Mon Oct 3 12:55:13 2022 UTC ()
ImageMagick, p5-PerlMagick: update to 7.1.0.49

Upstream provides no summaries any longer, just lists of commits, see
https://github.com/ImageMagick/Website/blob/main/ChangeLog.md


(wiz)
diff -r1.306 -r1.307 pkgsrc/graphics/ImageMagick/Makefile
diff -r1.258 -r1.259 pkgsrc/graphics/ImageMagick/Makefile.common
diff -r1.278 -r1.279 pkgsrc/graphics/ImageMagick/distinfo
diff -r1.11 -r1.12 pkgsrc/graphics/ImageMagick/patches/patch-config_policy.xml
diff -r1.174 -r1.175 pkgsrc/graphics/p5-PerlMagick/Makefile
cvs diff -r1.306 -r1.307 pkgsrc/graphics/ImageMagick/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/Makefile 2022/07/14 23:46:20 1.306
+++ pkgsrc/graphics/ImageMagick/Makefile 2022/10/03 12:55:13 1.307
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.306 2022/07/14 23:46:20 dholland Exp $ 1# $NetBSD: Makefile,v 1.307 2022/10/03 12:55:13 wiz Exp $
2 2
3PKGREVISION= 2 
4.include "Makefile.common" 3.include "Makefile.common"
5 4
6PKGNAME= ImageMagick-${DISTVERSION} 5PKGNAME= ImageMagick-${DISTVERSION}
7 6
8MAINTAINER= adam@NetBSD.org 7MAINTAINER= adam@NetBSD.org
9COMMENT= Package for display and non-interactive manipulation of images 8COMMENT= Package for display and non-interactive manipulation of images
10 9
11CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate' 10CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate'
12 11
13USE_LANGUAGES= c c++ c99 12USE_LANGUAGES= c c++ c99
14USE_TOOLS+= gmake pkg-config:run 13USE_TOOLS+= gmake pkg-config:run
15CONFIGURE_ARGS+= --disable-assert 14CONFIGURE_ARGS+= --disable-assert
16CONFIGURE_ARGS+= --with-fontconfig 15CONFIGURE_ARGS+= --with-fontconfig
cvs diff -r1.258 -r1.259 pkgsrc/graphics/ImageMagick/Makefile.common (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/Makefile.common 2022/09/30 07:31:00 1.258
+++ pkgsrc/graphics/ImageMagick/Makefile.common 2022/10/03 12:55:13 1.259
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile.common,v 1.258 2022/09/30 07:31:00 nros Exp $ 1# $NetBSD: Makefile.common,v 1.259 2022/10/03 12:55:13 wiz Exp $
2# 2#
3# used by graphics/p5-PerlMagick/Makefile 3# used by graphics/p5-PerlMagick/Makefile
4# 4#
5# Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md 5# Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md
6 6
7IM_MAJOR_VER= 7.1.0 7IM_MAJOR_VER= 7.1.0
8IM_MINOR_VER= 37 8IM_MINOR_VER= 49
9IM_MAJOR_LIB_VER= 7 9IM_MAJOR_LIB_VER= 7
10 10
11.if (${IM_MINOR_VER} != NONE) 11.if (${IM_MINOR_VER} != NONE)
12DISTSUFFIX= ${IM_MAJOR_VER}-${IM_MINOR_VER} 12DISTSUFFIX= ${IM_MAJOR_VER}-${IM_MINOR_VER}
13.else 13.else
14DISTSUFFIX= ${IM_MAJOR_VER} 14DISTSUFFIX= ${IM_MAJOR_VER}
15.endif 15.endif
16 16
17DISTNAME= ImageMagick-${DISTSUFFIX} 17DISTNAME= ImageMagick-${DISTSUFFIX}
18DISTVERSION= ${DISTSUFFIX:S/-/./} 18DISTVERSION= ${DISTSUFFIX:S/-/./}
19 19
20CATEGORIES= graphics 20CATEGORIES= graphics
21MASTER_SITES= https://imagemagick.org/archive/releases/ 21MASTER_SITES= https://imagemagick.org/archive/releases/
cvs diff -r1.278 -r1.279 pkgsrc/graphics/ImageMagick/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/distinfo 2022/06/20 20:49:26 1.278
+++ pkgsrc/graphics/ImageMagick/distinfo 2022/10/03 12:55:13 1.279
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.278 2022/06/20 20:49:26 dholland Exp $ 1$NetBSD: distinfo,v 1.279 2022/10/03 12:55:13 wiz Exp $
2 2
3BLAKE2s (ImageMagick-7.1.0-37.tar.xz) = c03be05ebcb1c3cda0eee6963c745fd714a0d99a901fc4e9c10d7953d95936aa 3BLAKE2s (ImageMagick-7.1.0-49.tar.xz) = ee9e83035ad119d82ad4f5f05bbf5dbac516a28543bb217b1a774227fe1754c4
4SHA512 (ImageMagick-7.1.0-37.tar.xz) = 43f116a3a6bb9794b8c8440c57a537eab29b0dac7b8ace574e3cc1e6d484054557c9e44235eb799b843ef761c6f22d29ef959f6de6b80a45a3898bee4d2f16da 4SHA512 (ImageMagick-7.1.0-49.tar.xz) = 2f602dc26c8b159b3065f8920a3aa06fa0ef0d9d35ed4c86882b9a34477bc5ca66386a7c3495bbc44fa896bd2f10db9024eb5bc2bfb14420d7abe1af9b021841
5Size (ImageMagick-7.1.0-37.tar.xz) = 10345216 bytes 5Size (ImageMagick-7.1.0-49.tar.xz) = 10362492 bytes
6SHA1 (patch-config_policy.xml) = f8d130dcb1e81cd78a7856ca9b334f6ebf95c18f 6SHA1 (patch-config_policy.xml) = 0ae88934acb31681dc3cd7738075362ae2c17c10
7SHA1 (patch-ghostscript-private.h) = 98d88220cf8814f2e4841c382de5e2e9e0ae9287 7SHA1 (patch-ghostscript-private.h) = 98d88220cf8814f2e4841c382de5e2e9e0ae9287
cvs diff -r1.11 -r1.12 pkgsrc/graphics/ImageMagick/patches/patch-config_policy.xml (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/patches/patch-config_policy.xml 2022/04/25 09:26:14 1.11
+++ pkgsrc/graphics/ImageMagick/patches/patch-config_policy.xml 2022/10/03 12:55:13 1.12
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-config_policy.xml,v 1.11 2022/04/25 09:26:14 wiz Exp $ 1$NetBSD: patch-config_policy.xml,v 1.12 2022/10/03 12:55:13 wiz 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 2022-04-23 13:47:41.000000000 +0000 8--- config/policy.xml.orig 2022-09-24 14:42:19.000000000 +0000
9+++ config/policy.xml 9+++ config/policy.xml
10@@ -76,6 +76,30 @@ 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" />
@@ -25,16 +25,16 @@ http://mail-index.netbsd.org/tech-pkg/20 @@ -25,16 +25,16 @@ http://mail-index.netbsd.org/tech-pkg/20
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+ <!-- breaks deforaos-icon-theme package --> 30+ <!-- breaks deforaos-icon-theme package -->
31+ <!--<policy domain="coder" rights="none" pattern="MVG" />--> 31+ <!--<policy domain="coder" rights="none" pattern="MVG" />-->
32+ <policy domain="coder" rights="none" pattern="MSL" /> 32+ <policy domain="coder" rights="none" pattern="MSL" />
33+ <policy domain="coder" rights="none" pattern="TEXT" /> 33+ <policy domain="coder" rights="none" pattern="TEXT" />
34+ <policy domain="coder" rights="none" pattern="SHOW" /> 34+ <policy domain="coder" rights="none" pattern="SHOW" />
35+ <policy domain="coder" rights="none" pattern="WIN" /> 35+ <policy domain="coder" rights="none" pattern="WIN" />
36+ <policy domain="coder" rights="none" pattern="PLT" /> 36+ <policy domain="coder" rights="none" pattern="PLT" />
37+ 37+
38 <!-- <policy domain="system" name="shred" value="2"/> --> 38 <!-- <policy domain="cache" name="synchronize" value="true"/> -->
 39 <!-- <policy domain="system" name="shred" value="1"/> -->
39 <!-- <policy domain="system" name="font" value="/path/to/unicode-font.ttf"/> --> 40 <!-- <policy domain="system" name="font" value="/path/to/unicode-font.ttf"/> -->
40 <policy domain="system" name="precision" value="6"/> 
cvs diff -r1.174 -r1.175 pkgsrc/graphics/p5-PerlMagick/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/p5-PerlMagick/Makefile 2022/06/28 11:34:06 1.174
+++ pkgsrc/graphics/p5-PerlMagick/Makefile 2022/10/03 12:55:13 1.175
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.174 2022/06/28 11:34:06 wiz Exp $ 1# $NetBSD: Makefile,v 1.175 2022/10/03 12:55:13 wiz Exp $
2 2
3PKGREVISION= 1 
4.include "../../graphics/ImageMagick/Makefile.common" 3.include "../../graphics/ImageMagick/Makefile.common"
5 4
6PKGNAME= p5-PerlMagick-${DISTVERSION} 5PKGNAME= p5-PerlMagick-${DISTVERSION}
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://imagemagick.org/script/perl-magick.php 8HOMEPAGE= https://imagemagick.org/script/perl-magick.php
10COMMENT= Object-oriented Perl interface to ImageMagick 9COMMENT= Object-oriented Perl interface to ImageMagick
11 10
12DISTINFO_FILE= ${.CURDIR}/../../graphics/ImageMagick/distinfo 11DISTINFO_FILE= ${.CURDIR}/../../graphics/ImageMagick/distinfo
13#PATCHDIR= ${.CURDIR}/../../graphics/ImageMagick/patches 12#PATCHDIR= ${.CURDIR}/../../graphics/ImageMagick/patches
14 13
15# Some configure_args come from Makefile.common 14# Some configure_args come from Makefile.common
16CONFIGURE_ARGS+= --with-perl=${PERL5:Q} 15CONFIGURE_ARGS+= --with-perl=${PERL5:Q}