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

gnu: libtiff: Incorporate grafted security patches. 

* gnu/packages/image.scm (libtiff)[source]: Add patches from libtiff/fixed.
[replacement]: Remove field.
(libtiff/fixed): Remove variable.
This commit is contained in:
Leo Famulari 2016-08-29 20:58:13 -04:00
parent 4b4fc92fe5
commit 568230c378
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gnu/packages/image.scm
View File

@ -150,7 +150,6 @@ maximum quality factor.")
(define-public libtiff (define-public libtiff
(package (package
(name "libtiff") (name "libtiff")
(replacement libtiff/fixed)
(version "4.0.6") (version "4.0.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -161,7 +160,14 @@ maximum quality factor.")
(patches (search-patches (patches (search-patches
"libtiff-oob-accesses-in-decode.patch" "libtiff-oob-accesses-in-decode.patch"
"libtiff-oob-write-in-nextdecode.patch" "libtiff-oob-write-in-nextdecode.patch"
"libtiff-CVE-2015-8665+CVE-2015-8683.patch")))) "libtiff-CVE-2015-8665+CVE-2015-8683.patch"
"libtiff-CVE-2016-3623.patch"
"libtiff-CVE-2016-3945.patch"
"libtiff-CVE-2016-3990.patch"
"libtiff-CVE-2016-3991.patch"
"libtiff-CVE-2016-5314.patch"
"libtiff-CVE-2016-5321.patch"
"libtiff-CVE-2016-5323.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
@ -183,23 +189,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.remotesensing.org/libtiff/"))) (home-page "http://www.remotesensing.org/libtiff/")))
(define libtiff/fixed
(package
(inherit libtiff)
(source (origin
(inherit (package-source libtiff))
(patches (search-patches
"libtiff-oob-accesses-in-decode.patch"
"libtiff-oob-write-in-nextdecode.patch"
"libtiff-CVE-2015-8665+CVE-2015-8683.patch"
"libtiff-CVE-2016-3623.patch"
"libtiff-CVE-2016-3945.patch"
"libtiff-CVE-2016-3990.patch"
"libtiff-CVE-2016-3991.patch"
"libtiff-CVE-2016-5314.patch"
"libtiff-CVE-2016-5321.patch"
"libtiff-CVE-2016-5323.patch"))))))
(define-public libwmf (define-public libwmf
(package (package
(name "libwmf") (name "libwmf")