commit 8caba48213d59dab00aea7ebab5d0abd3e292a1c
Author: Elan Ruusamäe <[email protected]>
Date: Fri Jun 3 12:09:05 2016 +0300
up to 6.9.4.6
ImageMagick.spec | 6 +++---
config.patch | 15 +++++++++------
2 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index c321d73..5ebb864 100644
--- 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 1
+%define pver 6
%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,12 +33,12 @@ 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: 4
+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: 430d33915b19f38012b55f98904c4f37
+# Source0-md5: a4453b03f16c98a6e56e1066799f4b5f
Patch0: config.patch
Patch1: %{name}-link.patch
Patch2: %{name}-libpath.patch
diff --git a/config.patch b/config.patch
index 16a1e2f..e29b4b0 100644
--- a/config.patch
+++ b/config.patch
@@ -1,14 +1,17 @@
---- ImageMagick-6.9.4-1/config/policy.xml 2016-05-09 20:28:58.000000000
+0300
-+++ ImageMagick-6.9.4-1/config/policy.xml.new 2016-05-26 17:37:36.934136236
+0300
-@@ -61,7 +57,18 @@
+--- 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
+@@ -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="HTTPS" /> -->
-- <!-- <policy domain="path" rights="none" pattern="@*" /> -->
+- <!-- <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="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,5 +22,5 @@
+ <policy domain="coder" rights="none" pattern="PLT" />
+ <policy domain="path" rights="none" pattern="@*" />
+ <policy domain="path" rights="none" pattern="|*" />
- <policy domain="cache" name="shared-secret" value="passphrase"/>
+ <policy domain="cache" name="shared-secret" value="passphrase"
stealth="true"/>
</policymap>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/8caba48213d59dab00aea7ebab5d0abd3e292a1c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
