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

gnu: libpng: Incorporate grafted patch. 

* gnu/packages/image.scm (libpng)[replacement]: Remove field.
[source]: Add patch 'libpng-CVE-2016-10087.patch'.
(libpng-1.2)[replacement]: Remove field.
(libpng/fixed): Remove variable.
This commit is contained in:
Leo Famulari 2017-01-25 12:51:50 -05:00
parent 678dd8a5ed
commit 9b1bb70904
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/image.scm
View File

@ -65,7 +65,6 @@
(define-public libpng (define-public libpng
(package (package
(name "libpng") (name "libpng")
(replacement libpng/fixed)
(version "1.6.25") (version "1.6.25")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -76,6 +75,7 @@
(string-append (string-append
"ftp://ftp.simplesystems.org/pub/libpng/png/src" "ftp://ftp.simplesystems.org/pub/libpng/png/src"
"/libpng15/libpng-" version ".tar.xz"))) "/libpng15/libpng-" version ".tar.xz")))
(patches (search-patches "libpng-CVE-2016-10087.patch"))
(sha256 (sha256
(base32 "04c8inn745hw25wz2dc5vll5n5d2gsndj01i4srwzgz8861qvzh9")))) (base32 "04c8inn745hw25wz2dc5vll5n5d2gsndj01i4srwzgz8861qvzh9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -90,18 +90,9 @@ library. It supports almost all PNG features and is extensible.")
(license license:zlib) (license license:zlib)
(home-page "http://www.libpng.org/pub/png/libpng.html"))) (home-page "http://www.libpng.org/pub/png/libpng.html")))
(define libpng/fixed
(package
(inherit libpng)
(source
(origin
(inherit (package-source libpng))
(patches (search-patches "libpng-CVE-2016-10087.patch"))))))
(define-public libpng-1.2 (define-public libpng-1.2
(package (package
(inherit libpng) (inherit libpng)
(replacement #f)
(version "1.2.57") (version "1.2.57")
(source (source
(origin (origin