From 21ef9843e4d0ea665acd2070ef589c3c4d0bd1b0 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 18 Nov 2015 17:47:17 -0500 Subject: Revert "gnu: libpng: Use 1.5.24 as a replacement [fixes CVE-2015-8126]." This reverts commit 1b076e630f4a7245d14634b047e1d1a91ee2659e. --- gnu/packages/image.scm | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 979d144ca4..1577bccfd0 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -47,28 +47,23 @@ #:use-module (guix build-system cmake) #:use-module (srfi srfi-1)) -(define (libpng-urls version) - "Return a list of URLs for libpng VERSION." - ;; Note: upstream removes older tarballs. - (list (string-append "mirror://sourceforge/libpng/libpng15/" - version "/libpng-" version ".tar.xz") - (string-append - "ftp://ftp.simplesystems.org/pub/libpng/png/src" - "/libpng15/libpng-" version ".tar.xz"))) - (define-public libpng (package (name "libpng") (version "1.5.21") (source (origin (method url-fetch) - (uri (libpng-urls version)) + + ;; Note: upstream removes older tarballs. + (uri (list (string-append "mirror://sourceforge/libpng/libpng15/" + version "/libpng-" version ".tar.xz") + (string-append + "ftp://ftp.simplesystems.org/pub/libpng/png/src" + "/libpng15/libpng-" version ".tar.xz"))) (sha256 (base32 "19yvzw6sf9gf7v25ha9bla8bw1nijh82wj8ag6brjj3hpij1q5dm")))) (build-system gnu-build-system) - (replacement libpng-1.5.24) ;CVE-2015-8126 - ;; libpng.la says "-lz", so propagate it. (propagated-inputs `(("zlib" ,zlib))) @@ -79,16 +74,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") -- cgit v1.2.3 ef='/guix/log/gnu/packages/assembly.scm?id=315b3d5a4a4cba43fec4d5ef589b03221df9792e'>assembly.scm
AgeCommit message (Expand)Author
2020-12-18gnu: rgbds: Update to 0.4.2....Tobias Geerinckx-Rice
2020-11-19gnu: Don't append '.git' to GitHub uris....Efraim Flashner
2020-11-16gnu: rgbds: Cross compile....Efraim Flashner
2020-11-08gnu: rgbds: Update source URI....Efraim Flashner
2020-09-10gnu: fasm: Update to 1.73.25....Tobias Geerinckx-Rice
2020-07-23gnu: rgbds: Update to 0.4.1....Tobias Geerinckx-Rice
2020-07-23gnu: wla-dx: Update to 9.11....Tobias Geerinckx-Rice
2020-07-21gnu: Add intel-xed....B. Wilson
2020-07-12gnu: Remove ".git" from "https://github/…/….git"....Ludovic Courtès
2020-07-07gnu: armips: Declare a source file-name....Efraim Flashner
2020-06-30gnu: Add armips....Leo Prikler
2020-06-02gnu: xa: Update to 2.3.11....Tobias Geerinckx-Rice
2020-06-02gnu: fasm: Update to 1.73.24....Tobias Geerinckx-Rice
2020-04-06gnu: rgbds: Update to 0.4.0....Jakub Kądziołka
2020-03-29gnu: rgbds: Update to 0.3.10....Jakub Kądziołka
2020-03-11gnu: Add xa....Christopher Lemmer Webber
2020-03-07gnu: yasm: Use HTTPS home page....Tobias Geerinckx-Rice
2020-02-20gnu: libjit: Use git-file-name...Jakub Kądziołka
2020-02-16gnu: fasm: Update to 1.73.22....Tobias Geerinckx-Rice
2020-01-11gnu: Add wla-dx....Jakub Kądziołka
2020-01-03gnu: fasm: Expand acronym in description....Tobias Geerinckx-Rice
2020-01-03gnu: fasm: Update to 1.73.21....Tobias Geerinckx-Rice
2020-01-03gnu: Add rgbds....Jakub Kądziołka
2019-12-01gnu: nasm: Don't use NAME in source URI....Tobias Geerinckx-Rice
2019-10-21gnu: yasm: Disable parallel tests....Christopher Baines
2019-10-12gnu: lightning: Update to 2.1.3....Tobias Geerinckx-Rice
2019-05-25Merge branch 'staging' into core-updatesMarius Bakke
2019-05-24gnu: Add libjit....Andy Tai
2019-05-08gnu: fasm: Update to 1.73.11....Tobias Geerinckx-Rice
2019-05-01Merge branch 'master' into core-updatesMarius Bakke
2019-04-11gnu: fasm: Update to 1.73.10....Tobias Geerinckx-Rice
2019-03-10gnu: nasm: Update to 2.14.02....Marius Bakke
2019-02-21gnu: fasm: Update to 1.73.09....Tobias Geerinckx-Rice