aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2016-05-15 19:14:02 +0000
committerKoop Mast <kwm@FreeBSD.org>2016-05-15 19:14:02 +0000
commit9386bbfbdf11c3a69b45c4be74197a28f08c9e3c (patch)
tree34197e4455ecc43c739ba001d0b6428dfd1e1aab /graphics
parent8fd78c868d6e9cc13377cd5a5f1d5739af3c014e (diff)
downloadports-9386bbfbdf11c3a69b45c4be74197a28f08c9e3c.tar.gz
ports-9386bbfbdf11c3a69b45c4be74197a28f08c9e3c.zip
MFH: r415108
Update ImageMagick7 to 7.0.1.3. Remove the delegate patch since it done in IM now. Security: 82b702e0-1907-11e6-857b-00221503d280 Approved by: ports-secteam (feld@)
Notes
Notes: svn path=/branches/2016Q2/; revision=415280
Diffstat (limited to 'graphics')
-rw-r--r--graphics/ImageMagick7/Makefile3
-rw-r--r--graphics/ImageMagick7/distinfo4
-rw-r--r--graphics/ImageMagick7/files/patch-config_delegates.xml.in10
-rw-r--r--graphics/ImageMagick7/files/patch-config_policy.xml10
4 files changed, 8 insertions, 19 deletions
diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index 649ef90f416e..772636ce1699 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ImageMagick
-DISTVERSION= 7.0.1-0
-PORTREVISION= 1
+DISTVERSION= 7.0.1-3
CATEGORIES= graphics perl5
MASTER_SITES= http://www.imagemagick.org/download/ \
http://www.imagemagick.org/download/legacy/ \
diff --git a/graphics/ImageMagick7/distinfo b/graphics/ImageMagick7/distinfo
index 278b45571116..55a81bb45dde 100644
--- a/graphics/ImageMagick7/distinfo
+++ b/graphics/ImageMagick7/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ImageMagick-7.0.1-0.tar.xz) = bd15aaef2aa2393b3d62b821f5752d5f4066a90d3b0d9259d93217ad47c056d9
-SIZE (ImageMagick-7.0.1-0.tar.xz) = 8288172
+SHA256 (ImageMagick-7.0.1-3.tar.xz) = 4f5a39f145bb0326f811e0826a9216b8c449ee4485550aa8c2e7cfdaf26f08a0
+SIZE (ImageMagick-7.0.1-3.tar.xz) = 8286332
diff --git a/graphics/ImageMagick7/files/patch-config_delegates.xml.in b/graphics/ImageMagick7/files/patch-config_delegates.xml.in
deleted file mode 100644
index c269fb5771f6..000000000000
--- a/graphics/ImageMagick7/files/patch-config_delegates.xml.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/delegates.xml.in.orig 2016-05-03 23:33:12.300197000 +0200
-+++ config/delegates.xml.in 2016-05-03 23:33:29.641438000 +0200
-@@ -90,7 +90,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.pnm&quot;; mv &quot;%i.jxr&quot; &quot;%i&quot;; mv &quot;%o.pnm&quot; &quot;%o&quot;"/>
- <delegate decode="man" command="&quot;@MANDelegate@&quot; -man -Tps &quot;%i&quot; &gt; &quot;%o&quot;"/>
diff --git a/graphics/ImageMagick7/files/patch-config_policy.xml b/graphics/ImageMagick7/files/patch-config_policy.xml
index 171053813054..2a285225c948 100644
--- a/graphics/ImageMagick7/files/patch-config_policy.xml
+++ b/graphics/ImageMagick7/files/patch-config_policy.xml
@@ -1,8 +1,8 @@
---- 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"/> -->
+--- config/policy.xml.orig 2016-05-09 19:28:58.000000000 +0200
++++ config/policy.xml 2016-05-10 17:44:26.720503000 +0200
+@@ -64,4 +64,9 @@
+ <!-- <policy domain="coder" rights="none" pattern="HTTPS" /> -->
+ <!-- <policy domain="path" rights="none" pattern="@*" /> -->
<policy domain="cache" name="shared-secret" value="passphrase"/>
+ <policy domain="coder" rights="none" pattern="EPHEMERAL" />
+ <policy domain="coder" rights="none" pattern="URL" />