Mon Nov 9 11:39:47 2020 UTC ()
ImageMagick: update to 7.0.10.37.

2020-11-07  7.0.10-37  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.10-37 GIT revision 17780:47a8392ef:20201107

2020-11-07  7.0.10-37  <quetzlzacatenango@image...>
  * correct soversioning.

2020-11-07  7.0.10-36  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.10-36 GIT revision 17776:6bb35345c:20201107

2020-11-02  7.0.10-36  <quetzlzacatenango@image...>
  * check and report if profile is corrupt.
  * do not add entropy based on mkstemp() unique filename.

2020-10-31  7.0.10-35  <quetzlzacatenango@image...>
  * Release ImageMagick version 7.0.10-35 GIT revision 17762:df5df8489:20201031

2020-10-14  7.0.10-35  <quetzlzacatenango@image...>
  * Prefer ffmpeg over avconv.
  * Support median image statistic and median property.
  * Add -extend option to {display,animate,import}.


(wiz)
diff -r1.281 -r1.282 pkgsrc/graphics/ImageMagick/Makefile
diff -r1.219 -r1.220 pkgsrc/graphics/ImageMagick/Makefile.common
diff -r1.112 -r1.113 pkgsrc/graphics/ImageMagick/PLIST
diff -r1.236 -r1.237 pkgsrc/graphics/ImageMagick/distinfo
diff -r1.4 -r1.5 pkgsrc/graphics/ImageMagick/patches/patch-config_policy.xml
cvs diff -r1.281 -r1.282 pkgsrc/graphics/ImageMagick/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/Makefile 2020/11/05 09:06:53 1.281
+++ pkgsrc/graphics/ImageMagick/Makefile 2020/11/09 11:39:46 1.282
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.281 2020/11/05 09:06:53 ryoon Exp $ 1# $NetBSD: Makefile,v 1.282 2020/11/09 11:39:46 wiz Exp $
2 2
3PKGREVISION= 1 
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 interactive manipulation of images 8COMMENT= Package for display and 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.219 -r1.220 pkgsrc/graphics/ImageMagick/Makefile.common (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/Makefile.common 2020/10/14 16:15:37 1.219
+++ pkgsrc/graphics/ImageMagick/Makefile.common 2020/11/09 11:39:46 1.220
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.219 2020/10/14 16:15:37 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.220 2020/11/09 11:39:46 wiz Exp $
2# 2#
3# used by graphics/p5-PerlMagick/Makefile 3# used by graphics/p5-PerlMagick/Makefile
4 4
5IM_MAJOR_VER= 7.0.10 5IM_MAJOR_VER= 7.0.10
6IM_MINOR_VER= 34 6IM_MINOR_VER= 37
7IM_MAJOR_LIB_VER= 7 7IM_MAJOR_LIB_VER= 7
8 8
9.if (${IM_MINOR_VER} != NONE) 9.if (${IM_MINOR_VER} != NONE)
10DISTSUFFIX= ${IM_MAJOR_VER}-${IM_MINOR_VER} 10DISTSUFFIX= ${IM_MAJOR_VER}-${IM_MINOR_VER}
11.else 11.else
12DISTSUFFIX= ${IM_MAJOR_VER} 12DISTSUFFIX= ${IM_MAJOR_VER}
13.endif 13.endif
14 14
15DISTNAME= ImageMagick-${DISTSUFFIX} 15DISTNAME= ImageMagick-${DISTSUFFIX}
16DISTVERSION= ${DISTSUFFIX:S/-/./} 16DISTVERSION= ${DISTSUFFIX:S/-/./}
17 17
18CATEGORIES= graphics 18CATEGORIES= graphics
19MASTER_SITES= https://www.imagemagick.org/download/releases/ 19MASTER_SITES= https://www.imagemagick.org/download/releases/
cvs diff -r1.112 -r1.113 pkgsrc/graphics/ImageMagick/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/PLIST 2020/10/05 11:33:43 1.112
+++ pkgsrc/graphics/ImageMagick/PLIST 2020/11/09 11:39:46 1.113
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.112 2020/10/05 11:33:43 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.113 2020/11/09 11:39:46 wiz Exp $
2bin/Magick++-config 2bin/Magick++-config
3bin/MagickCore-config 3bin/MagickCore-config
4bin/MagickWand-config 4bin/MagickWand-config
5bin/animate 5bin/animate
6bin/compare 6bin/compare
7bin/composite 7bin/composite
8bin/conjure 8bin/conjure
9bin/convert 9bin/convert
10bin/display 10bin/display
11bin/identify 11bin/identify
12bin/import 12bin/import
13bin/magick 13bin/magick
14bin/magick-script 14bin/magick-script
@@ -346,27 +346,26 @@ share/doc/ImageMagick-7/www/Magick++/Typ @@ -346,27 +346,26 @@ share/doc/ImageMagick-7/www/Magick++/Typ
346share/doc/ImageMagick-7/www/Magick++/index.html 346share/doc/ImageMagick-7/www/Magick++/index.html
347share/doc/ImageMagick-7/www/Magick++/magick.css 347share/doc/ImageMagick-7/www/Magick++/magick.css
348share/doc/ImageMagick-7/www/Magick++/montage-sample-framed.jpg 348share/doc/ImageMagick-7/www/Magick++/montage-sample-framed.jpg
349share/doc/ImageMagick-7/www/Magick++/right_triangle.png 349share/doc/ImageMagick-7/www/Magick++/right_triangle.png
350share/doc/ImageMagick-7/www/Magick++/thumbnail-anatomy-framed.fig 350share/doc/ImageMagick-7/www/Magick++/thumbnail-anatomy-framed.fig
351share/doc/ImageMagick-7/www/Magick++/thumbnail-anatomy-framed.jpg 351share/doc/ImageMagick-7/www/Magick++/thumbnail-anatomy-framed.jpg
352share/doc/ImageMagick-7/www/Magick++/thumbnail-anatomy-plain.fig 352share/doc/ImageMagick-7/www/Magick++/thumbnail-anatomy-plain.fig
353share/doc/ImageMagick-7/www/Magick++/thumbnail-anatomy-plain.jpg 353share/doc/ImageMagick-7/www/Magick++/thumbnail-anatomy-plain.jpg
354share/doc/ImageMagick-7/www/Magick++/thumbnail-sample-framed.jpg 354share/doc/ImageMagick-7/www/Magick++/thumbnail-sample-framed.jpg
355share/doc/ImageMagick-7/www/Magick++/thumbnail-sample-plain.jpg 355share/doc/ImageMagick-7/www/Magick++/thumbnail-sample-plain.jpg
356share/doc/ImageMagick-7/www/advanced-unix-installation.html 356share/doc/ImageMagick-7/www/advanced-unix-installation.html
357share/doc/ImageMagick-7/www/advanced-windows-installation.html 357share/doc/ImageMagick-7/www/advanced-windows-installation.html
358share/doc/ImageMagick-7/www/animate.html 358share/doc/ImageMagick-7/www/animate.html
359share/doc/ImageMagick-7/www/api.html 
360share/doc/ImageMagick-7/www/api/Image++.html 359share/doc/ImageMagick-7/www/api/Image++.html
361share/doc/ImageMagick-7/www/api/MagickCore/ImageMagick_8h-source.html 360share/doc/ImageMagick-7/www/api/MagickCore/ImageMagick_8h-source.html
362share/doc/ImageMagick-7/www/api/MagickCore/ImageMagick_8h.html 361share/doc/ImageMagick-7/www/api/MagickCore/ImageMagick_8h.html
363share/doc/ImageMagick-7/www/api/MagickCore/MagickCore_8h-source.html 362share/doc/ImageMagick-7/www/api/MagickCore/MagickCore_8h-source.html
364share/doc/ImageMagick-7/www/api/MagickCore/MagickCore_8h.html 363share/doc/ImageMagick-7/www/api/MagickCore/MagickCore_8h.html
365share/doc/ImageMagick-7/www/api/MagickCore/PreRvIcccm_8c.html 364share/doc/ImageMagick-7/www/api/MagickCore/PreRvIcccm_8c.html
366share/doc/ImageMagick-7/www/api/MagickCore/PreRvIcccm_8h-source.html 365share/doc/ImageMagick-7/www/api/MagickCore/PreRvIcccm_8h-source.html
367share/doc/ImageMagick-7/www/api/MagickCore/PreRvIcccm_8h.html 366share/doc/ImageMagick-7/www/api/MagickCore/PreRvIcccm_8h.html
368share/doc/ImageMagick-7/www/api/MagickCore/animate-private_8h-source.html 367share/doc/ImageMagick-7/www/api/MagickCore/animate-private_8h-source.html
369share/doc/ImageMagick-7/www/api/MagickCore/animate-private_8h.html 368share/doc/ImageMagick-7/www/api/MagickCore/animate-private_8h.html
370share/doc/ImageMagick-7/www/api/MagickCore/animate_8c.html 369share/doc/ImageMagick-7/www/api/MagickCore/animate_8c.html
371share/doc/ImageMagick-7/www/api/MagickCore/animate_8h-source.html 370share/doc/ImageMagick-7/www/api/MagickCore/animate_8h-source.html
372share/doc/ImageMagick-7/www/api/MagickCore/animate_8h.html 371share/doc/ImageMagick-7/www/api/MagickCore/animate_8h.html
cvs diff -r1.236 -r1.237 pkgsrc/graphics/ImageMagick/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/distinfo 2020/10/14 16:15:37 1.236
+++ pkgsrc/graphics/ImageMagick/distinfo 2020/11/09 11:39:46 1.237
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.236 2020/10/14 16:15:37 wiz Exp $ 1$NetBSD: distinfo,v 1.237 2020/11/09 11:39:46 wiz Exp $
2 2
3SHA1 (ImageMagick-7.0.10-34.tar.xz) = 833b63c04473aa65b6d4ff667868cceae118509c 3SHA1 (ImageMagick-7.0.10-37.tar.xz) = fbbfdb77cbc78d3260cb15c8acd0b9588fe7f378
4RMD160 (ImageMagick-7.0.10-34.tar.xz) = 6494eb48f7f8fdc88324b0b7d8fee96f687abd75 4RMD160 (ImageMagick-7.0.10-37.tar.xz) = c61d4ed41569d27b61f15f0bfa20d9b07c39515d
5SHA512 (ImageMagick-7.0.10-34.tar.xz) = f3637c929d75bd1eff7845c7fb85ca58bb6e00f618f2c39883e7ea5e080e3fcbc3f5d5989935df17c5498ff11723e0362f684e77f5bcbbff30bb0b30208c23d3 5SHA512 (ImageMagick-7.0.10-37.tar.xz) = d4acc8a48752a564d5bec688029079a831992eaedd41215256fc97113c7f0268441cb6bcdf86bc4c2b8d63ff38798ebbd4c79b7fdad177141cf9550883cccd05
6Size (ImageMagick-7.0.10-34.tar.xz) = 9655368 bytes 6Size (ImageMagick-7.0.10-37.tar.xz) = 9654160 bytes
7SHA1 (patch-config_policy.xml) = 2c446a00fc00f85ab33eae0691d4d8989a46289f 7SHA1 (patch-config_policy.xml) = 5c90f58e84f84f5d9e80324e3f045f885706d523
cvs diff -r1.4 -r1.5 pkgsrc/graphics/ImageMagick/patches/patch-config_policy.xml (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/patches/patch-config_policy.xml 2020/06/08 10:23:18 1.4
+++ pkgsrc/graphics/ImageMagick/patches/patch-config_policy.xml 2020/11/09 11:39:46 1.5
@@ -1,24 +1,26 @@ @@ -1,24 +1,26 @@
1$NetBSD: patch-config_policy.xml,v 1.4 2020/06/08 10:23:18 tm Exp $ 1$NetBSD: patch-config_policy.xml,v 1.5 2020/11/09 11:39:46 wiz Exp $
2 2
3Disable ghostscript coders by default to workaround VU#332928: 3Disable ghostscript coders by default to workaround VU#332928:
4<https://www.kb.cert.org/vuls/id/332928> 4<https://www.kb.cert.org/vuls/id/332928>
5 5
6--- config/policy.xml.orig 2018-08-13 11:05:28.000000000 +0000 6--- config/policy.xml.orig 2020-11-07 19:03:18.000000000 +0000
7+++ config/policy.xml 7+++ config/policy.xml
8@@ -74,4 +74,16 @@ 8@@ -72,6 +72,18 @@
9 <!-- <policy domain="cache" name="memory-map" value="anonymous"/> --> 9 <!-- <policy domain="cache" name="max-memory-request" value="256MiB"/> -->
10 <!-- <policy domain="cache" name="synchronize" value="True"/> --> 10 <!-- <policy domain="cache" name="synchronize" value="True"/> -->
11 <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> --> 11 <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> -->
12+ 12+
13+ <!--  13+ <!--
14+ -- Disable ghostscript coders as suggested by VU#332928 14+ -- Disable ghostscript coders as suggested by VU#332928
15+ -- <https://www.kb.cert.org/vuls/id/332928> 15+ -- <https://www.kb.cert.org/vuls/id/332928>
16+ --> 16+ -->
17+ <policy domain="coder" rights="none" pattern="PS" /> 17+ <policy domain="coder" rights="none" pattern="PS" />
18+ <policy domain="coder" rights="none" pattern="PS2" /> 18+ <policy domain="coder" rights="none" pattern="PS2" />
19+ <policy domain="coder" rights="none" pattern="PS3" /> 19+ <policy domain="coder" rights="none" pattern="PS3" />
20+ <policy domain="coder" rights="none" pattern="EPS" /> 20+ <policy domain="coder" rights="none" pattern="EPS" />
21+ <policy domain="coder" rights="none" pattern="PDF" /> 21+ <policy domain="coder" rights="none" pattern="PDF" />
22+ <policy domain="coder" rights="none" pattern="XPS" /> 22+ <policy domain="coder" rights="none" pattern="XPS" />
23+ 23+
 24 <!-- <policy domain="system" name="shred" value="2"/> -->
 25 <!-- <policy domain="system" name="precision" value="6"/> -->
24 </policymap> 26 </policymap>