From 34d94d09e6777628c2e07d5ecd1795a218db96ec Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Wed, 4 May 2016 10:24:49 +0200
Subject: [PATCH] =?UTF-8?q?ImageMagick:=20fix=20CVE-2016=E2=80=933714?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImageMagick/patches/CVE-2016-3714.patch   | 24 +++++++++++++++++++
 srcpkgs/ImageMagick/template                  |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/ImageMagick/patches/CVE-2016-3714.patch

diff --git a/srcpkgs/ImageMagick/patches/CVE-2016-3714.patch b/srcpkgs/ImageMagick/patches/CVE-2016-3714.patch
new file mode 100644
index 00000000000..3d8a74b9086
--- /dev/null
+++ b/srcpkgs/ImageMagick/patches/CVE-2016-3714.patch
@@ -0,0 +1,24 @@
+https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=29588
+
+--- config/delegates.xml.in.orig	2016-05-03 23:36:18.581813000 +0200
++++ config/delegates.xml.in	2016-05-03 23:36:26.858835000 +0200
+@@ -88,7 +88,6 @@
+   <delegate decode="hpgl" command="&quot;@HPGLDecodeDelegate@&quot; -q -m eps -f `basename &quot;%o&quot;` &quot;%i&quot;;     mv -f `basename &quot;%o&quot;` &quot;%o&quot;"/>
+   <delegate decode="htm" command="&quot;@HTMLDecodeDelegate@&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
+   <delegate decode="html" command="&quot;@HTMLDecodeDelegate@&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
+-  <delegate decode="https" command="&quot;@WWWDecodeDelegate@&quot; -s -k -L -o &quot;%o&quot; &quot;https:%F&quot;"/>
+   <delegate decode="ilbm" command="&quot;@ILBMDecodeDelegate@&quot; &quot;%i&quot; &gt; &quot;%o&quot;"/>
+   <delegate decode="jxr" command="mv &quot;%i&quot; &quot;%i.jxr&quot;; &quot;@JXRDecodeDelegate@&quot; -i &quot;%i.jxr&quot; -o &quot;%o.bmp&quot; -c 0; mv &quot;%i.jxr&quot; &quot;%i&quot;; mv &quot;%o.bmp&quot; &quot;%o&quot;"/>
+   <delegate decode="man" command="&quot;@MANDelegate@&quot; -man -Tps &quot;%i&quot; &gt; &quot;%o&quot;"/>
+--- config/policy.xml.orig	2016-05-03 23:18:45.652543000 +0200
++++ config/policy.xml	2016-05-03 23:19:23.818471000 +0200
+@@ -58,4 +58,9 @@
+   <!-- <policy domain="resource" name="time" value="3600"/> -->
+   <!-- <policy domain="system" name="precision" value="6"/> -->
+   <policy domain="cache" name="shared-secret" value="passphrase"/>
++  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
++  <policy domain="coder" rights="none" pattern="URL" />
++  <policy domain="coder" rights="none" pattern="HTTPS" />
++  <policy domain="coder" rights="none" pattern="MVG" />
++  <policy domain="coder" rights="none" pattern="MSL" />
+ </policymap>
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 99012fe5722..d613432990f 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -3,7 +3,7 @@ pkgname=ImageMagick
 _majorver=6.9.3
 _patchver=9
 version=${_majorver}.${_patchver}
-revision=1
+revision=2
 wrksrc=${pkgname}-${_majorver}-${_patchver}
 build_style=gnu-configure
 configure_args="--without-autotrace --with-wmf=yes