summary refs log tree commit diff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2016-05-31 13:20:19 -0400
committerLeo Famulari <leo@famulari.name>2016-05-31 13:38:40 -0400
commite88eb07110a9e6bf49bfe9020ad9a9a08c2dd61b (patch)
treedefd153c304d009603687ce01005fdc43c3c8695 /gnu/packages/patches
parent4d93a76138246ba1f9d6f81da4039e89e14570be (diff)
downloadguix-e88eb07110a9e6bf49bfe9020ad9a9a08c2dd61b.tar.gz
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.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/imagemagick-CVE-2016-5118.patch29
1 files changed, 29 insertions, 0 deletions
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 <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
+