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

[Antonio Rojas]

    Date: Monday, October 22, 2018 @ 17:12:56
  Author: arojas
Revision: 337011

Really apply workaround

Modified:
  imagemagick6/trunk/IM6-GS-policy.patch
  imagemagick6/trunk/PKGBUILD

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

Modified: IM6-GS-policy.patch
===================================================================
--- IM6-GS-policy.patch	2018-10-22 17:00:34 UTC (rev 337010)
+++ IM6-GS-policy.patch	2018-10-22 17:12:56 UTC (rev 337011)
@@ -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 17:00:34 UTC (rev 337010)
+++ PKGBUILD	2018-10-22 17:12:56 UTC (rev 337011)
@@ -3,7 +3,7 @@
 pkgbase=imagemagick6
 pkgname=(libmagick6 imagemagick6)
 pkgver=6.9.10.13
-pkgrel=1
+pkgrel=2
 pkgdesc="An image viewing/manipulation program (version 6)"
 url="https://legacy.imagemagick.org/"
 arch=(x86_64)
@@ -19,7 +19,7 @@
 sha256sums=('20f4e224c0546aeb910df0adeb156a94a4c9bfb8ca4df2a805d88274818b0910'
             'SKIP'
             'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73'
-            '70a5358fe0e33a4aed34a32cd32be6c9f38277de3560605d8e93f5d486d1e112')
+            'f20c09860da65a4259ec9627ceeca7d993949b7460fa199c5ffd874633814cf6')
 validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A)  # Lexie Parsimoniae
 
 prepare() {
@@ -74,6 +74,7 @@
 check() (
   cd $_tarname
   ulimit -n 4096
+  sed -e '/validate-formats/d' -i Makefile # these fail due to the security patch
   make check || :
 )