CVS commit: pkgsrc/graphics/ImageMagick

["Thomas Merkel" <tm%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tm
Date:           Mon Jun  8 10:23:19 UTC 2020

Modified Files:
        pkgsrc/graphics/ImageMagick: distinfo
Added Files:
        pkgsrc/graphics/ImageMagick/patches: patch-config_policy.xml

Log Message:
ImageMagick: restore policy.xml

After some short discussion, we will keep the policy.xml patch for now.


To generate a diff of this commit:
cvs rdiff -u -r1.227 -r1.228 pkgsrc/graphics/ImageMagick/distinfo
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/graphics/ImageMagick/patches/patch-config_policy.xml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/ImageMagick/distinfo
diff -u pkgsrc/graphics/ImageMagick/distinfo:1.227 pkgsrc/graphics/ImageMagick/distinfo:1.228
--- pkgsrc/graphics/ImageMagick/distinfo:1.227  Mon Jun  8 07:56:06 2020
+++ pkgsrc/graphics/ImageMagick/distinfo        Mon Jun  8 10:23:18 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.227 2020/06/08 07:56:06 tm Exp $
+$NetBSD: distinfo,v 1.228 2020/06/08 10:23:18 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

Added files:

Index: pkgsrc/graphics/ImageMagick/patches/patch-config_policy.xml
diff -u /dev/null pkgsrc/graphics/ImageMagick/patches/patch-config_policy.xml:1.4
--- /dev/null   Mon Jun  8 10:23:19 2020
+++ pkgsrc/graphics/ImageMagick/patches/patch-config_policy.xml Mon Jun  8 10:23:18 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-config_policy.xml,v 1.4 2020/06/08 10:23:18 tm 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>