update by lilac

2 files changed, 13 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a336f1b606b2..6ddfd2b826c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = imagemagick-fftw
 	pkgdesc = An image viewing/manipulation program
-	pkgver = 7.0.8.55
+	pkgver = 7.0.8.56
 	pkgrel = 1
 	url = https://www.imagemagick.org/
 	arch = x86_64
@@ -29,15 +29,13 @@ pkgbase = imagemagick-fftw
 	makedepends = libraqm
 	makedepends = libpng
 	makedepends = fftw
-	source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-55.tar.xz
-	source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-55.tar.xz.asc
+	source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-56.tar.xz
+	source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-56.tar.xz.asc
 	source = arch-fonts.diff
-	source = IM7-GS-policy.patch
 	validpgpkeys = D8272EF51DA223E4D05B466989AB63D48277377A
-	sha256sums = 2ae7274fddbf65c4e084d3c0c87a0b1270b34f978d5358d5a54f1b3dae5ec152
+	sha256sums = b1f32fed2bf0a28a7553f7ac1afc86d02ee35587408d2a89916e3072d9f8d532
 	sha256sums = SKIP
 	sha256sums = a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73
-	sha256sums = f20c09860da65a4259ec9627ceeca7d993949b7460fa199c5ffd874633814cf6
 
 pkgname = imagemagick-fftw
 	depends = libltdl
@@ -62,7 +60,7 @@ pkgname = imagemagick-fftw
 	optdepends = imagemagick-doc: manual and API docs
 	provides = libmagick
 	provides = libmagick-fftw
-	provides = imagemagick=7.0.8.55
+	provides = imagemagick=7.0.8.56
 	conflicts = imagemagick6
 	conflicts = imagemagick
 	replaces = libmagick-fftw
diff --git a/PKGBUILD b/PKGBUILD
index dc7149989c58..8986cb3eb95a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=imagemagick-fftw
 pkgname=(imagemagick-fftw)
-pkgver=7.0.8.55
+pkgver=7.0.8.56
 pkgrel=1
 pkgdesc="An image viewing/manipulation program"
 url="https://www.imagemagick.org/"
@@ -15,11 +15,10 @@ checkdepends=(gsfonts ttf-dejavu)
 _relname=ImageMagick-${pkgver%%.*}
 _tarname=ImageMagick-${pkgver%.*}-${pkgver##*.}
 source=(https://www.imagemagick.org/download/releases/$_tarname.tar.xz{,.asc}
-        arch-fonts.diff IM7-GS-policy.patch)
-sha256sums=('2ae7274fddbf65c4e084d3c0c87a0b1270b34f978d5358d5a54f1b3dae5ec152'
+        arch-fonts.diff)
+sha256sums=('b1f32fed2bf0a28a7553f7ac1afc86d02ee35587408d2a89916e3072d9f8d532'
             'SKIP'
-            'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73'
-            'f20c09860da65a4259ec9627ceeca7d993949b7460fa199c5ffd874633814cf6')
+            'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73')
 validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A)  # Lexie Parsimoniae
 
 shopt -s extglob
@@ -31,9 +30,6 @@ prepare() {
 
   # Fix up typemaps to match our packages, where possible
   patch -p1 -i ../arch-fonts.diff
-
-  # Work around ghostscript security issues https://bugs.archlinux.org/task/59778
-  patch -p1 -i ../IM7-GS-policy.patch
 }
 
 build() {
@@ -48,7 +44,7 @@ build() {
     PCLDelegate=/usr/bin/gpcl6 \
     --enable-hdri \
     --enable-opencl \
-    --with-gslib \
+    --without-gslib \
     --with-lqr \
     --with-modules \
     --with-openexr \
@@ -73,7 +69,6 @@ build() {
 check() (
   cd $_tarname
   ulimit -n 4096
-  sed -e '/validate-formats/d' -i Makefile # these fail due to the security patch
   make check
 )
 
@@ -108,5 +103,8 @@ package_imagemagick-fftw() {
 
 # Split docs
   mv "$pkgdir/usr/share/doc" "$srcdir/docpkg/usr/share/"
+
+# Harden security policy https://bugs.archlinux.org/task/62785
+  sed -e '/<\/policymap>/i \ \ <policy domain="delegate" rights="none" pattern="gs" \/>' -i "$pkgdir"/etc/ImageMagick-7/policy.xml
 }