summaryrefslogtreecommitdiff
path: root/source/l/imagemagick
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2020-11-01 19:22:27 +0000
committerEric Hameleers <alien@slackware.com>2020-11-02 08:59:51 +0100
commitaa634efe5a78c33a306ff44591590c32d829de80 (patch)
tree9857585d81691b2c471b11aa5e2fbe50d7997d4e /source/l/imagemagick
parentb9b10925923fe08bef9debfa98f8a2092e33c172 (diff)
downloadcurrent-aa634efe5a78c33a306ff44591590c32d829de80.tar.gz
Sun Nov 1 19:22:27 UTC 202020201101192227
a/kernel-generic-5.4.74-x86_64-1.txz: Upgraded. a/kernel-huge-5.4.74-x86_64-1.txz: Upgraded. a/kernel-modules-5.4.74-x86_64-1.txz: Upgraded. ap/qpdf-10.0.3-x86_64-1.txz: Upgraded. d/kernel-headers-5.4.74-x86-1.txz: Upgraded. k/kernel-source-5.4.74-noarch-1.txz: Upgraded. l/elfutils-0.182-x86_64-1.txz: Upgraded. l/imagemagick-7.0.10_35-x86_64-1.txz: Upgraded. n/iptables-1.8.6-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/l/imagemagick')
-rwxr-xr-xsource/l/imagemagick/imagemagick.SlackBuild2
-rw-r--r--source/l/imagemagick/policy.xml.diff18
2 files changed, 11 insertions, 9 deletions
diff --git a/source/l/imagemagick/imagemagick.SlackBuild b/source/l/imagemagick/imagemagick.SlackBuild
index af104487..ac150648 100755
--- a/source/l/imagemagick/imagemagick.SlackBuild
+++ b/source/l/imagemagick/imagemagick.SlackBuild
@@ -23,7 +23,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=imagemagick
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# NOTE: This is to cope with ImageMagick version numbers such as 5.4.7-4,
# which occur fairly often (but not always). If these numbers are all the same,
diff --git a/source/l/imagemagick/policy.xml.diff b/source/l/imagemagick/policy.xml.diff
index 04b3a105..4937fa65 100644
--- a/source/l/imagemagick/policy.xml.diff
+++ b/source/l/imagemagick/policy.xml.diff
@@ -1,6 +1,6 @@
---- ./config/policy.xml.orig 2017-07-15 12:33:46.000000000 -0500
-+++ ./config/policy.xml 2017-07-17 20:14:07.785459021 -0500
-@@ -55,6 +55,21 @@
+--- ./config/policy.xml.orig 2020-11-01 12:48:38.817043527 -0600
++++ ./config/policy.xml 2020-11-01 12:51:00.357046694 -0600
+@@ -52,6 +52,21 @@
<policy domain="coder" rights="read|write" pattern="{GIF,JPEG,PNG,WEBP}" />
-->
<policymap>
@@ -19,12 +19,14 @@
+ <!-- SECURITY: prevent pipe to shell: -->
+ <policy domain="path" rights="none" pattern="|*" />
+ <!-- Some examples: -->
- <!-- <policy domain="system" name="shred" value="2"/> -->
- <!-- <policy domain="system" name="precision" value="6"/> -->
- <!-- <policy domain="system" name="memory-map" value="anonymous"/> -->
-@@ -75,5 +90,4 @@
- <!-- <policy domain="path" rights="none" pattern="@*" /> -->
+ <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
+ <!-- <policy domain="resource" name="memory" value="2GiB"/> -->
+ <!-- <policy domain="resource" name="map" value="4GiB"/> -->
+@@ -71,7 +86,6 @@
<!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
+ <!-- <policy domain="cache" name="max-memory-request" value="256MiB"/> -->
<!-- <policy domain="cache" name="synchronize" value="True"/> -->
- <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> -->
+ <!-- <policy domain="system" name="shred" value="2"/> -->
+ <!-- <policy domain="system" name="precision" value="6"/> -->
</policymap>