Update to version 7.0.8.56

3 files changed, 11 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 070f1d85bcf2..4a8d61b52ed3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lib32-imagemagick
 	pkgdesc = An image viewing/manipulation program (32-bit)
-	pkgver = 7.0.8.53
+	pkgver = 7.0.8.56
 	pkgrel = 1
 	url = https://www.imagemagick.org/
 	arch = x86_64
@@ -24,15 +24,13 @@ pkgbase = lib32-imagemagick
 	depends = lib32-openexr
 	depends = lib32-openjpeg2
 	depends = imagemagick
-	source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-53.tar.xz
-	source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-53.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 = 6b4ec4ebc1a164493150dfffda258f0c4fdc092fdb354f9b3a8a13c2dae2c91f
+	sha256sums = b1f32fed2bf0a28a7553f7ac1afc86d02ee35587408d2a89916e3072d9f8d532
 	sha256sums = SKIP
 	sha256sums = a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73
-	sha256sums = f20c09860da65a4259ec9627ceeca7d993949b7460fa199c5ffd874633814cf6
 
 pkgname = lib32-imagemagick
 
diff --git a/IM7-GS-policy.patch b/IM7-GS-policy.patch
deleted file mode 100644
index fb371bdcbe29..000000000000
--- a/IM7-GS-policy.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ImageMagick-7.0.8-13/config/policy.xml.orig	2018-10-22 15:13:51.713995553 +0000
-+++ ImageMagick-7.0.8-13/config/policy.xml	2018-10-22 15:14:22.650737457 +0000
-@@ -68,6 +68,7 @@
-   <!-- <policy domain="resource" name="throttle" value="0"/> -->
-   <!-- <policy domain="resource" name="time" value="3600"/> -->
-   <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
-+  <policy domain="coder" rights="none" pattern="{PS,PS2,PS3,EPS,PDF,XPS}" />
-   <!-- <policy domain="module" rights="none" pattern="{PS,PDF,XPS}" /> -->
-   <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
-   <!-- <policy domain="path" rights="none" pattern="@*" /> -->
diff --git a/PKGBUILD b/PKGBUILD
index d9770bc3c803..76b4edec2963 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _basename=imagemagick
 pkgname=lib32-imagemagick
-pkgver=7.0.8.53
+pkgver=7.0.8.56
 pkgrel=1
 pkgdesc="An image viewing/manipulation program (32-bit)"
 url="https://www.imagemagick.org/"
@@ -16,12 +16,10 @@ checkdepends=(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=('6b4ec4ebc1a164493150dfffda258f0c4fdc092fdb354f9b3a8a13c2dae2c91f'
+        arch-fonts.diff)
+sha256sums=('b1f32fed2bf0a28a7553f7ac1afc86d02ee35587408d2a89916e3072d9f8d532'
             'SKIP'
-            'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73'
-            'f20c09860da65a4259ec9627ceeca7d993949b7460fa199c5ffd874633814cf6')
+            'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73')
 validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A)  # Lexie Parsimoniae
 
 shopt -s extglob
@@ -31,9 +29,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() {
@@ -55,7 +50,7 @@ build() {
         PCLDelegate=/usr/bin/gpcl6 \
         --enable-hdri \
         --enable-opencl \
-        --with-gslib \
+        --without-gslib \
         --with-lqr \
         --with-modules \
         --with-openexr \
@@ -80,6 +75,8 @@ build() {
 check() {
     cd $_tarname
 
+    ulimit -n 4096
+
     make -k check || :
 }