diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-05-28 23:47:25 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-05-28 23:47:25 +0200 |
| commit | 6f8cda185e3439777e1c3252cb3d75f0b19376fe (patch) | |
| tree | db8116ea8dfbf6ae490b9b3c220e6d9f67755d63 /gnu/packages/image.scm | |
| parent | 1622637bb74d03cd3070ce14195252ead032d99d (diff) | |
| parent | 6c1db130a8a0cad4ff0c27f8f2e7274682a50ca4 (diff) | |
| download | patches-6f8cda185e3439777e1c3252cb3d75f0b19376fe.tar patches-6f8cda185e3439777e1c3252cb3d75f0b19376fe.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/image.scm')
| -rw-r--r-- | gnu/packages/image.scm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 86902d5680..fe9e457f34 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -335,7 +335,7 @@ extracting icontainer icon files.") (define-public libtiff (package (name "libtiff") - (replacement libtiff/fixed) + (replacement libtiff-4.0.8) (version "4.0.7") (source (origin (method url-fetch) @@ -384,18 +384,18 @@ 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 +(define libtiff-4.0.8 (package (inherit libtiff) + (version "4.0.8") (source (origin - (inherit (package-source libtiff)) - (patches - (append - (origin-patches (package-source libtiff)) - (search-patches "libtiff-CVE-2017-7593.patch" - "libtiff-CVE-2017-7594.patch" - "libtiff-multiple-UBSAN-crashes.patch"))))))) + (method url-fetch) + (uri (string-append "http://download.osgeo.org/libtiff/tiff-" + version ".tar.gz")) + (sha256 + (base32 + "0419mh6kkhz5fkyl77gv0in8x4d2jpdpfs147y8mj86rrjlabmsr")))))) (define-public libwmf (package |