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.
This commit is contained in:
Leo Famulari 2016-06-01 22:01:36 -04:00
parent b37b854e2d
commit 1c5ee417f4
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
3 changed files with 2 additions and 33 deletions

View File

@ -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 \

View File

@ -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")

View File

@ -1,29 +0,0 @@
From c0c5c9fc7271fd141531b0bdb55b7f7ff5afc481 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
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