summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-07-16 18:53:33 +0000
committerEric Hameleers <alien@slackware.com>2021-07-17 08:59:52 +0200
commiteefcea89bf9bd1dc25244777d5e31d0fb48b9672 (patch)
treec892e7fecb785170b845b26b776b6d07d53bc3c6 /source
parent3c1ca4fba7f2eb67b5526d02b29849e5ff7cb2c7 (diff)
downloadcurrent-eefcea89bf9bd1dc25244777d5e31d0fb48b9672.tar.gz
Fri Jul 16 18:53:33 UTC 202120210716185333
a/mkinitrd-1.4.11-x86_64-25.txz: Rebuilt. Abort if a temporary directory cannot be created, otherwise the contents of the current directory could be destroyed. Thanks to Andypoo. d/Cython-0.29.24-x86_64-1.txz: Upgraded. l/libedit-20210714_3.1-x86_64-1.txz: Upgraded. x/libwacom-1.11-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rw-r--r--source/a/mkinitrd/0002-bail-if-temp-dir-is-not-created.patch16
-rwxr-xr-xsource/a/mkinitrd/mkinitrd.SlackBuild4
2 files changed, 19 insertions, 1 deletions
diff --git a/source/a/mkinitrd/0002-bail-if-temp-dir-is-not-created.patch b/source/a/mkinitrd/0002-bail-if-temp-dir-is-not-created.patch
new file mode 100644
index 00000000..1c6dcb92
--- /dev/null
+++ b/source/a/mkinitrd/0002-bail-if-temp-dir-is-not-created.patch
@@ -0,0 +1,16 @@
+--- ./mkinitrd.orig 2021-04-27 13:53:00.500036921 -0500
++++ ./mkinitrd 2021-07-16 13:04:05.246136283 -0500
+@@ -237,6 +237,13 @@
+ # Then copy all remaining libs our initrd files link against:
+ COUNT=1
+ PRFX=$(mktemp --suffix -ldd)
++
++ # Make sure a temporary directory was actually created:
++ if [ -z "${PRFX}" ]; then
++ echo "ERROR: Could not create a temp directory"
++ exit 1
++ fi
++
+ TMPFILE=${PRFX}${COUNT}
+
+ find $SOURCE_TREE -type f -exec ldd {} 2>/dev/null \; | unify_libs > $TMPFILE
diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild
index 232dc6ac..58dc341d 100755
--- a/source/a/mkinitrd/mkinitrd.SlackBuild
+++ b/source/a/mkinitrd/mkinitrd.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mkinitrd
VERSION=${VERSION:-1.4.11}
BB=1.32.1
-BUILD=${BUILD:-24}
+BUILD=${BUILD:-25}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -120,6 +120,8 @@ chmod 755 $PKG/sbin/mkinitrd
# Patch to switch to mktemp:
( cd $PKG/sbin ; zcat $CWD/mkinitrd.tempfile.to.mktemp.patch.gz | patch --verbose || exit 1) || exit 1
+# Patch mkinitrd to bail on no temp directory:
+( cd $PKG/sbin ; zcat $CWD/0002-bail-if-temp-dir-is-not-created.patch.gz | patch -p1 --verbose || exit 1) || exit 1
rm -f $PKG/sbin/mkinitrd.orig
mkdir -p $PKG/usr/man/man{5,8}