From aa634efe5a78c33a306ff44591590c32d829de80 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 1 Nov 2020 19:22:27 +0000
Subject: Sun Nov  1 19:22:27 UTC 2020

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.
---
 source/l/elfutils/slack-desc                |  2 +-
 source/l/imagemagick/imagemagick.SlackBuild |  2 +-
 source/l/imagemagick/policy.xml.diff        | 18 ++++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'source/l')

diff --git a/source/l/elfutils/slack-desc b/source/l/elfutils/slack-desc
index 7a7a3628b..4da087d6a 100644
--- a/source/l/elfutils/slack-desc
+++ b/source/l/elfutils/slack-desc
@@ -14,6 +14,6 @@ elfutils: (for listing the section sizes of an object or archive file),
 elfutils: strip (for discarding symbols), readelf (to see the raw ELF file
 elfutils: structures), and elflint (to check for well-formed ELF files).
 elfutils:
-elfutils: Project home: ftp://sourceware.org/pub/elfutils/
+elfutils: Homepage: ftp://sourceware.org/pub/elfutils/
 elfutils:
 elfutils:
diff --git a/source/l/imagemagick/imagemagick.SlackBuild b/source/l/imagemagick/imagemagick.SlackBuild
index af104487d..ac150648e 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 04b3a105e..4937fa65f 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>
-- 
cgit v1.2.3-65-gdbad