diff options
| author | Leo Famulari <leo@famulari.name> | 2017-01-25 12:53:31 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-01-25 13:23:26 -0500 |
| commit | 29705bc29f891919edf67af4c8368af4c84bf9e0 (patch) | |
| tree | 7cace2d16a75a196c7f7b3db3d9881e135e0e5c6 | |
| parent | 9b1bb709047f814b89dcba9452e1b21da65e7da3 (diff) | |
| download | guix-29705bc29f891919edf67af4c8368af4c84bf9e0.tar.gz guix-29705bc29f891919edf67af4c8368af4c84bf9e0.zip | |
gnu: libtiff: Incorporate grafted patches.
* gnu/packages/image.scm (libtiff)[replacement]: Remove field.
[source]: Add patches from libtiff/fixed.
(libtiff/fixed): Remove variable.
| -rw-r--r-- | gnu/packages/image.scm | 40 |
1 files changed, 16 insertions, 24 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index c545f026ad..613d344b97 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -250,12 +250,27 @@ extracting icontainer icon files.") (define-public libtiff (package (name "libtiff") - (replacement libtiff/fixed) (version "4.0.7") (source (origin (method url-fetch) (uri (string-append "ftp://download.osgeo.org/libtiff/tiff-" version ".tar.gz")) + (patches (search-patches "libtiff-heap-overflow-tiffcp.patch" + "libtiff-null-dereference.patch" + "libtiff-heap-overflow-tif-dirread.patch" + "libtiff-heap-overflow-pixarlog-luv.patch" + "libtiff-divide-by-zero.patch" + "libtiff-divide-by-zero-ojpeg.patch" + "libtiff-tiffcp-underflow.patch" + "libtiff-invalid-read.patch" + "libtiff-CVE-2016-10092.patch" + "libtiff-heap-overflow-tiffcrop.patch" + "libtiff-divide-by-zero-tiffcrop.patch" + "libtiff-CVE-2016-10093.patch" + "libtiff-divide-by-zero-tiffcp.patch" + "libtiff-assertion-failure.patch" + "libtiff-CVE-2016-10094.patch" + "libtiff-CVE-2017-5225.patch")) (sha256 (base32 "06ghqhr4db1ssq0acyyz49gr8k41gzw6pqb6mbn5r7jqp77s4hwz")))) @@ -283,29 +298,6 @@ 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 (search-patches "libtiff-heap-overflow-tiffcp.patch" - "libtiff-null-dereference.patch" - "libtiff-heap-overflow-tif-dirread.patch" - "libtiff-heap-overflow-pixarlog-luv.patch" - "libtiff-divide-by-zero.patch" - "libtiff-divide-by-zero-ojpeg.patch" - "libtiff-tiffcp-underflow.patch" - "libtiff-invalid-read.patch" - "libtiff-CVE-2016-10092.patch" - "libtiff-heap-overflow-tiffcrop.patch" - "libtiff-divide-by-zero-tiffcrop.patch" - "libtiff-CVE-2016-10093.patch" - "libtiff-divide-by-zero-tiffcp.patch" - "libtiff-assertion-failure.patch" - "libtiff-CVE-2016-10094.patch" - "libtiff-CVE-2017-5225.patch")))))) - (define-public libwmf (package (name "libwmf") |