- up to 6.9.5-2

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 0a57d608f9d9fe610d8b446fc87921abe9dd36d6..91aaeba4af84e6c3270c311bdfe1724cdf82021e 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -19,8 +19,8 @@
 # - module features:
 %bcond_without autotrace       # Autotrace support in SVG module
 
-%define                ver     6.9.4
-%define                pver    8
+%define                ver     6.9.5
+%define                pver    2
 %include       /usr/lib/rpm/macros.perl
 Summary:       Image display, conversion, and manipulation under X
 Summary(de.UTF-8):     Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
@@ -38,7 +38,7 @@ Epoch:                1
 License:       Apache-like
 Group:         X11/Applications/Graphics
 Source0:       ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5: f8e8f81761756803ee7babc8e31e4753
+# Source0-md5: 60727655acec7c3e766f9ba2c744419b
 Patch0:                config.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-libpath.patch

diff --git a/config.patch b/config.patch
index 17faa468b9d222fbf4cd2addafeeaaf8ba07d7a4..51799e4542a59f39ae1e7f4de7364a24eafa643d 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,14 +1,12 @@
-diff -ruN ImageMagick-6.9.4-8.orig/config/policy.xml ImageMagick-6.9.4-8/config/policy.xml
---- ImageMagick-6.9.4-8.orig/config/policy.xml 2016-06-07 15:28:31.000000000 +0200
-+++ ImageMagick-6.9.4-8/config/policy.xml      2016-06-07 23:37:43.850853095 +0200
-@@ -61,9 +61,19 @@
+--- ImageMagick-6.9.5-2/config/policy.xml.orig 2016-07-11 01:22:33.000000000 +0200
++++ ImageMagick-6.9.5-2/config/policy.xml      2016-07-18 14:04:44.370795642 +0200
+@@ -61,8 +61,19 @@
    <!-- <policy domain="resource" name="throttle" value="0"/> -->
    <!-- <policy domain="resource" name="time" value="3600"/> -->
    <!-- <policy domain="system" name="precision" value="6"/> -->
 -  <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
 -  <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
--  <!-- <policy domain="path" rights="none" pattern="|*"/> -->
--      <policy domain="path" rights="none" pattern="@*"/>  <!-- indirect reads not permitted -->
+-      <!-- <policy domain="path" rights="none" pattern="@*"/>  -->
 +  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
 +  <policy domain="coder" rights="none" pattern="URL" />
 +  <policy domain="coder" rights="none" pattern="HTTPS" />