02/02: gnu: libpng: Update to 1.5.24 [fixes CVE-2015-8126].

[Ludovic Courtès]

civodul pushed a commit to branch tk-update
in repository guix.

commit fc4f59e1fa5325f74d147c3066b08cbed9346f21
Author: Ludovic Courtès <address@hidden>
Date:   Mon Nov 16 09:52:46 2015 +0100

    gnu: libpng: Update to 1.5.24 [fixes CVE-2015-8126].
    
    * gnu/packages/image.scm (libpng)[source, version]: Update to 1.5.24.
      [replacement]: Remove.
      (libpng-1.5.24): Remove.
---
 gnu/packages/image.scm |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index b7b8eac..1d3dd78 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -58,16 +58,15 @@
 (define-public libpng
   (package
    (name "libpng")
-   (version "1.5.21")
+   (version "1.5.24")
    (source (origin
             (method url-fetch)
             (uri (libpng-urls version))
             (sha256
-             (base32 "19yvzw6sf9gf7v25ha9bla8bw1nijh82wj8ag6brjj3hpij1q5dm"))))
+             (base32
+              "1qhvfk1ypsaf6q6xkspyqqzmghpbahhq54ms8fa5ssqkyds38bmr"))))
    (build-system gnu-build-system)
 
-   (replacement libpng-1.5.24)                    ;CVE-2015-8126
-
    ;; libpng.la says "-lz", so propagate it.
    (propagated-inputs `(("zlib" ,zlib)))
 
@@ -78,16 +77,6 @@ library.  It supports almost all PNG features and is 
extensible.")
    (license license:zlib)
    (home-page "http://www.libpng.org/pub/png/libpng.html";)))
 
-(define libpng-1.5.24
-  (package
-    (inherit libpng)
-    (source (origin
-              (method url-fetch)
-              (uri (libpng-urls "1.5.24"))
-              (sha256
-               (base32
-                "1qhvfk1ypsaf6q6xkspyqqzmghpbahhq54ms8fa5ssqkyds38bmr"))))))
-
 (define-public libjpeg
   (package
    (name "libjpeg")