- up to 6.9.4-8

- remove --enable-indirect-reads option according to upstream

diff --git a/ImageMagick-configure.patch b/ImageMagick-configure.patch
deleted file mode 100644 (file)
index 68b6755..0000000
--- a/ImageMagick-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ImageMagick-6.9.4-6.orig/configure.ac      2016-06-01 00:23:05.000000000 +0200
-+++ ImageMagick-6.9.4-6/configure.ac   2016-06-05 16:06:31.718121600 +0200
-@@ -703,7 +703,7 @@
-     [enable_indirect_reads=$enableval],
-     [enable_indirect_reads='no'])
- 
--if test "$enable_indirect-reads" = 'yes'; then
-+if test "$enable_indirect_reads" = 'yes'; then
-     AC_DEFINE(INDIRECT_READS_SUPPORT,1,[enable indirect reads (@) in filenames])
-     MAGICK_FEATURES="IndirectReads $MAGICK_FEATURES"
- fi

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 585208ec8368546388eb8b7d4d993a42280ea3f7..0a57d608f9d9fe610d8b446fc87921abe9dd36d6 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -20,7 +20,7 @@
 %bcond_without autotrace       # Autotrace support in SVG module
 
 %define                ver     6.9.4
-%define                pver    6
+%define                pver    8
 %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
@@ -33,18 +33,17 @@ Summary(tr.UTF-8):  X altında resim gösterme, çevirme ve değişiklik yapma
 Summary(uk.UTF-8):     Перегляд, конвертування та обробка зображень під X Window
 Name:          ImageMagick
 Version:       %{ver}%{?pver:.%{pver}}
-Release:       2
+Release:       1
 Epoch:         1
 License:       Apache-like
 Group:         X11/Applications/Graphics
 Source0:       ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5: a4453b03f16c98a6e56e1066799f4b5f
+# Source0-md5: f8e8f81761756803ee7babc8e31e4753
 Patch0:                config.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-libpath.patch
 Patch3:                %{name}-ldflags.patch
 Patch4:                %{name}-lt.patch
-Patch5:                %{name}-configure.patch
 URL:           http://www.imagemagick.org/
 %{?with_opencl:BuildRequires:  OpenCL-devel}
 BuildRequires: OpenEXR-devel >= 1.0.6
@@ -664,7 +663,6 @@ Moduł kodera dla plików WMF.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 find -type f | xargs grep -l '/usr/local/bin/perl' | xargs %{__sed} -i -e 's=!/usr/local/bin/perl=!%{__perl}='
 
@@ -683,7 +681,6 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html
        %{!?with_openmp:--disable-openmp} \
        --disable-silent-rules \
        --enable-fast-install \
-       --enable-indirect-reads \
        %{__enable_disable hdri} \
        --enable-shared \
        --enable-static \

diff --git a/config.patch b/config.patch
index e29b4b0f899c603cb6cf71353df3caeea500bf1c..17faa468b9d222fbf4cd2addafeeaaf8ba07d7a4 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,13 +1,14 @@
---- ImageMagick-6.9.4-6/config/policy.xml~     2016-06-01 01:23:05.000000000 +0300
-+++ ImageMagick-6.9.4-6/config/policy.xml      2016-06-03 11:11:07.863179689 +0300
+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 @@
    <!-- <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="|*" /> -->
+-  <!-- <policy domain="path" rights="none" pattern="|*"/> -->
+-      <policy domain="path" rights="none" pattern="@*"/>  <!-- indirect reads not permitted -->
 +  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
 +  <policy domain="coder" rights="none" pattern="URL" />
 +  <policy domain="coder" rights="none" pattern="HTTPS" />
@@ -20,7 +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="path" rights="none" pattern="@*" />
-+  <policy domain="path" rights="none" pattern="|*" />
++  <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>