From 3da0bc7e8b75ab87701b806ff75be84d75539f88 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Wed, 11 May 2016 11:06:43 +0200 Subject: [PATCH] imagemagick: update safe_policy.path based on the latest imagetragick.com information. --- component/imagemagick/buildout.cfg | 2 +- component/imagemagick/safe_policy.patch | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/component/imagemagick/buildout.cfg b/component/imagemagick/buildout.cfg index 0ed221e5d..df34490a8 100644 --- a/component/imagemagick/buildout.cfg +++ b/component/imagemagick/buildout.cfg @@ -59,7 +59,7 @@ configure-options = patch-options = -p1 patches = ${:_profile_base_location_}/imagemagick-6.6.6-1-no-gsx-gsc-probe.patch#3f28ecd9f6722cf2c3238ce6ec3d7a68 - ${:_profile_base_location_}/safe_policy.patch#70461afd331ca006c9c0d51512c81189 + ${:_profile_base_location_}/safe_policy.patch#07889fefbd9b55f19b9136ed6c17aa8c 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} diff --git a/component/imagemagick/safe_policy.patch b/component/imagemagick/safe_policy.patch index c1c073847..2e2893f94 100644 --- a/component/imagemagick/safe_policy.patch +++ b/component/imagemagick/safe_policy.patch @@ -1,6 +1,6 @@ --- 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,29 @@ +@@ -50,16 +50,25 @@ --> <policymap> <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> --> @@ -28,10 +28,7 @@ + <policy domain="system" name="precision" value="6"/> <policy domain="cache" name="shared-secret" value="passphrase"/> + <policy domain="coder" rights="none" pattern="EPHEMERAL" /> -+ <policy domain="coder" rights="none" pattern="FTP" /> -+ <policy domain="coder" rights="none" pattern="HTTP" /> + <policy domain="coder" rights="none" pattern="HTTPS" /> -+ <policy domain="coder" rights="none" pattern="LABEL" /> + <policy domain="coder" rights="none" pattern="MSL" /> + <policy domain="coder" rights="none" pattern="MVG" /> + <policy domain="coder" rights="none" pattern="PLT" /> @@ -39,5 +36,4 @@ + <policy domain="coder" rights="none" pattern="TEXT" /> + <policy domain="coder" rights="none" pattern="URL" /> + <policy domain="coder" rights="none" pattern="WIN" /> -+ <policy domain="path" rights="none" pattern="@*" /> </policymap> -- 2.30.9