[arch-commits] Commit in imagemagick/trunk (IM7-GS-policy.patch PKGBUILD)

[Antonio Rojas]

    Date: Monday, October 22, 2018 @ 15:38:18
  Author: arojas
Revision: 337005

Update to 7.0.8.13, add workaround for GS security issues (FS#59778)

Added:
  imagemagick/trunk/IM7-GS-policy.patch
Modified:
  imagemagick/trunk/PKGBUILD

---------------------+
 IM7-GS-policy.patch |   11 +++++++++++
 PKGBUILD            |   14 ++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

Added: IM7-GS-policy.patch
===================================================================
--- IM7-GS-policy.patch	                        (rev 0)
+++ IM7-GS-policy.patch	2018-10-22 15:38:18 UTC (rev 337005)
@@ -0,0 +1,11 @@
+--- 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"/> -->
+   <!-- <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="module" rights="none" pattern="{PS,PDF,XPS}" /> -->
+   <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
+   <!-- <policy domain="path" rights="none" pattern="@*" /> -->

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-22 15:20:39 UTC (rev 337004)
+++ PKGBUILD	2018-10-22 15:38:18 UTC (rev 337005)
@@ -2,7 +2,7 @@
 
 pkgbase=imagemagick
 pkgname=(libmagick imagemagick imagemagick-doc)
-pkgver=7.0.8.12
+pkgver=7.0.8.13
 pkgrel=1
 pkgdesc="An image viewing/manipulation program"
 url="https://www.imagemagick.org/"
@@ -15,10 +15,11 @@
 _relname=ImageMagick-${pkgver%%.*}
 _tarname=ImageMagick-${pkgver%.*}-${pkgver##*.}
 source=(https://www.imagemagick.org/download/releases/$_tarname.tar.xz{,.asc}
-        arch-fonts.diff)
-sha256sums=('48df5877fe85603940310fe5c811a89af416882b60379918a95dcd4de6582b55'
+        arch-fonts.diff IM7-GS-policy.patch)
+sha256sums=('1543ad705ef45cf490de8e8db913e13b1e7baea057036db69feb475467d66873'
             'SKIP'
-            'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73')
+            'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73'
+            '70a5358fe0e33a4aed34a32cd32be6c9f38277de3560605d8e93f5d486d1e112')
 validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A)  # Lexie Parsimoniae
 
 shopt -s extglob
@@ -29,9 +30,10 @@
   cd $_tarname
 
   # Fix up typemaps to match our packages, where possible
-  patch -Np1 -i ../arch-fonts.diff
+  patch -p1 -i ../arch-fonts.diff
 
-  # Don't run auto(re)conf; assumes use of git
+  # Work around ghostscript security issues https://bugs.archlinux.org/task/59778
+  patch -p1 -i ../IM7-GS-policy.patch
 }
 
 build() {