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

[Antonio Rojas]

    Date: Monday, October 22, 2018 @ 17:00:06
  Author: arojas
Revision: 337009

Really apply workaround

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

---------------------+
 IM7-GS-policy.patch |    7 +++----
 PKGBUILD            |    5 +++--
 2 files changed, 6 insertions(+), 6 deletions(-)

Modified: IM7-GS-policy.patch
===================================================================
--- IM7-GS-policy.patch	2018-10-22 15:49:41 UTC (rev 337008)
+++ IM7-GS-policy.patch	2018-10-22 17:00:06 UTC (rev 337009)
@@ -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="@*" /> -->

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-22 15:49:41 UTC (rev 337008)
+++ PKGBUILD	2018-10-22 17:00:06 UTC (rev 337009)
@@ -3,7 +3,7 @@
 pkgbase=imagemagick
 pkgname=(libmagick imagemagick imagemagick-doc)
 pkgver=7.0.8.13
-pkgrel=1
+pkgrel=2
 pkgdesc="An image viewing/manipulation program"
 url="https://www.imagemagick.org/"
 arch=(x86_64)
@@ -19,7 +19,7 @@
 sha256sums=('1543ad705ef45cf490de8e8db913e13b1e7baea057036db69feb475467d66873'
             'SKIP'
             'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73'
-            '70a5358fe0e33a4aed34a32cd32be6c9f38277de3560605d8e93f5d486d1e112')
+            'f20c09860da65a4259ec9627ceeca7d993949b7460fa199c5ffd874633814cf6')
 validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A)  # Lexie Parsimoniae
 
 shopt -s extglob
@@ -73,6 +73,7 @@
 check() (
   cd $_tarname
   ulimit -n 4096
+  sed -e '/validate-formats/d' -i Makefile # these fail due to the security patch
   make check
 )