mbakke pushed a commit to branch core-updates
in repository guix.
commit 41e2e58a2afce2ad55f1f90374d9f92af27f3d6c
Author: Marius Bakke <[email protected]>
Date: Tue Jul 24 20:44:40 2018 +0200
gnu: libtiff: Incorporate grafted changes.
* gnu/packages/image.scm (libtiff)[replacement]: Remove field.
[source](patches): Add 'libtiff-CVE-2018-8905.patch' and
'libtiff-CVE-2018-10963.patch'.
(libtiff/fixed): Remove variable.
---
gnu/packages/image.scm | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index a330a31..1c3a2b7 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -394,7 +394,6 @@ extracting icontainer icon files.")
(define-public libtiff
(package
(name "libtiff")
- (replacement libtiff/fixed)
(version "4.0.9")
(source
(origin
@@ -405,7 +404,9 @@ extracting icontainer icon files.")
(base32
"1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf"))
(patches (search-patches "libtiff-CVE-2017-9935.patch"
- "libtiff-CVE-2017-18013.patch"))))
+ "libtiff-CVE-2017-18013.patch"
+ "libtiff-CVE-2018-8905.patch"
+ "libtiff-CVE-2018-10963.patch"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ;1.3 MiB of HTML documentation
@@ -427,17 +428,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
- (append (origin-patches (package-source libtiff))
- (search-patches "libtiff-CVE-2018-8905.patch"
- "libtiff-CVE-2018-10963.patch")))))))
-
(define-public leptonica
(package
(name "leptonica")
