summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortm <tm@pkgsrc.org>2020-06-08 07:56:06 +0000
committertm <tm@pkgsrc.org>2020-06-08 07:56:06 +0000
commit99dcfdf6981fd3e9c96d157aa119d476f28683b9 (patch)
tree9e553486c41d2a575501bac1b2d427a8f186d605
parent70e4852c5b6e76cffa015638b28e28ebfb03331b (diff)
downloadpkgsrc-99dcfdf6981fd3e9c96d157aa119d476f28683b9.tar.gz
ImageMagick: remove policy.xml because it's no longer required
Remove no longer required security fix in policy.xml because we already provide a fixed version of GhostScript and ImageMagick.
-rw-r--r--graphics/ImageMagick/distinfo3
-rw-r--r--graphics/ImageMagick/patches/patch-config_policy.xml24
2 files changed, 1 insertions, 26 deletions
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 81448024e7e..1a70706ecc0 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.226 2020/05/19 13:34:54 nia Exp $
+$NetBSD: distinfo,v 1.227 2020/06/08 07:56:06 tm Exp $
SHA1 (ImageMagick-7.0.10-13.tar.xz) = ce1792a35b487e3d7fa86d3e3f1ea7a60f79b7b7
RMD160 (ImageMagick-7.0.10-13.tar.xz) = 91ddcc971aa0089862ca058918566f6d1c9702e8
SHA512 (ImageMagick-7.0.10-13.tar.xz) = 0f688e9dd2edb78572114b6efd29b2220b050737d2a66a2ad37cf5a08f21501d07015ead9643ce270c3b285f4ff36d709e805f85febb2c938f73fe2dc0502748
Size (ImageMagick-7.0.10-13.tar.xz) = 9691740 bytes
-SHA1 (patch-config_policy.xml) = 2c446a00fc00f85ab33eae0691d4d8989a46289f
diff --git a/graphics/ImageMagick/patches/patch-config_policy.xml b/graphics/ImageMagick/patches/patch-config_policy.xml
deleted file mode 100644
index 55d01201bd9..00000000000
--- a/graphics/ImageMagick/patches/patch-config_policy.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-config_policy.xml,v 1.2 2018/08/23 14:52:22 leot Exp $
-
-Disable ghostscript coders by default to workaround VU#332928:
-<https://www.kb.cert.org/vuls/id/332928>
-
---- config/policy.xml.orig 2018-08-13 11:05:28.000000000 +0000
-+++ config/policy.xml
-@@ -74,4 +74,16 @@
- <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
- <!-- <policy domain="cache" name="synchronize" value="True"/> -->
- <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> -->
-+
-+ <!--
-+ -- Disable ghostscript coders as suggested by VU#332928
-+ -- <https://www.kb.cert.org/vuls/id/332928>
-+ -->
-+ <policy domain="coder" rights="none" pattern="PS" />
-+ <policy domain="coder" rights="none" pattern="PS2" />
-+ <policy domain="coder" rights="none" pattern="PS3" />
-+ <policy domain="coder" rights="none" pattern="EPS" />
-+ <policy domain="coder" rights="none" pattern="PDF" />
-+ <policy domain="coder" rights="none" pattern="XPS" />
-+
- </policymap>