From d8862778c1b334cefafb92cc88e158b2cdf82a76 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 29 May 2016 23:36:37 -0400 Subject: gnu: graphicsmagick: Fix CVE-2016-5118. * gnu/packages/patches/graphicsmagick-CVE-2016-5118.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/imagemagick.scm (graphicsmagick): Use it. --- gnu/packages/imagemagick.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/imagemagick.scm') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index a7bbe0cce0..c356a47148 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -160,6 +160,7 @@ script.") (uri (string-append "ftp://ftp.graphicsmagick.org/pub/" "GraphicsMagick/" (version-major+minor version) "/GraphicsMagick-" version ".tar.xz")) + (patches (search-patches "graphicsmagick-CVE-2016-5118.patch")) (sha256 (base32 "03g6l2h8cmf231y1vma0z7x85070jm1ysgs9ppqcd3jj56jka9gx")))) -- cgit v1.2.3 From 5ae77a6f5a3b6d38c2279f97e31f0f35adc7c29b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 30 May 2016 13:25:20 -0400 Subject: gnu: imagemagick: Update to 6.9.4-5. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.4-5. --- gnu/packages/imagemagick.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/imagemagick.scm') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index c356a47148..f129b16289 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -40,14 +40,14 @@ (define-public imagemagick (package (name "imagemagick") - (version "6.9.4-4") + (version "6.9.4-5") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "005nnp0masv59yfcdip6qld86567zjbz59c9lkcqrxclm27vmx0p")))) + "0niwa7ci50865x1h6qffz1q6i2ph2l5ym7bhcg5kdnvi4f75p9ir")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths") -- cgit v1.2.3 From 4d93a76138246ba1f9d6f81da4039e89e14570be Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 31 May 2016 13:23:17 -0400 Subject: gnu: graphicsmagick: Update to 1.3.24 [security update]. Fixes CVE-2016-{2317, 2318, 5118} and many other security issues described in 'NEWS.txt'. * gnu/packages/patches/graphicsmagick-CVE-2016-5118.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/imagemagick.scm (graphicsmagick): Update to 1.3.24. [source]: Remove patch. --- gnu/local.mk | 1 - gnu/packages/imagemagick.scm | 6 +++--- .../patches/graphicsmagick-CVE-2016-5118.patch | 19 ------------------- 3 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 gnu/packages/patches/graphicsmagick-CVE-2016-5118.patch (limited to 'gnu/packages/imagemagick.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 6e2d765159..f669167091 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -524,7 +524,6 @@ dist_patch_DATA = \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ - %D%/packages/patches/graphicsmagick-CVE-2016-5118.patch \ %D%/packages/patches/grep-timing-sensitive-test.patch \ %D%/packages/patches/grub-CVE-2015-8370.patch \ %D%/packages/patches/grub-gets-undeclared.patch \ diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index f129b16289..dc03ea48a4 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2016 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -154,16 +155,15 @@ script.") (define-public graphicsmagick (package (name "graphicsmagick") - (version "1.3.23") + (version "1.3.24") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.graphicsmagick.org/pub/" "GraphicsMagick/" (version-major+minor version) "/GraphicsMagick-" version ".tar.xz")) - (patches (search-patches "graphicsmagick-CVE-2016-5118.patch")) (sha256 (base32 - "03g6l2h8cmf231y1vma0z7x85070jm1ysgs9ppqcd3jj56jka9gx")))) + "1q40w5hcl8rcpszm0r7rpr3a9lj390p39zfvavkvlgxyyk7bmgsj")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/patches/graphicsmagick-CVE-2016-5118.patch b/gnu/packages/patches/graphicsmagick-CVE-2016-5118.patch deleted file mode 100644 index ddd1ce93f4..0000000000 --- a/gnu/packages/patches/graphicsmagick-CVE-2016-5118.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix CVE-2016-5118 (popen() shell vulnerability via filename). - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-5118 - -Upstream patch copied from the bug announcement: -http://seclists.org/oss-sec/2016/q2/432 -https://marc.info/?l=oss-security&m=146455222600609&w=2 - -diff -r 33200fc645f6 magick/blob.c ---- a/magick/blob.c Sat Nov 07 14:49:16 2015 -0600 -+++ b/magick/blob.c Sun May 29 14:12:57 2016 -0500 -@@ -68,6 +68,7 @@ - */ - #define DefaultBlobQuantum 65541 - -+#undef HAVE_POPEN - - /* - Enum declarations. -- cgit v1.2.3 From e88eb07110a9e6bf49bfe9020ad9a9a08c2dd61b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 31 May 2016 13:20:19 -0400 Subject: gnu: imagemagick: Fix CVE-2016-5118. * gnu/packages/patches/imagemagick-CVE-2016-5118.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/imagemagick.scm (imagemagick): Use it. --- gnu/local.mk | 1 + gnu/packages/imagemagick.scm | 1 + .../patches/imagemagick-CVE-2016-5118.patch | 29 ++++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 gnu/packages/patches/imagemagick-CVE-2016-5118.patch (limited to 'gnu/packages/imagemagick.scm') diff --git a/gnu/local.mk b/gnu/local.mk index f669167091..21f9f81d10 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -552,6 +552,7 @@ dist_patch_DATA = \ %D%/packages/patches/icu4c-CVE-2015-4760.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ + %D%/packages/patches/imagemagick-CVE-2016-5118.patch \ %D%/packages/patches/inkscape-drop-wait-for-targets.patch \ %D%/packages/patches/irrlicht-mesa-10.patch \ %D%/packages/patches/jansson-CVE-2016-4425.patch \ diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index dc03ea48a4..1549497483 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -46,6 +46,7 @@ (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) + (patches (search-patches "imagemagick-CVE-2016-5118.patch")) (sha256 (base32 "0niwa7ci50865x1h6qffz1q6i2ph2l5ym7bhcg5kdnvi4f75p9ir")))) diff --git a/gnu/packages/patches/imagemagick-CVE-2016-5118.patch b/gnu/packages/patches/imagemagick-CVE-2016-5118.patch new file mode 100644 index 0000000000..0df4ce57ca --- /dev/null +++ b/gnu/packages/patches/imagemagick-CVE-2016-5118.patch @@ -0,0 +1,29 @@ +From c0c5c9fc7271fd141531b0bdb55b7f7ff5afc481 Mon Sep 17 00:00:00 2001 +From: Leo Famulari +Date: Tue, 31 May 2016 13:06:10 -0400 +Subject: [PATCH] Fix CVE-2016-5118. + +This is the temporary fix suggested by upstream: +https://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=29803#p134039 +--- + magick/magick-baseconfig.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/magick/magick-baseconfig.h b/magick/magick-baseconfig.h +index d320f2a..c9cce82 100644 +--- a/magick/magick-baseconfig.h ++++ b/magick/magick-baseconfig.h +@@ -519,7 +519,10 @@ + + /* Define to 1 if you have the `popen' function. */ + #ifndef MAGICKCORE_HAVE_POPEN ++/* Temporary mitigation for CVE-2016-5118 (popen() shell vulnerability via ++ * filename) + #define MAGICKCORE_HAVE_POPEN 1 ++*/ + #endif + + /* Define to 1 if you have the `posix_fadvise' function. */ +-- +2.8.3 + -- cgit v1.2.3 From 1c5ee417f4c05e5937aae0a34c60d574bba197a0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 1 Jun 2016 22:01:36 -0400 Subject: gnu: imagemagick: Update to 6.9.4-7. * gnu/packages/patches/imagemagick-CVE-2016-5118.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.4-7. [source]: Remove patch. --- gnu/local.mk | 1 - gnu/packages/imagemagick.scm | 5 ++-- .../patches/imagemagick-CVE-2016-5118.patch | 29 ---------------------- 3 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 gnu/packages/patches/imagemagick-CVE-2016-5118.patch (limited to 'gnu/packages/imagemagick.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 59aaccc9b5..1cc4c7d809 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -553,7 +553,6 @@ dist_patch_DATA = \ %D%/packages/patches/icu4c-CVE-2015-4760.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ - %D%/packages/patches/imagemagick-CVE-2016-5118.patch \ %D%/packages/patches/inkscape-drop-wait-for-targets.patch \ %D%/packages/patches/irrlicht-mesa-10.patch \ %D%/packages/patches/jansson-CVE-2016-4425.patch \ diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 1549497483..5231200919 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -41,15 +41,14 @@ (define-public imagemagick (package (name "imagemagick") - (version "6.9.4-5") + (version "6.9.4-7") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) - (patches (search-patches "imagemagick-CVE-2016-5118.patch")) (sha256 (base32 - "0niwa7ci50865x1h6qffz1q6i2ph2l5ym7bhcg5kdnvi4f75p9ir")))) + "11jcbc9phx37m7ra4v3qsfa2iqh3srsvxplxz38h911jvgfchkzm")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths") diff --git a/gnu/packages/patches/imagemagick-CVE-2016-5118.patch b/gnu/packages/patches/imagemagick-CVE-2016-5118.patch deleted file mode 100644 index 0df4ce57ca..0000000000 --- a/gnu/packages/patches/imagemagick-CVE-2016-5118.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c0c5c9fc7271fd141531b0bdb55b7f7ff5afc481 Mon Sep 17 00:00:00 2001 -From: Leo Famulari -Date: Tue, 31 May 2016 13:06:10 -0400 -Subject: [PATCH] Fix CVE-2016-5118. - -This is the temporary fix suggested by upstream: -https://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=29803#p134039 ---- - magick/magick-baseconfig.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/magick/magick-baseconfig.h b/magick/magick-baseconfig.h -index d320f2a..c9cce82 100644 ---- a/magick/magick-baseconfig.h -+++ b/magick/magick-baseconfig.h -@@ -519,7 +519,10 @@ - - /* Define to 1 if you have the `popen' function. */ - #ifndef MAGICKCORE_HAVE_POPEN -+/* Temporary mitigation for CVE-2016-5118 (popen() shell vulnerability via -+ * filename) - #define MAGICKCORE_HAVE_POPEN 1 -+*/ - #endif - - /* Define to 1 if you have the `posix_fadvise' function. */ --- -2.8.3 - -- cgit v1.2.3