summaryrefslogtreecommitdiff
path: root/gnu/packages/image.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2018-03-17 03:23:00 -0400
committerMark H Weaver <mhw@netris.org>2018-03-17 03:36:05 -0400
commit4e1435be0bcb44afd3bebc5334444ca32a30c0db (patch)
tree50c9e9d717cd6b100657c30729203add20e57d41 /gnu/packages/image.scm
parenta5f2b44367c3589e02d11580ed189fac92cf3bf1 (diff)
gnu: libtiff: Ungraft.
* gnu/packages/image.scm (libtiff)[replacement]: Remove field. [source]: Add patches from former replacement. (libtiff/fixed): Remove variable.
Diffstat (limited to 'gnu/packages/image.scm')
-rw-r--r--gnu/packages/image.scm16
1 files changed, 3 insertions, 13 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index caafb2ea70..f817c2485b 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -392,7 +392,6 @@ extracting icontainer icon files.")
(package
(name "libtiff")
(version "4.0.9")
- (replacement libtiff/fixed)
(source
(origin
(method url-fetch)
@@ -400,7 +399,9 @@ extracting icontainer icon files.")
version ".tar.gz"))
(sha256
(base32
- "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf"))))
+ "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf"))
+ (patches (search-patches "libtiff-CVE-2017-9935.patch"
+ "libtiff-CVE-2017-18013.patch"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ;1.3 MiB of HTML documentation
@@ -422,17 +423,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-2017-9935.patch"
- "libtiff-CVE-2017-18013.patch")))))))
-
(define-public leptonica
(package
(name "leptonica")