diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-07-02 12:18:58 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-07-02 12:18:58 +0200 |
| commit | 92af3ce417fdcb932c3f291e0c79106466a40c66 (patch) | |
| tree | 610d10ca5c4197c1a0ae14f1972dc72fb78a39d3 /gnu/packages/image.scm | |
| parent | cb4b508cd68df89bfbd5255a0c5569f8318ad50f (diff) | |
| parent | 6e65eb3cad1d1148eade9ed2228cdea90d531a94 (diff) | |
| download | guix-92af3ce417fdcb932c3f291e0c79106466a40c66.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/image.scm')
| -rw-r--r-- | gnu/packages/image.scm | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index a2874be1a8..5ad6fe9487 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -394,6 +394,7 @@ extracting icontainer icon files.") (define-public libtiff (package (name "libtiff") + (replacement libtiff/fixed) (version "4.0.9") (source (origin @@ -426,6 +427,17 @@ collection of tools for doing simple manipulations of TIFF images.") "See COPYRIGHT in the distribution.")) (home-page "http://www.simplesystems.org/libtiff/"))) +(define libtiff/fixed + (package + (inherit libtiff) + (source + (origin + (inherit (package-source libtiff)) + (patches + (append (origin-patches (package-source libtiff)) + (search-patches "libtiff-CVE-2018-8905.patch" + "libtiff-CVE-2018-10963.patch"))))))) + (define-public leptonica (package (name "leptonica") |