up to 7.0.5-5

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 2d02c1d75aa40ac8e66cd53a1e4925aa8077f046..5c0eebabaf9326961963c5067806e2085f12a32f 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -19,8 +19,8 @@
 # - module features:
 %bcond_without autotrace       # Autotrace support in SVG module
 
-%define                ver     7.0.4
-%define                pver    0
+%define                ver     7.0.5
+%define                pver    5
 %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: b96e1d23d838ca132c2d99d55f5c2f77
+# Source0-md5: 617fbbc095c4ab514bbb066566e9108b
 Patch0:                config.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-libpath.patch

diff --git a/config.patch b/config.patch
index 7fa7ec7235fa589e7f244dc6bad4eaa3dd55aa2b..2baf21c1cb218ce221daa75766941547cb1c6ae9 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,16 +1,18 @@
---- 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 @@
+--- ImageMagick-7.0.5-5/config/policy.xml~     2017-04-24 20:18:37.000000000 +0300
++++ ImageMagick-7.0.5-5/config/policy.xml      2017-05-03 18:23:29.877606299 +0300
+@@ -77,10 +77,21 @@
    <!-- <policy domain="resource" name="throttle" value="0"/> -->
    <!-- <policy domain="resource" name="time" value="3600"/> -->
-   <!-- <policy domain="system" name="precision" value="6"/> -->
+   <!-- <policy domain="resource" name="time" value="3600"/> -->
 -  <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
 -  <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
 -  <!-- <policy domain="path" rights="none" pattern="@*" /> -->
+   <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
+   <!-- <policy domain="cache" name="synchronize" value="True"/> -->
+   <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/>
 +  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
 +  <policy domain="coder" rights="none" pattern="URL" />
 +  <policy domain="coder" rights="none" pattern="HTTPS" />
-+  <policy domain="delegate" rights="none" pattern="HTTPS" />
 +  <policy domain="coder" rights="none" pattern="HTTP" />
 +  <policy domain="coder" rights="none" pattern="FTP" />
 +  <policy domain="coder" rights="none" pattern="MVG" />
@@ -19,8 +21,7 @@
 +  <policy domain="coder" rights="none" pattern="SHOW" />
 +  <policy domain="coder" rights="none" pattern="WIN" />
 +  <policy domain="coder" rights="none" pattern="PLT" />
++  <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="cache" name="shared-secret" value="passphrase" stealth="true"/>
  </policymap>
-