me
/
guix
Archived
1
0
Fork 0
Code

gnu: libtiff: Ungraft. 

* gnu/packages/image.scm (libtiff)[replacement]: Remove field.
[source]: Add patches from former replacement.
(libtiff/fixed): Remove variable.
master
Mark H Weaver 2018-03-17 03:23:00 -04:00
parent a5f2b44367
commit 4e1435be0b
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/image.scm
View File

@ -392,7 +392,6 @@ extracting icontainer icon files.")
(package (package
(name "libtiff") (name "libtiff")
(version "4.0.9") (version "4.0.9")
(replacement libtiff/fixed)
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -400,7 +399,9 @@ extracting icontainer icon files.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf")))) "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf"))
(patches (search-patches "libtiff-CVE-2017-9935.patch"
"libtiff-CVE-2017-18013.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc")) ;1.3 MiB of HTML documentation "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.")) "See COPYRIGHT in the distribution."))
(home-page "http://www.simplesystems.org/libtiff/"))) (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 (define-public leptonica
(package (package
(name "leptonica") (name "leptonica")