version up : ImageMagick 7.0.2-10.

component/imagemagick/buildout.cfg

@@ -25,9 +25,9 @@ extends =
 
 [imagemagick]
 recipe = slapos.recipe.cmmi
-version = 7.0.1-1
+version = 7.0.2-10
 url = https://www.imagemagick.org/download/releases/ImageMagick-${:version}.tar.xz
-md5sum = 24673d00fcc8aa00313eeca6aa20fd3c
+md5sum = e1cb23d9c10a8eff228ef30ee281711a
 pkg_config_depends = ${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${lcms2:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig
 configure-options =
   --disable-static
@@ -58,8 +58,8 @@ configure-options =
   --with-frozenpaths
 patch-options = -p1
 patches =
-  ${:_profile_base_location_}/imagemagick-6.6.6-1-no-gsx-gsc-probe.patch#3f28ecd9f6722cf2c3238ce6ec3d7a68
-  ${:_profile_base_location_}/safe_policy.patch#07889fefbd9b55f19b9136ed6c17aa8c
+  ${:_profile_base_location_}/imagemagick-7.0.2-10-no-gsx-gsc-probe.patch#64898455d5175efedd1a7bef9f1f18b5
+  ${:_profile_base_location_}/safe_policy.patch#383c0392de7257c9dff7270973342914
 environment =
   PATH=${freetype:location}/bin:${ghostscript:location}/bin:${inkscape:location}/bin:${libxml2:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}

component/imagemagick/imagemagick-6.6.6-1-no-gsx-gsc-probe.patch → component/imagemagick/imagemagick-7.0.2-10-no-gsx-gsc-probe.patch

---- ImageMagick-6.6.6-1/configure.ac~	2010-11-28 21:51:05.000000000 +0100
-+++ ImageMagick-6.6.6-1/configure.ac	2010-12-03 14:13:14.000000000 +0100
-@@ -2791,7 +2791,7 @@
+--- ImageMagick-7.0.2-10/configure.ac.orig      2016-08-30 11:33:39.160279386 +0200
++++ ImageMagick-7.0.2-10/configure.ac   2016-08-30 11:35:34.753290590 +0200
+@@ -3110,7 +3110,7 @@
+ AC_PATH_PROG(MrSIDDecodeDelegate, "$MrSIDDecodeDelegateDefault", "$MrSIDDecodeDelegateDefault")
+ AC_PATH_PROG(MVDelegate, "$MVDelegateDefault", "$MVDelegateDefault")
  AC_PATH_PROG(PCLDelegate, "$PCLDelegateDefault", "$PCLDelegateDefault")
- AC_PATH_PROG(PGPDecodeDelegate, "$PGPDecodeDelegateDefault", "$PGPDecodeDelegateDefault")
- AC_PATH_PROG(POVDelegate, "$POVDelegateDefault", "$POVDelegateDefault")
 -AC_PATH_PROGS(PSDelegate, gsx gsc "$PSDelegateDefault", "$PSDelegateDefault")
 +AC_PATH_PROGS(PSDelegate, "$PSDelegateDefault", "$PSDelegateDefault")
- AC_PATH_PROG(RLEEncodeDelegate, "$RLEEncodeDelegateDefault", "$RLEEncodeDelegateDefault")
  AC_PATH_PROG(RMDelegate, "$RMDelegateDefault", "$RMDelegateDefault")
  AC_PATH_PROG(RSVGDecodeDelegate, "$RSVGDecodeDelegateDefault", "$RSVGDecodeDelegateDefault")
---- ImageMagick-6.6.6-1/configure~	2010-11-28 23:27:16.000000000 +0100
-+++ ImageMagick-6.6.6-1/configure	2010-12-03 14:13:57.000000000 +0100
-@@ -30931,7 +30931,7 @@
- fi
- 
- 
--for ac_prog in gsx gsc "$PSDelegateDefault"
-+for ac_prog in "$PSDelegateDefault"
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
+ AC_PATH_PROG(SVGDecodeDelegate, "$SVGDecodeDelegateDefault", "$SVGDecodeDelegateDefault")

component/imagemagick/safe_policy.patch

---- ImageMagick-7.0.1-1/config/policy.xml.orig	2016-05-04 00:18:54.000000000 +0200
-+++ ImageMagick-7.0.1-1/config/policy.xml	2016-05-06 08:22:30.002045742 +0200
-@@ -50,16 +50,25 @@
+--- ImageMagick-7.0.2-10/config/policy.xml.orig	2016-08-30 11:37:29.110253211 +0200
++++ ImageMagick-7.0.2-10/config/policy.xml	2016-08-30 11:40:09.719555899 +0200
+@@ -50,19 +50,28 @@
  -->
  <policymap>
    <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
@@ -15,6 +15,9 @@
 -  <!-- <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="resource" name="memory" value="2GiB"/>
 +  <policy domain="resource" name="map" value="4GiB"/>
 +  <policy domain="resource" name="width" value="10MP"/>
@@ -26,7 +29,10 @@
 +  <policy domain="resource" name="throttle" value="0"/>
 +  <policy domain="resource" name="time" value="3600"/>
 +  <policy domain="system" name="precision" value="6"/>
-   <policy domain="cache" name="shared-secret" value="passphrase"/>
++  <policy domain="coder" rights="none" pattern="MVG" />
++  <policy domain="delegate" rights="none" pattern="HTTPS" />
++  <policy domain="path" rights="none" pattern="@*" />
+   <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/>
 +  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
 +  <policy domain="coder" rights="none" pattern="HTTPS" />
 +  <policy domain="coder" rights="none" pattern="MSL" />