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

gnu: libpng: Remove graft for 1.6.37. 

* gnu/packages/image.scm (libpng): Update to 1.6.37.
[replacement]: Remove field.
(libpng-1.6.37): Remove variable.
This commit is contained in:
Marius Bakke 2019-05-01 22:39:23 +02:00
parent 8de1979d7c
commit 8b5b3acab3
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/packages/image.scm
View File

@ -86,8 +86,7 @@
(define-public libpng (define-public libpng
(package (package
(name "libpng") (name "libpng")
(version "1.6.36") (version "1.6.37")
(replacement libpng-1.6.37)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "mirror://sourceforge/libpng/libpng16/" (uri (list (string-append "mirror://sourceforge/libpng/libpng16/"
@ -100,7 +99,7 @@
"/libpng16/libpng-" version ".tar.xz"))) "/libpng16/libpng-" version ".tar.xz")))
(sha256 (sha256
(base32 (base32
"06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc")))) "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; libpng.la says "-lz", so propagate it. ;; libpng.la says "-lz", so propagate it.
@ -113,25 +112,6 @@ 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")))
;; This graft exists to fix CVE-2018-14048, CVE-2018-14550, and CVE-2019-7317.
(define-public libpng-1.6.37
(package
(inherit libpng)
(version "1.6.37")
(source (origin
(method url-fetch)
(uri (list (string-append "mirror://sourceforge/libpng/libpng16/"
version "/libpng-" version ".tar.xz")
(string-append
"ftp://ftp.simplesystems.org/pub/libpng/png/src"
"/libpng16/libpng-" version ".tar.xz")
(string-append
"ftp://ftp.simplesystems.org/pub/libpng/png/src/history"
"/libpng16/libpng-" version ".tar.xz")))
(sha256
(base32
"1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh"))))))
;; libpng-apng should be updated when the APNG patch is released: ;; libpng-apng should be updated when the APNG patch is released:
;; <https://bugs.gnu.org/27556> ;; <https://bugs.gnu.org/27556>
(define-public libpng-apng (define-public libpng-apng