7 files changed, 38 insertions, 9 deletions
diff --git a/source/a/gettext/gettext-tools.SlackBuild b/source/a/gettext/gettext-tools.SlackBuild
index 04294afd0..d6ff14131 100755
--- a/source/a/gettext/gettext-tools.SlackBuild
+++ b/source/a/gettext/gettext-tools.SlackBuild
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gettext-tools
-VERSION=0.22.3
+VERSION=0.22.4
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/a/gettext/gettext.SlackBuild b/source/a/gettext/gettext.SlackBuild
index 03d91abfd..4d47b21c0 100755
--- a/source/a/gettext/gettext.SlackBuild
+++ b/source/a/gettext/gettext.SlackBuild
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gettext
-VERSION=0.22.3
+VERSION=0.22.4
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/a/kbd/kbd.SlackBuild b/source/a/kbd/kbd.SlackBuild
index 68ba8dd17..5b32705f8 100755
--- a/source/a/kbd/kbd.SlackBuild
+++ b/source/a/kbd/kbd.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=kbd
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -146,7 +146,7 @@ rm -f $PKG/usr/share/kbd/keymaps/i386/qwerty/ro_win.map.gz
 mv $PKG/etc/pam.d/vlock $PKG/etc/pam.d/vlock.new
 
 # Add some extra fonts:
-( cd $PKG ; explodepkg $CWD/sources/extraf.tgz )
+( cd $PKG ; explodepkg $CWD/extraf.tgz )
 
 # Make sure kbdinfo manpage is installed:
 if [ ! -r $PKG/usr/man/man1/kbdinfo.1 ]; then
diff --git a/source/a/mkinitrd/0010-fix-test-for-jfs-xfs-repair-tools.patch b/source/a/mkinitrd/0010-fix-test-for-jfs-xfs-repair-tools.patch
new file mode 100644
index 000000000..9d8e2d060
--- /dev/null
+++ b/source/a/mkinitrd/0010-fix-test-for-jfs-xfs-repair-tools.patch
@@ -0,0 +1,26 @@
+--- ./mkinitrd.orig	2023-11-20 12:49:33.502016341 -0600
++++ ./mkinitrd	2023-11-20 12:50:30.142017608 -0600
+@@ -60,6 +60,8 @@
+ # Modified by Piter Punk <piterpunk@slackware.com> 25 April 2022
+ #   Add support to specify additional filesystems to be mounted by
+ #   initrd. Useful for those that have a separated '/usr'
++# Modified by Patrick Volkerding <volkerdi@slackware.com> 20 Movember 2023
++#   Add jfs/xfs repair tools if used for $ROOTFS
+ 
+ MKINITRD_VERSION=1.4.11
+ 
+@@ -773,10 +775,11 @@
+       /sbin/modprobe --set-version $kver --show-depends --ignore-install $MODULE 2>/dev/null \
+         | grep "^insmod " | cut -f 2 -d ' ' | while read SRCMOD; do
+ 
+-        # If jfs or xfs filesystems are in use, add the repair tools to the initrd:
+-        if [ "$(basename $SRCMOD .ko)" = "jfs" ]; then
++        # If the root filesystem is jfs, add the repair tools to the initrd:
++        if [ "$ROOTFS" = "jfs" ]; then
+           cp -a /sbin/jfs_fsck $SOURCE_TREE/sbin/
+-        elif [ "$(basename $SRCMOD .ko)" = "xfs" ]; then
++        # If the root filesystem is xfs, add the repair tools to the initrd:
++        elif [ "$ROOTFS" = "xfs" ]; then
+           cp -a /sbin/xfs_repair $SOURCE_TREE/sbin/
+         fi
+ 
diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild
index b51620fb8..e0417bdea 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:-33}
+BUILD=${BUILD:-34}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -140,6 +140,9 @@ rm -f $PKG/sbin/mkinitrd.orig
 # Don't include the 99-nfs.rules on the initrd:
 ( cd $PKG/sbin ; zcat $CWD/0009-exclude-99-nfs.rules.patch.gz | patch -p1 --verbose || exit 1) || exit 1
 rm -f $PKG/sbin/mkinitrd.orig
+# Fix test for including JFS or XFS repair tools:
+( cd $PKG/sbin ; zcat $CWD/0010-fix-test-for-jfs-xfs-repair-tools.patch.gz | patch -p1 --verbose || exit 1) || exit 1
+rm -f $PKG/sbin/mkinitrd.orig
 
 mkdir -p $PKG/usr/man/man{5,8}
 cat $CWD/mkinitrd.conf.5 | gzip -9c > $PKG/usr/man/man5/mkinitrd.conf.5.gz
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index cbb0f9b91..a11006a97 100755
--- a/source/a/pkgtools/pkgtools.SlackBuild
+++ b/source/a/pkgtools/pkgtools.SlackBuild
@@ -30,7 +30,7 @@ PKGNAM=pkgtools
 # *** UPDATE THESE WITH EACH BUILD:
 VERSION=15.1
 ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-7}
+BUILD=${BUILD:-8}
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
 # the name of the created package would be, and then exit. This information
diff --git a/source/a/pkgtools/scripts/setup.vi-ex b/source/a/pkgtools/scripts/setup.vi-ex
index f79ad91ee..677a332e8 100644
--- a/source/a/pkgtools/scripts/setup.vi-ex
+++ b/source/a/pkgtools/scripts/setup.vi-ex
@@ -3,11 +3,11 @@
 T_PX=$1
 TMP=/var/log/setup/tmp
 rm -f $TMP/exvitype
-dialog --title "CHOOSE DEFAULT EX/VI EDITOR" --default-item "nvi" --menu \
+dialog --title "CHOOSE DEFAULT EX/VI EDITOR" --default-item "vim" --menu \
 "This part of the configuration \
 process will create ex and vi symlinks in /usr/bin pointing to your default \
-ex/vi editors. On a fresh installation, these will point to nvi by default, \
-as it is lightweight and supports UTF8. You may choose a different default \
+ex/vi editors. On a fresh installation, these will point to vim by default \
+as it is the de facto standard. You may choose a different default \
 if you prefer, but please note that elvis does not support UTF8." 14 76 3 \
 "elvis" "Slackware's traditional ex/vi, no UTF8 support" \
 "nvi" "Classic BSD ex/vi, supports UTF8" \