nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Marius Bakke 2018-07-24 20:44:40 +02:00
parent 99cfdfb10c
commit 41e2e58a2a
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
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

@ -394,7 +394,6 @@ extracting icontainer icon files.")
(define-public libtiff (define-public libtiff
(package (package
(name "libtiff") (name "libtiff")
(replacement libtiff/fixed)
(version "4.0.9") (version "4.0.9")
(source (source
(origin (origin
@ -405,7 +404,9 @@ extracting icontainer icon files.")
(base32 (base32
"1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf")) "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf"))
(patches (search-patches "libtiff-CVE-2017-9935.patch" (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) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc")) ;1.3 MiB of HTML documentation "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.")) "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-2018-8905.patch"
"libtiff-CVE-2018-10963.patch")))))))
(define-public leptonica (define-public leptonica
(package (package
(name "leptonica") (name "leptonica")