update by lilac

3 files changed, 15 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1f229c782727..18c68cba195d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = imagemagick-fftw
 	pkgdesc = An image viewing/manipulation program
-	pkgver = 7.0.8.13
+	pkgver = 7.0.8.14
 	pkgrel = 1
 	url = https://www.imagemagick.org/
 	arch = x86_64
@@ -32,15 +32,15 @@ pkgbase = imagemagick-fftw
 	depends = libraqm
 	depends = libpng
 	depends = libxml2
-	source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-13.tar.xz
-	source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-13.tar.xz.asc
+	source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-14.tar.xz
+	source = https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-14.tar.xz.asc
 	source = arch-fonts.diff
 	source = IM7-GS-policy.patch
 	validpgpkeys = D8272EF51DA223E4D05B466989AB63D48277377A
-	sha256sums = 1543ad705ef45cf490de8e8db913e13b1e7baea057036db69feb475467d66873
+	sha256sums = 70c3d8c800cfd0282c0e0d9930b83f472f9593a882adc77532aa82c0d7ca0bb1
 	sha256sums = SKIP
 	sha256sums = a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73
-	sha256sums = 70a5358fe0e33a4aed34a32cd32be6c9f38277de3560605d8e93f5d486d1e112
+	sha256sums = f20c09860da65a4259ec9627ceeca7d993949b7460fa199c5ffd874633814cf6
 
 pkgname = libmagick-fftw
 	pkgdesc = An image viewing/manipulation program (library)
@@ -55,7 +55,7 @@ pkgname = libmagick-fftw
 	optdepends = openexr: OpenEXR support
 	optdepends = openjpeg2: JPEG2000 support
 	optdepends = pango: Text rendering
-	provides = libmagick=7.0.8.13
+	provides = libmagick=7.0.8.14
 	conflicts = libmagick
 	options = !emptydirs
 	options = libtool
@@ -73,9 +73,9 @@ pkgname = libmagick-fftw
 	backup = etc/ImageMagick-7/type-ghostscript.xml
 
 pkgname = imagemagick-fftw
-	depends = libmagick-fftw=7.0.8.13-1
+	depends = libmagick-fftw=7.0.8.14-1
 	optdepends = imagemagick-doc: manual and API docs
-	provides = imagemagick=7.0.8.13
+	provides = imagemagick=7.0.8.14
 	conflicts = imagemagick
 	options = !emptydirs
 
diff --git a/IM7-GS-policy.patch b/IM7-GS-policy.patch
index 2f79603cc082..fb371bdcbe29 100644
--- a/IM7-GS-policy.patch
+++ b/IM7-GS-policy.patch
@@ -1,11 +1,10 @@
 --- 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,7 +68,7 @@
-   <!-- <policy domain="resource" name="thread" value="4"/> -->
+@@ -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="{MVG,PS,PS2,PS3,EPS,PDF,XPS}" /> -->
+   <!-- <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 d662ee107714..fee2000fd24f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=imagemagick-fftw
 pkgname=(libmagick-fftw imagemagick-fftw)
-pkgver=7.0.8.13
+pkgver=7.0.8.14
 pkgrel=1
 pkgdesc="An image viewing/manipulation program"
 url="https://www.imagemagick.org/"
@@ -16,10 +16,10 @@ _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=('1543ad705ef45cf490de8e8db913e13b1e7baea057036db69feb475467d66873'
+sha256sums=('70c3d8c800cfd0282c0e0d9930b83f472f9593a882adc77532aa82c0d7ca0bb1'
             'SKIP'
             'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73'
-            '70a5358fe0e33a4aed34a32cd32be6c9f38277de3560605d8e93f5d486d1e112')
+            'f20c09860da65a4259ec9627ceeca7d993949b7460fa199c5ffd874633814cf6')
 validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A)  # Lexie Parsimoniae
 
 shopt -s extglob
@@ -73,6 +73,7 @@ build() {
 check() (
   cd $_tarname
   ulimit -n 4096
+  sed -e '/validate-formats/d' -i Makefile # these fail due to the security patch
   make check
 )