Tue May 4 14:31:57 2021 UTC ()
ImageMagick: fix deforaos-icon-theme package


(nia)
diff -r1.289 -r1.290 pkgsrc/graphics/ImageMagick/Makefile
diff -r1.250 -r1.251 pkgsrc/graphics/ImageMagick/distinfo
diff -r1.9 -r1.10 pkgsrc/graphics/ImageMagick/patches/patch-config_policy.xml
cvs diff -r1.289 -r1.290 pkgsrc/graphics/ImageMagick/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/Makefile 2021/04/30 12:34:17 1.289
+++ pkgsrc/graphics/ImageMagick/Makefile 2021/05/04 14:31:57 1.290
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1# $NetBSD: Makefile,v 1.289 2021/04/30 12:34:17 triaxx Exp $ 1# $NetBSD: Makefile,v 1.290 2021/05/04 14:31:57 nia Exp $
 2
 3PKGREVISION= 1
2 4
3.include "Makefile.common" 5.include "Makefile.common"
4 6
5PKGNAME= ImageMagick-${DISTVERSION} 7PKGNAME= ImageMagick-${DISTVERSION}
6 8
7MAINTAINER= adam@NetBSD.org 9MAINTAINER= adam@NetBSD.org
8COMMENT= Package for display and non-interactive manipulation of images 10COMMENT= Package for display and non-interactive manipulation of images
9 11
10CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate' 12CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate'
11 13
12USE_LANGUAGES= c c++ c99 14USE_LANGUAGES= c c++ c99
13USE_TOOLS+= gmake pkg-config:run 15USE_TOOLS+= gmake pkg-config:run
14CONFIGURE_ARGS+= --disable-assert 16CONFIGURE_ARGS+= --disable-assert
cvs diff -r1.250 -r1.251 pkgsrc/graphics/ImageMagick/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/distinfo 2021/04/30 12:34:17 1.250
+++ pkgsrc/graphics/ImageMagick/distinfo 2021/05/04 14:31:57 1.251
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.250 2021/04/30 12:34:17 triaxx Exp $ 1$NetBSD: distinfo,v 1.251 2021/05/04 14:31:57 nia Exp $
2 2
3SHA1 (ImageMagick-7.0.11-10.tar.xz) = 64afbb13daae48552b9b11a5e62c37167da05e31 3SHA1 (ImageMagick-7.0.11-10.tar.xz) = 64afbb13daae48552b9b11a5e62c37167da05e31
4RMD160 (ImageMagick-7.0.11-10.tar.xz) = c0c8e0035da4c6ad0ca75d13cbe3a8d5da12d8bc 4RMD160 (ImageMagick-7.0.11-10.tar.xz) = c0c8e0035da4c6ad0ca75d13cbe3a8d5da12d8bc
5SHA512 (ImageMagick-7.0.11-10.tar.xz) = a92a8a65ab7503edada45da9c34488deb79c00d005afcc85a17365fd76c83a174a7213bea4bd072f1125f2342722cb067ffa1513f6530db9608cb6dcff4f68d1 5SHA512 (ImageMagick-7.0.11-10.tar.xz) = a92a8a65ab7503edada45da9c34488deb79c00d005afcc85a17365fd76c83a174a7213bea4bd072f1125f2342722cb067ffa1513f6530db9608cb6dcff4f68d1
6Size (ImageMagick-7.0.11-10.tar.xz) = 10280304 bytes 6Size (ImageMagick-7.0.11-10.tar.xz) = 10280304 bytes
7SHA1 (patch-config_policy.xml) = 492aa9fa410dbbbded377fbcf06675f32224e5d8 7SHA1 (patch-config_policy.xml) = 2f2c5e9f0370cfbbf8ca91caef030eedfb2b6715
cvs diff -r1.9 -r1.10 pkgsrc/graphics/ImageMagick/patches/patch-config_policy.xml (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/patches/patch-config_policy.xml 2021/04/23 07:23:29 1.9
+++ pkgsrc/graphics/ImageMagick/patches/patch-config_policy.xml 2021/05/04 14:31:57 1.10
@@ -1,39 +1,40 @@ @@ -1,39 +1,40 @@
1$NetBSD: patch-config_policy.xml,v 1.9 2021/04/23 07:23:29 nia Exp $ 1$NetBSD: patch-config_policy.xml,v 1.10 2021/05/04 14:31:57 nia Exp $
2 2
3Update default policies for better resistance to untrusted input. 3Update default policies for better resistance to untrusted input.
4 4
5Discussion: 5Discussion:
6http://mail-index.netbsd.org/tech-pkg/2021/04/03/msg024740.html 6http://mail-index.netbsd.org/tech-pkg/2021/04/03/msg024740.html
7 7
8--- config/policy.xml.orig 2021-04-17 15:26:24.000000000 +0000 8--- config/policy.xml.orig 2021-04-29 02:01:58.000000000 +0000
9+++ config/policy.xml 9+++ config/policy.xml
10@@ -76,6 +76,29 @@ 10@@ -76,6 +76,30 @@
11 <!-- <policy domain="cache" name="synchronize" value="True"/> --> 11 <!-- <policy domain="cache" name="synchronize" value="True"/> -->
12 <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> --> 12 <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> -->
13 <!-- <policy domain="system" name="max-memory-request" value="256MiB"/> --> 13 <!-- <policy domain="system" name="max-memory-request" value="256MiB"/> -->
14+ 14+
15+ <!--  15+ <!--
16+ -- Disable ghostscript decoders as suggested by VU#332928 16+ -- Disable ghostscript decoders as suggested by VU#332928
17+ -- <https://www.kb.cert.org/vuls/id/332928> 17+ -- <https://www.kb.cert.org/vuls/id/332928>
18+ --> 18+ -->
19+ <policy domain="coder" rights="write" pattern="PS" /> 19+ <policy domain="coder" rights="write" pattern="PS" />
20+ <policy domain="coder" rights="write" pattern="PS2" /> 20+ <policy domain="coder" rights="write" pattern="PS2" />
21+ <policy domain="coder" rights="write" pattern="PS3" /> 21+ <policy domain="coder" rights="write" pattern="PS3" />
22+ <policy domain="coder" rights="write" pattern="EPS" /> 22+ <policy domain="coder" rights="write" pattern="EPS" />
23+ <policy domain="coder" rights="write" pattern="PDF" /> 23+ <policy domain="coder" rights="write" pattern="PDF" />
24+ <policy domain="coder" rights="write" pattern="XPS" /> 24+ <policy domain="coder" rights="write" pattern="XPS" />
25+ 25+
26+ <!-- Recommended policies from <https://imagetragick.com/> --> 26+ <!-- Recommended policies from <https://imagetragick.com/> -->
27+ <policy domain="coder" rights="none" pattern="EPHEMERAL" /> 27+ <policy domain="coder" rights="none" pattern="EPHEMERAL" />
28+ <policy domain="coder" rights="none" pattern="URL" /> 28+ <policy domain="coder" rights="none" pattern="URL" />
29+ <policy domain="coder" rights="none" pattern="HTTPS" /> 29+ <policy domain="coder" rights="none" pattern="HTTPS" />
30+ <policy domain="coder" rights="none" pattern="MVG" /> 30+ <!-- breaks deforaos-icon-theme package -->
 31+ <!--<policy domain="coder" rights="none" pattern="MVG" />-->
31+ <policy domain="coder" rights="none" pattern="MSL" /> 32+ <policy domain="coder" rights="none" pattern="MSL" />
32+ <policy domain="coder" rights="none" pattern="TEXT" /> 33+ <policy domain="coder" rights="none" pattern="TEXT" />
33+ <policy domain="coder" rights="none" pattern="SHOW" /> 34+ <policy domain="coder" rights="none" pattern="SHOW" />
34+ <policy domain="coder" rights="none" pattern="WIN" /> 35+ <policy domain="coder" rights="none" pattern="WIN" />
35+ <policy domain="coder" rights="none" pattern="PLT" /> 36+ <policy domain="coder" rights="none" pattern="PLT" />
36+ 37+
37 <!-- <policy domain="system" name="shred" value="2"/> --> 38 <!-- <policy domain="system" name="shred" value="2"/> -->
38 <!-- <policy domain="system" name="precision" value="6"/> --> 39 <!-- <policy domain="system" name="precision" value="6"/> -->
39 <!-- <policy domain="system" name="font" value="/path/to/unicode-font.ttf"/> --> 40 <!-- <policy domain="system" name="font" value="/path/to/unicode-font.ttf"/> -->