summaryrefslogtreecommitdiff
path: root/source/a
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2020-04-27 20:27:30 +0000
committerEric Hameleers <alien@slackware.com>2020-04-28 08:59:53 +0200
commit1cf9f87b65a9ec2c65a1fb409fe9e42a53af778f (patch)
tree9ae4603721b75831fd6e3cb8c5b7f9d192691d72 /source/a
parent6e0d30774ba3f189660e7672e0ad5fa88a259b6b (diff)
downloadcurrent-1cf9f87b65a9ec2c65a1fb409fe9e42a53af778f.tar.gz
Mon Apr 27 20:27:30 UTC 202020200427202730
a/mkinitrd-1.4.11-x86_64-15.txz: Rebuilt. Use the standard mktemp utility from GNU coreutils, not the old tempfile. d/help2man-1.47.15-x86_64-1.txz: Upgraded. l/aspell-en-2019.10.06_0-x86_64-1.txz: Upgraded. l/gtk+3-3.24.20-x86_64-1.txz: Upgraded. l/imagemagick-7.0.10_9-x86_64-1.txz: Upgraded. n/irssi-1.2.2-x86_64-2.txz: Rebuilt. Fixed ctrl-space killing input with recent glib. Thanks to tramtrist and Urchlay. x/xterm-354-x86_64-1.txz: Upgraded. extra/aspell-word-lists/aspell-de-20161207_7_0-x86_64-1.txz: Upgraded. extra/aspell-word-lists/aspell-ga-5.1_0-x86_64-1.txz: Upgraded. extra/aspell-word-lists/aspell-it-2.4_20070901_0-x86_64-1.txz: Upgraded. extra/aspell-word-lists/aspell-ml-0.04_1-x86_64-1.txz: Upgraded. extra/aspell-word-lists/aspell-pl-6.0_20200327_0-x86_64-1.txz: Upgraded. extra/aspell-word-lists/aspell-pt_BR-20131030_12_0-x86_64-1.txz: Upgraded. extra/aspell-word-lists/aspell-pt_PT-20190329_1_0-x86_64-1.txz: Upgraded. extra/aspell-word-lists/aspell-sk-2.02_0-x86_64-1.txz: Upgraded. extra/aspell-word-lists/aspell-tl-0.4_0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a')
-rwxr-xr-xsource/a/mkinitrd/mkinitrd.SlackBuild5
-rw-r--r--source/a/mkinitrd/mkinitrd.tempfile.to.mktemp.patch19
2 files changed, 23 insertions, 1 deletions
diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild
index 20965e3a..879e64c0 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.30.1
-BUILD=${BUILD:-14}
+BUILD=${BUILD:-15}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -118,6 +118,9 @@ cp -a $CWD/mkinitrd $PKG/sbin/mkinitrd
chown root:root $PKG/sbin/mkinitrd
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
+
mkdir -p $PKG/usr/man/man{5,8}
cat $CWD/mkinitrd.conf.5 | gzip -9c > $PKG/usr/man/man5/mkinitrd.conf.5.gz
cat $CWD/mkinitrd.8 | gzip -9c > $PKG/usr/man/man8/mkinitrd.8.gz
diff --git a/source/a/mkinitrd/mkinitrd.tempfile.to.mktemp.patch b/source/a/mkinitrd/mkinitrd.tempfile.to.mktemp.patch
new file mode 100644
index 00000000..3fb199ab
--- /dev/null
+++ b/source/a/mkinitrd/mkinitrd.tempfile.to.mktemp.patch
@@ -0,0 +1,19 @@
+From bbeb9d73191c1c79f5286fd3b1fdb5611fb11301 Mon Sep 17 00:00:00 2001
+From: "Patrick J. Volkerding" <volkerdi@slackware.com>
+Date: Sun Apr 26 18:51:23 CDT 2020
+Subject: [PATCH] Switch from tempfile to mktemp
+
+Use the standard mktemp utility from GNU coreutils rather than the
+lesser-known tempfile utility from Debian of yore.
+
+--- mkinitrd.orig 2019-09-04 23:37:08.000000000 -0500
++++ mkinitrd 2020-04-26 18:46:22.352636100 -0500
+@@ -235,7 +235,7 @@
+
+ # Then copy all remaining libs our initrd files link against:
+ COUNT=1
+- PRFX=$(tempfile --prefix ldd-)
++ PRFX=$(mktemp --suffix -ldd)
+ TMPFILE=${PRFX}${COUNT}
+
+ find $SOURCE_TREE -type f -exec ldd {} 2>/dev/null \; | unify_libs > $TMPFILE