Pullup ticket #6368 - requested by wiz

graphics/ImageMagick: security fix

(via patch)

5 files changed, 19 insertions, 17 deletions

diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 7ce96dc0fcd..e47a96849b9 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.216 2020/09/20 08:39:06 wiz Exp $
+# $NetBSD: Makefile.common,v 1.216.2.1 2020/11/24 18:28:37 bsiegert Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile
 
 IM_MAJOR_VER=		7.0.10
-IM_MINOR_VER=		30
+IM_MINOR_VER=		37
 IM_MAJOR_LIB_VER=	7
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index 7e791e1ebc1..e3fefafa62b 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.111 2020/07/29 11:21:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.111.2.1 2020/11/24 18:28:37 bsiegert Exp $
 bin/Magick++-config
 bin/MagickCore-config
 bin/MagickWand-config
@@ -356,7 +356,6 @@ share/doc/ImageMagick-7/www/Magick++/thumbnail-sample-plain.jpg
 share/doc/ImageMagick-7/www/advanced-unix-installation.html
 share/doc/ImageMagick-7/www/advanced-windows-installation.html
 share/doc/ImageMagick-7/www/animate.html
-share/doc/ImageMagick-7/www/api.html
 share/doc/ImageMagick-7/www/api/Image++.html
 share/doc/ImageMagick-7/www/api/MagickCore/ImageMagick_8h-source.html
 share/doc/ImageMagick-7/www/api/MagickCore/ImageMagick_8h.html
@@ -1183,6 +1182,7 @@ share/doc/ImageMagick-7/www/mirror.html
 share/doc/ImageMagick-7/www/mogrify.html
 share/doc/ImageMagick-7/www/montage.html
 share/doc/ImageMagick-7/www/motion-picture.html
+share/doc/ImageMagick-7/www/news.html
 share/doc/ImageMagick-7/www/opencl.html
 share/doc/ImageMagick-7/www/openmp.html
 share/doc/ImageMagick-7/www/perl-magick.html
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index d99a97b5bc4..40787bfd20b 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.233 2020/09/20 08:39:06 wiz Exp $
+$NetBSD: distinfo,v 1.233.2.1 2020/11/24 18:28:37 bsiegert Exp $
 
-SHA1 (ImageMagick-7.0.10-30.tar.xz) = 659c54d28a34218c1fe740d7b9cd3837b8e9bce8
-RMD160 (ImageMagick-7.0.10-30.tar.xz) = 5405d64612f2e1a607ba2a8ffc8998443e666068
-SHA512 (ImageMagick-7.0.10-30.tar.xz) = 5e05e989c9752141c00e6329461aa1b8b11df7719473cded4ba47a0f7ee4d2e8f2c69f410fa3937920524cc0753863de796155badbce910b0a089c2af3be254d
-Size (ImageMagick-7.0.10-30.tar.xz) = 9653020 bytes
-SHA1 (patch-config_policy.xml) = 2c446a00fc00f85ab33eae0691d4d8989a46289f
+SHA1 (ImageMagick-7.0.10-37.tar.xz) = fbbfdb77cbc78d3260cb15c8acd0b9588fe7f378
+RMD160 (ImageMagick-7.0.10-37.tar.xz) = c61d4ed41569d27b61f15f0bfa20d9b07c39515d
+SHA512 (ImageMagick-7.0.10-37.tar.xz) = d4acc8a48752a564d5bec688029079a831992eaedd41215256fc97113c7f0268441cb6bcdf86bc4c2b8d63ff38798ebbd4c79b7fdad177141cf9550883cccd05
+Size (ImageMagick-7.0.10-37.tar.xz) = 9654160 bytes
+SHA1 (patch-config_policy.xml) = 5c90f58e84f84f5d9e80324e3f045f885706d523
diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk
index e91b5ca3afd..72aaab40898 100644
--- a/graphics/ImageMagick/options.mk
+++ b/graphics/ImageMagick/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2020/09/01 12:21:03 ryoon Exp $
+# $NetBSD: options.mk,v 1.21.2.1 2020/11/24 18:28:37 bsiegert Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.ImageMagick
 PKG_SUPPORTED_OPTIONS=		x11 jp2 djvu openexr wmf liblqr heif
@@ -52,7 +52,7 @@ CONFIGURE_ARGS+=	--without-wmf
 
 .if !empty(PKG_OPTIONS:Mheif)
 .include "../../graphics/libheif/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-heif
+CONFIGURE_ARGS+=	--with-heic
 .else
-CONFIGURE_ARGS+=	--without-heif
+CONFIGURE_ARGS+=	--without-heic
 .endif
diff --git a/graphics/ImageMagick/patches/patch-config_policy.xml b/graphics/ImageMagick/patches/patch-config_policy.xml
index d35870098e5..8880a544e06 100644
--- a/graphics/ImageMagick/patches/patch-config_policy.xml
+++ b/graphics/ImageMagick/patches/patch-config_policy.xml
@@ -1,12 +1,12 @@
-$NetBSD: patch-config_policy.xml,v 1.4 2020/06/08 10:23:18 tm Exp $
+$NetBSD: patch-config_policy.xml,v 1.4.4.1 2020/11/24 18:28:37 bsiegert 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.orig	2020-11-07 19:03:18.000000000 +0000
 +++ config/policy.xml
-@@ -74,4 +74,16 @@
-   <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
+@@ -72,6 +72,18 @@
+   <!-- <policy domain="cache" name="max-memory-request" value="256MiB"/> -->
    <!-- <policy domain="cache" name="synchronize" value="True"/> -->
    <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> -->
 +
@@ -21,4 +21,6 @@ Disable ghostscript coders by default to workaround VU#332928:
 +  <policy domain="coder" rights="none" pattern="PDF" />
 +  <policy domain="coder" rights="none" pattern="XPS" />
 +
+   <!-- <policy domain="system" name="shred" value="2"/> -->
+   <!-- <policy domain="system" name="precision" value="6"/> -->
  </policymap>