From 1ee13e01c8a9e5f1ee87c580d283cf6fea7d80dc Mon Sep 17 00:00:00 2001 From: nee Date: Sat, 25 Nov 2017 20:51:11 +0100 Subject: gnu: image: Rename pngcrunch to pngcrush and update it. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/image.scm (pngcrush): Renamed from pngcrunch. [version]: update to 1.8.13. [arguments]: Use the nolib Makefile. [origin]: Use the no-lib tar. [home-page]: update to the new website. (pngcrunch): New deprecation variable. Signed-off-by: Ludovic Courtès --- gnu/packages/image.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'gnu/packages/image.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index cb8e387f6a..a183817dbd 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -207,25 +207,24 @@ in-memory raw vectors.") ;; Any of these GPL versions. (license (list license:gpl2 license:gpl3)))) -(define-public pngcrunch +(define-public pngcrush (package - (name "pngcrunch") - (version "1.8.11") + (name "pngcrush") + (version "1.8.13") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pmt/pngcrush/" - version "/pngcrush-" version ".tar.xz")) + version "/pngcrush-" version "-nolib.tar.xz")) (sha256 (base32 - "1c7m316i91jp3h1dj1ppppdv6zilm2njk1wrpqy2zj0fcll06lwd")))) + "0l43c59d6v9l0g07z3q3ywhb8xb3vz74llv3mna0izk9bj6aqkiv")))) (build-system gnu-build-system) (arguments - '(#:make-flags '("-f" "Makefile-nolib") - #:tests? #f ; no check target + '(#:tests? #f ; no check target #:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "Makefile-nolib" + (substitute* "Makefile" (("^(PNG(INC|LIB) = )/usr/local/" line vardef) (string-append vardef (assoc-ref inputs "libpng") "/")) (("^(Z(INC|LIB) = )/usr/local/" line vardef) @@ -236,12 +235,16 @@ in-memory raw vectors.") (inputs `(("libpng" ,libpng) ("zlib" , zlib))) - (home-page "https://pmt.sourceforge.net/pngcrush") + (home-page "https://pmt.sourceforge.io/pngcrush") (synopsis "Utility to compress PNG files") (description "pngcrusqh is an optimizer for PNG (Portable Network Graphics) files. It can compress them as much as 40% losslessly.") (license license:zlib))) +(define-public pngcrunch + ;; This package used to be wrongfully name "pngcrunch". + (deprecated-package "pngcrunch" pngcrush)) + (define-public libjpeg (package (name "libjpeg") -- cgit v1.2.3 From 7832785deff1bf7907b072ef81d47d426425ad3b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 22 Jun 2017 01:21:52 +0200 Subject: gnu: steghide: Fix description. * gnu/packages/image.scm (steghide)[description]: Remove typos and improve grammar. --- gnu/packages/image.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/image.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index a183817dbd..0e1f025563 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2017 Efraim Flashner -;;; Copyright © 2016 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 Arun Isaac ;;; Copyright © 2016, 2017 Kei Kebreau @@ -1054,10 +1054,9 @@ differences in file encoding, image quality, and other small variations.") (home-page "http://steghide.sourceforge.net") (synopsis "Image and audio steganography") (description - "Steghide is a steganography program that is able to hide data in various -kinds of image- and audio-files. The color- respectivly sample-frequencies -are not changed thus making the embedding resistant against first-order -statistical tests.") + "Steghide is a program to hide data in various kinds of image and audio +files (known as @dfn{steganography}). Neither color nor sample frequencies are +changed, making the embedding resistant against first-order statistical tests.") (license license:gpl2+))) (define-public stb-image-for-extempore -- cgit v1.2.3 From 0e7fb0cd9b91e873b5f9d04c49472b06aff6911f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Nov 2017 17:41:33 +0100 Subject: gnu: optipng: Fix CVE-2017-1000229. * gnu/packages/image.scm (optipng)[source](patches): New field. * gnu/packages/patches/optipng-CVE-2017-1000229.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/image.scm | 1 + .../patches/optipng-CVE-2017-1000229.patch | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 gnu/packages/patches/optipng-CVE-2017-1000229.patch (limited to 'gnu/packages/image.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 5ea975c4f4..19db3c44ca 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -940,6 +940,7 @@ dist_patch_DATA = \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ + %D%/packages/patches/optipng-CVE-2017-1000229.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ %D%/packages/patches/osip-CVE-2017-7853.patch \ %D%/packages/patches/ots-no-include-missing-file.patch \ diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 0e1f025563..b9f1ef2344 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1095,6 +1095,7 @@ installed as @code{stb_image}.") (method url-fetch) (uri (string-append "http://prdownloads.sourceforge.net/optipng/optipng-" version ".tar.gz")) + (patches (search-patches "optipng-CVE-2017-1000229.patch")) (sha256 (base32 "105yk5qykvhiahzag67gm36s2kplxf6qn5hay02md0nkrcgn6w28")))) diff --git a/gnu/packages/patches/optipng-CVE-2017-1000229.patch b/gnu/packages/patches/optipng-CVE-2017-1000229.patch new file mode 100644 index 0000000000..2cb3b2f21c --- /dev/null +++ b/gnu/packages/patches/optipng-CVE-2017-1000229.patch @@ -0,0 +1,22 @@ +Fix CVE-2017-1000229: + +https://security-tracker.debian.org/tracker/CVE-2017-1000229 +https://people.canonical.com/~ubuntu-security/cve/2017/CVE-2017-1000229.html +https://nvd.nist.gov/vuln/detail/CVE-2017-1000229 + +Patch copied from upstream bug tracker: +https://sourceforge.net/p/optipng/bugs/65/ + +diff --git a/src/minitiff/tiffread.c b/src/minitiff/tiffread.c +index b4910ec..5f9b376 100644 +--- a/src/minitiff/tiffread.c ++++ b/src/minitiff/tiffread.c +@@ -350,6 +350,8 @@ minitiff_read_info(struct minitiff_info *tiff_ptr, FILE *fp) + count = tiff_ptr->strip_offsets_count; + if (count == 0 || count > tiff_ptr->height) + goto err_invalid; ++ if (count > (size_t)-1 / sizeof(long)) ++ goto err_memory; + tiff_ptr->strip_offsets = (long *)malloc(count * sizeof(long)); + if (tiff_ptr->strip_offsets == NULL) + goto err_memory; -- cgit v1.2.3 From 2235abb2a25e9ae15ab1e6cb213a54d097b758a2 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 31 Aug 2017 17:07:21 +0530 Subject: gnu: gpick: Use scons-build-system. * gnu/packages/image.scm (gpick): Switch to scons-build-system. --- gnu/packages/image.scm | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'gnu/packages/image.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index b9f1ef2344..2bcfdf7e1a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice ;;; Copyright © 2016 Eric Bavier -;;; Copyright © 2016 Arun Isaac +;;; Copyright © 2016, 2017 Arun Isaac ;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Hartmut Goebel @@ -67,6 +67,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system python) #:use-module (guix build-system r) + #:use-module (guix build-system scons) #:use-module (srfi srfi-1)) (define-public libpng @@ -1205,33 +1206,26 @@ medical image data, e.g. magnetic resonance image (MRI) and functional MRI (sha256 (base32 "0mxvxk15xhk2i5vfavjhnkk4j3bnii0gpf8di14rlbpq070hd5rs")))) - (build-system python-build-system) + (build-system scons-build-system) (native-inputs `(("boost" ,boost) ("gettext" ,gnu-gettext) - ("pkg-config" ,pkg-config) - ("scons" ,scons))) + ("pkg-config" ,pkg-config))) (inputs `(("expat" ,expat) ("gtk2" ,gtk+-2) ("lua" ,lua-5.2))) (arguments `(#:tests? #f + #:scons ,scons-python2 + #:scons-flags (list (string-append "DESTDIR=" %output)) #:phases (modify-phases %standard-phases (add-before 'build 'fix-lua-reference (lambda _ (substitute* "SConscript" (("lua5.2") "lua-5.2")) - #t)) - (replace 'build - (lambda _ - (zero? (system* "scons")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((dest (assoc-ref outputs "out"))) - (zero? (system* "scons" "install" - (string-append "DESTDIR=" dest))))))))) + #t))))) (home-page "http://www.gpick.org/") (synopsis "Color picker") (description "Gpick is an advanced color picker and palette editing tool.") -- cgit v1.2.3 From d0d666f97b8f27746fc990cfe427301c45a30caa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 2 Dec 2017 16:33:15 +0100 Subject: gnu: libwebp: Update to 0.6.1. * gnu/packages/image.scm (libwebp): Update to 0.6.1. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/image.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 2bcfdf7e1a..e220ac242a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -802,7 +802,7 @@ multi-dimensional image processing.") (define-public libwebp (package (name "libwebp") - (version "0.6.0") + (version "0.6.1") (source (origin (method url-fetch) @@ -811,7 +811,7 @@ multi-dimensional image processing.") ".tar.gz")) (sha256 (base32 - "0h1brwkyxc7lb8lc53aacdks5vc1y9hzngqi41gg7y6l56912a69")))) + "1ayq2zq0zbgf5yizbm32zh7p1vb8kibw74am6am1n5cz5mw3ql06")))) (build-system gnu-build-system) (inputs `(("freeglut" ,freeglut) -- cgit v1.2.3