summary refs log tree commit diff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2016-06-01 22:01:36 -0400
committerLeo Famulari <leo@famulari.name>2016-06-03 16:45:13 -0400
commit1c5ee417f4c05e5937aae0a34c60d574bba197a0 (patch)
tree95428f0527ffcc46b3eda9934649df376cd171fa /gnu/packages/patches
parentb37b854e2d65433ec1809ed96d2ab4a652f3fca3 (diff)
downloadguix-1c5ee417f4c05e5937aae0a34c60d574bba197a0.tar.gz
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.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/imagemagick-CVE-2016-5118.patch29
1 files changed, 0 insertions, 29 deletions
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 <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
-