4734 files changed, 126341 insertions, 60426 deletions

diff --git a/system/86box/86box.SlackBuild b/system/86box/86box.SlackBuild
new file mode 100644
index 0000000000..f6ca964888
--- /dev/null
+++ b/system/86box/86box.SlackBuild
@@ -0,0 +1,140 @@
+#!/bin/bash
+
+# Slackware build script for 86box
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Notes:
+
+# This thing uses the current directory for its config file. I thought
+# about patching it to use ~/.86box.cfg or ~/.config/86Box/86box.cfg,
+# but it might be considered a feature (create each VM in it own
+# directory, with its own 86box.cfg).
+
+# We now have rtmidi in the repo. The build doesn't autodetect it and
+# disable it if it's missing, we have to help it out with -DRTMIDI=OFF
+# if needed. It's OK, it'll use FluidSynth for MIDI playback if there's
+# no rtmidi.
+
+# The linbox-qt5 frontend, despite its name, seems to require qt6 (pyside6).
+# The sl86 fronend looks too simple to be useful.
+# The other frontends are mac/windows only.
+# Anyway, it has a nice Qt GUI, I don't see why it needs a frontend.
+
+# 20240311 bkw: update for v4.1.
+# - submitted a build for rtmidi, so it's now supported here as an
+#   optional dep.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=86box
+SRCNAM=86Box
+VERSION=${VERSION:-4.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+tar xvf $CWD/roms-$VERSION.tar.gz
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# 20240311 bkw: rtmidi still not autodetected in 4.1.
+if [ "${RTMIDI:-yes}" != "yes" ] || ! pkg-config --exists rtmidi; then
+  RTMIDI="-DRTMIDI=OFF"
+fi
+
+mkdir -p build
+cd build
+  cmake \
+    $RTMIDI \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
+# Allow running "86box", lowercase B, to match the package name.
+ln -s $SRCNAM $PKG/usr/bin/$PRGNAM
+
+# This mv will be fast, src and dest are always on the same FS.
+mkdir -p $PKG/usr/share/$SRCNAM
+mv roms-$VERSION $PKG/usr/share/$SRCNAM/roms
+
+# Upstream ships desktop/icons, but 'make install' doesn't install it.
+mkdir -p $PKG/usr/share/applications
+cp -a src/unix/assets/net.86box.86Box.desktop $PKG/usr/share/applications
+
+mkdir -p $PKG/usr/share/metainfo
+cp -a src/unix/assets/net.86box.86Box.metainfo.xml $PKG/usr/share/metainfo
+
+for i in src/unix/assets/[0-9]*x*/; do
+  dir=$PKG/usr/share/icons/hicolor/$( basename $i )/apps
+  mkdir -p $dir
+  cp -a $i/*.png $dir
+done
+
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/net.86box.86Box.png \
+      $PKG/usr/share/pixmaps/$PRGNAM.png
+
+# Make the slack-desc show whether option rtmidi support is built in.
+WITH=WITHOUT
+objdump -p $PKG/usr/bin/$PRGNAM | grep -q 'NEEDED.*librtmidi' && WITH="WITH"
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING *.md $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+sed "s,@WITH@,$WITH," < $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/86box/86box.info b/system/86box/86box.info
new file mode 100644
index 0000000000..97b23319ab
--- /dev/null
+++ b/system/86box/86box.info
@@ -0,0 +1,12 @@
+PRGNAM="86box"
+VERSION="4.1"
+HOMEPAGE="https://86box.net/"
+DOWNLOAD="https://github.com/86Box/86Box/archive/v4.1/86Box-4.1.tar.gz \
+          https://github.com/86Box/roms/archive/v4.1/roms-4.1.tar.gz"
+MD5SUM="a209227eb5c2ca9f3c11dae1441b4468 \
+        2c04a4c1c4ec140a6d5dcfc54d882027"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libslirp"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/86box/README b/system/86box/README
new file mode 100644
index 0000000000..1dd2c54f7e
--- /dev/null
+++ b/system/86box/README
@@ -0,0 +1,32 @@
+86box (PC emulator)
+
+86box is a low level x86 emulator that runs older operating systems
+and software designed for IBM PC systems and compatibles from 1981
+through fairly recent system designs based on the PCI bus.
+
+Features:
+
+- Easy to use interface inspired by mainstream hypervisor software.
+- Low level emulation of 8086-based processors up to the Mendocino-era
+  Celeron with focus on accuracy.
+- Great range of customizability of virtual machines.
+- Many available systems, such as the very first IBM PC 5150 from 1981,
+  or the more obscure IBM PS/2 line of systems based on the Micro
+  Channel Architecture.
+- Lots of supported peripherals including video adapters, sound cards,
+  network adapters, hard disk controllers, and SCSI adapters.
+- MIDI output to Windows built-in MIDI support, FluidSynth, or emulated
+  Roland synthesizers.
+- Supports running MS-DOS, older Windows versions, OS/2, many Linux
+  distributions, or vintage systems such as BeOS or NEXTSTEP, and
+  applications for these systems.
+
+The package includes the ROM images required for emulation.
+
+Full documentation is available at:
+https://86box.readthedocs.io/en/latest/index.html
+
+Optional dependency: rtmidi (autodetected). If rtmidi is installed
+at build time, 86box will be buit with support for it. If you have
+rtmidi installed but want to build without it, export RTMIDI=no in the
+environment.
diff --git a/system/komparator4/doinst.sh b/system/86box/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/system/komparator4/doinst.sh
+++ b/system/86box/doinst.sh
diff --git a/system/86box/slack-desc b/system/86box/slack-desc
new file mode 100644
index 0000000000..a7d66de4f8
--- /dev/null
+++ b/system/86box/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+86box: 86box (PC emulator)
+86box:
+86box: 86box is a low level x86 emulator that runs older operating systems
+86box: and software designed for IBM PC systems and compatibles from 1981
+86box: through fairly recent system designs based on the PCI bus.
+86box:
+86box: This package was built @WITH@ rtmidi support.
+86box:
+86box:
+86box:
+86box:
diff --git a/system/AnonymousPro/AnonymousPro.SlackBuild b/system/AnonymousPro/AnonymousPro.SlackBuild
index 3b23762af0..6aa27a688f 100644
--- a/system/AnonymousPro/AnonymousPro.SlackBuild
+++ b/system/AnonymousPro/AnonymousPro.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for AnonymousPro
 
-# Copyright 2014-2015 Eugene M., <damagedone at gmx dot com>
+# Copyright 2014-2021 Eugene M., <damagedone at gmx dot com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,25 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=AnonymousPro
-VERSION=${VERSION:-1.002}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1_002}
+DIR_NAME=${DIR_NAME:-1.002.001}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -41,14 +52,9 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 unzip $CWD/$PRGNAM-$VERSION.zip
-unzip $CWD/AnonymousProMinus-1.003.zip
 
-# Ugly hack
-mv -f $PRGNAM-$VERSION.001 $PRGNAM-$VERSION
+mv -f $PRGNAM-$DIR_NAME $PRGNAM-$VERSION
 mv $PRGNAM-$VERSION/FONTLOG.txt $PRGNAM-$VERSION/AnonymousPro_FONTLOG.txt
-mv -f AnonymousProMinus-1.003/*.* $PRGNAM-$VERSION
-mv $PRGNAM-$VERSION/FONTLOG.txt $PRGNAM-$VERSION/AnonymousProMinus_FONTLOG.txt
-rm -rf ._AnonymousPro-1.002.001 AnonymousProMinus-1.003
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,4 +75,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/AnonymousPro/AnonymousPro.info b/system/AnonymousPro/AnonymousPro.info
index ca0b989459..a40ba80c58 100644
--- a/system/AnonymousPro/AnonymousPro.info
+++ b/system/AnonymousPro/AnonymousPro.info
@@ -1,10 +1,8 @@
 PRGNAM="AnonymousPro"
-VERSION="1.002"
+VERSION="1_002"
 HOMEPAGE="https://www.marksimonson.com/fonts/view/anonymous-pro"
-DOWNLOAD="https://www.marksimonson.com/assets/content/fonts/AnonymousPro-1.002.zip \
-          https://www.marksimonson.com/assets/content/fonts/AnonymousProMinus-1.003.zip"
-MD5SUM="bb5141b20b9d69b3190be03e5706c8b7 \
-        16468f49e2a56f8e2ad39f09728391bd"
+DOWNLOAD="https://www.marksimonson.com/assets/content/fonts/AnonymousPro-1_002.zip"
+MD5SUM="aac53fb8fdb238e84072a94f5721bbec"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/AnonymousPro/README b/system/AnonymousPro/README
index 77b576baa5..59b7e7704b 100644
--- a/system/AnonymousPro/README
+++ b/system/AnonymousPro/README
@@ -1,7 +1,7 @@
-Anonymous Pro (2009) is a family of four fixed-width fonts designed with coding
-in  mind. Anonymous Pro features an international, Unicode-based character set,
-with support for most Western and Central European Latin-based languages, plus
-Greek and Cyrillic.
+Anonymous Pro (2009) is a family of four fixed-width fonts designed
+with coding in mind. Anonymous Pro features an international,
+Unicode-based character set, with support for most Western and Central
+European Latin-based languages, plus Greek and Cyrillic.
 
 Features:
 
@@ -9,8 +9,9 @@ Features:
 - Fixed width design;
 - Various computer keyboard symbols;
 - DOS box-drawing characters;
-- Extended language support for most Latin-based Western and Central European
-  languages, as well as Greek and Cyrillic.
+- Extended language support for most Latin-based Western and Central
+  European languages, as well as Greek and Cyrillic.
 
-There are two versions: Anonymous Pro and Anonymous Pro Minus. Anonymous Pro
-contains embedded bitmaps for smaller sizes, Anonymous Pro Minus does not.
+There are two versions: Anonymous Pro and Anonymous Pro
+Minus. Anonymous Pro contains embedded bitmaps for smaller sizes,
+Anonymous Pro Minus does not.
diff --git a/system/AnonymousPro/doinst.sh b/system/AnonymousPro/doinst.sh
index 883c47ac0a..f0ffee7710 100644
--- a/system/AnonymousPro/doinst.sh
+++ b/system/AnonymousPro/doinst.sh
@@ -1,10 +1,10 @@
 # Update the X font indexes:
+
 if [ -x /usr/bin/mkfontdir ]; then
-  ( cd /usr/share/fonts/TTF
-    mkfontscale .
-    mkfontdir .
+  ( cd usr/share/fonts/TTF
+    /usr/bin/mkfontscale .
+    /usr/bin/mkfontdir .
   )
-fi
-if [ -x /usr/bin/fc-cache ]; then
-  /usr/bin/fc-cache -f
+
+  [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f
 fi
diff --git a/system/Attic/Attic.SlackBuild b/system/Attic/Attic.SlackBuild
index c74651bd19..e721261435 100644
--- a/system/Attic/Attic.SlackBuild
+++ b/system/Attic/Attic.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Attic
 
@@ -23,10 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=Attic
 VERSION=${VERSION:-0.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -63,6 +73,8 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+# thanks void maintainers
+patch -p1 -i $CWD/openssl.diff
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,6 +82,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+for _file in attic/*.pyx; do
+  rm ${_file/pyx/c}
+done
+
+python3 setup.py sdist
 python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -84,4 +101,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/Attic/Attic.info b/system/Attic/Attic.info
index 7ee4eacd49..82b46d586b 100644
--- a/system/Attic/Attic.info
+++ b/system/Attic/Attic.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://pypi.python.org/packages/source/A/Attic/Attic-0.16.tar.gz"
 MD5SUM="9c767c883f7f48bf95e7e5307ce6b5ea"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3 msgpack-python"
+REQUIRES="msgpack-python"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/system/Attic/README b/system/Attic/README
index c97f0db01e..daf574039b 100644
--- a/system/Attic/README
+++ b/system/Attic/README
@@ -4,6 +4,3 @@ data deduplication technique used makes Attic suitable for daily
 backups since only actual changes are stored.
 
 Optional dependency: llfuse (used for mounting the archives)
-
-NOTE:
-Please install python3 first before installing all other requirements.
diff --git a/system/Attic/openssl.diff b/system/Attic/openssl.diff
new file mode 100644
index 0000000000..7ebc0a9d3a
--- /dev/null
+++ b/system/Attic/openssl.diff
@@ -0,0 +1,59 @@
+--- a/attic/crypto.pyx
++++ b/attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+         pass
+     const EVP_MD *EVP_sha256()
+     const EVP_CIPHER *EVP_aes_256_ctr()
+-    void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+-    void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++    EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++    const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++    void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+ 
+     int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+                            const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+     """A thin wrapper around the OpenSSL EVP cipher API
+     """
+-    cdef EVP_CIPHER_CTX ctx
++    cdef EVP_CIPHER_CTX * ctx
+ 
+     def __cinit__(self, key, iv=None):
+-        EVP_CIPHER_CTX_init(&self.ctx)
+-        if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++        self.ctx = EVP_CIPHER_CTX_new();
++        if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+             raise Exception('EVP_EncryptInit_ex failed')
+         self.reset(key, iv)
+ 
+     def __dealloc__(self):
+-        EVP_CIPHER_CTX_cleanup(&self.ctx)
++        EVP_CIPHER_CTX_free(self.ctx)
+ 
+     def reset(self, key=None, iv=None):
+         cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+             key2 = key
+         if iv:
+             iv2 = iv
+-        if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++        if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+             raise Exception('EVP_EncryptInit_ex failed')
+ 
+     @property
+     def iv(self):
+-        return self.ctx.iv[:16]
++        return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+ 
+     def encrypt(self, data):
+         cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+         if not out:
+             raise MemoryError
+         try:
+-            if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++            if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+                 raise Exception('EVP_EncryptUpdate failed')
+             return out[:inl]
+         finally:
diff --git a/system/B-em/B-em.SlackBuild b/system/B-em/B-em.SlackBuild
new file mode 100644
index 0000000000..1d64e6b1d4
--- /dev/null
+++ b/system/B-em/B-em.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+# Slackware build script for B-em
+
+# Copyright 2023 Antonio Leal, Porto Salvo, Oeiras, Portugal
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=B-em
+VERSION=${VERSION:-388e1d8}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+COMMIT=${COMMIT:-388e1d8db63c4f6b0e68d6e4235b9bd16984a65b}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+
+if [ -f "$CWD/B-em-$COMMIT.tar.gz" ]; then
+    mv $CWD/B-em-$COMMIT.tar.gz $CWD/b-em-$COMMIT.tar.gz
+fi
+tar xvfz $CWD/b-em-$COMMIT.tar.gz
+if [ -d "B-em-$COMMIT" ]; then
+    mv B-em-$COMMIT $PRGNAM-$VERSION
+else
+    mv b-em-$COMMIT $PRGNAM-$VERSION
+fi
+
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+./autogen.sh
+./configure --prefix=/usr
+make
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+mkdir -p $PKG/usr/share/pixmaps
+cp icon/b-em.png $PKG/usr/share/pixmaps
+mkdir -p $PKG/usr/share/applications
+cp $CWD/B-em.desktop $PKG/usr/share/applications
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mv $PKG/usr/share/doc/b-em/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG/usr/share/doc
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/B-em/B-em.desktop b/system/B-em/B-em.desktop
new file mode 100644
index 0000000000..4c82f207f5
--- /dev/null
+++ b/system/B-em/B-em.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=B-em
+Comment=BBC Microcomputer Emulator
+Exec=b-em
+Icon=/usr/share/pixmaps/b-em.png
+Terminal=false
+Type=Application
+Categories=System;Emulator;
+
diff --git a/system/B-em/B-em.info b/system/B-em/B-em.info
new file mode 100644
index 0000000000..eaf047a9c5
--- /dev/null
+++ b/system/B-em/B-em.info
@@ -0,0 +1,10 @@
+PRGNAM="B-em"
+VERSION="388e1d8"
+HOMEPAGE="https://github.com/stardot/b-em"
+DOWNLOAD="https://github.com/stardot/b-em/archive/388e1d8db63c4f6b0e68d6e4235b9bd16984a65b/b-em-388e1d8db63c4f6b0e68d6e4235b9bd16984a65b.tar.gz"
+MD5SUM="ea2234e2e97437c4c60377963f346fba"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="allegro"
+MAINTAINER="Antonio Leal"
+EMAIL="antonioleal@yahoo.com"
diff --git a/system/B-em/README b/system/B-em/README
new file mode 100644
index 0000000000..63b975b789
--- /dev/null
+++ b/system/B-em/README
@@ -0,0 +1,11 @@
+B-em BBC Microcomputer emulator
+
+B-em is an emulator for various models of BBC Microcomputer as
+made by Acorn Computers in the 1980s along with a selection of
+2nd processors.
+
+B-em is licensed under the GPL, see COPYING for more details.
+
+The original site being at http://b-em.bbcmicro.com this
+package contains all the enhancements made since version 2.2
+as available at https://github.com/stardot/b-em
diff --git a/system/ddrescue-gui/doinst.sh b/system/B-em/doinst.sh
index aea0f894eb..aea0f894eb 100644
--- a/system/ddrescue-gui/doinst.sh
+++ b/system/B-em/doinst.sh
diff --git a/system/B-em/slack-desc b/system/B-em/slack-desc
new file mode 100644
index 0000000000..1db2863009
--- /dev/null
+++ b/system/B-em/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+B-em: B-em (BBC Microcomputer Emulator)
+B-em:
+B-em: B-em is an emulator for various models of BBC Microcomputer as
+B-em: made by Acorn Computers in the 1980s along with a selection of
+B-em: 2nd processors.
+B-em:
+B-em: B-em is licensed under the GPL, see COPYING for more details.
+B-em:
+B-em:
+B-em:
+B-em:
diff --git a/system/CNS11643-font/35-CNS11643-font.conf b/system/CNS11643-font/35-CNS11643-font.conf
index 6122b22e10..b23d2b29e7 100644
--- a/system/CNS11643-font/35-CNS11643-font.conf
+++ b/system/CNS11643-font/35-CNS11643-font.conf
@@ -2,112 +2,84 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- TW-Kai and TW-Sung Configure File -->
 <fontconfig>
-  <match target="font">
-    <test qual="any" name="family">
-      <string>TW-Sung</string>
-    </test>
-    <test qual="any" name="family">
-      <string>全字庫正宋體</string>
-    </test>
-    <test qual="any" name="family">
-      <string>TW-Sung-Plus</string>
-    </test>
-    <test qual="any" name="family">
-      <string>全字庫正宋體 Plus</string>
-    </test>
-    <test qual="any" name="family">
-      <string>TW-Sung-Ext-B</string>
-    </test>
-    <test qual="any" name="family">
-      <string>全字庫正宋體 Ext-B</string>
-    </test>
-    <test qual="any" name="family">
-      <string>TW-Kai</string>
-    </test>
-    <test qual="any" name="family">
-      <string>全字庫正楷體</string>
-    </test>
-    <test qual="any" name="family">
-      <string>TW-Kai-Plus</string>
-    </test>
-    <test qual="any" name="family">
-      <string>全字庫正楷體 Plus</string>
-    </test>
-    <test qual="any" name="family">
-      <string>TW-Kai-Ext-B</string>
-    </test>
-    <test qual="any" name="family">
-      <string>全字庫正楷體 Ext-B</string>
-    </test>
-  </match>
-  <match target="pattern">
-    <test name="family" compare="eq">
-      <string>TW-Sung</string>
-    </test>
-    <edit name="family" mode="prepend" binding="strong">
-      <string>DejaVu Serif</string>
-    </edit>
-  </match>
-  <match target="pattern">
-    <test name="family" compare="eq">
-      <string>TW-Kai</string>
-    </test>
-    <edit name="family" mode="prepend" binding="strong">
-      <string>DejaVu Sans Light</string>
-    </edit>
-  </match>
-  <alias binding="strong">
+  <alias>
     <family>TW-Sung</family>
     <prefer>
-      <family>DejaVu Serif:book</family>
-      <family>Liberation Sans</family>
-      <family>Bitstream Vera Serif</family>
       <family>TW-Sung</family>
       <family>TW-Sung-Plus</family>
       <family>TW-Sung-Ext-B</family>
     </prefer>
   </alias>
-  <alias binding="strong">
+  <alias>
     <family>TW-Kai</family>
     <prefer>
-      <family>DejaVu Sans:book</family>
-      <family>Bitstream Vera Sans</family>
       <family>TW-Kai</family>
       <family>TW-Kai-Plus</family>
       <family>TW-Kai-Ext-B</family>
     </prefer>
   </alias>
-  <alias binding="strong">
-    <family>serif</family>
+  <alias>
+    <family>細明體</family>
     <prefer>
-      <family>DejaVu Serif:book</family>
-      <family>Liberation Serif</family>
-      <family>Bitstream Vera Serif</family>
       <family>TW-Sung</family>
       <family>TW-Sung-Plus</family>
       <family>TW-Sung-Ext-B</family>
     </prefer>
   </alias>
-  <alias binding="strong">
-    <family>sans</family>
+  <alias>
+    <family>新細明體</family>
     <prefer>
-      <family>DejaVu Sans Light:book</family>
-      <family>Liberation Sans</family>
-      <family>Bitstream Vera Sans</family>
-      <family>TW-Kai</family>
-      <family>TW-Kai-Plus</family>
-      <family>TW-Kai-Ext-B</family>
+      <family>TW-Sung</family>
+      <family>TW-Sung-Plus</family>
+      <family>TW-Sung-Ext-B</family>
     </prefer>
   </alias>
   <alias>
-    <family>monospace</family>
+    <family>MingLiU</family>
     <prefer>
-      <family>DejaVu Sans Mono</family>
-      <family>Liberation Sans Mono</family>
-      <family>Bitstream Vera Sans Mono</family>
       <family>TW-Sung</family>
       <family>TW-Sung-Plus</family>
       <family>TW-Sung-Ext-B</family>
     </prefer>
   </alias>
+  <alias>
+    <family>PMingLiU</family>
+    <prefer>
+      <family>TW-Sung</family>
+      <family>TW-Sung-Plus</family>
+      <family>TW-Sung-Ext-B</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>標楷體</family>
+    <prefer>
+      <family>TW-Kai</family>
+      <family>TW-Kai-Plus</family>
+      <family>TW-Kai-Ext-B</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>BiauKai</family>
+    <prefer>
+      <family>TW-Kai</family>
+      <family>TW-Kai-Plus</family>
+      <family>TW-Kai-Ext-B</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>DFKai-SB</family>
+    <prefer>
+      <family>TW-Kai</family>
+      <family>TW-Kai-Plus</family>
+      <family>TW-Kai-Ext-B</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>KaiU</family>
+    <prefer>
+      <family>TW-Kai</family>
+      <family>TW-Kai-Plus</family>
+      <family>TW-Kai-Ext-B</family>
+    </prefer>
+  </alias>
 </fontconfig>
diff --git a/system/CNS11643-font/CNS11643-font.SlackBuild b/system/CNS11643-font/CNS11643-font.SlackBuild
index 15934eff03..ede661c2e3 100644
--- a/system/CNS11643-font/CNS11643-font.SlackBuild
+++ b/system/CNS11643-font/CNS11643-font.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for CNS11643-font
 
-# Copyright 2018  CCHsu, Taiwan
+# Copyright 2022  CCHsu, Taiwan
+# Copyright 2023  ltlnx, Taiwan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,15 +23,22 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=CNS11643-font
-VERSION=${VERSION:-20180105}
+VERSION=${VERSION:-20231103}
 SRCNAM=Open_Data
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,11 +63,17 @@ mkdir -p $PKG/usr/share/fonts/TTF
 cp -a Open_Data/Fonts/*.ttf $PKG/usr/share/fonts/TTF
 
 # Create a font config file and symlink it into /etc/fonts/conf.d.
-mkdir -p $PKG/etc/fonts/conf.{d,avail}
-cat $CWD/35-CNS11643-font.conf > $PKG/etc/fonts/conf.avail/35-CNS11643-font.conf
-( cd $PKG/etc/fonts/conf.d && \
-  ln -sf ../conf.avail/35-CNS11643-font.conf
-)
+# Do this only if the user explicitly asks for it.
+ADDCONF=${ADDCONF:-no}
+if [ "$ADDCONF" = "yes" ]; then
+    mkdir -p $PKG/etc/fonts/conf.{d,avail}
+    cat $CWD/35-CNS11643-font.conf > $PKG/etc/fonts/conf.avail/35-CNS11643-font.conf
+    ( cd $PKG/etc/fonts/conf.d && \
+      ln -sf ../conf.avail/35-CNS11643-font.conf
+    )
+fi
+
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -68,4 +82,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/CNS11643-font/CNS11643-font.info b/system/CNS11643-font/CNS11643-font.info
index b5d362ee12..2ad79de436 100644
--- a/system/CNS11643-font/CNS11643-font.info
+++ b/system/CNS11643-font/CNS11643-font.info
@@ -1,10 +1,10 @@
 PRGNAM="CNS11643-font"
-VERSION="20180105"
+VERSION="20231103"
 HOMEPAGE="http://www.cns11643.gov.tw/"
 DOWNLOAD="http://www.cns11643.gov.tw/AIDB/Open_Data.zip"
-MD5SUM="2d30f001ffd8fd014201b21486fe158e"
+MD5SUM="f1a71e427ec64795f0aef99f3759ec29"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="CCHsu"
-EMAIL="a12321aabb@gmail.com"
+MAINTAINER="ltlnx"
+EMAIL="ltlnx@disroot.org"
diff --git a/system/CNS11643-font/README b/system/CNS11643-font/README
index 71352aaf8b..674ef9135d 100644
--- a/system/CNS11643-font/README
+++ b/system/CNS11643-font/README
@@ -2,10 +2,70 @@ This package contains two type of fonts: TW-Kai and TW-Sung, which are
 provided by CNS11643 Chinese Standard Interchange Code Master Ideographs
 from Taiwan.
 
-This SlackBuild puts 35-CNS11643-font.conf into /etc/fonts/conf.avail.
-It sets the "serif" and "monospace"aliases to TW-Sung fonts, the "sans"
-aliases to TW-Kai fonts. You canuncomment the symlink in the slackbuild
-if you like.
+A config file is included, 35-CNS11643-font.conf, which binds the
+Windows counterparts "MingLiU" (細明體) and "PMingLiU"
+(新細明體) to TW-Sung, and "DFKai-SB", "UKai" (標楷體) to TW-Kai.
+If you want it copied into /etc/fonts/conf.avail, add the
+environment variable "ADDCONF=yes" in front of the SlackBuild.
+I recommend running the SlackBuild like this:
+
+  ADDCONF=yes ./CNS11643-font.SlackBuild
+
+If you're using a SlackBuild manager, the way of adding variables may
+differ; please consult the manual of your program for instructions.
+
+If you don't want your default fonts replaced, you can add this to
+/etc/fonts/conf.avail/50-user.conf between the <fontconfig> tags:
+(please replace the font names according to the comments)
+
+<!-- Custom font preference -->
+<alias>
+    <family>serif</family>
+    <prefer>
+        <!-- preferred serif latin font -->
+        <family>Noto Serif</family>
+        <!-- preferred serif fallback font -->
+        <family>Noto Serif CJK TC</family>
+    </prefer>
+</alias>
+<alias>
+    <family>sans-serif</family>
+    <prefer>
+        <!-- preferred sans-serif latin font -->
+        <family>Noto Sans</family>
+        <!-- preferred sans-serif fallback font -->
+        <family>Noto Sans CJK TC</family>
+    </prefer>
+</alias>
+<match target="pattern">
+    <test qual="any" name="family" compare="eq">
+        <string>monospace</string>
+    </test>
+    <!-- replace "Liberation Mono" with preferred monospace font -->
+    <edit name="family" mode="assign" binding="strong">
+        <string>Liberation Mono</string>
+    </edit>
+</match>
+<alias>
+    <!-- replace "Liberation Mono" with preferred monospace font -->
+    <family>Liberation Mono</family>
+    <prefer>
+        <!-- preferred monospace font -->
+        <family>Liberation Mono</family>
+        <!-- preferred monospace fallback font
+             (does not necessarily need to be monospace -->
+        <family>Sarasa Fixed TC</family>
+    </prefer>
+</alias>
+<alias>
+    <family>system-ui</family>
+    <prefer>
+        <!-- preferred system-ui latin font (usually sans-serif) -->
+        <family>Noto Sans</family>
+        <!-- preferred system-ui fallback font -->
+        <family>Noto Sans CJK TC</family>
+    </prefer>
+</alias>
 
 The source file can be found at "http://data.gov.tw/node/5961", and the
 license can be found at "http://www.cns11643.gov.tw/AIDB/copyright.do".
diff --git a/system/CNS11643-font/doinst.sh b/system/CNS11643-font/doinst.sh
index 883c47ac0a..b3ec374e4a 100644
--- a/system/CNS11643-font/doinst.sh
+++ b/system/CNS11643-font/doinst.sh
@@ -1,6 +1,6 @@
 # Update the X font indexes:
 if [ -x /usr/bin/mkfontdir ]; then
-  ( cd /usr/share/fonts/TTF
+  ( cd usr/share/fonts/TTF
     mkfontscale .
     mkfontdir .
   )
diff --git a/system/CPU-X/CPU-X.SlackBuild b/system/CPU-X/CPU-X.SlackBuild
index 8e55bb89ef..ea1763bcb1 100644
--- a/system/CPU-X/CPU-X.SlackBuild
+++ b/system/CPU-X/CPU-X.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for CPU-X
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=CPU-X
-VERSION=${VERSION:-4.1.0}
+VERSION=${VERSION:-5.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,9 +72,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p build
 cd build
@@ -77,13 +84,16 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DCMAKE_BUILD_TYPE=Release ..
+
+  # 20220228 bkw: avoid writing to the real /usr:
+  sed -i \
+    's,/usr/bin/glib-compile-schemas,/bin/true,' \
+    data/cmake_install.cmake
+
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog.md COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -93,4 +103,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/CPU-X/CPU-X.info b/system/CPU-X/CPU-X.info
index 57c16b3b42..d2731bc84f 100644
--- a/system/CPU-X/CPU-X.info
+++ b/system/CPU-X/CPU-X.info
@@ -1,10 +1,10 @@
 PRGNAM="CPU-X"
-VERSION="4.1.0"
-HOMEPAGE="https://x0rg.github.io/CPU-X/"
-DOWNLOAD="https://github.com/X0rg/CPU-X/archive/v4.1.0/CPU-X-4.1.0.tar.gz"
-MD5SUM="8aba2bfe98c0dcd3da53d01b77e94036"
+VERSION="5.0.3"
+HOMEPAGE="https://github.com/x0rg/CPU-X/"
+DOWNLOAD="https://github.com/x0rg/CPU-X/archive/v5.0.3/CPU-X-5.0.3.tar.gz"
+MD5SUM="548d7a6a7b27a58221a3898c47041b64"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libcpuid"
+REQUIRES="glfw3 libcpuid libstatgrab"
 MAINTAINER="Cristiano Urban"
 EMAIL="cristiano.urban.slack@gmail.com"
diff --git a/system/CPU-X/slack-desc b/system/CPU-X/slack-desc
index 06f7f5051d..0444748a9c 100644
--- a/system/CPU-X/slack-desc
+++ b/system/CPU-X/slack-desc
@@ -12,7 +12,7 @@ CPU-X: Free software that gathers information on CPU, motherboard and more.
 CPU-X: CPU-X is similar to CPU-Z (Windows), but CPU-X is a Free and 
 CPU-X: Open Source software designed for GNU/Linux and FreeBSD.
 CPU-X:
-CPU-X: Homepage: https://x0rg.github.io/CPU-X/
+CPU-X: Homepage: https://github.com/x0rg/CPU-X/
 CPU-X:
 CPU-X:
 CPU-X:
diff --git a/system/DisplayCAL/DisplayCAL.SlackBuild b/system/DisplayCAL/DisplayCAL.SlackBuild
new file mode 100644
index 0000000000..eda918b05e
--- /dev/null
+++ b/system/DisplayCAL/DisplayCAL.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/bash
+
+# Slackware build script for DisplayCAL
+
+# Copyright 2023 Fernando Lopez Jr. <fernando.lopezjr@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=DisplayCAL
+VERSION=${VERSION:-3.8.9.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python2 setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/man
+mv $PKG/usr/share/man/man1 $PKG/usr/man/
+rm -rf $PKG/usr/share/man
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mv $PKG/usr/share/doc/ $PKG/usr/doc/
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CHANGES.html LICENSE.txt README.html \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/DisplayCAL/DisplayCAL.info b/system/DisplayCAL/DisplayCAL.info
new file mode 100644
index 0000000000..cf83ee7323
--- /dev/null
+++ b/system/DisplayCAL/DisplayCAL.info
@@ -0,0 +1,10 @@
+PRGNAM="DisplayCAL"
+VERSION="3.8.9.3"
+HOMEPAGE="https://displaycal.net/"
+DOWNLOAD="https://sourceforge.net/projects/dispcalgui/files/release/3.8.9.3/DisplayCAL-3.8.9.3.tar.gz"
+MD5SUM="dafa7f892965ccd392bbfa292ad1422b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Fernando Lopez Jr."
+EMAIL="fernando.lopezjr@gmail.com"
diff --git a/system/DisplayCAL/README b/system/DisplayCAL/README
new file mode 100644
index 0000000000..3258fa1387
--- /dev/null
+++ b/system/DisplayCAL/README
@@ -0,0 +1,8 @@
+DisplayCAL (formerly known as dispcalGUI) is a display calibration
+and profiling solution with a focus on accuracy and versatility
+(in fact, the author is of the honest opinion it may be the most
+accurate and versatile ICC compatible display profiling solution
+available anywhere). At its core it relies on ArgyllCMS, an advanced
+open source color management system, to take measurements, create
+calibrations and profiles, and for a variety of other advanced
+color related tasks.
diff --git a/system/DisplayCAL/doinst.sh b/system/DisplayCAL/doinst.sh
new file mode 100644
index 0000000000..0fb9c8b686
--- /dev/null
+++ b/system/DisplayCAL/doinst.sh
@@ -0,0 +1,14 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/system/DisplayCAL/slack-desc b/system/DisplayCAL/slack-desc
new file mode 100644
index 0000000000..d18a4b6583
--- /dev/null
+++ b/system/DisplayCAL/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+DisplayCAL: DisplayCAL (display calibration and profiling)
+DisplayCAL:
+DisplayCAL: DisplayCAL (formerly known as dispcalGUI) is a display calibration
+DisplayCAL: and profiling solution with a focus on accuracy and versatility (in
+DisplayCAL: fact, the author is of the honest opinion it may be the most accurate
+DisplayCAL: and versatile ICC compatible display profiling solution available
+DisplayCAL: anywhere).
+DisplayCAL: At its core it relies on ArgyllCMS, an advanced open source color
+DisplayCAL: management system, to take measurements, create calibrations and
+DisplayCAL: profiles, and for a variety of other advanced color related tasks.
+DisplayCAL:
diff --git a/system/Eterm/Eterm.SlackBuild b/system/Eterm/Eterm.SlackBuild
deleted file mode 100644
index 0582dca0d4..0000000000
--- a/system/Eterm/Eterm.SlackBuild
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Eterm
-
-# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=Eterm
-VERSION=${VERSION:-0.9.6}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-tar xvf $CWD/$PRGNAM-bg-$VERSION.tar.gz
-cp -rf bg/* $PRGNAM-$VERSION/bg
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --disable-static \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --enable-greek \
-  --enable-trans \
-  --enable-utmp \
-  --enable-escreen-fx \
-  --enable-etwin \
-  --enable-multi-charset \
-  --with-theme-update \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/share/applications
-install -D -m644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-
-mkdir -p $PKG/usr/share/pixmaps/
-install -D -m644 $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README LICENSE doc/README* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/Eterm/Eterm.desktop b/system/Eterm/Eterm.desktop
deleted file mode 100644
index 49322a1086..0000000000
--- a/system/Eterm/Eterm.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Eterm
-Comment=Eterm is a color vt102 terminal emulator
-Exec=Eterm
-Icon=Eterm
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator
-GenericName=Terminal
diff --git a/system/Eterm/Eterm.info b/system/Eterm/Eterm.info
deleted file mode 100644
index 958e00cc86..0000000000
--- a/system/Eterm/Eterm.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="Eterm"
-VERSION="0.9.6"
-HOMEPAGE="https://www.enlightenment.org/"
-DOWNLOAD="http://www.eterm.org/download/Eterm-0.9.6.tar.gz \
-          http://www.eterm.org/download/Eterm-bg-0.9.6.tar.gz"
-MD5SUM="90e424584c22d4050496874d14f78bb1 \
-        e8c6567b13d7fb760bded56c1d1a181d"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="imlib2 libast"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/system/Eterm/Eterm.png b/system/Eterm/Eterm.png
deleted file mode 100644
index efcef9e849..0000000000
--- a/system/Eterm/Eterm.png
+++ /dev/null
diff --git a/system/Eterm/README b/system/Eterm/README
deleted file mode 100644
index ecccb7eb5d..0000000000
--- a/system/Eterm/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Eterm is a color vt102 terminal emulator intended as a replacement 
-for xterm. It is designed with a Freedom of Choice philosophy, 
-leaving as much power, flexibility, and freedom as possible in the 
-hands of the user. It is designed to look good and work well, but 
-takes a feature-rich approach rather than one of minimalism while 
-still maintaining speed and efficiency.
diff --git a/system/Eterm/slack-desc b/system/Eterm/slack-desc
deleted file mode 100644
index 36bfeffd4e..0000000000
--- a/system/Eterm/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-     |-----handy-ruler------------------------------------------------------|
-Eterm: Eterm (vt102 terminal emulator)
-Eterm:
-Eterm: Eterm is a color vt102 terminal emulator intended as a replacement
-Eterm: for xterm. It is designed with a Freedom of Choice philosophy,
-Eterm: eaving as much power, flexibility, and freedom as possible in the
-Eterm: hands of the user. It is designed to look good and work well, but
-Eterm: takes a feature-rich approach rather than one of minimalism while
-Eterm: still maintaining speed and efficiency.
-Eterm:
-Eterm: Homepage: https://www.enlightenment.org/
-Eterm:
diff --git a/system/FontAwesome/FontAwesome.SlackBuild b/system/FontAwesome/FontAwesome.SlackBuild
index c831676b78..a47c0d3ef7 100644
--- a/system/FontAwesome/FontAwesome.SlackBuild
+++ b/system/FontAwesome/FontAwesome.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for FontAwesome
 
-# Copyright 2016 Andre Fernando, Indonesia
+# Copyright 2016 Andre Fernando, Indonesia <ando344@gmail.com>
+# Copyright 2024 Isaac Yu <isaacyu@protonmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +23,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=FontAwesome
-VERSION=${VERSION:-4.7.0}
+VERSION=${VERSION:-6.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -52,13 +60,15 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/share/fonts/TTF
-cp -a fonts/*.ttf $PKG/usr/share/fonts/TTF
+cp -a webfonts/*.ttf $PKG/usr/share/fonts/TTF
 
 mkdir -p $PKG/usr/share/fonts/OTF
-cp -a fonts/*.ttf $PKG/usr/share/fonts/OTF
+cp -a otfs/*.otf $PKG/usr/share/fonts/OTF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CONTRIBUTING.md HELP-US-OUT.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTING.md LICENSE.txt README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -67,4 +77,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/FontAwesome/FontAwesome.info b/system/FontAwesome/FontAwesome.info
index 0772e5c9dc..8975257619 100644
--- a/system/FontAwesome/FontAwesome.info
+++ b/system/FontAwesome/FontAwesome.info
@@ -1,10 +1,10 @@
 PRGNAM="FontAwesome"
-VERSION="4.7.0"
-HOMEPAGE="http://fortawesome.github.io/Font-Awesome/"
-DOWNLOAD="https://github.com/FortAwesome/Font-Awesome/archive/v4.7.0/Font-Awesome-4.7.0.tar.gz"
-MD5SUM="a6145901f233f7d54165d8ade779082e"
+VERSION="6.5.2"
+HOMEPAGE="https://fontawesome.com/"
+DOWNLOAD="https://github.com/FortAwesome/Font-Awesome/archive/6.5.2/Font-Awesome-6.5.2.tar.gz"
+MD5SUM="a13a0af66d2e0bbcbeece51a32e44d51"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Andre Fernando"
-EMAIL="ando344@gmail.com"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/FreeFileSync/FreeFileSync.1 b/system/FreeFileSync/FreeFileSync.1
new file mode 100644
index 0000000000..3e60546a7e
--- /dev/null
+++ b/system/FreeFileSync/FreeFileSync.1
@@ -0,0 +1,27 @@
+.TH "FreeFileSync" "1" "10 Dec 2011" "" ""
+.SH "NAME"
+FreeFileSync \(em a folder comparison and synchronization tool (GUI)
+.SH "SYNOPSIS"
+
+.PP 
+.nf 
+FreeFileSync CONFIG_FILE
+.fi 
+.PP 
+.SH "DESCRIPTION"
+
+.PP 
+This is a folder comparison and synchronization tool. It is optimized 
+for highest performance and usability without restricted or overloaded 
+UI interfaces. 
+.PP
+It's key features: Multiple folder pairs, Batch capability, Binary 
+comparison, Handle conflicts and propagate deletions, Optimized 
+performance, Transactional file copy, ...
+.PP 
+.SH "AUTHOR"
+
+.PP 
+FreeFileSync was originally written by ZenJu. It is currently maintained
+by Damien Lecan.
+.PP
diff --git a/system/FreeFileSync/FreeFileSync.SlackBuild b/system/FreeFileSync/FreeFileSync.SlackBuild
new file mode 100644
index 0000000000..d3bb3a3a9a
--- /dev/null
+++ b/system/FreeFileSync/FreeFileSync.SlackBuild
@@ -0,0 +1,122 @@
+#!/bin/bash
+
+# Slackware repackaging script for FreeFileSync
+
+# Copyright 2023 Antonio Leal, Porto Salvo, Oeiras, Portugal
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=FreeFileSync
+VERSION=${VERSION:-13.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+case "$( uname -m )" in
+  x86_64) ARCH=x86_64 ;;
+    i?86) ARCH=i586 ;;
+       *) echo "Package for $(uname -m) architecture is not available." ; exit 1 ;;
+esac
+
+set -e
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+
+tar xvfz $CWD/${PRGNAM}_${VERSION}_Linux.tar.gz
+mkdir p1
+cd p1
+7z x ../${PRGNAM}_${VERSION}_Install.run
+cd ..
+mkdir p2
+cd p2
+tar xvfz ../p1/$PRGNAM.tar.gz
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Make sure top-level perms are correct:
+chmod 0755 .
+
+# Binaries
+mkdir -p $PKG/usr/bin $PKG/opt/$PRGNAM/Bin $PKG/usr/share/pixmaps $PKG/usr/share/applications
+install -D -m0755 FreeFileSync $PKG/opt/$PRGNAM/FreeFileSync
+install -D -m0755 RealTimeSync $PKG/opt/$PRGNAM/RealTimeSync
+if [[ $ARCH == "x86_64" ]]; then
+    install -D -m0755 Bin/FreeFileSync_x86_64 $PKG/opt/$PRGNAM/Bin/FreeFileSync_x86_64
+    install -D -m0755 Bin/RealTimeSync_x86_64 $PKG/opt/$PRGNAM/Bin/RealTimeSync_x86_64
+fi
+if [[ $ARCH == "i586" ]]; then
+    install -D -m0755 Bin/FreeFileSync_i686 $PKG/opt/$PRGNAM/Bin/FreeFileSync_i686
+    install -D -m0755 Bin/RealTimeSync_i686 $PKG/opt/$PRGNAM/Bin/RealTimeSync_i686
+fi
+
+cp -avxu Resources $PKG/opt/$PRGNAM/
+cp Resources/FreeFileSync.png $PKG/usr/share/pixmaps
+cp Resources/RealTimeSync.png $PKG/usr/share/pixmaps
+cp $CWD/FreeFileSync.desktop $PKG/usr/share/applications
+cp $CWD/RealTimeSync.desktop $PKG/usr/share/applications
+
+# Man pages
+mkdir -p $PKG/usr/man/man1
+cat $CWD/FreeFileSync.1 | gzip -c -f > $PKG/usr/man/man1/FreeFileSync.1.gz
+cat $CWD/RealTimeSync.1 | gzip -c -f > $PKG/usr/man/man1/RealTimeSync.1.gz
+
+# Documentation
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp User\ Manual.pdf $PKG/usr/doc/$PRGNAM-$VERSION
+cp LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp CHANGELOG $PKG/usr/doc/$PRGNAM-$VERSION
+
+# Links
+( cd $PKG/usr/bin ; rm -rf FreeFileSync )
+( cd $PKG/usr/bin ; ln -s ../../opt/FreeFileSync/FreeFileSync FreeFileSync )
+( cd $PKG/usr/bin ; rm -rf RealTimeSync )
+( cd $PKG/usr/bin ; ln -s ../../opt/FreeFileSync/RealTimeSync RealTimeSync )
+( cd $PKG/opt/$PRGNAM ; rm -rf User\ Manual.pdf )
+( cd $PKG/opt/$PRGNAM ; ln -s ../../usr/doc/$PRGNAM-$VERSION/User\ Manual.pdf )
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/FreeFileSync/FreeFileSync.desktop b/system/FreeFileSync/FreeFileSync.desktop
new file mode 100644
index 0000000000..85384526e4
--- /dev/null
+++ b/system/FreeFileSync/FreeFileSync.desktop
@@ -0,0 +1,43 @@
+[Desktop Entry]
+Type=Application
+Name=FreeFileSync
+Exec=FreeFileSync %F
+Icon=FreeFileSync
+Terminal=false
+Categories=Utility;FileTools;Archiving;
+StartupNotify=true
+MimeType=application/x-freefilesync-gui;application/x-freefilesync-batch;
+Comment=Folder Comparison and Synchronization
+Comment[ar]=مقارنة ومزامنة المجلدات
+Comment[bg]=Сравняване и синхронизация на папки
+Comment[cs]=porovnání a synchronizace složek
+Comment[da]=Mappesammenligning og synkronisering
+Comment[de]=Ordnervergleich und Synchronisation
+Comment[el]=Σύγκριση Φακέλων και Συγχρονισμός
+Comment[en_GB]=Folder Comparison and Synchronisation
+Comment[es]=Comparación y sincronización de carpetas
+Comment[fi]=Hakemistojen vertailu ja synkronointi
+Comment[fr]=Comparaison de dossiers et Synchronisation
+Comment[he]=סנכרון קבצים ותיקיות
+Comment[hi]=निर्देशिका तुलना और सिंक्रनाइज़ेशन
+Comment[hr]=Usporedba i sinkronizacija mapa
+Comment[hu]=Mappa összehasonlítás és szinkronizálás
+Comment[it]=Comparazione delle Cartelle e Sincronizzazione
+Comment[ja]=フォルダの比較と同期
+Comment[ko]=폴더 비교 및 동기화
+Comment[lt]=Aplankų Palyginimas ir Suvienodinimas
+Comment[nl]=Map vergelijken en synchroniseren
+Comment[no]=Mappe-sammenligning og synkronisering
+Comment[pl]=Porównywanie i Synchronizacja folderów
+Comment[pt]=Comparação e Sincronização de Pastas
+Comment[pt_BR]=Comparação e Sincronização de Pastas
+Comment[ro]=Comparație și sincronizare a directoarelor
+Comment[ru]=Сравнение и синхронизация
+Comment[sk]=Porovnanie a synchronizácia priečinkov
+Comment[sl]=Primerjava in sinhronizacija mape
+Comment[sv]=Mappjämförelse och synkronisering
+Comment[tr]=Klasör karşılaştırma ve eşitleme
+Comment[uk]=Порівнювання та Синхронізація папок
+Comment[vi]=So sánh và đồng bộ hóa thư mục
+Comment[zh]=文件夹比较与同步
+Comment[zh_TW]=資料夾比對和同步
diff --git a/system/FreeFileSync/FreeFileSync.info b/system/FreeFileSync/FreeFileSync.info
new file mode 100644
index 0000000000..43d0759b25
--- /dev/null
+++ b/system/FreeFileSync/FreeFileSync.info
@@ -0,0 +1,10 @@
+PRGNAM="FreeFileSync"
+VERSION="13.5"
+HOMEPAGE="https://freefilesync.org/"
+DOWNLOAD="https://freefilesync.org/download/FreeFileSync_13.5_Linux.tar.gz"
+MD5SUM="54c1cd44eebf7d4834b519e1193e8c2b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="p7zip"
+MAINTAINER="Antonio Leal"
+EMAIL="antonioleal@yahoo.com"
diff --git a/system/FreeFileSync/README b/system/FreeFileSync/README
new file mode 100644
index 0000000000..746cb58861
--- /dev/null
+++ b/system/FreeFileSync/README
@@ -0,0 +1,8 @@
+FreeFileSync is a folder comparison and synchronization software that
+creates and manages backup copies of all your important files.
+Instead of copying every file every time, FreeFileSync determines the
+differences between a source and a target folder and transfers only
+the minimum amount of data needed. FreeFileSync is Open Source
+software,available for Windows, Linux and macOS.
+
+This package installs to /opt/FreeFileSync
diff --git a/system/FreeFileSync/RealTimeSync.1 b/system/FreeFileSync/RealTimeSync.1
new file mode 100644
index 0000000000..1bcaf6d16a
--- /dev/null
+++ b/system/FreeFileSync/RealTimeSync.1
@@ -0,0 +1,27 @@
+.TH "RealTimeSync" "1" "10 Dec 2011" "" ""
+.SH "NAME"
+RealTimeSync \(em a folder comparison and synchronization tool (Batch)
+.SH "SYNOPSIS"
+
+.PP 
+.nf 
+RealTimeSync CONFIG_FILE
+.fi 
+.PP 
+.SH "DESCRIPTION"
+
+.PP 
+This is a folder comparison and synchronization tool. It is optimized 
+for highest performance and usability without restricted or overloaded 
+UI interfaces. 
+.PP
+It's key features: Multiple folder pairs, Batch capability, Binary 
+comparison, Handle conflicts and propagate deletions, Optimized 
+performance, Transactional file copy, ...
+.PP 
+.SH "AUTHOR"
+
+.PP 
+RealTimeSync was originally written by ZenJu. It is currently maintained
+by Damien Lecan.
+.PP
diff --git a/system/FreeFileSync/RealTimeSync.desktop b/system/FreeFileSync/RealTimeSync.desktop
new file mode 100644
index 0000000000..3847da2d8e
--- /dev/null
+++ b/system/FreeFileSync/RealTimeSync.desktop
@@ -0,0 +1,43 @@
+[Desktop Entry]
+Type=Application
+Name=RealTimeSync
+Exec=RealTimeSync %f
+Icon=RealTimeSync
+Terminal=false
+Categories=Utility;FileTools;Archiving;
+StartupNotify=true
+MimeType=application/x-freefilesync-real;
+Comment=Automated Synchronization
+Comment[ar]=المزامنة التلقائية
+Comment[bg]=Автоматична синхронизация
+Comment[cs]=Automatická synchronizace
+Comment[da]=Automatisk synkronisering
+Comment[de]=Automatisierte Synchronisation
+Comment[el]=Αυτοματοποιημένος Συγχρονισμός
+Comment[en_GB]=Automated Synchronisation
+Comment[es]=Sincronización Automática
+Comment[fi]=Automaattinen synkronointi
+Comment[fr]=Synchronisation Automatique
+Comment[he]=סנכרון אוטומטי
+Comment[hi]=स्वचालित सिंक्रनाइज़ेशन
+Comment[hr]=Automatska Sinkronizacija
+Comment[hu]=Automatizált szinkronizálás
+Comment[it]=Sincronizzazione automatizzata
+Comment[ja]=自動同期
+Comment[ko]=자동 동기화
+Comment[lt]=Automatinis Suvienodinimas
+Comment[nl]=Automatische synchronisatie
+Comment[no]=Automatisk synkronisering
+Comment[pl]=Automatyczna synchronizacja
+Comment[pt]=Sincronização Automática
+Comment[pt_BR]=Sincronização Automatizada
+Comment[ro]=Sincronizare Automată
+Comment[ru]=Автоматическая синхронизация
+Comment[sk]=Automatická synchronizácia
+Comment[sl]=Samodejna sinhronizacija
+Comment[sv]=Automatiserad synkronisering
+Comment[tr]=Otomatik eşitleme
+Comment[uk]=Автоматична Синхронізація
+Comment[vi]=Đồng bộ tự động
+Comment[zh]=自动同步
+Comment[zh_TW]=自動化同步
diff --git a/system/FreeFileSync/doinst.sh b/system/FreeFileSync/doinst.sh
new file mode 100644
index 0000000000..9b51b160f6
--- /dev/null
+++ b/system/FreeFileSync/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/gnome/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/gnome >/dev/null 2>&1
+  fi
+fi
diff --git a/system/FreeFileSync/slack-desc b/system/FreeFileSync/slack-desc
new file mode 100644
index 0000000000..f908d14e8b
--- /dev/null
+++ b/system/FreeFileSync/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+FreeFileSync: FreeFileSync (Cross-platform file sync utility with GUI)
+FreeFileSync:
+FreeFileSync: FreeFileSync is a folder comparison and synchronization software
+FreeFileSync: that creates and manages backup copies of all your important files.
+FreeFileSync: Instead of copying every file every time, FreeFileSync determines
+FreeFileSync: the differences between a source and a target folder and transfers
+FreeFileSync: only the minimum amount of data needed. FreeFileSync is Open
+FreeFileSync: Source software, available for Windows, Linux and macOS.
+FreeFileSync:
+FreeFileSync: Homepage https://freefilesync.org
+FreeFileSync:
diff --git a/system/FunkLoad/FunkLoad.SlackBuild b/system/FunkLoad/FunkLoad.SlackBuild
index 14709f1f9e..a4a5af7f73 100644
--- a/system/FunkLoad/FunkLoad.SlackBuild
+++ b/system/FunkLoad/FunkLoad.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for FunkLoad
 
@@ -19,10 +19,13 @@
 
 #  0. You just DO WHAT THE FUCK YOU WANT TO.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=FunkLoad
 VERSION=${VERSION:-1.17.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -32,7 +35,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -79,4 +89,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/GentiumPlus/GentiumPlus.SlackBuild b/system/GentiumPlus/GentiumPlus.SlackBuild
index 16632edb2b..759f0716f9 100644
--- a/system/GentiumPlus/GentiumPlus.SlackBuild
+++ b/system/GentiumPlus/GentiumPlus.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for GentiumPlus
 
@@ -22,12 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=GentiumPlus
 VERSION=${VERSION:-5.000}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -61,4 +73,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-noarch-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/GentiumPlus/README b/system/GentiumPlus/README
index 205de87bc4..d27b0a8a66 100644
--- a/system/GentiumPlus/README
+++ b/system/GentiumPlus/README
@@ -1,4 +1,4 @@
-Gentium Plus is a typeface family designed to enable the diverse ethnic groups
-around the world who use the Latin, Cyrillic and Greek scripts to produce
-readable, high-quality publications. It supports a wide range of Latin- and
-Cyrillic-based alphabets.
+Gentium Plus is a typeface family designed to enable the diverse
+ethnic groups around the world who use the Latin, Cyrillic and Greek
+scripts to produce readable, high-quality publications. It supports a
+wide range of Latin- and Cyrillic-based alphabets.
diff --git a/system/I-Nex/I-Nex.SlackBuild b/system/I-Nex/I-Nex.SlackBuild
index bf8428c4f9..246848795d 100644
--- a/system/I-Nex/I-Nex.SlackBuild
+++ b/system/I-Nex/I-Nex.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for I-Nex
 
@@ -22,10 +22,23 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220331 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - don't install .desktop files +x.
+# - make /usr/bin/i-nex symlink relative.
+
+# 20220212 bkw: Modified by SlackBuilds.org: BUILD=2.
+# - add -j1 to 'make install' to avoid breaking parallel builds.
+# - fix the .desktop files
+# - install the rest of the docs (AUTHORS, ChangeLog).
+# - don't install useless INSTALL to doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=I-Nex
 VERSION=${VERSION:-7.6.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +48,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,9 +82,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 sed -i -e 's|^STATIC.*|STATIC = false|' i-nex.mk
 
@@ -86,15 +103,25 @@ CFLAGS="$SLKCFLAGS" \
 
 cd ..
 make
-make install DESTDIR=$PKG
+make -j1 install DESTDIR=$PKG
+strip $PKG/usr/bin/i-nex-edid
+
+# the shipped .desktop files don't validate, and are silly. also they
+# get installed executable...
+rm -f $PKG/usr/share/applications/*
+for i in $CWD/*.desktop; do
+  cat $i > $PKG/usr/share/applications/$( basename $i )
+done
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# 20220331 bkw: this symlink should be relative, not absolute.
+rm -f $PKG/usr/bin/i-nex
+ln -s i-nex.gambas $PKG/usr/bin/i-nex
 
+rm -rf $PKG/usr/share/doc
 mv $PKG/usr/share/man/ $PKG/usr/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PRGNAM/COPYING $PRGNAM/INSTALL $PRGNAM/README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PRGNAM/{AUTHORS,COPYING,ChangeLog,README} $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -102,4 +129,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/I-Nex/I-Nex.info b/system/I-Nex/I-Nex.info
index 434197af8a..b7088894d4 100644
--- a/system/I-Nex/I-Nex.info
+++ b/system/I-Nex/I-Nex.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/i-nex/I-Nex/archive/7.6.1/I-Nex-7.6.1.tar.gz"
 MD5SUM="03c2622075c15f24b3b3fa5dd7cf3597"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5 gambas3 libcpuid"
+REQUIRES="gambas3 libcpuid"
 MAINTAINER="Cristiano Urban"
 EMAIL="cristiano.urban.slack@gmail.com"
diff --git a/system/I-Nex/i-nex-library.desktop b/system/I-Nex/i-nex-library.desktop
new file mode 100644
index 0000000000..2b488642dc
--- /dev/null
+++ b/system/I-Nex/i-nex-library.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=I-Nex Library
+Comment=I-Nex System Library Information.
+Exec=/usr/bin/i-nex.gambas --library
+Icon=/usr/share/pixmaps/i-nex-32.png
+Terminal=false
+StartupNotify=true
+Type=Application
+Categories=System;
+Version=1.0
diff --git a/system/I-Nex/i-nex.desktop b/system/I-Nex/i-nex.desktop
new file mode 100644
index 0000000000..46e1f1fc7e
--- /dev/null
+++ b/system/I-Nex/i-nex.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=I-Nex
+Comment=I-Nex Viewing System Device Information.
+Exec=/usr/bin/i-nex.gambas
+Icon=/usr/share/pixmaps/i-nex-32.png
+Terminal=false
+StartupNotify=true
+Type=Application
+Categories=System;
+Version=1.0
diff --git a/system/Iosevka-aile/Iosevka-aile.SlackBuild b/system/Iosevka-aile/Iosevka-aile.SlackBuild
new file mode 100644
index 0000000000..4beb1d38a2
--- /dev/null
+++ b/system/Iosevka-aile/Iosevka-aile.SlackBuild
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+# Slackware build script for Iosevka-aile
+
+# Copyright 2022-2024 K. Eugene Carlson  Tsukuba, Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=Iosevka-aile
+SRCNAM=PkgTTC-IosevkaAile
+VERSION=${VERSION:-29.0.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+unzip $CWD/$SRCNAM-$VERSION.zip
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/share/fonts/TTF
+install -m 644 *.ttc $PKG/usr/share/fonts/TTF/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/LICENSE.md > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE.md
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/Iosevka-aile/Iosevka-aile.info b/system/Iosevka-aile/Iosevka-aile.info
new file mode 100644
index 0000000000..013ce6fd00
--- /dev/null
+++ b/system/Iosevka-aile/Iosevka-aile.info
@@ -0,0 +1,10 @@
+PRGNAM="Iosevka-aile"
+VERSION="29.0.5"
+HOMEPAGE="https://typeof.net/Iosevka"
+DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v29.0.5/PkgTTC-IosevkaAile-29.0.5.zip"
+MD5SUM="6de3ab94f40d3bb521971225f1bab31d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/Iosevka-aile/LICENSE.md b/system/Iosevka-aile/LICENSE.md
new file mode 100644
index 0000000000..7bc97872ae
--- /dev/null
+++ b/system/Iosevka-aile/LICENSE.md
@@ -0,0 +1,110 @@
+Copyright (c) 2015-2022, Renzhi Li (aka. Belleve Invis, belleve@typeof.net)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+--------------------------
+
+
+SIL Open Font License v1.1
+====================================================
+
+
+Preamble
+----------
+
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+
+Definitions
+-------------
+
+`"Font Software"` refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+`"Reserved Font Name"` refers to any names specified as such after the
+copyright statement(s).
+
+`"Original Version"` refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+`"Modified Version"` refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+`"Author"` refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+
+Permission & Conditions
+------------------------
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1. Neither the Font Software nor any of its individual components,
+   in Original or Modified Versions, may be sold by itself.
+
+2. Original or Modified Versions of the Font Software may be bundled,
+   redistributed and/or sold with any software, provided that each copy
+   contains the above copyright notice and this license. These can be
+   included either as stand-alone text files, human-readable headers or
+   in the appropriate machine-readable metadata fields within text or
+   binary files as long as those fields can be easily viewed by the user.
+
+3. No Modified Version of the Font Software may use the Reserved Font
+   Name(s) unless explicit written permission is granted by the corresponding
+   Copyright Holder. This restriction only applies to the primary font name as
+   presented to the users.
+
+4. The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+   Software shall not be used to promote, endorse or advertise any
+   Modified Version, except to acknowledge the contribution(s) of the
+   Copyright Holder(s) and the Author(s) or with their explicit written
+   permission.
+
+5. The Font Software, modified or unmodified, in part or in whole,
+   must be distributed entirely under this license, and must not be
+   distributed under any other license. The requirement for fonts to
+   remain under this license does not apply to any document created
+   using the Font Software.
+
+
+
+Termination
+-----------
+
+This license becomes null and void if any of the above conditions are
+not met.
+
+
+    DISCLAIMER
+    
+    THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+    OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+    COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+    DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+    OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/system/Iosevka-aile/README b/system/Iosevka-aile/README
new file mode 100644
index 0000000000..b3665cb535
--- /dev/null
+++ b/system/Iosevka-aile/README
@@ -0,0 +1,6 @@
+Iosevka is an open-source, sans-serif, monospace, quasi‑proportional
+typeface family, designed for writing code, using in terminals,
+and preparing technical documents.
+
+Iosevka-aile is the quasi-proportional "Aile" family of Iosevka. It is
+designed for documents and writing in particular.
diff --git a/system/Iosevka-aile/doinst.sh b/system/Iosevka-aile/doinst.sh
new file mode 100644
index 0000000000..d119c4ef73
--- /dev/null
+++ b/system/Iosevka-aile/doinst.sh
@@ -0,0 +1,10 @@
+# Update the X font indices:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd usr/share/fonts/TTF
+    /usr/bin/mkfontscale .
+    /usr/bin/mkfontdir .
+  )
+
+  [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f
+fi
diff --git a/system/Iosevka-aile/slack-desc b/system/Iosevka-aile/slack-desc
new file mode 100644
index 0000000000..d1cf4a49fe
--- /dev/null
+++ b/system/Iosevka-aile/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+Iosevka-aile: Iosevka-aile (Slender quasi-proportional sans-serif typeface)
+Iosevka-aile:
+Iosevka-aile: Iosevka-aile is a quasi-proportional subfamily of Iosevka. It is
+Iosevka-aile: designed for documents and writing.
+Iosevka-aile:
+Iosevka-aile:
+Iosevka-aile:
+Iosevka-aile:
+Iosevka-aile:
+Iosevka-aile: Author: Renzhi Li (aka Belleve Invis)
+Iosevka-aile: Homepage: https://typeof.net/Iosevka
diff --git a/system/Iosevka-etoile/Iosevka-etoile.SlackBuild b/system/Iosevka-etoile/Iosevka-etoile.SlackBuild
new file mode 100644
index 0000000000..3aacbe1445
--- /dev/null
+++ b/system/Iosevka-etoile/Iosevka-etoile.SlackBuild
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+# Slackware build script for Iosevka-etoile
+
+# Copyright 2022-2024 K. Eugene Carlson  Tsukuba, Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=Iosevka-etoile
+SRCNAM=PkgTTC-IosevkaEtoile
+VERSION=${VERSION:-29.0.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+unzip $CWD/$SRCNAM-$VERSION.zip
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/share/fonts/TTF
+install -m 644 *.ttc $PKG/usr/share/fonts/TTF/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/LICENSE.md > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE.md
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/Iosevka-etoile/Iosevka-etoile.info b/system/Iosevka-etoile/Iosevka-etoile.info
new file mode 100644
index 0000000000..1fa9e6384c
--- /dev/null
+++ b/system/Iosevka-etoile/Iosevka-etoile.info
@@ -0,0 +1,10 @@
+PRGNAM="Iosevka-etoile"
+VERSION="29.0.5"
+HOMEPAGE="https://typeof.net/Iosevka"
+DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v29.0.5/PkgTTC-IosevkaEtoile-29.0.5.zip"
+MD5SUM="f9dc0b7217481b3a61f5ae859a827bc6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/Iosevka-etoile/LICENSE.md b/system/Iosevka-etoile/LICENSE.md
new file mode 100644
index 0000000000..7bc97872ae
--- /dev/null
+++ b/system/Iosevka-etoile/LICENSE.md
@@ -0,0 +1,110 @@
+Copyright (c) 2015-2022, Renzhi Li (aka. Belleve Invis, belleve@typeof.net)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+--------------------------
+
+
+SIL Open Font License v1.1
+====================================================
+
+
+Preamble
+----------
+
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+
+Definitions
+-------------
+
+`"Font Software"` refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+`"Reserved Font Name"` refers to any names specified as such after the
+copyright statement(s).
+
+`"Original Version"` refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+`"Modified Version"` refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+`"Author"` refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+
+Permission & Conditions
+------------------------
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1. Neither the Font Software nor any of its individual components,
+   in Original or Modified Versions, may be sold by itself.
+
+2. Original or Modified Versions of the Font Software may be bundled,
+   redistributed and/or sold with any software, provided that each copy
+   contains the above copyright notice and this license. These can be
+   included either as stand-alone text files, human-readable headers or
+   in the appropriate machine-readable metadata fields within text or
+   binary files as long as those fields can be easily viewed by the user.
+
+3. No Modified Version of the Font Software may use the Reserved Font
+   Name(s) unless explicit written permission is granted by the corresponding
+   Copyright Holder. This restriction only applies to the primary font name as
+   presented to the users.
+
+4. The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+   Software shall not be used to promote, endorse or advertise any
+   Modified Version, except to acknowledge the contribution(s) of the
+   Copyright Holder(s) and the Author(s) or with their explicit written
+   permission.
+
+5. The Font Software, modified or unmodified, in part or in whole,
+   must be distributed entirely under this license, and must not be
+   distributed under any other license. The requirement for fonts to
+   remain under this license does not apply to any document created
+   using the Font Software.
+
+
+
+Termination
+-----------
+
+This license becomes null and void if any of the above conditions are
+not met.
+
+
+    DISCLAIMER
+    
+    THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+    OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+    COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+    DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+    OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/system/Iosevka-etoile/README b/system/Iosevka-etoile/README
new file mode 100644
index 0000000000..b5cce0c5f3
--- /dev/null
+++ b/system/Iosevka-etoile/README
@@ -0,0 +1,6 @@
+Iosevka is an open-source, sans-serif, monospace, quasi‑proportional
+typeface family, designed for writing code, using in terminals,
+and preparing technical documents.
+
+Iosevka-etoile is the quasi-proportional "Etoile" family of Iosevka. It
+is designed for documents and writing in particular.
diff --git a/system/Iosevka-etoile/doinst.sh b/system/Iosevka-etoile/doinst.sh
new file mode 100644
index 0000000000..d119c4ef73
--- /dev/null
+++ b/system/Iosevka-etoile/doinst.sh
@@ -0,0 +1,10 @@
+# Update the X font indices:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd usr/share/fonts/TTF
+    /usr/bin/mkfontscale .
+    /usr/bin/mkfontdir .
+  )
+
+  [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f
+fi
diff --git a/system/Iosevka-etoile/slack-desc b/system/Iosevka-etoile/slack-desc
new file mode 100644
index 0000000000..d93e4d6d3e
--- /dev/null
+++ b/system/Iosevka-etoile/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+Iosevka-etoile: Iosevka-etoile (Slender quasi-proportional typeface)
+Iosevka-etoile:
+Iosevka-etoile: Iosevka-etoile is a quasi-proportional subfamily of Iosevka. It is
+Iosevka-etoile: designed for documents and writing.
+Iosevka-etoile:
+Iosevka-etoile:
+Iosevka-etoile:
+Iosevka-etoile:
+Iosevka-etoile:
+Iosevka-etoile: Author: Renzhi Li (aka Belleve Invis)
+Iosevka-etoile: Homepage: https://typeof.net/Iosevka
diff --git a/system/Iosevka-slab/Iosevka-slab.SlackBuild b/system/Iosevka-slab/Iosevka-slab.SlackBuild
index 6eeb1de1b8..962f27443f 100644
--- a/system/Iosevka-slab/Iosevka-slab.SlackBuild
+++ b/system/Iosevka-slab/Iosevka-slab.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Iosevka-slab
 
-# Copyright 2020-2021 Eugene M., <damagedone at gmx dot com>
+# Copyright 2020-2024 Eugene M., <damagedone at gmx dot com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=Iosevka-slab
-VERSION=${VERSION:-4.4.0}
+VERSION=${VERSION:-29.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -40,7 +50,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip -o $CWD/ttc-iosevka-slab-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
+unzip -o $CWD/PkgTTC-IosevkaSlab-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -53,7 +63,7 @@ mkdir -p $PKG/usr/share/fonts/TTF
 cp -a *.ttc $PKG/usr/share/fonts/TTF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+cat $CWD/LICENSE.md > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE.md
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -61,4 +71,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/Iosevka-slab/Iosevka-slab.info b/system/Iosevka-slab/Iosevka-slab.info
index 61850dd9df..59576d9a50 100644
--- a/system/Iosevka-slab/Iosevka-slab.info
+++ b/system/Iosevka-slab/Iosevka-slab.info
@@ -1,8 +1,8 @@
 PRGNAM="Iosevka-slab"
-VERSION="4.4.0"
+VERSION="29.1.0"
 HOMEPAGE="https://typeof.net/Iosevka/"
-DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v4.4.0/ttc-iosevka-slab-4.4.0.zip"
-MD5SUM="ab42c82270bdf48172a5ac6ac271869b"
+DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v29.1.0/PkgTTC-IosevkaSlab-29.1.0.zip"
+MD5SUM="a4133e4ec480ba65ce5dfaee12fc6f43"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/Iosevka-slab/LICENSE b/system/Iosevka-slab/LICENSE
deleted file mode 100644
index d952d62c06..0000000000
--- a/system/Iosevka-slab/LICENSE
+++ /dev/null
@@ -1,92 +0,0 @@
-This Font Software is licensed under the SIL Open Font License,
-Version 1.1.
-
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font
-creation efforts of academic and linguistic communities, and to
-provide a free and open framework in which fonts may be shared and
-improved in partnership with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply to
-any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software
-components as distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to,
-deleting, or substituting -- in part or in whole -- any of the
-components of the Original Version, by changing formats or by porting
-the Font Software to a new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed,
-modify, redistribute, and sell modified and unmodified copies of the
-Font Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components, in
-Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the
-corresponding Copyright Holder. This restriction only applies to the
-primary font name as presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created using
-the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/system/Iosevka-slab/LICENSE.md b/system/Iosevka-slab/LICENSE.md
new file mode 100644
index 0000000000..7bc97872ae
--- /dev/null
+++ b/system/Iosevka-slab/LICENSE.md
@@ -0,0 +1,110 @@
+Copyright (c) 2015-2022, Renzhi Li (aka. Belleve Invis, belleve@typeof.net)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+--------------------------
+
+
+SIL Open Font License v1.1
+====================================================
+
+
+Preamble
+----------
+
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+
+Definitions
+-------------
+
+`"Font Software"` refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+`"Reserved Font Name"` refers to any names specified as such after the
+copyright statement(s).
+
+`"Original Version"` refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+`"Modified Version"` refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+`"Author"` refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+
+Permission & Conditions
+------------------------
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1. Neither the Font Software nor any of its individual components,
+   in Original or Modified Versions, may be sold by itself.
+
+2. Original or Modified Versions of the Font Software may be bundled,
+   redistributed and/or sold with any software, provided that each copy
+   contains the above copyright notice and this license. These can be
+   included either as stand-alone text files, human-readable headers or
+   in the appropriate machine-readable metadata fields within text or
+   binary files as long as those fields can be easily viewed by the user.
+
+3. No Modified Version of the Font Software may use the Reserved Font
+   Name(s) unless explicit written permission is granted by the corresponding
+   Copyright Holder. This restriction only applies to the primary font name as
+   presented to the users.
+
+4. The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+   Software shall not be used to promote, endorse or advertise any
+   Modified Version, except to acknowledge the contribution(s) of the
+   Copyright Holder(s) and the Author(s) or with their explicit written
+   permission.
+
+5. The Font Software, modified or unmodified, in part or in whole,
+   must be distributed entirely under this license, and must not be
+   distributed under any other license. The requirement for fonts to
+   remain under this license does not apply to any document created
+   using the Font Software.
+
+
+
+Termination
+-----------
+
+This license becomes null and void if any of the above conditions are
+not met.
+
+
+    DISCLAIMER
+    
+    THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+    OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+    COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+    DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+    OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/system/Iosevka-slab/doinst.sh b/system/Iosevka-slab/doinst.sh
index 2909ee40e1..f0ffee7710 100644
--- a/system/Iosevka-slab/doinst.sh
+++ b/system/Iosevka-slab/doinst.sh
@@ -1,9 +1,9 @@
 # Update the X font indexes:
 
 if [ -x /usr/bin/mkfontdir ]; then
-  ( cd /usr/share/fonts/TTF
-    mkfontscale .
-    mkfontdir .
+  ( cd usr/share/fonts/TTF
+    /usr/bin/mkfontscale .
+    /usr/bin/mkfontdir .
   )
 
   [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f
diff --git a/system/Iosevka/Iosevka.SlackBuild b/system/Iosevka/Iosevka.SlackBuild
index 47b6fefea1..8a6c14de82 100644
--- a/system/Iosevka/Iosevka.SlackBuild
+++ b/system/Iosevka/Iosevka.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Iosevka
 
-# Copyright 2015-2021 Eugene M., <damagedone at gmx dot com>
+# Copyright 2015-2024 Eugene M., <damagedone at gmx dot com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=Iosevka
-VERSION=${VERSION:-4.4.0}
+VERSION=${VERSION:-29.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -40,7 +50,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip -o $CWD/ttc-iosevka-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
+unzip -o $CWD/PkgTTC-Iosevka-$VERSION.zip -d $TMP/$PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -53,7 +63,7 @@ mkdir -p $PKG/usr/share/fonts/TTF
 cp -a *.ttc $PKG/usr/share/fonts/TTF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+cat $CWD/LICENSE.md > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE.md
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -61,4 +71,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/Iosevka/Iosevka.info b/system/Iosevka/Iosevka.info
index 8d0a727657..361db3d74e 100644
--- a/system/Iosevka/Iosevka.info
+++ b/system/Iosevka/Iosevka.info
@@ -1,8 +1,8 @@
 PRGNAM="Iosevka"
-VERSION="4.4.0"
+VERSION="29.1.0"
 HOMEPAGE="https://typeof.net/Iosevka/"
-DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v4.4.0/ttc-iosevka-4.4.0.zip"
-MD5SUM="14a61a686c494cca763b51aeedd7b943"
+DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v29.1.0/PkgTTC-Iosevka-29.1.0.zip"
+MD5SUM="bf725be14592dca7ab1165a4a1844fcb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/Iosevka/LICENSE b/system/Iosevka/LICENSE
deleted file mode 100644
index d952d62c06..0000000000
--- a/system/Iosevka/LICENSE
+++ /dev/null
@@ -1,92 +0,0 @@
-This Font Software is licensed under the SIL Open Font License,
-Version 1.1.
-
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font
-creation efforts of academic and linguistic communities, and to
-provide a free and open framework in which fonts may be shared and
-improved in partnership with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply to
-any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software
-components as distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to,
-deleting, or substituting -- in part or in whole -- any of the
-components of the Original Version, by changing formats or by porting
-the Font Software to a new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed,
-modify, redistribute, and sell modified and unmodified copies of the
-Font Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components, in
-Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the
-corresponding Copyright Holder. This restriction only applies to the
-primary font name as presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created using
-the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/system/Iosevka/LICENSE.md b/system/Iosevka/LICENSE.md
new file mode 100644
index 0000000000..7bc97872ae
--- /dev/null
+++ b/system/Iosevka/LICENSE.md
@@ -0,0 +1,110 @@
+Copyright (c) 2015-2022, Renzhi Li (aka. Belleve Invis, belleve@typeof.net)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+--------------------------
+
+
+SIL Open Font License v1.1
+====================================================
+
+
+Preamble
+----------
+
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+
+Definitions
+-------------
+
+`"Font Software"` refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+`"Reserved Font Name"` refers to any names specified as such after the
+copyright statement(s).
+
+`"Original Version"` refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+`"Modified Version"` refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+`"Author"` refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+
+Permission & Conditions
+------------------------
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1. Neither the Font Software nor any of its individual components,
+   in Original or Modified Versions, may be sold by itself.
+
+2. Original or Modified Versions of the Font Software may be bundled,
+   redistributed and/or sold with any software, provided that each copy
+   contains the above copyright notice and this license. These can be
+   included either as stand-alone text files, human-readable headers or
+   in the appropriate machine-readable metadata fields within text or
+   binary files as long as those fields can be easily viewed by the user.
+
+3. No Modified Version of the Font Software may use the Reserved Font
+   Name(s) unless explicit written permission is granted by the corresponding
+   Copyright Holder. This restriction only applies to the primary font name as
+   presented to the users.
+
+4. The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+   Software shall not be used to promote, endorse or advertise any
+   Modified Version, except to acknowledge the contribution(s) of the
+   Copyright Holder(s) and the Author(s) or with their explicit written
+   permission.
+
+5. The Font Software, modified or unmodified, in part or in whole,
+   must be distributed entirely under this license, and must not be
+   distributed under any other license. The requirement for fonts to
+   remain under this license does not apply to any document created
+   using the Font Software.
+
+
+
+Termination
+-----------
+
+This license becomes null and void if any of the above conditions are
+not met.
+
+
+    DISCLAIMER
+    
+    THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+    OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+    COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+    DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+    OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/system/Iosevka/doinst.sh b/system/Iosevka/doinst.sh
index 2909ee40e1..f0ffee7710 100644
--- a/system/Iosevka/doinst.sh
+++ b/system/Iosevka/doinst.sh
@@ -1,9 +1,9 @@
 # Update the X font indexes:
 
 if [ -x /usr/bin/mkfontdir ]; then
-  ( cd /usr/share/fonts/TTF
-    mkfontscale .
-    mkfontdir .
+  ( cd usr/share/fonts/TTF
+    /usr/bin/mkfontscale .
+    /usr/bin/mkfontdir .
   )
 
   [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f
diff --git a/system/JetBrainsMono/JetBrainsMono.SlackBuild b/system/JetBrainsMono/JetBrainsMono.SlackBuild
index fc74eb4097..3e6e4a5c0d 100644
--- a/system/JetBrainsMono/JetBrainsMono.SlackBuild
+++ b/system/JetBrainsMono/JetBrainsMono.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for JetBrainsMono
 
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=JetBrainsMono
 VERSION=${VERSION:-2.001}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -57,4 +67,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/MySQL-Sandbox/MySQL-Sandbox.SlackBuild b/system/MySQL-Sandbox/MySQL-Sandbox.SlackBuild
index 36d09427e5..db9741301e 100644
--- a/system/MySQL-Sandbox/MySQL-Sandbox.SlackBuild
+++ b/system/MySQL-Sandbox/MySQL-Sandbox.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for MySQL-Sandbox
 
@@ -21,10 +21,13 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=MySQL-Sandbox
 VERSION=${VERSION:-3.2.05}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,7 +37,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -95,4 +105,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/OpenSnitch/OpenSnitch.SlackBuild b/system/OpenSnitch/OpenSnitch.SlackBuild
new file mode 100644
index 0000000000..7d8ac974a8
--- /dev/null
+++ b/system/OpenSnitch/OpenSnitch.SlackBuild
@@ -0,0 +1,225 @@
+#!/bin/bash
+
+# Slackware build script for OpenSnitch
+
+# Copyright 2024 Isaac Yu <isaacyu@protonmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=OpenSnitch
+VERSION=${VERSION:-1.6.5.1}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM=opensnitch
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Install eBPF modules if eBPF=yes is passed
+if [ ${eBPF:-no} = yes ]; then
+  cd ebpf_prog
+  KDIR="/usr/src/linux"
+
+  # set -fno-stack-protector to work around a clang regression
+  # this is fine - bpf programs do not use stack protectors
+  # Reference: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=opensnitch-ebpf-module
+  CLANG="clang -fno-stack-protector" ARCH="$ARCH" KERNEL_DIR="$KDIR" KERNEL_HEADERS="$KDIR" make
+
+  # Remove debug info
+  llvm-strip -g opensnitch*.o
+
+  # Finalize eBPF module installation
+  install -Dm644 opensnitch*.o -t $PKG/usr/lib/opensnitchd/ebpf
+
+  cd ../
+fi
+
+# site-packages directory
+SITE_PACKAGES=$(python3 -c "import site; print(site.getsitepackages()[0])")
+
+# Prevent creation of cache files in /root/.cache/go-build
+export GOCACHE="${GOCACHE:-"$TMP/$SRCNAM-$VERSION/go-cache"}"
+export GOMODCACHE="${GOMODCACHE:-"$TMP/$SRCNAM-$VERSION/go"}"
+
+# Generate protobuf files
+cd proto
+make
+cd ../
+
+# Workaround for namespace conflict
+# Taken from https://github.com/pentoo/pentoo-overlay/blob/master/app-admin/opensnitch/opensnitch-1.6.4.ebuild
+# For more details, refer to https://github.com/evilsocket/opensnitch/issues/496
+# and https://github.com/evilsocket/opensnitch/pull/442
+sed -i 's/^import ui_pb2/from . import ui_pb2/' ui/opensnitch/ui_pb2_grpc.py
+
+# Fix an issue with setup.py installing to python's site-packages instead of /usr
+# prefer scaled SVG instead of pixellated 48x48 PNG
+patch -p1 < $CWD/patches/fix-setup.py.patch
+
+# Modify the go.mod file for the offline build
+patch -p1 < $CWD/patches/modify-go.mod-file.patch
+
+# Remove debian patch
+patch -p1 < $CWD/patches/remove-debian-path.patch
+
+# Use system python packages
+patch -p1 < $CWD/patches/use-system-python-packages.patch
+
+# Generate resource files
+pyrcc5 -o ui/opensnitch/{resources_rc.py,/res/resources.qrc}
+
+# Set up vendored modules
+cd daemon
+mkdir -p vendor
+cat $CWD/modules.txt > vendor/modules.txt
+for DIR in $(grep -o "^# .* " vendor/modules.txt | cut -d' ' -f2)
+do
+  NAME=$(echo $DIR | sed 's/[./]v[0-9]\+$//' | xargs basename)
+  DIR=vendor/$DIR
+
+  # The general rule is to extract the tarball: "tar xvf $CWD/$NAME-*.tar.gz"
+  # However, a few exceptions to this are necessary.
+  if [ $DIR = "vendor/github.com/golang/protobuf" ]; then
+    tar xvf $CWD/$NAME-[0-9]*.tar.gz
+  elif [ $DIR = "vendor/github.com/mdlayher/netlink" ]; then
+    tar xvf $CWD/$NAME-[0-9].[0-9].[0-9].tar.gz
+  elif [ $DIR = "vendor/github.com/varlink/go" ]; then
+    tar xvf $CWD/$NAME-[0-9].[0-9].[0-9].tar.gz
+  elif [ $DIR = "vendor/github.com/vishvananda/netlink" ]; then
+    tar xvf $CWD/$NAME-[a-z]*.tar.gz
+  elif [ $DIR = "vendor/google.golang.org/genproto" ]; then
+    tar xvf $CWD/go-$NAME-*.tar.gz
+  elif [ $DIR = "vendor/google.golang.org/protobuf" ]; then
+    tar xvf $CWD/$NAME-go-*.tar.gz
+  else
+    tar xvf $CWD/$NAME-*.tar.gz
+  fi
+
+  # Rename extracted folders
+  mkdir -p $(dirname $DIR)
+  [ $DIR = "vendor/google.golang.org/genproto" ] && mv go-$NAME-* $DIR || mv $NAME-* $DIR
+done
+
+# Build the opensnitch daemon
+CGO_CFLAGS="$SLKCFLAGS" \
+CGO_CXXFLAGS="$SLKCFLAGS" \
+go build -mod vendor -o opensnitchd
+
+# Install the opensnitch daemon
+install -Dm755 opensnitchd $PKG/usr/bin/opensnitchd
+
+# Now that the opensnitch daemon is installed, install the ui:
+cd ../ui
+python3 setup.py install --root=$PKG
+cd ../
+
+# configuration files
+mkdir -p $PKG/etc/opensnitchd
+cp daemon/default-config.json $PKG/etc/opensnitchd/default-config.json.new
+cp daemon/system-fw.json $PKG/etc/opensnitchd/system-fw.json.new
+
+# logrotate
+mkdir -p $PKG/etc/logrotate.d
+cp utils/packaging/daemon/deb/debian/opensnitch.logrotate $PKG/etc/logrotate.d/opensnitch.new
+
+# Create log files in such a way that they won't clobber existing ones
+# This was taken from ponce's clamav SlackBuild
+mkdir -p $PKG/var/log
+touch $PKG/var/log/opensnitchd.log.new
+chmod 0660 $PKG/var/log/opensnitchd.log.new
+
+# Generate translations
+LANGS=( de_DE es_ES eu_ES fi_FI fr_FR hu_HU ja_JP lt_LT nb_NO nl_NL pt_BR ro_RO ru_RU tr_TR zh_TW )
+cd ui/i18n/
+sh generate_i18n.sh
+for LANG in "${LANGS[@]}"
+do
+  install -Dm644 locales/$LANG/opensnitch-$LANG.ts $PKG/$SITE_PACKAGES/opensnitch/i18n/locales/$LANG
+done
+cd ../../
+
+# Install rc script
+mkdir -p $PKG/etc/rc.d
+cat $CWD/rc.opensnitchd > $PKG/etc/rc.d/rc.opensnitchd.new
+chmod 0644 $PKG/etc/rc.d/rc.opensnitchd.new
+
+# Remove tests from the site-packages directory
+rm -rf "$PKG/$SITE_PACKAGES/tests"
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/OpenSnitch/OpenSnitch.info b/system/OpenSnitch/OpenSnitch.info
new file mode 100644
index 0000000000..646d9a360f
--- /dev/null
+++ b/system/OpenSnitch/OpenSnitch.info
@@ -0,0 +1,46 @@
+PRGNAM="OpenSnitch"
+VERSION="1.6.5.1"
+HOMEPAGE="https://github.com/evilsocket/opensnitch"
+DOWNLOAD="https://github.com/evilsocket/opensnitch/archive/v1.6.5.1/opensnitch-1.6.5.1.tar.gz \
+          https://github.com/fsnotify/fsnotify/archive/v1.4.7/fsnotify-1.4.7.tar.gz \
+          https://github.com/golang/protobuf/archive/v1.5.0/protobuf-1.5.0.tar.gz \
+          https://github.com/google/gopacket/archive/v1.1.14/gopacket-1.1.14.tar.gz \
+          https://github.com/google/nftables/archive/v0.1.0/nftables-0.1.0.tar.gz \
+          https://github.com/google/uuid/archive/v1.3.0/uuid-1.3.0.tar.gz \
+          https://github.com/iovisor/gobpf/archive/v0.2.0/gobpf-0.2.0.tar.gz \
+          https://github.com/josharian/native/archive/b6b71de/native-b6b71def0850a2fbd7e6875f8e28217a48c5bcb4.tar.gz \
+          https://github.com/mdlayher/netlink/archive/v1.4.2/netlink-1.4.2.tar.gz \
+          https://github.com/mdlayher/socket/archive/57e3fa5/socket-57e3fa563ecb8fbbbf28b56c674ce382ae48f7db.tar.gz \
+          https://github.com/varlink/go/archive/v0.4.0/go-0.4.0.tar.gz \
+          https://github.com/vishvananda/netlink/archive/e1a867c/netlink-e1a867c6b45251cacffe13a17ae65713a01f3127.tar.gz \
+          https://github.com/vishvananda/netns/archive/db3c7e5/netns-db3c7e526aae966c4ccfa6c8189b693d6ac5d202.tar.gz \
+          https://github.com/golang/net/archive/491a49a/net-491a49abca63de5e07ef554052d180a1b5fe2d70.tar.gz \
+          https://github.com/golang/sys/archive/97ca703/sys-97ca703d548df069cb02aacea9efc3093ffdc3c4.tar.gz \
+          https://github.com/golang/text/archive/v0.3.6/text-0.3.6.tar.gz \
+          https://github.com/googleapis/go-genproto/archive/24fa4b2/go-genproto-24fa4b261c55da65468f2abfdae2b024eef27dfb.tar.gz \
+          https://github.com/grpc/grpc-go/archive/v1.32.0/grpc-go-1.32.0.tar.gz \
+          https://github.com/protocolbuffers/protobuf-go/archive/v1.26.0/protobuf-go-1.26.0.tar.gz"
+MD5SUM="6d8317d89e3928b9e6641035e7b95e57 \
+        e23b3240fc9e807fcffb97d12a433138 \
+        7bff4630d93dc4f9081b5dbc31067899 \
+        5e4827e740a060b8f97116955718de19 \
+        9efa300afa970d9d0d11361dd1fb6ce6 \
+        8d968751528dd23af2f0d79ea9f94a79 \
+        bed8fdc4fc7f844edfd034a7bcc64536 \
+        1967b9ffbde12b2a9ccbc761f22b513e \
+        7e0d02b68cd4c0d9bae88d52ab96a6e9 \
+        327e1dcae5c8b5f5e65efe796de3195b \
+        3527e437021606aa13d0eb55f50edb75 \
+        f7e4e46966ff3771ee77264b9672dae9 \
+        fb384110572b31ee6e222cecbe610013 \
+        880d2f4ea4c362492ed4403ebfb0b9b2 \
+        8ed6c2ccd833013f26c102106405b444 \
+        f406aa34e4555c0bac8c2f00f2ab729b \
+        cbb310e9b9ede71e0ff38df5f5dc8268 \
+        44d6398e2ee17187a8143446db595522 \
+        2e97ffc1575be0c3c82702464a8d7e01"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="protoc-gen-go-grpc python3-grpcio python3-pyinotify python3-slugify"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/OpenSnitch/README b/system/OpenSnitch/README
new file mode 100644
index 0000000000..0ca99fa637
--- /dev/null
+++ b/system/OpenSnitch/README
@@ -0,0 +1,13 @@
+OpenSnitch is a GNU/Linux interactive application firewall inspired by
+Little Snitch.
+
+Opensnitch requires the opensnitchd rc script to execute upon startup.
+That is, add the following line to /etc/rc.local:
+[ -x /etc/rc.d/rc.opensnitchd ] && /etc/rc.d/rc.opensnitchd start
+
+To install the eBPF process monitor module (requires kernel-source),
+pass in eBPF=yes to the SlackBuild.
+
+The eBFP module additionally requires kernel support for KProbes
+(kernel probes) and syscalls tracing. README.SLACKWARE contains
+instructions for compiling a kernel with these features.
diff --git a/system/OpenSnitch/README.SLACKWARE b/system/OpenSnitch/README.SLACKWARE
new file mode 100644
index 0000000000..22f0638e81
--- /dev/null
+++ b/system/OpenSnitch/README.SLACKWARE
@@ -0,0 +1,58 @@
+The eBPF module requires the following kernel features:
+KProbes (CONFIG_KPROBES = y)
+syscalls tracing support (CONFIG_FTRACE_SYSCALLS = y)
+
+Instructions are taken from the following website:
+https://www.slackbook.org/html/system-configuration-kernel.html
+
+Run all of the following commands below as root.
+
+- Enter into the kernel source directory:
+cd /usr/src/linux
+
+- Back up the current .config file:
+cp .config .config_backup
+
+- Bring the kernel back to its base state:
+make mrproper
+
+- Restore the previous .config file:
+cp .config_backup .config
+
+- Configure the kernel (it will load up .config):
+make menuconfig
+
+- Enable KProbes support:
+General architecture-dependent-options  --->
+    [*] KProbes
+
+- Enable syscalls tracing:
+Kernel Hacking  --->
+    [*] Tracers  --->
+        [*] Trace Syscalls
+
+- Save the changes before exiting.
+- After exiting, prepare the source tree for compiling:
+make dep
+make clean
+
+- Compile the kernel:
+make bzImage
+
+- Then compile kernel modules:
+make modules
+
+- Back up previous vmlinuz and System.map files
+- Then copy the new vmlinuz and System.map files to /boot
+- For example (change depending on ARCH, generic vs huge kernel, etc.):
+KERNEL_VER=$(uname -r)
+mv /boot/vmlinuz-generic-$KERNEL_VER /boot/vmlinuz-generic-$KERNEL_VER-old
+cp arch/x86_64/boot/bzImage /boot/vmlinuz-generic-$KERNEL_VER
+mv /boot/System.map-generic-$KERNEL_VER /boot/System.map-generic-$KERNEL_VER.old
+cp System.map /boot/System.map-generic-$KERNEL_VER
+
+- Finally, install the kernel:
+make modules_install
+
+- Please complete any extra necessary steps on your system
+(ex. recompile initrd, run /sbin/lilo, etc.)
diff --git a/system/OpenSnitch/doinst.sh b/system/OpenSnitch/doinst.sh
new file mode 100644
index 0000000000..2dc4554f0e
--- /dev/null
+++ b/system/OpenSnitch/doinst.sh
@@ -0,0 +1,39 @@
+config() {
+  NEW="$1"
+  OLD="`dirname $NEW`/`basename $NEW .new`"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.opensnitchd.new
+config etc/logrotate.d/opensnitch.new
+config etc/opensnitchd/default-config.json.new
+config etc/opensnitchd/system-fw.json.new
+# Remove new log if one is already present
+config var/log/opensnitchd.log.new ; rm -f var/log/opensnitchd.log.new
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/OpenSnitch/modules.txt b/system/OpenSnitch/modules.txt
new file mode 100644
index 0000000000..df3c15795f
--- /dev/null
+++ b/system/OpenSnitch/modules.txt
@@ -0,0 +1,81 @@
+# github.com/fsnotify/fsnotify v1.4.7
+## explicit
+github.com/fsnotify/fsnotify
+# github.com/golang/protobuf v1.5.0
+## explicit
+github.com/golang/protobuf/jsonpb
+# github.com/google/gopacket v1.1.14
+## explicit
+github.com/google/gopacket
+github.com/google/gopacket/layers
+# github.com/google/nftables v0.1.0
+## explicit
+github.com/google/nftables
+github.com/google/nftables/binaryutil
+github.com/google/nftables/expr
+# github.com/google/uuid v1.3.0
+## explicit
+github.com/google/uuid
+# github.com/iovisor/gobpf v0.2.0
+## explicit
+github.com/iovisor/gobpf/elf
+# github.com/josharian/native v0.0.0-20200817173448-b6b71def0850
+## explicit
+github.com/josharian/native
+# github.com/mdlayher/netlink v1.4.2
+## explicit
+github.com/mdlayher/netlink/nltest
+# github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb
+## explicit
+github.com/mdlayher/socket
+# github.com/varlink/go v0.4.0
+## explicit
+github.com/varlink/go/varlink
+# github.com/vishvananda/netlink v0.0.0-20210811191823-e1a867c6b452
+## explicit
+github.com/vishnananda/netlink
+github.com/vishnananda/netlink/netnl
+# github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae
+## explicit
+github.com/vishvananda/netns
+# golang.org/x/net v0.0.0-20211209124913-491a49abca63
+## explicit
+golang.org/x/net/context
+# golang.org/x/sys v0.0.0-20211205182925-97ca703d548d
+## explicit
+golang.org/x/sys/unix
+# golang.org/x/text v0.3.6
+## explicit
+golang.org/x/text/secure/bidirule
+# google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55
+## explicit
+google.golang.org/genproto/googleapis/rpc/status
+# google.golang.org/grpc v1.32.0
+## explicit
+google.golang.org/grpc
+google.golang.org/grpc/connectivity
+google.golang.org/grpc/credentials
+google.golang.org/grpc/encoding/gzip
+google.golang.org/grpc/keepalive
+# google.golang.org/protobuf v1.26.0
+## explicit
+google.golang.org/protobuf/cmd/protoc-gen-go/internal_gengo
+google.golang.org/protobuf/compiler/protogen
+google.golang.org/protobuf/encoding/protojson
+google.golang.org/protobuf/encoding/prototext
+google.golang.org/protobuf/encoding/protowire
+google.golang.org/protobuf/proto
+google.golang.org/protobuf/reflect/protodesc
+google.golang.org/protobuf/reflect/protoreflect
+google.golang.org/protobuf/reflect/protoregistry
+google.golang.org/protobuf/runtime/protoiface
+google.golang.org/protobuf/runtime/protoimpl
+google.golang.org/protobuf/testing/protopack
+google.golang.org/protobuf/types/descriptorpb
+google.golang.org/protobuf/types/known/anypb
+google.golang.org/protobuf/types/known/durationpb
+google.golang.org/protobuf/types/known/emptypb
+google.golang.org/protobuf/types/known/structpb
+google.golang.org/protobuf/types/known/timestamppb
+google.golang.org/protobuf/types/known/wrapperspb
+google.golang.org/protobuf/types/pluginpb
diff --git a/system/OpenSnitch/patches/fix-setup.py.patch b/system/OpenSnitch/patches/fix-setup.py.patch
new file mode 100644
index 0000000000..c0ea3d94d5
--- /dev/null
+++ b/system/OpenSnitch/patches/fix-setup.py.patch
@@ -0,0 +1,21 @@
+This patch was taken from Arch Linux repositories:
+https://gitlab.archlinux.org/archlinux/packaging/packages/opensnitch/-/blob/main/fix-setup.py.patch
+--- a/ui/setup.py
++++ b/ui/setup.py
+@@ -28,11 +28,9 @@ These rules can last forever, until the app restart or just one time.',
+       packages=find_packages(),
+       include_package_data = True,
+       package_data={'': ['*.*']},
+-      data_files=[('/usr/share/applications', ['resources/opensnitch_ui.desktop']),
+-               ('/usr/share/kservices5', ['resources/kcm_opensnitch.desktop']),
+-               ('/usr/share/icons/hicolor/scalable/apps', ['resources/icons/opensnitch-ui.svg']),
+-               ('/usr/share/icons/hicolor/48x48/apps', ['resources/icons/48x48/opensnitch-ui.png']),
+-               ('/usr/share/icons/hicolor/64x64/apps', ['resources/icons/64x64/opensnitch-ui.png']),
+-               ('/usr/share/metainfo', ['resources/io.github.evilsocket.opensnitch.appdata.xml'])],
++      data_files=[('share/applications', ['resources/opensnitch_ui.desktop']),
++               ('share/kservices5', ['resources/kcm_opensnitch.desktop']),
++               ('share/icons/hicolor/scalable/apps', ['resources/icons/opensnitch-ui.svg']),
++               ('share/metainfo', ['resources/io.github.evilsocket.opensnitch.appdata.xml'])],
+       scripts = [ 'bin/opensnitch-ui' ],
+       zip_safe=False)
+
diff --git a/system/OpenSnitch/patches/modify-go.mod-file.patch b/system/OpenSnitch/patches/modify-go.mod-file.patch
new file mode 100644
index 0000000000..7b16668a1e
--- /dev/null
+++ b/system/OpenSnitch/patches/modify-go.mod-file.patch
@@ -0,0 +1,22 @@
+# This patch was adapted from the one on Arch Linux:
+https://gitlab.archlinux.org/archlinux/packaging/packages/opensnitch/-/blob/main/add-go.sum-file.patch
+--- a/daemon/go.mod
++++ b/daemon/go.mod
+@@ -9,10 +9,16 @@ require (
+ 	github.com/google/nftables v0.1.0
+ 	github.com/google/uuid v1.3.0
+ 	github.com/iovisor/gobpf v0.2.0
++	github.com/josharian/native v0.0.0-20200817173448-b6b71def0850
++	github.com/mdlayher/netlink v1.4.2
++	github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb
+ 	github.com/varlink/go v0.4.0
+ 	github.com/vishvananda/netlink v0.0.0-20210811191823-e1a867c6b452
++	github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae
+ 	golang.org/x/net v0.0.0-20211209124913-491a49abca63
+ 	golang.org/x/sys v0.0.0-20211205182925-97ca703d548d
++	golang.org/x/text v0.3.6
++	google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55
+ 	google.golang.org/grpc v1.32.0
+-	google.golang.org/protobuf v1.26.0 // indirect
++	google.golang.org/protobuf v1.26.0
+ )
diff --git a/system/OpenSnitch/patches/remove-debian-path.patch b/system/OpenSnitch/patches/remove-debian-path.patch
new file mode 100644
index 0000000000..6cb62752cd
--- /dev/null
+++ b/system/OpenSnitch/patches/remove-debian-path.patch
@@ -0,0 +1,15 @@
+This patch watch taken from Arch Linux repositories:
+https://gitlab.archlinux.org/archlinux/packaging/packages/opensnitch/-/blob/main/remove-debian-path.patch
+--- a/ui/bin/opensnitch-ui
++++ b/ui/bin/opensnitch-ui
+@@ -35,10 +35,6 @@ from concurrent import futures
+ 
+ import grpc
+ 
+-dist_path = '/usr/lib/python3/dist-packages/'
+-if dist_path not in sys.path:
+-    sys.path.append(dist_path)
+-
+ from opensnitch.service import UIService
+ from opensnitch.config import Config
+ from opensnitch.utils import Themes, Utils, Versions, Message
diff --git a/system/OpenSnitch/patches/use-system-python-packages.patch b/system/OpenSnitch/patches/use-system-python-packages.patch
new file mode 100644
index 0000000000..441e01c480
--- /dev/null
+++ b/system/OpenSnitch/patches/use-system-python-packages.patch
@@ -0,0 +1,22 @@
+This patch was taken from Arch Linux repositories:
+https://gitlab.archlinux.org/archlinux/packaging/packages/opensnitch/-/blob/main/use-system-python-packages.patch
+--- a/ui/Makefile
++++ b/ui/Makefile
+@@ -3,16 +3,13 @@ all: opensnitch/resources_rc.py
+ install:
+ 	@pip3 install --upgrade .
+ 
+-opensnitch/resources_rc.py: translations deps
++opensnitch/resources_rc.py: translations
+ 	@pyrcc5 -o opensnitch/resources_rc.py opensnitch/res/resources.qrc
+ 	sed -i 's/^import ui_pb2/from . import ui_pb2/' opensnitch/ui_pb2*
+ 
+ translations:
+ 	@cd i18n ; make
+ 	
+-deps:
+-	@pip3 install -r requirements.txt
+-
+ clean:
+ 	@rm -rf *.pyc
+ 	@rm -rf opensnitch/resources_rc.py
diff --git a/system/OpenSnitch/rc.opensnitchd b/system/OpenSnitch/rc.opensnitchd
new file mode 100644
index 0000000000..7e8c30fa1c
--- /dev/null
+++ b/system/OpenSnitch/rc.opensnitchd
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# Start opensnitchd:
+start_opensnitchd() {
+  echo "Start Opensnitch"
+
+  if [ -x /usr/bin/opensnitchd ]; then
+    [ ! -d /etc/opensnitchd/rules ] && mkdir -p /etc/opensnitchd/rules
+    chown -R root:root /etc/opensnitchd
+    chown root:root /var/log/opensnitchd.log
+    chmod -R 755 /etc/opensnitchd
+    chmod -R 644 /etc/opensnitchd/rules
+    chmod 600 /var/log/opensnitchd.log
+  fi
+
+  /usr/bin/opensnitchd -rules-path /etc/opensnitchd/rules -log-file /var/log/opensnitchd.log > /dev/null 2>&1 &
+}
+
+# Stop opensnitchd:
+stop_opensnitchd() {
+  if /usr/bin/pgrep -f /usr/bin/opensnitchd >/dev/null; then
+    echo "Stopping application firewall"
+    /usr/bin/pkill -SIGINT opensnitchd
+  else
+    echo "Opensnitch is not running"
+    exit 1
+  fi
+}
+
+# Restart opensnitchd:
+restart_opensnitchd() {
+  stop_opensnitchd
+  sleep 1
+  start_opensnitchd
+}
+
+case "$1" in
+'start')
+  start_opensnitchd
+  ;;
+'stop')
+  stop_opensnitchd
+  ;;
+'restart')
+  restart_opensnitchd
+  ;;
+*)
+  echo "usage $0 start|stop|restart"
+esac
diff --git a/system/OpenSnitch/slack-desc b/system/OpenSnitch/slack-desc
new file mode 100644
index 0000000000..e0387e931b
--- /dev/null
+++ b/system/OpenSnitch/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+OpenSnitch: OpenSnitch (Inbound application firewall)
+OpenSnitch:
+OpenSnitch: OpenSnitch is a GNU/Linux interactive application firewall inspired by
+OpenSnitch: Little Snitch.
+OpenSnitch:
+OpenSnitch:
+OpenSnitch:
+OpenSnitch:
+OpenSnitch:
+OpenSnitch:
+OpenSnitch:
diff --git a/system/ProFont/ProFont.SlackBuild b/system/ProFont/ProFont.SlackBuild
index ed4e0dc168..64e564e313 100644
--- a/system/ProFont/ProFont.SlackBuild
+++ b/system/ProFont/ProFont.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ProFont
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ProFont
 VERSION=${VERSION:-20040610}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=profont-x11
 
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -90,4 +100,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/PySixel/PySixel.SlackBuild b/system/PySixel/PySixel.SlackBuild
index 47a12dc885..617f3c7dd9 100644
--- a/system/PySixel/PySixel.SlackBuild
+++ b/system/PySixel/PySixel.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for PySixel
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=PySixel
 VERSION=${VERSION:-0.1.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -82,4 +92,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/SavvyCAN/README b/system/SavvyCAN/README
index d95fd3aad4..15a2c92283 100644
--- a/system/SavvyCAN/README
+++ b/system/SavvyCAN/README
@@ -4,21 +4,22 @@ A Qt5 based cross platform tool which can be used to load, save, and
 capture canbus frames. This tool is designed to help with visualization,
 reverse engineering, debugging, and capturing of canbus frames.
 
-Really requires at a resolution of at least 1024x768. Fully multi-monitor
-capable. Works on 4K monitors as well.
+Really requires at a resolution of at least 1024x768. Fully
+multi-monitor capable. Works on 4K monitors as well.
 
 You are highly recommended to use the CANDue board from EVTV.
 
 The CANDue board must be running the GVRET firmware which can also be
 found within the collin80 repos.
 
-It is now possible to use any QT SerialBus driver (socketcan, Vector,
-PeakCAN, TinyCAN). There may, however, be some loss of some functionality
-as some functions of SavvyCAN are designed for use directly with the EVTVDue
-and CANDue 2.0 boards.
+It is now possible to use any QT SerialBus driver (socketcan,
+Vector, PeakCAN, TinyCAN). There may, however, be some loss of some
+functionality as some functions of SavvyCAN are designed for use
+directly with the EVTVDue and CANDue 2.0 boards.
 
-It should, however, be noted that use of a capture device is not required to
-make use of this program. It can load and save in several formats:
+It should, however, be noted that use of a capture device is not
+required to make use of this program. It can load and save in several
+formats:
 
 BusMaster log file
 Microchip log file
diff --git a/system/SavvyCAN/SavvyCAN.SlackBuild b/system/SavvyCAN/SavvyCAN.SlackBuild
index 4746c07978..3f410ce432 100644
--- a/system/SavvyCAN/SavvyCAN.SlackBuild
+++ b/system/SavvyCAN/SavvyCAN.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for SavvyCAN
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=SavvyCAN
 VERSION=${VERSION:-197}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -90,4 +100,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/SavvyCAN/SavvyCAN.info b/system/SavvyCAN/SavvyCAN.info
index d44ac6762b..98fb550ce7 100644
--- a/system/SavvyCAN/SavvyCAN.info
+++ b/system/SavvyCAN/SavvyCAN.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/collin80/SavvyCAN/archive/V197/SavvyCAN-197.tar.gz"
 MD5SUM="7bfeb3e3faca1d26f785cc1bffe5af93"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5"
+REQUIRES=""
 MAINTAINER="Fernando Lopez Jr."
 EMAIL="fernando.lopezjr@gmail.com"
diff --git a/system/SavvyCAN/slack-desc b/system/SavvyCAN/slack-desc
index decfa5f12b..5c58f591de 100644
--- a/system/SavvyCAN/slack-desc
+++ b/system/SavvyCAN/slack-desc
@@ -13,7 +13,7 @@ SavvyCAN: capture canbus frames. This tool is designed to help with visua-
 SavvyCAN: lization, reverse engineering, debugging, and capturing of canbus
 SavvyCAN: frames.
 SavvyCAN:
-SavvyCAN: Really requires at a resolution of at least 1024x768. Fully multi-moni-
-SavvyCAN: tor capable. Works on 4K monitors as well.
+SavvyCAN: Really requires at a resolution of at least 1024x768. Fully multi-
+SavvyCAN: monitor capable. Works on 4K monitors as well.
 SavvyCAN:
 SavvyCAN: You are highly recommended to use the CANDue board from EVTV.
diff --git a/system/Sl/Sl.SlackBuild b/system/Sl/Sl.SlackBuild
index 6dfc1440e3..b9d05b6901 100644
--- a/system/Sl/Sl.SlackBuild
+++ b/system/Sl/Sl.SlackBuild
@@ -1,21 +1,28 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Sl
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 # There's already an "sl" on SBo, so this is named Sl. The version number
 # comes from the -version option.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=Sl
 VERSION=${VERSION:-1.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -46,7 +53,7 @@ cat README > $PKGDOC/README_SBo.txt
 cat $PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 cat slack-desc > $PKGINST/slack-desc
-cat doinst.sh > $PKGINST/doinst.sh
+cat $CWD/doinst.sh > $PKGINST/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/Sl/Sl.info b/system/Sl/Sl.info
index 37bd254292..782fa2fe61 100644
--- a/system/Sl/Sl.info
+++ b/system/Sl/Sl.info
@@ -1,10 +1,10 @@
 PRGNAM="Sl"
 VERSION="1.1.3"
-HOMEPAGE="http://web.archive.org/web/20131228142311/http://practicalthought.com/sl/"
-DOWNLOAD="http://web.archive.org/web/20150726011829/http://practicalthought.com:80/sl/sl"
+HOMEPAGE="https://web.archive.org/web/20131228142311/http://practicalthought.com/sl/"
+DOWNLOAD="https://web.archive.org/web/20150726011829/http://practicalthought.com:80/sl/sl"
 MD5SUM="ed4c22a531e957c95df5f41206d6ed2f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/Solaar/README b/system/Solaar/README
index cb67a12858..8904b00ecd 100644
--- a/system/Solaar/README
+++ b/system/Solaar/README
@@ -12,7 +12,7 @@ devices, extra settings (usually not available through the standard
 Linux system configuration) are supported.
 
 By default, the udev rule
-/etc/udev/rules.d/42-logitech-unifying-receiver.rules
+/lib/udev/rules.d/42-logitech-unifying-receiver.rules
 allows all members of the plugdev group to have read/write access to the
 Unifying Receiver device.  Therefore, make sure all desktop users are
 part of the plugdev group:
@@ -21,6 +21,3 @@ usermod -a -G plugdev <username>
 After installation, you must physically remove the Unifying Receiver and
 re-insert it for the device node permissions to take effect for the
 first time.
-
-NOTE: As of 1.0.2 Solaar has moved to python3, so all of its
-dependencies must be built with python3 support.
diff --git a/system/Solaar/Solaar.SlackBuild b/system/Solaar/Solaar.SlackBuild
index 02f2eb1027..e7d077043f 100644
--- a/system/Solaar/Solaar.SlackBuild
+++ b/system/Solaar/Solaar.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Solaar
 
-# Copyright 2019-2020 Erich Ritz, Scottsdale, Arizona, USA
+# Copyright 2019-2024 Erich Ritz, Jenks, Oklahoma, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=Solaar
-VERSION=${VERSION:-1.0.4}
+VERSION=${VERSION:-1.1.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -61,12 +68,12 @@ find -L . \
 
 python3 setup.py install --root=$PKG
 
-mkdir -p $PKG/etc/udev/rules.d
-cp -a rules.d/42-logitech-unify-permissions.rules $PKG/etc/udev/rules.d
+mv $PKG/usr/lib $PKG/
+sed -i 's/#MODE="0660", GROUP="plugdev"/MODE="0660", GROUP="plugdev"/g' $PKG/lib/udev/rules.d/42-logitech-unify-permissions.rules
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING COPYRIGHT ChangeLog README.md \
+  COPYING COPYRIGHT ChangeLog.md README.md Release_Notes.md docs \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -75,4 +82,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/Solaar/Solaar.info b/system/Solaar/Solaar.info
index b42550bf28..3cebd904ad 100644
--- a/system/Solaar/Solaar.info
+++ b/system/Solaar/Solaar.info
@@ -1,10 +1,10 @@
 PRGNAM="Solaar"
-VERSION="1.0.4"
+VERSION="1.1.11"
 HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
-DOWNLOAD="https://github.com/pwr-Solaar/Solaar/archive/1.0.4/Solaar-1.0.4.tar.gz"
-MD5SUM="da7074a03814b42372b6aea31078c9f7"
+DOWNLOAD="https://github.com/pwr-Solaar/Solaar/archive/1.1.11/Solaar-1.1.11.tar.gz"
+MD5SUM="00c5238277ef60d8a091ba28f3220b9e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pyudev pygobject3-python3"
+REQUIRES="python-evdev pyudev python3-xlib python3-psutil"
 MAINTAINER="Erich Ritz"
 EMAIL="erich.public@protonmail.com"
diff --git a/system/TLP/49tlp b/system/TLP/49tlp
deleted file mode 100644
index bfe0e81af1..0000000000
--- a/system/TLP/49tlp
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# tlp - handle suspend/hibernate/resume tasks
-#
-# Copyright (c) 2018 Thomas Koch <linrunner at gmx.net>
-# This software is licensed under the GPL v2 or later.
-
-. "${PM_FUNCTIONS}"
-
-case $1 in
-    hibernate|suspend)
-        tlp suspend
-        ;;
-
-    thaw|resume)
-        tlp resume
-        ;;
-
-    *) exit $NA
-        ;;
-esac
-
-exit 0
diff --git a/system/TLP/README b/system/TLP/README
index 74d9bc935d..f4bd268b0d 100644
--- a/system/TLP/README
+++ b/system/TLP/README
@@ -1,13 +1,15 @@
-TLP implements advanced power management for Linux.
+TLP is a command line tool for optimizing power usage, relevant for
+laptops.
 
-It is a command line tool with automated background tasks,
-does not contain a GUI.
+The default settings are optimized, and customization can be done by
+editing TLP's configuration file(s).
 
-Remove any power saving settings/scripts (e.g.: in /etc/rc.local), and 
-uninstall laptop-mode-tools prior installing or TLP may not work properly.
+Note - Remove any power saving settings/scripts (e.g.: in 
+/etc/rc.local), and uninstall laptop-mode-tools to allow TLP to work
+properly.
 
-See README.SLACKWARE for more information about post-installation script.
+See README.SLACKWARE for post-installation instructions.
 
-An additional configuration is available for Thinkpads.
-See the website for more details.
-http://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html
+Additional configuration is available for Thinkpads.
+
+Website: https://linrunner.de/tlp/
diff --git a/system/TLP/README.Slackware b/system/TLP/README.Slackware
index 34e8b4723d..a028a1b337 100644
--- a/system/TLP/README.Slackware
+++ b/system/TLP/README.Slackware
@@ -10,13 +10,19 @@ chmod +x /etc/rc.d/rc.tlp
 /etc/rc.d/rc.acpid restart
 
 # Configure tlp to be run at startup
-add "/etc/rc.d/rc.tlp start" (without quotes) to /etc/rc.d/rc.local
+Add the following to /etc/rc.d/rc.local
 
-After removal of this package you would need to revert the above
-changes.  Please make sure that you stopped the TLP service before
-removing TLP.
+if [ -x /etc/rc.d/rc.tlp ]; then
+  /etc/rc.d/rc.tlp start
+fi
 
-If you have enabled any hooks in /usr/lib/pm-utils/power.d/ (they are
-disabled by default), then the instructions given in the TLP developer
-documentation can be followed.
-http://linrunner.de/en/tlp/docs/tlp-developer-documentation.html#installscripts
+After removal of the package revert the above changes.
+Make sure to stop the service before uninstalling.
+
+If any hooks in /usr/lib/pm-utils/power.d/ have been enabled (disabled by default),
+the instructions in the developer documentation can be followed:
+
+https://web.archive.org/web/20180514003235/https://linrunner.de/en/tlp/docs/tlp-developer-documentation.html#installscripts
+
+TLP configuration moved from /etc/default/tlp to /etc/tlp.conf
+since version 1.3.0.
\ No newline at end of file
diff --git a/system/TLP/TLP.SlackBuild b/system/TLP/TLP.SlackBuild
index a69c0c6db1..38734c504c 100644
--- a/system/TLP/TLP.SlackBuild
+++ b/system/TLP/TLP.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for TLP
 
-# Copyright 2013-2019 Aaditya Bagga <aaditya_gnulinux@zoho.com>
+# Copyright 2013-2024 Aaditya <aaditya_gnulinux@zoho.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=TLP
-VERSION=${VERSION:-1.2.2}
+VERSION=${VERSION:-1.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,23 +76,15 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Switch to rc.d
-sed 's/init.d/rc.d/' -i Makefile
-
-# Fix for x86_64
-sed "s/usr\/lib/usr\/lib${LIBDIRSUFFIX}/" -i Makefile
-
-# Correct sourcing of non-existant file
-sed 's|. \/lib\/lsb\/init-functions|#. \/lib\/lsb\/init-functions|' -i tlp.init
+# Slackware specific
+sed 's|init.d|rc.d|' -i Makefile
+sed "s|/lib/elogind|/lib${LIBDIRSUFFIX}/elogind|" -i Makefile
 
 export TLP_MAN=/usr/man
 make install-tlp install-man DESTDIR=$PKG
 
-# Install tlp pm-utils hook as we dont have elogind
-install -D -m 755 $CWD/49tlp $PKG/usr/lib${LIBDIRSUFFIX}/pm-utils/sleep.d/49tlp
-
 # Don't clobber configs
-mv $PKG/etc/default/tlp $PKG/etc/default/tlp.new
+mv $PKG/etc/tlp.conf $PKG/etc/tlp.conf.new
 
 # move to rc.tlp
 mv $PKG/etc/rc.d/tlp $PKG/etc/rc.d/rc.tlp.new
@@ -95,7 +94,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp COPYING LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp COPYING LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -103,4 +102,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/TLP/TLP.info b/system/TLP/TLP.info
index bd380f406f..eee87ced4e 100644
--- a/system/TLP/TLP.info
+++ b/system/TLP/TLP.info
@@ -1,10 +1,10 @@
 PRGNAM="TLP"
-VERSION="1.2.2"
+VERSION="1.6.1"
 HOMEPAGE="https://github.com/linrunner/TLP"
-DOWNLOAD="https://github.com/linrunner/TLP/archive/1.2.2.tar.gz"
-MD5SUM="23dc1b2edcf4d01a37c67b12f023df22"
+DOWNLOAD="https://github.com/linrunner/TLP/archive/1.6.1.tar.gz"
+MD5SUM="e6b2702d1737f5f5f04d8dd9f595b988"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Aaditya Bagga"
+MAINTAINER="Aaditya"
 EMAIL="aaditya_gnulinux@zoho.com"
diff --git a/system/TLP/doinst.sh b/system/TLP/doinst.sh
index d21b756e2a..ae35cd7c56 100644
--- a/system/TLP/doinst.sh
+++ b/system/TLP/doinst.sh
@@ -22,5 +22,5 @@ preserve_perms() {
   config $NEW
 }
 
-config etc/default/tlp.new
+config etc/tlp.conf.new
 preserve_perms etc/rc.d/rc.tlp.new
diff --git a/system/TLP/slack-desc b/system/TLP/slack-desc
index 16b264494e..6eb81a36c4 100644
--- a/system/TLP/slack-desc
+++ b/system/TLP/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
    |-----handy-ruler------------------------------------------------------|
-TLP: TLP (Advanced Power Management Tool)
+TLP: TLP (Optimize power usage)
 TLP:
-TLP: TLP brings you the benefits of advanced power management for Linux
+TLP: TLP brings the benefits of advanced power management for Linux
 TLP: without the need to understand every technical detail.
-TLP: TLP comes with a default configuration already optimized for battery
-TLP: life, so you may just install and forget it.
-TLP: Nevertheless TLP is highly customizable to fulfil your specific
-TLP: requirements.
 TLP:
-TLP: Website - https://linrunner.de/en/tlp/tlp.html
+TLP: It comes with a default configuration already optimized for battery
+TLP: life. Customization can be done by editing its config files.
+TLP:
+TLP: Website: https://linrunner.de/tlp/
+TLP:
 TLP:
diff --git a/system/TermRecord/TermRecord.SlackBuild b/system/TermRecord/TermRecord.SlackBuild
index ca45787fd1..958322e356 100644
--- a/system/TermRecord/TermRecord.SlackBuild
+++ b/system/TermRecord/TermRecord.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for TermRecord
 
-# Copyright 2014-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=TermRecord
 VERSION=${VERSION:-1.2.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,7 +79,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -83,4 +93,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/TermRecord/TermRecord.info b/system/TermRecord/TermRecord.info
index 1fa107f82d..9a7f7cb2fb 100644
--- a/system/TermRecord/TermRecord.info
+++ b/system/TermRecord/TermRecord.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://files.pythonhosted.org/packages/54/72/59139ff485c52ea829fb8e3c
 MD5SUM="3fbda3cfbde39f06033954c3d561894f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="Jinja2"
+REQUIRES=""
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/system/Type1_to_OTF/Type1_to_OTF.SlackBuild b/system/Type1_to_OTF/Type1_to_OTF.SlackBuild
index 47c9a81d2e..5e60324e7d 100644
--- a/system/Type1_to_OTF/Type1_to_OTF.SlackBuild
+++ b/system/Type1_to_OTF/Type1_to_OTF.SlackBuild
@@ -1,5 +1,4 @@
-#!/bin/sh
-
+#!/bin/bash
 # Slackware build script for Type1_to_OTF
 
 # Copyright 2017 Duncan Roe, Melbourne, Australia
@@ -22,13 +21,23 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=Type1_to_OTF
 VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -57,4 +66,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/Type1_to_OTF/Type1_to_OTF.info b/system/Type1_to_OTF/Type1_to_OTF.info
index 4c42e24f38..6aca199f0e 100644
--- a/system/Type1_to_OTF/Type1_to_OTF.info
+++ b/system/Type1_to_OTF/Type1_to_OTF.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/duncan-roe/Type1_to_OTF/archive/v1.0/Type1_to_OTF-1
 MD5SUM="33708ff7ff9342f4308c104e4f8ee342"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="afdko"
+REQUIRES="afdko python3-MutatorMath python3-booleanOperations python3-defcon python3-fontMath python3-fontParts python3-fontPens python3-psautohint python3-pyclipper python3-ufoProcessor python3-ufonormalizer python3-zopfli"
 MAINTAINER="Duncan Roe"
 EMAIL="duncan_roe@optusnet.com.au"
diff --git a/system/UEFITool/README b/system/UEFITool/README
new file mode 100644
index 0000000000..72cd8472a6
--- /dev/null
+++ b/system/UEFITool/README
@@ -0,0 +1,18 @@
+UEFITool is a cross-platform open source application written in C++/Qt,
+that parses UEFI-compatible firmware image into a tree structure,
+verifies image's integrity and provides a GUI to manipulate image's
+elements.
+
+Project development started in the middle of 2013 because of the lack
+of cross-platform open source utilities for tinkering with UEFI images.
+
+In the beginning of 2015 the major refactoring round was started to make
+the program compatible with newer UEFI features including FFSv3 volumes
+and fixed image elements. It's in development right now with the
+following features still missing:
+
+- Editor part, i.e image reconstruction routines
+- Console UI
+The missing parts are in development and the version with a new engine
+
+will be made as soon as image reconstruction works again.
diff --git a/system/UEFITool/UEFITool.SlackBuild b/system/UEFITool/UEFITool.SlackBuild
new file mode 100644
index 0000000000..c2a3c73fa9
--- /dev/null
+++ b/system/UEFITool/UEFITool.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/bash
+
+# Slackware build script for UEFITool
+
+# Copyright 2023 Fernando Lopez Jr. <fernando.lopezjr@gmail.com>
+# All rights reserved.
+
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=UEFITool
+VERSION=${VERSION:-A67}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+meson \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  . build
+
+DESTDIR=$PKG ${NINJA:=ninja} -C build -v install
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+#mkdir -p $PKG/usr/man
+#find $PKG/usr/man -type f -exec gzip -9 {} \;
+#for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.md README.md version.h $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/UEFITool/UEFITool.info b/system/UEFITool/UEFITool.info
new file mode 100644
index 0000000000..ade955a226
--- /dev/null
+++ b/system/UEFITool/UEFITool.info
@@ -0,0 +1,10 @@
+PRGNAM="UEFITool"
+VERSION="A67"
+HOMEPAGE="https://github.com/LongSoft/UEFITool"
+DOWNLOAD="https://github.com/LongSoft/UEFITool/archive/A67/UEFITool-A67.tar.gz"
+MD5SUM="27b0eed00e3486a03a8842578d686da1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Fernando Lopez Jr."
+EMAIL="fernando.lopezjr@gmail.com"
diff --git a/system/UEFITool/slack-desc b/system/UEFITool/slack-desc
new file mode 100644
index 0000000000..bb49e770cd
--- /dev/null
+++ b/system/UEFITool/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+UEFITool: UEFITool (EFI-compatible firmware image editor)
+UEFITool:
+UEFITool: UEFITool is a cross-platform open source application written in
+UEFITool: C++/Qt, that parses UEFI-compatible firmware image into a tree 
+UEFITool: structure,verifies image's integrity and provides a GUI to manipulate
+UEFITool: image's elements.
+UEFITool:
+UEFITool:
+UEFITool:
+UEFITool: homepage: https://github.com/LongSoft/UEFITool
+UEFITool:
diff --git a/system/USBdev/README b/system/USBdev/README
deleted file mode 100644
index 47745db577..0000000000
--- a/system/USBdev/README
+++ /dev/null
@@ -1,4 +0,0 @@
-USBdev is a USB devices recognition tool on Linux. The tool compares
-the USB devices that is connected before and after once you connect
-to the further doors USB. USBdev use linux-usb.org repository to get
-data devices.
diff --git a/system/USBdev/USBdev.SlackBuild b/system/USBdev/USBdev.SlackBuild
deleted file mode 100644
index 2b2f59af4a..0000000000
--- a/system/USBdev/USBdev.SlackBuild
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for USBdev
-
-# Copyright 2016-2019  Dimitris Zlatanidis  Orestiada, Greece
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=USBdev
-VERSION=${VERSION:-2019.11.05}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python3 setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.rst LICENSE ChangeLog.txt requirements.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/USBdev/USBdev.info b/system/USBdev/USBdev.info
deleted file mode 100644
index 8c48c4a196..0000000000
--- a/system/USBdev/USBdev.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="USBdev"
-VERSION="2019.11.05"
-HOMEPAGE="https://gitlab.com/dslackw/USBdev"
-DOWNLOAD="https://gitlab.com/dslackw/USBdev/-/archive/2019.11.05/USBdev-2019.11.05.tar.gz"
-MD5SUM="b64b627197a6794869f328d3a3ae4030"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3 pyusb"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/system/USBdev/slack-desc b/system/USBdev/slack-desc
deleted file mode 100644
index 902a35aa13..0000000000
--- a/system/USBdev/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-      |-----handy-ruler------------------------------------------------------|
-USBdev: USBdev (Recognition tool of USB devices)
-USBdev:
-USBdev: USBdev is a USB devices recognition tool on Linux. The tool compares
-USBdev: the USB devices that is connected before and after once you connect
-USBdev: to the further doors USB. USBdev use linux-usb.org repository to get
-USBdev: data devices.
-USBdev:
-USBdev: Homepage: https://gitlab.com/dslackw/USBdev
-USBdev:
-USBdev:
-USBdev:
diff --git a/system/WoeUSB/README b/system/WoeUSB/README
new file mode 100644
index 0000000000..01cdeca161
--- /dev/null
+++ b/system/WoeUSB/README
@@ -0,0 +1 @@
+A Microsoft Windows USB installation media preparer for GNU+Linux
diff --git a/system/WoeUSB/WoeUSB.SlackBuild b/system/WoeUSB/WoeUSB.SlackBuild
new file mode 100644
index 0000000000..dcb3fbc6a5
--- /dev/null
+++ b/system/WoeUSB/WoeUSB.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+# Slackware build script for WoeUSB script.
+
+# Copyright 2023 Fernando Lopez Jr. <fernando.lopezjr@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=WoeUSB
+VERSION=${VERSION:-5.2.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+install -D -m755 sbin/woeusb $PKG/sbin/woeusb
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+  # TODO make this work in a future release. thank you.
+#find $PKG/share/man -type f -exec gzip -9 {} \;
+#for i in $( find $PKG/share/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm #$i ; done
+
+mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps/
+cp -a share/woeusb/woeusb.svg $PKG/usr/share/icons/hicolor/scalable/apps/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTING.md README.md LICENSES/* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/WoeUSB/WoeUSB.info b/system/WoeUSB/WoeUSB.info
new file mode 100644
index 0000000000..29684e65e8
--- /dev/null
+++ b/system/WoeUSB/WoeUSB.info
@@ -0,0 +1,10 @@
+PRGNAM="WoeUSB"
+VERSION="5.2.4"
+HOMEPAGE="https://github.com/WoeUSB/WoeUSB"
+DOWNLOAD="https://github.com/WoeUSB/WoeUSB/archive/v5.2.4/WoeUSB-5.2.4.tar.gz"
+MD5SUM="02e1ec5456d7934207dd7fd34c6aff87"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="wimlib"
+MAINTAINER="Fernando Lopez Jr."
+EMAIL="fernando.lopezjr@gmail.com"
diff --git a/system/WoeUSB/doinst.sh b/system/WoeUSB/doinst.sh
new file mode 100644
index 0000000000..4110f5514d
--- /dev/null
+++ b/system/WoeUSB/doinst.sh
@@ -0,0 +1,5 @@
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/WoeUSB/slack-desc b/system/WoeUSB/slack-desc
new file mode 100644
index 0000000000..fe498357ee
--- /dev/null
+++ b/system/WoeUSB/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+WoeUSB: WoeUSB (usb windows iso maker)
+WoeUSB:
+WoeUSB: A Microsoft Windows USB installation media preparer for GNU+Linux
+WoeUSB:
+WoeUSB: https://github.com/WoeUSB/WoeUSB
+WoeUSB:
+WoeUSB:
+WoeUSB:
+WoeUSB:
+WoeUSB:
+WoeUSB:
diff --git a/system/ZoneMinder/README b/system/ZoneMinder/README
index 44db1da50e..67ba5950d5 100644
--- a/system/ZoneMinder/README
+++ b/system/ZoneMinder/README
@@ -2,15 +2,15 @@ ZoneMinder is a Linux video camera security and surveillance solution.
 
 This suite is intended for use in single or multi-camera video
 security applications, commercial or home CCTV. It supports capture,
-analysis, recording, and monitoring of video data. PTZ cameras can
-be controlled via web or semi-automatically using a variety of
+analysis, recording, and monitoring of video data. PTZ cameras
+can be controlled via web or semi-automatically using a variety of
 protocols. It can also be integrated into a home automation system
-via X.10 or other protocols.  This build includes cambozola and jscalendar.
+via X.10 or other protocols. This build includes cambozola and
+jscalendar.
 
 Optional dependencies are php-apcu (to enable the ZoneMinder API),
-perl-Archive-Zip (automatic event uploading), perl-X10 (integration with
-X10-based home automation), perl-Device-SerialPort (RS232/RS485 PTZ camera
-control), perl-MIME-Lite, and perl-MIME-Entity (automatic event mail
-notification).
+perl-Archive-Zip (automatic event uploading), perl-Device-SerialPort 
+(RS232/RS485 PTZ camera control), perl-MIME-Lite, and perl-MIME-Entity
+(automatic event mail notification).
 
 See README.SLACKWARE for configuration information.
diff --git a/system/ZoneMinder/ZoneMinder.SlackBuild b/system/ZoneMinder/ZoneMinder.SlackBuild
index 222d092dc5..02b4d6b977 100644
--- a/system/ZoneMinder/ZoneMinder.SlackBuild
+++ b/system/ZoneMinder/ZoneMinder.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ZoneMinder
 
@@ -22,10 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ZoneMinder
 VERSION=${VERSION:-1.32.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 CAMBOZOLA_VERSION=${CAMBOZOLA_VERSION:-0.936}  # Java streaming client
 JSCALENDAR_VERSION=${JSCALENDAR_VERSION:-1.0} # Calendar plugin (use 1.0 here)
@@ -44,7 +47,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -179,4 +189,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ZoneMinder/ZoneMinder.info b/system/ZoneMinder/ZoneMinder.info
index 5e2c800c75..f2b558a20a 100644
--- a/system/ZoneMinder/ZoneMinder.info
+++ b/system/ZoneMinder/ZoneMinder.info
@@ -2,13 +2,13 @@ PRGNAM="ZoneMinder"
 VERSION="1.32.2"
 HOMEPAGE="https://www.ZoneMinder.com"
 DOWNLOAD="https://slackware.uk/~urchlay/src/ZoneMinder-1.32.2.tar.gz \
-          http://www.andywilcock.com/code/cambozola/cambozola-0.936.tar.gz \
+          https://slackware.uk/~urchlay/src/cambozola-0.936.tar.gz \
           https://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip"
 MD5SUM="fc986fcb7601d3fe463a2970ead67cf7 \
         c4896a99702af61eead945ed58b5667b \
         10f2160fe68294013efcd1473cd36f72"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-Sys-MemInfo perl-Date-Manip perl-Sys-Mmap perl-LWP-Protocol-https SDL2 perl-JSON-MaybeXS perl-Number-Bites-Human perl-TimeDate perl-Sys-CPU ffmpeg libmp4v2 x264"
+REQUIRES="perl-Sys-MemInfo perl-Date-Manip perl-Sys-Mmap perl-LWP-Protocol-https perl-JSON-MaybeXS perl-Number-Bites-Human perl-TimeDate perl-Sys-CPU libmp4v2 x264"
 MAINTAINER="Geno Bob"
 EMAIL="GenoBob@gmail.com"
diff --git a/system/a2tools/a2tools.SlackBuild b/system/a2tools/a2tools.SlackBuild
index 6886498b7a..7688d71525 100644
--- a/system/a2tools/a2tools.SlackBuild
+++ b/system/a2tools/a2tools.SlackBuild
@@ -1,15 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for a2tools
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230601 bkw: BUILD=2, fix compiler warnings.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=a2tools
 VERSION=${VERSION:-003}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,23 +24,23 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -44,19 +49,18 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
-unzip $CWD/$PRGNAM-v$VERSION.zip
+unzip $CWD/$PRGNAM-v$VERSION.zip -x '*.exe' '*.dos' '*.csh'
 cd $PRGNAM
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod 644 *
+
+# 20230531 bkw: fix a couple of (probably harmless) compiler warnings.
+patch -p1 < $CWD/fix_warnings.diff
 
 # It doesn't come with a Makefile, it comes with a csh script. Don't
 # use it...
 
-gcc $SLKCFLAGS -DUNIX -Wall -o $PRGNAM $PRGNAM.c
+${CC:-gcc} $SLKCFLAGS -DUNIX -Wall -o $PRGNAM $PRGNAM.c
 mkdir -p $PKG/usr/bin $PKG/usr/man/man6
 install -s -m0755 $PRGNAM $PKG/usr/bin
 gzip -9c < $PRGNAM.6 > $PKG/usr/man/man6/$PRGNAM.6.gz
@@ -66,12 +70,13 @@ for link in a2ls a2in a2out a2rm; do
   ln -s $PRGNAM.6.gz $PKG/usr/man/man6/$link.6.gz
 done
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a LICENSE README $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/a2tools/a2tools.info b/system/a2tools/a2tools.info
index 274cb5d59a..2d6689c373 100644
--- a/system/a2tools/a2tools.info
+++ b/system/a2tools/a2tools.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/a2tools/fix_warnings.diff b/system/a2tools/fix_warnings.diff
new file mode 100644
index 0000000000..33ff698796
--- /dev/null
+++ b/system/a2tools/fix_warnings.diff
@@ -0,0 +1,21 @@
+diff -Naur a2tools/a2tools.c a2tools.patched/a2tools.c
+--- a2tools/a2tools.c	2001-04-10 00:18:01.000000000 -0400
++++ a2tools.patched/a2tools.c	2023-05-31 23:25:37.538490402 -0400
+@@ -541,7 +541,7 @@
+ void a2out (void) {
+     unsigned char listbuffer[256];
+     unsigned int hop, next_trk, next_sec, i, j;
+-    void (*postproc_function)(void);
++    void (*postproc_function)(void) = NULL;
+     if (!dir_do(dir_find_name)) quit(6,"File not found.\n");
+     hop = begun = 0;
+     next_trk=dir_entry_data[0];
+@@ -817,7 +817,7 @@
+ 
+     /* prepare source filename by padding blanks */
+     i=0;
+-    while(i<30 && a2_name[i]) padded_name[i]=a2_name[i++] & 0x7f;
++    while(i<30 && a2_name[i]) { padded_name[i]=a2_name[i] & 0x7f; i++; }
+     while(i<30) padded_name[i++]=' ';
+ 
+     /* get VTOC and check validity */
diff --git a/system/acefile/README b/system/acefile/README
new file mode 100644
index 0000000000..a214806300
--- /dev/null
+++ b/system/acefile/README
@@ -0,0 +1,17 @@
+acefile (extract ACE 1.0 and 2.0 archives)
+
+This single-file, pure python 3, no-dependencies implementation is
+intended to be used as a library, but also provides a stand-alone
+unace utility. As a mostly pure-python implementation, it is
+significantly slower than native implementations, but more robust
+against vulnerabilities.
+
+This implementation supports up to version 2.0 of the ACE archive
+format, including the EXE, DELTA, PIC and SOUND modes of ACE 2.0,
+password protected archives and multi-volume archives. It does not
+support writing to archives. It is an implementation from scratch,
+based on the 1998 document titled "Technical information of the
+archiver ACE v1.2" by Marcel Lemke, using unace 2.5 and WinAce 2.69 by
+Marcel Lemke as reference implementations.
+
+Unlike the standard unace, this is Free Software (BSD-licensed).
diff --git a/system/acefile/acefile-unace.1 b/system/acefile/acefile-unace.1
new file mode 100644
index 0000000000..ca29026b4d
--- /dev/null
+++ b/system/acefile/acefile-unace.1
@@ -0,0 +1,107 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "ACEFILE-UNACE" 1 "2023-04-18" "0.6.12" "SlackBuilds.org"
+.SH NAME
+acefile-unace \- extract/view/test ACE archives
+.\" RST source for acefile-unace(1) man page. Convert with:
+.
+.\" rst2man.py acefile-unace.rst > acefile-unace.1
+.
+.SH SYNOPSIS
+.sp
+\fBacefile\-unace\fP [\fB\-h\fP] [\fB\-V\fP] [\fB\-x\fP | \fB\-t\fP | \fB\-l\fP |
+\fB\-\-extract\fP | \fB\-\-test\fP | \fB\-\-list\fP | \fB\-\-headers\fP] [\fB\-d\fP
+\fIdirectory\fP] [\fB\-p\fP \fIpassword\fP] [\fB\-r\fP | \fB\-\-restore\fP] [\fB\-b\fP |
+\fB\-batch\fP] [\fB\-\-debug\fP] \fBace\-file\fP [\fBfile(s)\fP]
+.SH DESCRIPTION
+.sp
+\fBacefile\-unace\fP extracts, views, or tests \fBACE\fP archives, such
+as those created by WinACE. It does not allow creating or writing to
+archives.
+.sp
+\fBacefile\-unace\fP supports up to version 2.0 of the ACE archive
+format, including the EXE, DELTA, PIC and SOUND modes of ACE 2.0,
+password protected archives, and multi\-volume archives.
+.sp
+The \fBace\-file\fP argument is required. With no options, the default is to
+extract all files within \fBace\-file\fP to the current directory.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B  \-h\fP,\fB  \-\-help
+Show built\-in help message and exit.
+.TP
+.B  \-V\fP,\fB  \-\-version
+Show version number and exit.
+.TP
+.B  \-\-extract\fP,\fB  \-x
+Extract files in archive (default).
+.TP
+.B  \-\-test\fP,\fB  \-t
+Test archive integrity.
+.TP
+.B  \-\-list\fP,\fB  \-l
+List files in archive.
+.TP
+.B  \-\-headers
+Dump archive headers.
+.TP
+.BI \-d \ directory\fR,\fB \ \-\-basedir \ directory
+Base directory for extraction (default: current directory).
+.TP
+.BI \-p \ password\fR,\fB \ \-\-password \ password
+Password for decryption.
+.TP
+.B  \-r\fP,\fB  \-\-restore
+Restore mtime/atime, attribs and ntsecurity on extraction.
+.TP
+.B  \-b\fP,\fB  \-\-batch
+Suppress all interactive input.
+.TP
+.B  \-v\fP,\fB  \-\-verbose
+Be more verbose.
+.TP
+.B  \-\-debug
+Show mode transitions and expose internal exceptions.
+.UNINDENT
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/acefile\-unace\-0.6.12/LICENSE.md for license information.
+.SH AUTHORS
+.sp
+\fBacefile\-unace\fP was written by Daniel Roethlisberger.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The acefile\-unace homepage: \fI\%https://pypi.org/project/acefile/\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/system/acefile/acefile-unace.rst b/system/acefile/acefile-unace.rst
new file mode 100644
index 0000000000..83b4b68da1
--- /dev/null
+++ b/system/acefile/acefile-unace.rst
@@ -0,0 +1,97 @@
+.. RST source for acefile-unace(1) man page. Convert with:
+..   rst2man.py acefile-unace.rst > acefile-unace.1
+
+.. |version| replace:: 0.6.12
+.. |date| date::
+
+=============
+acefile-unace
+=============
+
+------------------------------
+extract/view/test ACE archives
+------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+**acefile-unace** [**-h**] [**-V**] [**-x** | **-t** | **-l** |
+**--extract** | **--test** | **--list** | **--headers**] [**-d**
+*directory*] [**-p** *password*] [**-r** | **--restore**] [**-b** |
+**-batch**] [**--debug**] **ace-file** [**file(s)**]
+
+DESCRIPTION
+===========
+
+**acefile-unace** extracts, views, or tests **ACE** archives, such
+as those created by WinACE. It does not allow creating or writing to
+archives.
+
+**acefile-unace** supports up to version 2.0 of the ACE archive
+format, including the EXE, DELTA, PIC and SOUND modes of ACE 2.0,
+password protected archives, and multi-volume archives.
+
+The **ace-file** argument is required. With no options, the default is to
+extract all files within **ace-file** to the current directory.
+
+OPTIONS
+=======
+
+-h, --help
+  Show built-in help message and exit.
+
+-V, --version
+  Show version number and exit.
+
+--extract, -x
+  Extract files in archive (default).
+
+--test, -t
+  Test archive integrity.
+
+--list, -l
+  List files in archive.
+
+--headers
+  Dump archive headers.
+
+-d directory, --basedir directory
+  Base directory for extraction (default: current directory).
+
+-p password, --password password
+  Password for decryption.
+
+-r, --restore
+  Restore mtime/atime, attribs and ntsecurity on extraction.
+
+-b, --batch
+  Suppress all interactive input.
+
+-v, --verbose
+  Be more verbose.
+
+--debug
+  Show mode transitions and expose internal exceptions.
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/acefile-unace-|version|/LICENSE.md for license information.
+
+AUTHORS
+=======
+
+**acefile-unace** was written by Daniel Roethlisberger.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The acefile-unace homepage: https://pypi.org/project/acefile/
diff --git a/system/acefile/acefile.SlackBuild b/system/acefile/acefile.SlackBuild
new file mode 100644
index 0000000000..ddca4156db
--- /dev/null
+++ b/system/acefile/acefile.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/bash
+
+# Slackware build script for acefile
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Note: the only ACE archives I could actually find in the wild to
+# test this with are the Windows and MS-DOS ACE self-extracting exes,
+# found here:
+
+# https://web.archive.org/web/20170619234433/http://www.winace.com/files/wace269i.exe
+# linked to from https://web.archive.org/web/20170619234433fw_/http://www.winace.com/news.html
+# https://web.archive.org/web/2005if_/http://www.winace.com:80/files/ace26.exe
+
+# $ file wace269i.exe 
+# wace269i.exe: PE32 executable (GUI) Intel 80386, for MS Windows, Petite compressed, ACE self-extracting archive
+# $ file ace26.exe
+# ace26.exe: MS-DOS executable, LE executable for MS-DOS, PMODE/W DOS extender, UPX compressed, ACE self-extracting archive
+
+# acefile-unace extracts both of the exes just fine.
+
+# Also, I used dosbox to run the ms-dos ace.exe and created an .ace
+# archive with 2 small images in it, and it worked fine, too. Although
+# only if the files were small (probably a limitation of the shareware
+# ms-dos ace). With large files, acefile-unace and regular unace
+# both show CRC errors... but sometimes regular unace will segfault
+# instead.
+
+# ...it seems to work just fine. As the README says, it's a bit slow to
+# extract, but AFAICT the results are correct.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=acefile
+VERSION=${VERSION:-0.6.12}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# No CFLAGS or LIBDIRSUFFIX needed here. It uses -O3 for the native code,
+# and I don't see a way to change it.
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+python3 setup.py install --root=$PKG
+strip $PKG/usr/lib*/python*/site-packages/*.so
+
+# man page by SlackBuild author.
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/acefile-unace.1 > $PKG/usr/man/man1/acefile-unace.1.gz
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a *.md $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/acefile/acefile.info b/system/acefile/acefile.info
new file mode 100644
index 0000000000..e93d5ac306
--- /dev/null
+++ b/system/acefile/acefile.info
@@ -0,0 +1,10 @@
+PRGNAM="acefile"
+VERSION="0.6.12"
+HOMEPAGE="https://pypi.org/project/acefile/"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/a/acefile/acefile-0.6.12.tar.gz"
+MD5SUM="a1bb0e5e711e876c12833a305664917a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/acefile/slack-desc b/system/acefile/slack-desc
new file mode 100644
index 0000000000..5b196ae357
--- /dev/null
+++ b/system/acefile/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+acefile: acefile (extract ACE 1.0 and 2.0 archives)
+acefile:
+acefile: This single-file, pure python 3, no-dependencies implementation is
+acefile: intended to be used as a library, but also provides a stand-alone
+acefile: unace utility. As a mostly pure-python implementation, it is
+acefile: significantly slower than native implementations, but more robust
+acefile: against vulnerabilities.
+acefile:
+acefile:
+acefile:
+acefile:
diff --git a/system/ack/ack.SlackBuild b/system/ack/ack.SlackBuild
index 7d14084397..2379d2d658 100644
--- a/system/ack/ack.SlackBuild
+++ b/system/ack/ack.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ack
 
-# Copyright 2013-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ack
-VERSION=${VERSION:-3.4.0}
+VERSION=${VERSION:-3.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -48,4 +58,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ack/ack.info b/system/ack/ack.info
index 887de2ab3d..c7be3afee2 100644
--- a/system/ack/ack.info
+++ b/system/ack/ack.info
@@ -1,8 +1,8 @@
 PRGNAM="ack"
-VERSION="3.4.0"
+VERSION="3.7.0"
 HOMEPAGE="https://beyondgrep.com"
-DOWNLOAD="https://beyondgrep.com/ack-v3.4.0"
-MD5SUM="f8537c7a1a89749f0130627cb7de1515"
+DOWNLOAD="https://beyondgrep.com/ack-v3.7.0"
+MD5SUM="3eb56338dd8b488ca41facefeca6f898"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/acpi/README b/system/acpi/README
index 86e3ab1963..a310be4e9b 100644
--- a/system/acpi/README
+++ b/system/acpi/README
@@ -1,4 +1,4 @@
-Linux ACPI client is a command-line tool, similar to the "apm" command,
-that provides information on battery status, AC power, and thermal readings.
-This does not support ACPI suspending, and it only displays information 
-about ACPI devices.
+Linux ACPI client is a command-line tool, similar to the "apm"
+command, that provides information on battery status, AC power, and
+thermal readings. This does not support ACPI suspending, and it only
+displays information about ACPI devices.
diff --git a/system/acpi/acpi.SlackBuild b/system/acpi/acpi.SlackBuild
index d6a6b8d6c2..51ccd6e6ac 100644
--- a/system/acpi/acpi.SlackBuild
+++ b/system/acpi/acpi.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for acpi
 
 # Copyright 2008-2012 Grigorios Bouzakis <grbzks@imap.cc>
@@ -20,10 +20,13 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=acpi
 VERSION=${VERSION:-1.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -33,7 +36,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -97,4 +107,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/acpi_call/acpi_call.SlackBuild b/system/acpi_call/acpi_call.SlackBuild
index cbba19ee17..0a64efc3eb 100644
--- a/system/acpi_call/acpi_call.SlackBuild
+++ b/system/acpi_call/acpi_call.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for acpi_call
 # Heavily based on virtualbox-kernel.SlackBuild
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=acpi_call
 VERSION=${VERSION:-1.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 KERNEL=${KERNEL:-$(uname -r)}
 KERNELPATH=${KERNELPATH:-/lib/modules/$KERNEL/build}
@@ -44,9 +47,16 @@ fi
 
 PKG_ARCH=$ARCH
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKG_VERS-$PKG_ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$PRGNAM}
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 set -e
@@ -67,6 +77,9 @@ find -L . \
 patch -p0 < $CWD/fix-acpi-include.patch
 patch -p0 < $CWD/fix-5.x-kernel.patch
 
+# Fix build with Linux >= 4.12
+sed -i 's|asm/uaccess.h|linux/uaccess.h|' acpi_call.c
+
 make KDIR=$KERNELPATH
 
 mkdir -p $PKG/lib/modules/$KERNEL/misc
@@ -81,4 +94,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERS-$PKG_ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERS-$PKG_ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/acpitool/acpitool.SlackBuild b/system/acpitool/acpitool.SlackBuild
index 9f1d0e1865..a5829c5d06 100644
--- a/system/acpitool/acpitool.SlackBuild
+++ b/system/acpitool/acpitool.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2007 by ktabic (rdc@ktabic.co.uk)
 # Copyright 2020 Ricardo J. Barberis <ricardo.barberis@gmail.com>
@@ -24,26 +24,36 @@
 
 # Modified by the SlackBuilds.org Project
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=acpitool
 VERSION=${VERSION:-0.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -102,4 +112,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/adobe-source-code-pro-font/README b/system/adobe-source-code-pro-font/README
index fd92e0d369..96d07bb301 100644
--- a/system/adobe-source-code-pro-font/README
+++ b/system/adobe-source-code-pro-font/README
@@ -1,3 +1,3 @@
-Source Code Pro is a set of monospaced OpenType fonts that have been designed
-to work well in coding environments. This family of fonts is a complementary
-design to the Source Sans family.
+Source Code Pro is a set of monospaced OpenType fonts that have been
+designed to work well in coding environments. This family of fonts is
+a complementary design to the Source Sans family.
diff --git a/system/adobe-source-code-pro-font/adobe-source-code-pro-font.SlackBuild b/system/adobe-source-code-pro-font/adobe-source-code-pro-font.SlackBuild
index cf725a9598..9de871278c 100644
--- a/system/adobe-source-code-pro-font/adobe-source-code-pro-font.SlackBuild
+++ b/system/adobe-source-code-pro-font/adobe-source-code-pro-font.SlackBuild
@@ -1,6 +1,10 @@
-#!/bin/sh
+#!/bin/bash
+
+# Slackware build script for adobe-source-code-pro-font
 
 # Copyright (c) 2012 Daniel LEVAI
+# Copyright (c) 2012-2019 Dugan Chen
+# Copyright (c) 2019-2023 Matteo Bernardini
 # All rights reserved.
 #
 # * Redistribution and use in source and binary forms, with or without
@@ -22,20 +26,27 @@
 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Currently maintained by Dugan Chen
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=adobe-source-code-pro-font
-VERSION=${VERSION:-1.030}
-ROMAN_VERSION=2.010
-ITALIC_VERSION=$VERSION
-SRC=source-code-pro-${ROMAN_VERSION}R-ro-${ITALIC_VERSION}R-it
+VERSION=${VERSION:-2.042}
+ITALIC_VERSION=${ITALIC_VERSION:-1.062}
+SRC=source-code-pro-${VERSION}R-u_${ITALIC_VERSION}R-i
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -45,9 +56,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${SRC}
-tar xvf $CWD/${VERSION}R-it.tar.gz || tar xvf $CWD/${SRC}.tar.gz
-cd ${SRC}
+rm -rf source-code-pro-${VERSION}
+mkdir source-code-pro-${VERSION}
+cd source-code-pro-${VERSION}
+unzip $CWD/OTF-$SRC.zip
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -59,8 +71,6 @@ mkdir -p $PKG/usr/share/fonts/OTF/
 cp OTF/*.otf $PKG/usr/share/fonts/OTF/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
-chmod a-x $PKG/usr/doc/$PRGNAM-$VERSION/*
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -68,4 +78,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/adobe-source-code-pro-font/adobe-source-code-pro-font.info b/system/adobe-source-code-pro-font/adobe-source-code-pro-font.info
index 30e23e99ac..d355f316e0 100644
--- a/system/adobe-source-code-pro-font/adobe-source-code-pro-font.info
+++ b/system/adobe-source-code-pro-font/adobe-source-code-pro-font.info
@@ -1,8 +1,8 @@
 PRGNAM="adobe-source-code-pro-font"
-VERSION="1.030"
+VERSION="2.042"
 HOMEPAGE="http://adobe-fonts.github.io/source-code-pro/"
-DOWNLOAD="https://github.com/adobe-fonts/source-code-pro/archive/2.010R-ro/1.030R-it.tar.gz"
-MD5SUM="5d11969eb0a5e243acdbcf046753aa03"
+DOWNLOAD="https://github.com/adobe-fonts/source-code-pro/releases/download/2.042R-u%2F1.062R-i%2F1.026R-vf/OTF-source-code-pro-2.042R-u_1.062R-i.zip"
+MD5SUM="6a214c6daba683ef7ae0bcc8f4bd2a7f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/adobe-source-code-pro-font/doinst.sh b/system/adobe-source-code-pro-font/doinst.sh
index 07732c33c3..522e1a9f94 100644
--- a/system/adobe-source-code-pro-font/doinst.sh
+++ b/system/adobe-source-code-pro-font/doinst.sh
@@ -1,7 +1,7 @@
 # Update the X font indexes:
 if [ -x /usr/bin/mkfontdir ]; then
-  /usr/bin/mkfontscale /usr/share/fonts/OTF
-  /usr/bin/mkfontdir /usr/share/fonts/OTF
+  /usr/bin/mkfontscale usr/share/fonts/OTF
+  /usr/bin/mkfontdir usr/share/fonts/OTF
 fi
 if [ -x /usr/bin/fc-cache ]; then
   /usr/bin/fc-cache -f
diff --git a/system/adobe-source-han-sans-fonts/adobe-source-han-sans-fonts.SlackBuild b/system/adobe-source-han-sans-fonts/adobe-source-han-sans-fonts.SlackBuild
index 050bda352e..ecec0fbf3a 100644
--- a/system/adobe-source-han-sans-fonts/adobe-source-han-sans-fonts.SlackBuild
+++ b/system/adobe-source-han-sans-fonts/adobe-source-han-sans-fonts.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for adobe-source-han-sans-fonts
 
@@ -22,13 +22,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=adobe-source-han-sans-fonts
 VERSION=${VERSION:-1.004R}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,4 +79,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/adobe-source-sans-pro-font/README b/system/adobe-source-sans-pro-font/README
index 5202c38abf..5e67b5a2b0 100644
--- a/system/adobe-source-sans-pro-font/README
+++ b/system/adobe-source-sans-pro-font/README
@@ -1,3 +1,5 @@
-Source Sans is a set of OpenType fonts that have been designed to work well in
-user interface (UI) environments, as well as in text setting for screen and
-print.
+adobe-source-sans-pro-font (open source font)
+
+Source Sans is a set of OpenType fonts that have been designed to work
+well in user interface (UI) environments, as well as in text setting
+for screen and print.
diff --git a/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.SlackBuild b/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.SlackBuild
index 01520ef778..a9fc867c1b 100644
--- a/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.SlackBuild
+++ b/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.SlackBuild
@@ -1,7 +1,10 @@
-#!/bin/sh
+#!/bin/bash
+
+# Slackware build script for adobe-source-sans-pro-font
 
 # Copyright (c) 2012 Daniel LEVAI
-# Copyright (c) 2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright (c) 2012-2019 Dugan Chen
+# Copyright (c) 2019-2023 Matteo Bernardini
 # All rights reserved.
 #
 # * Redistribution and use in source and binary forms, with or without
@@ -24,15 +27,29 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220212 bkw: Modified by SlackBuilds.org, updated for v3.046R.
+# Note to whoever's updating this in the future: don't get the source
+# tarball or zip file (with the archive/refs/tags URL), it doesn't
+# contain the compiled OTF fonts (only the source, which we don't have
+# the tools to compile into fonts). The zip file with release/download
+# in the URL and OTF in the name is the one you want.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=adobe-source-sans-pro-font
-SRCNAM=source-sans-pro
-VERSION=${VERSION:-3.006R}
+SRCNAM=source-sans
+VERSION=${VERSION:-3.052}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -42,21 +59,19 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
-cd $SRCNAM-$VERSION
+rm -rf $SRCNAM-${VERSION}R
+# 20220212 bkw: careful, warrior! no top-level dir in zip file!
+mkdir $SRCNAM-${VERSION}R
+cd $SRCNAM-${VERSION}R
+unzip $CWD/OTF-$SRCNAM-${VERSION}R.zip
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find . -type d -a -exec chmod 755 {} \+
+find . -type f -a -exec chmod 644 {} \+
 
 mkdir -p $PKG/usr/share/fonts/OTF
-cp OTF/*.otf VAR/*.otf $PKG/usr/share/fonts/OTF/
+cp OTF/*.otf $PKG/usr/share/fonts/OTF/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -64,4 +79,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.info b/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.info
index f7cdb2b4ca..4f98e7b309 100644
--- a/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.info
+++ b/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.info
@@ -1,8 +1,8 @@
 PRGNAM="adobe-source-sans-pro-font"
-VERSION="3.006R"
+VERSION="3.052"
 HOMEPAGE="http://adobe-fonts.github.io/source-sans-pro"
-DOWNLOAD="https://github.com/adobe-fonts/source-sans-pro/archive/3.006R/source-sans-pro-3.006R.tar.gz"
-MD5SUM="7e8b5f1898287eb5242645abfdeb527b"
+DOWNLOAD="https://github.com/adobe-fonts/source-sans/releases/download/3.052R/OTF-source-sans-3.052R.zip"
+MD5SUM="57b037a28ba098b9829ef5b70b992d98"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/adobe-source-sans-pro-font/doinst.sh b/system/adobe-source-sans-pro-font/doinst.sh
index 07732c33c3..522e1a9f94 100644
--- a/system/adobe-source-sans-pro-font/doinst.sh
+++ b/system/adobe-source-sans-pro-font/doinst.sh
@@ -1,7 +1,7 @@
 # Update the X font indexes:
 if [ -x /usr/bin/mkfontdir ]; then
-  /usr/bin/mkfontscale /usr/share/fonts/OTF
-  /usr/bin/mkfontdir /usr/share/fonts/OTF
+  /usr/bin/mkfontscale usr/share/fonts/OTF
+  /usr/bin/mkfontdir usr/share/fonts/OTF
 fi
 if [ -x /usr/bin/fc-cache ]; then
   /usr/bin/fc-cache -f
diff --git a/system/adobe-source-serif-pro-font/README b/system/adobe-source-serif-pro-font/README
index 11f412799f..1f645c421a 100644
--- a/system/adobe-source-serif-pro-font/README
+++ b/system/adobe-source-serif-pro-font/README
@@ -1,2 +1,4 @@
+adobe-source-serif-pro-font (open source font)
+
 Source Serif Pro is a set of OpenType fonts that have been designed to
 complement Source Sans Pro.
diff --git a/system/adobe-source-serif-pro-font/adobe-source-serif-pro-font.SlackBuild b/system/adobe-source-serif-pro-font/adobe-source-serif-pro-font.SlackBuild
index 62773d97f7..edea72eae8 100644
--- a/system/adobe-source-serif-pro-font/adobe-source-serif-pro-font.SlackBuild
+++ b/system/adobe-source-serif-pro-font/adobe-source-serif-pro-font.SlackBuild
@@ -1,6 +1,10 @@
-#!/bin/sh
+#!/bin/bash
+
+# Slackware build script for adobe-source-serif-pro-font
 
 # Copyright (c) 2012 Daniel LEVAI
+# Copyright (c) 2012-2019 Dugan Chen
+# Copyright (c) 2019-2023 Matteo Bernardini
 # All rights reserved.
 #
 # * Redistribution and use in source and binary forms, with or without
@@ -25,15 +29,30 @@
 #
 # Currently maintained by Dugan Chen
 
+# 20220212 bkw: Modified by SlackBuilds.org: updated for v4.004.
+# Note to whoever's updating this in the future: don't get the source
+# tarball or zip file (with the archive/refs/tags URL), it doesn't
+# contain the compiled OTF fonts (only the source, which we don't have
+# the tools to compile into fonts). The zip file with release/download
+# in the URL is the one you want. Unfortunately it doesn't include any
+# documentation (but that's upstream's call, *shrug*).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=adobe-source-serif-pro-font
-VERSION=${VERSION:-1.017R}
-SRCDIR=source-serif-pro-${VERSION}
+VERSION=${VERSION:-4.005}
+SRCNAM=source-serif
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -43,22 +62,17 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${SRCDIR}
-tar xvf $CWD/${VERSION}.tar.gz || tar xvf $CWD/${SRCDIR}.tar.gz
-cd ${SRCDIR}
+rm -rf $SRCNAM-${VERSION}_Desktop
+unzip $CWD/$SRCNAM-${VERSION}_Desktop.zip
+cd $SRCNAM-${VERSION}_Desktop
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find . -type d -a -exec chmod 755 {} \+
+find . -type f -a -exec chmod 644 {} \+
 
 mkdir -p $PKG/usr/share/fonts/OTF/
 cp OTF/*.otf $PKG/usr/share/fonts/OTF/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.txt ReadMe.html README.md $PKG/usr/doc/$PRGNAM-$VERSION
-chmod a-x $PKG/usr/doc/$PRGNAM-$VERSION/*
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -66,4 +80,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/adobe-source-serif-pro-font/adobe-source-serif-pro-font.info b/system/adobe-source-serif-pro-font/adobe-source-serif-pro-font.info
index a70ddff597..b618cc08ca 100644
--- a/system/adobe-source-serif-pro-font/adobe-source-serif-pro-font.info
+++ b/system/adobe-source-serif-pro-font/adobe-source-serif-pro-font.info
@@ -1,8 +1,8 @@
 PRGNAM="adobe-source-serif-pro-font"
-VERSION="1.017R"
+VERSION="4.005"
 HOMEPAGE="https://adobe-fonts.github.io/source-serif-pro/"
-DOWNLOAD="https://github.com/adobe-fonts/source-serif-pro/archive/1.017R.tar.gz"
-MD5SUM="fee6b5d1fe3b21621b14fe342c32a398"
+DOWNLOAD="https://github.com/adobe-fonts/source-serif/releases/download/4.005R/source-serif-4.005_Desktop.zip"
+MD5SUM="316acf7250008f2987a3c49325f5ef5c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/adobe-source-serif-pro-font/doinst.sh b/system/adobe-source-serif-pro-font/doinst.sh
index 011ed452ee..3bca1b9b72 100644
--- a/system/adobe-source-serif-pro-font/doinst.sh
+++ b/system/adobe-source-serif-pro-font/doinst.sh
@@ -1,7 +1,7 @@
 # Update the X font indexes:
 if [ -x /usr/bin/mkfontdir ]; then
-  /usr/bin/mkfontscale /usr/share/fonts/OTF
-  /usr/bin/mkfontdir /usr/share/fonts/OTF
+  /usr/bin/mkfontscale usr/share/fonts/OTF
+  /usr/bin/mkfontdir usr/share/fonts/OTF
 fi
 if [ -x /usr/bin/fc-cache ]; then
   /usr/bin/fc-cache -f
diff --git a/system/aespipe/aespipe.SlackBuild b/system/aespipe/aespipe.SlackBuild
index dd20a66b2b..8cbe4a355f 100644
--- a/system/aespipe/aespipe.SlackBuild
+++ b/system/aespipe/aespipe.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for aespipe
 
@@ -23,12 +23,20 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 #
-# markus reichelt, slackbuilds@mareichelt.de, 0xCCEEF115
+# markus reichelt, (email removed)
+
+# 20231031 bkw: update for v2.4g.
+# 20230709 bkw: BUILD=2
+# - new maintainer.
+# - include bz2aespipe in package.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=aespipe
-VERSION=${VERSION:-2.4f}
+VERSION=${VERSION:-2.4g}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCVER="v${VERSION}"
 
@@ -40,29 +48,34 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+OPT="--enable-padlock --enable-intelaes"
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-  OPT="--enable-asm=x86 --enable-padlock --enable-intelaes"
+  OPT+=" --enable-asm=x86"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-  OPT="--enable-asm=x86 --enable-padlock --enable-intelaes"
+  OPT+=" --enable-asm=x86"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  OPT="--enable-asm=amd64 --enable-padlock --enable-intelaes"
+  OPT+=" --enable-asm=amd64"
+elif [ "$ARCH" = "aarch64" ]; then # hope this is correct
+  SLKCFLAGS="-O2 -fPIC"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-  OPT=""
 fi
 
+echo "===> configure options: $OPT"
+
 set -e
 
 rm -rf $PKG
@@ -72,11 +85,8 @@ rm -rf $PRGNAM-$SRCVER
 tar xvf $CWD/$PRGNAM-$SRCVER.tar.bz2
 cd $PRGNAM-$SRCVER
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 set -e
 
@@ -91,18 +101,17 @@ fi
 LDFLAGS=$LDFLAGS \
 CFLAGS=$SLKCFLAGS \
 ./configure \
-  --bindir=$PKG/usr/bin \
-  --mandir=$PKG/usr/man \
+  --bindir=/usr/bin \
+  --mandir=/usr/man \
   $OPT
 
 make
 make tests
-make install
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
-find $PKG/usr/man/man1 -type f -exec gzip -9 {} \;
+# 20230709 bkw: this loox useful and the README shows an example for it:
+cp -a bz2aespipe $PKG/usr/bin
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README* ChangeLog* $PKG/usr/doc/$PRGNAM-$VERSION
@@ -112,4 +121,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/aespipe/aespipe.info b/system/aespipe/aespipe.info
index a2ae6076d8..5d11b1e5ac 100644
--- a/system/aespipe/aespipe.info
+++ b/system/aespipe/aespipe.info
@@ -1,10 +1,10 @@
 PRGNAM="aespipe"
-VERSION="2.4f"
-HOMEPAGE="http://loop-aes.sourceforge.net/"
-DOWNLOAD="http://loop-aes.sourceforge.net/aespipe/aespipe-v2.4f.tar.bz2"
-MD5SUM="ed05c62c1954110f009bedda4bc1562f"
+VERSION="2.4g"
+HOMEPAGE="https://loop-aes.sourceforge.net/"
+DOWNLOAD="https://loop-aes.sourceforge.net/aespipe/aespipe-v2.4g.tar.bz2"
+MD5SUM="c216c6c9e939fac69f859af0ad2fd8ef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Markus Reichelt"
-EMAIL="slackbuilds@mareichelt.de"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/afdko/README b/system/afdko/README
index 3a8a240034..480a6d2375 100644
--- a/system/afdko/README
+++ b/system/afdko/README
@@ -10,10 +10,6 @@ Now that Libreoffice has dropped support for Type1 fonts, one can use
 afdko to convert the system Type1 fonts to OTF, which
 Libreoffice supports. The package Type1_to_OTF does this.
 
-
-Notes for x86_64
-
-As received from upstream, adfko forces the building of 32-bit
-executables. This is fine on a 32-bit system. On a 64-bit system, the
-SlackBuild enables a 64-bit build. This is experimental and unsupported,
-but seems to work OK (at least for makeotf and tx).
+Warning: This SlackBuild requires network access when it runs, meaning
+it downloads files from the Internet with root access. You should
+decide for yourself whether or not you think this is a good idea.
diff --git a/system/afdko/afdko.SlackBuild b/system/afdko/afdko.SlackBuild
index 63cc3aad8d..ff2695274c 100644
--- a/system/afdko/afdko.SlackBuild
+++ b/system/afdko/afdko.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for afdko
 
-# Copyright 2017 Duncan Roe, Melbourne, Australia
+# Copyright 2017,2022 Duncan Roe, Melbourne, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=afdko
-VERSION=${VERSION:-2.5.65322}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-3.8.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,14 +38,29 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "x86_64" ]; then
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
+  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
@@ -54,9 +72,6 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-# This symlink is not required (but another one is, later)
-rm -f $PRGNAM-$VERSION/FDK/Tools/linux/AFDKOPython
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -64,44 +79,33 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Non-standard build process - see README
-
-# Replacement for ./configure
-if [ "$LIBDIRSUFFIX" = 64 ]; then
-  for i in $(find . -name Makefile -o -name '*.mak' | \
-    xargs grep -E -- -m32 | cut -f1 -d:); do
-    cat $i | sed 's/ -m32//' >t5
-    mv t5 $i
-  done
-fi
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
 
-# Replacement for make
-cd FDK/Tools/Programs
-./BuildAllLinux.sh
-cd ../..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
 
-# Replacement for make install
-mkdir -p $PKG/opt/$PRGNAM/Tools
-mv Tools/linux Tools/SharedData $PKG/opt/$PRGNAM/Tools
+# don't download cmake or ninja
+sed -i "/'cmake',/d
+        /'ninja'/d" setup.py
 
-mkdir -p $PKG/opt/$PRGNAM/Tools/linux/Python/Current/bin
-ln -s $(readlink -f $(type -p python)) \
-  $PKG/opt/$PRGNAM/Tools/linux/Python/Current/bin/python2.7
+python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/etc/profile.d
-cp $CWD/afdko.sh $CWD/afdko.csh $PKG/etc/profile.d/
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AFDKO-Overview.html FDK\ Build\ Notes.txt FDKReleaseNotes.txt \
-  Read_Me_First.html Technical\ Documentation ../LICENSE.txt ../README.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.md README.md docs $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/afdko/afdko.info b/system/afdko/afdko.info
index 748428185e..0a52ca6b0c 100644
--- a/system/afdko/afdko.info
+++ b/system/afdko/afdko.info
@@ -1,10 +1,10 @@
 PRGNAM="afdko"
-VERSION="2.5.65322"
-HOMEPAGE="https://www.adobe.com/devnet/opentype/afdko.html"
-DOWNLOAD="https://github.com/adobe-type-tools/afdko/archive/2.5.65322/afdko-2.5.65322.tar.gz"
-MD5SUM="414b572a74a7b786606423e860938835"
+VERSION="3.8.3"
+HOMEPAGE="https://github.com/adobe-type-tools/afdko/"
+DOWNLOAD="https://github.com/adobe-type-tools/afdko/releases/download/3.8.3/afdko-3.8.3.tar.gz"
+MD5SUM="5aa7305cf8ac232fc6c01da3fb621319"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="numpy python-fonttools"
+REQUIRES="python3-fonttools scikit-build python3-lxml tqdm"
 MAINTAINER="Duncan Roe"
 EMAIL="duncan_roe@optusnet.com.au"
diff --git a/system/afio/README b/system/afio/README
index 6ff9ad41b5..18fda14eb6 100644
--- a/system/afio/README
+++ b/system/afio/README
@@ -1,3 +1,5 @@
+afio (archiver and backup program with internal compression support)
+
 Afio makes compressed archives that are safer than compressed tar or
 cpio archives, allowing better handling of input data corruption. Afio
 also supports multi-volume archives during interactive operation.
diff --git a/system/afio/afio.SlackBuild b/system/afio/afio.SlackBuild
index c6b9c4e6ba..04d164cea8 100644
--- a/system/afio/afio.SlackBuild
+++ b/system/afio/afio.SlackBuild
@@ -1,13 +1,22 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for afio
 
 # Written by ruario <sbo@ruari.com>
 
+# 20220212 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - i486 => i586
+# - use correct github download URL.
+# - don't install executable scripts in doc dir.
+# - don't install installation instructions in doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=afio
 VERSION=${VERSION:-2.5.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -17,17 +26,21 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-fPIC"
+  SLKCFLAGS="-O2 -fPIC"
 else
   SLKCFLAGS=""
 fi
@@ -38,27 +51,22 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find . -type d -a -exec chmod 755 {} \+
+find . -type f -a -exec chmod 644 {} \+
 
-sed "s/\(^CFLAGS = \)/\1 $SLKCFLAGS /" -i.original Makefile
+sed -i "s,-O2,$SLKCFLAGS," Makefile
 make
 
-install -Dm755 afio $PKG/usr/bin/afio
+install -Dm755 -s afio $PKG/usr/bin/afio
 install -Dm644 afio.1 $PKG/usr/man/man1/afio.1
 
-strip --strip-unneeded $PKG/usr/bin/afio
 gzip $PKG/usr/man/man1/afio.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ANNOUNCE* HISTORY INSTALLATION PORTING README* SCRIPTS script* afio_license_issues_*.txt \
+cp -a ANNOUNCE* HISTORY PORTING README* SCRIPTS script* *.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -66,4 +74,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l n -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l n -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/afio/afio.info b/system/afio/afio.info
index 93f2229d06..861e920a03 100644
--- a/system/afio/afio.info
+++ b/system/afio/afio.info
@@ -1,7 +1,7 @@
 PRGNAM="afio"
 VERSION="2.5.2"
 HOMEPAGE="https://github.com/kholtman/afio"
-DOWNLOAD="https://github.com/kholtman/afio/archive/v2.5.2.tar.gz"
+DOWNLOAD="https://github.com/kholtman/afio/archive/v2.5.2/afio-2.5.2.tar.gz"
 MD5SUM="2ab7c66d2b6c100aef5fce596baf2247"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/afpfs-ng/afpfs-ng.SlackBuild b/system/afpfs-ng/afpfs-ng.SlackBuild
index 99ca7c533a..6a289a46cd 100644
--- a/system/afpfs-ng/afpfs-ng.SlackBuild
+++ b/system/afpfs-ng/afpfs-ng.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for afpfs-ng
 
@@ -22,26 +22,36 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=afpfs-ng
 VERSION=${VERSION:-0.8.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,7 +79,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -102,8 +112,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README FUTURE NEWS ChangeLog AUTHORS COPYING INSTALL TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/afuse/README b/system/afuse/README
index f6c57f8dc9..7356adc09f 100644
--- a/system/afuse/README
+++ b/system/afuse/README
@@ -1,13 +1,14 @@
 Afuse is an automounting file system implemented in user-space using
-FUSE. Afuse currently implements the most basic functionality that can
-be expected by an automounter; that is it manages a directory of virtual
-directories. If one of these virtual directories is accessed and is not
-already automounted, afuse will attempt to mount a filesystem onto that
-directory. If the mount succeeds the requested access proceeds as normal,
-otherwise it will fail with an error.
+FUSE. Afuse currently implements the most basic functionality that
+can be expected by an automounter; that is it manages a directory
+of virtual directories. If one of these virtual directories is
+accessed and is not already automounted, afuse will attempt to mount
+a filesystem onto that directory. If the mount succeeds the requested
+access proceeds as normal, otherwise it will fail with an error.
+
+The generated package includes the script afuse-avahissh: this will
+use avahi to automatically populate the root directory with hosts
+advertising their sftp service via Avahi.
 
-The generated package includes the script afuse-avahissh: this will use
-avahi to automatically populate the root directory with hosts advertising
-their sftp service via Avahi.
 As it's not essential for general usage, avahi is considered an optional
 dependency (install it if you want to use that script).
diff --git a/system/afuse/afuse.SlackBuild b/system/afuse/afuse.SlackBuild
index 724924b8c1..0f6b03b81f 100644
--- a/system/afuse/afuse.SlackBuild
+++ b/system/afuse/afuse.SlackBuild
@@ -1,29 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
 # slackware build script for afuse
 # Written Evandro Alves Rodrigues evandrofisico@gmail.com
 #
 
+# 20220402 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - remove empty ChangeLog and useless INSTALL from doc dir.
+# - i486 => i586.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=afuse
 VERSION=${VERSION:-0.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -47,9 +58,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 # From upstream
 patch -p1 < $CWD/avoid-early-exit-in-afuse_releasedir.patch
@@ -65,13 +76,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README \
+cp -a AUTHORS COPYING COPYING.LIB NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -79,4 +87,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/agedu/agedu.SlackBuild b/system/agedu/agedu.SlackBuild
index ad6f833c72..48c2ccaaa9 100644
--- a/system/agedu/agedu.SlackBuild
+++ b/system/agedu/agedu.SlackBuild
@@ -1,11 +1,12 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for agedu
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20221226 bkw: Update for v20211129.8cd63c5 (autoconf => cmake).
 # 20201025 bkw: Update for v20200705.2a7d4a2.
 # 20200302 bkw: Update for v20200206.963bc9d.
 # 20191130 bkw: Update for v20190630.66cb14d.
@@ -15,10 +16,13 @@
 # 20170921 bkw: Update for v20170831.fc6b2b5. Switch to self-hosted source
 # as upstream deletes the old version as soon as a new one is released.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=agedu
-VERSION=${VERSION:-20200705.2a7d4a2}
+VERSION=${VERSION:-20211129.8cd63c5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -28,7 +32,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,19 +67,19 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make VERBOSE=1
+  make install/strip DESTDIR=$PKG
+cd ..
+
 gzip $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -82,4 +90,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/agedu/agedu.info b/system/agedu/agedu.info
index 0570282f19..2a6335fa5d 100644
--- a/system/agedu/agedu.info
+++ b/system/agedu/agedu.info
@@ -1,10 +1,10 @@
 PRGNAM="agedu"
-VERSION="20200705.2a7d4a2"
+VERSION="20211129.8cd63c5"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/agedu/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/agedu-20200705.2a7d4a2.tar.gz"
-MD5SUM="db17b0c0a7ee222e54e02e6a53ac10d7"
+DOWNLOAD="https://slackware.uk/~urchlay/src/agedu-20211129.8cd63c5.tar.gz"
+MD5SUM="0b59611f867948a098a1dd36e1775608"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/aha/README b/system/aha/README
index 209bf1359d..555f625c75 100644
--- a/system/aha/README
+++ b/system/aha/README
@@ -1,5 +1,5 @@
 aha (convert ANSI color/graphics to HTML)
 
 aha (ANSI HTML Adapter) converts ANSI colors to HTML, e.g. if you want
-to publish the output of ls --color=yes, git diff, ccal or htop as static
-HTML somewhere.
+to publish the output of ls --color=yes, git diff, ccal or htop as
+static HTML somewhere.
diff --git a/system/aha/aha.SlackBuild b/system/aha/aha.SlackBuild
index 360d780e10..4adcdcae1d 100644
--- a/system/aha/aha.SlackBuild
+++ b/system/aha/aha.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for aha
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/
 # for details.
@@ -13,10 +13,13 @@
 # 20170301 bkw: update for 0.4.10.5, use long-form github URL
 # 20170122 bkw: update for 0.4.10.3
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=aha
 VERSION=${VERSION:-0.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -26,7 +29,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,4 +76,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/aha/aha.info b/system/aha/aha.info
index ad321b92ed..bb5a97432d 100644
--- a/system/aha/aha.info
+++ b/system/aha/aha.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/aide/aide.SlackBuild b/system/aide/aide.SlackBuild
index b87c666081..10e19c31a0 100644
--- a/system/aide/aide.SlackBuild
+++ b/system/aide/aide.SlackBuild
@@ -1,14 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for AIDE
 # Andy Bailey <GooseYArd@gmail.com>
-# Emmanuel N. Millan <emmanueln@gmail.com> - 2018,2019
+# Emmanuel N. Millan <emmanueln@gmail.com> - 2018,2021
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=aide
 #PKGVER=`basename $PRGNAM*tar.gz .tar.gz | cut -d- -f2`
-VERSION=${VERSION:-0.16.2}
+VERSION=${VERSION:-0.18.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -18,7 +21,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -92,4 +102,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/aide/aide.info b/system/aide/aide.info
index 8caec1c7d3..bf6da3d4a2 100644
--- a/system/aide/aide.info
+++ b/system/aide/aide.info
@@ -1,8 +1,8 @@
 PRGNAM="aide"
-VERSION="0.16.2"
+VERSION="0.18.6"
 HOMEPAGE="https://aide.github.io/"
-DOWNLOAD="https://github.com/aide/aide/releases/download/v0.16.2/aide-0.16.2.tar.gz"
-MD5SUM="9835914273bb06f9b3263ce36ef7149b"
+DOWNLOAD="https://github.com/aide/aide/releases/download/v0.18.6/aide-0.18.6.tar.gz"
+MD5SUM="3f464e9187dc812af140dd0f3f1c58f7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/alacritty/alacritty.SlackBuild b/system/alacritty/alacritty.SlackBuild
index b776ff04fc..48199eabc5 100644
--- a/system/alacritty/alacritty.SlackBuild
+++ b/system/alacritty/alacritty.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for alacritty
 
-# Copyright 2017-2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-2022 Andrew Clemons, Wellington New Zealand
+# Copyright 2022-2024 Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=alacritty
-VERSION=${VERSION:-0.4.3}
+VERSION=${VERSION:-0.13.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -41,23 +45,31 @@ if [ -z "$ARCH" ]; then
   fi
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  CARGOTARGET="--target i586-unknown-linux-gnu"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  CARGOTARGET="--target i686-unknown-linux-gnu"
-elif [ "$ARCH" = "x86_64" ]; then
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "aarch64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  CARGOTARGET="--target x86_64-unknown-linux-gnu"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   CARGOTARGET=""
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -87,11 +99,19 @@ mkdir vendor
 (
   cd vendor
 
-  grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
-    sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
-    awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \
-    grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do
-
+  grep -h -A 4 "\[\[package\]\]" \
+      $(find "../" -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
+      sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
+      awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4, $5 }' | \
+      sed 's/"//g;s/name=//;s/ version=/=/' | \
+      grep " source=" | \
+      sed 's/ dependencies=.*$//' | \
+      sed 's/ source=[^ ]*//' | \
+      sed 's/ checksum=/=/' | \
+      sort -u | \
+      while read -r dep ; do
+
+    cksum="$(printf "%s\n" "$dep" | cut -d= -f3)"
     ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
     dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
 
@@ -110,9 +130,7 @@ mkdir vendor
       ) | sed '$ s/,$//'
 
       printf "    },\n"
-      printf '    "package": "'
-
-      sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
+      printf '    "package": "%s"'  "$cksum"
 
       printf "}\n"
     } > $dep-$ver/.cargo-checksum.json
@@ -126,9 +144,17 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
+CARGO_HOME=.cargo \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-cargo build --release $CARGOTARGET
+cargo build --offline --release $CARGOTARGET
 
 mkdir -p $PKG/usr/bin/
 
@@ -137,57 +163,40 @@ find target -name $PRGNAM -exec install -m 755 {} $PKG/usr/bin/$PRGNAM \;
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/man/man1
-
-if [ -e alacritty.man ] ; then
-  install -m644 alacritty.man $PKG/usr/man/man1/alacritty.1
-elif [ -e  extra/alacritty.man ] ; then
-  install -m644 extra/alacritty.man $PKG/usr/man/man1/alacritty.1
-fi
+mkdir -p $PKG/usr/man/{man1,man5}
+scdoc < extra/man/alacritty.1.scd | install -m644 /dev/stdin $PKG/usr/man/man1/alacritty.1
+scdoc < extra/man/alacritty-msg.1.scd | install -m644 /dev/stdin $PKG/usr/man/man1/alacritty-msg.1
+scdoc < extra/man/alacritty.5.scd | install -m644 /dev/stdin $PKG/usr/man/man5/alacritty.5
+scdoc < extra/man/alacritty-bindings.5.scd | install -m644 /dev/stdin $PKG/usr/man/man5/alacritty-bindings.5
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/share/bash-completion/completions
-if [ -e alacritty-completions.bash ] ; then
-  install -m644 alacritty-completions.bash $PKG/usr/share/bash-completion/completions/alacritty
-elif [ -e extra/completions/alacritty.bash ] ; then
-  install -m644 extra/completions/alacritty.bash $PKG/usr/share/bash-completion/completions/alacritty
-fi
+install -m644 extra/completions/alacritty.bash $PKG/usr/share/bash-completion/completions/alacritty
 
 mkdir -p $PKG/usr/share/zsh/site-functions
-if [ -e alacritty-completions.zsh ] ; then
-  install -m644 alacritty-completions.zsh $PKG/usr/share/zsh/site-functions/_alacritty
-elif [ -e extra/completions/_alacritty ] ; then
-  install -m644 extra/completions/_alacritty $PKG/usr/share/zsh/site-functions/_alacritty
-fi
+install -m644 extra/completions/_alacritty $PKG/usr/share/zsh/site-functions/_alacritty
+
+mkdir -p $PKG/usr/share/appdata/
+install -m644 extra/linux/org.alacritty.Alacritty.appdata.xml $PKG/usr/share/appdata/org.alacritty.Alacritty.appdata.xml
 
 mkdir -p $PKG/usr/share/terminfo
-if [ -e alacritty.info ] ; then
-  tic -o $PKG/usr/share/terminfo alacritty.info
-elif [ -e extra/alacritty.info ] ; then
-  tic -o $PKG/usr/share/terminfo -xe alacritty,alacritty-direct extra/alacritty.info
-fi
+tic -o $PKG/usr/share/terminfo -xe alacritty,alacritty-direct extra/alacritty.info
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE-APACHE README.md alacritty.yml $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md CONTRIBUTING.md LICENSE-APACHE LICENSE-MIT README.md docs $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/usr/share/applications
-if [ -e $PRGNAM.desktop ] ; then
-  install -m 644 $PRGNAM.desktop $PKG/usr/share/applications
-elif [ -e extra/linux/$PRGNAM.desktop ] ; then
-  install -m 644 extra/linux/$PRGNAM.desktop $PKG/usr/share/applications
-fi
+install -m 644 extra/linux/Alacritty.desktop $PKG/usr/share/applications
 
-if [ -e extra/logo/alacritty-term.svg ] ; then
-  mkdir -p $PKG/usr/share/pixmaps
-  install -m 644 extra/logo/alacritty-term.svg $PKG/usr/share/pixmaps/Alacritty.svg
-fi
+mkdir -p $PKG/usr/share/pixmaps
+install -m 644 extra/logo/alacritty-term.svg $PKG/usr/share/pixmaps/Alacritty.svg
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/alacritty/alacritty.info b/system/alacritty/alacritty.info
index a2b156f48f..59214b27d8 100644
--- a/system/alacritty/alacritty.info
+++ b/system/alacritty/alacritty.info
@@ -1,526 +1,518 @@
 PRGNAM="alacritty"
-VERSION="0.4.3"
-HOMEPAGE="https://github.com/jwilm/alacritty"
-DOWNLOAD="https://github.com/jwilm/alacritty/archive/v0.4.3/alacritty-0.4.3.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/adler32/adler32-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/andrew/andrew-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/android_glue/android_glue-0.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/android_log-sys/android_log-sys-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/approx/approx-0.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arc-swap/arc-swap-0.4.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayref/arrayref-0.3.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.4.12.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bindgen/bindgen-0.53.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/blake2b_simd/blake2b_simd-0.5.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/block/block-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bytemuck/bytemuck-1.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bzip2-sys/bzip2-sys-0.1.8+1.0.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bzip2/bzip2-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/calloop/calloop-0.4.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.53.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cexpr/cexpr-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cgl/cgl-0.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clang-sys/clang-sys-0.29.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clipboard-win/clipboard-win-2.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cloudabi/cloudabi-0.0.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cmake/cmake-0.1.43.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cocoa/cocoa-0.19.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cocoa/cocoa-0.20.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/constant_time_eq/constant_time_eq-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/copypasta/copypasta-0.6.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation-sys/core-foundation-sys-0.6.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation-sys/core-foundation-sys-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation/core-foundation-0.6.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation/core-foundation-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-graphics/core-graphics-0.17.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-graphics/core-graphics-0.19.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-text/core-text-15.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/core-video-sys/core-video-sys-0.1.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crc32fast/crc32fast-1.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/deflate/deflate-0.8.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/derivative/derivative-2.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-sys/dirs-sys-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs/dirs-2.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dispatch/dispatch-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dlib/dlib-0.4.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/downcast-rs/downcast-rs-1.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dtoa/dtoa-0.4.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dwrote/dwrote-0.9.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/embed-resource/embed-resource-1.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/env_logger/env_logger-0.7.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/euclid/euclid-0.20.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/expat-sys/expat-sys-2.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/filetime/filetime-0.2.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/flate2/flate2-1.0.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types-macros/foreign-types-macros-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types-shared/foreign-types-shared-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types-shared/foreign-types-shared-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types/foreign-types-0.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types/foreign-types-0.5.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/freetype-rs/freetype-rs-0.23.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/freetype-sys/freetype-sys-0.9.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fsevent-sys/fsevent-sys-2.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fsevent/fsevent-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon-sys/fuchsia-zircon-sys-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon/fuchsia-zircon-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/gl_generator/gl_generator-0.13.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/gl_generator/gl_generator-0.14.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/glob/glob-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin/glutin-0.24.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_egl_sys/glutin_egl_sys-0.1.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_emscripten_sys/glutin_emscripten_sys-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_gles2_sys/glutin_gles2_sys-0.1.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_glx_sys/glutin_glx_sys-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_wgl_sys/glutin_wgl_sys-0.1.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/http_req/http_req-0.5.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/humantime/humantime-1.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/idna/idna-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/image/image-0.23.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/inflate/inflate-0.4.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/inotify-sys/inotify-sys-0.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/inotify/inotify-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/instant/instant-0.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/iovec/iovec-0.1.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/jni-sys/jni-sys-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/jobserver/jobserver-0.1.21.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/kernel32-sys/kernel32-sys-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/khronos_api/khronos_api-3.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazycell/lazycell-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lexical-core/lexical-core-0.6.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.70.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libloading/libloading-0.5.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.0.25.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/line_drawing/line_drawing-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/linked-hash-map/linked-hash-map-0.5.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lock_api/lock_api-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/malloc_buf/malloc_buf-0.0.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/matches/matches-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/maybe-uninit/maybe-uninit-2.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memmap/memmap-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide/miniz_oxide-0.3.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/mio-anonymous-pipes/mio-anonymous-pipes-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/mio-extras/mio-extras-2.0.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/mio-named-pipes/mio-named-pipes-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/mio/mio-0.6.22.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/miow/miow-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/miow/miow-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/native-tls/native-tls-0.2.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ndk-glue/ndk-glue-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ndk-sys/ndk-sys-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ndk/ndk-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/net2/net2-0.2.34.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.14.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.17.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nodrop/nodrop-0.1.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nom/nom-5.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/notify/notify-4.0.15.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.42.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-iter/num-iter-0.1.40.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-rational/num-rational-0.2.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_enum/num_enum-0.4.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_enum_derive/num_enum_derive-0.4.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/objc-foundation/objc-foundation-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/objc/objc-0.2.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/objc_id/objc_id-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-probe/openssl-probe-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-sys/openssl-sys-0.9.56.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl/openssl-0.10.29.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ordered-float/ordered-float-1.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/osmesa-sys/osmesa-sys-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot/parking_lot-0.10.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot_core/parking_lot_core-0.7.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/peeking_take_while/peeking_take_while-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/percent-encoding/percent-encoding-2.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/phf/phf-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/phf_codegen/phf_codegen-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/phf_generator/phf_generator-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/phf_shared/phf_shared-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/png/png-0.16.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/podio/podio-0.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ppv-lite86/ppv-lite86-0.2.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-crate/proc-macro-crate-0.1.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-0.4.30.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quick-error/quick-error-1.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-0.6.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.7.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_pcg/rand_pcg-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/raw-window-handle/raw-window-handle-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.56.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.3.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rust-argon2/rust-argon2-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-hash/rustc-hash-1.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc_tools_util/rustc_tools_util-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc_version/rustc_version-0.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rusttype/rusttype-0.7.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rusttype/rusttype-0.8.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/schannel/schannel-0.1.19.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-1.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/security-framework-sys/security-framework-sys-0.4.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/security-framework/security-framework-0.4.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/semver-parser/semver-parser-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/semver/semver-0.9.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.110.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.110.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.53.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_yaml/serde_yaml-0.8.12.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/servo-fontconfig-sys/servo-fontconfig-sys-4.0.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/servo-fontconfig/servo-fontconfig-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/shared_library/shared_library-0.1.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/shlex/shlex-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/signal-hook-registry/signal-hook-registry-1.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/signal-hook/signal-hook-0.1.15.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/siphasher/siphasher-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/slab/slab-0.4.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-1.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/smithay-client-toolkit/smithay-client-toolkit-0.6.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/smithay-clipboard/smithay-clipboard-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/socket2/socket2-0.3.12.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/spsc-buffer/spsc-buffer-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/static_assertions/static_assertions-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/stb_truetype/stb_truetype-0.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.22.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tempfile/tempfile-3.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/terminfo/terminfo-0.7.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.43.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/toml/toml-0.5.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicase/unicase-2.6.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-bidi/unicode-bidi-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.12.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-2.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/urlocator/urlocator-0.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8parse/utf8parse-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/void/void-1.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vswhom-sys/vswhom-sys-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vswhom/vswhom-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vte/vte-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vte_generate_state_changes/vte_generate_state_changes-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-client/wayland-client-0.23.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-commons/wayland-commons-0.23.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-protocols/wayland-protocols-0.23.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-scanner/wayland-scanner-0.23.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-sys/wayland-sys-0.23.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/which/which-3.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-build/winapi-build-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.2.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winit/winit-0.22.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winpty-sys/winpty-sys-0.5.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winpty/winpty-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winreg/winreg-0.6.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ws2_32-sys/ws2_32-sys-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/x11-clipboard/x11-clipboard-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/x11-dl/x11-dl-2.18.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/xcb/xcb-0.9.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/xdg/xdg-2.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/xml-rs/xml-rs-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/yaml-rust/yaml-rust-0.4.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/zip/zip-0.5.5.crate"
-MD5SUM="bf062ba33330ef00d5ad7fe5c0209964 \
-        853b409f126727af3ee29ae2de887271 \
-        abc51f82118d86e83165ba87e2521e96 \
-        6cceeb8df4bc23fa37bfcd31dfa3277d \
-        196a2eb81627baf71f6677a3c669e6ac \
-        55fb1d6c71bdf258f91759517ac64c8e \
-        294a49d3c53865fa7ac5d0ce2f5d5735 \
-        711b149cf4767597fc265983750f4da3 \
-        da0c3fb9229aa468e48f73aa614b9823 \
-        6ff474dd60c839a9c788844b7a42c72c \
-        11364a62687e5682d652aeafe1a13ed2 \
-        38a5278571eefda86428a8ebfc1cedc2 \
-        142cb4b9a653e56e56311f0c883b8582 \
-        7c6515c4b7f4c7723a3c6d1f07acc261 \
-        bbaf2cabce203fecd54c0c294eb7fb2b \
-        064762ae7ae5feb9af472e8e8900aea9 \
-        6799c26a7eacaf8e58d3e45c6c5add89 \
-        085f6f44e54f62691bf3cf3365f5544a \
+VERSION="0.13.1"
+HOMEPAGE="https://github.com/alacritty/alacritty"
+DOWNLOAD="https://github.com/alacritty/alacritty/archive/v0.13.1/alacritty-0.13.1.tar.gz \
+          https://static.crates.io/crates/adler/adler-1.0.2.crate \
+          https://static.crates.io/crates/ahash/ahash-0.8.6.crate \
+          https://static.crates.io/crates/aho-corasick/aho-corasick-1.1.2.crate \
+          https://static.crates.io/crates/android-activity/android-activity-0.5.1.crate \
+          https://static.crates.io/crates/android-properties/android-properties-0.2.2.crate \
+          https://static.crates.io/crates/anstream/anstream-0.6.5.crate \
+          https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.3.crate \
+          https://static.crates.io/crates/anstyle-query/anstyle-query-1.0.0.crate \
+          https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-3.0.1.crate \
+          https://static.crates.io/crates/anstyle/anstyle-1.0.4.crate \
+          https://static.crates.io/crates/arrayref/arrayref-0.3.7.crate \
+          https://static.crates.io/crates/arrayvec/arrayvec-0.7.4.crate \
+          https://static.crates.io/crates/as-raw-xcb-connection/as-raw-xcb-connection-1.0.1.crate \
+          https://static.crates.io/crates/atomic-waker/atomic-waker-1.1.2.crate \
+          https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \
+          https://static.crates.io/crates/base64/base64-0.21.5.crate \
+          https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \
+          https://static.crates.io/crates/bitflags/bitflags-2.4.1.crate \
+          https://static.crates.io/crates/block-sys/block-sys-0.2.0.crate \
+          https://static.crates.io/crates/block2/block2-0.3.0.crate \
+          https://static.crates.io/crates/block/block-0.1.6.crate \
+          https://static.crates.io/crates/bumpalo/bumpalo-3.14.0.crate \
+          https://static.crates.io/crates/bytemuck/bytemuck-1.14.0.crate \
+          https://static.crates.io/crates/bytes/bytes-1.5.0.crate \
+          https://static.crates.io/crates/calloop-wayland-source/calloop-wayland-source-0.2.0.crate \
+          https://static.crates.io/crates/calloop/calloop-0.12.3.crate \
+          https://static.crates.io/crates/cc/cc-1.0.83.crate \
+          https://static.crates.io/crates/cesu8/cesu8-1.1.0.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://static.crates.io/crates/cfg_aliases/cfg_aliases-0.1.1.crate \
+          https://static.crates.io/crates/cgl/cgl-0.3.2.crate \
+          https://static.crates.io/crates/clap/clap-4.4.11.crate \
+          https://static.crates.io/crates/clap_builder/clap_builder-4.4.11.crate \
+          https://static.crates.io/crates/clap_complete/clap_complete-4.4.4.crate \
+          https://static.crates.io/crates/clap_derive/clap_derive-4.4.7.crate \
+          https://static.crates.io/crates/clap_lex/clap_lex-0.6.0.crate \
+          https://static.crates.io/crates/clipboard-win/clipboard-win-3.1.1.crate \
+          https://static.crates.io/crates/cmake/cmake-0.1.50.crate \
+          https://static.crates.io/crates/cocoa-foundation/cocoa-foundation-0.1.2.crate \
+          https://static.crates.io/crates/cocoa/cocoa-0.25.0.crate \
+          https://static.crates.io/crates/colorchoice/colorchoice-1.0.0.crate \
+          https://static.crates.io/crates/combine/combine-4.6.6.crate \
+          https://static.crates.io/crates/concurrent-queue/concurrent-queue-2.4.0.crate \
+          https://static.crates.io/crates/copypasta/copypasta-0.10.0.crate \
+          https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.6.crate \
+          https://static.crates.io/crates/core-foundation/core-foundation-0.9.4.crate \
+          https://static.crates.io/crates/core-graphics-types/core-graphics-types-0.1.3.crate \
+          https://static.crates.io/crates/core-graphics/core-graphics-0.23.1.crate \
+          https://static.crates.io/crates/core-text/core-text-20.1.0.crate \
+          https://static.crates.io/crates/crc32fast/crc32fast-1.3.2.crate \
+          https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.10.crate \
+          https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.18.crate \
+          https://static.crates.io/crates/crossfont/crossfont-0.7.0.crate \
+          https://static.crates.io/crates/cursor-icon/cursor-icon-1.1.0.crate \
+          https://static.crates.io/crates/dirs-sys/dirs-sys-0.4.1.crate \
+          https://static.crates.io/crates/dirs/dirs-5.0.1.crate \
+          https://static.crates.io/crates/dispatch/dispatch-0.2.0.crate \
+          https://static.crates.io/crates/dlib/dlib-0.5.2.crate \
+          https://static.crates.io/crates/downcast-rs/downcast-rs-1.2.0.crate \
+          https://static.crates.io/crates/dwrote/dwrote-0.11.0.crate \
+          https://static.crates.io/crates/embed-resource/embed-resource-2.4.0.crate \
+          https://static.crates.io/crates/equivalent/equivalent-1.0.1.crate \
+          https://static.crates.io/crates/errno/errno-0.3.7.crate \
+          https://static.crates.io/crates/expat-sys/expat-sys-2.1.6.crate \
+          https://static.crates.io/crates/fastrand/fastrand-2.0.1.crate \
+          https://static.crates.io/crates/fdeflate/fdeflate-0.3.3.crate \
+          https://static.crates.io/crates/filetime/filetime-0.2.22.crate \
+          https://static.crates.io/crates/flate2/flate2-1.0.28.crate \
+          https://static.crates.io/crates/foreign-types-macros/foreign-types-macros-0.2.3.crate \
+          https://static.crates.io/crates/foreign-types-shared/foreign-types-shared-0.3.1.crate \
+          https://static.crates.io/crates/foreign-types/foreign-types-0.5.0.crate \
+          https://static.crates.io/crates/freetype-rs/freetype-rs-0.26.0.crate \
+          https://static.crates.io/crates/freetype-sys/freetype-sys-0.13.1.crate \
+          https://static.crates.io/crates/fsevent-sys/fsevent-sys-4.1.0.crate \
+          https://static.crates.io/crates/futures-io/futures-io-0.3.30.crate \
+          https://static.crates.io/crates/gethostname/gethostname-0.3.0.crate \
+          https://static.crates.io/crates/gethostname/gethostname-0.4.3.crate \
+          https://static.crates.io/crates/getrandom/getrandom-0.2.11.crate \
+          https://static.crates.io/crates/gl_generator/gl_generator-0.14.0.crate \
+          https://static.crates.io/crates/glutin/glutin-0.31.2.crate \
+          https://static.crates.io/crates/glutin_egl_sys/glutin_egl_sys-0.6.0.crate \
+          https://static.crates.io/crates/glutin_glx_sys/glutin_glx_sys-0.5.0.crate \
+          https://static.crates.io/crates/glutin_wgl_sys/glutin_wgl_sys-0.5.0.crate \
+          https://static.crates.io/crates/hashbrown/hashbrown-0.14.3.crate \
+          https://static.crates.io/crates/heck/heck-0.4.1.crate \
+          https://static.crates.io/crates/home/home-0.5.5.crate \
+          https://static.crates.io/crates/icrate/icrate-0.0.4.crate \
+          https://static.crates.io/crates/indexmap/indexmap-2.1.0.crate \
+          https://static.crates.io/crates/inotify-sys/inotify-sys-0.1.5.crate \
+          https://static.crates.io/crates/inotify/inotify-0.9.6.crate \
+          https://static.crates.io/crates/itoa/itoa-1.0.10.crate \
+          https://static.crates.io/crates/jni-sys/jni-sys-0.3.0.crate \
+          https://static.crates.io/crates/jni/jni-0.21.1.crate \
+          https://static.crates.io/crates/jobserver/jobserver-0.1.27.crate \
+          https://static.crates.io/crates/js-sys/js-sys-0.3.66.crate \
+          https://static.crates.io/crates/khronos_api/khronos_api-3.1.0.crate \
+          https://static.crates.io/crates/kqueue-sys/kqueue-sys-1.0.4.crate \
+          https://static.crates.io/crates/kqueue/kqueue-1.0.8.crate \
+          https://static.crates.io/crates/lazy-bytes-cast/lazy-bytes-cast-5.0.1.crate \
+          https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \
+          https://static.crates.io/crates/libc/libc-0.2.151.crate \
+          https://static.crates.io/crates/libloading/libloading-0.8.1.crate \
+          https://static.crates.io/crates/libredox/libredox-0.0.1.crate \
+          https://static.crates.io/crates/libredox/libredox-0.0.2.crate \
+          https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.12.crate \
+          https://static.crates.io/crates/lock_api/lock_api-0.4.11.crate \
+          https://static.crates.io/crates/log/log-0.4.20.crate \
+          https://static.crates.io/crates/malloc_buf/malloc_buf-0.0.6.crate \
+          https://static.crates.io/crates/memchr/memchr-2.6.4.crate \
+          https://static.crates.io/crates/memmap2/memmap2-0.9.3.crate \
+          https://static.crates.io/crates/memoffset/memoffset-0.7.1.crate \
+          https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.7.1.crate \
+          https://static.crates.io/crates/mio/mio-0.8.10.crate \
+          https://static.crates.io/crates/miow/miow-0.6.0.crate \
+          https://static.crates.io/crates/ndk-context/ndk-context-0.1.1.crate \
+          https://static.crates.io/crates/ndk-sys/ndk-sys-0.5.0%2B25.2.9519653.crate \
+          https://static.crates.io/crates/ndk/ndk-0.8.0.crate \
+          https://static.crates.io/crates/nix/nix-0.26.4.crate \
+          https://static.crates.io/crates/notify/notify-6.1.1.crate \
+          https://static.crates.io/crates/num_enum/num_enum-0.7.1.crate \
+          https://static.crates.io/crates/num_enum_derive/num_enum_derive-0.7.1.crate \
+          https://static.crates.io/crates/objc-foundation/objc-foundation-0.1.1.crate \
+          https://static.crates.io/crates/objc-sys/objc-sys-0.3.2.crate \
+          https://static.crates.io/crates/objc2-encode/objc2-encode-3.0.0.crate \
+          https://static.crates.io/crates/objc2/objc2-0.4.1.crate \
+          https://static.crates.io/crates/objc/objc-0.2.7.crate \
+          https://static.crates.io/crates/objc_id/objc_id-0.1.1.crate \
+          https://static.crates.io/crates/once_cell/once_cell-1.19.0.crate \
+          https://static.crates.io/crates/option-ext/option-ext-0.2.0.crate \
+          https://static.crates.io/crates/orbclient/orbclient-0.3.47.crate \
+          https://static.crates.io/crates/parking_lot/parking_lot-0.12.1.crate \
+          https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.9.9.crate \
+          https://static.crates.io/crates/percent-encoding/percent-encoding-2.3.1.crate \
+          https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.13.crate \
+          https://static.crates.io/crates/piper/piper-0.2.1.crate \
+          https://static.crates.io/crates/pkg-config/pkg-config-0.3.28.crate \
+          https://static.crates.io/crates/png/png-0.17.10.crate \
+          https://static.crates.io/crates/polling/polling-3.3.0.crate \
+          https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-2.0.0.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.71.crate \
+          https://static.crates.io/crates/quick-xml/quick-xml-0.30.0.crate \
+          https://static.crates.io/crates/quote/quote-1.0.33.crate \
+          https://static.crates.io/crates/raw-window-handle/raw-window-handle-0.5.2.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.3.5.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.4.1.crate \
+          https://static.crates.io/crates/redox_users/redox_users-0.4.4.crate \
+          https://static.crates.io/crates/regex-automata/regex-automata-0.4.3.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.2.crate \
+          https://static.crates.io/crates/rustc_version/rustc_version-0.4.0.crate \
+          https://static.crates.io/crates/rustix-openpty/rustix-openpty-0.1.1.crate \
+          https://static.crates.io/crates/rustix/rustix-0.38.25.crate \
+          https://static.crates.io/crates/ryu/ryu-1.0.16.crate \
+          https://static.crates.io/crates/same-file/same-file-1.0.6.crate \
+          https://static.crates.io/crates/scoped-tls/scoped-tls-1.0.1.crate \
+          https://static.crates.io/crates/scopeguard/scopeguard-1.2.0.crate \
+          https://static.crates.io/crates/sctk-adwaita/sctk-adwaita-0.8.1.crate \
+          https://static.crates.io/crates/semver/semver-1.0.20.crate \
+          https://static.crates.io/crates/serde/serde-1.0.193.crate \
+          https://static.crates.io/crates/serde_derive/serde_derive-1.0.193.crate \
+          https://static.crates.io/crates/serde_json/serde_json-1.0.108.crate \
+          https://static.crates.io/crates/serde_spanned/serde_spanned-0.6.5.crate \
+          https://static.crates.io/crates/serde_yaml/serde_yaml-0.9.29.crate \
+          https://static.crates.io/crates/servo-fontconfig-sys/servo-fontconfig-sys-5.1.0.crate \
+          https://static.crates.io/crates/servo-fontconfig/servo-fontconfig-0.5.1.crate \
+          https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.4.1.crate \
+          https://static.crates.io/crates/signal-hook/signal-hook-0.3.17.crate \
+          https://static.crates.io/crates/simd-adler32/simd-adler32-0.3.7.crate \
+          https://static.crates.io/crates/slab/slab-0.4.9.crate \
+          https://static.crates.io/crates/smallvec/smallvec-1.11.2.crate \
+          https://static.crates.io/crates/smithay-client-toolkit/smithay-client-toolkit-0.18.0.crate \
+          https://static.crates.io/crates/smithay-clipboard/smithay-clipboard-0.7.0.crate \
+          https://static.crates.io/crates/smol_str/smol_str-0.2.0.crate \
+          https://static.crates.io/crates/strict-num/strict-num-0.1.1.crate \
+          https://static.crates.io/crates/strsim/strsim-0.10.0.crate \
+          https://static.crates.io/crates/syn/syn-2.0.43.crate \
+          https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.52.crate \
+          https://static.crates.io/crates/thiserror/thiserror-1.0.52.crate \
+          https://static.crates.io/crates/tiny-skia-path/tiny-skia-path-0.11.3.crate \
+          https://static.crates.io/crates/tiny-skia/tiny-skia-0.11.3.crate \
+          https://static.crates.io/crates/toml/toml-0.8.8.crate \
+          https://static.crates.io/crates/toml_datetime/toml_datetime-0.6.5.crate \
+          https://static.crates.io/crates/toml_edit/toml_edit-0.20.7.crate \
+          https://static.crates.io/crates/toml_edit/toml_edit-0.21.0.crate \
+          https://static.crates.io/crates/tracing-core/tracing-core-0.1.32.crate \
+          https://static.crates.io/crates/tracing/tracing-0.1.40.crate \
+          https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.12.crate \
+          https://static.crates.io/crates/unicode-segmentation/unicode-segmentation-1.10.1.crate \
+          https://static.crates.io/crates/unicode-width/unicode-width-0.1.11.crate \
+          https://static.crates.io/crates/unsafe-libyaml/unsafe-libyaml-0.2.10.crate \
+          https://static.crates.io/crates/utf8parse/utf8parse-0.2.1.crate \
+          https://static.crates.io/crates/version_check/version_check-0.9.4.crate \
+          https://static.crates.io/crates/vswhom-sys/vswhom-sys-0.1.2.crate \
+          https://static.crates.io/crates/vswhom/vswhom-0.1.0.crate \
+          https://static.crates.io/crates/vte/vte-0.13.0.crate \
+          https://static.crates.io/crates/vte_generate_state_changes/vte_generate_state_changes-0.1.1.crate \
+          https://static.crates.io/crates/walkdir/walkdir-2.4.0.crate \
+          https://static.crates.io/crates/wasi/wasi-0.11.0%2Bwasi-snapshot-preview1.crate \
+          https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.89.crate \
+          https://static.crates.io/crates/wasm-bindgen-futures/wasm-bindgen-futures-0.4.39.crate \
+          https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.89.crate \
+          https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.89.crate \
+          https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.89.crate \
+          https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.89.crate \
+          https://static.crates.io/crates/wayland-backend/wayland-backend-0.3.2.crate \
+          https://static.crates.io/crates/wayland-client/wayland-client-0.31.1.crate \
+          https://static.crates.io/crates/wayland-csd-frame/wayland-csd-frame-0.3.0.crate \
+          https://static.crates.io/crates/wayland-cursor/wayland-cursor-0.31.0.crate \
+          https://static.crates.io/crates/wayland-protocols-plasma/wayland-protocols-plasma-0.2.0.crate \
+          https://static.crates.io/crates/wayland-protocols-wlr/wayland-protocols-wlr-0.2.0.crate \
+          https://static.crates.io/crates/wayland-protocols/wayland-protocols-0.31.0.crate \
+          https://static.crates.io/crates/wayland-scanner/wayland-scanner-0.31.0.crate \
+          https://static.crates.io/crates/wayland-sys/wayland-sys-0.31.1.crate \
+          https://static.crates.io/crates/web-sys/web-sys-0.3.66.crate \
+          https://static.crates.io/crates/web-time/web-time-0.2.4.crate \
+          https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi-util/winapi-util-0.1.6.crate \
+          https://static.crates.io/crates/winapi-wsapoll/winapi-wsapoll-0.1.1.crate \
+          https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi/winapi-0.3.9.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.45.0.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.48.0.crate \
+          https://static.crates.io/crates/windows-targets/windows-targets-0.42.2.crate \
+          https://static.crates.io/crates/windows-targets/windows-targets-0.48.5.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.42.2.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.48.5.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.42.2.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.48.5.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.42.2.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.48.5.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.42.2.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.42.2.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.42.2.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.42.2.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.5.crate \
+          https://static.crates.io/crates/winit/winit-0.29.9.crate \
+          https://static.crates.io/crates/winnow/winnow-0.5.30.crate \
+          https://static.crates.io/crates/winreg/winreg-0.51.0.crate \
+          https://static.crates.io/crates/wio/wio-0.2.2.crate \
+          https://static.crates.io/crates/x11-clipboard/x11-clipboard-0.8.1.crate \
+          https://static.crates.io/crates/x11-dl/x11-dl-2.21.0.crate \
+          https://static.crates.io/crates/x11rb-protocol/x11rb-protocol-0.12.0.crate \
+          https://static.crates.io/crates/x11rb-protocol/x11rb-protocol-0.13.0.crate \
+          https://static.crates.io/crates/x11rb/x11rb-0.12.0.crate \
+          https://static.crates.io/crates/x11rb/x11rb-0.13.0.crate \
+          https://static.crates.io/crates/xcursor/xcursor-0.3.5.crate \
+          https://static.crates.io/crates/xdg/xdg-2.5.2.crate \
+          https://static.crates.io/crates/xkbcommon-dl/xkbcommon-dl-0.4.1.crate \
+          https://static.crates.io/crates/xkeysym/xkeysym-0.2.0.crate \
+          https://static.crates.io/crates/xml-rs/xml-rs-0.8.19.crate \
+          https://static.crates.io/crates/zerocopy-derive/zerocopy-derive-0.7.32.crate \
+          https://static.crates.io/crates/zerocopy/zerocopy-0.7.32.crate"
+MD5SUM="9199be2f1d48125de06db0d79553ee2e \
+        669215548c64019c08c92b2c1afd3deb \
+        62063b829dc1fb0dcb50f845ef981263 \
+        95e5f8d0b7ab37171b8d3118542ba06a \
+        848f406142dbae274a821c9e93da9fbb \
+        33d654107e29a1ec9c8df5947d1888f2 \
+        2764314f4afc9f9751d60ebad48f6ea6 \
+        e188f6de00a35235da008cd39e1a003d \
+        d2453c99c7af98286c2dc9017a8dba6d \
+        b57fd47f132f32001e0d4bfc4621f1bf \
+        b4f71ffecd3694a82ffb62c357d997a8 \
+        ff41a5b5c2364747a7ff11f6bdeee406 \
+        504b5d258d68bdb980c997b93f0c6e6e \
+        7646c7582d8b97443a94c12d30e60d99 \
+        6a44afda654777d2930b93366bdfc7f3 \
+        05d77ef52e90ad161fdd41b252420467 \
+        577bba6ae4d7493e169ca895141dd106 \
+        a295edb6953237ebbdfa8e731229f9a3 \
+        ebcf604c44976809506192718f439dc1 \
+        fbcf6847d661bc3fdd8745c06a721b04 \
+        1751ef7d3080787345baeb93455f69df \
         ea2d23ceb9f98853a7dffc6c02884464 \
-        3b74244d96b3c60d2bf930a363679415 \
-        e502e6c6b0dca9c1ae2d99e92b26f645 \
-        ff4e1560b7d0ac5c4ae2688bc27f9c98 \
-        e0bf3b40b2d51cb52f40647b368efb50 \
-        0935eb9ddb26216e9dfd44bb249457b2 \
-        547dbf225c61b70c81f74f79a83affc9 \
-        dcb58f182347515cab229f836dd8e6d1 \
-        882dbbc613a93f64c3709b0a2bd0d6dc \
+        d8cacbb844fca8c0ca102c7576946131 \
+        9dd8e437188fced85429d9d0d9db145f \
+        51ed49380bb7d086c005208e805983b2 \
+        b760bf4a1a3fc54c76e9d042131a7acc \
+        458113901c4f5ab270e125b867f7dea4 \
+        9241fa90ea8b17c00010be46c9aa1ac5 \
+        267fc4a374516caa7ab495f0c607c1b4 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        126712a51ed2962e587048a634186390 \
         5739f950bcce803d986d189b128861b0 \
-        20cac860cf8ea29dd8e7e6f76eae9639 \
-        42af3a1e965585d80dcc1e0324fda6eb \
-        eb6e4217d79aefec36a4d1068b4ae278 \
-        1c8b50f8528dd37df7d984e0e4b61bd5 \
-        bfa12a07125b5aadf803aa3b5f939aa8 \
-        8de0c85238890738ff538f1548be52f0 \
-        50a7fcd4cdc347a06d3702c8dea6e926 \
-        ec9751a4c0d35e7313e52ddb7147376b \
-        a31d6dd3fb5148b9f87bf0b5e2761585 \
-        6a97194aa07f7993298563f012b05a73 \
-        9754db1eb3e8b15807f05a3540d2ab39 \
-        ee7b2dc49246abc5b91ed9feccbde82f \
-        f0682cfdc40af509c98f46f6350c1ba5 \
-        868723b977d47531ecfc00d431362acd \
-        2a9cc9f6b6f7399263d93df520be6ff6 \
-        bae239f1a0c474035926b65a8b271305 \
-        ba5527be251aede09ca0c45331f0feca \
-        3c153e21729b743f5127dec47670de17 \
-        ff67cf2eb9668167782b8012d3b48e7b \
-        ba7b8f06debf4491d6d530caaa4d3e66 \
-        1bb3b5328fdb89edf639fd9c3613e61f \
-        1946cef415cbf82cdcb975d813dd9696 \
-        8b418106a3968619300a2af8f6b4f200 \
+        c400ff01b6ca2ac3fc00742c2765d2d6 \
+        077e8f5390b3c1dac53fddca4556f9ff \
+        30e4024be60605f771fae98ebf38e441 \
+        08b9a34eadbb01ac16e36694e53eb254 \
+        8f177f61a37d63f805acb925b30a0e58 \
+        145831bf63bc14f31aca74b5e94e302b \
+        54e4adfd2d64f037c5115993a5da57b2 \
+        c9ea02f41a58ccc02bf4bbe6c73f9085 \
+        d8424867e97cd067b3d96929f845d546 \
+        010f6d0e98cc2a2b99907a23c6cd6bbc \
+        8b15d333a98fc02a34909961900246a4 \
+        59e2ac3afb27356dae5b252b6792e73c \
+        277c0eef3e10f7ec1b4db034ff40f1a8 \
+        d7624e4ff046ae83eda8e82d90887bdb \
+        4d7e3bc6c42f8a875a87246ed14d9948 \
+        58ee9a40577f5086ec1f22dc238b9c60 \
+        1f2aefb269a8a9d8a86160c67a10c0b0 \
+        407b8e24ec9b7a2921414e8e22267d45 \
+        a9d6492a1bd21d93dbc27c32eabd0c70 \
+        11452e33fe5f4dfe6f36f2d266a5d343 \
+        4e040f3b7359531ac7134679ea9afcdc \
+        b98796f70d39efaf11e6489c1c266d56 \
+        716a56ef901b38924bf55e20f602bd34 \
+        6681f2b2a1b8854ec13b1d35edc6fdc3 \
+        88c7bfadd3b04a713230597fe4c54e3d \
         03f2b7eae8b6491dbd3caacd842cb8cb \
-        1886bdaca29d3af3cc1178fe96dc3876 \
-        8cf354694bfabc868c506a648839b84c \
-        f8e21d57a92cfe87510176559f2118f0 \
-        a227f79f30fea6e06777524ce2602f18 \
-        146047ba26d24cfcfc6cf91979df6bc4 \
-        081ed755ceb8e0b7c78cffde40fd084d \
-        788b783fe3389534dc509539c20b7612 \
+        7c8ef8b5fc652fa97d3629d1ec8b18e8 \
+        09b520d03e86d50e3ac39d856d5aec32 \
+        a1544bff9ea95274369bf38508f8266a \
+        34ec0de0ebc730437e6788aa1264f86c \
+        bdf329a72ecd0605c296f25e53136706 \
+        24f6202003a936e73e51f47584ea8bea \
         d318084a7a361875006cd156c19db3dc \
-        b9f03f84345e22eae7858abc75dea31c \
-        5941f4a3d3435767e79260f61093ecd3 \
-        8dab3b3ec00dc56cffde0b0c410d47b5 \
-        506b571683460afdd2674576c022ff76 \
-        667e86b8b8d96ab4e9605627ce7dcc9a \
-        13c3c9f696793ecdc507877849cd3e02 \
-        78c898fdaa3968e23904bf8538c4a271 \
+        80e1c1b89d858c93fc5946b4a8266504 \
+        597b5678e74f368f512931d828e8ff97 \
+        412f39c3faf2efd34b5fe184e36ccc2f \
+        110e56f20886997bc288b6fea8617ce1 \
+        38f845b095b4ca30f93e034c7bd5ab14 \
+        0b1834c2de5aeb930998c0f41e1e5ac7 \
         24210500b0b946ed658dd20037cdf5b4 \
-        4f87f1d369fc881d9c09b8c60f08e40e \
-        9337eab4f601d1770903c6d3f3bde679 \
-        7c292ae288fae4b3dd8f4871f7ec54e9 \
-        49c7c8d8dff092a63277ed8d8a3b383b \
-        54cfab480b7a5f7302eadf44129d3f4b \
-        dd7c80c2d04d2e9ceba82826cf69764d \
-        de1228e571c94ef53ec4c21db57279ab \
-        849054e0df3292687cc1a3971d65ec2e \
+        186129dddd732f4fa1845915d8995091 \
+        c2682997e48a129ea7cc8afd6e850366 \
+        724696d583d5c24321c62a5e443d241f \
+        bb90dd58c7107a6f586b04588404b0ff \
+        8212aac8fcaeb41265840f72b31c9135 \
+        cbb52c723c94c83804912cde945b4510 \
+        3b00daaa372df161c5c8eeaf16a741d1 \
         cd6875725af793cd82db47d68b00ee93 \
-        e7c07242a95ee1df865efe9534e10a34 \
-        8d6d77db0129da96cc9bbf3f7649d5af \
-        a2532fe5c5af23f578e58f47c8b512f0 \
-        443d79d3dc7fbcd8b2ca67a3caa717b1 \
-        197834cb95fbe6ee356760ede252f4d1 \
-        42111d38dc2b5b6f96aae7ea6412605f \
-        c6384052cffdc4f368edd4efd5c67c42 \
-        be4d52524ec8485abc40efba317b1e4c \
-        edc41639aa4527c8cd965e601d4a1b4d \
-        bb2582cae7b3d837f5da1df153001db5 \
-        54ac4c56d9ec2800b8428020f24be67c \
-        c93dba5222b7abb3e2377590fcdb0d13 \
-        8ece65b4db64f81379cbd293e2f04d39 \
-        50929c2de8a472031f43c9fc371f2111 \
-        2be25e9b80e7d5a98393dc83069dc1b9 \
-        f73657307861e5406065d5171ad8ccdc \
-        f1c40b9836035b69e464df711a1d2950 \
-        493f4bd45cf2a6c3963f66f58884f622 \
+        86c67a9c1f6c51726cf94a84eecb18c0 \
+        e1054d42008eb59cea63bc22136ed22f \
+        fb01542b6f62fe5d68d1dd9835d4e80b \
+        8f6832ae66ce3c13c0f5da9f585f60e8 \
+        3451a2e54a12d567bbb1bf2815aedc37 \
+        b92fa50f56a1e06a7f1bf665442d4a73 \
+        11681ec4554f1f934b25eeba3f558ea7 \
+        e1543fd467c420225dabc4d75ff3fe79 \
+        f429c89da1e2d0ba564a0cb5e2ed928c \
+        639af0cca65c012e6a028acfb657e417 \
+        1c69490f9cefc24e2119217039c61dda \
+        0403f58e42c94609207c40a310cfe78a \
         73272fe4aadb91d550dca8fc7ead8bf7 \
-        04a84513cdad48c92d8363d627904227 \
-        9d033cc2daa6924420a4a89e6705773f \
+        be01525e51d79736e7af74fe93d19f93 \
+        9aaf13d622cd02548feaaca35687da9c \
+        6b33b0539f6c25c66268868b6b61e240 \
         8bc92e2d422193be1d498146e34a0b85 \
+        8234d20b9a5ea5e7087bb5ddb414011c \
+        e646c59e9a7da5308afd8e43149bcfef \
+        e53d38f6285cdc1bb509983b218d10d3 \
         fba3b040a55c01be7376d3dd5c4d4920 \
-        09c2a456bd4064675a0c53ca70f5eea1 \
-        a2f5808f8787bdbcf577f560c70b5dba \
-        6db136a3e060ff39fc699991b77b0170 \
-        16b94c53885cc430711a85db2ea665e4 \
-        8a79353ba205d0a86f695053dd4d15be \
-        4e3c46643b83ce53618c9bcd211f111a \
-        ccfdc823f169bd2016cb508b117dae67 \
-        19466d8edb3c032438026125770b17f9 \
-        61e508ca2eee543023c5e1ba777e5ede \
+        181cb83a57d327b26ebc21db41b28480 \
+        feb5919f3a98172d047e10b0bc1ea5ae \
+        4d3764b253ae871241c2f327e519f382 \
+        9ea1bc3f82c4c646878376eacbf366ce \
+        1d1b2033b4272a22654e55447ae7f404 \
+        cc1b0e90e372869ad03ef40bd53fa30f \
+        8ee79b4fe4c43d9ab09f16344612a656 \
         7c81e7a61ec172a229d6fdbc553e883d \
-        7916dcd738a8fa6a2798754c20d6e146 \
-        b5cf10e268e8a3bee2de8a734104245e \
-        124ec4f35274a0e9c1a4ef3dc0958643 \
-        bdb38691302aeb63500e053919f5f0f7 \
-        6ad7c30338903afc3521369ecd826cfb \
-        eb7a07c42356ca50832d5a7ca0e738d3 \
-        0d4dc4bd76fdb66114874a4afae6834b \
-        0e68149cff6d0663d9d70dc88a3f124a \
-        e820082de1cf13e1111d2acbae898fcc \
-        a82e0b9efe7f6385071c9fd9b3bccfa3 \
-        6217ae55f37fa0c9a37595276ead194a \
-        98731fbefe42841dce239a8e8064431d \
-        e4b3317d33ff0d40a2a0f5195673ec38 \
-        fbccda0cd4fb98e305ba86c4dd5567bc \
-        7cc35774447d1ec5b7a6f0ebf8765c39 \
-        683a998da434a7ff8558bdf6eaa7b8c7 \
-        0cddb62b3dcfb814b4e0b9441c5c1a18 \
-        c45800f4dfb888a928c772b081065214 \
-        2bd60bd849926090bd69a9fca2706c62 \
-        8efd24bdaba2414159d5c9c7d146f3ca \
-        d29e8c70063563f063eb6647ddd187ff \
-        9c52a747ee0325081e566c9f700a8d7e \
-        7ea8e5ad906d517aa522b8fcbc49e8dd \
-        99e024622d98dc28a8a5f37afccaf20a \
-        c3df6ec550943c6ccd356272db8eb202 \
-        fdb01eb939ccb5c5ff66970427d22c48 \
-        03442e847beac2997633c93f7ecb9cc2 \
+        ab9a5f02cef3b8794d810332ebf26a03 \
+        8c7d4897baee5e346d2184d46422ec49 \
+        48e7cc866f45af55ea3f627e29a2cd98 \
+        eb7e04508518ed8f29935ec874e1740a \
+        47628a42562928b85cd28cb50e08d8bb \
+        c14d50ef3ce9b2640d2a9d68c53834b9 \
+        7e395ce2e673b7d9665751cbbe3cbcdc \
+        e8ba17285a3c3413579cf23c009a5f52 \
+        d4aa9768b074d64e8271942682ff0159 \
+        44ab2701d152b855941648698cd7a99e \
+        1be22bdbd81580965933512a89c00e25 \
+        99913f0b1e33a0760543c0ca3b5e4dfe \
+        0c7dc4f3d2bd9fa81623fb1f3abef015 \
         aecd889de42c8168e1bc97a6f2720d8f \
+        f3b8c17ba1076acbcd2074e4278f44f9 \
+        1986c3b1b3a4968592e1577e8676ac12 \
+        bc6ef50c7cdab8a32d9720f4a5fdb2f1 \
         b4dcac855af5df71f3383d86c4a96b78 \
         fd9aa273ad560dedd00ddcf3dbe808ce \
-        0fb8f799f959c69991d54556c5457068 \
-        c20de7948428395a51bbd46dd03dbfc8 \
-        59b36aa3bae0b2fa7d338e71da2e309f \
-        1d457c63e43a46ed899f3c644ffb2d92 \
-        e1e7dd5a92eecf2d6a2430313d5b4de5 \
-        8d7308960df5143fe29a4a31c0c5f9c9 \
-        be2af3efcea9586194e249f646161d83 \
-        7e264bc8f23a45ad680668cb5e57d9fd \
-        f490982aceabdbd515348f63e638a782 \
-        a580658df3c2da1e8fed41a7a51389d0 \
-        4964b67b085fa4433b67dbde4d986c31 \
-        fd3df95de65e4c1fe6c9c4a8399cb7e7 \
-        f27cbb8b66feb1cc9ab1b9af8a1a2c51 \
-        d6f8f8aba0bdb5edb2dc41705b9d1144 \
-        e23545b69ca2087070db2432c9e9f52f \
-        7261ce43635fd9c2a009810db04d6901 \
-        31e22078d1d024582e5116669d6714e4 \
-        d120d82e6be8b10ed122a6b026db4199 \
-        020c7d0be083642e24a1499122793006 \
-        54b1bfe8bed9df22acc8e98f0761f527 \
-        3181dca31efe33cbed29a45d0ec67848 \
-        e6692d52f35aa3b9311d7d7748fa25ea \
-        d3c0a18ae8f426b3659405203a88f182 \
-        66d1cb32dce999907409f636f004b884 \
-        0a80ed36a125ac3cdfa09f8707055873 \
-        a0f55fda89c0f97784edb18f4c253a49 \
-        b269356e8646f3184a0e8d52a58cee69 \
-        7b0715affe44616a992f113ad7ab7d50 \
-        6840e02794f8d1a270f10a743f62d8b2 \
-        8dc2aa474c2cba342120ade9e98de066 \
-        31d088af3982b271b2afdda37e963518 \
-        04031b2ff0f95e8fb3c09d2d1d3b3b77 \
-        26e3fed1cf505f5fd65b98fb149ca1aa \
-        526f5ebac8d794185afbc71959c5c968 \
-        c9a135ad3406eeeffb425d585d4567d7 \
-        7b1261ea730a9314bc9bcdf4a379bf98 \
-        675704441633e4a46e05d0dec5671a70 \
-        4d101ab24d14c54937c5f45ece8fad5f \
-        f69d418c4e60b38ce069f8778208b520 \
-        55ba60123c22238764e9007b3152f6cc \
-        44d95c1ed46baee736c9420ad1de3228 \
+        8390247ae7126c00e162732b249be9d7 \
+        130db480add7c9dccf7c13aa9ca71c82 \
+        239e2ba2344ce1564490615b7ec6a7b0 \
+        1be45f99109d447849f4244b58c5a470 \
+        7502c2f15026ee3e6a01f57b92942771 \
+        0ba30a94d7b8865c23e86d4d64e5b91e \
+        ffc7c4e1b2639ba6c8579a1c47c5f97c \
+        564286699e80741f7c24b16c9a1a5f58 \
+        76c281577ef136b9484166302e37c9bd \
+        7b5035f3ae2acd6abe959249308bb5a1 \
+        4fc82daae9a3fe793c8876370d26bd6a \
+        0df16f0fae76d411cebf1e67c55070d9 \
+        e83703ecba7917d4e12c8e639692e169 \
+        fc70d4884e65f1c29086807a9aaad534 \
+        0ddb8bccd3198892d0dd0ec7151f7cd3 \
+        6150a7bb6ddc7aaa6aba6130de9fd2b8 \
+        782ea88d8e5b517b1c9e7d870e20e9e3 \
+        ff1d093069cfc9eb161907e17a51208b \
+        bca57d7079177ca0aa651d452c7099fe \
+        4f496143a21775fa7bd22bf329c37f37 \
+        91b60a71d44302a8b05bd398eca56c37 \
+        fdf3aa5e1f6c33e4f68b0f7b08e1e94e \
+        e60c2f75a7c60276ba15dba4c1766286 \
+        9bdda698a3c8ba141f4daba1a7630143 \
+        ca664d757b2c95424cf3465e412cce90 \
         2d8d8b377d144f5e32b4f65a69eb0b24 \
-        f505a218806e44b2369671089d65e839 \
-        b4a0a98a54439a5a37952c8879187ee3 \
-        1024ac462fe90a1d7882a6911bd70604 \
-        9e0c7fedb6287e5090bab920da5c1d09 \
-        8b4d8c7b6e3a060d365bc1ad650929fa \
-        64111c20b69aa1532fb66b70c4660b55 \
-        3879349fe374e764e24f37ce40ac9824 \
-        9b7d58f6341fb619ff2190481ce13b84 \
-        ce76f5430cd6d2ab76d0d86ecb8a4f4d \
-        edc6879bb5e213331662862bb4a68145 \
-        1e7f016a7eff797498f28cba0e156d3a \
-        0a1c33ff15279010692af23566070deb \
-        e0a0f1fa737110ffd0b04af8d1062edd \
-        e4e7efe2ab7921499d5c247a349e9e1f \
-        6baa5e1feb7ae90febb0ce028b0e4117 \
-        25d8a9b311bab576201d2d2bf19492e4 \
-        760118daf11b1985e22552de2b5b868a \
-        c7bfa89e6da163f1474bb3787987bb12 \
-        079297fc0fb968f749368577d9131549 \
-        d542cb62835e6715b6971ef7af7a592c \
-        0f842e0256ed664e51aca8ca2e306c57 \
-        77db363940fc8039d4389406375031d0 \
-        557d2ae2d0ba91790dfa7b2a894807e8 \
-        180a73ec075244f3a7a519160efade32 \
-        3cea882cebbb1273387568cf938abe35 \
-        781d4ccf5d04c98fa02af207a9639249 \
-        67ddc5f26cbbc715dfa213c9e4881dd7 \
-        bb3ae104a9fa1b31568cc98c920a4653 \
-        62e883807a65ebe1ba9d0e555d703339 \
-        c4fcdc44105c5e02def5a4ea19f1775f \
-        a8de006fe0c7e373c560dd51599287a8 \
-        a5dd75e77c7324f5c1d2d372c990d0a7 \
-        9d66208e00715217a8c1f2e40efe4a0c \
-        2e99b7fe9fc50def58bf0b391c149b1c \
-        36cbce768155bdac8934efa262d75fe3 \
-        f403bbb812ce1a2d9270d9159cf9e8d3 \
-        3d394ff298f20e04de3ce053ab63ccc7 \
-        0f65fd26370e1fd67c8e8812cabea574 \
-        5aaf04f9a94a6450e3e4963ddd62b92d \
-        e628ca8adb2b572bffb210f014656b6f \
-        81821d39675a1f584546b9920e5d6b5d \
-        f0fec022d543fb5d2575bd32ee6803a4 \
-        9d83f7627e511837fb2d94fbad338d35 \
-        aab44b0dae2fc434c7b1f119ffb100b9 \
-        333b4ba3f64c35b6f89b521e8d64548b \
-        0d6976e8a1a1e69abc8ba8f6966cddb8 \
-        689203efc084fc0f1d1f74f5d354ae75 \
-        6fe13b4122d83cd239b61466ede3198c \
+        b898bcf321bba46ecd15c9279cdbb290 \
+        f1358be8c98b98837cbd2cf51e75f8b3 \
+        92577365ba12f6bc2c5fd3b639135b62 \
+        bf2aac00571a32be8a2fb842e194a728 \
+        d6c1f2447aa984e398cdfdeb4cd75d44 \
+        d43f1621c76532ffdc7990d23593c61b \
+        3ed0ebc631b1840f3be21e1ba07fa4ed \
+        fa0d5d4e1e3bd20a9ca9aef473fc3665 \
+        6bcc09c6316e342b6076da0828cad63d \
+        89b435ff50362dda1abe34a8862cf4ab \
+        b4a3e97f65acc9e03df7e95defe9b27c \
+        22e95901b912671da26457ac33e36a23 \
+        f60ab8537f924a65fbc0961e958d375b \
+        d0116882bd495f2b993495a8cf01f6fe \
+        5d8c25fc51ffebca67935516c2325860 \
+        a88ce3625ee63d53088ad83d8581b368 \
+        3e595c35e2081351d8ba2da3e13353f3 \
+        b70a651e684a72d00f732c90856a6a19 \
+        c9fc0a9962fd7434e6d76ae22400e72a \
+        eb8ac974a85ac3219c8c66b17bf5d0f5 \
+        82d98dc87dc8503400aa095f5aa70f13 \
+        5b8200043b8a729b7ed1b74825c68073 \
+        93097f1e5375355e5561e947b1b77180 \
+        0d731b0c0babb1f744fce3ef70eec11d \
+        11ccfbb001a8e067c18843864e21e033 \
+        4726ea3b77caf0028375236c677e9a82 \
+        b7a1b93f85587ed99e0a46d141f26528 \
+        9aecd5ff283534a21d7cd51266abfe89 \
+        dff68dc5b0704b8123a947f52e31dc8d \
+        8184f2020a3a5c78844485260ec49a36 \
+        a6655e5e9845cb569991e87b5b38a1fc \
+        0a906c03436ec2dcc4c311c21fee0da2 \
+        ca65153603a1a7240bbd9d2ce19f2d67 \
+        b145fb66e71c48f5f7b5b7ad98de963b \
+        908ec8a89821b72f3a35726bab24461f \
+        428fc5d72716c000ce20267887878be2 \
+        ceee1159c41351d05f4cf705490867b3 \
+        d18d362345c4fe512ef67b738b239fb8 \
+        1ad539bb397aab6bb7c261d5b421a1a6 \
         32222c3df2805eabcfe92432db2aee8f \
-        03d7d776edd1a01dbc81f955fa9a9d41 \
+        c67eae79cbc709d1c2c7535f3d7b6281 \
         a29fec77b1e07caf7b682b881b676c06 \
-        1092a4a24e80f8856efc71af51a06114 \
-        6e23e0eee42b1ba9ec61a6db7ec2dc08 \
-        a59b9a01b4de22db8d7287f945bce33c \
-        b5015d777b19cae7d1c9a40622c74b03 \
-        45a3312c06fe9539a292146025f02426 \
-        fbdc95c195b987c8d75dc92c97a10307 \
-        5a2a0beb0c61c93106161a473bb9df12 \
-        7035a08f69721a134bd3f401d977fb57 \
-        c900e7dbce808ff8ced375077b17a163 \
+        96481ed810273371ed8b87f062a0dcda \
+        e972ea58ec203bfa6c79c1207852298b \
+        27e1a4ac927346509cf010b024c79e87 \
+        91606eb5d0ce66d748b5fc678b33a0ea \
+        90f2e8c0ca989290eff37cd9b3ec2a87 \
+        9202e1b9c6367013631774f38fdff707 \
+        f00d62969f597349b1d460c96b57136c \
+        7f115ec6580072e95e26ab41f3fabb84 \
+        e5ab780a9b5951ae6ddd1e0b26a8c6c8 \
+        1a1ac386996554c8f86261509e942f7c \
+        2149df0c65b9963e19b4e7ca4050ad96 \
+        4a67d22614c644fef07efb496a053865 \
+        56608eb750f70d0c9a6643a351cc5ea5 \
+        028a529550344ea14623168220fa1901 \
+        c0188e94dfca68e01c6bf0450d4f035e \
+        5d8e90b65d01001eef0e5c2a77fed433 \
+        7da33160ff24759809edd61619a4a69f \
+        e97f7d5779474c95cf1a1769013db24e \
+        b06e8c6d713b11560dd758109343209c \
         db96b50050277bf05a3c68534bbb9586 \
-        b9e37d5fc4ad28b612b78ad37816684d \
+        306c0281447d1876e8220007b7a7e053 \
+        e2860eb635198a35bdd26d200febc044 \
         09de9d01e7331ff3da11f58be8bef0df \
-        b44489eb4799c4fabac3fceb48de54f7 \
-        ce68e06a2cd4f180747cf169fc388a95 \
-        8125488182a6ce236cdc8508ae1ad6a2 \
-        b047c36ce2c3277ec2f9d0b88b17a082 \
-        a5993712501e0c03db6ec7a31c4d6d50 \
-        e01f3a4b5c3690899e5975c90bf12174 \
-        38346bab0933c9eb1e36d22fe4220ba7 \
-        8aa5631ce68ab505b09a7e01fd704f65 \
-        6e5896b10ddc995243e45e5482e7ee43 \
-        bc17188adb6a07610c3a78bfb184ef59 \
-        1628d3f26e3f952d8c43973ade1f2dad \
-        9039399ab9632e189ce70d8008011d34 \
-        0541629539c6bf2359a81746df61d841 \
-        7ae9feef92beadbfbb0caa8c2fee28d6"
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        b58284cb8ce52b8de07e09f4f8fb9653 \
+        f2797ade0e36f1e5d6be9d11b5076582 \
+        a369d510325342310c7ab159bd181dae \
+        24c64817e85ef77765ed0f26c31c9b4c \
+        7968284877e481b58df1569b68b5dc26 \
+        dae6d89034a6988042fd8be4cf5e037d \
+        34d06a94727c506c11e4710160e90f32 \
+        de2839e16d9d7a9fd1c397da62f62b4a \
+        017691b927b405669e1139b054a35f4a \
+        e0c35ffb8cfdb74a39bf799811f79304 \
+        f56c70fbae23f08fb0912284333f7851 \
+        d990172b607020701f9e84ca8e1c043c \
+        d20c2b0f45a62cc15c503ea610706a8f \
+        0a68848588e847ceccf504891584d00b \
+        ec7e437088dc741e6a0653e553abca4e \
+        45b469ad607b912256b7c80141fa2d17 \
+        8cec8a187df7a7b971009a7693f60140 \
+        7799baff9a5664205d9110a2624e8989 \
+        13b0d6da1e9b98af1619505a766656da \
+        0d4bd262b0a39e35e1e00dc97a67b827 \
+        d85c237fd9f6e522379b9a41c5f34b16 \
+        4396bc1704f7337718352f0e6ec2d391 \
+        da2424fe9f0c33ec7d8deda1f263abd0 \
+        1d09c0d1f19fc18bb1c400100df17c0c \
+        260cb5824639b426f46f9fec71ac7ef0 \
+        ee9610aac4f0c37e3a31f6cea6fb8ff9 \
+        77250c45b58d52e13e3c7d2a67919d1a \
+        ff16c9daa9afa7ba1d5334699700b042 \
+        5a19e54d2580e4c0d72c281df8f54ae6 \
+        1613d0f9e24d4b05e81748ea1f355f6c \
+        efd9146058a0c646f64bbf9282168f97 \
+        423da0bc6c03a22a8c3181feec42c09b \
+        f7e1624bbb0598683388e7820bbae8c4 \
+        936257597fbe2fd02d954a5db53c687a \
+        ae2ca148274c581aa6ee8a8e292ca2af"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
+REQUIRES="rust16 scdoc"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
diff --git a/system/alacritty/slack-desc b/system/alacritty/slack-desc
index 91d781376f..90c77d5e4b 100644
--- a/system/alacritty/slack-desc
+++ b/system/alacritty/slack-desc
@@ -12,7 +12,7 @@ alacritty: Alacritty is the fastest terminal emulator in existence. Using the
 alacritty: GPU for rendering enables optimizations that simply aren't possible
 alacritty: in other emulators.
 alacritty:
-alacritty: https://github.com/jwilm/alacritty
+alacritty: https://github.com/alacritty/alacritty
 alacritty:
 alacritty:
 alacritty:
diff --git a/system/alien/alien.SlackBuild b/system/alien/alien.SlackBuild
index 0a59a34621..ebec4a1211 100644
--- a/system/alien/alien.SlackBuild
+++ b/system/alien/alien.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for alien
 
@@ -16,10 +16,15 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+# 20220402 bkw: Modified by SlackBuilds.org, BUILD=2: remove perllocal.pod
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=alien
 VERSION=${VERSION:-8.95}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -29,7 +34,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,9 +68,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 perl Makefile.PL \
   PREFIX=/usr \
@@ -75,6 +84,7 @@ make install DESTDIR=$PKG
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+rm -f $PKG/usr/lib*/perl5/perllocal.pod
 find $PKG -depth -type d -empty -delete || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -86,4 +96,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/amanda/README b/system/amanda/README
index 925fd00984..71f8988757 100644
--- a/system/amanda/README
+++ b/system/amanda/README
@@ -1,13 +1,14 @@
-AMANDA, the Advanced Maryland Automatic Network Disk Archiver, is a
-backup system that allows the administrator of a LAN to set up a single
-master backup server to back up multiple hosts to a single large capacity
-tape drive.  AMANDA uses native dump and/or GNU tar facilities and can
-back up a large number of workstations running multiple versions of Unix.
-Recent versions can also use SAMBA to back up Microsoft Windows hosts.
+AMANDA, the Advanced Maryland Automatic Network Disk Archiver, is
+a backup system that allows the administrator of a LAN to set up a
+single master backup server to back up multiple hosts to a single
+large capacity tape drive. AMANDA uses native dump and/or GNU tar
+facilities and can back up a large number of workstations running
+multiple versions of Unix. Recent versions can also use SAMBA to back
+up Microsoft Windows hosts.
 
-You will need to have a special user and group created for AMANDA to use;
-this defaults to user and group of "amanda" but you can specify whatever
-group you wish - see the build script for more information.
+You will need to have a special user and group created for AMANDA to
+use; this defaults to user and group of "amanda" but you can specify
+whatever group you wish - see the build script for more information.
 
 After installing, see the /usr/doc/amanda-3.3.0/README.Slackware for
 more information on how to modify inetd.conf to start the the Amanda
diff --git a/system/amanda/amanda.SlackBuild b/system/amanda/amanda.SlackBuild
index d0eeb8d225..99eae2638c 100644
--- a/system/amanda/amanda.SlackBuild
+++ b/system/amanda/amanda.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for amanda
 
@@ -31,20 +31,30 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=amanda
-VERSION=${VERSION:-3.3.8}
+VERSION=${VERSION:-3.3.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,8 +64,8 @@ AMANDAGRP=${AMANDAGRP:-amanda}
 AMANDAUID=${AMANDAUID:-211}
 AMANDAGID=${AMANDAGID:-211}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -100,7 +110,7 @@ find -L . \
 
 PERLDIR=$(perl -V:installvendorlib | cut -d\' -f2)
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon -I/usr/include/tirpc -Wl,-ltirpc" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -154,4 +164,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/amanda/amanda.info b/system/amanda/amanda.info
index 7c8c2d163d..65e8116f92 100644
--- a/system/amanda/amanda.info
+++ b/system/amanda/amanda.info
@@ -1,8 +1,8 @@
 PRGNAM="amanda"
-VERSION="3.3.8"
+VERSION="3.3.9"
 HOMEPAGE="http://www.amanda.org/"
-DOWNLOAD="http://downloads.sourceforge.net/amanda/amanda-3.3.8.tar.gz"
-MD5SUM="2e9bb80fd177908cf9c1b010b4399455"
+DOWNLOAD="http://prdownloads.sourceforge.net/amanda/amanda-3.3.9.tar.gz"
+MD5SUM="51a7d55ee84d250c9d809318b0b3dcbb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/anacron/README b/system/anacron/README
deleted file mode 100644
index 733c963087..0000000000
--- a/system/anacron/README
+++ /dev/null
@@ -1,36 +0,0 @@
-anacron (periodic command scheduler)
-
-anacron is a periodic command scheduler.  It executes commands at
-intervals specified in days.  Unlike cron, it does not assume that the
-system is running continuously.  It can therefore be used to control
-the execution of daily, weekly and monthly jobs (or anything with a
-period of n days), on systems that don't run 24 hours a day.  When
-installed and configured properly, Anacron will make sure that the
-commands are run at the specified intervals as closely as
-machine-uptime permits.
-
-Every time Anacron is run, it reads a configuration file that
-specifies the jobs Anacron controls, and their periods in days.  If a
-job wasn't executed in the last n days, where n is the period of that
-job, Anacron executes it.  Anacron then records the date in a special
-timestamp file that it keeps for each job, so it can know when to run
-it again.  When all the executed commands terminate, Anacron exits.
-
-It is recommended to run Anacron from the system boot-scripts. For 
-example, add the following lines to /etc/rc.d/rc.local:
-
-  if [ -x /usr/sbin/anacron -a -f /etc/anacrontab ]; then
-    /usr/sbin/anacron -s > /dev/null 2>&1
-  fi
-
-This way the jobs "whose time has come" will be run shortly after the
-machine boots.  A delay can be specified for each job so that the
-machine isn't overloaded at boot time.
-
-In addition to running Anacron from the boot-scripts, it is also
-recommended to schedule it as a daily cron-job (usually at an early
-morning hour), so that if the machine is kept running for a night,
-jobs for the next day will still be executed.
-
-See anacron (8), anacrontab (5) and /usr/doc/anacron-2.3/README
-for further information.
diff --git a/system/anacron/anacron.SlackBuild b/system/anacron/anacron.SlackBuild
deleted file mode 100644
index c095bee74b..0000000000
--- a/system/anacron/anacron.SlackBuild
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for anacron
-
-# (C) 2007 Michael Wagner <lapinours@web.de>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=anacron
-VERSION=${VERSION:-2.3}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-DOCS="COPYING ChangeLog README TODO"
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# "Patch" gregor.c
-sed -i 's,const int isleap,int isleap,' gregor.c
-
-make CFLAGS="$SLKCFLAGS"
-make install PREFIX=$PKG
-
-strip --strip-unneeded $PKG/usr/sbin/$PRGNAM 2> /dev/null
-
-# Install a default /etc/anacrontab file
-mkdir -p $PKG/etc
-cat $CWD/anacrontab.new > $PKG/etc/anacrontab.new
-
-for i in $PKG/usr/man/man?/*; do
-  chmod 644 $i && gzip -9 $i 2> /dev/null
-done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/*
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/anacron/anacron.info b/system/anacron/anacron.info
deleted file mode 100644
index 470d0e504f..0000000000
--- a/system/anacron/anacron.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="anacron"
-VERSION="2.3"
-HOMEPAGE="http://anacron.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/anacron/anacron-2.3.tar.gz"
-MD5SUM="865cc1dfe1ed75c470d3e6de13763f03"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere.com"
diff --git a/system/anacron/anacrontab.new b/system/anacron/anacrontab.new
deleted file mode 100644
index 05f186f60e..0000000000
--- a/system/anacron/anacrontab.new
+++ /dev/null
@@ -1,8 +0,0 @@
-# /etc/anacrontab example
-# See the anacrontab(5) manpage
-SHELL=/bin/sh
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-# format: period delay job-identifier command
-1       5       cron.daily      run-parts /etc/cron.daily
-7       10      cron.weekly     run-parts /etc/cron.weekly
-30      15      cron.monthly    run-parts /etc/cron.monthly
diff --git a/system/anacron/doinst.sh b/system/anacron/doinst.sh
deleted file mode 100644
index b3c934f55c..0000000000
--- a/system/anacron/doinst.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-# List of configuration files (they should end in .new)
-
-config etc/anacrontab.new
-
diff --git a/system/anacron/slack-desc b/system/anacron/slack-desc
deleted file mode 100644
index e04d64496d..0000000000
--- a/system/anacron/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-anacron: anacron (periodic command scheduler)
-anacron:
-anacron: anacron executes commands at intervals specified in days.
-anacron: Unlike cron, it does not assume that the system is running
-anacron: continuously.  It can therefore be used to control the execution of
-anacron: daily, weekly and monthly jobs (or anything with a period of n days),
-anacron: on systems that don't run 24 hours a day.
-anacron:
-anacron: Homepage: http://anacron.sourceforge.net
-anacron:
-anacron:
diff --git a/system/ancient/README b/system/ancient/README
new file mode 100644
index 0000000000..50dcbd85d6
--- /dev/null
+++ b/system/ancient/README
@@ -0,0 +1,28 @@
+Ancient - Modern decompressor for old data compression formats
+
+This is a collection of decompression routines for old formats popular
+in the Amiga, Atari computers and some other systems from 80's and 90's
+as well as some that are currently used which were used in a some
+specific way in these old systems.
+
+Decompression algorithms provided:
+- bzip2
+- Compact (Unix)
+- Compress (Unix)
+- CrunchMania by Thomas Schwarz
+- Disk Masher System a.k.a. DMS
+- File Imploder
+- Freeze/Melt
+- gzip
+- Pack (Unix)
+- PowerPacker
+- Quasijarus Strong Compression
+- Rob Northen compressors.
+- Turbo Packer by Wolfgang Mayerle.
+- MMCMP: Music Module Compressor
+- SCO Compress LZH
+- StoneCracker
+- XPK-encapsulated files
+
+This code should compile cleanly on most C++17 capable compilers, and it
+is tested on clang and MSVC.
diff --git a/system/ancient/ancient.SlackBuild b/system/ancient/ancient.SlackBuild
new file mode 100644
index 0000000000..866258dcc0
--- /dev/null
+++ b/system/ancient/ancient.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/bash
+
+# Slackware build script for ancient
+
+# Copyright 2023 SPN Team
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ancient
+VERSION=${VERSION:-2.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./autogen.sh
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG -name perllocal.pod \
+  -o -name ".packlist" \
+  -o -name "*.bs" \
+  | xargs rm -f
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md LICENSE \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ancient/ancient.info b/system/ancient/ancient.info
new file mode 100644
index 0000000000..9d599bedc7
--- /dev/null
+++ b/system/ancient/ancient.info
@@ -0,0 +1,10 @@
+PRGNAM="ancient"
+VERSION="2.1.1"
+HOMEPAGE="https://github.com/temisu/ancient"
+DOWNLOAD="https://github.com/temisu/ancient/archive/v2.1.1/ancient-2.1.1.tar.gz"
+MD5SUM="2ccf33e4678931ee40916540da08a32d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="SPN Team"
+EMAIL="pwmn-master@hotmail.com"
diff --git a/system/ancient/slack-desc b/system/ancient/slack-desc
new file mode 100644
index 0000000000..ac5db7beeb
--- /dev/null
+++ b/system/ancient/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+ancient: ancient (Modern decompressor for old data compression formats)
+ancient:
+ancient: This is a collection of decompression routines for old formats
+ancient: popular in the Amiga, Atari computers and some other systems from
+ancient: 80's and 90's as well as some that are currently used which were
+ancient: used in a some specific way in these old systems.
+ancient:
+ancient:
+ancient:
+ancient:
+ancient: https://github.com/temisu/ancient
diff --git a/system/android-file-transfer/README b/system/android-file-transfer/README
index a2ec55f725..2a89b313cd 100644
--- a/system/android-file-transfer/README
+++ b/system/android-file-transfer/README
@@ -1,8 +1,5 @@
 Android File Transfer for Linux - reliable MTP client with
 minimalistic UI similar to Android File Transfer for Mac.
 
-Android File Transfer by default builds qt4 ui (or qt5,
-if installed).  However, in building only the client,
-without ui, run the script with the following command:
-
+To build only the command-line client, pass QT_GUI=no to the SlackBuild:
 QT_GUI=no ./android-file-transfer.SlackBuild
diff --git a/system/android-file-transfer/android-file-transfer.SlackBuild b/system/android-file-transfer/android-file-transfer.SlackBuild
index 809af5be97..9dda5cbbf9 100644
--- a/system/android-file-transfer/android-file-transfer.SlackBuild
+++ b/system/android-file-transfer/android-file-transfer.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for android-file-transfer
 #
-# Copyright 2019 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2019-2023 Isaac Yu <isaacyu@protonmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,22 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230811 bkw: Modified by SlackBuilds.org: stop trying to build the
+# Python module. This uses Python 2, and tries to build the Python
+# module if pybind11 is installed... but our pybind11 no longer
+# supports Python 2, so the build fails.
+
+# 20220211 bkw: Modified by SlackBuilds.org: use the correct github
+# download URL, get rid of the useless static lib in the package, add
+# a doinst.sh for the desktop/icon stuff.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=android-file-transfer
-VERSION=${VERSION:-3.9}
+VERSION=${VERSION:-4.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +47,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,15 +75,15 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+rm -rf $PRGNAM-linux-$VERSION
+tar xvf $CWD/$PRGNAM-linux-$VERSION.tar.gz
 cd $PRGNAM-linux-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 if [ ${QT_GUI:-yes} = no ]; then
 	GUI="OFF"
@@ -81,15 +97,18 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DCMAKE_BUILD_TYPE=Release .. \
-    -DBUILD_QT_UI=$GUI
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DBUILD_QT_UI=$GUI \
+    -DBUILD_PYTHON=OFF \
+    -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# 20220211 bkw: pretty sure the static lib libmtp-ng-static.a is
+# getting installed by mistake. there are no headers, so user code
+# couldn't link with it anyway.
+rm -rf $PKG/usr/lib*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a FAQ.md README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
@@ -97,6 +116,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/android-file-transfer/android-file-transfer.info b/system/android-file-transfer/android-file-transfer.info
index e2ec031b1b..a76187b4d9 100644
--- a/system/android-file-transfer/android-file-transfer.info
+++ b/system/android-file-transfer/android-file-transfer.info
@@ -1,10 +1,10 @@
 PRGNAM="android-file-transfer"
-VERSION="3.9"
+VERSION="4.3"
 HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux"
-DOWNLOAD="https://github.com/whoozle/android-file-transfer-linux/archive/v3.9/android-file-transfer-3.9.tar.gz"
-MD5SUM="84c28538f03802a3f0dda71e53564034"
+DOWNLOAD="https://github.com/whoozle/android-file-transfer-linux/archive/v4.3/android-file-transfer-linux-4.3.tar.gz"
+MD5SUM="4be6d29b072202194d97150f72125ff5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Isaac Yu"
-EMAIL="isaacyu1@isaacyu1.com"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/android-file-transfer/doinst.sh b/system/android-file-transfer/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/system/android-file-transfer/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/android-udev-rules/LICENSE b/system/android-udev-rules/LICENSE
new file mode 100644
index 0000000000..94a9ed024d
--- /dev/null
+++ b/system/android-udev-rules/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/system/android-udev-rules/README b/system/android-udev-rules/README
new file mode 100644
index 0000000000..a90b542fdc
--- /dev/null
+++ b/system/android-udev-rules/README
@@ -0,0 +1,5 @@
+This package sets the requiered udev rules to the system
+in order to use fastboot and adb on android device
+with proper permissions.
+
+NOTE: A restart is requiered after installing this package.
diff --git a/system/android-udev-rules/android-udev-rules.SlackBuild b/system/android-udev-rules/android-udev-rules.SlackBuild
new file mode 100644
index 0000000000..4c2464fc89
--- /dev/null
+++ b/system/android-udev-rules/android-udev-rules.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/bash
+#
+# Slackware build script for android-udev-rules
+
+# Copyright 2021 Reza Talebi, Shahin Shahr, Iran.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=android-udev-rules
+SRCNAM=51-android.rules
+VERSION=${VERSION:-2024.02.21}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+DEST=etc/udev/rules.d
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION/$DEST
+cp $CWD/$SRCNAM $PRGNAM-$VERSION/$DEST
+cd $PRGNAM-$VERSION/$DEST
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cp -r $TMP/$PRGNAM-$VERSION/etc $PKG
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/android-udev-rules/android-udev-rules.info b/system/android-udev-rules/android-udev-rules.info
new file mode 100644
index 0000000000..912ecac3da
--- /dev/null
+++ b/system/android-udev-rules/android-udev-rules.info
@@ -0,0 +1,10 @@
+PRGNAM="android-udev-rules"
+VERSION="2024.02.21"
+HOMEPAGE="https://github.com/M0Rf30/android-udev-rules"
+DOWNLOAD="https://raw.githubusercontent.com/M0Rf30/android-udev-rules/20240221/51-android.rules"
+MD5SUM="4c1d48ababfd56414f8b91704664e3d6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="android-tools"
+MAINTAINER="Reza Talebi"
+EMAIL="reza.talebi.73@outlook.com"
diff --git a/system/android-udev-rules/doinst.sh b/system/android-udev-rules/doinst.sh
new file mode 100644
index 0000000000..b6f2036577
--- /dev/null
+++ b/system/android-udev-rules/doinst.sh
@@ -0,0 +1,4 @@
+if [ -f /etc/udev/rules.d/51-android.rules ]; then
+    chmod a+r /etc/udev/rules.d/51-android.rules
+fi
+
diff --git a/system/android-udev-rules/slack-desc b/system/android-udev-rules/slack-desc
new file mode 100644
index 0000000000..295b2d7912
--- /dev/null
+++ b/system/android-udev-rules/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+android-udev-rules: android-udev-rules (udev rules and permissions for adb and fastboot)
+android-udev-rules:
+android-udev-rules: This package sets the requiered udev rules to the system
+android-udev-rules: in order to use fastboot and adb on android device
+android-udev-rules: with proper permissions.
+android-udev-rules:
+android-udev-rules:
+android-udev-rules:
+android-udev-rules: https://github.com/M0Rf30/android-udev-rules
+android-udev-rules:
+android-udev-rules:
diff --git a/system/andromeda/andromeda.SlackBuild b/system/andromeda/andromeda.SlackBuild
index 8bb4daad34..e157b7640f 100644
--- a/system/andromeda/andromeda.SlackBuild
+++ b/system/andromeda/andromeda.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for andromeda
 # Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
@@ -21,10 +21,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - make .desktop file validate.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=andromeda
 VERSION=${VERSION:-0.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,9 +76,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 mkdir -p build
 cd build
@@ -79,11 +89,10 @@ cd build
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+sed -i '/\[ru\]/s,Comment,GenericName,' $PKG/usr/share/applications/imageviewer.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
@@ -94,4 +103,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/andromeda/andromeda.info b/system/andromeda/andromeda.info
index e2979fd497..8b395365f4 100644
--- a/system/andromeda/andromeda.info
+++ b/system/andromeda/andromeda.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://ponce.cc/slackware/sources/repo/andromeda-0.3.tar.xz"
 MD5SUM="ee69b9b5dcc0aa142a6901335faf640a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt4"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/system/ansible-core/README b/system/ansible-core/README
new file mode 100644
index 0000000000..282f8b19a1
--- /dev/null
+++ b/system/ansible-core/README
@@ -0,0 +1,5 @@
+Ansible Core is the language and runtime that powers automation.
+
+Core includes the Ansible language and runtime,
+a set of built-in modules and command-line tools,
+and a framework for extending automation with collections.
diff --git a/system/ansible-core/ansible-core.SlackBuild b/system/ansible-core/ansible-core.SlackBuild
new file mode 100644
index 0000000000..fba03e2c59
--- /dev/null
+++ b/system/ansible-core/ansible-core.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+# Slackware build script for ansible-core
+
+# Copyright 2024 Marek Wodzinski <majek@w7i.pl>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ansible-core
+VERSION=${VERSION:-2.15.9}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+    case "$( uname -m )" in
+        i?86) ARCH=i586 ;;
+        arm*) ARCH=arm ;;
+           *) ARCH=$(uname -m) ;;
+    esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 setup.py install --root=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md licenses/ $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ansible-core/ansible-core.info b/system/ansible-core/ansible-core.info
new file mode 100644
index 0000000000..63eecc2a28
--- /dev/null
+++ b/system/ansible-core/ansible-core.info
@@ -0,0 +1,10 @@
+PRGNAM="ansible-core"
+VERSION="2.15.9"
+HOMEPAGE="https://www.ansible.com"
+DOWNLOAD="https://files.pythonhosted.org/packages/47/0b/5e46aeee6c72adc3507d9909e57fa1e9a66b3f4929c463bdbe102441a062/ansible-core-2.15.9.tar.gz"
+MD5SUM="101644e55f0f2e13630aeaba3809298f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="cryptography importlib-resources python3-resolvelib"
+MAINTAINER="Marek Wodzinski"
+EMAIL="majek@w7i.pl"
diff --git a/system/ansible-core/slack-desc b/system/ansible-core/slack-desc
new file mode 100644
index 0000000000..f24ce06215
--- /dev/null
+++ b/system/ansible-core/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+ansible-core: ansible-core (language and runtime that powers automation)
+ansible-core:
+ansible-core: Core includes the Ansible language and runtime,
+ansible-core: a set of built-in modules and command-line tools,
+ansible-core: and a framework for extending automation with collections.
+ansible-core:
+ansible-core: Homepage: https://www.ansible.com
+ansible-core:
+ansible-core:
+ansible-core:
+ansible-core:
diff --git a/system/ansible/ansible.SlackBuild b/system/ansible/ansible.SlackBuild
index bb0f5e4a09..76914fce5c 100644
--- a/system/ansible/ansible.SlackBuild
+++ b/system/ansible/ansible.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ansible
 
 # Copyright 2014 Alex Diaconu <alex.diaconu@gmx.com>
 # Copyright 2016 Ciorceri Petru Sorin <cpsorin@gmail.com>
-# Copyright 2017-2020 Marek Wodzinski <majek@w7i.pl>
+# Copyright 2017-2024 Marek Wodzinski <majek@w7i.pl>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ansible
-VERSION=${VERSION:-2.9.13}
+VERSION=${VERSION:-8.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
     case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
     esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -73,25 +83,12 @@ find -L . \
 
 python3 setup.py install --root=$PKG
 
-# Copy docs, remove git traces, compress manpages
-cp -a docs/man $PKG/usr/man
-find $PKG/usr/man \
-    \( -iname '.git*' \
-    -o -iname 'man3' \) -delete # "man3" contains a single ".gitdir" file (yeah)
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/etc/ansible
-cp -a examples/ansible.cfg $PKG/etc/ansible/ansible.cfg.new
-cp -a examples/hosts $PKG/etc/ansible/hosts.new
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a examples COPYING *.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING *.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ansible/ansible.info b/system/ansible/ansible.info
index 643c9cb987..aecae39f8c 100644
--- a/system/ansible/ansible.info
+++ b/system/ansible/ansible.info
@@ -1,10 +1,10 @@
 PRGNAM="ansible"
-VERSION="2.9.13"
+VERSION="8.7.0"
 HOMEPAGE="https://www.ansible.com"
-DOWNLOAD="https://releases.ansible.com/ansible/ansible-2.9.13.tar.gz"
-MD5SUM="3f66cce5bdbfc49315b9f357d36d38c5"
+DOWNLOAD="https://files.pythonhosted.org/packages/90/25/55e09468efe564f3b48c47a7e082bd84d4f0d064af60ac8458eba4667994/ansible-8.7.0.tar.gz"
+MD5SUM="7878b20b0994a6740764d6f02dc0f2a5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="cryptography python3-PyYAML Jinja2"
+REQUIRES="ansible-core"
 MAINTAINER="Marek Wodzinski"
 EMAIL="majek@w7i.pl"
diff --git a/system/ansible/doinst.sh b/system/ansible/doinst.sh
deleted file mode 100644
index 52f13dc698..0000000000
--- a/system/ansible/doinst.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-config() {
-    NEW="$1"
-    OLD="$(dirname $NEW)/$(basename $NEW .new)"
-    # If there's no config file by that name, mv it over:
-    if [ ! -r $OLD ]; then
-        mv $NEW $OLD
-    elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-        # toss the redundant copy
-        rm $NEW
-    fi
-    # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/ansible/ansible.cfg.new
-config etc/ansible/hosts.new
diff --git a/system/ansifilter/README b/system/ansifilter/README
new file mode 100644
index 0000000000..9588f983a3
--- /dev/null
+++ b/system/ansifilter/README
@@ -0,0 +1,5 @@
+ansifilter (strip or convert ANSI escapes in text files)
+
+Ansifilter handles text files containing ANSI terminal escape codes.
+The command sequences may be stripped or be interpreted to generate
+formatted output (HTML, RTF, TeX, LaTeX, BBCode, Pango).
diff --git a/system/ansifilter/ansifilter.SlackBuild b/system/ansifilter/ansifilter.SlackBuild
new file mode 100644
index 0000000000..2a5461d435
--- /dev/null
+++ b/system/ansifilter/ansifilter.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/bash
+
+# Slackware build script for ansifilter
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ansifilter
+VERSION=${VERSION:-2.20}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# don't need this in the doc dir.
+sed -i '/\.\/INSTALL/d' makefile
+
+# use our flags, followed by upstream's (which are already -O2 -fPIC,
+# so this really only matters on x86 32-bit). don't have to mess with
+# the qt stuff, qmake already uses the correct flags it was built with.
+sed -i "/FLAGS/s,-Wall,$SLKCFLAGS," src/makefile
+
+make
+make gui
+# make tcl   ### tcl support disabled unless someone requests it someday.
+make install \
+  man_dir=/usr/man/man1 doc_dir=/usr/doc/$PRGNAM-$VERSION \
+  DESTDIR=$PKG INSTALL_PROGRAM="install -s -m0755"
+make install-gui \
+  DESTDIR=$PKG INSTALL_PROGRAM="install -s -m0755"
+gzip -9 $PKG/usr/man/man*/*
+
+ICONS=$PKG/usr/share/icons/hicolor/48x48/apps
+mkdir -p $ICONS
+convert src/qt-gui/ansifilter.xpm $ICONS/$PRGNAM.png
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ansi_art_samples $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ansifilter/ansifilter.info b/system/ansifilter/ansifilter.info
new file mode 100644
index 0000000000..54475ed2a8
--- /dev/null
+++ b/system/ansifilter/ansifilter.info
@@ -0,0 +1,10 @@
+PRGNAM="ansifilter"
+VERSION="2.20"
+HOMEPAGE="http://andre-simon.de/doku/ansifilter/en/ansifilter.php"
+DOWNLOAD="http://andre-simon.de/zip/ansifilter-2.20.tar.bz2"
+MD5SUM="d2a8d8b9256bc8c843934d8123b5c0dd"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/krusader/doinst.sh b/system/ansifilter/doinst.sh
index 65c7e2eeb9..65c7e2eeb9 100644
--- a/system/krusader/doinst.sh
+++ b/system/ansifilter/doinst.sh
diff --git a/system/ansifilter/slack-desc b/system/ansifilter/slack-desc
new file mode 100644
index 0000000000..c292c56293
--- /dev/null
+++ b/system/ansifilter/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+ansifilter: ansifilter (strip or convert ANSI escapes in text files)
+ansifilter:
+ansifilter: Ansifilter handles text files containing ANSI terminal escape codes.
+ansifilter: The command sequences may be stripped or be interpreted to generate
+ansifilter: formatted output (HTML, RTF, TeX, LaTeX, BBCode, Pango).
+ansifilter:
+ansifilter:
+ansifilter:
+ansifilter:
+ansifilter:
+ansifilter:
diff --git a/system/anything-sync-daemon/anything-sync-daemon.SlackBuild b/system/anything-sync-daemon/anything-sync-daemon.SlackBuild
index d5765c49d5..b6346a5a87 100644
--- a/system/anything-sync-daemon/anything-sync-daemon.SlackBuild
+++ b/system/anything-sync-daemon/anything-sync-daemon.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "anything-sync-daemon".
 
@@ -24,13 +24,24 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230530 bkw: modified by SlackBuilds.org:
+# - install bash and zsh completions in correct directories.
+# - remove INSTALL from doc dir (not useful to a package user).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=anything-sync-daemon
 VERSION=${VERSION:-5.76}
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -46,20 +57,19 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
-sed -i 's#/share##g' Makefile
-make
-make install-bin install-man install-cron DESTDIR=$PKG
+make MANDIR=/usr/man/man1
+make install-bin install-man install-cron MANDIR=/usr/man/man1 DESTDIR=$PKG
 
 mv $PKG/etc/cron.hourly/asd-update $PKG/etc/cron.hourly/asd-update.new
 install -D -m 0644 $TMP/$PRGNAM-$VERSION/common/asd.conf $PKG/etc/asd.conf.new
 install -D -m 0644 $CWD/rc.asd $PKG/etc/rc.d/rc.asd.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL MIT README.md WARNING_READ_THIS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a MIT README.md WARNING_READ_THIS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir $PKG/install
@@ -67,4 +77,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/anything-sync-daemon/anything-sync-daemon.info b/system/anything-sync-daemon/anything-sync-daemon.info
index f2e9878c42..9a3e4b8172 100644
--- a/system/anything-sync-daemon/anything-sync-daemon.info
+++ b/system/anything-sync-daemon/anything-sync-daemon.info
@@ -1,7 +1,7 @@
 PRGNAM="anything-sync-daemon"
 VERSION="5.76"
 HOMEPAGE="https://github.com/graysky2/anything-sync-daemon"
-DOWNLOAD="https://github.com/graysky2/anything-sync-daemon/archive/v5.76.tar.gz"
+DOWNLOAD="https://github.com/graysky2/anything-sync-daemon/archive/v5.76/anything-sync-daemon-5.76.tar.gz"
 MD5SUM="362243b99ceb506164b348e370b2fa49"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/apache-activemq/README b/system/apache-activemq/README
index 74dc0508ec..38acdece23 100644
--- a/system/apache-activemq/README
+++ b/system/apache-activemq/README
@@ -1,21 +1,22 @@
-Apache ActiveMQ is the most popular and powerful open source messaging and
-Integration Patterns provider.
+Apache ActiveMQ is the most popular and powerful open source messaging
+and Integration Patterns provider.
 
-Apache ActiveMQ is fast, supports many Cross Language Clients and Protocols,
-comes with easy to use Enterprise Integration Patterns and many advanced
-features while fully supporting JMS 1.1 and J2EE 1.4. Apache ActiveMQ is
-released under the Apache 2.0 License.
+Apache ActiveMQ is fast, supports many Cross Language Clients and
+Protocols, comes with easy to use Enterprise Integration Patterns
+and many advanced features while fully supporting JMS 1.1 and J2EE
+1.4. Apache ActiveMQ is released under the Apache 2.0 License.
 
-This package provides an /etc/rc.d/rc.activemq init script to manage the main
-ActiveMQ system instance. If you want to run different instances on the same
-machine:
+This package provides an /etc/rc.d/rc.activemq init script to manage
+the main ActiveMQ system instance. If you want to run different
+instances on the same machine:
 
-1) create the configuration file /etc/default/activemq-instance-<INSTANCENAME>
+1) create the configuration file
+   /etc/default/activemq-instance-<INSTANCENAME>
 2) create an appropriate ACTIVEMQ_HOME
 3) ln -sf /usr/share/activemq/bin/activemq \
       /usr/local/bin/activemq-instance-<INSTANCENAME>
-4) use /usr/local/bin/activemq-instance-<INSTANCENAME> to start/stop/restart
-   your own instance.
+4) use /usr/local/bin/activemq-instance-<INSTANCENAME> to
+   start/stop/restart your own instance.
 
 
 Groupname and Username
@@ -29,8 +30,9 @@ for example:
 
 Web Interface
 
-The web interface for ActiveMQ is available at http://127.0.0.1:8161/admin/
-with the default username and password set to:
+The web interface for ActiveMQ is available at
+http://127.0.0.1:8161/admin/ with the default username and password
+set to:
 
 Login: admin
 Passwort: admin
diff --git a/system/apache-activemq/apache-activemq.SlackBuild b/system/apache-activemq/apache-activemq.SlackBuild
index 61af0d8950..45eb960483 100644
--- a/system/apache-activemq/apache-activemq.SlackBuild
+++ b/system/apache-activemq/apache-activemq.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Apache Active MQ.
 
@@ -22,20 +22,44 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220408 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - set ARCH correctly if it's not set in the environment.
+# - on 32-bit, remove the 64-bit binaries (and vice versa).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=apache-activemq
 VERSION=${VERSION:-5.14.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ACTIVEMQ_USER=${ACTIVEMQ_USER:-activemq}
 ACTIVEMQ_UID=${ACTIVEMQ_UID:-253}
 ACTIVEMQ_GROUP=${ACTIVEMQ_GROUP:-activemq}
 ACTIVEMQ_GID=${ACTIVEMQ_GID:-253}
 
-# i486 or x86_64 only
-ARCH=${ARCH:-i486}
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+# i?86 or x86_64 only
+case "$ARCH" in
+  i?86)   wrongbindir=linux-x86-64 ;;
+  x86_64) wrongbindir=linux-x86-32 ;;
+  *) echo "Unsupported ARCH $ARCH, only x86_64 and i?86 are supported." ;
+     exit 1 ;;
+esac
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -74,9 +98,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 # Worst file permissions ever seen in a package...
 find . -type d -exec chmod 755 {} \;
@@ -88,7 +112,13 @@ mkdir -p $PKG/etc/activemq \
   $PKG/var/{run,lib,log}/activemq
 
 cp -f conf/* $PKG/etc/activemq/
-rm -rf bin/macosx
+rm -rf bin/macosx bin/$wrongbindir
+
+# 20220408 bkw: the binaries should be stripped, unless that breaks
+# something. I don't know how to tell, so this is commented out.
+# Maintainer of this build, please uncomment and check?
+#strip bin/linux-x86*/{wrapper,libwrapper.so}
+
 cp -rf bin lib $PKG/usr/share/activemq/
 cp -rf webapps $PKG/var/lib/activemq/
 
@@ -104,11 +134,12 @@ chown -R $ACTIVEMQ_USER:$ACTIVEMQ_GROUP $PKG/var/{run,lib,log}/activemq
 )
 
 # These links are still needed for activemq to actually work
-ln -sf /etc/activemq $PKG/usr/share/activemq/conf
-ln -sf /var/lib/activemq/webapps $PKG/usr/share/activemq/webapps
-ln -sf /var/log/activemq $PKG/usr/share/activemq/log
-ln -sf /tmp/activemq $PKG/usr/share/activemq/tmp
-
+# 20220408 bkw: made these relative links. the one to /tmp still
+# makes sbopkglint complain...
+ln -sf ../../../etc/activemq $PKG/usr/share/activemq/conf
+ln -sf ../../../var/lib/activemq/webapps $PKG/usr/share/activemq/webapps
+ln -sf ../../../var/log/activemq $PKG/usr/share/activemq/log
+ln -sf ../../../tmp/activemq $PKG/usr/share/activemq/tmp
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
@@ -125,4 +156,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/apache-activemq/apache-activemq.info b/system/apache-activemq/apache-activemq.info
index c2ae9a1e99..fd70b5d656 100644
--- a/system/apache-activemq/apache-activemq.info
+++ b/system/apache-activemq/apache-activemq.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://archive.apache.org/dist/activemq/5.14.5/apache-activemq-5.14.5-
 MD5SUM="3d28a422e05544a4c6764ad0d91718ee"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Miguel De Anda"
 EMAIL="miguel@thedeanda.com"
diff --git a/system/apache-cassandra/apache-cassandra.SlackBuild b/system/apache-cassandra/apache-cassandra.SlackBuild
index c29685266c..e4fe2c0a46 100644
--- a/system/apache-cassandra/apache-cassandra.SlackBuild
+++ b/system/apache-cassandra/apache-cassandra.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for apache-cassandra
 #
 # Copyright 2010  Manlio Modugno <manliomodugno -# #- gmail-# #- com>
@@ -24,14 +24,23 @@
 
 # based on apache-tomcat.SlackBuild by Heinz Wiesinger and Vincent Batts
 
+# 20230807 bkw: Modified by SlackBuilds.org, BUILD=2: fix csh profile script.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="apache-cassandra"
-VERSION=${VERSION:-2.0.7}
+VERSION=${VERSION:-4.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH="noarch"
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -58,20 +67,19 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 
 rm -f bin/*.bat
 
-cp -rf bin conf interface lib pylib tools $PKG/opt/$PRGNAM
+cp -rf bin conf lib pylib tools $PKG/opt/$PRGNAM
 cp $CWD/rc.cassandra $PKG/etc/rc.d/rc.cassandra.new
 
-cp -a CHANGES.txt  LICENSE.txt  NEWS.txt  NOTICE.txt  README.txt \
+cp -a CHANGES.txt  LICENSE.txt  NEWS.txt  NOTICE.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
-cp -rf javadoc $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 cat << EOF > $PKG/etc/profile.d/$PRGNAM.csh
 #!/bin/csh
-setenv CASSANDRA_HOME="/opt/$PRGNAM"
-setenv CASSANDRA_CONF="\$CASSANDRA_HOME/conf"
-setenv CASSANDRA_INCLUDE="\$CASSANDRA_HOME/tools/bin/cassandra.in.sh"
-setenv PATH="\$PATH:\$CASSANDRA_HOME/bin"
+setenv CASSANDRA_HOME "/opt/$PRGNAM"
+setenv CASSANDRA_CONF "\${CASSANDRA_HOME}/conf"
+setenv CASSANDRA_INCLUDE "\${CASSANDRA_HOME}/tools/bin/cassandra.in.sh"
+setenv PATH "\${PATH}:\${CASSANDRA_HOME}/bin"
 EOF
 
 cat << EOF > $PKG/etc/profile.d/$PRGNAM.sh
@@ -89,4 +97,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/apache-cassandra/apache-cassandra.info b/system/apache-cassandra/apache-cassandra.info
index 45143d3b55..09c9c61397 100644
--- a/system/apache-cassandra/apache-cassandra.info
+++ b/system/apache-cassandra/apache-cassandra.info
@@ -1,10 +1,10 @@
 PRGNAM="apache-cassandra"
-VERSION="2.0.7"
+VERSION="4.1.3"
 HOMEPAGE="http://cassandra.apache.org/"
-DOWNLOAD="http://archive.apache.org/dist/cassandra/2.0.7/apache-cassandra-2.0.7-bin.tar.gz"
-MD5SUM="1894c5103d12a2be14a2c44bfa2363cc"
+DOWNLOAD="https://dlcdn.apache.org/cassandra/4.1.3/apache-cassandra-4.1.3-bin.tar.gz"
+MD5SUM="f2f148d0c7af65375caedb074dde93d1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Mario Antunes"
 EMAIL="mariolpantunes@gmail.com"
diff --git a/system/apache-cassandra/rc.cassandra b/system/apache-cassandra/rc.cassandra
index 8fa5d9a7ce..6cfea9d080 100644
--- a/system/apache-cassandra/rc.cassandra
+++ b/system/apache-cassandra/rc.cassandra
@@ -35,7 +35,7 @@ if [[ $STATUS -eq 0 ]]; then
     echo -e "Service $PRG is already running."
 else
     echo -e "Start service $PRG"
-    $DIR$PRG -p $PID_FILE > /dev/null 2>&1 &
+    $DIR$PRG -R -p $PID_FILE > /dev/null 2>&1 &
 fi
 }
 
diff --git a/system/apache-tomcat/README b/system/apache-tomcat/README
index ba4fe2f735..05ef874c7b 100644
--- a/system/apache-tomcat/README
+++ b/system/apache-tomcat/README
@@ -1,5 +1,5 @@
-Apache Tomcat is an implementation of the Java Servlet and JavaServer Pages
-technologies.  The Java Servlet and JavaServer Pages specifications are 
-developed under the Java Community Process.  Apache Tomcat powers numerous 
-large-scale, mission- critical web applications across a diverse range of 
-industries and organizations.
+Apache Tomcat is an implementation of the Java Servlet and
+JavaServer Pages technologies. The Java Servlet and JavaServer Pages
+specifications are developed under the Java Community Process. Apache
+Tomcat powers numerous large-scale, mission-critical web applications
+across a diverse range of industries and organizations.
diff --git a/system/apache-tomcat/apache-tomcat.SlackBuild b/system/apache-tomcat/apache-tomcat.SlackBuild
index 28eec47580..694d71d493 100644
--- a/system/apache-tomcat/apache-tomcat.SlackBuild
+++ b/system/apache-tomcat/apache-tomcat.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for apache-tomcat
 
-# Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2023 Heinz Wiesinger, Amsterdam, The Netherlands
 # Copyright 2010  Vincent Batts, vbatts@hashbangbash.com, http://hashbangbash.com/
 # All rights reserved.
 #
@@ -12,24 +12,31 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=apache-tomcat
-VERSION=${VERSION:-7.0.103}
+VERSION=${VERSION:-10.0.27}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,12 +71,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/etc/tomcat $PKG/usr/share/{tomcat,java} \
-  $PKG/var/{run,lib,log,tmp,spool}/tomcat
-
- # required, otherwise, permissions on /var/tmp will be
- # (re)set to 755 when package is installed.
- #
-chmod 1777 $PKG/var/tmp
+  $PKG/var/{lib,log,spool}/tomcat
 
 rm -f bin/*.exe bin/*.bat bin/*.tar.gz bin/commons-daemon.jar
 cp -rf bin lib $PKG/usr/share/tomcat/
@@ -85,7 +87,7 @@ ln -s /var/tmp/tomcat ${PKG}${TOMCAT_HOME}/temp
 ln -s /var/run/tomcat ${PKG}${TOMCAT_HOME}/work
 ln -s /etc/tomcat ${PKG}${TOMCAT_HOME}/conf
 
-for i in tmp run spool; do
+for i in spool; do
     chown -R tomcat:tomcat ${PKG}/var/${i}/tomcat
     chmod -R 755 ${PKG}/var/${i}/tomcat
 done
@@ -150,4 +152,4 @@ cd $PKG/etc/tomcat
 cd -
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/apache-tomcat/apache-tomcat.info b/system/apache-tomcat/apache-tomcat.info
index 2750dfb566..83d14c751e 100644
--- a/system/apache-tomcat/apache-tomcat.info
+++ b/system/apache-tomcat/apache-tomcat.info
@@ -1,10 +1,10 @@
 PRGNAM="apache-tomcat"
-VERSION="7.0.103"
+VERSION="10.0.27"
 HOMEPAGE="https://tomcat.apache.org/"
-DOWNLOAD="https://archive.apache.org/dist/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103.tar.gz"
-MD5SUM="8dd9df51900023107e0c24f4ed105b01"
+DOWNLOAD="https://dlcdn.apache.org/tomcat/tomcat-10/v10.0.27/bin/apache-tomcat-10.0.27.tar.gz"
+MD5SUM="01efbd5d30f0b06f1bda3aa19ba68f2a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk commons-daemon"
+REQUIRES="commons-daemon"
 MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+EMAIL="pprkut@slackbuilds.org"
diff --git a/system/apache-tomcat/rc.tomcat b/system/apache-tomcat/rc.tomcat
index 75c083b679..e3630784a1 100644
--- a/system/apache-tomcat/rc.tomcat
+++ b/system/apache-tomcat/rc.tomcat
@@ -9,10 +9,14 @@
 
 # Load environment variables
 . /etc/profile.d/apache-tomcat.sh
-if [ -e "/etc/profile.d/openjdk.sh" ]; then
-  . /etc/profile.d/openjdk.sh
-else
-  . /etc/profile.d/jdk.sh
+
+if [ -z "$JAVA_HOME" ]; then
+  for i in /etc/profile.d/*jdk*.sh; do
+    if [ -x $i ]; then
+      source $i
+      break
+    fi
+  done
 fi
 
 PIDFILE="/var/spool/tomcat/tomcat.pid"
@@ -38,6 +42,17 @@ TOMCAT_CMD="-user $USER -cp $CLASSPATH \
 
 tomcat_start() {
   echo -n "Starting Apache Tomcat ... "
+  if ! [ -e /var/run/tomcat ]; then
+    mkdir /var/run/tomcat
+    chown tomcat:tomcat /var/run/tomcat
+    chmod 755 /var/run/tomcat
+  fi
+  if ! [ -e /var/tmp/tomcat ]; then
+    mkdir /var/tmp/tomcat
+    chown tomcat:tomcat /var/tmp/tomcat
+    chmod 755 /var/tmp/tomcat
+  fi
+
   if [ -e "$PIDFILE" ]; then
     echo "already running!"
   else
diff --git a/system/apachetop/README b/system/apachetop/README
index c6895a5ae8..09829b74e5 100644
--- a/system/apachetop/README
+++ b/system/apachetop/README
@@ -1,2 +1,3 @@
 ApacheTop is a curses-based top-like display for Apache information,
-including requests per second, bytes per second, most popular URLs, etc. 
+including requests per second, bytes per second, most popular URLs,
+etc.
diff --git a/system/apachetop/apachetop.SlackBuild b/system/apachetop/apachetop.SlackBuild
index c766ca84da..2d18709962 100644
--- a/system/apachetop/apachetop.SlackBuild
+++ b/system/apachetop/apachetop.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ApacheTop
 
@@ -9,10 +9,13 @@
 # Granted WTFPLv2, as published by Sam Hocevar dec 2004.
 # See http://sam.zoy.org/wtfpl/COPYING for more details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=apachetop
-VERSION=${VERSION:-0.19.7}
+VERSION=${VERSION:-0.23.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -22,7 +25,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -58,7 +65,7 @@ find -L . \
 
 # Apply a patch by Aaron McClimont to allow writing statistics to a file.
 # For like MRTG to use (or Cricket, Cacti, Torrus, whatever).
-patch -p0 < $CWD/apachetop.outputfile.patch
+#patch -p0 < $CWD/apachetop.outputfile.patch
 
 # Add mension of the feature added above to the manpage.
 patch -p0 < $CWD/apachetop.manpage.diff
@@ -92,4 +99,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/apachetop/apachetop.info b/system/apachetop/apachetop.info
index e4f5665b2b..aaecdc7193 100644
--- a/system/apachetop/apachetop.info
+++ b/system/apachetop/apachetop.info
@@ -1,8 +1,8 @@
 PRGNAM="apachetop"
-VERSION="0.19.7"
+VERSION="0.23.2"
 HOMEPAGE="https://github.com/tessus/apachetop"
-DOWNLOAD="https://github.com/tessus/apachetop/archive/0.19.7/apachetop-0.19.7.tar.gz"
-MD5SUM="a1b7d9d21794fbcc87bc6efc66320a21"
+DOWNLOAD="https://github.com/tessus/apachetop/archive/0.23.2/apachetop-0.23.2.tar.gz"
+MD5SUM="ec77c32d9ff19809a3ddeb500ad306e5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/apachetop/apachetop.outputfile.patch b/system/apachetop/apachetop.outputfile.patch
deleted file mode 100644
index 95e484370c..0000000000
--- a/system/apachetop/apachetop.outputfile.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-Index: src/apachetop.cc
-===================================================================
---- src/apachetop.cc	(revision 873)
-+++ src/apachetop.cc	(revision 874)
-@@ -85,6 +85,7 @@
- 	cf.debug = true;
- 	cf.current_display_size = 0;
- 	cf.input_count = 0;
-+	cf.output_file = "";
- 	cf.circle_size = DEFAULT_CIRCLE_SIZE;
- 	cf.circle_mode = DEFAULT_CIRCLE_MODE;
- 	cf.sort = DEFAULT_SORT;
-@@ -136,7 +137,7 @@
- #endif
- 
- 	/* process commandline {{{ */
--	while ((ch = getopt(argc, argv, "f:H:T:hvqlrs:pd:")) != -1)
-+	while ((ch = getopt(argc, argv, "f:o:H:T:hqlrs:pd:")) != -1)
- 	{
- 		switch(ch)
- 		{
-@@ -150,6 +151,9 @@
- 				else
- 					cf.input_count++;
- 				break;
-+			case 'o':
-+				cf.output_file = optarg;
-+				break;
- 			case 'T':
- 				x = atoi(optarg);
- 				seen_t = true;
-@@ -1043,24 +1047,25 @@
- 	fprintf(stderr, 
- 	    "ApacheTop v%s - Usage:\n"
- 	    "File options:\n"
--	    "  -f logfile  open logfile (assumed common/combined) [%s]\n"
--	    "              (repeat option for more than one source)\n"
-+	    "  -f logfile   open logfile (assumed common/combined) [%s]\n"
-+	    "               (repeat option for more than one source)\n"
-+            "  -o outfile  output logfile\n"
- 	    "\n"
- 	    "URL/host/referrer munging options:\n"
--	    "  -q          keep query strings [%s]\n"
--	    "  -l          lowercase all URLs [%s]\n"
--	    "  -s num      keep num path segments of URL [all]\n"
--	    "  -p          preserve protocol at front of referrers [%s]\n"
--	    "  -r          resolve hostnames/IPs into each other [%s]\n"
-+	    "  -q           keep query strings [%s]\n"
-+	    "  -l           lowercase all URLs [%s]\n"
-+	    "  -s num       keep num path segments of URL [all]\n"
-+	    "  -p           preserve protocol at front of referrers [%s]\n"
-+	    "  -r           resolve hostnames/IPs into each other [%s]\n"
- 	    "\n"
- 	    "Stats options:\n"
- 	    "  Supply up to one of the following two. default: [-%c %d]\n"
--	    "  -H hits     remember stats for this many hits\n"
--	    "  -T secs     remember stats for this many seconds\n"
-+	    "  -H hits      remember stats for this many hits\n"
-+	    "  -T secs      remember stats for this many seconds\n"
- 	    "\n"
--	    "  -d secs     refresh delay in seconds [%d]\n"
-+	    "  -d secs      refresh delay in seconds [%d]\n"
- 	    "\n"
-	    "  -v          show version\n"
--	    "  -h          this help\n"
-+	    "  -h           this help\n"
- 	    "\n"
- 	    "Compile Options: %cHAVE_KQUEUE %cHAVE_FAM %cENABLE_PCRE\n"
- 	    "Polling Method: %s\n"
-Index: src/display.cc
-===================================================================
---- src/display.cc	(revision 873)
-+++ src/display.cc	(revision 874)
-@@ -22,6 +22,7 @@
- extern itemlist *items;
- extern map *last_display_map;
- 
-+FILE *outputFile;
- 
- bool display(time_t last_display) /* {{{ */
- {
-@@ -174,11 +175,21 @@
- 	move(0, 0);
- 	clrtoeol();
- 
-+	if (cf.output_file != "") {
-+        // Open the file.
-+        outputFile = fopen (cf.output_file, "wt");
-+	}
-+
- 	/* last hit */
- 	secs_offset = gstats.alltime.last % 86400;
- 	mvprintw(0, 0, "last hit: %02d:%02d:%02d",
- 	  secs_offset / 3600, (secs_offset / 60) % 60, secs_offset % 60);
- 	
-+	if (cf.output_file != "") {
-+        fprintf(outputFile, "last hit: %02d:%02d:%02d\n",
-+          secs_offset / 3600, (secs_offset / 60) % 60, secs_offset % 60);
-+	}
-+
- 	/* uptime */
- 	diff = (unsigned int)difftime(now, gstats.start);
- 	if (diff > 86399) diff -= ((d = diff / 86400)*86400);
-@@ -186,6 +197,9 @@
- 	if (diff > 59) diff -= ((m = diff / 60)*60);
- 	s = diff;
- 	mvprintw(0, 27, "atop runtime: %2d days, %02d:%02d:%02d", d, h, m, s);
-+	if (cf.output_file != "") {
-+        fprintf(outputFile, "atop runtime: %2d days, %02d:%02d:%02d\n", d, h, m, s);
-+	}
- 
- 	/* are we paused? */
- 	if (cf.display_paused)
-@@ -197,6 +211,10 @@
- 	secs_offset = now % 86400;
- 	mvprintw(0, 71, "%02d:%02d:%02d",
- 	  secs_offset /3600, (secs_offset/ 60) % 60, secs_offset % 60);
-+	if (cf.output_file != "") {
-+        fprintf(outputFile, "current time: %02d:%02d:%02d\n",
-+          secs_offset /3600, (secs_offset/ 60) % 60, secs_offset % 60);
-+	}
- 
- 
- 	//All: 1,140,532 requests (39.45/sec),  999,540,593 bytes (857,235/sec) 
-@@ -215,6 +233,15 @@
- 	  bps, bps_suffix,
- 	  per_req, per_req_suffix);
- 	attroff(A_BOLD);
-+	if (cf.output_file != "") {
-+        fprintf(outputFile,
-+          "All: %12.0f reqs (%6.1f/sec)  %11.1f%c (%7.1f%c/sec)   %7.1f%c/req\n",
-+          gstats.alltime.reqcount,
-+          gstats.alltime.reqcount/ftmp,
-+          bytes, bytes_suffix,
-+          bps, bps_suffix,
-+          per_req, per_req_suffix);
-+	}
- 
- 
- 	// 2xx 1,604,104 (95%) 3xx 1,000,000 ( 3%) 4xx 1,000,000 ( 1%) 
-@@ -244,6 +271,29 @@
- 	 
- 	);
- 
-+	if (cf.output_file != "") {
-+        fprintf(outputFile,
-+         "2xx: %7.0f (%4.*f%%) 3xx: %7.0f (%4.*f%%) "
-+         "4xx: %5.0f (%4.*f%%) 5xx: %5.0f (%4.*f%%)\n",
-+
-+         gstats.r_codes[2].reqcount,
-+         (gstats.r_codes[2].reqcount/ftmp) == 1 ? 0 : 1,
-+         (gstats.r_codes[2].reqcount/ftmp)*100,
-+
-+         gstats.r_codes[3].reqcount,
-+         (gstats.r_codes[3].reqcount/ftmp) == 1 ? 0 : 1,
-+         (gstats.r_codes[3].reqcount/ftmp)*100,
-+
-+         gstats.r_codes[4].reqcount,
-+         (gstats.r_codes[4].reqcount/ftmp) == 1 ? 0 : 1,
-+         (gstats.r_codes[4].reqcount/ftmp)*100,
-+
-+         gstats.r_codes[5].reqcount,
-+         (gstats.r_codes[5].reqcount/ftmp) == 1 ? 0 : 1,
-+         (gstats.r_codes[5].reqcount/ftmp)*100
-+        );
-+	}
-+
- 	/* housecleaning on the circle, if its required in this class */
- 	c->updatestats();
- 	/* fetch the time of the first "recent" request */
-@@ -263,6 +313,16 @@
- 	  per_req, per_req_suffix
- 	);
- 	attroff(A_BOLD);
-+	if (cf.output_file != "") {
-+        fprintf(outputFile,
-+          "R (%3ds): %7.0f reqs (%6.1f/sec)  %11.1f%c (%7.1f%c/sec)   %7.1f%c/req\n",
-+          itmp, c->getreqcount(),
-+          ((float)c->getreqcount()/itmp),
-+          bytes, bytes_suffix,
-+          bps, bps_suffix,
-+          per_req, per_req_suffix
-+        );
-+	}
- 
- 	ftmp = c->getsummary(2) + c->getsummary(3) +
- 	       c->getsummary(4) + c->getsummary(5);
-@@ -286,6 +346,27 @@
- 	 (c->getsummary(5)/ftmp) == 1 ? 0 : 1,
- 	 (c->getsummary(5)/ftmp)*100
- 	);
-+	if (cf.output_file != "") {
-+        fprintf(outputFile,
-+          "R2xx: %6.0f (%4.*f%%) R3xx: %6.0f (%4.*f%%) "
-+          "R4xx: %4.0f (%4.*f%%) R5xx: %4.0f (%4.*f%%)\n",
-+         c->getsummary(2),
-+         (c->getsummary(2)/ftmp) == 1 ? 0 : 1,
-+         (c->getsummary(2)/ftmp)*100,
-+
-+         c->getsummary(3),
-+         (c->getsummary(3)/ftmp) == 1 ? 0 : 1,
-+         (c->getsummary(3)/ftmp)*100,
-+
-+         c->getsummary(4),
-+         (c->getsummary(4)/ftmp) == 1 ? 0 : 1,
-+         (c->getsummary(4)/ftmp)*100,
-+
-+         c->getsummary(5),
-+         (c->getsummary(5)/ftmp) == 1 ? 0 : 1,
-+         (c->getsummary(5)/ftmp)*100
-+        );
-+	}
- 
- //	mvprintw(5, 0,
- //	    "Unique Objects:         Size Footprint:");
-@@ -315,6 +396,11 @@
- 
- 	}
- 
-+	if (cf.output_file != "") {
-+        // Close the file.
-+        fclose (outputFile);
-+	}
-+
- } /* }}} */
- 
- void display_list() /* {{{ */
-Index: src/apachetop.h
-===================================================================
---- src/apachetop.h	(revision 873)
-+++ src/apachetop.h	(revision 874)
-@@ -138,6 +138,7 @@
- 	short current_display_size; /* how many lines we're displaying */
- 
- 	short input_count;
-+        char *output_file;
- 
- 	#define TIMED_CIRCLE 'T'
- 	#define HITS_CIRCLE  'H'
diff --git a/system/apcupsd/README b/system/apcupsd/README
index 5e4534c3d9..d306345bc7 100644
--- a/system/apcupsd/README
+++ b/system/apcupsd/README
@@ -1,16 +1,17 @@
-APCUPSD can be used for power management and controlling most of APC's UPS 
-models on Unix and Windows machines. Apcupsd works with most of APC's 
-Smart-UPS models as well as most simple signalling models such as Back-UPS
-and BackUPS-Office.
+APCUPSD can be used for power management and controlling most of APC's
+UPS models on Unix and Windows machines. Apcupsd works with most of
+APC's Smart-UPS models as well as most simple signalling models such
+as Back-UPS and BackUPS-Office.
 
-This buildscript veers from the "accepted" installation of apcupsd, but for 
-what I believe you'll see are justifiable reasons.  The stock install of 
-apcupsd detects its presence on Slackware and attempts to patch the system's
-/etc/rc.d/rc.6 script and places the rc.apcupsd script inside /etc/rc.d 
-(instead of DESTDIR/etc/rc.d - in essence, it touches files outside DESTDIR).
-I don't view this as even remotely acceptable, so the build script disables 
-the distribution-specific installation to prevent messing with files outside 
-DESTDIR; however, this does make it require some manual configuration after 
+This buildscript veers from the "accepted" installation of apcupsd,
+but for what I believe you'll see are justifiable reasons. The stock
+install of apcupsd detects its presence on Slackware and attempts to
+patch the system's /etc/rc.d/rc.6 script and places the rc.apcupsd
+script inside /etc/rc.d (instead of DESTDIR/etc/rc.d - in essence, it
+touches files outside DESTDIR). I don't view this as even remotely
+acceptable, so the build script disables the distribution-specific
+installation to prevent messing with files outside DESTDIR;
+however, this does make it require some manual configuration after
 installation.
 
 After installing, see /usr/doc/apcupsd-3.14.13/README.SLACKWARE for more
diff --git a/system/apcupsd/apcupsd.SlackBuild b/system/apcupsd/apcupsd.SlackBuild
index 080d77ca6f..c69ac04df6 100644
--- a/system/apcupsd/apcupsd.SlackBuild
+++ b/system/apcupsd/apcupsd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for apcupsd
 
@@ -22,13 +22,21 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220402 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - don't install icons and .desktop files executable.
+# - fix desktop-file-validate warning.
+# - remove useless INSTALL instructions from doc dir.
+
 # Modified 3/3/2009 by Christopher Walker <kris240376@gmail.com>
 # * added log rotation
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=apcupsd
 VERSION=${VERSION:-3.14.14}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +46,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -68,9 +80,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Fixup up a couple of nitpicks in the init script
 patch -p1 < $CWD/patches/init-script-fixups.diff
@@ -113,6 +125,12 @@ CXXFLAGS="$SLKCFLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS=1" \
 make
 make install DESTDIR=$PKG
 
+# 20220402 bkw: bad permissions, desktop-file-validate.
+chmod 644 $PKG/usr/share/{applications,pixmaps}/*
+sed -i -e '/^Categories/s,Application;,,' \
+       -e '/^Encoding/d' \
+       $PKG/usr/share/applications/*desktop
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -137,7 +155,7 @@ done
 rm -rf $PKG/usr/share/hal
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog DISCLAIMER Developers INSTALL ReleaseNotes \
+cp -a COPYING ChangeLog DISCLAIMER Developers ReleaseNotes \
   VERIFYING examples doc/* $CWD/README.SLACKWARE $CWD/$PRGNAM.SlackBuild \
     $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
@@ -150,4 +168,4 @@ sed s/@VERSION@/$VERSION/ $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/apg/apg.SlackBuild b/system/apg/apg.SlackBuild
index a213d6346e..824242a5eb 100644
--- a/system/apg/apg.SlackBuild
+++ b/system/apg/apg.SlackBuild
@@ -1,21 +1,29 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for apg
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230816 bkw: note to self: repology thinks this build is outdated,
+# because someone has packaged up 2.3.0b, a beta version. The forked
+# github repo I'm using does not include 2.3.0.b, and I don't want to
+# package up a 20-year-old beta of a dead project.
+
 # TODO: figure out what's wrong with apgd. It works fine when called
 # from the command line, but when starting it from inetd it seems
 # to get stuck in a loop, never prints any output, logs hundreds
 # of requests, and never generates any output. This is low-priority
 # because nobody actually *uses* a password-generation TCP service...
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=apg
 VERSION=${VERSION:-2.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -25,7 +33,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -74,4 +86,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/apg/apg.info b/system/apg/apg.info
index 89d7456f13..0fc116b674 100644
--- a/system/apg/apg.info
+++ b/system/apg/apg.info
@@ -1,10 +1,10 @@
 PRGNAM="apg"
 VERSION="2.2.3"
-HOMEPAGE="https://github.com/jabenninghoff/apg/blob/master/rnd.c"
+HOMEPAGE="https://github.com/jabenninghoff/"
 DOWNLOAD="https://github.com/jabenninghoff/apg/archive/v2.2.3/apg-2.2.3.tar.gz"
 MD5SUM="6d1490d7835dbf5a04ade75fbad3d726"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/apparmor/README b/system/apparmor/README
index 06c07e32c0..f0dafebc98 100644
--- a/system/apparmor/README
+++ b/system/apparmor/README
@@ -1,9 +1,10 @@
-AppArmor protects systems from insecure or untrusted processes by running them
-in restricted confinement, while still allowing processes to share files,
-exercise privilege and communicate with other processes. AppArmor is a
-Mandatory Access Control (MAC) mechanism which uses the Linux Security Module
-(LSM) framework.
+AppArmor protects systems from insecure or untrusted processes by
+running them in restricted confinement, while still allowing processes
+to share files, exercise privilege and communicate with other
+processes. AppArmor is a Mandatory Access Control (MAC) mechanism
+which uses the Linux Security Module (LSM) framework.
 
-Note that in order to use AppArmor, you need to have CONFIG_SECURITY_APPARMOR
-setting enabled in the kernel (which is not enabled by default in Slackware).
-So in order to use this, you need to reconfigure & recompile your kernel.
+Note that in order to use AppArmor, you need to have
+CONFIG_SECURITY_APPARMOR setting enabled in the kernel (which is not
+enabled by default in Slackware). So in order to use this, you need
+to reconfigure & recompile your kernel.
diff --git a/system/apparmor/apparmor.SlackBuild b/system/apparmor/apparmor.SlackBuild
index 9f1dcc2c1a..71673a4919 100644
--- a/system/apparmor/apparmor.SlackBuild
+++ b/system/apparmor/apparmor.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for AppArmor
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=apparmor
-VERSION=${VERSION:-2.13.4}
+VERSION=${VERSION:-3.1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -103,7 +113,6 @@ make
 make install DESTDIR=$PKG MANDIR=/usr/man
 popd
 mv -v ${PKG}/etc/apparmor/parser.conf    ${PKG}/etc/apparmor/parser.conf.new
-mv -v ${PKG}/etc/apparmor/subdomain.conf ${PKG}/etc/apparmor/subdomain.conf.new
 mv -v ${PKG}/etc/rc.d/rc.apparmor        ${PKG}/etc/rc.d/rc.apparmor.new
 
 pushd utils
@@ -143,9 +152,11 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/apparmor/apparmor.info b/system/apparmor/apparmor.info
index d1f682368f..39f5fafaca 100644
--- a/system/apparmor/apparmor.info
+++ b/system/apparmor/apparmor.info
@@ -1,10 +1,10 @@
 PRGNAM="apparmor"
-VERSION="2.13.4"
+VERSION="3.1.6"
 HOMEPAGE="https://gitlab.com/apparmor/"
-DOWNLOAD="https://gitlab.com/apparmor/apparmor/-/archive/v2.13.4/apparmor-v2.13.4.tar.bz2"
-MD5SUM="ac50e8bec220d62a350661ee88fd41b4"
+DOWNLOAD="https://gitlab.com/apparmor/apparmor/-/archive/v3.1.6/apparmor-v3.1.6.tar.bz2"
+MD5SUM="7ad3f9533f209615cc5d53f768a94d3a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
+REQUIRES=""
 MAINTAINER="pyllyukko"
 EMAIL="pyllyukko@maimed.org"
diff --git a/system/apparmor/doinst.sh b/system/apparmor/doinst.sh
index 7715ef2c3a..9cbdac1590 100644
--- a/system/apparmor/doinst.sh
+++ b/system/apparmor/doinst.sh
@@ -27,5 +27,4 @@ config etc/apparmor/easyprof.conf.new
 config etc/apparmor/logprof.conf.new
 config etc/apparmor/notify.conf.new
 config etc/apparmor/parser.conf.new
-config etc/apparmor/subdomain.conf.new
 config etc/apparmor/severity.db.new
diff --git a/system/apple-emoji/32-apple-emoji.conf b/system/apple-emoji/32-apple-emoji.conf
new file mode 100644
index 0000000000..f6261b008e
--- /dev/null
+++ b/system/apple-emoji/32-apple-emoji.conf
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias binding="strong">
+    <family>emoji</family>
+    <default><family>Apple Color Emoji</family></default>
+  </alias>
+  <alias binding="strong">
+    <family>Noto Color Emoji</family>
+    <prefer><family>Apple Color Emoji</family></prefer>
+  </alias>
+  <alias binding="strong">
+    <family>Segoe UI Emoji</family>
+    <prefer><family>Apple Color Emoji</family></prefer>
+  </alias>
+  <alias binding="strong">
+    <family>Emoji One</family>
+    <prefer><family>Apple Color Emoji</family></prefer>
+  </alias>
+</fontconfig>
diff --git a/system/apple-emoji/README b/system/apple-emoji/README
new file mode 100644
index 0000000000..19dc1ef1b1
--- /dev/null
+++ b/system/apple-emoji/README
@@ -0,0 +1,5 @@
+Apple Color Emoji for Linux
+
+To prefer these over emojis provided by, e.g. Noto, create a symlink:
+/etc/fonts/conf.d/32-apple-emoji.conf ->
+/etc/fonts/avail.d/32-apple-emoji.conf
diff --git a/system/apple-emoji/apple-emoji.SlackBuild b/system/apple-emoji/apple-emoji.SlackBuild
new file mode 100644
index 0000000000..b08504b6d1
--- /dev/null
+++ b/system/apple-emoji/apple-emoji.SlackBuild
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+# Slackware build script for <apple-emoji>
+
+# Copyright 2023 Petar Petrov slackalaxy at gmail dot com
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=apple-emoji
+VERSION=${VERSION:-16.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+
+install -D -m644 $CWD/AppleColorEmoji.ttf $PKG/usr/share/fonts/TTF/AppleColorEmoji.ttf
+install -D -m644 $CWD/32-$PRGNAM.conf $PKG/etc/fonts/conf.avail/32-$PRGNAM.conf
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/apple-emoji/apple-emoji.info b/system/apple-emoji/apple-emoji.info
new file mode 100644
index 0000000000..d6d59f8a51
--- /dev/null
+++ b/system/apple-emoji/apple-emoji.info
@@ -0,0 +1,10 @@
+PRGNAM="apple-emoji"
+VERSION="16.4"
+HOMEPAGE="https://github.com/samuelngs/apple-emoji-linux/"
+DOWNLOAD="https://github.com/samuelngs/apple-emoji-linux/releases/download/v16.4/AppleColorEmoji.ttf"
+MD5SUM="6c62dd6c2be983991dc7d8fefb084750"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.com"
diff --git a/system/apple-emoji/doinst.sh b/system/apple-emoji/doinst.sh
new file mode 100644
index 0000000000..5dfeb031b9
--- /dev/null
+++ b/system/apple-emoji/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/apple-emoji/slack-desc b/system/apple-emoji/slack-desc
new file mode 100644
index 0000000000..eb10c005b8
--- /dev/null
+++ b/system/apple-emoji/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+apple-emoji: apple-emoji (Apple Color Emoji)
+apple-emoji:
+apple-emoji: Apple Color Emoji for Linux
+apple-emoji:
+apple-emoji:
+apple-emoji:
+apple-emoji:
+apple-emoji:
+apple-emoji:
+apple-emoji:
+apple-emoji:
diff --git a/system/apple-fonts-Garamond/README b/system/apple-fonts-Garamond/README
new file mode 100644
index 0000000000..1917281d65
--- /dev/null
+++ b/system/apple-fonts-Garamond/README
@@ -0,0 +1 @@
+Apple fonts Garamond from the Macbuntu project
diff --git a/system/apple-fonts-Garamond/apple-fonts-Garamond.SlackBuild b/system/apple-fonts-Garamond/apple-fonts-Garamond.SlackBuild
new file mode 100644
index 0000000000..4aeb812cf5
--- /dev/null
+++ b/system/apple-fonts-Garamond/apple-fonts-Garamond.SlackBuild
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+# Slackware build script for <apple-fonts-Garamond>
+
+# Copyright 2023 Petar Petrov slackalaxy at gmail dot com
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=apple-fonts-Garamond
+VERSION=${VERSION:-r134}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+
+mkdir -p $PKG/usr/share/fonts/TTF
+cp -L $CWD/*.ttf $PKG/usr/share/fonts/TTF
+
+# just in case...
+chmod 0644 $PKG/usr/share/fonts/TTF/*.ttf
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/apple-fonts-Garamond/apple-fonts-Garamond.info b/system/apple-fonts-Garamond/apple-fonts-Garamond.info
new file mode 100644
index 0000000000..c6d5b299ba
--- /dev/null
+++ b/system/apple-fonts-Garamond/apple-fonts-Garamond.info
@@ -0,0 +1,20 @@
+PRGNAM="apple-fonts-Garamond"
+VERSION="r134"
+HOMEPAGE="https://svn.code.sf.net/p/macbuntu/code/Macbuntu/fonts/mac/"
+DOWNLOAD="https://svn.code.sf.net/p/macbuntu/code/Macbuntu/fonts/mac/AppleGaramond-Bold.ttf \
+	https://svn.code.sf.net/p/macbuntu/code/Macbuntu/fonts/mac/AppleGaramond-BoldItalic.ttf \
+	https://svn.code.sf.net/p/macbuntu/code/Macbuntu/fonts/mac/AppleGaramond-Italic.ttf \
+	https://svn.code.sf.net/p/macbuntu/code/Macbuntu/fonts/mac/AppleGaramond-Light.ttf \
+	https://svn.code.sf.net/p/macbuntu/code/Macbuntu/fonts/mac/AppleGaramond-LightItalic.ttf \
+	https://svn.code.sf.net/p/macbuntu/code/Macbuntu/fonts/mac/AppleGaramond.ttf"
+MD5SUM="346fa14b194dad9647d42211814c98f5 \
+	cf04f734682e4c72839cc42cd99a5f97 \
+	e9c53ae71e1d09a3ec2ce3842d6c23c6 \
+	d4244fd536be2c4de94a657a0017fcac \
+	6d07c4444583832c7cf4e1d1547766d9 \
+	a6f12191d6abbba09d3ed0fd81b128bb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.com"
diff --git a/system/apple-fonts-Garamond/doinst.sh b/system/apple-fonts-Garamond/doinst.sh
new file mode 100644
index 0000000000..5dfeb031b9
--- /dev/null
+++ b/system/apple-fonts-Garamond/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/apple-fonts-Garamond/slack-desc b/system/apple-fonts-Garamond/slack-desc
new file mode 100644
index 0000000000..af692f5286
--- /dev/null
+++ b/system/apple-fonts-Garamond/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+apple-fonts-Garamond: apple-fonts-Garamond (Apple fonts Garamond)
+apple-fonts-Garamond:
+apple-fonts-Garamond: Apple fonts Garamond from Macbuntu.
+apple-fonts-Garamond:
+apple-fonts-Garamond:
+apple-fonts-Garamond:
+apple-fonts-Garamond:
+apple-fonts-Garamond:
+apple-fonts-Garamond:
+apple-fonts-Garamond:
+apple-fonts-Garamond:
diff --git a/system/apple-fonts-NY/README b/system/apple-fonts-NY/README
new file mode 100644
index 0000000000..f352d32cfb
--- /dev/null
+++ b/system/apple-fonts-NY/README
@@ -0,0 +1,22 @@
+Apple New York fonts
+
+These typefaces offer the control and flexibility to optimally display
+text at a variety of sizes, in many different languages, across multiple
+interfaces.
+
+A companion to San Francisco, this serif typeface is based on essential
+aspects of historical type styles. New York features six weights,
+supports Latin, Greek and Cyrillic scripts, and features variable
+optical sizes allowing it to perform as a traditional reading face at
+small sizes and a graphic display face at larger sizes.
+
+This provides the following OTF fonts:
+* New York Small
+* New York Medium
+* New York Large
+* New York Extra Large
+
+NOTE:
+NewYork.ttf and NewYorkItalic.ttf are not included in the package,
+because some programs like OpenOffice have problems with it (crash on
+start). In fact, FontForge reports "bad device table" for these.
diff --git a/system/apple-fonts-NY/apple-fonts-NY.SlackBuild b/system/apple-fonts-NY/apple-fonts-NY.SlackBuild
new file mode 100644
index 0000000000..2f58596b10
--- /dev/null
+++ b/system/apple-fonts-NY/apple-fonts-NY.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# Slackware build script for <apple-fonts-NY>
+
+# Copyright 2023 Petar Petrov slackalaxy at gmail dot com
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=apple-fonts-NY
+VERSION=${VERSION:-2023}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+
+7z x $CWD/NY.dmg
+cd NYFonts
+7z x NY\ Fonts.pkg
+7z x Payload~
+cd Library/Fonts
+
+mkdir -p $PKG/usr/share/fonts/OTF
+cp -a *.otf $PKG/usr/share/fonts/OTF
+
+# just in case...
+chmod 0644 $PKG/usr/share/fonts/OTF/*.otf
+	
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/apple-fonts-NY/apple-fonts-NY.info b/system/apple-fonts-NY/apple-fonts-NY.info
new file mode 100644
index 0000000000..3429b3597c
--- /dev/null
+++ b/system/apple-fonts-NY/apple-fonts-NY.info
@@ -0,0 +1,10 @@
+PRGNAM="apple-fonts-NY"
+VERSION="2023"
+HOMEPAGE="https://developer.apple.com/fonts/"
+DOWNLOAD="https://devimages-cdn.apple.com/design/resources/download/NY.dmg"
+MD5SUM="cf4240d1870274142788f898b73e0b04"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="p7zip"
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.com"
diff --git a/system/apple-fonts-NY/doinst.sh b/system/apple-fonts-NY/doinst.sh
new file mode 100644
index 0000000000..412793f9d9
--- /dev/null
+++ b/system/apple-fonts-NY/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/apple-fonts-NY/slack-desc b/system/apple-fonts-NY/slack-desc
new file mode 100644
index 0000000000..aae07207f6
--- /dev/null
+++ b/system/apple-fonts-NY/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+apple-fonts-NY: apple-fonts-NY (Apple New York fonts)
+apple-fonts-NY:
+apple-fonts-NY: New York features six weights, supports Latin, Greek and Cyrillic
+apple-fonts-NY: scripts, and features variable optical sizes.
+apple-fonts-NY:
+apple-fonts-NY: https://developer.apple.com/fonts/
+apple-fonts-NY:
+apple-fonts-NY:
+apple-fonts-NY:
+apple-fonts-NY:
+apple-fonts-NY:
diff --git a/system/apple-fonts-SF/README b/system/apple-fonts-SF/README
new file mode 100644
index 0000000000..d9c30f4daa
--- /dev/null
+++ b/system/apple-fonts-SF/README
@@ -0,0 +1,31 @@
+Apple San Francisco fonts
+
+These typefaces offer the control and flexibility to optimally display
+text at a variety of sizes, in many different languages, across multiple
+interfaces.
+
+This provides the following OTF fonts:
+
+SF Pro
+This neutral, flexible, sans-serif typeface is the system font for iOS,
+iPad OS, macOS and tvOS. SF Pro features nine weights, variable optical
+sizes for optimal legibility, four widths, and includes a rounded
+variant. SF Pro supports over 150 languages across Latin, Greek, and
+Cyrillic scripts.
+
+SF Compact
+Sharing many features with SF Pro, SF Compact features an efficient,
+compact design that is optimized for small sizes and narrow columns. SF
+Compact is the system font for watchOS and includes a rounded variant.
+
+SF Mono
+This monospaced variant of San Francisco enables alignment between rows
+and columns of text, and is used in coding environments like Xcode. SF
+Mono features six weights and supports Latin, Greek, and Cyrillic
+scripts.
+
+NOTE:
+SF-Compact.ttf, SF-Compact-Italic.ttf, SF-Pro.ttf and SF-Pro-Italic.ttf
+are not included in the package, because some programs like OpenOffice
+have problems with it (crash on start). In fact, FontForge reports "bad
+device table" for these. Same applies for SF Arabic.
diff --git a/system/apple-fonts-SF/apple-fonts-SF.SlackBuild b/system/apple-fonts-SF/apple-fonts-SF.SlackBuild
new file mode 100644
index 0000000000..527489be30
--- /dev/null
+++ b/system/apple-fonts-SF/apple-fonts-SF.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/bash
+
+# Slackware build script for <apple-fonts-SF>
+
+# Copyright 2023 Petar Petrov slackalaxy at gmail dot com
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=apple-fonts-SF
+VERSION=${VERSION:-2023}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+
+7z x $CWD/SF-Compact.dmg
+7z x $CWD/SF-Mono.dmg
+7z x $CWD/SF-Pro.dmg
+	
+mkdir -p $PKG/usr/share/fonts/OTF
+	
+cd SFCompactFonts
+7z x SF\ Compact\ Fonts.pkg
+7z x Payload~
+cd Library/Fonts
+cp -a *.otf $PKG/usr/share/fonts/OTF
+cd ../../..
+	
+cd SFMonoFonts
+7z x SF\ Mono\ Fonts.pkg
+7z x Payload~
+cd Library/Fonts
+cp -a *.otf $PKG/usr/share/fonts/OTF
+cd ../../..
+	
+cd SFProFonts
+7z x SF\ Pro\ Fonts.pkg
+7z x Payload~
+cd Library/Fonts
+cp -a *.otf $PKG/usr/share/fonts/OTF
+	
+# just in case...
+chmod 0644 $PKG/usr/share/fonts/OTF/*.otf
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/apple-fonts-SF/apple-fonts-SF.info b/system/apple-fonts-SF/apple-fonts-SF.info
new file mode 100644
index 0000000000..8a0edd4995
--- /dev/null
+++ b/system/apple-fonts-SF/apple-fonts-SF.info
@@ -0,0 +1,14 @@
+PRGNAM="apple-fonts-SF"
+VERSION="2023"
+HOMEPAGE="https://developer.apple.com/fonts/"
+DOWNLOAD="https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg \
+https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg \
+https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg"
+MD5SUM="dbca7b5819e44b3c35d927048896078f \
+5ff6d068b349ac684b44264d00935f29 \
+b7ae94096a43b3ec93e851e4e588b9ed"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="p7zip"
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.com"
diff --git a/system/apple-fonts-SF/doinst.sh b/system/apple-fonts-SF/doinst.sh
new file mode 100644
index 0000000000..412793f9d9
--- /dev/null
+++ b/system/apple-fonts-SF/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/apple-fonts-SF/slack-desc b/system/apple-fonts-SF/slack-desc
new file mode 100644
index 0000000000..9abaa74bce
--- /dev/null
+++ b/system/apple-fonts-SF/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+apple-fonts-SF: apple-fonts-SF (Apple San Francisco fonts)
+apple-fonts-SF:
+apple-fonts-SF: These typefaces offer the control and flexibility to optimally
+apple-fonts-SF: display text at a variety of sizes, in many different languages,
+apple-fonts-SF: across multiple interfaces.
+apple-fonts-SF:
+apple-fonts-SF: This includes: SF Pro, SF Compact and SF Mono.
+apple-fonts-SF:
+apple-fonts-SF: https://developer.apple.com/fonts/
+apple-fonts-SF:
+apple-fonts-SF:
diff --git a/system/apptainer/README b/system/apptainer/README
new file mode 100644
index 0000000000..28182dbd80
--- /dev/null
+++ b/system/apptainer/README
@@ -0,0 +1,28 @@
+  Apptainer is an open source container platform designed to be 
+simple, fast, and secure. Many container platforms are available, 
+but Apptainer is designed for ease-of-use on shared systems and in 
+high performance computing (HPC) environments. It features:
+
+  An immutable single-file container image format, supporting 
+cryptographic signatures and encryption.
+  Integration over isolation by default. Easily make use of GPUs, 
+high speed networks, parallel filesystems on a cluster or server.
+  Mobility of compute. The single file SIF container format is easy 
+to transport and share.
+  A simple, effective security model. You are the same user inside a 
+container as outside, and cannot gain additional privilege on the 
+host system by default.
+
+  Apptainer is open source software, distributed under the BSD 
+License.
+
+  Apptainer was formerly known as Singularity and is now a part of 
+the Linux Foundation. When migrating from Singularity see the admin
+migration documentation and user compatibility documentation.
+
+
+  You shall install fakeroot for all functionalities.
+
+  Usage example:
+apptainer build slackware.sif \
+  /usr/share/apptainer/examples/slackware/slackware.def
diff --git a/system/apptainer/apptainer.SlackBuild b/system/apptainer/apptainer.SlackBuild
new file mode 100644
index 0000000000..7f60d6af73
--- /dev/null
+++ b/system/apptainer/apptainer.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/bash
+
+# Slackware build script for apptainer
+
+# Copyright 2023 William PC - Seattle, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=apptainer
+VERSION=${VERSION:-1.1.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+
+# this sets the go path without the needs of logout
+SBOGO=$(find /usr/lib${LIBDIRSUFFIX} -type f -name "go")
+export GOROOT=$(dirname $(dirname $SBOGO))
+echo "Using GOROOT = $GOROOT"
+
+PATH=$GOROOT/bin:$PATH \
+./mconfig -b ./build \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make -C build
+make -C build install DESTDIR=$PKG
+
+install -d $PKG/usr/share/apptainer
+cp -av examples $PKG/usr/share/apptainer
+
+mkdir -p $PKG/usr/share/apptainer/examples/slackware
+cat > $PKG/usr/share/apptainer/examples/slackware/slackware.def <<EOF
+Bootstrap: docker
+From: vbatts/slackware:15.0
+
+%runscript
+    echo "This is what happens when you run the container..."
+
+%post
+    echo "Hello from inside the container"
+EOF
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTING.md CONTRIBUTORS.md \
+  LICENSE.md LICENSE_DEPENDENCIES.md LICENSE_THIRD_PARTY.md \
+  RELEASE_PROCEDURE.md SUPPORT.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/apptainer/apptainer.info b/system/apptainer/apptainer.info
new file mode 100644
index 0000000000..c1c96f3d85
--- /dev/null
+++ b/system/apptainer/apptainer.info
@@ -0,0 +1,10 @@
+PRGNAM="apptainer"
+VERSION="1.1.6"
+HOMEPAGE="https://apptainer.org"
+DOWNLOAD="https://github.com/apptainer/apptainer/releases/download/v1.1.6/apptainer-1.1.6.tar.gz"
+MD5SUM="64aa25ce9c24847f4304661be53df467"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="William PC"
+EMAIL="w_calandrini[at]hotmail[dot]com"
diff --git a/system/apptainer/slack-desc b/system/apptainer/slack-desc
new file mode 100644
index 0000000000..a0253771a8
--- /dev/null
+++ b/system/apptainer/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+apptainer: apptainer (open-source container for high performance computing)
+apptainer:
+apptainer:
+apptainer:   Apptainer is an open source container platform designed to be
+apptainer: simple, fast, and secure. Many container platforms are available,
+apptainer: but Apptainer is designed for ease-of-use on shared systems and in
+apptainer: high performance computing (HPC) environments.
+apptainer:
+apptainer:
+apptainer:
+apptainer:
diff --git a/system/aqemu/README b/system/aqemu/README
deleted file mode 100644
index 53a3392bfc..0000000000
--- a/system/aqemu/README
+++ /dev/null
@@ -1,3 +0,0 @@
-AQEMU is a graphical interface to QEMU and KVM emulators.
-
-This requires one of the qemu varieties.
diff --git a/system/aqemu/aqemu.SlackBuild b/system/aqemu/aqemu.SlackBuild
deleted file mode 100644
index c87c05ae13..0000000000
--- a/system/aqemu/aqemu.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for AQEMU
-
-# Copyright 2010 Leo Midha <netrixtardis@stealth3.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=aqemu
-VERSION=${VERSION:-0.9.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-cmake \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DWITHOUT_EMBEDDED_DISPLAY=on
-make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mv $PKG/usr/share/man $PKG/usr
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS CHANGELOG COPYING README* TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/aqemu/aqemu.info b/system/aqemu/aqemu.info
deleted file mode 100644
index fcb213da93..0000000000
--- a/system/aqemu/aqemu.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="aqemu"
-VERSION="0.9.2"
-HOMEPAGE="https://github.com/tobimensch/aqemu"
-DOWNLOAD="https://downloads.sourceforge.net/aqemu/aqemu-0.9.2.tar.gz"
-MD5SUM="cd7f6077a5a49a25450dc007532b0f95"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="qt5"
-MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf{at}gmail{dot}com"
diff --git a/system/aqemu/slack-desc b/system/aqemu/slack-desc
deleted file mode 100644
index de48c47ca7..0000000000
--- a/system/aqemu/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-     |-----handy-ruler------------------------------------------------------|
-aqemu: aqemu (graphical interface to QEMU and KVM emulators)
-aqemu:
-aqemu: AQEMU is a graphical interface to QEMU and KVM emulators.
-aqemu:
-aqemu: Homepage: https://github.com/tobimensch/aqemu
-aqemu:
-aqemu:
-aqemu:
-aqemu:
-aqemu:
-aqemu:
diff --git a/system/arc/arc.SlackBuild b/system/arc/arc.SlackBuild
index b9e094b40b..77dfb17bd9 100644
--- a/system/arc/arc.SlackBuild
+++ b/system/arc/arc.SlackBuild
@@ -1,15 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for arc
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=arc
 VERSION=${VERSION:-5.21q}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +22,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -48,14 +55,11 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || \
 tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 sed -i 's,share/man,man,' Makefile
-make OPT="$SLKCFLAGS" DESTDIR=$PKG PREFIX=/usr all install
+make OPT="$SLKCFLAGS -w -Wl,--allow-multiple-definition" DESTDIR=$PKG PREFIX=/usr all install
 gzip $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -66,4 +70,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/arc/arc.info b/system/arc/arc.info
index da8ea129bc..216fcb2caf 100644
--- a/system/arc/arc.info
+++ b/system/arc/arc.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/arch-install-scripts/README b/system/arch-install-scripts/README
new file mode 100644
index 0000000000..1bfed40c26
--- /dev/null
+++ b/system/arch-install-scripts/README
@@ -0,0 +1,2 @@
+This is a small suite of scripts aimed at automating some menial
+tasks when installing Arch Linux.
diff --git a/system/arch-install-scripts/arch-install-scripts.SlackBuild b/system/arch-install-scripts/arch-install-scripts.SlackBuild
new file mode 100644
index 0000000000..9aac56de00
--- /dev/null
+++ b/system/arch-install-scripts/arch-install-scripts.SlackBuild
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+# Slackware build script for arch-install-scripts
+
+# Copyright 2023 Matt Egger USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=arch-install-scripts
+VERSION=${VERSION:-v28}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+sed -i 's|/usr/local|/usr|g' Makefile
+sed -i 's|/share/man|/man|g' Makefile
+
+make
+make install DESTDIR=$PKG
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/arch-install-scripts/arch-install-scripts.info b/system/arch-install-scripts/arch-install-scripts.info
new file mode 100644
index 0000000000..7331ee4a3f
--- /dev/null
+++ b/system/arch-install-scripts/arch-install-scripts.info
@@ -0,0 +1,10 @@
+PRGNAM="arch-install-scripts"
+VERSION="v28"
+HOMEPAGE="https://gitlab.archlinux.org/archlinux/arch-install-scripts"
+DOWNLOAD="https://gitlab.archlinux.org/archlinux/arch-install-scripts/-/archive/v28/arch-install-scripts-v28.tar.gz"
+MD5SUM="9eec614288973d4fd0841f31a6d57225"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matt Egger"
+EMAIL="bru.barwal@sdf.org"
diff --git a/system/arch-install-scripts/slack-desc b/system/arch-install-scripts/slack-desc
new file mode 100644
index 0000000000..e1f7c8a795
--- /dev/null
+++ b/system/arch-install-scripts/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+arch-install-scripts: arch-install-scripts (Useful scripts for installing Arch Linux)
+arch-install-scripts:
+arch-install-scripts: This is a small suite of scripts aimed at automating some menial
+arch-install-scripts: tasks when installing Arch Linux.
+arch-install-scripts:
+arch-install-scripts: https://gitlab.archlinux.org/archlinux/arch-install-scripts
+arch-install-scripts:
+arch-install-scripts:
+arch-install-scripts:
+arch-install-scripts:
+arch-install-scripts:
diff --git a/system/archivemount/archivemount.SlackBuild b/system/archivemount/archivemount.SlackBuild
index 4b2001ae1d..cb5b895f82 100644
--- a/system/archivemount/archivemount.SlackBuild
+++ b/system/archivemount/archivemount.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for archivemount
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
@@ -10,10 +10,13 @@
 # for pointing out the real homepage and new version of archivemount.
 # Also, reflowed the README, all the lines are <= 72 characters now.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=archivemount
 VERSION=${VERSION:-0.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -23,7 +26,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -83,4 +90,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/archivemount/archivemount.info b/system/archivemount/archivemount.info
index 0a2296ff0b..108af2980c 100644
--- a/system/archivemount/archivemount.info
+++ b/system/archivemount/archivemount.info
@@ -1,10 +1,10 @@
 PRGNAM="archivemount"
 VERSION="0.9.1"
 HOMEPAGE="https://www.cybernoia.de/software/archivemount.html"
-DOWNLOAD="https://www.cybernoia.de/software/archivemount/archivemount-0.9.1.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/archivemount-0.9.1.tar.gz"
 MD5SUM="954c096230ab1e1f7153555c0221b37d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/archmage/README b/system/archmage/README
new file mode 100644
index 0000000000..cff0716bcc
--- /dev/null
+++ b/system/archmage/README
@@ -0,0 +1,4 @@
+archmage (CHM to HTML/PDF/text converter)
+
+arCHMage converts CHM files to HTML, plain text, or PDF. CHM is the
+format used by Microsoft HTML Help, also known as Compiled HTML.
diff --git a/system/archmage/a8f632dd.diff b/system/archmage/a8f632dd.diff
new file mode 100644
index 0000000000..68d820e860
--- /dev/null
+++ b/system/archmage/a8f632dd.diff
@@ -0,0 +1,289 @@
+diff --git a/.gitignore b/.gitignore
+index 3768c97..d88251b 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -2,3 +2,4 @@
+ build/
+ dist/
+ *.pyc
++.eggs
+diff --git a/.travis.yml b/.travis.yml
+index b94c4dc..8770821 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -1,4 +1,7 @@
+ os: linux
++arch:
++   - amd64
++   - ppc64le
+ addons:
+   apt:
+     update: true
+@@ -6,8 +9,8 @@ addons:
+       - libchm-dev
+ language: python
+ python:
+-  - "3.5"
+   - "3.6"
+   - "3.7"
+   - "3.8"
++  - "3.9"
+ script: scripts/travis-run.sh
+diff --git a/AUTHORS b/AUTHORS
+index 23e621b..d36c3ec 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -1,3 +1,3 @@
+ Copyright (c) 2003 Eugeny Korekin <az@ftc.ru>
+ Copyright (c) 2005-2009 Basil Shubin <basil.shubin@gmail.com>
+-Copyright (c) 2015,2019 Mikhail Gusarov <dottedmag@dottedmag.net>
++Copyright (c) 2015-2020 Misha Gusarov <dottedmag@dottedmag.net>
+diff --git a/README.md b/README.md
+index ec2b4e1..b14cec2 100644
+--- a/README.md
++++ b/README.md
+@@ -33,6 +33,8 @@ This feature requires `htmldoc(1)`, and `lynx(1)` or `elinks(1)` installed.
+ Installation
+ ============
+ 
++Archmage uses PyCHM that depends on (C library) CHMlib. After CHMlib is installed, do
++
+     pip install archmage
+ 
+ Requirements
+@@ -40,7 +42,7 @@ Requirements
+ 
+ arCHMage has the following dependencies:
+ 
+-  * Python 3.5+
++  * Python 3.6+
+   * PyCHM
+   * BeautifulSoup4
+ 
+diff --git a/archmage/CHM.py b/archmage/CHM.py
+index ce85446..44bbd98 100644
+--- a/archmage/CHM.py
++++ b/archmage/CHM.py
+@@ -3,7 +3,7 @@
+ # archmage -- CHM decompressor
+ # Copyright (c) 2003 Eugeny Korekin <aaaz@users.sourceforge.net>
+ # Copyright (c) 2005-2009 Basil Shubin <bashu@users.sourceforge.net>
+-# Copyright (c) 2015,2019 Mikhail Gusarov <dottedmag@dottedmag.net>
++# Copyright (c) 2015-2020 Misha Gusarov <dottedmag@dottedmag.net>
+ #
+ # This program is free software; you can redistribute it and/or modify it under
+ # the terms of the GNU General Public License as published by the Free Software
+@@ -29,6 +29,7 @@ import string
+ import tempfile
+ import os.path
+ from enum import Enum
++from typing import List, Union
+ 
+ import archmage
+ 
+@@ -36,7 +37,7 @@ from archmage.CHMParser import SitemapFile, PageLister, ImageCatcher, TOCCounter
+ 
+ # import PyCHM bindings
+ try:
+-    from chm import chmlib
++    from chm import chmlib  # type: ignore
+ except ImportError as msg:
+     sys.exit(
+         "ImportError: %s\nPlease check README file for system requirements."
+@@ -70,7 +71,7 @@ class FileSource:
+                 out.append(path)
+             return chmlib.CHM_ENUMERATOR_CONTINUE
+ 
+-        out = []
++        out: List[str] = []
+         if (
+             chmlib.chm_enumerate(
+                 self._chm, chmlib.CHM_ENUMERATE_ALL, get_name, out
+@@ -123,7 +124,7 @@ class CHM:
+         self.cache = {}
+         # Name of source directory with CHM content
+         if os.path.isdir(name):
+-            self.source = DirSource(name)
++            self.source: Union[DirSource, FileSource] = DirSource(name)
+         else:
+             self.source = FileSource(name)
+         self.sourcename = name
+@@ -177,13 +178,14 @@ class CHM:
+         return self.cache["image_urls"]
+ 
+     def _image_urls(self):
+-        out = []
++        out: List[str] = []
+         image_catcher = ImageCatcher()
+         for file in self.html_files():
++            # Use latin-1, as it will accept any byte sequences
+             image_catcher.feed(
+                 Entry(
+                     self.source, file, self.filename_case, self.restore_framing
+-                ).correct()
++                ).correct().decode("latin-1")
+             )
+             for image_url in image_catcher.imgurls:
+                 if not out.count(image_url):
+@@ -273,7 +275,8 @@ class CHM:
+ 
+     def _toclevels(self):
+         counter = TOCCounter()
+-        counter.feed(self.topicstree)
++        # Use latin-1, as it will accept any byte sequences
++        counter.feed(self.topicstree.decode("latin-1"))
+         if counter.count > self.maxtoclvl:
+             return self.maxtoclvl
+         else:
+@@ -432,7 +435,7 @@ class CHM:
+                     self.extract_entry(
+                         entry=key, output_file=key.lower(), destdir=tempdir
+                     )
+-        htmldoc(files, self.htmldoc_exec, options, self.toclevels, output)
++        htmldoc(files, self.htmldoc_exec, options, self.toclevels(), output)
+         # Remove temporary files
+         shutil.rmtree(path=tempdir)
+ 
+@@ -493,21 +496,21 @@ if (window.name != "content")
+                 data = self.lower_links(data)
+ 
+             # Delete unwanted HTML elements.
+-            data = re.sub("<div .*teamlib\\.gif.*\\/div>", "", data)
+-            data = re.sub("<a href.*>\\[ Team LiB \\]<\\/a>", "", data)
++            data = re.sub(b"<div .*teamlib\\.gif.*\\/div>", b"", data)
++            data = re.sub(b"<a href.*>\\[ Team LiB \\]<\\/a>", b"", data)
+             data = re.sub(
+-                "<table.*larrow\\.gif.*rarrow\\.gif.*<\\/table>", "", data
++                b"<table.*larrow\\.gif.*rarrow\\.gif.*<\\/table>", b"", data
+             )
+-            data = re.sub("<a href.*next\\.gif[^>]*><\\/a>", "", data)
+-            data = re.sub("<a href.*previous\\.gif[^>]*><\\/a>", "", data)
+-            data = re.sub("<a href.*prev\\.gif[^>]*><\\/a>", "", data)
+-            data = re.sub('"[^"]*previous\\.gif"', '""', data)
+-            data = re.sub('"[^"]*prev\\.gif"', '""', data)
+-            data = re.sub('"[^"]*next\\.gif"', '""', data)
++            data = re.sub(b"<a href.*next\\.gif[^>]*><\\/a>", b"", data)
++            data = re.sub(b"<a href.*previous\\.gif[^>]*><\\/a>", b"", data)
++            data = re.sub(b"<a href.*prev\\.gif[^>]*><\\/a>", b"", data)
++            data = re.sub(b'"[^"]*previous\\.gif"', b'""', data)
++            data = re.sub(b'"[^"]*prev\\.gif"', b'""', data)
++            data = re.sub(b'"[^"]*next\\.gif"', b'""', data)
+         if data is not None:
+             return data
+         else:
+-            return ""
++            return b""
+ 
+     def get(self):
+         """Get CHM entry content"""
+@@ -524,4 +527,4 @@ if (window.name != "content")
+         if data is not None:
+             return data
+         else:
+-            return ""
++            return b""
+diff --git a/archmage/CHMParser.py b/archmage/CHMParser.py
+index 1ac1e2b..02c8c37 100644
+--- a/archmage/CHMParser.py
++++ b/archmage/CHMParser.py
+@@ -2,7 +2,7 @@
+ #
+ # archmage -- CHM decompressor
+ # Copyright (c) 2009 Basil Shubin <bashu@users.sourceforge.net>
+-# Copyright (c) 2015,2019 Mikhail Gusarov <dottedmag@dottedmag.net>
++# Copyright (c) 2015-2020 Misha Gusarov <dottedmag@dottedmag.net>
+ #
+ # This program is free software; you can redistribute it and/or modify it under
+ # the terms of the GNU General Public License as published by the Free Software
+@@ -21,9 +21,10 @@
+ 
+ import re
+ import mimetypes
+-import sgmllib, urllib.request, urllib.error, urllib.parse
++import sgmllib  # type: ignore
++import urllib.request, urllib.error, urllib.parse
+ 
+-from bs4 import BeautifulSoup, UnicodeDammit
++from bs4 import BeautifulSoup, UnicodeDammit  # type: ignore
+ from html.parser import HTMLParser
+ from urllib.parse import urlparse
+ 
+diff --git a/archmage/__init__.py b/archmage/__init__.py
+index 8f1d5c5..804becf 100644
+--- a/archmage/__init__.py
++++ b/archmage/__init__.py
+@@ -3,7 +3,7 @@
+ # archmage -- CHM decompressor
+ # Copyright (c) 2003 Eugeny Korekin <aaaz@users.sourceforge.net>
+ # Copyright (c) 2005-2009 Basil Shubin <bashu@users.sourceforge.net>
+-# Copyright (c) 2015,2019 Mikhail Gusarov <dottedmag@dottedmag.net>
++# Copyright (c) 2015-2020 Misha Gusarov <dottedmag@dottedmag.net>
+ #
+ # This program is free software; you can redistribute it and/or modify it under
+ # the terms of the GNU General Public License as published by the Free Software
+diff --git a/archmage/arch.conf b/archmage/arch.conf
+index bb5432a..c9208a4 100644
+--- a/archmage/arch.conf
++++ b/archmage/arch.conf
+@@ -56,7 +56,7 @@ chmtohtml = '-t html -f "%(output)s" --book %(toc)s --no-numbered --toctitle "Ta
+ 
+ # CHM2PDF converting. Use following command to convert CHM content to a single 
+ # PDF file. Make sure that htmldoc is available on your system.
+-chmtopdf = '-t pdf14 -f "%(output)s" --book %(toc)s --no-numbered --toctitle "Table of Contents" --title --textcolor "#000000" --linkcolor "#0000ff" --linkstyle plain --size Universal --left 1.00in --right 0.50in --top 0.50in --bottom 0.50in --header .t. --header1 ... --footer h.1 --nup 1 --tocheader .t. --tocfooter ..i --portrait --color --no-pscommands --no-xrxcomments --compression=1 --jpeg=0 --fontsize 11.0 --fontspacing 1.2 --headingfont Helvetica --bodyfont Times --headfootsize 11.0 --headfootfont Helvetica --charset iso-8859-1 --links --embedfonts --pagemode outline --pagelayout single --firstpage c1 --pageeffect none --pageduration 10 --effectduration 1.0 --no-encryption --permissions all  --owner-password ""  --user-password "" --browserwidth 680 --no-strict --no-overflow --quiet'
++chmtopdf = '-t pdf14 -f "%(output)s" --webpage %(toc)s --no-title --no-numbered --toctitle "Table of Contents" --textcolor "#000000" --linkcolor "#0000ff" --linkstyle plain --size Universal --left 1.00in --right 0.50in --top 0.50in --bottom 0.50in --header .t. --header1 ... --footer h.1 --nup 1 --tocheader .t. --tocfooter ..i --portrait --color --no-pscommands --no-xrxcomments --compression=1 --jpeg=0 --fontsize 11.0 --fontspacing 1.2 --headingfont Helvetica --bodyfont Times --headfootsize 11.0 --headfootfont Helvetica --charset iso-8859-1 --links --embedfonts --pagemode outline --pagelayout single --firstpage c1 --pageeffect none --pageduration 10 --effectduration 1.0 --no-encryption --permissions all  --owner-password ""  --user-password "" --browserwidth 680 --no-strict --no-overflow --quiet'
+ 
+ # Maximum Table of Content levels for htmldoc utility.
+ #
+diff --git a/archmage/cli.py b/archmage/cli.py
+index a7fd54a..8a573f7 100755
+--- a/archmage/cli.py
++++ b/archmage/cli.py
+@@ -3,7 +3,7 @@
+ # archmage -- CHM decompressor
+ # Copyright (c) 2003 Eugeny Korekin <aaaz@users.sourceforge.net>
+ # Copyright (c) 2005-2009 Basil Shubin <bashu@users.sourceforge.net>
+-# Copyright (c) 2015,2019 Mikhail Gusarov <dottedmag@dottedmag.net>
++# Copyright (c) 2015-2020 Misha Gusarov <dottedmag@dottedmag.net>
+ #
+ # This program is free software; you can redistribute it and/or modify it under
+ # the terms of the GNU General Public License as published by the Free Software
+diff --git a/archmage/htmldoc.py b/archmage/htmldoc.py
+index 606fea1..b223dfd 100644
+--- a/archmage/htmldoc.py
++++ b/archmage/htmldoc.py
+@@ -21,7 +21,6 @@
+ """Generic converter function"""
+ 
+ import os
+-import string
+ import tempfile
+ import subprocess
+ 
+@@ -42,10 +41,10 @@ def htmldoc(input, cmd, options, toclevels, output):
+     options = options % {"output": output, "toc": toc}
+     if input:
+         # Create a htmldoc file for batch processing
+-        f = tempfile.NamedTemporaryFile(delete=False)
+-        f.write("#HTMLDOC 1.8.27\n")
+-        f.write(options + "\n")
+-        f.write(string.join(input, "\n"))
++        f = tempfile.NamedTemporaryFile(mode="wb", delete=False)
++        f.write(b"#HTMLDOC 1.8.27\n")
++        f.write(options.encode("utf-8") + b"\n")
++        f.write(b'\n'.join(f.encode('utf-8') for f in input))
+         f.close()
+         # Prepare command line to execute
+         command = "%s --batch %s" % (cmd, f.name)
+diff --git a/setup.py b/setup.py
+index 630a675..092372d 100644
+--- a/setup.py
++++ b/setup.py
+@@ -18,7 +18,7 @@ setup(
+     name="archmage",
+     version="0.4.2.1",
+     description="CHM decompressor",
+-    maintainer="Mikhail Gusarov",
++    maintainer="Misha Gusarov",
+     maintainer_email="dottedmag@dottedmag.net",
+     url="https://github.com/dottedmag/archmage",
+     license="GPLv2+",
diff --git a/system/archmage/archmage.1 b/system/archmage/archmage.1
new file mode 100644
index 0000000000..22127accea
--- /dev/null
+++ b/system/archmage/archmage.1
@@ -0,0 +1,93 @@
+.\" Man page generated from reStructuredText.
+.
+.TH ARCHMAGE 1 "2020-11-20" "0.4.2.1" "SlackBuilds.org"
+.SH NAME
+archmage \- convert CHM to PDF, HTML, or plain text
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" RST source for archmage(1) man page. Convert with:
+.
+.\" rst2man.py archmage.rst > archmage.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+archmage [\fI\-options\fP] \fBchmfile\fP [\fBdestdir\fP | \fBdestfile\fP]
+.SH DESCRIPTION
+.sp
+\fBarchmage\fP converts CHM files to HTML, plain text and PDF. CHM is the
+format used by Microsoft HTML Help, also known as Compiled HTML.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-x\fP,\fB  \-\-extract
+Extracts CHM file into specified directory. If destination
+directory is omitted, then a new one will be created based
+on the name of the CHM file. This option is the default.
+.TP
+.BI \-c\fP,\fB  \-\-convert\fB= format
+Convert CHM file into specified file format. If destination
+file is omitted, the output filename will be created based on
+the name of the CHM file. Available formats:
+.INDENT 7.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+html \- Single HTML file
+text \- Plain text file (uses lynx(1) or elinks(1))
+pdf \- Adobe PDF
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.TP
+.B \-d\fP,\fB  \-\-dump
+Dump HTML data from CHM file to standard output.
+.TP
+.B \-V\fP,\fB  \-\-version
+Print version number and exit.
+.TP
+.B \-h\fP,\fB  \-\-help
+Print help message and exit.
+.UNINDENT
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/archmage\-0.4.2.1/COPYING for license information.
+.SH AUTHORS
+.sp
+archmage was written by dottedmag.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The archmage homepage: \fI\%https://github.com/dottedmag/archmage\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/system/archmage/archmage.SlackBuild b/system/archmage/archmage.SlackBuild
new file mode 100644
index 0000000000..53fdda642b
--- /dev/null
+++ b/system/archmage/archmage.SlackBuild
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+# Slackware build script for archmage
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=archmage
+VERSION=${VERSION:-0.4.2.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# latest git as of 20220107. fixes PDF conversion.
+patch -p1 < $CWD/a8f632dd.diff
+
+python3 setup.py install --root $PKG
+
+# man page written by SlackBuild author. Upstream has a man page, but
+# it's a stub (doesn't list the options, etc).
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS* COPYING* NEWS* README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/archmage/archmage.info b/system/archmage/archmage.info
new file mode 100644
index 0000000000..0797d97d01
--- /dev/null
+++ b/system/archmage/archmage.info
@@ -0,0 +1,10 @@
+PRGNAM="archmage"
+VERSION="0.4.2.1"
+HOMEPAGE="https://github.com/dottedmag/archmage"
+DOWNLOAD="https://github.com/dottedmag/archmage/archive/v0.4.2.1/archmage-0.4.2.1.tar.gz"
+MD5SUM="af3b4393d5d8912ddf93d722725e9b70"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pychm BeautifulSoup4 htmldoc python3-sgmllib3k"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/archmage/archmage.rst b/system/archmage/archmage.rst
new file mode 100644
index 0000000000..1732696834
--- /dev/null
+++ b/system/archmage/archmage.rst
@@ -0,0 +1,74 @@
+.. RST source for archmage(1) man page. Convert with:
+..   rst2man.py archmage.rst > archmage.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 0.4.2.1
+.. |date| date::
+
+========
+archmage
+========
+
+---------------------------------------
+convert CHM to PDF, HTML, or plain text
+---------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+archmage [*-options*] **chmfile** [**destdir** | **destfile**]
+
+DESCRIPTION
+===========
+
+**archmage** converts CHM files to HTML, plain text and PDF. CHM is the
+format used by Microsoft HTML Help, also known as Compiled HTML.
+
+OPTIONS
+=======
+
+-x, --extract
+  Extracts CHM file into specified directory. If destination
+  directory is omitted, then a new one will be created based
+  on the name of the CHM file. This option is the default.
+
+-c, --convert=format
+  Convert CHM file into specified file format. If destination
+  file is omitted, the output filename will be created based on
+  the name of the CHM file. Available formats::
+
+     html - Single HTML file
+     text - Plain text file (uses lynx(1) or elinks(1))
+     pdf - Adobe PDF
+
+-d, --dump
+  Dump HTML data from CHM file to standard output.
+
+-V, --version
+  Print version number and exit.
+
+-h, --help
+  Print help message and exit.
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/archmage-|version|/COPYING for license information.
+
+AUTHORS
+=======
+
+archmage was written by dottedmag.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The archmage homepage: https://github.com/dottedmag/archmage
diff --git a/system/archmage/slack-desc b/system/archmage/slack-desc
new file mode 100644
index 0000000000..11917df4d0
--- /dev/null
+++ b/system/archmage/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+archmage: archmage (CHM to HTML/PDF/text converter)
+archmage:
+archmage: arCHMage converts CHM files to HTML, plain text, or PDF. CHM is the
+archmage: format used by Microsoft HTML Help, also known as Compiled HTML.
+archmage:
+archmage:
+archmage:
+archmage:
+archmage:
+archmage:
+archmage:
diff --git a/system/argyllcms/argyllcms.SlackBuild b/system/argyllcms/argyllcms.SlackBuild
index 33833e2558..b07561ca97 100644
--- a/system/argyllcms/argyllcms.SlackBuild
+++ b/system/argyllcms/argyllcms.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for ArgyllCMS
 # Home Page http://www.argyllcms.com/
@@ -25,12 +25,15 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="argyllcms"
 SRCNAM="Argyll"
-VERSION=${VERSION:-2.0.1}
-SRCVERSION=${SRCVERSION:-V2.0.1}
+VERSION=${VERSION:-2.3.1}
+SRCVERSION=${SRCVERSION:-V2.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -40,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,15 +71,18 @@ set -e
 rm -rf $TMP/$SRCNAM-$SRCVERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
+rm -rf $TMP/${SRCNAM}_${SRCVERSION}
 unzip $CWD/${SRCNAM}_${SRCVERSION}_src.zip
 cd $TMP/${SRCNAM}_${SRCVERSION}
 
-chown -R root.root .
+chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 750 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 640 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+export CCOPTFLAG="$SLKCFLAGS -fcommon"
 
 patch -p1 < $CWD/patches/argyllcms-1.8.0-gcc5.patch
 
@@ -104,11 +114,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a License*.txt Readme.txt $PKG/usr/doc/$PRGNAM-$VERSION
+install -m0644 License*.txt Readme.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/argyllcms/argyllcms.info b/system/argyllcms/argyllcms.info
index 0c942d059f..d140558dec 100644
--- a/system/argyllcms/argyllcms.info
+++ b/system/argyllcms/argyllcms.info
@@ -1,10 +1,10 @@
 PRGNAM="argyllcms"
-VERSION="2.0.1"
+VERSION="2.3.1"
 HOMEPAGE="http://www.argyllcms.com/"
-DOWNLOAD="http://argyllcms.com/Argyll_V2.0.1_src.zip"
-MD5SUM="5a9cf5233ea46733685965e4d0f99649"
+DOWNLOAD="http://argyllcms.com/Argyll_V2.3.1_src.zip"
+MD5SUM="aa7c56b6426d296f16bc53a18fe8acd4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jam"
-MAINTAINER="Nishant Limbachia"
-EMAIL="nishant@mnspace.net"
+MAINTAINER="Fernando Lopez Jr"
+EMAIL="fernando.lopezjr@gmail.com"
diff --git a/system/arj/README b/system/arj/README
index 2cb7b69f23..33855f15c4 100644
--- a/system/arj/README
+++ b/system/arj/README
@@ -3,5 +3,5 @@ arj (Free Software implementation of arj archiver)
 A portable version of the ARJ archiver, available for a growing number
 of DOS-like and UNIX-like platforms on a variety of architectures.
 
-This build doesn't conflict with Slackware's unarj package. Unlike unarj,
-arj is capable of creating archives as well as extracting them.
+This build doesn't conflict with Slackware's unarj package. Unlike
+unarj, arj is capable of creating archives as well as extracting them.
diff --git a/system/arj/arj.SlackBuild b/system/arj/arj.SlackBuild
index f7e979bf99..49d2e70857 100644
--- a/system/arj/arj.SlackBuild
+++ b/system/arj/arj.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for arj
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
@@ -10,10 +10,13 @@
 # http://www.securityfocus.com/archive/1/535190
 # Already patched in debian, add their patches here.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=arj
 VERSION=${VERSION:-3.10.22}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -23,7 +26,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -51,11 +58,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Use Debian's patches. See https://packages.debian.org/sid/arj. These are
 # needed to get the source to build on modern systems, and work correctly
@@ -97,4 +101,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/arj/arj.info b/system/arj/arj.info
index 57c8b58657..75b0a1a9e2 100644
--- a/system/arj/arj.info
+++ b/system/arj/arj.info
@@ -1,10 +1,10 @@
 PRGNAM="arj"
 VERSION="3.10.22"
 HOMEPAGE="http://arj.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/arj/arj/2.78_3.10%20build%2022/arj-3.10.22.tar.gz"
+DOWNLOAD="http://arj.sourceforge.net/files/arj-3.10.22.tar.gz"
 MD5SUM="f263bf3cf6d42a8b7e85b4fb514336d3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/arj/patches/self_integrity_64bit.patch b/system/arj/patches/self_integrity_64bit.patch
index f9ceb2ffe9..0c2332bf2c 100644
--- a/system/arj/patches/self_integrity_64bit.patch
+++ b/system/arj/patches/self_integrity_64bit.patch
@@ -1,5 +1,5 @@
 Description: Fix arj self-integrity check on 64-bit systems
-Author: B Watson <yalhcru@gmail.com>
+Author: B Watson <urchlay@slackware.uk>
 Origin: other, http://slackbuilds.org/cgit/slackbuilds/tree/system/arj/patches/SBo_integrity_64bit.patch
 Forwarded: no
 Reviewed-By: Guillem Jover <guillem@debian.org>
diff --git a/system/arqiver/README b/system/arqiver/README
new file mode 100644
index 0000000000..77dce04f43
--- /dev/null
+++ b/system/arqiver/README
@@ -0,0 +1,2 @@
+Arqiver is a simple Qt archiver manager. It serves as a front-end for
+libarchive (bsdtar), gzip and 7z.
diff --git a/system/arqiver/arqiver.SlackBuild b/system/arqiver/arqiver.SlackBuild
new file mode 100644
index 0000000000..b2a472e4cd
--- /dev/null
+++ b/system/arqiver/arqiver.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# Slackware build script for arqiver
+
+# Copyright 2024- Antonio Leal, Porto Salvo, Oeiras, Portugal
+# Copyright 2022-2024 Isaac Yu <isaacyu@protonmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=arqiver
+VERSION=${VERSION:-0.12.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM=Arqiver
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
+cd $SRCNAM-$VERSION
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+qmake-qt5 PREFIX=/usr
+make
+make install INSTALL_ROOT=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog COPYING NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/arqiver/arqiver.info b/system/arqiver/arqiver.info
new file mode 100644
index 0000000000..9eb17d14a3
--- /dev/null
+++ b/system/arqiver/arqiver.info
@@ -0,0 +1,10 @@
+PRGNAM="arqiver"
+VERSION="0.12.0"
+HOMEPAGE="https://github.com/tsujan/Arqiver"
+DOWNLOAD="https://github.com/tsujan/Arqiver/releases/download/V0.12.0/Arqiver-0.12.0.tar.xz"
+MD5SUM="a6a331998d2c8b1c0c95fc0b9a3f89c6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Antonio Leal"
+EMAIL="antonioleal@yahoo.com"
diff --git a/system/hebe/doinst.sh b/system/arqiver/doinst.sh
index 4a25de5e6f..4a25de5e6f 100644
--- a/system/hebe/doinst.sh
+++ b/system/arqiver/doinst.sh
diff --git a/system/arqiver/slack-desc b/system/arqiver/slack-desc
new file mode 100644
index 0000000000..26d97322a6
--- /dev/null
+++ b/system/arqiver/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+arqiver: arqiver (Simple Qt archive manager)
+arqiver:
+arqiver: arqiver is a simple Qt archive manager. It serves as a front-end for
+arqiver: libarchive (bsdtar), gzip and 7z. 
+arqiver:
+arqiver: Homepage https://github.com/tsujan/Arqiver
+arqiver:
+arqiver:
+arqiver:
+arqiver:
+arqiver:
diff --git a/system/artwiz-aleczapka/README b/system/artwiz-aleczapka/README
index 860c26d785..bf4929d72e 100644
--- a/system/artwiz-aleczapka/README
+++ b/system/artwiz-aleczapka/README
@@ -1,8 +1,11 @@
-This is a set of artwiz fonts that is compatible with fontconfig/Xft-2.0.
+This is a set of artwiz fonts that is compatible with
+fontconfig/Xft-2.0.
 
-This script can also build the alternate language versions which contain more
-Latin-1 glyphs.  Download the appropriate tarball from the artwiz-aleczapka
-website and set $FONTLANG to "de" or "se".  See the SlackBuild script for more
-info.  All languages should be able to coexist on the same machine.
+This script can also build the alternate language versions which
+contain more Latin-1 glyphs. Download the appropriate tarball
+from the artwiz-aleczapka website and set $FONTLANG to "de" or "se".
+See the SlackBuild script for more info. All languages should be able
+to coexist on the same machine.
 
-After installation you may need to restart X for it to use the new fonts.
+After installation you may need to restart X for it to use the new
+fonts.
diff --git a/system/artwiz-aleczapka/artwiz-aleczapka.SlackBuild b/system/artwiz-aleczapka/artwiz-aleczapka.SlackBuild
index 7be269316e..bc9326bb50 100644
--- a/system/artwiz-aleczapka/artwiz-aleczapka.SlackBuild
+++ b/system/artwiz-aleczapka/artwiz-aleczapka.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for artwiz-aleczapka
 
@@ -22,13 +22,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=artwiz-aleczapka
 VERSION=${VERSION:-1.3}
 ARCH=noarch
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -92,4 +102,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/artwiz-cursor/README b/system/artwiz-cursor/README
index 624e417d6e..618dc33e11 100644
--- a/system/artwiz-cursor/README
+++ b/system/artwiz-cursor/README
@@ -2,11 +2,13 @@ Artwiz fonts are small futuristic ASCII and mouse cursor fonts for X.
 This package only contains the artwiz mouse cursor font.
 
 This package is intended to replace x/font-cursor-misc from Slackware.
-Uninstall the font-cursor-misc package just before installing this one.
-Alternatively, read the comments in the SlackBuild script for instructions on
-how to choose between the two when both are installed.
+Uninstall the font-cursor-misc package just before installing this
+one. Alternatively, read the comments in the SlackBuild script for
+instructions on how to choose between the two when both are installed.
 
-After installation you will need to restart X for the changes to take effect.
+After installation you will need to restart X for the changes to take
+effect.
 
-After uninstallation you will need to reinstall the font-cursor-misc package
-so that X can find the appropriate cursor font the next time it starts.
+After uninstallation you will need to reinstall the font-cursor-misc
+package so that X can find the appropriate cursor font the next time
+it starts.
diff --git a/system/artwiz-cursor/artwiz-cursor.SlackBuild b/system/artwiz-cursor/artwiz-cursor.SlackBuild
index 2b4d5fa347..7fe5736e1b 100644
--- a/system/artwiz-cursor/artwiz-cursor.SlackBuild
+++ b/system/artwiz-cursor/artwiz-cursor.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for artwiz-cursor
 
@@ -22,13 +22,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=artwiz-cursor
 VERSION=${VERSION:-1.3}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -82,4 +92,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/asbt/README b/system/asbt/README
index 11656f7a35..6d68fb5969 100644
--- a/system/asbt/README
+++ b/system/asbt/README
@@ -1,9 +1,9 @@
-asbt is a tool for managing packages in your local copy of slackbuilds,
-which can be obtained from http://slackbuilds.org (SBo).
+asbt is a tool for managing packages in your local copy of
+slackbuilds, which can be obtained from http://slackbuilds.org (SBo).
 
 It supports searching (-s), viewing information (-i,-r,-d,-v,-l,-q),
-downloading (-G), building (-B), installing/removing/upgrading (-I,-R,-U),
-checking updates (-c), and some other options.
+downloading (-G), building (-B), installing/removing/upgrading
+(-I,-R,-U), checking updates (-c), and some other options.
 
 The list of available options is present in the readme and the man page.
 See README.Slackware for more information.
diff --git a/system/asbt/asbt.SlackBuild b/system/asbt/asbt.SlackBuild
index bcc5aa17ba..e74f190245 100644
--- a/system/asbt/asbt.SlackBuild
+++ b/system/asbt/asbt.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for asbt
 
-# Copyright 2014-2020 Aaditya Bagga <aaditya_gnulinux@zoho.com>
+# Copyright 2014-2020 Aaditya <aaditya_gnulinux@zoho.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=asbt
 VERSION=${VERSION:-2.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,4 +75,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/asbt/asbt.info b/system/asbt/asbt.info
index d8bd20df07..8535dd355c 100644
--- a/system/asbt/asbt.info
+++ b/system/asbt/asbt.info
@@ -1,10 +1,10 @@
 PRGNAM="asbt"
 VERSION="2.1.1"
-HOMEPAGE="https://github.com/aadityabagga/asbt"
-DOWNLOAD="https://github.com/aadityabagga/asbt/archive/2.1.1.tar.gz"
+HOMEPAGE="https://github.com/abchk1234/asbt"
+DOWNLOAD="https://github.com/abchk1234/asbt/archive/2.1.1/asbt-2.1.1.tar.gz"
 MD5SUM="22a9bda61fc6eb4124ecf13a9ece85aa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Aaditya Bagga"
+MAINTAINER="Aaditya"
 EMAIL="aaditya_gnulinux@zoho.com"
diff --git a/system/asus-fanmode/README b/system/asus-fanmode/README
new file mode 100644
index 0000000000..45716e5d17
--- /dev/null
+++ b/system/asus-fanmode/README
@@ -0,0 +1,5 @@
+asus_fanmode is a daemon that controls Fan Boost Mode on ASUS TUF
+series laptops. Based on CPU temperature readings this tool selects
+suitable fan mode using threshold values from configuration file.
+
+**TAKE NOTE: The rc file it's not included in this slackbuild.
diff --git a/system/asus-fanmode/asus-fanmode.SlackBuild b/system/asus-fanmode/asus-fanmode.SlackBuild
new file mode 100644
index 0000000000..532d5a1f8d
--- /dev/null
+++ b/system/asus-fanmode/asus-fanmode.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/bash
+
+# Slackware build script for asus-fanmode
+
+# Copyright 2023 juanma1980 <juanma1980@disroot.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=asus-fanmode
+SRCNAM=asus_fanmode
+VERSION=${VERSION:-0.3.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ICM_DOWNLOAD="no"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+make
+if [ "$ICM_DOWNLOAD" = "yes" ]; then
+	./getweb all
+fi
+make install DESTDIR=$PKG
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+#Remove systemd unit
+rm -fr $PKG/usr/lib/
+# Also, include the SlackBuild script in the documentation directory
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+mv etc/asus_fanmode.conf etc/asus_fanmode.conf.new
+
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/asus-fanmode/asus-fanmode.info b/system/asus-fanmode/asus-fanmode.info
new file mode 100644
index 0000000000..7c1cb1f262
--- /dev/null
+++ b/system/asus-fanmode/asus-fanmode.info
@@ -0,0 +1,10 @@
+PRGNAM="asus-fanmode"
+VERSION="0.3.1"
+HOMEPAGE="https://github.com/leonmaxx/asus_fanmode"
+DOWNLOAD="https://github.com/leonmaxx/asus_fanmode/archive/refs/tags/v0.3.1/asus_fanmode-0.3.1.tar.gz"
+MD5SUM="59c37676f23c29cabea2d893cefaed10"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="juanma1980"
+EMAIL="juanma1980@disroot.org"
diff --git a/system/asus-fanmode/doinst.sh b/system/asus-fanmode/doinst.sh
new file mode 100644
index 0000000000..d2aaeff119
--- /dev/null
+++ b/system/asus-fanmode/doinst.sh
@@ -0,0 +1,16 @@
+# $RCSfile: doinst.sh,v $
+# $Revision: 1.9 $
+# $Date: 2023-05-11 07:58:15+01 $
+# DW
+
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    rm $NEW
+  fi
+}
+
+config etc/asus_fanmode.conf.new
diff --git a/system/asus-fanmode/slack-desc b/system/asus-fanmode/slack-desc
new file mode 100644
index 0000000000..5d38510efd
--- /dev/null
+++ b/system/asus-fanmode/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+asus-fanmode: asus-fanmode (Fan Boost Daemon)
+asus-fanmode:
+asus-fanmode: asus-fanmode is a daemon that controls Fan Boost Mode on 
+asus-fanmode: ASUS TUF series laptops. Based on CPU temperature readings this 
+asus-fanmode: tool selects suitable fan mode using threshold values from
+asus-fanmode: configuration file.
+asus-fanmode:
+asus-fanmode:
+asus-fanmode:
+asus-fanmode:
+asus-fanmode:
diff --git a/system/atarisio/README b/system/atarisio/README
new file mode 100644
index 0000000000..014f2642ce
--- /dev/null
+++ b/system/atarisio/README
@@ -0,0 +1,30 @@
+atarisio (peripheral emulator for Atari 8-bit computer and SIO2PC)
+
+AtariSIO allows a Linux system to act as one or more disk drives,
+a printer, and/or a cassette drive for an Atari 8-bit (400/800/XL/XE)
+computer, using an SIO2PC cable.
+
+Even without SIO2PC or a real Atari, this package includes some
+utilities that are useful for manipulating and examining Atari disk,
+cassette, and executable images.
+
+AtariSIO can use either a regular serial port or its own kernel
+driver. The kernel driver requires a real serial port with a 16550A
+UART, which is fairly rare on modern PC hardware. The regular serial
+port mode works with most USB serial port adaptors. For best results,
+use an FTDI-based adaptor.
+
+By default, the kernel driver is not built because it's not very
+useful (or even functional) on modern PCs. To enable it, read the
+instructions in "README_kernel.txt".
+
+By default, the atariserver and atarixfer executables are installed
+setgid dialout so they can access the serial port, and have the
+appropriate capability bits set so they can use realtime scheduling.
+
+If you don't like this, you can set SETGID=no in the script's
+environment, and run the programs as root (e.g. with su or sudo).
+
+If you're using a filesystem that doesn't support capabilities,
+you can instead set SETUID=yes in the script's environment, to make
+atariserver and atarixfer run as root.
diff --git a/system/atarisio/README_kernel.txt b/system/atarisio/README_kernel.txt
new file mode 100644
index 0000000000..8411230215
--- /dev/null
+++ b/system/atarisio/README_kernel.txt
@@ -0,0 +1,64 @@
+*******************************************************************
+* If your serial port is a USB adaptor, STOP reading this NOW and *
+* go build atarisio _without_ KERNEL="yes"!                       *
+*******************************************************************
+
+AtariSIO's atariserver and atarixfer use your serial (RS232) port to
+communicate with the SIO2PC device. This can be done one of two ways:
+using the regular Linux serial port driver or a special AtariSIO
+kernel driver that "takes over" the serial port [1].
+
+The kernel driver exists because the SIO protocol relies on tight
+timing, especially when using high bitrates (lower POKEY divisor
+numbers). On older machines, scheduling latency can cause "hiccups"
+in the SIO transfers, resulting in slow loading (due to retries)
+or failures.
+
+On modern machines (especially with modern kernels), there's less of
+a need for the kernel driver. Also, modern computers don't often have
+real serial ports. It's still possible to use AtariSIO with a USB to
+RS232 adaptor on such a machine, but not with the kernel module.
+
+The AtariSIO kernel driver can only be used if you have a real (not
+USB) serial port that uses a 16550A or 100% compatible UART. If you're
+using USB, stop reading this and build atarisio without KERNEL=yes.
+
+Also, even if you do have a real 16550A serial port, you still might
+want to avoid the kernel driver: if atarisio works fine without it,
+there's no need for the kernel driver's extra complexity.
+
+If you're determined to use the kernel driver, read on.
+
+1. Build atarisio with KERNEL=yes [2].
+
+2. Install the atarisio package you just built.
+
+3. The atarisio module needs to know which serial port to use. The
+   default is /dev/ttyS0. If you only have one serial port, this
+   should be the correct one. If you need to change this, edit
+   /etc/modprobe.d/atarisio.conf and change the "port=/dev/ttyS0" to
+   whatever it should be.
+
+4. As root, run "modprobe atarisio". The module will be loaded on
+   every boot; this step is just to avoid rebooting. If you don't
+   want to load the module at boot, edit /etc/rc.d/rc.modules.local
+   and comment out the "/sbin/modprobe atarisio" line.
+
+At this point, you should be ready to run atarisio. If you have
+trouble with the kernel module, try building atarisio without it and
+see if it works. If not, there's probably something wrong with your
+hardware.
+
+Notes:
+
+[1] The SlackBuild author hasn't tested the kernel module. I don't
+    currently own any machines with 16550A serial ports, only USB.
+    I used to use the kernel module with older hardware (up to 2016
+    or so) and it worked fine then.
+
+[2] If building the kernel module fails, it means your kernel is too
+    new for atarisio. The current version of atarisio works with
+    kernels up to 5.15.x (which is what Slackware 15.0 runs). If
+    you're running Slackware-current and can't compile the kernel
+    module, tough luck (for now anyway). Use atarisio without the
+    kernel module, or use Slackware 15.0.
diff --git a/system/atarisio/ataricom.1 b/system/atarisio/ataricom.1
new file mode 100644
index 0000000000..9c87fd504d
--- /dev/null
+++ b/system/atarisio/ataricom.1
@@ -0,0 +1,99 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "ATARICOM" 1 "2022-07-14" "0.30-210714" "HiassofT Atari 8-bit Tools"
+.SH NAME
+ataricom \- utility for manipulating Atari 8-bit executable files
+.\" RST source for ataricom(1) man page. Convert with:
+.
+.\" rst2man.py ataricom.rst > ataricom.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+ataricom [\fIoptions\fP]... \fBfile\fP [\fBoutfile\fP]
+.SH DESCRIPTION
+.sp
+ataricom performs various useful operations on Atari 8\-bit executable
+files. These files are also known as binary load files, or COM, BIN,
+XEX, OBJ, OBX, et al. These are only names; there is only one Atari
+8\-bit executable file format.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.BI \-c \ address
+create COM file from raw data file.
+.TP
+.B  \-e
+extract blocks to outfileBBBB.ext.
+.TP
+.B  \-E
+extract blocks to outfileBBBB_SADR_EADR.ext.
+.TP
+.BI \-r \ address
+add RUN block with specified address at end of file.
+.TP
+.BI \-i \ address
+add INIT block with specified address at end of file.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-b start[\-end][,...]
+only process specified blocks.
+.TP
+.B \-x start[\-end][,...]
+exclude specified blocks.
+.TP
+.B \-m start\-end[,...]
+merge specified blocks.
+.TP
+.B \-s block,adr...
+split block at given addresses.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B  \-n
+write raw data blocks (no COM headers).
+.TP
+.B  \-X
+show block length and file offset in hex.
+.UNINDENT
+.SH AUTHOR
+.sp
+Matthias Reichl <\fI\%hias@horus.com\fP>.
+.sp
+Man page by B. Watson <\fI\%urchlay@urchlay.com\fP>.
+.SH SEE ALSO
+.sp
+\fBatariserver\fP(1), \fBatarixfer\fP(1), \fBdir2atr\fP(1), \fBadir\fP(1), \fBcasinfo\fP(1).
+.sp
+AtariSIO home page: \fI\%https://www.horus.com/~hias/atari/\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/system/atarisio/ataricom.rst b/system/atarisio/ataricom.rst
new file mode 100644
index 0000000000..18ecbd8df0
--- /dev/null
+++ b/system/atarisio/ataricom.rst
@@ -0,0 +1,82 @@
+.. RST source for ataricom(1) man page. Convert with:
+..   rst2man.py ataricom.rst > ataricom.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 0.30-210714
+.. |date| date::
+
+========
+ataricom
+========
+
+-----------------------------------------------------
+utility for manipulating Atari 8-bit executable files
+-----------------------------------------------------
+
+:Manual section: 1
+:Manual group: HiassofT Atari 8-bit Tools
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+ataricom [*options*]... **file** [**outfile**]
+
+DESCRIPTION
+===========
+
+ataricom performs various useful operations on Atari 8-bit executable
+files. These files are also known as binary load files, or COM, BIN,
+XEX, OBJ, OBX, et al. These are only names; there is only one Atari
+8-bit executable file format.
+
+OPTIONS
+=======
+
+-c address
+      create COM file from raw data file.
+
+-e
+      extract blocks to outfileBBBB.ext.
+
+-E
+      extract blocks to outfileBBBB_SADR_EADR.ext.
+
+-r address
+      add RUN block with specified address at end of file.
+
+-i address
+      add INIT block with specified address at end of file.
+
+-b start[-end][,...]
+      only process specified blocks.
+
+-x start[-end][,...]
+      exclude specified blocks.
+
+-m start-end[,...]
+      merge specified blocks.
+
+-s block,adr...
+      split block at given addresses.
+
+-n
+      write raw data blocks (no COM headers).
+
+-X
+      show block length and file offset in hex.
+
+AUTHOR
+======
+
+Matthias Reichl <hias@horus.com>.
+
+Man page by B. Watson <urchlay@urchlay.com>.
+
+SEE ALSO
+========
+
+**atariserver**\(1), **atarixfer**\(1), **dir2atr**\(1), **adir**\(1), **casinfo**\(1).
+
+AtariSIO home page: https://www.horus.com/~hias/atari/
diff --git a/system/atarisio/atarisio.SlackBuild b/system/atarisio/atarisio.SlackBuild
new file mode 100644
index 0000000000..f9b6cc4ccb
--- /dev/null
+++ b/system/atarisio/atarisio.SlackBuild
@@ -0,0 +1,183 @@
+#!/bin/bash
+
+# Slackware build script for atarisio
+
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20221225 bkw: update for v221009, fix email address in .info
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=atarisio
+VERSION=${VERSION:-221009}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCNAM=AtariSIO
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# The kernel driver is really nice, but has two issues:
+# 1. It requires a real 16550A serial port. These are pretty rare on
+#    modern machines.
+# 2. While the driver is loaded, you can't use the serial port as a
+#    normal serial port. This prevents using the Atari as a terminal
+#    or SLIP mode for FujiChat.
+# By default, this build will disable it.
+KERNEL=${KERNEL:-no}
+if [ "$KERNEL" = "no" ]; then
+  DEFAULT_DEVICE=${DEFAULT_DEVICE:-/dev/ttyUSB0}
+  INCLUDES="does not include"
+  KVER=""
+else
+  DEFAULT_DEVICE=${DEFAULT_DEVICE:-/dev/atarisio0}
+  INCLUDES="includes"
+  KERNVER="$( uname -r )"
+  KVER=" for kernel $KERNVER"
+fi
+
+# Use our flags, and don't waste time running depmod since we
+# install the module to $PKG anyway.
+sed -i "/^CFLAGS/s,-g,$SLKCFLAGS," Makefile
+sed -i '/\tdepmod/d' driver/Makefile
+
+# Thought about ENABLE_ATP=1, but ATP is incomplete and abandoned.
+# Nothing ever used it, according to the AtariSIO author.
+do_make() {
+  make $@ \
+    DEFAULT_DEVICE="$DEFAULT_DEVICE" \
+    INST_DIR=$PKG/usr \
+    MDIR=$PKG/lib/modules/$KERNVER/misc
+}
+
+do_make tools ENABLE_TESTS=1
+do_make tools-install
+strip $PKG/usr/bin/*
+
+# built all the test stuff with ENABLE_TESTS, but not all
+# of it's generally useful. These look like they are:
+install -s -m0755 tools/{casinfo,serialwatcher,ataridd} $PKG/usr/bin
+
+# atariserver and atarixfer get installed setuid root.
+# we have 3 choices in this build:
+# 1. leave them setuid root (SETUID=yes, ignore SETGID)
+# 2. make them setgid dialout (so they can access /dev/ttyS*) and
+#    set capabilities in doinst.sh (SETUID=no, SETGID=yes)
+# 3. no setuid or setgid; let the user sudo or whatever (SETUID=no, SETGID=no)
+
+# default choice is 2.
+SETUID="${SETUID:-no}"
+SETGID="${SETGID:-yes}"
+
+# thought about adding serialwatcher and ataridd to this list, but
+# they're quick & dirty test tools, author probably didn't give a lot
+# of thought to security.
+SBINS="$PKG/usr/bin/atariserver $PKG/usr/bin/atarixfer"
+
+# reset ownership to Slackware default:
+chown root:root $PKG/usr/bin/*
+chmod 0755 $PKG/usr/bin/*
+
+if [ "$SETUID" = "yes" ]; then
+  # choice 1:
+  chown root:users $SBINS
+  chmod 4750 $SBINS
+elif [ "$SETGID" = "yes" ]; then
+  # choice 2:
+  chown root:dialout $SBINS
+  chmod 2755 $SBINS
+  mkdir -p $PKG/install
+  cat $CWD/doinst.caps >> $PKG/install/doinst.sh
+else
+  # choice 3: do nothing, leave at Slackware default
+  :
+fi
+
+if [ "$KERNEL" != "no" ]; then
+  do_make driver
+  do_make driver-install
+  mkdir -p $PKG/lib/udev/rules.d $PKG/etc/modprobe.d
+  cp -a atarisio-modprobe.conf $PKG/etc/modprobe.d/atarisio.conf.new
+  cp -a atarisio-udev.rules $PKG/lib/udev/rules.d/99-atarisio.rules
+fi
+
+# If the kernel stuff wasn't built, this is an empty dir.
+rmdir $PKG/usr/include 2>/dev/null || true
+
+# man pages and HTML docs not built by main Makefile
+cd docbook
+  make docs-man
+  make docs-html
+  rm -f html/*.proc
+  mkdir -p $PKG/usr/man/man1
+  for i in man/*.1; do
+    gzip -c < $i > $PKG/usr/man/man1/$( basename $i ).gz
+  done
+cd -
+
+# there's no man pages for these, so I wrote them:
+for i in ataricom casinfo; do
+  gzip -9c < $CWD/$i.1 > $PKG/usr/man/man1/$i.1.gz
+done
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a Changelog README* TODO docbook/html contrib $PKGDOC
+if [ "$KERNEL" != "no" ]; then
+  cat $CWD/README_kernel.txt > $PKGDOC/README_kernel.txt
+fi
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+sed -e "s,@INCLUDES@,$INCLUDES," \
+    -e "s,@KVER@,$KVER," \
+    -e "s,@DEFAULT_DEVICE@,$DEFAULT_DEVICE," \
+    < $CWD/slack-desc > $PKG/install/slack-desc
+[ "$KERNEL" != "no" ] && cat $CWD/doinst.kernel >> $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/atarisio/atarisio.info b/system/atarisio/atarisio.info
new file mode 100644
index 0000000000..9600502984
--- /dev/null
+++ b/system/atarisio/atarisio.info
@@ -0,0 +1,10 @@
+PRGNAM="atarisio"
+VERSION="221009"
+HOMEPAGE="https://www.horus.com/~hias/atari/"
+DOWNLOAD="https://github.com/HiassofT/AtariSIO/archive/221009/AtariSIO-221009.tar.gz"
+MD5SUM="32ccc043ee6e06c6170843b19521987d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="atasm"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/atarisio/casinfo.1 b/system/atarisio/casinfo.1
new file mode 100644
index 0000000000..8276050148
--- /dev/null
+++ b/system/atarisio/casinfo.1
@@ -0,0 +1,109 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "CASINFO" 1 "2022-07-14" "0.30-210714" "HiassofT Atari 8-bit Tools"
+.SH NAME
+casinfo \- print info about Atari 8-bit cassette images
+.\" RST source for casinfo(1) man page. Convert with:
+.
+.\" rst2man.py casinfo.rst > casinfo.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+casinfo \fBfile\fP
+.SH DESCRIPTION
+.sp
+\fBcasinfo\fP reads an Atari 8\-bit cassette image (aka CAS file) and prints
+the following information:
+.INDENT 0.0
+.INDENT 3.5
+.INDENT 0.0
+.IP \(bu 2
+Description
+.IP \(bu 2
+Number of Parts (aka Stages or Files)
+.IP \(bu 2
+Number of Blocks
+.IP \(bu 2
+The metadata for each block:
+.INDENT 2.0
+.IP \(bu 2
+Block Number
+.IP \(bu 2
+Record Type (data or fsk)
+.IP \(bu 2
+Part (0 for the first file/stage, 1 for the 2nd, etc)
+.IP \(bu 2
+Baud (bits/sec; normally 600)
+.IP \(bu 2
+Gap aka PRWT (Pre\-Record Write Tone, in milliseconds)
+.IP \(bu 2
+Block length in bytes (normally 132)
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.sp
+If an invalid file (not a CAS image) is given, \fBcasinfo\fP will print
+\fBError: "file" doesn\(aqt start with FUJI header\fP to stderr, then
+exit. Beware that the exit status is always 0 (success), so a script
+would have to capture and parse stderr to catch errors.
+.SH EXAMPLE
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+$ casinfo test.cas
+casinfo 0.30\-210714 (c) 2007\-2010 Matthias Reichl
+infos for "test.cas":
+Description: <none>
+Number of Parts: 1
+Number of Blocks: 3
+   0:  data part:  0  baud:   600  gap: 25647  length:   132
+   1:  data part:  0  baud:   600  gap:   252  length:   132
+   2:  data part:  0  baud:   600  gap:   254  length:   132
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.SH AUTHOR
+.sp
+Matthias Reichl <\fI\%hias@horus.com\fP>.
+.sp
+Man page by B. Watson <\fI\%urchlay@urchlay.com\fP>.
+.SH SEE ALSO
+.sp
+\fBatariserver\fP(1), \fBatarixfer\fP(1), \fBdir2atr\fP(1), \fBadir\fP(1), \fBataricom\fP(1).
+.sp
+AtariSIO home page: \fI\%https://www.horus.com/~hias/atari/\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/system/atarisio/casinfo.rst b/system/atarisio/casinfo.rst
new file mode 100644
index 0000000000..a7e85cee92
--- /dev/null
+++ b/system/atarisio/casinfo.rst
@@ -0,0 +1,76 @@
+.. RST source for casinfo(1) man page. Convert with:
+..   rst2man.py casinfo.rst > casinfo.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 0.30-210714
+.. |date| date::
+
+=======
+casinfo
+=======
+
+--------------------------------------------
+print info about Atari 8-bit cassette images
+--------------------------------------------
+
+:Manual section: 1
+:Manual group: HiassofT Atari 8-bit Tools
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+casinfo **file**
+
+DESCRIPTION
+===========
+
+**casinfo** reads an Atari 8-bit cassette image (aka CAS file) and prints
+the following information:
+
+  - Description
+  - Number of Parts (aka Stages or Files)
+  - Number of Blocks
+  - The metadata for each block:
+
+    - Block Number
+    - Record Type (data or fsk)
+    - Part (0 for the first file/stage, 1 for the 2nd, etc)
+    - Baud (bits/sec; normally 600)
+    - Gap aka PRWT (Pre-Record Write Tone, in milliseconds)
+    - Block length in bytes (normally 132)
+
+If an invalid file (not a CAS image) is given, **casinfo** will print
+**Error: "file" doesn't start with FUJI header** to stderr, then
+exit. Beware that the exit status is always 0 (success), so a script
+would have to capture and parse stderr to catch errors.
+
+EXAMPLE
+=======
+
+::
+
+   $ casinfo test.cas
+   casinfo 0.30-210714 (c) 2007-2010 Matthias Reichl
+   infos for "test.cas":
+   Description: <none>
+   Number of Parts: 1
+   Number of Blocks: 3
+      0:  data part:  0  baud:   600  gap: 25647  length:   132
+      1:  data part:  0  baud:   600  gap:   252  length:   132
+      2:  data part:  0  baud:   600  gap:   254  length:   132
+
+AUTHOR
+======
+
+Matthias Reichl <hias@horus.com>.
+
+Man page by B. Watson <urchlay@urchlay.com>.
+
+SEE ALSO
+========
+
+**atariserver**\(1), **atarixfer**\(1), **dir2atr**\(1), **adir**\(1), **ataricom**\(1).
+
+AtariSIO home page: https://www.horus.com/~hias/atari/
diff --git a/system/atarisio/doinst.caps b/system/atarisio/doinst.caps
new file mode 100644
index 0000000000..af3bac867f
--- /dev/null
+++ b/system/atarisio/doinst.caps
@@ -0,0 +1,2 @@
+[ -x /sbin/setcap ] && /sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/atariserver
+[ -x /sbin/setcap ] && /sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/atarixfer
diff --git a/system/atarisio/doinst.kernel b/system/atarisio/doinst.kernel
new file mode 100644
index 0000000000..25a5af3ff0
--- /dev/null
+++ b/system/atarisio/doinst.kernel
@@ -0,0 +1,19 @@
+chroot . /sbin/depmod -a 2>/dev/null
+
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    rm $NEW
+  fi
+}
+
+config etc/modprobe.d/atarisio.conf.new
+
+if [ -e etc/rc.d/rc.modules.local ]; then
+  if ! grep -q '# AtariSIO' etc/rc.d/rc.modules.local; then
+    echo "/sbin/modprobe atarisio        # AtariSIO (added by SBo atarisio package)" >> etc/rc.d/rc.modules.local
+  fi
+fi
diff --git a/system/atarisio/slack-desc b/system/atarisio/slack-desc
new file mode 100644
index 0000000000..2e05d324ba
--- /dev/null
+++ b/system/atarisio/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+        |-----handy-ruler------------------------------------------------------|
+atarisio: atarisio (peripheral emulator for Atari 8-bit computer and SIO2PC)
+atarisio:
+atarisio: AtariSIO allows a Linux system to act as one or more disk drives,
+atarisio: a printer, and/or a cassette drive for an Atari 8-bit (400/800/XL/XE)
+atarisio: computer, using an SIO2PC cable.
+atarisio:
+atarisio: Package @INCLUDES@ the atarisio kernel driver@KVER@.
+atarisio: Default device: @DEFAULT_DEVICE@
+atarisio:
+atarisio:
+atarisio:
diff --git a/system/aterm/README b/system/aterm/README
index 64752066ae..448f8c0d9d 100644
--- a/system/aterm/README
+++ b/system/aterm/README
@@ -1,3 +1,3 @@
-aterm is designed to provide pleasing visual effects while performing such 
-a mundane function as terminal emulation under X.  It is largely based on
-rxvt code.
+aterm is designed to provide pleasing visual effects while performing
+such a mundane function as terminal emulation under X. It is largely
+based on rxvt code.
diff --git a/system/aterm/aterm.SlackBuild b/system/aterm/aterm.SlackBuild
index 9e8240abca..9fd5b39a59 100644
--- a/system/aterm/aterm.SlackBuild
+++ b/system/aterm/aterm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for aterm
 
@@ -24,26 +24,36 @@
 
 # Modified by the SlackBuilds.org project
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=aterm
 VERSION=${VERSION:-1.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,6 +79,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+sed -i 's%<sys/stropts.h>%<sys/ioctl.h>%;s%I_PUSH,%TIOCPKT,%' src/command.c
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -100,4 +112,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/atool/atool.SlackBuild b/system/atool/atool.SlackBuild
index 6ccd335da1..46a8860744 100644
--- a/system/atool/atool.SlackBuild
+++ b/system/atool/atool.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for atool
 
@@ -22,10 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=atool
 VERSION=${VERSION:-0.39.0}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -97,4 +107,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/atool/atool.info b/system/atool/atool.info
index 6853b6cc31..e623d4a1b0 100644
--- a/system/atool/atool.info
+++ b/system/atool/atool.info
@@ -6,5 +6,5 @@ MD5SUM="e0aa006decbc6484b9dba2879f1bb9f0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
+MAINTAINER="D Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/system/atop/atop.SlackBuild b/system/atop/atop.SlackBuild
index 971777441c..2ac95288b4 100644
--- a/system/atop/atop.SlackBuild
+++ b/system/atop/atop.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for atop
 
@@ -11,10 +11,13 @@
 # Granted WTFPL, Version 2, as published by Sam Hocevar. See
 # http://sam.zoy.org/wtfpl/COPYING for more details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=atop
-VERSION=${VERSION:-2.5.0}
+VERSION=${VERSION:-2.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -24,7 +27,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -58,7 +65,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-make CFLAGS="$SLKCFLAGS"
+make
 
 # Install the binary sgid utmp in order to allow accounting
 install -D -o root -g utmp -m 2751 atop $PKG/usr/bin/atop
@@ -68,8 +75,6 @@ install -D -m 0644 atop.init $PKG/etc/rc.d/rc.atop.new
 sed -i "s|/usr/share/atop/atop.daily|/etc/atop/atop.daily|g" $PKG/etc/rc.d/rc.atop.new
 
 mkdir -p $PKG/etc/{logrotate.d,atop}
-install -m 0644 psaccs_atop $PKG/etc/logrotate.d/psaccs_atop.new
-install -m 0644 psaccu_atop $PKG/etc/logrotate.d/psaccu_atop.new
 install -m 0644 $CWD/psacct.logrotate $PKG/etc/logrotate.d/psacct.new
 install -m 0755 atop.daily $PKG/etc/atop/atop.daily
 
@@ -99,4 +104,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/atop/atop.info b/system/atop/atop.info
index f34f8750fe..31b9bac1b8 100644
--- a/system/atop/atop.info
+++ b/system/atop/atop.info
@@ -1,8 +1,8 @@
 PRGNAM="atop"
-VERSION="2.5.0"
+VERSION="2.10.0"
 HOMEPAGE="https://www.atoptool.nl/"
-DOWNLOAD="https://www.atoptool.nl/download/atop-2.5.0.tar.gz"
-MD5SUM="5a63d28c276e8f65e8186083b51c7f3a"
+DOWNLOAD="https://www.atoptool.nl/download/atop-2.10.0.tar.gz"
+MD5SUM="6d14559b59e25d15dbcfa978ed0ec50e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/atop/doinst.sh b/system/atop/doinst.sh
index d634387854..32b6609770 100644
--- a/system/atop/doinst.sh
+++ b/system/atop/doinst.sh
@@ -20,8 +20,6 @@ fi
 
 config etc/rc.d/rc.atop.new
 config etc/logrotate.d/psacct.new
-config etc/logrotate.d/psaccs_atop.new
-config etc/logrotate.d/psaccu_atop.new
 
 touch var/log/atop/daily.log
 
diff --git a/system/audit/README b/system/audit/README
index 59dba16797..72284d18d0 100644
--- a/system/audit/README
+++ b/system/audit/README
@@ -1,16 +1,17 @@
 Audit for Slackware
 
-The Linux Auditing System is a kernel subsystem the allows the kernel to 
-record events of interest to intrusion detection systems, such as file 
-access attempts, specific system calls, or custom events generated by 
-trusted system binaries like login or sshd.  The audit package provides the 
-tools to configure the audit system, and to collect and process its output.
+The Linux Auditing System is a kernel subsystem the allows the
+kernel to record events of interest to intrusion detection systems,
+such as file access attempts, specific system calls, or custom events
+generated by trusted system binaries like login or sshd. The audit
+package provides the tools to configure the audit system, and to
+collect and process its output.
 
-To collect audit events, your kernel must have the audit system enabled, 
-which is present in the stock Slackware kernels.
+To collect audit events, your kernel must have the audit system
+enabled, which is present in the stock Slackware kernels.
 
-The audit package has no other dependencies. However, certain audit events 
-of interest, such as failed login attempts from /bin/login, password changes, 
-etcetera are generated by their respective binaries using libaudit.  If your 
-site policy requires auditing those events, some reconfiguration and/or 
-patching may be required.
+The audit package has no other dependencies. However, certain audit
+events of interest, such as failed login attempts from /bin/login,
+password changes, etcetera are generated by their respective binaries
+using libaudit. If your site policy requires auditing those events,
+some reconfiguration and/or patching may be required.
diff --git a/system/audit/audit.SlackBuild b/system/audit/audit.SlackBuild
index c18f98a8b8..45aca7c2a1 100644
--- a/system/audit/audit.SlackBuild
+++ b/system/audit/audit.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2010,  R. Andrew Bailey, Chantilly, VA  USA
 #    2013 - 2014,  Bogdan Radulescu, Bucharest, Romania <bogdan@nimblex.net>
@@ -22,10 +22,16 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 
+# 20220211 bkw: Modified by SlackBuilds.org: update for v3.0.7 as
+# the previous version won't build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=audit
-VERSION=${VERSION:-2.3.6}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.0.7}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -62,13 +72,16 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Init should check /etc/rc.d/rc.auditd.conf instead of /etc/sysconfig/auditd
 patch -p1 < $CWD/audit-2.3.6-sysconfig.diff
 
+# python binding are disabled ATM, see
+# https://listman.redhat.com/archives/linux-audit/2022-February/msg00085.html
+# thanks to fourtysixandtwo for the pointers
 CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -81,41 +94,51 @@ CFLAGS="$SLKCFLAGS" \
   --program-suffix= \
   --sbindir=/sbin \
   --enable-static=no \
+  --enable-systemd=no \
+  --with-libcap-ng=yes \
+  --enable-gssapi-krb5=yes \
+  --without-python \
+  --without-python3 \
   --build=$ARCH-slackware-linux
 
 make
-make DESTDIR=$PKG install
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# audispd must be 0750 to run
-chmod 0750 $PKG/sbin/audispd
+make DESTDIR=$PKG install-strip
+gzip -9 $PKG/usr/man/man*/*
+
+# 20220211 bkw: --libdir got ignored, not sure this go source is
+# actually useful anyway.
+if [ -n "$LIBDIRSUFFIX" ]; then
+  mv $PKG/usr/lib/golang $PKG/usr/lib$LIBDIRSUFFIX
+  rmdir $PKG/usr/lib
+fi
 
 mkdir -p $PKG/etc/rc.d
 mv $PKG/etc/sysconfig/auditd $PKG/etc/rc.d/rc.auditd.conf.new
 mv $PKG/etc/rc.d/init.d/auditd $PKG/etc/rc.d/rc.auditd.new
 rm -rf $PKG/etc/rc.d/init.d $PKG/etc/sysconfig
 
-# Change config files to .new:
-for i in $(find $PKG/etc -type f -name "*.rules" -o -name "*.conf") ; do mv $i $i.new; done
-
 mkdir -p $PKG/var/log/audit $PKG/var/lock/subsys
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO contrib \
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README contrib \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 find $PKG/usr/doc -size 0 -exec rm {} \;
 
-find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
-for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+rm -f $PKG/usr/lib*/*.la
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+# Change config files to .new:
+( cd $PKG
+  for i in $(find etc -type f -name "*.rules" -o -name "*.conf") ; do
+    mv $i $i.new
+    echo "config $i.new" >> $PKG/install/doinst.sh
+  done )
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/audit/audit.info b/system/audit/audit.info
index 809f0561eb..665a78bfa8 100644
--- a/system/audit/audit.info
+++ b/system/audit/audit.info
@@ -1,8 +1,8 @@
 PRGNAM="audit"
-VERSION="2.3.6"
-HOMEPAGE="http://people.redhat.com/sgrubb/audit/"
-DOWNLOAD="http://people.redhat.com/sgrubb/audit/audit-2.3.6.tar.gz"
-MD5SUM="ffe178196717f8d3fc5337559543f58a"
+VERSION="3.0.7"
+HOMEPAGE="https://people.redhat.com/sgrubb/audit/"
+DOWNLOAD="https://people.redhat.com/sgrubb/audit/audit-3.0.7.tar.gz"
+MD5SUM="34fab69e80ea6668e9c72e73ec24fd88"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/audit/doinst.sh b/system/audit/doinst.sh
index 779bb9aa32..b6622d7fb3 100644
--- a/system/audit/doinst.sh
+++ b/system/audit/doinst.sh
@@ -23,14 +23,4 @@ preserve_perms() {
 }
 
 preserve_perms etc/rc.d/rc.auditd.new
-preserve_perms etc/rc.d/rc.auditd.conf.new
-config etc/audit/rules.d/audit.rules.new
-config etc/audit/auditd.conf.new
-config etc/audisp/audispd.conf.new
-config etc/audisp/zos-remote.conf.new
-config etc/audisp/plugins.d/af_unix.conf.new
-config etc/audisp/plugins.d/au-remote.conf.new
-config etc/audisp/plugins.d/audispd-zos-remote.conf.new
-config etc/audisp/plugins.d/syslog.conf.new
-config etc/audisp/audisp-remote.conf.new
-config etc/libaudit.conf.new
+config etc/rc.d/rc.auditd.conf.new
diff --git a/system/augeas/README b/system/augeas/README
index 986c5d5128..2214f24be4 100644
--- a/system/augeas/README
+++ b/system/augeas/README
@@ -1,6 +1,6 @@
-Augeas is a library and command line tool that focuses on the most basic
-problem in handling Linux configurations programmatically: editing actual
-configuration files in a controlled manner.
+Augeas is a library and command line tool that focuses on the most
+basic problem in handling Linux configurations programmatically:
+editing actual configuration files in a controlled manner.
 
 To that end, Augeas exposes a tree of all configuration settings (well,
 all the ones it knows about) and a simple local API for manipulating the
diff --git a/system/augeas/augeas.SlackBuild b/system/augeas/augeas.SlackBuild
index c738fdc115..8ccb7f3e51 100644
--- a/system/augeas/augeas.SlackBuild
+++ b/system/augeas/augeas.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for augeas
 
-# Copyright 2015 Nikos Giotis <nikos.giotis@gmail.com>
+# Copyright 2015-2023, Nikos Giotis, Athens, GR
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,26 +23,36 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=augeas
-VERSION=${VERSION:-1.4.0}
+VERSION=${VERSION:-1.14.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -85,6 +95,8 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -92,11 +104,11 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog HACKING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog HACKING.md NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/augeas/augeas.info b/system/augeas/augeas.info
index 03fe904222..86955be840 100644
--- a/system/augeas/augeas.info
+++ b/system/augeas/augeas.info
@@ -1,8 +1,8 @@
 PRGNAM="augeas"
-VERSION="1.4.0"
+VERSION="1.14.1"
 HOMEPAGE="http://augeas.net/"
-DOWNLOAD="http://download.augeas.net/augeas-1.4.0.tar.gz"
-MD5SUM="a2536a9c3d744dc09d234228fe4b0c93"
+DOWNLOAD="https://github.com/hercules-team/augeas/releases/download/release-1.14.1/augeas-1.14.1.tar.gz"
+MD5SUM="ac31216268b4b64809afd3a25f2515e5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/autoarchive/autoarchive.SlackBuild b/system/autoarchive/autoarchive.SlackBuild
index 7eabcf48a1..3edec57b0c 100644
--- a/system/autoarchive/autoarchive.SlackBuild
+++ b/system/autoarchive/autoarchive.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for autoarchive
 
-# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2022  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220402 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix broken man page symlink.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=autoarchive
-VERSION=${VERSION:-1.3.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.0.2}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,14 +70,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # fix docs path
 sed -i 's/share\/doc/doc/' setup.py
@@ -81,7 +91,8 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mv $PKG/etc/aa/aa.conf $PKG/etc/aa/aa.conf.new
 
-find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README COPYING NEWS PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
@@ -92,4 +103,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/autoarchive/autoarchive.info b/system/autoarchive/autoarchive.info
index 1dbca30c22..c1ea9bbc7f 100644
--- a/system/autoarchive/autoarchive.info
+++ b/system/autoarchive/autoarchive.info
@@ -1,10 +1,10 @@
 PRGNAM="autoarchive"
-VERSION="1.3.0"
+VERSION="2.0.2"
 HOMEPAGE="http://autoarchive.sourceforge.net/"
-DOWNLOAD="https://pypi.python.org/packages/71/4a/329d970bee2dc278ecd4523708c4cfd332e91cd2e14617a2057ed9974901/autoarchive-1.3.0.tar.bz2"
-MD5SUM="9d8a371e3dff5a7bfb40d21b4fa85257"
+DOWNLOAD="https://files.pythonhosted.org/packages/a4/cf/99c7f0b26a8bdce00b1e9362d06a4737a426fa1e142435cf284a1f7c4bd2/autoarchive-2.0.2.tar.gz"
+MD5SUM="ee05a3a0ee90c859cbaaa24084ea6155"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
+REQUIRES=""
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/system/autocutsel/README b/system/autocutsel/README
index c82e421723..a61f8b7669 100644
--- a/system/autocutsel/README
+++ b/system/autocutsel/README
@@ -1,14 +1,17 @@
+autocutsel (keep the X clipboard and the cutbuffer in sync)
+
 Autocutsel tracks changes in the X server's cutbuffer and CLIPBOARD
 selection. When the CLIPBOARD is changed, it updates the cutbuffer.
 When the cutbuffer is changed, it owns the CLIPBOARD selection.
 The cutbuffer and CLIPBOARD selection are always synchronized.
 
-Autocutsel is mostly useful with window managers since most desktop
-environments today include their own clipboard managers.
-If you dont use a display manager like KDM you can use autocutsel
-by adding an entry to your $HOME/.xinitc file using the -fork option.
+Autocutsel is mostly useful with window managers, since most desktop
+environments today include their own clipboard managers. If you don't
+use a display manager like KDM you can use autocutsel by adding an
+entry to your $HOME/.xinitc file using the -fork option.
 
-Some softwares (like OpenOffice Writer) have trouble when the PRIMARY
-selection is requested before the mouse button is released.
-As a workaround, you can run autocutsel with the "-buttonup" option
-and it will only get the selection when the first mouse button is not pressed.
+Some software (like OpenOffice Writer) has trouble when the PRIMARY
+selection is requested before the mouse button is released. As a
+workaround, you can run autocutsel with the "-buttonup" option and
+it will only get the selection when the first mouse button is not
+pressed.
diff --git a/system/autocutsel/autocutsel.SlackBuild b/system/autocutsel/autocutsel.SlackBuild
index d9beb0a57f..7122158b93 100644
--- a/system/autocutsel/autocutsel.SlackBuild
+++ b/system/autocutsel/autocutsel.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for autocutsel
 
 # Copyright 2011 Grigorios Bouzakis <email removed>
@@ -22,12 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Now maintained by B. Watson <yalhcru@gmail.com>
+# Now maintained by B. Watson <urchlay@slackware.uk>
+
+# 20210827 bkw: update for v0.10.1, remove INSTALL from package.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=autocutsel
-VERSION=${VERSION:-0.10.0}
+VERSION=${VERSION:-0.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,11 +74,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -91,11 +97,11 @@ for i in $PRGNAM cutsel; do
 done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/autocutsel/autocutsel.info b/system/autocutsel/autocutsel.info
index e795961444..9be0ae3dda 100644
--- a/system/autocutsel/autocutsel.info
+++ b/system/autocutsel/autocutsel.info
@@ -1,10 +1,10 @@
 PRGNAM="autocutsel"
-VERSION="0.10.0"
-HOMEPAGE="http://www.nongnu.org/autocutsel"
-DOWNLOAD="https://github.com/sigmike/autocutsel/releases/download/0.10.0/autocutsel-0.10.0.tar.gz"
-MD5SUM="7d5b96e5f7b79b883d8350f104043366"
+VERSION="0.10.1"
+HOMEPAGE="https://www.nongnu.org/autocutsel"
+DOWNLOAD="https://github.com/sigmike/autocutsel/releases/download/0.10.1/autocutsel-0.10.1.tar.gz"
+MD5SUM="4e891b51745891d3367f085ff84610de"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/autojump/autojump.SlackBuild b/system/autojump/autojump.SlackBuild
index ba2c4d9d93..f87b818b57 100644
--- a/system/autojump/autojump.SlackBuild
+++ b/system/autojump/autojump.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for autojump
 
@@ -23,14 +23,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220408 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - install the python modules in /usr/share/autojump, not /usr/bin.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=autojump
 VERSION=${VERSION:-22.5.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -46,9 +56,9 @@ cd $PRGNAM-release-v$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Adjust man page destdir
 sed -i "s/'share', 'man'/'man'/" install.py
@@ -63,8 +73,13 @@ sed -i "s:/usr/local/:/usr/:g" bin/$PRGNAM.sh
 python install.py --destdir $PKG --prefix 'usr/' \
   --zshshare 'usr/share/zsh/site-functions'
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# 20220408 bkw: get the python modules out of /usr/bin, and
+# fix the main program to look for them in the new location.
+mv $PKG/usr/bin/autojump_*.py $PKG/usr/share/autojump
+sed -i '/^from operator import itemgetter/asys.path.append("/usr/share/autojump")' \
+       $PKG/usr/bin/autojump
+
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
@@ -74,4 +89,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/autojump/autojump.info b/system/autojump/autojump.info
index dcaf89b49a..d9c7ea6679 100644
--- a/system/autojump/autojump.info
+++ b/system/autojump/autojump.info
@@ -1,7 +1,7 @@
 PRGNAM="autojump"
 VERSION="22.5.3"
 HOMEPAGE="https://github.com/wting/autojump"
-DOWNLOAD="https://github.com/wting/autojump/archive/release-v22.5.3.tar.gz"
+DOWNLOAD="https://github.com/wting/autojump/archive/release-v22.5.3/autojump-release-v22.5.3.tar.gz"
 MD5SUM="29f1a7df736814c747645703bf00ce48"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/autoslackpkg/README b/system/autoslackpkg/README
deleted file mode 100644
index b99aa806f8..0000000000
--- a/system/autoslackpkg/README
+++ /dev/null
@@ -1,55 +0,0 @@
-autoslackpkg automates the use of slackpkg. The script expects to be run
-as the root user. It also expects specific modifications to blacklist,
-mkinitrd.conf, efi.conf & lilo.conf.
-
-The script maintains multiple kernels and manages EFI & LILO setups (not
-GRUB yet). The default boot kernel is changed to the most recent kernel.
-In the unlikely event the most recent kernel is not functioning properly
-the system can be rebooted with the previous kernel.
-
-The script has a config file /etc/slackpkg/autoslackpkg.conf that sets
-default variables. These variables can be changed based on unique system
-requirements.
-
-The script requires options and arguments. To see usage help
-run (autoslackpkg) without options or arguments. Usage help also is
-displayed if there is a script option or argument error.
-
-When run with the -h option and a valid argument (autoslackpkg -h
-overview | blacklist | elilo | lilo | mkinitrd) the script provides
-help.
-
-When run with the -m option and a valid argument (autoslackpkg -m dialog
-| batch) the script runs in either dialog mode or batch mode. Dialog
-mode is a hands-on, interactive mode. Batch mode runs without user
-input.
-
-When run with the -s option (autoslackpkg -s update | install-new |
-upgrade-all | clean-system | install-kernel | remove-kernel |
-new-config) the script only runs a specific section of the overall
-script.
-
-The script runs in 2 Phases. If not installing a new kernel then
-autoslackpkg runs both Phase 1 & Phase 2 in succession. If a new kernel
-is installed then only Phase 1 is run & reboot is required. After
-reboot, rerun autoslackpkg then Phase 1 is skipped & only Phase 2 is
-run.
-
-Phase 1 includes:
-
-  1) slackpkg update
-  2) slackpkg install-new
-  3) slackpkg upgrade-all (see blacklist help)
-  4) new kernel download & installation (see blacklist help)
-  5) mkinitrd for new kernel (see mkitrd help)
-  6) EFI system new kernel management (see elilo help)
-  7) LILO system new kernel management (see lilo help)
-
-Phase 2 includes:
-
-  1) slackpkg clean-system
-  2) EFI system old kernel management (see elilo help)
-  3) LILO system old kernel management (see lilo help)
-  4) run updatedb
-  5) slackpkg new-config
-  6) find /etc *.new & *.orig
diff --git a/system/autoslackpkg/autoslackpkg.SlackBuild b/system/autoslackpkg/autoslackpkg.SlackBuild
deleted file mode 100644
index e1b22b7102..0000000000
--- a/system/autoslackpkg/autoslackpkg.SlackBuild
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for autoslackpkg
-
-# Copyright 2019, 2020 Stu Miller, Colorado, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=autoslackpkg
-VERSION=${VERSION:-1.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  CHANGELOG \
-  README \
-  $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/etc/slackpkg
-cp -a \
-  $PRGNAM.conf.new \
-  $PKG/etc/slackpkg/
-
-mkdir -p $PKG/usr/sbin
-cp -a \
-  $PRGNAM \
-  $PKG/usr/sbin/
-
-mkdir -p $PKG/usr/libexec/$PRGNAM
-cp -a \
-  libexec/$PRGNAM/* \
-  $PKG/usr/libexec/$PRGNAM/
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/autoslackpkg/autoslackpkg.info b/system/autoslackpkg/autoslackpkg.info
deleted file mode 100644
index 1539f227e6..0000000000
--- a/system/autoslackpkg/autoslackpkg.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="autoslackpkg"
-VERSION="1.1"
-HOMEPAGE="https://www.go4it2day.com/news/autoslackpkg-1.1.html"
-DOWNLOAD="https://www.go4it2day.com/downloads/autoslackpkg/1.1/autoslackpkg-1.1.tar.gz"
-MD5SUM="02c46c7abf1d532fbba82abb7b73b71c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Stu Miller"
-EMAIL="slackbuilds@go4it2day.com"
diff --git a/system/autoslackpkg/doinst.sh b/system/autoslackpkg/doinst.sh
deleted file mode 100644
index fbcc100866..0000000000
--- a/system/autoslackpkg/doinst.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# doinst.sh for autoslackpkg
-
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/slackpkg/autoslackpkg.conf.new
diff --git a/system/autoslackpkg/slack-desc b/system/autoslackpkg/slack-desc
deleted file mode 100644
index 12e6cf2207..0000000000
--- a/system/autoslackpkg/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-            |-----handy-ruler------------------------------------------------------|
-autoslackpkg: autoslackpkg (automates the use of slackpkg)
-autoslackpkg:
-autoslackpkg: To see autoslackpkg usage run:  autoslackpkg
-autoslackpkg:
-autoslackpkg: Home: https://www.go4it2day.com/news/autoslackpkg-1.1.html
-autoslackpkg:
-autoslackpkg:
-autoslackpkg:
-autoslackpkg:
-autoslackpkg:
-autoslackpkg:
diff --git a/system/avfs/README b/system/avfs/README
index 1f6dfa5cf3..4097c5d76f 100644
--- a/system/avfs/README
+++ b/system/avfs/README
@@ -1,6 +1,6 @@
-AVFS is a system, which enables all programs to look inside archived or
-compressed files, or access remote files without recompiling the programs
-or changing the kernel. At the moment it supports floppies, tar and gzip
-files, zip, bzip2, ar and rar files, ftp sessions, http, webdav, rsh/rcp,
-ssh/scp. Quite a few other handlers are implemented with the Midnight
-Commander's external FS.
+AVFS is a system, which enables all programs to look inside archived
+or compressed files, or access remote files without recompiling the
+programs or changing the kernel. At the moment it supports floppies,
+tar and gzip files, zip, bzip2, ar and rar files, ftp sessions, http,
+webdav, rsh/rcp, ssh/scp. Quite a few other handlers are implemented
+with the Midnight Commander's external FS.
diff --git a/system/avfs/avfs.SlackBuild b/system/avfs/avfs.SlackBuild
index eeacc0b71b..f847d1b15a 100644
--- a/system/avfs/avfs.SlackBuild
+++ b/system/avfs/avfs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for avfs
 
@@ -24,10 +24,13 @@
 
 # Modified by Eugene M., <damagedone at gmx dot com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=avfs
-VERSION=${VERSION:-1.1.3}
+VERSION=${VERSION:-1.1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -96,8 +106,10 @@ cp -a AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README TODO doc/* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/avfs/avfs.info b/system/avfs/avfs.info
index bd4de2c5ad..1d68c7f5d0 100644
--- a/system/avfs/avfs.info
+++ b/system/avfs/avfs.info
@@ -1,8 +1,8 @@
 PRGNAM="avfs"
-VERSION="1.1.3"
+VERSION="1.1.5"
 HOMEPAGE="http://avf.sourceforge.net"
-DOWNLOAD="http://sourceforge.net/projects/avf/files/avfs/1.1.3/avfs-1.1.3.tar.bz2"
-MD5SUM="a2bfa82748c2d3ecb40a5df71ecf136d"
+DOWNLOAD="http://sourceforge.net/projects/avf/files/avfs/1.1.5/avfs-1.1.5.tar.bz2"
+MD5SUM="a0c4dfd62fb896fab9355718544db2db"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="p7zip unrar"
diff --git a/system/b2/Makefile.unix.mak.patch b/system/b2/Makefile.unix.mak.patch
new file mode 100644
index 0000000000..8ef3bf00f2
--- /dev/null
+++ b/system/b2/Makefile.unix.mak.patch
@@ -0,0 +1,11 @@
+--- Makefile.unix.mak.	2023-06-10 11:56:03.000000000 +0100
++++ Makefile.unix.mak	2023-06-21 21:10:15.499776974 +0100
+@@ -52,7 +52,7 @@
+ 	@echo ---------------------------------------------------------------------------
+ 	rm -Rf "$(_FOLDER)"
+ 	mkdir -p "$(_FOLDER)"
+-	(cd "$(_FOLDER)" && cmake -G "$(CMAKE_TYPE)" $(CMAKE_DEFINES) -DCMAKE_BUILD_TYPE=$(BUILD) $(if $(SANITIZER),-DSANITIZE_$(SANITIZER)=On) ../..) || $(if $(SANITIZER),rm -Rf "$(_FOLDER)",false)
++	(cd "$(_FOLDER)" && cmake -G "$(CMAKE_TYPE)" $(CMAKE_DEFINES) -DCMAKE_BUILD_TYPE=$(BUILD) $(if $(SANITIZER),-DSANITIZE_$(SANITIZER)=Off) ../..) || $(if $(SANITIZER),rm -Rf "$(_FOLDER)",false)
+ 
+ .PHONY:buildall
+ buildall:
diff --git a/system/b2/README b/system/b2/README
new file mode 100644
index 0000000000..b245aa0dd0
--- /dev/null
+++ b/system/b2/README
@@ -0,0 +1,4 @@
+b2 is a cross-platform BBC Micro emulator. Use your Windows/Linux PC or
+macOS computer to play your old BBC games or develop new BBC software.
+
+more info at https://github.com/tom-seddon/b2
diff --git a/system/b2/b2.SlackBuild b/system/b2/b2.SlackBuild
new file mode 100644
index 0000000000..fc60e14ed7
--- /dev/null
+++ b/system/b2/b2.SlackBuild
@@ -0,0 +1,126 @@
+#!/bin/bash
+
+# Slackware build script for b2 BBC Micro Emulator
+
+# Copyright 2023 Antonio Leal, Porto Salvo, Oeiras, Portugal
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=b2
+VERSION=${VERSION:-20231011_172305_4bd1939}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+TARBALL=${TARBALL:-b2-20231011-172305-4bd1939}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+
+cd $TMP
+rm -rf $TARBALL
+tar xvfz $CWD/$TARBALL.tar.gz
+cd $TARBALL
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+#Disable sanitizers, build plain old Release
+patch Makefile.unix.mak $CWD/Makefile.unix.mak.patch
+make init
+cd build/r.linux
+ninja
+cd ../..
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+mkdir -p $PKG/opt/b2
+install -Dsv -m 0755 build/r.linux/src/b2/b2 $PKG/opt/b2/b2
+cp -avxu build/r.linux/src/b2/assets $PKG/opt/b2
+
+mkdir -p $PKG/usr/share/pixmaps
+cp $CWD/b2.png $PKG/usr/share/pixmaps
+mkdir -p $PKG/usr/share/applications
+cp $CWD/b2.desktop $PKG/usr/share/applications
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp doc/BeebLink.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp doc/Command-Line.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp doc/File-Association.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp doc/Overview.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp doc/b2_notes.org $PKG/usr/doc/$PRGNAM-$VERSION
+cp doc/other-code-notes.md $PKG/usr/doc/$PRGNAM-$VERSION
+
+# Symlinks
+mkdir -p $PKG/usr/bin/
+( cd $PKG/usr/bin ; rm -rf b2 )
+( cd $PKG/usr/bin ; ln -sf ../../opt/b2/b2 b2 )
+mkdir -p $PKG/opt/
+( cd $PKG/opt/b2 ; rm -rf doc )
+( cd $PKG/opt/b2 ; ln -sf ../../usr/doc/$PRGNAM-$VERSION doc )
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/b2/b2.desktop b/system/b2/b2.desktop
new file mode 100644
index 0000000000..4ba6703d99
--- /dev/null
+++ b/system/b2/b2.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=b2
+Comment=BBC Microcomputer Emulator
+Exec=/opt/b2/b2
+Icon=/usr/share/pixmaps/b2.png
+Terminal=false
+Type=Application
+Categories=System;Emulator;
diff --git a/system/b2/b2.info b/system/b2/b2.info
new file mode 100644
index 0000000000..427c0adc1a
--- /dev/null
+++ b/system/b2/b2.info
@@ -0,0 +1,10 @@
+PRGNAM="b2"
+VERSION="20231011_172305_4bd1939"
+HOMEPAGE="https://github.com/tom-seddon/b2"
+DOWNLOAD="https://github.com/antonioleal/myslackbuilds/raw/main/system/b2/b2-20231011-172305-4bd1939.tar.gz"
+MD5SUM="360acffd1c0a33989ad7f3c1679fe716"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="uuid"
+MAINTAINER="Antonio Leal"
+EMAIL="antonioleal@yahoo.com"
diff --git a/system/b2/b2.png b/system/b2/b2.png
new file mode 100644
index 0000000000..0fba2279ed
--- /dev/null
+++ b/system/b2/b2.png
diff --git a/system/evilvte/doinst.sh b/system/b2/doinst.sh
index aea0f894eb..aea0f894eb 100644
--- a/system/evilvte/doinst.sh
+++ b/system/b2/doinst.sh
diff --git a/system/b2/slack-desc b/system/b2/slack-desc
new file mode 100644
index 0000000000..3282c1cbcf
--- /dev/null
+++ b/system/b2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+  |-----handy-ruler------------------------------------------------------|
+b2: b2 (BBC Microcomputer Emulator)
+b2:
+b2: b2 is a cross-platform BBC Micro emulator. Use your Windows/Linux PC
+b2: or macOS computer to play your old BBC games or develop new BBC
+b2: software.
+b2:
+b2: more info at https://github.com/tom-seddon/b2
+b2:
+b2:
+b2:
+b2:
diff --git a/system/babeltrace/babeltrace.SlackBuild b/system/babeltrace/babeltrace.SlackBuild
index edd22d17b6..760b40e4f1 100644
--- a/system/babeltrace/babeltrace.SlackBuild
+++ b/system/babeltrace/babeltrace.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Babeltrace diagnosis mechanism
 
@@ -23,10 +23,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220404 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - don't install static libraries.
+# - get rid of /usr/share/doc.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=babeltrace
 VERSION=${VERSION:-1.5.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,9 +77,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -79,6 +90,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --enable-python-bindings \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
 make
@@ -87,15 +99,17 @@ make install DESTDIR=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip -9 $PKG/usr/man/man*/*
+rm -rf $PKG/usr/share # 20220404 bkw: nothing here but share/doc
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README ChangeLog CodingStyle LICENSE doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/babeltrace/babeltrace.info b/system/babeltrace/babeltrace.info
index 226e28c920..375983e0d1 100644
--- a/system/babeltrace/babeltrace.info
+++ b/system/babeltrace/babeltrace.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://www.efficios.com/files/babeltrace/babeltrace-1.5.3.tar.bz2"
 MD5SUM="0cec2745ac316649791c43f416d71ea1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
+REQUIRES=""
 MAINTAINER="Marian Marinov"
 EMAIL="mm@yuhu.biz"
diff --git a/system/backasa/backasa.SlackBuild b/system/backasa/backasa.SlackBuild
index 714ed128c1..4e271951d1 100644
--- a/system/backasa/backasa.SlackBuild
+++ b/system/backasa/backasa.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for backasa
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=backasa
 VERSION=${VERSION:-0.9.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -82,4 +92,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/backintime/README b/system/backintime/README
new file mode 100644
index 0000000000..efc6035ccf
--- /dev/null
+++ b/system/backintime/README
@@ -0,0 +1,12 @@
+Back In Time is a simple backup tool for Linux, inspired by
+"flyback project". It provides a command line client 'backintime'
+and a Qt5 GUI 'backintime-qt' both written in Python3.
+
+You only need to specify 3 things:
+
+    where to save snapshots
+    what folders to back up
+    backup frequency (manual, every hour, every day, every month)
+
+The documentation is currently under development in
+https://backintime.readthedocs.org/
diff --git a/system/backintime/backintime.SlackBuild b/system/backintime/backintime.SlackBuild
new file mode 100644
index 0000000000..69ad099c84
--- /dev/null
+++ b/system/backintime/backintime.SlackBuild
@@ -0,0 +1,122 @@
+#!/bin/bash
+
+# SlackBuild script for Back In Time.
+#
+# Copyright 2022,2023 Fabio Bas <ctrlaltca {at} gmail [dot] com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=backintime
+VERSION=${VERSION:-1.4.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Common components
+cd $TMP/$PRGNAM-$VERSION/common
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+  # Fix documentation paths
+  sed -i 's|/share/doc/backintime-common|/doc/'$PRGNAM'-'$VERSION'|g' \
+    $TMP/$PRGNAM-$VERSION/common/Makefile
+  make
+  make install DESTDIR=$PKG
+cd -
+
+# Qt5 components
+cd $TMP/$PRGNAM-$VERSION/qt
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+  # Fix documentation paths
+  sed -i 's|/share/doc/backintime-qt|/doc/'$PRGNAM'-'$VERSION'|g' \
+    $TMP/$PRGNAM-$VERSION/qt/Makefile
+  make
+  make install DESTDIR=$PKG
+cd -
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mv $PKG/usr/share/man/ $PKG/usr
+
+# Add slackware documentation in /usr/share/doc/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README$TAG
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/backintime/backintime.info b/system/backintime/backintime.info
new file mode 100644
index 0000000000..4a2c09afbe
--- /dev/null
+++ b/system/backintime/backintime.info
@@ -0,0 +1,10 @@
+PRGNAM="backintime"
+VERSION="1.4.3"
+HOMEPAGE="https://github.com/bit-team/backintime"
+DOWNLOAD="https://github.com/bit-team/backintime/releases/download/v1.4.3/backintime-1.4.3.tar.gz"
+MD5SUM="421470c6e959f00b6dcbbae6ee08ab05"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Fabio Bas"
+EMAIL="ctrlaltca <at> gmail {dot} com"
diff --git a/system/zuluCrypt/doinst.sh b/system/backintime/doinst.sh
index aea0f894eb..aea0f894eb 100644
--- a/system/zuluCrypt/doinst.sh
+++ b/system/backintime/doinst.sh
diff --git a/system/backintime/slack-desc b/system/backintime/slack-desc
new file mode 100644
index 0000000000..be4be2a4ab
--- /dev/null
+++ b/system/backintime/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+          |-----handy-ruler------------------------------------------------------|
+backintime: backintime (simple backup tool)
+backintime:
+backintime: Back In Time is a simple backup tool for Linux, inspired by
+backintime: "flyback project". It provides a command line client 'backintime'
+backintime: and a Qt5 GUI 'backintime-qt' both written in Python3.
+backintime:
+backintime: You only need to specify 3 things: where to save snapshots, what
+backintime: folders to back up and the backup frequency (manual, every hour,
+backintime: every day, every month)
+backintime:
+backintime: https://github.com/bit-team/backintime
diff --git a/system/bacula-client/README b/system/bacula-client/README
index e614a98aa0..2f92efbc24 100644
--- a/system/bacula-client/README
+++ b/system/bacula-client/README
@@ -1,8 +1,9 @@
 Bacula (Manage backup, recovery) - Client only
 
-Bacula is a set of Open Source, computer programs that permit you (or the
-system administrator) to manage backup, recovery, and verification of computer
-data across a network of computers of different kinds. Bacula is relatively
-easy to use and very efficient, while offering many advanced storage management
-features that make it easy to find and recover lost or damaged files. In
-technical terms, it is an Open Source, network based backup program.
+Bacula is a set of Open Source, computer programs that permit
+you (or the system administrator) to manage backup, recovery,
+and verification of computer data across a network of computers of
+different kinds. Bacula is relatively easy to use and very efficient,
+while offering many advanced storage management features that make it
+easy to find and recover lost or damaged files. In technical terms,
+it is an Open Source, network based backup program.
diff --git a/system/bacula-client/bacula-client.SlackBuild b/system/bacula-client/bacula-client.SlackBuild
index c481a020db..65164da31b 100644
--- a/system/bacula-client/bacula-client.SlackBuild
+++ b/system/bacula-client/bacula-client.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Bacula Client
 
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220323 bkw: Modified by SlackBuilds.org: update for v9.6.7 (needed
+# to fix 32-bit build).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bacula-client
-VERSION=${VERSION:-9.6.3}
+VERSION=${VERSION:-9.6.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=bacula
 
@@ -37,13 +43,17 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -67,9 +77,9 @@ cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -110,9 +120,11 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bacula-client/bacula-client.info b/system/bacula-client/bacula-client.info
index 506b822dd6..5de8e679f4 100644
--- a/system/bacula-client/bacula-client.info
+++ b/system/bacula-client/bacula-client.info
@@ -1,8 +1,8 @@
 PRGNAM="bacula-client"
-VERSION="9.6.3"
+VERSION="9.6.7"
 HOMEPAGE="http://www.bacula.org"
-DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-9.6.3.tar.gz"
-MD5SUM="6d64bc27de773ee0e0ca1d836cbe4008"
+DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-9.6.7.tar.gz"
+MD5SUM="2fa01ba7b0bb171535f6510b96ffd22b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/bacula/README b/system/bacula/README
index dc0da7f130..2c787f2fcb 100644
--- a/system/bacula/README
+++ b/system/bacula/README
@@ -1,18 +1,22 @@
 Bacula (Manage backup, recovery) - Client and server
 
-Bacula is a set of Open Source, computer programs that permit you (or the
-system administrator) to manage backup, recovery, and verification of computer
-data across a network of computers of different kinds. Bacula is relatively
-easy to use and very efficient, while offering many advanced storage management
-features that make it easy to find and recover lost or damaged files. In
-technical terms, it is an Open Source, network based backup program.
+Bacula is a set of Open Source, computer programs that permit
+you (or the system administrator) to manage backup, recovery,
+and verification of computer data across a network of computers of
+different kinds. Bacula is relatively easy to use and very efficient,
+while offering many advanced storage management features that make it
+easy to find and recover lost or damaged files. In technical terms,
+it is an Open Source, network based backup program.
 
 This script has a few build options:
 
-  DATABASE=auto|mysql|postgresql|sqlite - by default MySQL/MariaDB is selected
+  DATABASE=auto|mysql|postgresql|sqlite 
+    By default MySQL/MariaDB is selected
   OPT_PREFIX=yes|no - install into /opt/bacula (disabled by default)
   BAT=yes|no - build with GUI support (disabled by default)
-  EMAIL=root@localhost - destination for job announcements and core dumps
+  EMAIL=root@localhost - destination for job announcements and
+                         core dumps
   SMTPHOST=localhost - expects smtp daemon running on localhost
 
-More information about post-install/upgrading can be found in README.SLACKWARE
+More information about post-install/upgrading can be found in
+README.SLACKWARE
diff --git a/system/bacula/bacula.SlackBuild b/system/bacula/bacula.SlackBuild
index 30b0059daa..4b47e6a6ae 100644
--- a/system/bacula/bacula.SlackBuild
+++ b/system/bacula/bacula.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Bacula
 
@@ -22,10 +22,18 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220301 bkw: Modified by SlackBuilds.org:
+# - updated for v9.6.7, to fix 32-bit builds. I didn't update to the 11.x
+#   series, someone who actually uses & can test bacula will have to
+#   decide to do that.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bacula
-VERSION=${VERSION:-9.6.3}
+VERSION=${VERSION:-9.6.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -109,7 +121,7 @@ cat << EOF
 
 EOF
 
-  exit
+  exit 1
 elif ! getent group bacula 2>/dev/null; then
 
 cat << EOF
@@ -120,7 +132,7 @@ cat << EOF
 
 EOF
 
-  exit
+  exit 1
 fi
 
 rm -rf $PKG
@@ -132,9 +144,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -163,7 +175,7 @@ CXXFLAGS="$SLKCFLAGS" \
   $ENABLE_BAT \
   --build=$ARCH-slackware-linux
 
-make
+make V=1
 make install DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -205,10 +217,12 @@ cp -a \
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 sed -i "s#%sysconfdir%#$(echo "$SYSCONFDIR" | sed 's:^/*::')#g" $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bacula/bacula.info b/system/bacula/bacula.info
index 8ecb0e383d..b1be363101 100644
--- a/system/bacula/bacula.info
+++ b/system/bacula/bacula.info
@@ -1,8 +1,8 @@
 PRGNAM="bacula"
-VERSION="9.6.3"
+VERSION="9.6.7"
 HOMEPAGE="http://www.bacula.org"
-DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-9.6.3.tar.gz"
-MD5SUM="6d64bc27de773ee0e0ca1d836cbe4008"
+DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-9.6.7.tar.gz"
+MD5SUM="2fa01ba7b0bb171535f6510b96ffd22b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/bareos-client/README b/system/bareos-client/README
deleted file mode 100644
index c6edc8cbcd..0000000000
--- a/system/bareos-client/README
+++ /dev/null
@@ -1,10 +0,0 @@
-Bareos (Manage backup, recovery) - Client only
-
-Bareos is a set of computer programs that permit you (or the system admin) to
-manage backup, recovery, and verification of computer data across a network
-of computers of different kinds. In technical terms, it is a network
-Client/Server based backup program. Bareos is relatively easy to use and
-efficient, while offering many advanced storage management features that make
-it easy to find and recover lost or damaged files. Due to its modular design,
-Bareos is scalable from small single computer systems to systems consisting
-of hundreds of computers located over a large network.
diff --git a/system/bareos-client/bareos-client.SlackBuild b/system/bareos-client/bareos-client.SlackBuild
deleted file mode 100644
index 4295bf61d1..0000000000
--- a/system/bareos-client/bareos-client.SlackBuild
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for bareos-client
-# Copyright 2016 Henry Jensen Germany
-# based on Slackware build script for bacula-client
-# Copyright 2010, 2012, 2013  Mario Preksavec, Zagreb, HR
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=bareos-client
-VERSION=${VERSION:-15.2.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=bareos-Release
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-working-dir=/var/lib/bareos \
-  --with-scriptdir=/var/lib/bareos/scripts \
-  --with-logdir=/var/log/bareos \
-  --with-plugindir=/var/lib/bareos/plugins \
-  --enable-smartalloc \
-  --enable-client-only \
-  --enable-acl \
-  --enable-xattr \
-  --with-fd-user=root \
-  --with-fd-group=root \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Copy init script
-install -D -m0755 -oroot -groot scripts/bareos $PKG/etc/rc.d/rc.bareos.new
-
-# Append .new to config files
-for i in $PKG/etc/bareos/*.conf ; do mv $i $i.new ; done
-
-# Remove useless tmp dir
-rmdir $PKG/tmp
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AGPL-3.0.txt AUTHORS LICENSE README.* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/bareos-client/bareos-client.info b/system/bareos-client/bareos-client.info
deleted file mode 100644
index ecbb8f5528..0000000000
--- a/system/bareos-client/bareos-client.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="bareos-client"
-VERSION="15.2.3"
-HOMEPAGE="http://www.bareos.org"
-DOWNLOAD="https://github.com/bareos/bareos/archive/Release/15.2.3.tar.gz"
-MD5SUM="b15872bcda22363ea9a87be7a2e3201a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Henry Jensen"
-EMAIL="hjensen@connochaetos.org"
diff --git a/system/bareos-client/doinst.sh b/system/bareos-client/doinst.sh
deleted file mode 100644
index cd8176a934..0000000000
--- a/system/bareos-client/doinst.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-preserve_perms etc/rc.d/rc.bareos.new
-config etc/bareos/bareos-fd.conf.new
-config etc/bareos/bconsole.conf.new
diff --git a/system/bareos-client/slack-desc b/system/bareos-client/slack-desc
deleted file mode 100644
index 5cc6b918e3..0000000000
--- a/system/bareos-client/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-             |-----handy-ruler------------------------------------------------------|
-bareos-client: bareos-client (managed backup and recovery - Client only)
-bareos-client:
-bareos-client: bareos is a set of computer programs that permit you (or the system
-bareos-client: administrator) to manage backup, recovery, and verification of
-bareos-client: computer data across a network of computers of different kinds.
-bareos-client:
-bareos-client: Homepage: http://www.bareos.org
-bareos-client:
-bareos-client:
-bareos-client:
-bareos-client:
diff --git a/system/bareos/README b/system/bareos/README
deleted file mode 100644
index 0ab09857cb..0000000000
--- a/system/bareos/README
+++ /dev/null
@@ -1,34 +0,0 @@
-Bareos (Manage backup, recovery) - Client and server
-
-Bareos is a set of computer programs that permit you (or the system admin) to
-manage backup, recovery, and verification of computer data across a network
-of computers of different kinds. In technical terms, it is a network
-Client/Server based backup program. Bareos is relatively easy to use and
-efficient, while offering many advanced storage management features that make
-it easy to find and recover lost or damaged files. Due to its modular design,
-Bareos is scalable from small single computer systems to systems consisting
-of hundreds of computers located over a large network.
-
-This script comes with a few options that can be set at build time, one of
-which is DATABASE. Supported databases include postgresql, mysql and sqlite3.
-By default mysql is selected, to disable or select another database, run:
-
-  DATABASE="" ./bareos.SlackBuild
-
-Some say that having everything under /opt/bareos can be more backup friendly
-for disaster recovery situations, and since the official documentation also
-mentions this prefix in quite a few places, running the script with:
-
-  OPT_PREFIX=yes ./bareos.SlackBuild
-
-will put (almost) everything into /opt/bareos directory.
-
-Another option worth mentioning is Bat, which by default comes disabled, and
-if enabled with BAT=yes variable, creates a package with desktop entries.
-Additionally, smtp delivery agent is assumed running on localhost, and job
-announcements and core dumps are sent to root@localhost email address. Both
-can be changed with EMAIL and SMTPHOST variables.
-
-For more information on upgrading from previous version and from Bacula 
-see README.SLACKWARE that came with this package (which is also installed 
-with the documentation).
diff --git a/system/bareos/README.SLACKWARE b/system/bareos/README.SLACKWARE
deleted file mode 100644
index 8024adca15..0000000000
--- a/system/bareos/README.SLACKWARE
+++ /dev/null
@@ -1,21 +0,0 @@
-Bareos is a fork from the nackup project Bacula. For the reasons why the 
-fork was made see https://www.bareos.org/en/faq/why_fork.html
-
-It is posible to migrate from Bacula 5.x to Bareos. For the migration 
-of the database there are SQL scripts located at 
-/var/lib/bareos/scripts/ddl/updates
-
-You can check the VersionID of your bacula database with the command
-
-  SELECT VersionID from Version;
-
-Bacula 5.2 has the VersionID 14. To upgrade to Bareois 15.2.x apply the 
-scripts 
-
- *.14_2001.sql
- *.2001_2002.sql
- *.2002_2003.sql
- *.2003_2004.sql
-
-top your bacula database. Rename the user "bacula" to "baeros" and adjust 
-your config files accordingly.
\ No newline at end of file
diff --git a/system/bareos/bareos.SlackBuild b/system/bareos/bareos.SlackBuild
deleted file mode 100644
index 4bfbcd5eaf..0000000000
--- a/system/bareos/bareos.SlackBuild
+++ /dev/null
@@ -1,220 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for bareos
-# Copyright 2016 Henry Jensen Germany
-# based on Slackware build script for bacula
-# Copyright 2010, 2012, 2013  Mario Preksavec, Zagreb, HR
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=bareos
-VERSION=${VERSION:-15.2.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-# E-mail address used for job announcements and core dumps
-EMAIL=${EMAIL:-root@localhost}
-
-# SMTP host for e-mail delivery
-SMTPHOST=${SMTPHOST:-localhost}
-
-# Database support, build with mysql on by default
-DATABASE=${DATABASE:-mysql}
-case "$DATABASE" in
-  postgresql) WITH_DATABASE="--with-postgresql" ;;
-       mysql) WITH_DATABASE="--with-mysql" ;;
-      sqlite) WITH_DATABASE="--with-sqlite3" ;;
-           *) WITH_DATABASE="" ;;
-esac
-
-# BAT support, includes a desktop icon
-BAT=${BAT:-no}
-case "$BAT" in
-  yes) ENABLE_BAT="--enable-bat" ;;
-    *) ENABLE_BAT="" ;;
-esac
-
-# User might want a portable install
-OPT_PREFIX=${OPT_PREFIX:-no}
-case "$OPT_PREFIX" in
-  no) PREFIX=/usr
-      LIBDIR=$PREFIX/lib${LIBDIRSUFFIX}
-      SYSCONFDIR=/etc
-      LOCALSTATEDIR=/var
-      SBINDIR=$PREFIX/sbin
-      VARIABLEDATA=$LOCALSTATEDIR/bareos
-   ;;
-   *) PREFIX=/opt/bareos
-      LIBDIR=$PREFIX/lib
-      SYSCONFDIR=$PREFIX/etc
-      SBINDIR=$PREFIX/bin
-      LOCALSTATEDIR=$PREFIX/var
-      VARIABLEDATA=$PREFIX
-   ;;
-esac
-
-set -e
-
-# Bail if user or group isn't valid on your system
-if ! grep ^bareos: /etc/passwd 2>&1 > /dev/null; then
-
-cat << EOF
-
-  You must have a bareos user to run this script
-
-  # groupadd -g 328 bareos
-  # useradd -u 328 -d /dev/null -s /bin/false -g bareos bareos
-
-EOF
-
-  exit 1
-elif ! grep ^bareos: /etc/group 2>&1 > /dev/null; then
-
-cat << EOF
-
-  You must have a bareos group to run this script
-
-  # groupadd -g 328 bareos
-
-EOF
-
-  exit 1
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-Release-$VERSION
-tar xvf $CWD/$PRGNAM-Release-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
-cd $PRGNAM-Release-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=$PREFIX \
-  --sbindir=$SBINDIR \
-  --libdir=$LIBDIR \
-  --sysconfdir=$SYSCONFDIR \
-  --localstatedir=$LOCALSTATEDIR \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-working-dir=/var/lib/bareos \
-  --with-pid-dir=/var/lib/bareos \
-  --with-bsrdir=/var/lib/bareos \
-  --with-scriptdir=/var/lib/bareos/scripts \
-  --with-plugindir=/var/lib/bareos/plugins \
-  --with-logdir=/var/log/bareos \
-  --with-dump-email=$EMAIL \
-  --with-job-email=$EMAIL \
-  --with-smtp-host=$SMTPHOST \
-  --enable-smartalloc \
-  --enable-acl \
-  --enable-xattr \
-  --disable-readline \
-  --with-dir-group=bareos \
-  --with-dir-user=bareos \
-  --with-sd-group=bareos \
-  --with-sd-user=bareos \
-  --with-fd-user=root \
-  --with-fd-group=root \
-  --with-openssl \
-  $WITH_DATABASE \
-  $ENABLE_BAT \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Copy logrotate script, adds bareos user
-mkdir -p $PKG/etc/logrotate.d
-sed '/^\/.*{$/ s#$#\n    su bareos bareos#' scripts/logrotate \
-  > $PKG/etc/logrotate.d/bareos.new
-
-# Copy init script
-install -D -m0755 -oroot -groot scripts/bareos $PKG/etc/rc.d/rc.bareos.new
-
-# Append .new to config files
-for i in $PKG/$SYSCONFDIR/bareos/*.conf ; do mv $i $i.new ; done
-
-# More BAT GUI stuff
-case "$BAT" in
-  yes) install -D -m0644 -oroot -groot $CWD/bareos-bat.desktop \
-         $PKG/usr/share/applications/bareos-bat.desktop
-       install -D -m0644 -oroot -groot $CWD/bareos.png \
-         $PKG/usr/share/icons/hicolor/64x64/apps/bareos.png
-       sed -i "s#%sbindir%#$SBINDIR#" \
-         $PKG/usr/share/applications/bareos-bat.desktop
-    ;;
-esac
-
-# Remove useless tmp dir
-rmdir $PKG/tmp
-
-# Fix some permissions
-chown -R bareos:bareos $PKG/etc/bareos $PKG/usr/sbin/* $PKG/var/log/bareos \
-  $PKG/var/lib/bareos/{plugins,scripts}
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AGPL-3.0.txt AUTHORS LICENSE README.* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-sed -i "s#%sysconfdir%#$(echo "$SYSCONFDIR" | sed 's:^/*::')#g" $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/bareos/bareos.info b/system/bareos/bareos.info
deleted file mode 100644
index f8cc6f48ba..0000000000
--- a/system/bareos/bareos.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="bareos"
-VERSION="15.2.3"
-HOMEPAGE="http://www.bareos.org"
-DOWNLOAD="https://github.com/bareos/bareos/archive/Release/15.2.3.tar.gz"
-MD5SUM="b15872bcda22363ea9a87be7a2e3201a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Henry Jensen"
-EMAIL="hjensen@connochaetos.org"
diff --git a/system/bareos/bareos.png b/system/bareos/bareos.png
deleted file mode 100644
index 4138bb0867..0000000000
--- a/system/bareos/bareos.png
+++ /dev/null
diff --git a/system/bareos/doinst.sh b/system/bareos/doinst.sh
deleted file mode 100644
index b97f697e52..0000000000
--- a/system/bareos/doinst.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-preserve_perms etc/rc.d/rc.bareos.new
-config %sysconfdir%/bareos/bareos-dir.conf.new
-config %sysconfdir%/bareos/bareos-fd.conf.new
-config %sysconfdir%/bareos/bareos-sd.conf.new
-config %sysconfdir%/bareos/bconsole.conf.new
-config %sysconfdir%/bareos/mtx-changer.conf.new
-config etc/logrotate.d/bareos.new
diff --git a/system/bareos/slack-desc b/system/bareos/slack-desc
deleted file mode 100644
index 20c7210a22..0000000000
--- a/system/bareos/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-      |-----handy-ruler------------------------------------------------------|
-bareos: bareos (managed backup and recovery)
-bareos:
-bareos: bareos is a set of computer programs that permit you (or the system
-bareos: administrator) to manage backup, recovery, and verification of
-bareos: computer data across a network of computers of different kinds.
-bareos:
-bareos: Homepage: http://www.bareos.org
-bareos:
-bareos:
-bareos:
-bareos:
diff --git a/system/barman/barman.SlackBuild b/system/barman/barman.SlackBuild
index 6b3fde3f7a..a20736d08d 100644
--- a/system/barman/barman.SlackBuild
+++ b/system/barman/barman.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for barman
 
-# Copyright 2014-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2023  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=barman
-VERSION=${VERSION:-2.10}
+VERSION=${VERSION:-3.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -80,7 +90,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog LICENSE NEWS README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENSE NEWS README.rst doc/*.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -88,4 +98,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/barman/barman.info b/system/barman/barman.info
index 03588e0ab4..429757bede 100644
--- a/system/barman/barman.info
+++ b/system/barman/barman.info
@@ -1,10 +1,10 @@
 PRGNAM="barman"
-VERSION="2.10"
+VERSION="3.9.0"
 HOMEPAGE="http://www.pgbarman.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/cc/fb/dca92b36ca6c77da2e8d69382666069504ce6d9ec846bb81a0f81fc9f0ce/barman-2.10.tar.gz"
-MD5SUM="6ae19fc6cd493b296f7b8514992440d9"
+DOWNLOAD="https://files.pythonhosted.org/packages/1c/b3/73a31f123ec38998a5ed69ff3d3b654ed0943733b3b704a42b5efe36e3c1/barman-3.9.0.tar.gz"
+MD5SUM="8922653409dc6c0716c120c57fbc7981"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="psycopg2 argh python-dateutil argcomplete"
+REQUIRES="python3-psycopg2 python3-dateutil python3-argcomplete"
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/system/bat/README b/system/bat/README
index 40a04228e8..caedaf1c7b 100644
--- a/system/bat/README
+++ b/system/bat/README
@@ -1 +1,15 @@
 bat is a cat clone with syntax highlighting and Git integration.
+
+bat prints the syntax-highlighted content of a collection of FILEs to
+the terminal. If no FILE is specified, or when FILE is '-', it reads
+from standard input.
+
+bat supports a large number of programming and markup languages. It also
+communicates with git(1) to show modifications with respect to the git
+index. bat automatically pipes its output through a pager (by default:
+less).
+
+Whenever the output of bat goes to a non-interactive terminal, i.e. when
+the output is piped into another process or into a file, bat will act as
+a drop-in replacement for cat(1) and fall back to printing the plain
+file contents.
diff --git a/system/bat/bat.SlackBuild b/system/bat/bat.SlackBuild
index 93163b0e74..347ed9e49c 100644
--- a/system/bat/bat.SlackBuild
+++ b/system/bat/bat.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bat
 
 # Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2021-2024 Erich Ritz, Jenks, Oklahoma, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bat
-VERSION=${VERSION:-0.17.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.24.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -41,7 +45,11 @@ if [ -z "$ARCH" ]; then
   fi
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -77,13 +85,13 @@ cd $PRGNAM-$VERSION
 # configuration tells cargo to use the configured directory
 # for dependencies intead of downloading from crates.io
 mkdir .cargo
-cat << EOF >> .cargo/config
+cat << EOF >> .cargo/config.toml
+[source]
 [source.crates-io]
-registry = 'https://github.com/rust-lang/crates.io-index'
-replace-with = 'vendored-sources'
+replace-with = "vendored-sources"
 
 [source.vendored-sources]
-directory = '$(pwd)/vendor'
+directory = "vendor"
 EOF
 
 # deps and versions come from Cargo.lock
@@ -91,15 +99,31 @@ mkdir vendor
 (
   cd vendor
 
-  grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
-    sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
-    awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \
-    grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do
-
+  grep -h -A 4 "\[\[package\]\]" \
+      $(find "../" -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
+      sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
+      awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4, $5 }' | \
+      sed 's/"//g;s/name=//;s/ version=/=/' | \
+      grep " source=" | \
+      sed 's/ dependencies=.*$//' | \
+      sed 's/ source=[^ ]*//' | \
+      sed 's/ checksum=/=/' | \
+      sort -u | \
+      while read -r dep ; do
+
+    cksum="$(printf "%s\n" "$dep" | cut -d= -f3)"
     ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
     dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
 
-    tar xvf $CWD/$dep-$ver.crate
+    CRATE_FILE=$CWD/$dep-$ver.crate
+
+    if [ -z "$cksum" ] ; then
+      mkdir $dep-$ver
+      tar xvf $CRATE_FILE -C $dep-$ver --strip-components=1
+      cksum="null"
+    else
+      tar xvf $CRATE_FILE
+    fi
 
     touch $dep-$ver/.cargo-ok
 
@@ -114,12 +138,10 @@ mkdir vendor
       ) | sed '$ s/,$//'
 
       printf "    },\n"
-      printf '    "package": "'
-
-      sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
+      printf '    "package": "%s"'  "$cksum"
 
       printf "}\n"
-    } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json
+    } | python3 -c "import sys, json; data = sys.stdin.read(); print (json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : ')))" > $dep-$ver/.cargo-checksum.json
   done
 )
 
@@ -130,6 +152,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
+CARGO_HOME=.cargo \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 cargo build --offline --release $CARGOTARGET
@@ -138,12 +168,22 @@ mkdir -p $PKG/usr/bin/
 
 find target -name $PRGNAM -exec install -m 755 {} $PKG/usr/bin/$PRGNAM \;
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+mkdir -p $PKG/usr/share/bash-completion/completions
+find target -name $PRGNAM.bash -exec install -m 644 {} $PKG/usr/share/bash-completion/completions/$PRGNAM \;
+
+mkdir -p $PKG/usr/share/zsh/site-functions
+find target -name $PRGNAM.zsh -exec install -m 644 {} $PKG/usr/share/zsh/site-functions/_$PRGNAM \;
+
+mkdir -p $PKG/usr/share/fish/vendor_completions.d
+find target -name $PRGNAM.fish -exec install -m 644 {} $PKG/usr/share/fish/vendor_completions.d/$PRGNAM.fish \;
+
+mkdir -p $PKG/usr/man/man1
+find target -name $PRGNAM.1 -exec install -m 644 {} $PKG/usr/man/man1/$PRGNAM.1 \;
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a -r \
-  LICENSE-APACHE LICENSE-MIT README.md \
+  LICENSE-APACHE LICENSE-MIT README.md CHANGELOG.md CONTRIBUTING.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -151,4 +191,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bat/bat.info b/system/bat/bat.info
index 16d5ad72c4..f2ab5ed64a 100644
--- a/system/bat/bat.info
+++ b/system/bat/bat.info
@@ -1,302 +1,370 @@
 PRGNAM="bat"
-VERSION="0.17.1"
+VERSION="0.24.0"
 HOMEPAGE="https://github.com/sharkdp/bat"
-DOWNLOAD="https://github.com/sharkdp/bat/archive/v0.17.1/bat-0.17.1.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/adler/adler-0.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_colours/ansi_colours-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.12.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayref/arrayref-0.3.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/assert_cmd/assert_cmd-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.12.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bat/bat-0.17.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bincode/bincode-1.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bit-set/bit-set-0.5.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bit-vec/bit-vec-0.6.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/blake2b_simd/blake2b_simd-0.5.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/block-buffer/block-buffer-0.7.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/block-padding/block-padding-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bstr/bstr-0.2.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/byte-tools/byte-tools-0.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.60.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.19.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/console/console-0.13.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/constant_time_eq/constant_time_eq-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/content_inspector/content_inspector-0.2.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crc32fast/crc32fast-1.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/difference/difference-2.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/digest/digest-0.8.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs/dirs-3.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-sys/dirs-sys-0.3.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/doc-comment/doc-comment-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dtoa/dtoa-0.4.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/encode_unicode/encode_unicode-0.3.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding/encoding-0.2.33.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding-index-japanese/encoding-index-japanese-1.20141219.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding-index-korean/encoding-index-korean-1.20141219.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding-index-simpchinese/encoding-index-simpchinese-1.20141219.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding-index-singlebyte/encoding-index-singlebyte-1.20141219.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding-index-tradchinese/encoding-index-tradchinese-1.20141219.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding_index_tests/encoding_index_tests-0.1.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/error-chain/error-chain-0.12.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fake-simd/fake-simd-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fancy-regex/fancy-regex-0.3.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/flate2/flate2-1.0.18.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/float-cmp/float-cmp-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-cprng/fuchsia-cprng-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/generic-array/generic-array-0.12.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.15.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/git2/git2-0.13.12.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/glob/glob-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/globset/globset-0.4.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hashbrown/hashbrown-0.9.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.16.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/idna/idna-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/indexmap/indexmap-1.6.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/jobserver/jobserver-0.1.21.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazycell/lazycell-1.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.78.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libgit2-sys/libgit2-sys-0.12.14+1.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/line-wrap/line-wrap-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/linked-hash-map/linked-hash-map-0.5.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/maplit/maplit-1.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/matches/matches-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide/miniz_oxide-0.4.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/normalize-line-endings/normalize-line-endings-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.43.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.12.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/onig/onig-6.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/onig_sys/onig_sys-69.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/opaque-debug/opaque-debug-0.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/path_abs/path_abs-0.5.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/percent-encoding/percent-encoding-2.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pest/pest-2.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pest_derive/pest_derive-2.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pest_generator/pest_generator-2.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pest_meta/pest_meta-2.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.18.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/plist/plist-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates/predicates-1.0.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates-core/predicates-core-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates-tree/predicates-tree-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.24.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.4.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.4.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rdrand/rdrand-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.57.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.3.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.3.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.18.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rust-argon2/rust-argon2-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/safemem/safemem-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/semver/semver-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/semver-parser/semver-parser-0.10.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.117.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.117.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.58.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_yaml/serde_yaml-0.8.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/sha-1/sha-1-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/shell-words/shell-words-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/std_prelude/std_prelude-0.2.12.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.42.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syntect/syntect-4.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tempdir/tempdir-0.3.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/term_size/term_size-0.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/terminal_size/terminal_size-0.1.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tinyvec/tinyvec-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/treeline/treeline-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/typenum/typenum-1.12.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ucd-trie/ucd-trie-0.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-bidi/unicode-bidi-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-2.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wait-timeout/wait-timeout-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wild/wild-2.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/xml-rs/xml-rs-0.8.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/yaml-rust/yaml-rust-0.4.4.crate"
-MD5SUM="13cfeed35ce6575b70fa6bc38a3e9b22 \
-        c9d0c8f38c6686e47c29fe9b409c25c2 \
-        837ec91351db79aee59d6c96111460b0 \
-        4b7bc58614d5e591a09f1d43fce506d6 \
-        294a49d3c53865fa7ac5d0ce2f5d5735 \
-        f44e8d1d2e61974b268852797530ea41 \
-        6ff474dd60c839a9c788844b7a42c72c \
-        38a5278571eefda86428a8ebfc1cedc2 \
-        57d3fb06fb030f614a8cb6847cf3643d \
-        142cb4b9a653e56e56311f0c883b8582 \
-        c6443ec8d007c729ba5482008d0c864d \
-        600137b12b6b717eec0f376bc6680540 \
-        a49d8cc975bd24014bedb423eee02e7d \
-        de348f8664b16740eb8d438f9c2fb8a7 \
-        8f8acc3c1caff2043085a0cc28a92757 \
-        90ba73709b69e02ca4e8a6fad0fb8c9d \
-        6799c26a7eacaf8e58d3e45c6c5add89 \
-        085f6f44e54f62691bf3cf3365f5544a \
-        a885637c56c780044d778f18420687cc \
-        95414d4f9c612bbe8a061dd2ff0bc519 \
-        d25e25d08adce75c63f3969191141f28 \
-        4bd3c3b61fe602e6078615a491e5050a \
-        e502e6c6b0dca9c1ae2d99e92b26f645 \
-        61b90a50085850bba25b409edff17c06 \
-        882dbbc613a93f64c3709b0a2bd0d6dc \
-        1581b390d17f6e73a43ffc8a7b009e57 \
-        bc79e0eb364df515a33755ac9a581cfd \
-        9b908d3bfedb3231cab0d3ce7f387669 \
-        ec9751a4c0d35e7313e52ddb7147376b \
+DOWNLOAD="https://github.com/sharkdp/bat/archive/v0.24.0/bat-0.24.0.tar.gz \
+          https://static.crates.io/crates/adler/adler-1.0.2.crate \
+          https://static.crates.io/crates/aho-corasick/aho-corasick-0.7.19.crate \
+          https://static.crates.io/crates/aho-corasick/aho-corasick-1.0.1.crate \
+          https://static.crates.io/crates/ansi_colours/ansi_colours-1.2.1.crate \
+          https://static.crates.io/crates/anstream/anstream-0.6.4.crate \
+          https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.0.crate \
+          https://static.crates.io/crates/anstyle-query/anstyle-query-1.0.0.crate \
+          https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-3.0.1.crate \
+          https://static.crates.io/crates/anstyle/anstyle-0.3.5.crate \
+          https://static.crates.io/crates/anstyle/anstyle-1.0.0.crate \
+          https://static.crates.io/crates/assert_cmd/assert_cmd-2.0.10.crate \
+          https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \
+          https://static.crates.io/crates/base64/base64-0.21.0.crate \
+          https://static.crates.io/crates/bincode/bincode-1.3.3.crate \
+          https://static.crates.io/crates/bit-set/bit-set-0.5.3.crate \
+          https://static.crates.io/crates/bit-vec/bit-vec-0.6.3.crate \
+          https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \
+          https://static.crates.io/crates/bitflags/bitflags-2.4.0.crate \
+          https://static.crates.io/crates/bstr/bstr-1.6.0.crate \
+          https://static.crates.io/crates/bugreport/bugreport-0.5.0.crate \
+          https://static.crates.io/crates/bytemuck/bytemuck-1.12.1.crate \
+          https://static.crates.io/crates/bytesize/bytesize-1.3.0.crate \
+          https://static.crates.io/crates/cc/cc-1.0.73.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://static.crates.io/crates/clap/clap-4.4.6.crate \
+          https://static.crates.io/crates/clap_builder/clap_builder-4.4.6.crate \
+          https://static.crates.io/crates/clap_lex/clap_lex-0.5.0.crate \
+          https://static.crates.io/crates/clircle/clircle-0.4.0.crate \
+          https://static.crates.io/crates/colorchoice/colorchoice-1.0.0.crate \
+          https://static.crates.io/crates/console/console-0.15.5.crate \
+          https://static.crates.io/crates/content_inspector/content_inspector-0.2.4.crate \
+          https://static.crates.io/crates/crc32fast/crc32fast-1.3.2.crate \
+          https://static.crates.io/crates/dashmap/dashmap-5.4.0.crate \
+          https://static.crates.io/crates/difflib/difflib-0.4.0.crate \
+          https://static.crates.io/crates/dissimilar/dissimilar-1.0.5.crate \
+          https://static.crates.io/crates/doc-comment/doc-comment-0.3.3.crate \
+          https://static.crates.io/crates/dunce/dunce-1.0.3.crate \
+          https://static.crates.io/crates/either/either-1.8.0.crate \
+          https://static.crates.io/crates/encode_unicode/encode_unicode-0.3.6.crate \
+          https://static.crates.io/crates/encoding_rs/encoding_rs-0.8.33.crate \
+          https://static.crates.io/crates/equivalent/equivalent-1.0.1.crate \
+          https://static.crates.io/crates/errno-dragonfly/errno-dragonfly-0.1.2.crate \
+          https://static.crates.io/crates/errno/errno-0.3.3.crate \
+          https://static.crates.io/crates/etcetera/etcetera-0.8.0.crate \
+          https://static.crates.io/crates/expect-test/expect-test-1.4.1.crate \
+          https://static.crates.io/crates/fancy-regex/fancy-regex-0.7.1.crate \
+          https://static.crates.io/crates/fastrand/fastrand-2.0.0.crate \
+          https://static.crates.io/crates/flate2/flate2-1.0.27.crate \
+          https://static.crates.io/crates/float-cmp/float-cmp-0.9.0.crate \
+          https://static.crates.io/crates/fnv/fnv-1.0.7.crate \
+          https://static.crates.io/crates/form_urlencoded/form_urlencoded-1.1.0.crate \
+          https://static.crates.io/crates/fsio/fsio-0.4.0.crate \
+          https://static.crates.io/crates/getrandom/getrandom-0.2.7.crate \
+          https://static.crates.io/crates/git-version-macro/git-version-macro-0.3.5.crate \
+          https://static.crates.io/crates/git-version/git-version-0.3.5.crate \
+          https://static.crates.io/crates/git2/git2-0.18.0.crate \
+          https://static.crates.io/crates/glob/glob-0.3.0.crate \
+          https://static.crates.io/crates/globset/globset-0.4.10.crate \
+          https://static.crates.io/crates/grep-cli/grep-cli-0.1.9.crate \
+          https://static.crates.io/crates/hashbrown/hashbrown-0.12.3.crate \
+          https://static.crates.io/crates/hashbrown/hashbrown-0.14.1.crate \
+          https://static.crates.io/crates/home/home-0.5.5.crate \
+          https://static.crates.io/crates/idna/idna-0.3.0.crate \
+          https://static.crates.io/crates/indexmap/indexmap-1.9.1.crate \
+          https://static.crates.io/crates/indexmap/indexmap-2.0.2.crate \
+          https://static.crates.io/crates/itertools/itertools-0.10.5.crate \
+          https://static.crates.io/crates/itoa/itoa-1.0.3.crate \
+          https://static.crates.io/crates/jobserver/jobserver-0.1.25.crate \
+          https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \
+          https://static.crates.io/crates/libc/libc-0.2.147.crate \
+          https://static.crates.io/crates/libgit2-sys/libgit2-sys-0.16.1+1.7.1.crate \
+          https://static.crates.io/crates/libz-sys/libz-sys-1.1.8.crate \
+          https://static.crates.io/crates/line-wrap/line-wrap-0.1.1.crate \
+          https://static.crates.io/crates/linked-hash-map/linked-hash-map-0.5.6.crate \
+          https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.5.crate \
+          https://static.crates.io/crates/lock_api/lock_api-0.4.9.crate \
+          https://static.crates.io/crates/log/log-0.4.17.crate \
+          https://static.crates.io/crates/memchr/memchr-2.5.0.crate \
+          https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.7.1.crate \
+          https://static.crates.io/crates/nix/nix-0.26.2.crate \
+          https://static.crates.io/crates/normalize-line-endings/normalize-line-endings-0.3.0.crate \
+          https://static.crates.io/crates/nu-ansi-term/nu-ansi-term-0.49.0.crate \
+          https://static.crates.io/crates/num-traits/num-traits-0.2.15.crate \
+          https://static.crates.io/crates/num_threads/num_threads-0.1.6.crate \
+          https://static.crates.io/crates/once_cell/once_cell-1.18.0.crate \
+          https://static.crates.io/crates/onig/onig-6.4.0.crate \
+          https://static.crates.io/crates/onig_sys/onig_sys-69.8.1.crate \
+          https://static.crates.io/crates/os_str_bytes/os_str_bytes-6.4.1.crate \
+          https://static.crates.io/crates/parking_lot/parking_lot-0.12.1.crate \
+          https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.9.7.crate \
+          https://static.crates.io/crates/path_abs/path_abs-0.5.1.crate \
+          https://static.crates.io/crates/percent-encoding/percent-encoding-2.2.0.crate \
+          https://static.crates.io/crates/pkg-config/pkg-config-0.3.25.crate \
+          https://static.crates.io/crates/plist/plist-1.4.3.crate \
+          https://static.crates.io/crates/ppv-lite86/ppv-lite86-0.2.17.crate \
+          https://static.crates.io/crates/predicates-core/predicates-core-1.0.6.crate \
+          https://static.crates.io/crates/predicates-tree/predicates-tree-1.0.5.crate \
+          https://static.crates.io/crates/predicates/predicates-3.0.3.crate \
+          https://static.crates.io/crates/proc-macro-hack/proc-macro-hack-0.5.19.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.66.crate \
+          https://static.crates.io/crates/quick-xml/quick-xml-0.28.1.crate \
+          https://static.crates.io/crates/quote/quote-1.0.26.crate \
+          https://static.crates.io/crates/rand/rand-0.8.5.crate \
+          https://static.crates.io/crates/rand_chacha/rand_chacha-0.3.1.crate \
+          https://static.crates.io/crates/rand_core/rand_core-0.6.4.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.2.16.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.3.5.crate \
+          https://static.crates.io/crates/regex-automata/regex-automata-0.3.7.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.27.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.7.2.crate \
+          https://static.crates.io/crates/regex/regex-1.8.3.crate \
+          https://static.crates.io/crates/rgb/rgb-0.8.34.crate \
+          https://static.crates.io/crates/run_script/run_script-0.10.0.crate \
+          https://static.crates.io/crates/rustix/rustix-0.38.11.crate \
+          https://static.crates.io/crates/ryu/ryu-1.0.11.crate \
+          https://static.crates.io/crates/safemem/safemem-0.3.3.crate \
+          https://static.crates.io/crates/same-file/same-file-1.0.6.crate \
+          https://static.crates.io/crates/scopeguard/scopeguard-1.1.0.crate \
+          https://static.crates.io/crates/semver/semver-1.0.17.crate \
+          https://static.crates.io/crates/serde/serde-1.0.163.crate \
+          https://static.crates.io/crates/serde_derive/serde_derive-1.0.163.crate \
+          https://static.crates.io/crates/serde_json/serde_json-1.0.85.crate \
+          https://static.crates.io/crates/serde_yaml/serde_yaml-0.9.25.crate \
+          https://static.crates.io/crates/serial_test/serial_test-2.0.0.crate \
+          https://static.crates.io/crates/serial_test_derive/serial_test_derive-2.0.0.crate \
+          https://static.crates.io/crates/shell-escape/shell-escape-0.1.5.crate \
+          https://static.crates.io/crates/shell-words/shell-words-1.1.0.crate \
+          https://static.crates.io/crates/smallvec/smallvec-1.10.0.crate \
+          https://static.crates.io/crates/static_assertions/static_assertions-1.1.0.crate \
+          https://static.crates.io/crates/std_prelude/std_prelude-0.2.12.crate \
+          https://static.crates.io/crates/strsim/strsim-0.10.0.crate \
+          https://static.crates.io/crates/syn/syn-1.0.104.crate \
+          https://static.crates.io/crates/syn/syn-2.0.12.crate \
+          https://static.crates.io/crates/syntect/syntect-5.0.0.crate \
+          https://static.crates.io/crates/sys-info/sys-info-0.9.1.crate \
+          https://static.crates.io/crates/tempfile/tempfile-3.8.0.crate \
+          https://static.crates.io/crates/termcolor/termcolor-1.1.3.crate \
+          https://static.crates.io/crates/terminal_size/terminal_size-0.3.0.crate \
+          https://static.crates.io/crates/termtree/termtree-0.2.4.crate \
+          https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.40.crate \
+          https://static.crates.io/crates/thiserror/thiserror-1.0.40.crate \
+          https://static.crates.io/crates/time/time-0.3.14.crate \
+          https://static.crates.io/crates/tinyvec/tinyvec-1.6.0.crate \
+          https://static.crates.io/crates/tinyvec_macros/tinyvec_macros-0.1.0.crate \
+          https://static.crates.io/crates/unicode-bidi/unicode-bidi-0.3.8.crate \
+          https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.4.crate \
+          https://static.crates.io/crates/unicode-normalization/unicode-normalization-0.1.22.crate \
+          https://static.crates.io/crates/unicode-width/unicode-width-0.1.10.crate \
+          https://static.crates.io/crates/unsafe-libyaml/unsafe-libyaml-0.2.9.crate \
+          https://static.crates.io/crates/url/url-2.3.1.crate \
+          https://static.crates.io/crates/utf8parse/utf8parse-0.2.1.crate \
+          https://static.crates.io/crates/vcpkg/vcpkg-0.2.15.crate \
+          https://static.crates.io/crates/wait-timeout/wait-timeout-0.2.0.crate \
+          https://static.crates.io/crates/walkdir/walkdir-2.3.3.crate \
+          https://static.crates.io/crates/wasi/wasi-0.11.0+wasi-snapshot-preview1.crate \
+          https://static.crates.io/crates/wild/wild-2.1.0.crate \
+          https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi-util/winapi-util-0.1.5.crate \
+          https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi/winapi-0.3.9.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.42.0.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.45.0.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.48.0.crate \
+          https://static.crates.io/crates/windows-targets/windows-targets-0.42.1.crate \
+          https://static.crates.io/crates/windows-targets/windows-targets-0.48.0.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.42.1.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.48.0.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.42.1.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.48.0.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.42.1.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.48.0.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.42.1.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.48.0.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.42.1.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.48.0.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.42.1.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.48.0.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.42.1.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.0.crate \
+          https://static.crates.io/crates/yaml-rust/yaml-rust-0.4.5.crate"
+MD5SUM="29835f4ae789902ef0db3a39024d6016 \
+        669215548c64019c08c92b2c1afd3deb \
+        d67bff45f921eea8a4a4890cddf70e6c \
+        8ad2bf7329daec74312f767d402aac50 \
+        d88ccc46758cab11501690eb4db207d6 \
+        d18a8aaf56bfd7418a91540a0174402d \
+        aea9df8755bcb59733b1be84252ffd00 \
+        d2453c99c7af98286c2dc9017a8dba6d \
+        b57fd47f132f32001e0d4bfc4621f1bf \
+        53c2a5b5e01940a8d5149106c2dff04a \
+        285e1a0d21d8078099686654ad13235a \
+        113c0bb6d298ddaa9995074cbb71533a \
+        05d77ef52e90ad161fdd41b252420467 \
+        cf0f1cbb3733e7153959edffc25adac4 \
+        b9beac7e75b4986031a89562c26eb553 \
+        b174984f0ec889f5c32e90bddb80f674 \
+        45a867175c81501378699f80724393c0 \
+        a295edb6953237ebbdfa8e731229f9a3 \
+        b6a33f8009be15391bb7ca1a3c1f5bc4 \
+        6f678db176b4331c3dab7d271e95e6fb \
+        5e9f6609f741f65c6636ce3b2a2b3fd2 \
+        39ad0dcbd6c48a4850406c457f75d54a \
+        04c2dcc3c8184578320c53d63a07aed0 \
+        8e3a4d0980acef2c4e74485a45de29a9 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        166b8dd7c4ba1de91b063bf2735db503 \
+        50dd5ede0492efbc82a851a70f5a134f \
+        174448468cf3c9ccffd07dddd68df964 \
+        d303a7ffdd69b91b80ef430ff07f70c4 \
+        010f6d0e98cc2a2b99907a23c6cd6bbc \
+        d4727fa5712856528cd16bb6893b4339 \
         64bebafaf681f39deebbc41b24b3527f \
-        3c153e21729b743f5127dec47670de17 \
-        ff67cf2eb9668167782b8012d3b48e7b \
-        5e49f4c3f9076fe30ae207fe951f9195 \
-        b00352aced738d455145117157604783 \
-        3eaf0fcec214234d8b1f127ddf807ee8 \
-        8b70009baf55df3c0eea3582883f148b \
+        a9d6492a1bd21d93dbc27c32eabd0c70 \
+        1c05ac1c92acdf657033242e4b9b70ba \
+        bebc8338ae113a87a04564c97c1e3f0c \
+        5ad9c211e3fd5d779c2218f50791a7e9 \
         dd1e49c76e9d5853e673a3b41ba02917 \
-        cb752f0454c59d6effa9409f18a9a9b7 \
+        7280d20293b49a61b6e4ff41cfe3276b \
+        212574e303e85b9101f495e021eb701b \
         95a243b2d7c30018a643e218b3c5d693 \
-        1cdd23edc54b385ee5cfb6a0f9f52f17 \
-        c19b47edfeea6760da864066bba50208 \
-        bb17317266b63ce2a7eb7b8a47f35594 \
-        1618bf8d183d5cee0b6db1392a8f874b \
-        0dbb2c3d83adb1fa4f17ac94e2bef0dc \
-        afdb4c49775dbcd9c76763052433d370 \
-        5c31515f4fc8fc5167a5b64f816e915e \
-        da699c4c8e4c153cbdb9fb0ef3fb3056 \
-        1aef0dd636d3ef234e4f035fc26c0069 \
-        480f00b3768504ade60944b9b340bc67 \
-        14cfb04bc2786abe846e99276c1e604c \
-        2a49454320cf4ea4fde553c66e2e9522 \
+        5f9a3a8b7213c055342b2f423a213b3a \
+        bdf329a72ecd0605c296f25e53136706 \
+        fc65414dcac661c46f2cfad7722304f9 \
+        33479bc3e6a76008f4d1654925cd3a94 \
+        f8bbc5e2d829e3a4cb40da5ef6dfcd72 \
+        e48c869fdaf1a63e46e1dfeda6a0df87 \
+        12062a70b524c1f4d77d5a5bb69a455e \
+        af5f6e998d4516001c57548d670b2c1f \
+        5464f1288cca25da28ec41595a001ce9 \
+        94f11861c538d1a2fd56c86d140e4358 \
         8dab3b3ec00dc56cffde0b0c410d47b5 \
-        27260b46db6b9ac40318143d70a80ba3 \
-        916a6c827f4f0f64b7652bebf67d82e1 \
-        704babd757a22f163230a36fa5474890 \
-        e27fbbe4ba8fa5a77aa69f189a98ed5e \
+        357f2bcdc622476ad883fe9d07f874c3 \
+        aa686146f0515bbce37d14547afe5d82 \
+        62864db03072aaae4f855126d502b8c7 \
+        d3542acfb5b79eaebf094e2b0f230a59 \
+        29103474523337dbad13204c224e8af5 \
+        219b62dce18875d3f65e5bdea97eafdf \
         e7c07242a95ee1df865efe9534e10a34 \
-        1b94f32581a557963eecb29761e9c0eb \
-        58285dfb5134c5df5503066a20dc9d2c \
-        1cb9255bca772052ccac99a2cb3cc994 \
-        54ac4c56d9ec2800b8428020f24be67c \
-        bb43d4a3ffb3066ac416c9bae771b001 \
-        396bc88987f4bc192f975d94cdf326c7 \
-        04a84513cdad48c92d8363d627904227 \
+        46e242c6a07197a8af2007682efd3154 \
+        2fe9835e0179d99c1b7829e710f8ee01 \
+        1b41b97d982520b7364a87a39e2a1ed8 \
+        d4633fb342a692407e4684a48b32d06b \
+        11681ec4554f1f934b25eeba3f558ea7 \
+        c3425a02781d0bb3c4f8d5d025d12266 \
+        9473c008d472707d1aa3273d7cbabb96 \
+        649551b72728784a9c4c0a058e7bdb88 \
+        20b9f5d97aaf06b0f580f12860b67ba8 \
+        7cb502e78aa72a02fffa9d954f7d4dfa \
+        75e2156746dcd795a4fcfeee4ce4953f \
         fba3b040a55c01be7376d3dd5c4d4920 \
-        23cc9e52c52465f5b225e62ab7cc3457 \
-        631d51a2cc0462ba02a364ace945aec9 \
-        486fd4e3f2db566414f9d0b66e377fb6 \
-        e5768043e447a7423f030c1394440502 \
+        26c20e41bc14af441bdabca4bf2de865 \
+        5fbf6c7a4728d530f3dcec869dc1e1d7 \
+        591b0243c421bf8e6df09e3209fce861 \
         651dd38020e02806ccadcc41df89c7dc \
-        ccfdc823f169bd2016cb508b117dae67 \
-        f50d2e280b4a3491fffda43b90982544 \
-        47580fad08273a52e998f84ef404912e \
-        7916dcd738a8fa6a2798754c20d6e146 \
-        124ec4f35274a0e9c1a4ef3dc0958643 \
-        308036ddba62d02f4b6540a2612f45d1 \
+        ef352de59e1b26277213640319c87e88 \
+        bee4957fca33c21ef5620739f5ccfb43 \
+        426eb9e22cbb36480e13fd265be87b4c \
+        b31bf94ffe7e0f2ada93afae1076eaeb \
+        94b8bf179385ff071bdc33b58bf047c0 \
+        eb7e04508518ed8f29935ec874e1740a \
+        580f8f88379ff0678e8336a781dda55d \
         f9ddf92ded75c1df47b2dd1379a482fd \
-        759816fe5b617674ae5dee83e3c3e6e2 \
-        2daa59d0efd38e9b5fbb2658b080eaa1 \
-        d4e26e9e666a3a40641a0716f4fab00c \
-        dbf2124d22667f0c58689e7d2a8e289f \
-        797752fea1f2c8b458cf7383b61433c9 \
-        88b078aad93b7c645bd6c127e910051b \
-        f490982aceabdbd515348f63e638a782 \
-        37cf6acd1c3259eefeba636e4cc9b365 \
-        43e97206d08bfd1a23b2ed01fba95c69 \
-        0cf1fcdb3e8eab7001792f4916516fc2 \
-        222d8ac7246a639ff9858d12cbb40e54 \
-        0c860c0d0fa0dde03bd6be862fb1b6b4 \
-        e06cf535fc806174e0948dc764643d26 \
-        90334ab24d9b7f3934dcf3b3cb85c48c \
-        d7994a5881ead65b583339d8c7fc31c8 \
-        7d6ee412648063d4ef8062b466a41115 \
-        0736e4f76f4f8f0a29563b0608ca3974 \
-        63b29211eef9ccee0b0401d423db0efd \
-        9e99a37f8c37bb953732ef46ac2b12a1 \
-        8cab41822d03dfa674870315308fa392 \
-        35ddcd36701a1a6711cc3aec85909f41 \
-        c8d655d206cbe48b84a22544d6fc6d15 \
-        3cc3a4bd5861ca93d7c0d19129334703 \
-        870008bba2e68db4988c31e511fbd9c4 \
-        eee136546e9f4735577dd20f45727c69 \
-        24118e5657591c6f208dbb1d77fbc482 \
-        0538d1da369f3e3f0412aa4d735c1b61 \
-        8557ac6195186e216af6b33bc6ab9f8c \
-        a69721c73263cd2040e1a5f120b03a6f \
+        8be1ace0f1c199d5cd5656f4d1cf8fcb \
+        a0de6eabdeb1320350abcbd7c02df6ac \
+        ae2471729f689287aec9da43f8106a4b \
+        2dc8aacabbc090f8025a4789d4d6d8f0 \
+        d06080c698392ce9097c5bc69de86f33 \
+        75ae5e02e272143f29cddced22da760a \
+        cbdec2af76c0cb6941296af17b0c9065 \
+        1be45f99109d447849f4244b58c5a470 \
+        1dd7189bccf7a3cfb69fd1dc213f660e \
+        e19dcd118d42a9cefc6f203eadba66f9 \
+        c7ce684666ac9c76223b1a0a5034ce99 \
+        b478ee84018082806ea8da763f0b3f1f \
+        c9dc94161e262c04a468a7fbb96b2be8 \
+        5c69337d37e58a380e00eac9ce0373bb \
+        be08d75820c528ad6143e9e42efccee0 \
+        f0483617baf64c673526ff9e015b4d44 \
+        45b89ed774f16acb4c97357e090ae589 \
+        c7c38eb603bed6f42edbc4294806a44a \
+        1220d83980fb7f591f310194dce2fc66 \
+        5939e658fe64757c6936705743340895 \
+        323153a8ec1da78a73131fec9d900c2e \
+        ee7a5f842c39bc47c474196e83b0df5f \
+        e30085994bbeb4b7f4895d48216d5476 \
+        a1626b8f4d165b1b60d960862eba4cf0 \
+        16111f31a29feae4ce4a324b83dc0189 \
+        782ea88d8e5b517b1c9e7d870e20e9e3 \
+        aecc051a251ceacaa93d51976024e276 \
+        eae2f2a5c23013ff8849962c49844095 \
+        86ebf4dcfbf79df9b12d53d6d3b1cc4b \
+        10d1df499db7e291d33940293a59e4ea \
+        b8b5408bc71861d03c86809a1c1c86e7 \
+        d856bb46954932a51c89bae189502e01 \
+        708c8cd3833a7a020f11cdf77022793c \
+        20e127104e602f7766746289ffd23c67 \
         994b165f971ecfc09dc13fca8d394691 \
         2d8d8b377d144f5e32b4f65a69eb0b24 \
-        d2cc4e584ed64165fc56d2c9081eb3ee \
-        62cde3def3d803cca1b9f289dc8a706b \
-        00abb3f999c030c8af5aa0d54f776ac9 \
-        622e004624817a6eca1813fbdbebd14c \
-        3ce14be976e95e6d3f68314ea41937af \
-        1efacc3e4c0d31418a2a5b97961d7de8 \
-        b1cace2e0c87bbbf5753996e28016787 \
-        1a3070ee58d2d21cb6adaacc71ff27cd \
+        b4a0a98a54439a5a37952c8879187ee3 \
+        eb6238cbf278a63e0afc0804cf527c62 \
+        bccac46f67a7b6ef48de6a400967f5c4 \
+        4f6f844fa8b062139413beb76eee5795 \
+        8033d8942c141f80e2b9ad697a4b847a \
+        30c730b84e1bafe9782c65586a77f386 \
+        91c634c89b4e4de7688885c95466de49 \
+        79fb3b377741a5c6567478c5d672173d \
+        08abe36adae4caee78acf034c56a550b \
+        ce622fdb8d18cd1c13ed8fadc5400c10 \
+        a8014a7c865aa54f305e8cda3ef02019 \
+        c9defe80406280bcfce4ecf31c0200b3 \
         8e320697cbdcd4b294e671888e746131 \
-        781d4ccf5d04c98fa02af207a9639249 \
-        8f6bbc827086ddd71f276651b4cf7232 \
-        084c80f18922723b80adb4e045e98c60 \
-        918b2d65f7489e154483e3d6e54118a0 \
-        73d602cc41e3e431bf4fabd129ae1616 \
-        37432cda34fdcf9f2b67dda7e69104e9 \
-        a8de006fe0c7e373c560dd51599287a8 \
-        a5dd75e77c7324f5c1d2d372c990d0a7 \
-        253a33d4577293cbeb852f14069b4a84 \
-        8f1da9ba3b7b793efa8a39a159d06035 \
-        55927226b06f62ccbd2890269d68c2fd \
-        6cae4969689ecc3b4b4c31a9fb9539a6 \
-        f403bbb812ce1a2d9270d9159cf9e8d3 \
-        c3be058b692f0e9b25a3219b7b5d940c \
-        4272c279b06b88f8b0ffce7109348e27 \
-        a51c43692084979295641a7ffba4b297 \
-        81821d39675a1f584546b9920e5d6b5d \
-        bff823ec07c5fbcc3e425c9c9e4b38a6 \
-        333b4ba3f64c35b6f89b521e8d64548b \
-        8b01b016a9b6deebc1b43f296057efb5 \
+        82d98dc87dc8503400aa095f5aa70f13 \
+        2ff96a1d48b35a4ace243d2d347ad4c2 \
+        1090c617f01d655b4d8833762fe1e50e \
+        3684912f362c8cb86cb37e1a63b1e5b6 \
+        4668cb8d079162e0113240a4072900fa \
+        ce7327ca8031864d638b1e21fd44c4dd \
+        40ce77bc7803d0ff8734f6a11c4e8814 \
+        b7eae58d7a80112442643ee2ff481ef7 \
+        20bd2fec49a1daa82476faf42ef8f18b \
+        dd290e713c28d2e565d78eedd471ed78 \
+        ab44b0c93adeb9ee88e1c66555b8e6a7 \
+        7de3c191486a92a2becbbdbf80a8ed8e \
+        5f0470696baaa4e5953bddbf196998f9 \
+        7bfcad253aff26bc26c5e3521f3ba891 \
+        bd0cd532c61dac2087ecd7e0fef0d011 \
+        c12056f5fc11f0d69b92b1d1d4799c80 \
+        c12d182417999fc365f952e701f6071f \
+        7d6d4fc9fad200d6e295f6930e97e022 \
+        7d1f51736f0f81fcb5fcb020f9f85154 \
+        41a9cb1cc86d75f991241c9c3f725556 \
+        ceee1159c41351d05f4cf705490867b3 \
+        e900a384ac7dbb320fe6a7279fbfef89 \
         6708629acf3d2ecb7404e43255d2df85 \
-        1092a4a24e80f8856efc71af51a06114 \
-        6e23e0eee42b1ba9ec61a6db7ec2dc08 \
-        95491f9095e26cbd501d6aadc7322e1c \
-        0498c4a11448bfc35dc7bb2caa64c753 \
+        250acb3063bbdc870cbb54edcd6fff8f \
+        e972ea58ec203bfa6c79c1207852298b \
+        b3af058bfd9d161843f176f76b117d02 \
         db96b50050277bf05a3c68534bbb9586 \
         b9e37d5fc4ad28b612b78ad37816684d \
         09de9d01e7331ff3da11f58be8bef0df \
-        c78fded8bcf586e5b389e3366d55f9c0 \
-        814f52ce85af89cafdc9633e64fefba4"
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        110789f2dd21a2ea820ebed976b4b1c2 \
+        b58284cb8ce52b8de07e09f4f8fb9653 \
+        f2797ade0e36f1e5d6be9d11b5076582 \
+        25cf36fbb4f7adb02f3d9fa24ccaef4f \
+        7244738a73643f06df82069d00393ad7 \
+        5ac131337793334dce7adbf1116671b3 \
+        e8732bb9eec91463ea10020fc16991c1 \
+        8f5702706600f24bf7332043c15aa566 \
+        3d2bf2e578fe93c538d4f8c5cfddbe9b \
+        dd86cb477e0b0b1411a5c92cba244b42 \
+        631f9e1bcfe18e3976ef4c893ee13531 \
+        0f6b457ea783c088dff026ce39ce72ca \
+        f3dad0f67aa70c6618c1593bd2086c36 \
+        23d20707b55228cb9b4328a26ddca724 \
+        085ec81e4ced998bb7f1aea30b7a630e \
+        62e05b432403f316d86f7af8af0839e3 \
+        e24dfcf625e130a1e6db0ae375a17dd7 \
+        8893d419a205b225e4010d7d02a15c6a \
+        2fa0c13b386de68baa17168774b1c5fa \
+        331d07cdd036d528ede2f69c7ff0beb6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
+REQUIRES="rust16"
+MAINTAINER="Erich Ritz"
+EMAIL="erich.public@protonmail.com"
diff --git a/system/bbf/README b/system/bbf/README
new file mode 100644
index 0000000000..16efd290b3
--- /dev/null
+++ b/system/bbf/README
@@ -0,0 +1,9 @@
+bbf (bad block finder)
+
+bbf is a safer and more featureful tool for dealing with bad blocks
+on hard drives. It's built around the workflow of dealing with hard
+drive bad blocks. It has a number of features to limit risk in using
+the tool and provides features to more easily track down what files
+are affected by the bad blocks found. It also gives you the ability
+to manually mark blocks as corrupted in cases where a block isn't
+technically bad, but is causing issues.
diff --git a/system/bbf/bbf.8 b/system/bbf/bbf.8
new file mode 100644
index 0000000000..b523dfb2e6
--- /dev/null
+++ b/system/bbf/bbf.8
@@ -0,0 +1,416 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "BBF" 8 "2023-03-27" "20220524_0e90e04" "SlackBuilds.org"
+.SH NAME
+bbf \- bad block finder
+.\" RST source for bbf(1) man page. Convert with:
+.
+.\" rst2man.py bbf.rst > bbf.8
+.
+.SH SYNOPSIS
+.sp
+bbf [\fIoptions\fP] \fIinstruction\fP \fIpath\fP
+.SH DESCRIPTION
+.sp
+\fBbbf\fP is a safer and more featureful tool for dealing with bad
+blocks on hard drives. It\(aqs built around the workflow of dealing with
+hard drive bad blocks. It has a number of features to limit risk in
+using the tool and provides features to more easily track down what
+files are affected by the bad blocks found. It also gives you the
+ability to manually mark blocks as corrupted in cases where a block
+isn\(aqt technically bad, but is causing issues.
+.SH FEATURES
+.INDENT 0.0
+.INDENT 3.5
+.INDENT 0.0
+.IP \(bu 2
+readonly scanning of bad blocks
+.IP \(bu 2
+safe \(aqfix\(aq mode which won\(aqt overwrite good blocks
+.IP \(bu 2
+burnin mode for checking new drives
+.IP \(bu 2
+manual marking blocks as corrupted
+.IP \(bu 2
+find files given list of blocks
+.IP \(bu 2
+dump list of files and associated block ranges
+.IP \(bu 2
+dump list of blocks used by a file
+.IP \(bu 2
+issue secure drive erasure
+.IP \(bu 2
+filesystem stressing
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.SH OPTIONS
+.SS Arguments
+.INDENT 0.0
+.TP
+.B  \-f\fP,\fB  \-\-force
+override checking if drive is in use when trying to perform destructive actions
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-t, \-\-rwtype \fIos|ata\fP
+select between OS or ATA reads and writes (default: os)
+.UNINDENT
+.INDENT 0.0
+.TP
+.B  \-q\fP,\fB  \-\-quiet
+redirects stdout to /dev/null or otherwise limits output
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-s, \-\-start\-block \fIlba\fP
+block to start from (default: 0)
+.TP
+.B \-e, \-\-end\-block \fIlba\fP
+block to stop at (default: last block)
+.TP
+.B \-S, \-\-stepping \fIn\fP
+number of logical blocks to read at a time (default: physical / logical)
+.TP
+.B \-o, \-\-output \fIfile\fP
+file to write bad block list to (default: $HOME/badblocks.*captcha*)
+.TP
+.B \-i, \-\-input \fIfile\fP
+file to read bad block list from (default: $HOME/badblocks.*captcha*)
+.TP
+.B \-r, \-\-retries \fIcount\fP
+number of retries on certain reads & writes
+.TP
+.B \-c, \-\-captcha \fIcaptcha\fP
+needed when performing destructive operations
+.TP
+.B \-M, \-\-maxerrors \fIn\fP
+max r/w errors before exiting (default: 1024)
+.UNINDENT
+.SS Instructions
+.sp
+\fBinfo\fP
+.INDENT 0.0
+.INDENT 3.5
+\fIpath\fP is a block device. Prints out details about the block device.
+.UNINDENT
+.UNINDENT
+.sp
+\fBcaptcha\fP
+.INDENT 0.0
+.INDENT 3.5
+\fIpath\fP is a block device. Prints out captcha needed for certain instructions.
+.UNINDENT
+.UNINDENT
+.sp
+\fBscan\fP
+.INDENT 0.0
+.INDENT 3.5
+\fIpath\fP is a block device. A read\-only scan of the block device for
+bad blocks. \fIrwtype=ata\fP will be slower but may catch more.
+.sp
+Relevant options: rwtype, start block, end block, stepping, max errors, input file, output file.
+.UNINDENT
+.UNINDENT
+.sp
+\fBfix\fP
+.INDENT 0.0
+.INDENT 3.5
+\fIpath\fP is a block device. Writes to bad blocks in an attempt to
+force the drive to reallocate the block. Attempts to read the block
+first and will write the read data if successful otherwise it will
+write zeros. This means it is pretty safe to use even if the blocks
+\(aqfixed\(aq aren\(aqt in fact damaged.
+.UNINDENT
+.UNINDENT
+.sp
+\fIrwtype=ata\fP will work better.
+.INDENT 0.0
+.INDENT 3.5
+Requires captcha.
+.sp
+Relevant options: captcha, rwtype, force, input file.
+.UNINDENT
+.UNINDENT
+.sp
+\fBfix\-file\fP
+.INDENT 0.0
+.INDENT 3.5
+\fIpath\fP is a file. Gets the list of blocks that a file uses and then
+goes through each block reading what is there and then writing it
+back which will force reallocation if a block is bad.
+.sp
+\fIrwtype=ata\fP will work better.
+.sp
+Requires captcha.
+.sp
+Relevant options: captcha, rwtype, retries.
+.UNINDENT
+.UNINDENT
+.sp
+\fBburnin\fP
+.INDENT 0.0
+.INDENT 3.5
+\fIpath\fP is a block device. Iterates through the blocks of the device performing the following:
+.INDENT 0.0
+.INDENT 3.5
+.INDENT 0.0
+.IP 1. 3
+Read block data (zero out on failure)
+.IP 2. 3
+Write 0x00\(aqs and read back to confirm data integrity.
+.IP 3. 3
+Write 0x55\(aqs and read back to confirm data integrity.
+.IP 4. 3
+Write 0xAA\(aqs and read back to confirm data integrity.
+.IP 5. 3
+Write 0xFF\(aqs and read back to confirm data integrity.
+.IP 6. 3
+Write back originally read data.
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.sp
+Requires captcha.
+.sp
+Relevant options: rwtype, start block, end block, stepping, max
+errors, retries, input file, output file.
+.UNINDENT
+.UNINDENT
+.sp
+\fBfsthrash\fP
+.INDENT 0.0
+.INDENT 3.5
+\fIpath\fP is a directory. Spawns a number of threads to hammer the
+filesystem using a number of functions to stress the filesystem and
+underlying device. Functions include: create, open, mkdir, unlink,
+rmdir, write, read, close, readdir, stat, chmod, chown, link,
+symlink. Cleans up after itself on exit but does consume storage and
+inodes as it runs.
+.sp
+Use \fI\-\-quiet\fP to keep it from printing out what it is doing and improve performance.
+.UNINDENT
+.UNINDENT
+.sp
+\fBfilethrash\fP
+.INDENT 0.0
+.INDENT 3.5
+\fIpath\fP is a non\-existent file. Creates a file, expands it to fill
+up the rest of the filesystem, and spawns a thread per core which
+writes 1MB blocks to the file at random offsets to stress the
+filesystem and unerlying device.
+.UNINDENT
+.UNINDENT
+.sp
+\fBfind\-files\fP
+.INDENT 0.0
+.INDENT 3.5
+\fIpath\fP is a filesystem mount point. Attempts to find the
+files associated with any blocks listed in the bad block input
+file. Useful after running \fIscan\fP to find the files with bad blocks.
+.sp
+Relevant options: input file.
+.UNINDENT
+.UNINDENT
+.sp
+\fBdump\-files\fP
+.INDENT 0.0
+.INDENT 3.5
+\fIpath\fP is a filesystem. Scans the filesystem and dumps a list of the files with the blocks on the device it occupies.
+.UNINDENT
+.UNINDENT
+.sp
+\fBfile\-blocks\fP
+.INDENT 0.0
+.INDENT 3.5
+\fIpath\fP is an existing file. Prints out a list of all logical blocks the file uses.
+.UNINDENT
+.UNINDENT
+.sp
+\fBwrite\-pseudo\-uncorrectable\-wl\fP
+.sp
+\fBwrite\-pseudo\-uncorrectable\-wol\fP
+.sp
+\fBwrite\-flagged\-uncorrectable\-wl\fP
+.sp
+\fBwrite\-flagged\-uncorrectable\-wol\fP
+.INDENT 0.0
+.INDENT 3.5
+\fIpath\fP is a block device. Marks blocks listed in the bad block input
+file as \(aqpseudo\(aq or \(aqflagged\(aq uncorrectable. Blocks marked \(aqpseudo\(aq,
+when read, cause the drive to perform normal error recovery and
+return errors if necessary. Blocks marked \(aqflagged\(aq, when read,
+will simply return errors indicating it is bad. \(aqwl\(aq means \(aqwith
+logging\(aq and if read will result in failed reads being stored in
+SMART logs. \(aqwol\(aq means \(aqwithout logging\(aq and will not log any read
+failures in the SMART log.
+.sp
+Relevant options: input file.
+.UNINDENT
+.UNINDENT
+.sp
+\fBsecurity\-erase\fP
+.INDENT 0.0
+.INDENT 3.5
+\fIpath\fP is a block device. Issues an ATA Security Erase command to
+the device. What this means specifically is device specific but
+generally it is supposed to be like a low\-level format. Use with
+care.
+.sp
+Requires captcha.
+.sp
+Relevant options: captcha.
+.UNINDENT
+.UNINDENT
+.sp
+\fBenhanced\-security\-erase\fP
+.INDENT 0.0
+.INDENT 3.5
+Theoretically a more thorough version of the standard ATA Security
+Erase command. Similarly its function depends on the device and may
+be the same as the regular security erase.
+.sp
+Requires captcha.
+.sp
+Relevant options: captcha.
+.UNINDENT
+.UNINDENT
+.SH EXAMPLES
+.nf
+# bbf info /dev/sdb
+/dev/sdi:
+.in +2
+\- serial_number: XXXXXXXX
+\- firmware_revision: SC61
+\- model_number: ST8000VN0022\-2EL112
+\- RPM: 7200
+\- features:
+.in +2
+\- form_factor: 3.5"
+\- write_uncorrectable: 1
+\- smart_supported: 1
+\- smart_enabled: 1
+\- security_supported: 1
+\- security_enabled: 0
+\- security_locked: 0
+\- security_frozen: 0
+\- security_count_expired: 0
+\- security_enhanced_erase_supported: 1
+\- security_normal_erase_time: 698
+\- security_enhanced_erase_time: 698
+\- block_erase: 0
+\- overwrite: 1
+\- crypto_scramble: 0
+\- sanitize: 1
+\- supports_sata_gen1: 1
+\- supports_sata_gen2: 1
+\- supports_sata_gen3: 1
+\- trim_supported: 0
+.in -2
+\- block_size:
+.in +2
+\- physical: 4096
+\- logical: 512
+\- stepping: 8
+.in -2
+\- block_count:
+.in +2
+\- physical: 1953506646
+\- logical: 15628053168
+.in -2
+\- size:
+.in +2
+\- bytes: 8001563222016
+\- human:
+.in +2
+\- base2: 7.28TB
+\- base10: 8.00TiB
+
+.in -2
+.in -2
+.in -2
+.fi
+.sp
+.nf
+# bbf \-S 256 \-t ata scan /dev/sdb
+start block: 0
+end block: 15628053168
+stepping: 256
+logical block size: 512
+physical block size: 4096
+read size: 131072
+Scanning: 0 \- 15628053168
+Current: 2425512192 (15.52%); bps: 179384.74; eta: 20:26:39; bad: 0
+
+.fi
+.sp
+.nf
+# bbf captcha /dev/sdb
+Z8400VR0
+
+.fi
+.sp
+.nf
+# bbf \-i ~/badblocks.Z8400VR0 \-c Z8400VR0 fix /dev/sdb
+
+.fi
+.sp
+.nf
+# bbf \-q fsthrash /mnt/mydrive0
+CTRL\-C to exit...
+^CCleaning up...
+
+.fi
+.sp
+.nf
+# bbf filethrash /mnt/mydrive0/test
+Creating file: /mnt/mydrive0/test
+Expanding file to fill drive: 200209731584 bytes
+Spawning thrashing threads: 4 (one per core)
+CTRL\-C to exit...
+.fi
+.sp
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/bbf\-20220524_0e90e04/LICENSE for license information.
+.SH AUTHORS
+.sp
+\fBbbf\fP was written by Antonio SJ Musumeci <\fI\%trapexit@spawn.link\fP>.
+.sp
+This man page created for the SlackBuilds.org project by
+B. Watson. Since it\(aqs just copy/pasted from README.md, the man page is
+licensed the same as \fBbbf\fP itself.
+.SH SEE ALSO
+.sp
+\fBbadblocks\fP(8), \fBsmartctl\fP(8), \fBfsck\fP(8)
+.sp
+The \fBbbf\fP homepage: \fI\%https://github.com/trapexit/bbf\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/system/bbf/bbf.SlackBuild b/system/bbf/bbf.SlackBuild
new file mode 100644
index 0000000000..b3313d7b63
--- /dev/null
+++ b/system/bbf/bbf.SlackBuild
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# Slackware build script for bbf
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=bbf
+VERSION=${VERSION:-20220524_0e90e04}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+make CFLAGS="$SLKCFLAGS"
+install -s -D $PRGNAM $PKG/usr/sbin/$PRGNAM
+
+# man page is copypasta from README.md, with nice formatting and
+# a few grammar/spelling fixes.
+mkdir -p $PKG/usr/man/man8
+gzip -9c < $CWD/$PRGNAM.8 > $PKG/usr/man/man8/$PRGNAM.8.gz
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a *.md LICENSE $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bbf/bbf.info b/system/bbf/bbf.info
new file mode 100644
index 0000000000..0730843445
--- /dev/null
+++ b/system/bbf/bbf.info
@@ -0,0 +1,10 @@
+PRGNAM="bbf"
+VERSION="20220524_0e90e04"
+HOMEPAGE="https://github.com/trapexit/bbf"
+DOWNLOAD="https://slackware.uk/~urchlay/src/bbf-20220524_0e90e04.tar.xz"
+MD5SUM="2e269c80c916bdb840489535e1044afe"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/bbf/bbf.rst b/system/bbf/bbf.rst
new file mode 100644
index 0000000000..20a7a1d3a8
--- /dev/null
+++ b/system/bbf/bbf.rst
@@ -0,0 +1,320 @@
+.. RST source for bbf(1) man page. Convert with:
+..   rst2man.py bbf.rst > bbf.8
+
+.. |version| replace:: 20220524_0e90e04
+.. |date| date::
+
+===
+bbf
+===
+
+----------------
+bad block finder
+----------------
+
+:Manual section: 8
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+bbf [*options*] *instruction* *path*
+
+DESCRIPTION
+===========
+
+**bbf** is a safer and more featureful tool for dealing with bad
+blocks on hard drives. It's built around the workflow of dealing with
+hard drive bad blocks. It has a number of features to limit risk in
+using the tool and provides features to more easily track down what
+files are affected by the bad blocks found. It also gives you the
+ability to manually mark blocks as corrupted in cases where a block
+isn't technically bad, but is causing issues.
+
+FEATURES
+========
+
+ * readonly scanning of bad blocks
+ * safe 'fix' mode which won't overwrite good blocks
+ * burnin mode for checking new drives
+ * manual marking blocks as corrupted
+ * find files given list of blocks
+ * dump list of files and associated block ranges
+ * dump list of blocks used by a file
+ * issue secure drive erasure
+ * filesystem stressing
+
+
+OPTIONS
+=======
+
+Arguments
+---------
+
+-f, --force
+  override checking if drive is in use when trying to perform destructive actions
+
+-t, --rwtype *os|ata*
+  select between OS or ATA reads and writes (default: os)
+
+-q, --quiet
+  redirects stdout to /dev/null or otherwise limits output
+
+-s, --start-block *lba*
+  block to start from (default: 0)
+
+-e, --end-block *lba*
+  block to stop at (default: last block)
+
+-S, --stepping *n*
+  number of logical blocks to read at a time (default: physical / logical)
+
+-o, --output *file*
+  file to write bad block list to (default: $HOME/badblocks.*captcha*)
+
+-i, --input *file*
+  file to read bad block list from (default: $HOME/badblocks.*captcha*)
+
+-r, --retries *count*
+  number of retries on certain reads & writes
+
+-c, --captcha *captcha*
+  needed when performing destructive operations
+
+-M, --maxerrors *n*
+  max r/w errors before exiting (default: 1024)
+
+Instructions
+------------
+
+**info**
+
+  *path* is a block device. Prints out details about the block device.
+
+**captcha**
+
+  *path* is a block device. Prints out captcha needed for certain instructions.
+
+**scan**
+
+  *path* is a block device. A read-only scan of the block device for
+  bad blocks. *rwtype=ata* will be slower but may catch more.
+
+  Relevant options: rwtype, start block, end block, stepping, max errors, input file, output file.
+
+**fix**
+
+  *path* is a block device. Writes to bad blocks in an attempt to
+  force the drive to reallocate the block. Attempts to read the block
+  first and will write the read data if successful otherwise it will
+  write zeros. This means it is pretty safe to use even if the blocks
+  'fixed' aren't in fact damaged.
+
+*rwtype=ata* will work better.
+
+  Requires captcha.
+
+  Relevant options: captcha, rwtype, force, input file.
+
+**fix-file**
+
+  *path* is a file. Gets the list of blocks that a file uses and then
+  goes through each block reading what is there and then writing it
+  back which will force reallocation if a block is bad.
+
+  *rwtype=ata* will work better.
+
+  Requires captcha.
+
+  Relevant options: captcha, rwtype, retries.
+
+**burnin**
+
+  *path* is a block device. Iterates through the blocks of the device performing the following:
+
+    1) Read block data (zero out on failure)
+
+    2) Write 0x00's and read back to confirm data integrity.
+
+    3) Write 0x55's and read back to confirm data integrity.
+
+    4) Write 0xAA's and read back to confirm data integrity.
+
+    5) Write 0xFF's and read back to confirm data integrity.
+
+    6) Write back originally read data.
+
+  Requires captcha.
+
+  Relevant options: rwtype, start block, end block, stepping, max
+  errors, retries, input file, output file.
+
+**fsthrash**
+
+  *path* is a directory. Spawns a number of threads to hammer the
+  filesystem using a number of functions to stress the filesystem and
+  underlying device. Functions include: create, open, mkdir, unlink,
+  rmdir, write, read, close, readdir, stat, chmod, chown, link,
+  symlink. Cleans up after itself on exit but does consume storage and
+  inodes as it runs.
+
+  Use *--quiet* to keep it from printing out what it is doing and improve performance.
+
+**filethrash**
+
+  *path* is a non-existent file. Creates a file, expands it to fill
+  up the rest of the filesystem, and spawns a thread per core which
+  writes 1MB blocks to the file at random offsets to stress the
+  filesystem and unerlying device.
+
+**find-files**
+
+  *path* is a filesystem mount point. Attempts to find the
+  files associated with any blocks listed in the bad block input
+  file. Useful after running *scan* to find the files with bad blocks.
+
+  Relevant options: input file.
+
+**dump-files**
+
+  *path* is a filesystem. Scans the filesystem and dumps a list of the files with the blocks on the device it occupies.
+
+**file-blocks**
+
+  *path* is an existing file. Prints out a list of all logical blocks the file uses.
+
+**write-pseudo-uncorrectable-wl**
+
+**write-pseudo-uncorrectable-wol**
+
+**write-flagged-uncorrectable-wl**
+
+**write-flagged-uncorrectable-wol**
+
+  *path* is a block device. Marks blocks listed in the bad block input
+  file as 'pseudo' or 'flagged' uncorrectable. Blocks marked 'pseudo',
+  when read, cause the drive to perform normal error recovery and
+  return errors if necessary. Blocks marked 'flagged', when read,
+  will simply return errors indicating it is bad. 'wl' means 'with
+  logging' and if read will result in failed reads being stored in
+  SMART logs. 'wol' means 'without logging' and will not log any read
+  failures in the SMART log.
+
+  Relevant options: input file.
+
+**security-erase**
+
+  *path* is a block device. Issues an ATA Security Erase command to
+  the device. What this means specifically is device specific but
+  generally it is supposed to be like a low-level format. Use with
+  care.
+
+  Requires captcha.
+
+  Relevant options: captcha.
+
+**enhanced-security-erase**
+
+  Theoretically a more thorough version of the standard ATA Security
+  Erase command. Similarly its function depends on the device and may
+  be the same as the regular security erase.
+
+  Requires captcha.
+
+  Relevant options: captcha.
+
+EXAMPLES
+========
+
+| # bbf info /dev/sdb
+| /dev/sdi:
+|  - serial_number: XXXXXXXX
+|  - firmware_revision: SC61
+|  - model_number: ST8000VN0022-2EL112
+|  - RPM: 7200
+|  - features:
+|    - form_factor: 3.5"
+|    - write_uncorrectable: 1
+|    - smart_supported: 1
+|    - smart_enabled: 1
+|    - security_supported: 1
+|    - security_enabled: 0
+|    - security_locked: 0
+|    - security_frozen: 0
+|    - security_count_expired: 0
+|    - security_enhanced_erase_supported: 1
+|    - security_normal_erase_time: 698
+|    - security_enhanced_erase_time: 698
+|    - block_erase: 0
+|    - overwrite: 1
+|    - crypto_scramble: 0
+|    - sanitize: 1
+|    - supports_sata_gen1: 1
+|    - supports_sata_gen2: 1
+|    - supports_sata_gen3: 1
+|    - trim_supported: 0
+|  - block_size:
+|    - physical: 4096
+|    - logical: 512
+|    - stepping: 8
+|  - block_count:
+|    - physical: 1953506646
+|    - logical: 15628053168
+|  - size:
+|    - bytes: 8001563222016
+|    - human:
+|      - base2: 7.28TB
+|      - base10: 8.00TiB
+|
+
+| # bbf -S 256 -t ata scan /dev/sdb
+| start block: 0
+| end block: 15628053168
+| stepping: 256
+| logical block size: 512
+| physical block size: 4096
+| read size: 131072
+| Scanning: 0 - 15628053168
+| Current: 2425512192 (15.52%); bps: 179384.74; eta: 20:26:39; bad: 0
+|
+
+| # bbf captcha /dev/sdb
+| Z8400VR0
+|
+
+| # bbf -i ~/badblocks.Z8400VR0 -c Z8400VR0 fix /dev/sdb
+|
+
+| # bbf -q fsthrash /mnt/mydrive0
+| CTRL-C to exit...
+| ^CCleaning up...
+|
+
+| # bbf filethrash /mnt/mydrive0/test
+| Creating file: /mnt/mydrive0/test
+| Expanding file to fill drive: 200209731584 bytes
+| Spawning thrashing threads: 4 (one per core)
+| CTRL-C to exit...
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/bbf-|version|/LICENSE for license information.
+
+AUTHORS
+=======
+
+**bbf** was written by Antonio SJ Musumeci <trapexit@spawn.link>.
+
+This man page created for the SlackBuilds.org project by
+B. Watson. Since it's just copy/pasted from README.md, the man page is
+licensed the same as **bbf** itself.
+
+SEE ALSO
+========
+
+**badblocks**\(8), **smartctl**\(8), **fsck**\(8)
+
+The **bbf** homepage: https://github.com/trapexit/bbf
diff --git a/system/bbf/git2tarxz.sh b/system/bbf/git2tarxz.sh
new file mode 100644
index 0000000000..9c21b0defc
--- /dev/null
+++ b/system/bbf/git2tarxz.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# Create source tarball from git repo
+
+# Note that this script doesn't need to be run as root. It does need to
+# be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create a
+# tarball of. With no arg, HEAD is used.
+
+PRGNAM=bbf
+CLONE_URL=https://github.com/trapexit/bbf
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=${DATE}_${GIT_SHA}
+
+find . -name .git\* -print0 | xargs -0 rm -rf
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/system/bbf/slack-desc b/system/bbf/slack-desc
new file mode 100644
index 0000000000..281878c235
--- /dev/null
+++ b/system/bbf/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+bbf: bbf (bad block finder)
+bbf:
+bbf: bbf is a safer and more featureful tool for dealing with bad blocks
+bbf: on hard drives. It's built around the workflow of dealing with hard
+bbf: drive bad blocks. It has a number of features to limit risk in using
+bbf: the tool and provides features to more easily track down what files
+bbf: are affected by the bad blocks found. It also gives you the ability
+bbf: to manually mark blocks as corrupted in cases where a block isn't
+bbf: technically bad, but is causing issues.
+bbf:
+bbf:
diff --git a/system/bbqsql/bbqsql.SlackBuild b/system/bbqsql/bbqsql.SlackBuild
index 986a2d7a82..199aa13c36 100644
--- a/system/bbqsql/bbqsql.SlackBuild
+++ b/system/bbqsql/bbqsql.SlackBuild
@@ -1,14 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bbqsql
 
 # Written by wigums (wigums@protonmail.com)
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bbqsql
 VERSION=${VERSION:-1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -18,7 +21,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,4 +75,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bcache-tools/README b/system/bcache-tools/README
index 7db39a5263..251f258a39 100644
--- a/system/bcache-tools/README
+++ b/system/bcache-tools/README
@@ -1,20 +1,21 @@
 These are the userspace tools required for bcache.
 
-Bcache is a patch for the Linux kernel to use SSDs to cache other block
-devices. For more information, see http://bcache.evilpiepirate.org.
-Documentation for the run time interface is included in the kernel tree, in
-Documentation/bcache.txt.
+Bcache is a patch for the Linux kernel to use SSDs
+to cache other block devices. For more information, see
+http://bcache.evilpiepirate.org. Documentation for the run time
+interface is included in the kernel tree, in Documentation/bcache.txt.
 
 Included:
 
 make-bcache
-Formats a block device for use with bcache. A device can be formatted for use
-as a cache or as a backing device (requires yet to be implemented kernel
-support). The most important option is for specifying the bucket size.
-Allocation is done in terms of buckets, and cache hits are counted per bucket;
-thus a smaller bucket size will give better cache utilization, but poorer write
-performance. The bucket size is intended to be equal to the size of your SSD's
-erase blocks, which seems to be 128k-512k for most SSDs; feel free to
+Formats a block device for use with bcache. A device can be
+formatted for use as a cache or as a backing device (requires yet
+to be implemented kernel support). The most important option is for
+specifying the bucket size. Allocation is done in terms of buckets,
+and cache hits are counted per bucket; thus a smaller bucket size
+will give better cache utilization, but poorer write performance. The
+bucket size is intended to be equal to the size of your SSD's erase
+blocks, which seems to be 128k-512k for most SSDs; feel free to
 experiment.
 
 bcache-super-show
@@ -22,9 +23,9 @@ Prints the bcache superblock of a cache device or a backing device.
 
 Udev rules
 The first half of the rules do auto-assembly and add uuid symlinks
-to cache and backing devices.  If util-linux's libblkid is
+to cache and backing devices. If util-linux's libblkid is
 sufficiently recent (2.24) the rules will take advantage of
-the fact that bcache has already been detected.  Otherwise
+the fact that bcache has already been detected. Otherwise
 they call a small probe-bcache program that imitates blkid.
 
 The second half of the rules add symlinks to cached devices,
diff --git a/system/bcache-tools/bcache-tools.SlackBuild b/system/bcache-tools/bcache-tools.SlackBuild
index 1a90a16932..23d1837843 100644
--- a/system/bcache-tools/bcache-tools.SlackBuild
+++ b/system/bcache-tools/bcache-tools.SlackBuild
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 2014 Nikos Giotis <nikos.giotis@gmail.com>
+#!/bin/bash
+# Copyright 2014-2022 Nikos Giotis <nikos.giotis@gmail.com>, Athens, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -19,35 +19,55 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20221201 ng: 
+# - move some files back in /lib/udev, there other udev related executables
+#   in /lib/udev directory also. This way they are available and included
+#   to the initrd.gz created by mkinitrd for early boot device discovery.
+# - move bcache-super-show to /lib/udev also for initrd inclusion.
+# - strip binaries the standard slackbuilds.org way
+# - update the package version and get the sources from kernel.org
+# 20220404 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - i486 => i586.
+# - move probe-bcache and bcache-register binaries to /usr/sbin.
+# - strip binaries.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bcache-tools
-VERSION=${VERSION:-1.0.8}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20221201_2499ff2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+SRCVER=2499ff2dd78f236c7809016be5dfff836454396b
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fgnu89-inline"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fgnu89-inline"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -fgnu89-inline"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fgnu89-inline"
   LIBDIRSUFFIX=""
 fi
 
@@ -57,8 +77,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
 
 # Patches for slackware compatibility
 # Disable initramfs, initcpio and dracut installations from 'make install' step
@@ -70,14 +90,13 @@ zcat $CWD/udev-rules-no-run-builtin.patch.gz | patch -p0 --verbose
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Build
-cd $TMP/$PRGNAM-$VERSION
+cd $TMP/$PRGNAM-$SRCVER
 
-CC="gcc -fgnu89-inline" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 make
@@ -88,20 +107,43 @@ mkdir -p $PKG/lib/udev/rules.d
 mkdir -p $PKG/usr/share/man/man8
 make install DESTDIR=$PKG
 
-# Man pages
+# Move bcache-super-show in /lib/udev as it is needed by bcache-export-cached
+mv $PKG/usr/sbin/bcache-super-show $PKG/lib/udev
+
+# Move /usr/sbin/* to /sbin
+mkdir -p $PKG/sbin
+mv $PKG/usr/sbin/* $PKG/sbin
+rmdir $PKG/usr/sbin
+
+# Link bcache-super-show back to /sbin
+pushd $PKG/sbin
+ln -s /lib/udev/bcache-super-show bcache-super-show
+popd
+
+sed -i "s,bcache-super-show,/lib/udev/bcache-super-show," $PKG/lib/udev/bcache-export-cached
+
+# Use absolute paths in udev rules
+for i in probe-bcache bcache-register bcache-export-cached; do
+    sed -i "s,$i,/lib/udev/$i," $PKG/lib/udev/rules.d/*.rules
+done
+
+# Man pages in wrong place, move and gzip.
 mv $PKG/usr/share/man $PKG/usr/
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-rm -rf $PKG/usr/share
+gzip -9 $PKG/usr/man/man*/*
+rmdir $PKG/usr/share
+
+# strip executables
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Documentation
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $TMP/$PRGNAM-$VERSION/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
-cat $TMP/$PRGNAM-$VERSION/COPYING > $PKG/usr/doc/$PRGNAM-$VERSION/COPYING
+cat $TMP/$PRGNAM-$SRCVER/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+cat $TMP/$PRGNAM-$SRCVER/COPYING > $PKG/usr/doc/$PRGNAM-$VERSION/COPYING
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bcache-tools/bcache-tools.info b/system/bcache-tools/bcache-tools.info
index e370867f29..c2b626b897 100644
--- a/system/bcache-tools/bcache-tools.info
+++ b/system/bcache-tools/bcache-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="bcache-tools"
-VERSION="1.0.8"
-HOMEPAGE="https://github.com/g2p/bcache-tools"
-DOWNLOAD="https://github.com/g2p/bcache-tools/archive/v1.0.8.tar.gz"
-MD5SUM="d1632a7c37214e0aa38f3cf95624fa46"
+VERSION="20221201_2499ff2"
+HOMEPAGE="https://bcache.evilpiepirate.org/"
+DOWNLOAD="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/snapshot/bcache-tools-2499ff2dd78f236c7809016be5dfff836454396b.tar.gz"
+MD5SUM="7479efa6b5f028075f67321361ded039"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/beebem/beebem.SlackBuild b/system/beebem/beebem.SlackBuild
index 7a2d3c3c1e..58a81e3e09 100644
--- a/system/beebem/beebem.SlackBuild
+++ b/system/beebem/beebem.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for beebem
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=beebem
 VERSION=${VERSION:-0.0.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -113,4 +123,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bees/README b/system/bees/README
new file mode 100644
index 0000000000..88041ffa13
--- /dev/null
+++ b/system/bees/README
@@ -0,0 +1,33 @@
+bees (Best-Effort Extent-Same) is a block-oriented userspace
+deduplication agent designed for large btrfs filesystems. It is an
+offline dedupe combined with an incremental data scan capability to
+minimize time data spends on disk from write to dedupe.
+
+Strengths:
+  * Space-efficient hash table and matching algorithms - can use as
+    little as 1 GB hash table per 10 TB unique data (0.1GB/TB)
+  * Daemon incrementally dedupes new data using btrfs tree search
+  * Works with btrfs compression - dedupe any combination of compressed
+    and uncompressed files
+  * Works around btrfs filesystem structure to free more disk space
+  * Persistent hash table for rapid restart after shutdown
+  * Whole-filesystem dedupe - including snapshots
+  * Constant hash table size - no increased RAM usage if data set
+    becomes larger
+  * Works on live data - no scheduled downtime required
+  * Automatic self-throttling based on system load
+
+Weaknesses:
+  * Whole-filesystem dedupe - has no include/exclude filters, does not
+    accept file lists
+  * Requires root privilege (or CAP_SYS_ADMIN)
+  * First run may require temporary disk space for extent reorganization
+  * First run may increase metadata space usage if many snapshots exist
+  * Constant hash table size - no decreased RAM usage if data set
+    becomes smaller
+  * btrfs only
+
+After installing, edit /etc/rc.d/rc.bees.conf, /etc/logrotate.d/bees,
+and /etc/bees/*.conf, and ensure /etc/rc.d/rc.bees is started from
+/etc/rc.d/rc.local. To drastically reduce the amount of logging it is
+recommended to add "-v 6" to OPTIONS in /etc/bees/*.conf.
diff --git a/system/bees/bees.SlackBuild b/system/bees/bees.SlackBuild
new file mode 100644
index 0000000000..807d885a3d
--- /dev/null
+++ b/system/bees/bees.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+# Slackware build script for bees
+
+# Copyright 2023 Erich Ritz, Jenks, Oklahoma, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=bees
+VERSION=${VERSION:-0.10}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make reallyall LIBDIR=lib$LIBDIRSUFFIX BEES_VERSION=$VERSION
+
+make install LIBDIR=lib$LIBDIRSUFFIX DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+install -D -m0755 -oroot -groot $CWD/rc.bees $PKG/etc/rc.d/rc.bees.new
+install -D -m0644 -oroot -groot $CWD/rc.bees.conf $PKG/etc/rc.d/rc.bees.conf.new
+install -D -m0644 -oroot -groot $CWD/bees.logrotate $PKG/etc/logrotate.d/bees.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/docs
+cp -a \
+  README.md README.html COPYING \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  docs/*.html docs/*.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION/docs
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bees/bees.info b/system/bees/bees.info
new file mode 100644
index 0000000000..9757716342
--- /dev/null
+++ b/system/bees/bees.info
@@ -0,0 +1,10 @@
+PRGNAM="bees"
+VERSION="0.10"
+HOMEPAGE="https://zygo.github.io/bees/"
+DOWNLOAD="https://github.com/Zygo/bees/archive/v0.10/bees-0.10.tar.gz"
+MD5SUM="2c90623e9867c4dcda4b4ef471372da8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Erich Ritz"
+EMAIL="erich.public@protonmail.com"
diff --git a/system/bees/bees.logrotate b/system/bees/bees.logrotate
new file mode 100644
index 0000000000..0a29113ff3
--- /dev/null
+++ b/system/bees/bees.logrotate
@@ -0,0 +1,7 @@
+/var/log/bees.log {
+    copytruncate
+    compress
+    notifempty
+    missingok
+    size 10M
+}
diff --git a/system/bees/doinst.sh b/system/bees/doinst.sh
new file mode 100644
index 0000000000..cf069623bf
--- /dev/null
+++ b/system/bees/doinst.sh
@@ -0,0 +1,27 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.bees.new
+config etc/rc.d/rc.bees.conf.new
+config etc/logrotate.d/bees.new
diff --git a/system/bees/rc.bees b/system/bees/rc.bees
new file mode 100644
index 0000000000..e28122e496
--- /dev/null
+++ b/system/bees/rc.bees
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+declare -a UUIDS
+declare -a LOGFILES
+
+. /etc/rc.d/rc.bees.conf
+
+umount_uuid()
+{
+	UUID="$1"
+	MNT="/run/bees/mnt/$UUID"
+	# Try for up to 10 seconds and then bail out
+	for _ in {1..10} ; do
+		umount "$MNT" > /dev/null 2>&1
+		if mountpoint -q "$MNT" ; then
+			sleep 1
+		else
+			break
+		fi
+	done
+}
+
+bees_start()
+{
+	for i in "${!UUIDS[@]}" ; do
+		UUID="${UUIDS[$i]}"
+		LOGFILE="${LOGFILES[$i]}"
+		umount_uuid "$UUID"
+		nice -n 15 ionice -c 3 daemon --name="bees.$UUID" --output="$LOGFILE" -- beesd "$UUID"
+	done
+}
+
+bees_stop()
+{
+	for UUID in "${UUIDS[@]}" ; do
+		daemon --name="bees.$UUID" --stop
+		umount_uuid "$UUID"
+	done
+}
+
+bees_status()
+{
+	for UUID in "${UUIDS[@]}" ; do
+		daemon --name="bees.$UUID" --running --verbose
+	done
+}
+
+bees_forcestop()
+{
+	killall bees
+}
+
+case "$1" in
+	'start')
+		bees_start
+		;;
+	'stop')
+		bees_stop
+		;;
+	'status')
+		bees_status
+		;;
+	'forcestop')
+		bees_forcestop
+		;;
+	*)
+		echo "usage $0 start|stop|status|forcestop"
+		;;
+esac
diff --git a/system/bees/rc.bees.conf b/system/bees/rc.bees.conf
new file mode 100644
index 0000000000..9bfc8aecf4
--- /dev/null
+++ b/system/bees/rc.bees.conf
@@ -0,0 +1,18 @@
+# Find the UUID of btrfs filesystems by executing the command:
+#
+#   btrfs filesystem show
+#
+# For each filesystem, define UUIDS[#] and LOGFILES[#] to set the UUID
+# and log file location. Don't foget to update /etc/logrotate.d/bees
+# when adding new log files.
+#
+# Each btrfs filesystem should have a corresponding conf file in
+# /etc/bees/*.conf. See /etc/bees/beesd.conf.sample.
+
+## btrfs filesystem #1
+#UUIDS[0]=11111111-1111-1111-1111-111111111111
+#LOGFILES[0]=/var/log/bees.log
+
+## btrfs filesystem #2
+#UUIDS[1]=22222222-2222-2222-2222-222222222222
+#LOGFILES[1]=/var/log/bees_2.log
diff --git a/system/bees/slack-desc b/system/bees/slack-desc
new file mode 100644
index 0000000000..47e2e82afe
--- /dev/null
+++ b/system/bees/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+bees: bees (Best-Effort Extent-Same)
+bees:
+bees: bees is a block-oriented userspace deduplication agent designed for
+bees: large btrfs filesystems. It is an offline dedupe combined with an
+bees: incremental data scan capability to minimize time data spends on disk
+bees: from write to dedupe.
+bees:
+bees: Homepage: https://zygo.github.io/bees/
+bees:
+bees:
+bees:
diff --git a/system/betty/README b/system/betty/README
index 5268b6aa61..4224c15016 100644
--- a/system/betty/README
+++ b/system/betty/README
@@ -6,8 +6,5 @@ run into situations like this.
 This means you don't have to leave your command line to look up an
 obscure but useful command. Just ask Betty!
 
-
-Optional Dependency
-
 If you want enable the speak functionality, install espeak or any
-equivalent software and speech-dispatcher.
+equivalent software.
diff --git a/system/betty/betty.SlackBuild b/system/betty/betty.SlackBuild
index d72ab0c2c8..f7f123ec35 100644
--- a/system/betty/betty.SlackBuild
+++ b/system/betty/betty.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for betty
 # Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
@@ -22,10 +22,13 @@
 # along with this program (most likely, a file named COPYING).  If
 # not, see <http://www.gnu.org/licenses/>.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=betty
 VERSION=${VERSION:-0.1.7}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -68,4 +78,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bicon/README b/system/bicon/README
index d6bb8e8389..a6ed3a7559 100644
--- a/system/bicon/README
+++ b/system/bicon/README
@@ -1,21 +1,16 @@
 BiCon: a Bidirectional Console
 
-BiCon can be used under Linux console, or terminal emulators with
+BiCon can be used under the Linux console, or terminal emulators with
 basic Unicode rendering (UTF-8).
 
-Run "bicon" to get a console supporting Arabic or Persian according
-to LANG or specify the country on the command line, for instance:
+Run "bicon" to get a console supporting Arabic or Persian according to
+LANG or specify the country on the command line, for instance:
+
   bicon ir # for Persian (Iran)
 
 Keymaps and fonts for Arabic and Persian are included. 
 
 Use alt+shift to switch keyboard layouts in a graphical environment.
-To know more:
-
-  "man bicon"
-and
-  "man bicon.bin"
+For more information: "man bicon" and "man bicon.bin".
 
 See also /usr/doc/bicon-<VERSION>/README.Slackware for BiCon's usage.
-
-BiCon is maintained by Behdad Esfahbod.
diff --git a/system/bicon/README.Slackware b/system/bicon/README.Slackware
index 5b3b0d83f5..af0c204066 100644
--- a/system/bicon/README.Slackware
+++ b/system/bicon/README.Slackware
@@ -14,31 +14,31 @@ depends whether the "bicon" command is given or not an argument.
 
 1) If started as "bicon" from the console.
 
-If a two characters country code is given as argument it is considered
+If a two character country code is given as argument it is considered
 to choose the keymap, else the country (or "territory" to be accurate)
 part of LANG is used.
-_ If the country (converted to lowercase letters) is found in this list:
+- If the country (converted to lowercase letters) is found in this list:
   ae dz eg iq jo ko kw lb ly ma om qa sa sd sy tn ye
   then the keymap "arabic" is chosen.
-_ If the country is "IR" or "ir" then the keymap "ir" is chosen.
+- If the country is "IR" or "ir" then the keymap "ir" is chosen.
 
 The font bicon-8x16-512 is always used with its Unicode map.
 
 IMPORTANT. You won't be able to use the "setfont" command after having
-started bicon as a regular user. You will have to tentatively become root
+started bicon as a regular user. You will have to temporarily become root
 with "su" to change the font if you want.
 
 2) If started as "bicon" from an X terminal.
 
-You will need to use an UTF-8 able or enabled terminal.
+You will need to use an UTF-8 capable or enabled terminal.
 
-A switchable keyboard layout (us + the language that correspond to the
+A switchable keyboard layout (US + the language that corresponds to the
 country set by the user or found in LANG) is set.
 
 IMPORTANT:
-_ BiCon doesn't set the font. You'll have to do that yourself. Be careful
+- BiCon doesn't set the font. You'll have to do that yourself. Be careful
   to use a font including the needed glyphs.
-_ BiCon sets the "option" for the X server to:
+- BiCon sets the "option" for the X server to:
     "grp:alt_shift_toggle,grp_led:scroll"
   and the "layout" to:
     "us,<ir or (country code)>"
@@ -55,14 +55,14 @@ one (after having started BiCon, of course):
     -print | \
   xkbcomp -w 2 - "$DISPLAY"
 
-3) If started as bicon.bin, BiCon doesn't load any font or keyboard.
+3) If started as bicon.bin, BiCon doesn't load any font or keymap.
 You might prefer it that way if you want to keep your own settings.
 
 Reference: file bin/bicon.in in the source archive.
 
 See also:
-_ man bicon
-_ man bicon.bin
-_ documents in /usr/doc/bicon-<version>
+- man bicon
+- man bicon.bin
+- documents in /usr/doc/bicon-<version>
 
 Didier Spaier <didier at slint dot fr>, 27/07/2015
diff --git a/system/bicon/bicon.SlackBuild b/system/bicon/bicon.SlackBuild
index 9e3d0f1fc5..65ece85f29 100644
--- a/system/bicon/bicon.SlackBuild
+++ b/system/bicon/bicon.SlackBuild
@@ -1,31 +1,25 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bicon
 
-# Copyright 2015 Didier Spaier Paris, France
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Originally written by Didier Spaier Paris, France
+# Now maintained by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20220110 bkw:
+# - take over maintenance.
+# - relicense as WTFPL.
+# - simplify build.
+# - slight grammar/typo fixes.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=bicon
 VERSION=${VERSION:-0.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +29,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -63,13 +61,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 ./autogen.sh
 CFLAGS="$SLKCFLAGS" \
@@ -84,19 +77,13 @@ CFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS NEWS README THANKS TODO COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 
-# The file HISTORY is missing in the source tarball but can be of interest
-# to some.
+# This is missing in the source tarball but could be of interest to some:
 cp $CWD/HISTORY $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -107,4 +94,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bicon/bicon.info b/system/bicon/bicon.info
index 8f47b3eb8c..8c75aae99d 100644
--- a/system/bicon/bicon.info
+++ b/system/bicon/bicon.info
@@ -6,5 +6,5 @@ MD5SUM="862972ed260f9e74277b8eeb7c81e126"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Didier Spaier"
-EMAIL="didier at slint dot fr"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/bicon/slack-desc b/system/bicon/slack-desc
index 883c32ee72..99743845f7 100644
--- a/system/bicon/slack-desc
+++ b/system/bicon/slack-desc
@@ -8,7 +8,7 @@
      |-----handy-ruler------------------------------------------------------|
 bicon: bicon (a Bidirectional Console)
 bicon:
-bicon: BiCon can be used under Linux console, or terminal emulators with
+bicon: BiCon can be used under the Linux console, or terminal emulators with
 bicon: basic Unicode rendering (UTF-8).
 bicon:
 bicon: Run "bicon" to get a console supporting Arabic or Persian according
diff --git a/system/biew/biew.SlackBuild b/system/biew/biew.SlackBuild
index f07b2dbb1c..eefc88edae 100644
--- a/system/biew/biew.SlackBuild
+++ b/system/biew/biew.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for biew
 # Written by Oleg O. Chukaev <oleg.chukaev@mail.ru>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=biew
 VERSION=${VERSION:-6.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRC_VERSION=$(echo $VERSION | tr -d .)
 
@@ -18,7 +21,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -84,4 +94,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bin2iso/bin2iso.SlackBuild b/system/bin2iso/bin2iso.SlackBuild
index 91ef15daf5..3bb700fe98 100644
--- a/system/bin2iso/bin2iso.SlackBuild
+++ b/system/bin2iso/bin2iso.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bin2iso
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bin2iso
 VERSION=${VERSION:-19b}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -82,4 +92,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bindfs/bindfs.SlackBuild b/system/bindfs/bindfs.SlackBuild
index 390476cdfd..8adc891c04 100644
--- a/system/bindfs/bindfs.SlackBuild
+++ b/system/bindfs/bindfs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bindfs
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bindfs
-VERSION=${VERSION:-1.14.7}
+VERSION=${VERSION:-1.17.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -96,4 +106,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bindfs/bindfs.info b/system/bindfs/bindfs.info
index e37c36f5ad..0bc6cf3b25 100644
--- a/system/bindfs/bindfs.info
+++ b/system/bindfs/bindfs.info
@@ -1,8 +1,8 @@
 PRGNAM="bindfs"
-VERSION="1.14.7"
+VERSION="1.17.2"
 HOMEPAGE="https://bindfs.org"
-DOWNLOAD="https://bindfs.org/downloads/bindfs-1.14.7.tar.gz"
-MD5SUM="047ca696707077c05d2d995fbd9aec7d"
+DOWNLOAD="https://bindfs.org/downloads/bindfs-1.17.2.tar.gz"
+MD5SUM="9c76790ae2437d87bbc07e1ea1beefea"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/binfmt-support/README b/system/binfmt-support/README
index 3ee4608e5e..d85003a7cc 100644
--- a/system/binfmt-support/README
+++ b/system/binfmt-support/README
@@ -1,23 +1,25 @@
 binfmt-support
 
-The binfmt_misc kernel module, contained in versions 2.1.43 and later of the
-Linux kernel, allows system administrators to register interpreters for
-various binary formats based on a magic number or their file extension, and
-cause the appropriate interpreter to be invoked whenever a matching file is
-executed. Think of it as a more flexible version of the #! executable
-interpreter mechanism.
+The binfmt_misc kernel module, contained in versions 2.1.43 and
+later of the Linux kernel, allows system administrators to register
+interpreters for various binary formats based on a magic number or
+their file extension, and cause the appropriate interpreter to be
+invoked whenever a matching file is executed. Think of it as a more
+flexible version of the #! executable interpreter mechanism.
 
 binfmt-support provides an update-binfmts script with which package
-maintainers can register interpreters to be used with this module without
-having to worry about writing their own init.d scripts, and which sysadmins
-can use for a slightly higher-level interface to this module.
+maintainers can register interpreters to be used with this module
+without having to worry about writing their own init.d scripts, and
+which sysadmins can use for a slightly higher-level interface to this
+module.
 
 You will want to add an fstab entry for binfmt_misc:
 
     none /proc/sys/fs/binfmt_misc binfmt_misc defaults 0 0
 
-You will also want to make sure the binfmt_misc kernel module is loaded at
-boot by adding '/sbin/modprobe binfmt_misc' to /etc/rc.d/rc.modules.local.
+You will also want to make sure the binfmt_misc kernel module
+is loaded at boot by adding '/sbin/modprobe binfmt_misc' to
+/etc/rc.d/rc.modules.local.
 
 To have binfmt-support start and stop with your host,
 add to /etc/rc.d/rc.local:
diff --git a/system/binfmt-support/binfmt-support.SlackBuild b/system/binfmt-support/binfmt-support.SlackBuild
index b60ef0d36d..b817dd5f14 100644
--- a/system/binfmt-support/binfmt-support.SlackBuild
+++ b/system/binfmt-support/binfmt-support.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for binfmt-support
 
 # Copyright 2019-2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2022 Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=binfmt-support
-VERSION=${VERSION:-2.2.1}
+VERSION=${VERSION:-2.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +39,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -103,7 +111,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING ChangeLog-2013 NEWS \
+  COPYING ChangeLog-2013 NEWS.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -112,4 +120,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/binfmt-support/binfmt-support.info b/system/binfmt-support/binfmt-support.info
index bf6c570f5a..d8a44dd6d8 100644
--- a/system/binfmt-support/binfmt-support.info
+++ b/system/binfmt-support/binfmt-support.info
@@ -1,10 +1,10 @@
 PRGNAM="binfmt-support"
-VERSION="2.2.1"
-HOMEPAGE="http://binfmt-support.nongnu.org/"
-DOWNLOAD="http://deb.debian.org/debian/pool/main/b/binfmt-support/binfmt-support_2.2.1.orig.tar.gz"
-MD5SUM="c62b74a8862575f321f8c1ef3e4b8a2e"
+VERSION="2.2.2"
+HOMEPAGE="https://gitlab.com/cjwatson/binfmt-support"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/b/binfmt-support/binfmt-support_2.2.2.orig.tar.gz"
+MD5SUM="97e366d9c6f68d8cd0ae5f47eb3c0735"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="man-db"
+REQUIRES=""
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
diff --git a/system/binfmt-support/slack-desc b/system/binfmt-support/slack-desc
index 1d7129136e..9a6d69ee7d 100644
--- a/system/binfmt-support/slack-desc
+++ b/system/binfmt-support/slack-desc
@@ -15,5 +15,5 @@ binfmt-support: init.d scripts, and which sysadmins can use for a slightly
 binfmt-support: higher-level interface to this module.
 binfmt-support:
 binfmt-support:
-binfmt-support: https://nongnu.org/binfmt-support/
+binfmt-support: https://gitlab.com/cjwatson/binfmt-support
 binfmt-support:
diff --git a/system/bit-babbler/bit-babbler.SlackBuild b/system/bit-babbler/bit-babbler.SlackBuild
index c8344c1afb..c3263647db 100644
--- a/system/bit-babbler/bit-babbler.SlackBuild
+++ b/system/bit-babbler/bit-babbler.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # SlackBuild for bit-babbler, 7 March 2019
 # awg <awg@cock.li>
@@ -20,10 +20,13 @@
 ## The BitBabbler software itself remains a copyrighted work.  Please
 ## see the file 'copyright' in the bit-babbler source distribution.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bit-babbler
 VERSION=${VERSION:-0.8}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -33,7 +36,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -112,4 +122,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bit-babbler/bit-babbler.info b/system/bit-babbler/bit-babbler.info
index ec82ad4667..4436260375 100644
--- a/system/bit-babbler/bit-babbler.info
+++ b/system/bit-babbler/bit-babbler.info
@@ -1,7 +1,7 @@
 PRGNAM="bit-babbler"
 VERSION="0.8"
 HOMEPAGE="http://bitbabbler.org/"
-DOWNLOAD="http://bitbabbler.org/downloads/bit-babbler_0.8.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/bit-babbler_0.8.tar.gz"
 MD5SUM="1def2a04c9f0783d8cc466b64b6b118e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/bitmapfont2ttf/README b/system/bitmapfont2ttf/README
index 1c9b9a50e0..f3470e7680 100644
--- a/system/bitmapfont2ttf/README
+++ b/system/bitmapfont2ttf/README
@@ -6,7 +6,7 @@ The resulting font retains its "pixelated" look when scaled up to any
 size.
 
 bitmapfont2ttf is a bit picky about the BDF fonts it will accept as
-input.  This build includes a patch that allows it to work with fonts
+input. This build includes a patch that allows it to work with fonts
 produced by psf2bdf (from psftools). The patch is applied by default,
 but you can export PRISTINE=yes in the environment if you really don't
 want it.
diff --git a/system/bitmapfont2ttf/bitmapfont2ttf.SlackBuild b/system/bitmapfont2ttf/bitmapfont2ttf.SlackBuild
index 683b4abfce..6f96760be5 100644
--- a/system/bitmapfont2ttf/bitmapfont2ttf.SlackBuild
+++ b/system/bitmapfont2ttf/bitmapfont2ttf.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bitmapfont2ttf
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
@@ -12,10 +12,13 @@
 # https://github.com/wernsey/bitmap.git
 # ...plus some minor fixes by me to get exact-autotrace to compile.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bitmapfont2ttf
 VERSION=${VERSION:-20200215_03529d2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -25,7 +28,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -79,4 +86,4 @@ mkdir -p $PKG/install
 sed "16s/$/$PATCHDESC/" $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bitmapfont2ttf/bitmapfont2ttf.info b/system/bitmapfont2ttf/bitmapfont2ttf.info
index a245e0f4b4..3ad98e5bf1 100644
--- a/system/bitmapfont2ttf/bitmapfont2ttf.info
+++ b/system/bitmapfont2ttf/bitmapfont2ttf.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://slackware.uk/~urchlay/src/bitmapfont2ttf-20200215_03529d2.tar.
 MD5SUM="5f4ab36a5d56c79e28ce38841f063bdc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="fontforge"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/bitrot/bitrot.SlackBuild b/system/bitrot/bitrot.SlackBuild
index 4ad60bbf1a..527810b281 100644
--- a/system/bitrot/bitrot.SlackBuild
+++ b/system/bitrot/bitrot.SlackBuild
@@ -1,7 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bitrot
 
+# Copyright © 2023 Logan Rathbone, Province of Ontario, Canada
+# Copyright 2022 Brandon Pribula, BC Canada
 # Copyright 2018 Donald Cooley South Haven, Indiana USA
 # All rights reserved.
 #
@@ -22,10 +24,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bitrot
-VERSION=${VERSION:-0.9.2}
+VERSION=${VERSION:-1.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,19 +78,22 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
+export PYTHONPATH=/opt/python$PYVER/site-packages/
+
+python3 -m build --no-isolation
+python3 -m installer -d "$PKG" dist/*.whl
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README.rst \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bitrot/bitrot.info b/system/bitrot/bitrot.info
index 4122aadd5b..d1670622e7 100644
--- a/system/bitrot/bitrot.info
+++ b/system/bitrot/bitrot.info
@@ -1,10 +1,10 @@
 PRGNAM="bitrot"
-VERSION="0.9.2"
+VERSION="1.0.1"
 HOMEPAGE="https://github.com/ambv/bitrot"
-DOWNLOAD="https://github.com/ambv/bitrot/archive/0.9.2/bitrot-0.9.2.tar.gz"
-MD5SUM="ff3f84fee6f2b543b8e89ec306e2353e"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/b/bitrot/bitrot-1.0.1.tar.gz"
+MD5SUM="ab20267b7050bfb38f1d08a6c2e1fdf8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+REQUIRES="python3-setuptools-opt"
+MAINTAINER="Brandon Pribula"
+EMAIL="b.pribs11@gmail.com"
diff --git a/system/bitrot/slack-desc b/system/bitrot/slack-desc
index f0b85c20ec..bf299a99d1 100644
--- a/system/bitrot/slack-desc
+++ b/system/bitrot/slack-desc
@@ -15,5 +15,5 @@ bitrot:
 bitrot:
 bitrot:
 bitrot:
+bitrot: Homepage:  https://github.com/ambv/bitrot
 bitrot:
-bitrot: https://github.com/ambv/bitrot
diff --git a/system/blake2/README b/system/blake2/README
index 92db1e0cd4..389d3c60ba 100644
--- a/system/blake2/README
+++ b/system/blake2/README
@@ -3,3 +3,7 @@ the SHA-3 finalist BLAKE. BLAKE2 offers the highest security, yet is
 fast as MD5 on 64-bit platforms and requires less RAM.
 
 This script builds the b2sum binary.
+
+Note: if you get 'illegal instruction' errors from b2sum at runtime,
+this is due to upstream's use of -march=native optimization. Rebuild
+the package with FORCE_SLACK_CFLAGS=yes to avoid this.
diff --git a/system/blake2/blake2.SlackBuild b/system/blake2/blake2.SlackBuild
index ee33615ac3..a586a1ed2a 100644
--- a/system/blake2/blake2.SlackBuild
+++ b/system/blake2/blake2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for blake2
 
@@ -22,11 +22,18 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - use SLKCFLAGS.
+# - install binary stripped.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=blake2
 VERSION=${VERSION:-20160619}
 SRCNAM=BLAKE2
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,11 +43,16 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# 20220404 bkw: nothing here uses LIBDIRSUFFIX.
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -66,15 +78,17 @@ cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
+[ "${FORCE_SLACK_CFLAGS:-no}" = "yes" ] && export CFLAGS="$SLKCFLAGS"
 cd b2sum
 make
 
+
 mkdir -p $PKG/usr/bin
-install -m 0755 b2sum $PKG/usr/bin/b2sum
+install -s -m 0755 b2sum $PKG/usr/bin/b2sum
 
 cd ..
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -85,4 +99,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bleachbit/bleachbit.SlackBuild b/system/bleachbit/bleachbit.SlackBuild
index 5309956821..b0b44c04d4 100644
--- a/system/bleachbit/bleachbit.SlackBuild
+++ b/system/bleachbit/bleachbit.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for bleachbit
 #
 # Copyright 2013-2018  Erwin van Zanten, Dordrecht, The Netherlands, Europe
-# Copyright 2018-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2018-2023  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,20 +23,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bleachbit
-VERSION=${VERSION:-4.2.0}
+VERSION=${VERSION:-4.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -85,4 +89,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bleachbit/bleachbit.info b/system/bleachbit/bleachbit.info
index b2b644d918..e489424c8c 100644
--- a/system/bleachbit/bleachbit.info
+++ b/system/bleachbit/bleachbit.info
@@ -1,10 +1,10 @@
 PRGNAM="bleachbit"
-VERSION="4.2.0"
+VERSION="4.6.0"
 HOMEPAGE="https://www.bleachbit.org/"
-DOWNLOAD="https://github.com/bleachbit/bleachbit/archive/v4.2.0/bleachbit-4.2.0.tar.gz"
-MD5SUM="39856abb5f3a0bdadf83b07609bed3e3"
+DOWNLOAD="https://github.com/bleachbit/bleachbit/archive/v4.6.0/bleachbit-4.6.0.tar.gz"
+MD5SUM="b2b70dbe3156f1612c2c1b7a4020c20a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pygobject3-python3"
+REQUIRES=""
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/system/blktrace/blktrace.SlackBuild b/system/blktrace/blktrace.SlackBuild
index 2661d00a2c..a20e4aaf0d 100644
--- a/system/blktrace/blktrace.SlackBuild
+++ b/system/blktrace/blktrace.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for blktrace
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=blktrace
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -74,4 +84,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/blktrace/blktrace.info b/system/blktrace/blktrace.info
index bfa19c5b18..5adba8f74d 100644
--- a/system/blktrace/blktrace.info
+++ b/system/blktrace/blktrace.info
@@ -1,8 +1,8 @@
 PRGNAM="blktrace"
-VERSION="1.2.0"
+VERSION="1.3.0"
 HOMEPAGE="https://brick.kernel.dk/snaps/"
-DOWNLOAD="https://brick.kernel.dk/snaps/blktrace-1.2.0.tar.gz"
-MD5SUM="05abb873b4de96c5e7b2deba80695bf1"
+DOWNLOAD="https://brick.kernel.dk/snaps/blktrace-1.3.0.tar.gz"
+MD5SUM="3319fd00260a52edbcc562af2593d34d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/blocaled/README b/system/blocaled/README
new file mode 100644
index 0000000000..47cc18d427
--- /dev/null
+++ b/system/blocaled/README
@@ -0,0 +1,8 @@
+Blocaled provides a stand-alone implementation of the localed D-Bus
+service. This is useful for things like gnome applications that utilize
+the localed service.
+
+blocaled is maintained by BLFS editor Pierre Labastie, for the specific
+needs of the BLFS project, but may be used on any system implementing
+the libgio library.
+
diff --git a/system/blocaled/blocaled.SlackBuild b/system/blocaled/blocaled.SlackBuild
new file mode 100644
index 0000000000..22db5089a7
--- /dev/null
+++ b/system/blocaled/blocaled.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+# Slackware build script for blocaled
+
+# Copyright 2022 Bob Funk Winnipeg, Canada
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=blocaled
+VERSION=${VERSION:-0.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux \
+  --with-localeconfig=/var/lib/blocaled/gnome-locale.conf \
+  --with-keyboardconfig=/var/lib/blocaled/gnome-locale.conf \
+  --with-xkbdconfig=/etc/X11/xorg.conf.d/91-keyboard-layout-libinput.conf
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/blocaled/blocaled.info b/system/blocaled/blocaled.info
new file mode 100644
index 0000000000..27724abf3d
--- /dev/null
+++ b/system/blocaled/blocaled.info
@@ -0,0 +1,10 @@
+PRGNAM="blocaled"
+VERSION="0.5"
+HOMEPAGE="https://github.com/lfs-book/blocaled"
+DOWNLOAD="https://github.com/lfs-book/blocaled/releases/download/v0.5/blocaled-0.5.tar.xz"
+MD5SUM="04d9833d0dfbf3609b0d8f6d276812ff"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libdaemon"
+MAINTAINER="Bob Funk"
+EMAIL="bobfunk11@gmail.com"
diff --git a/system/blocaled/slack-desc b/system/blocaled/slack-desc
new file mode 100644
index 0000000000..48682f2c7b
--- /dev/null
+++ b/system/blocaled/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+blocaled: blocaled (localed D-Bus service)
+blocaled:
+blocaled: The blocaled daemon implements the standard localed (i.e. 
+blocaled: org.freedesktop.locale1) D-Bus interface as a stand-alone daemon.
+blocaled:
+blocaled:
+blocaled:
+blocaled:
+blocaled:
+blocaled: https://github.com/lfs-book/blocaled
+blocaled:
diff --git a/system/blocks/blocks.SlackBuild b/system/blocks/blocks.SlackBuild
index cfbdb7ce9d..459b969f01 100644
--- a/system/blocks/blocks.SlackBuild
+++ b/system/blocks/blocks.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for blocks
 
@@ -22,27 +22,37 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=blocks
 COMMIT=d00d8aa2bcb64ef5113de9500220e57049b836b4
 VERSION=${VERSION:-0.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -84,4 +94,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/blocks/blocks.info b/system/blocks/blocks.info
index f173963991..e53cace44d 100644
--- a/system/blocks/blocks.info
+++ b/system/blocks/blocks.info
@@ -1,10 +1,10 @@
 PRGNAM="blocks"
 VERSION="0.1.4"
 HOMEPAGE="https://github.com/g2p/blocks"
-DOWNLOAD="https://github.com/g2p/blocks/archive/d00d8aa2bcb64ef5113de9500220e57049b836b4.tar.gz"
+DOWNLOAD="https://github.com/g2p/blocks/archive/d00d8aa2bcb64ef5113de9500220e57049b836b4/blocks-d00d8aa2bcb64ef5113de9500220e57049b836b4.tar.gz"
 MD5SUM="a8576e955f788449e7927800efa71e44"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3 python3-pyparted python3-augeas maintboot"
+REQUIRES="python3-pyparted python3-augeas maintboot"
 MAINTAINER="Nikos Giotis"
 EMAIL="nikos.giotis@gmail.com"
diff --git a/system/blueprint-compiler/README b/system/blueprint-compiler/README
new file mode 100644
index 0000000000..9aaa5bbfa4
--- /dev/null
+++ b/system/blueprint-compiler/README
@@ -0,0 +1,10 @@
+GtkBuilder XML format is quite verbose, and many app developers
+don't like using WYSIWYG editors for creating UIs. Blueprint
+files are intended to be a concise, easy-to-read format that
+makes it easier to create and edit GTK UIs. Internally, it compiles
+to GtkBuilder XML as part of an app's build system. It adds no
+new features, just makes the features that exist more accessible.
+Another goal is to have excellent developer tooling--including a
+language server--so that less knowledge of the format is required.
+Hopefully this will increase adoption of cool advanced features like
+GtkExpression.
diff --git a/system/blueprint-compiler/blueprint-compiler.SlackBuild b/system/blueprint-compiler/blueprint-compiler.SlackBuild
new file mode 100644
index 0000000000..2dfeb9ff78
--- /dev/null
+++ b/system/blueprint-compiler/blueprint-compiler.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+# Slackware build script for blueprint-compiler
+
+# Copyright 2022 Fernando Lopez Jr <fernando.lopezjr@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=blueprint-compiler
+SRCNAM=${PRGNAM}
+VERSION=${VERSION:-0.10.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+NINJA=${NINJA:=ninja}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-v$VERSION.tar.?z2
+mv $SRCNAM-v$VERSION $SRCNAM-$VERSION
+cd $SRCNAM-$VERSION
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true
+  $NINJA
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  *.md COPYING \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/blueprint-compiler/blueprint-compiler.info b/system/blueprint-compiler/blueprint-compiler.info
new file mode 100644
index 0000000000..a6bc02e240
--- /dev/null
+++ b/system/blueprint-compiler/blueprint-compiler.info
@@ -0,0 +1,10 @@
+PRGNAM="blueprint-compiler"
+VERSION="0.10.0"
+HOMEPAGE="https://gitlab.gnome.org/jwestman/blueprint-compiler"
+DOWNLOAD="https://gitlab.gnome.org/jwestman/blueprint-compiler/-/archive/v0.10.0/blueprint-compiler-v0.10.0.tar.bz2"
+MD5SUM="72087bfc42b8f3ebf3aac5816b7bfa27"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Fernando Lopez Jr"
+EMAIL="fernando.lopezjr@gmail.com"
diff --git a/system/blueprint-compiler/doinst.sh b/system/blueprint-compiler/doinst.sh
new file mode 100644
index 0000000000..401d987795
--- /dev/null
+++ b/system/blueprint-compiler/doinst.sh
@@ -0,0 +1,15 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
+fi
diff --git a/system/blueprint-compiler/slack-desc b/system/blueprint-compiler/slack-desc
new file mode 100644
index 0000000000..a814ef383c
--- /dev/null
+++ b/system/blueprint-compiler/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+blueprint-compiler: blueprint-compiler (GTK UIs)
+blueprint-compiler:
+blueprint-compiler: GTK GUI compiler
+blueprint-compiler:
+blueprint-compiler:
+blueprint-compiler:
+blueprint-compiler:
+blueprint-compiler:
+blueprint-compiler:
+blueprint-compiler: Homepage: https://gitlab.gnome.org/jwestman/blueprint-compiler
+blueprint-compiler:
diff --git a/system/bochs/README b/system/bochs/README
index 950bf998f4..7760351723 100644
--- a/system/bochs/README
+++ b/system/bochs/README
@@ -1,3 +1,5 @@
+bochs (cross platform x86 emulator)
+
 Bochs is a highly portable open source IA-32 (x86) emulator written in
 C++, that runs on most popular platforms. It include emulation of the
 Intel x86 CPU, common I/O devices, and a custom BIOS. Bochs can be
diff --git a/system/bochs/bochs.SlackBuild b/system/bochs/bochs.SlackBuild
index 198edad541..bea5d9be03 100644
--- a/system/bochs/bochs.SlackBuild
+++ b/system/bochs/bochs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Bochs
 # Copyright 2012, 2013, 2014, 2015 Bojan Popovic, Belgrade, Serbia
@@ -26,20 +26,25 @@
 # ChangeLog:
 #
 #  * 2014-01-29:
-# 		New upstream version (2.6.2). Solved the problem with dynamic
-#		linking on x86_64.
+#     New upstream version (2.6.2). Solved the problem with dynamic
+#    linking on x86_64.
 #  * 2015-08-03:
-#   	New upstream version (2.6.8). You can now override most of the
-# 		configure options on the command line.
+#     New upstream version (2.6.8). You can now override most of the
+#     configure options on the command line.
+
+# 20220211 bkw: updated for v2.7, as 2.6.8 won't build on Slackware 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=bochs
-VERSION=${VERSION:-2.6.8}
+VERSION=${VERSION:-2.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -91,19 +96,23 @@ SDL2=${SDL2:-no} # Note: buggy on my machine.
 # SDL and SDL2 interfaces are mutually exclusive. SDL interface seems to be
 # more stable, so default to SDL.
 if [ "$SDL" = "yes" -a "$SDL2" = "yes" ]; then
-	echo "Warning: You can't enable both SDL and SDL2. Defaulting to SDL."
-	SDL2=no
+  echo "Warning: You can't enable both SDL and SDL2. Defaulting to SDL."
+  SDL2=no
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 DOCS="CHANGES COPYING PARAM_TREE.txt README* TESTFORM.txt TODO"
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -127,9 +136,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # We need this on x86_64 to fix a libtldl problem
 libtoolize -c
@@ -186,15 +195,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-wx=${WX} \
   --build=$ARCH-slackware-linux
 
-
-
 make
 make install DESTDIR=$PKG
+strip $PKG/usr/bin/* $PKG/usr/lib*/$PRGNAM/plugins/lib*.so.?.?.?
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Move docs in the proper place
+# Move docs to the proper place
 mkdir -p $PKG/usr/doc
 mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
 rmdir $PKG/usr/share/doc
@@ -205,4 +210,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bochs/bochs.info b/system/bochs/bochs.info
index 93ea47b057..61dc27bc19 100644
--- a/system/bochs/bochs.info
+++ b/system/bochs/bochs.info
@@ -1,10 +1,10 @@
 PRGNAM="bochs"
-VERSION="2.6.8"
+VERSION="2.7"
 HOMEPAGE="http://bochs.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/bochs/bochs-2.6.8.tar.gz"
-MD5SUM="8a243e2b5f7562f32d2b26f3cebbba08"
+DOWNLOAD="http://downloads.sourceforge.net/bochs/bochs-2.7.tar.gz"
+MD5SUM="d77a43c21cfd8aa013eb2eaa35644f80"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Bojan Popovic"
-EMAIL="bocke@slackware-srbija.org"
+MAINTAINER="Jason Graham"
+EMAIL="jgraham@compukix.net"
diff --git a/system/bogofilter/bogofilter.SlackBuild b/system/bogofilter/bogofilter.SlackBuild
index 354cd167cd..a0e9ade1a4 100644
--- a/system/bogofilter/bogofilter.SlackBuild
+++ b/system/bogofilter/bogofilter.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bogofilter
 
-# Copyright 2008-2013  Robby Workman  Northport, Alabama, USA
+# Copyright 2008-2021  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,26 +22,37 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220404 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - remove useless INSTALL from doc dir.
+# - add $PRGNAM.SlackBuild to doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bogofilter
-VERSION=${VERSION:-1.2.4}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.2.5}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-bogofilter
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -54,18 +65,20 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -73,8 +86,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-static=no \
   --build=$ARCH-slackware-linux
 
 make
@@ -87,12 +101,13 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
-cp AUTHORS COPYING GETTING.STARTED INSTALL NEWS* README* RELEASE.NOTES \
-  TODO doc/README*  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp AUTHORS COPYING GETTING.STARTED NEWS* README* RELEASE.NOTES \
+  TODO doc/README* $PKG/usr/doc/$PRGNAM-$VERSION
 cp doc/*.html $PKG/usr/doc/$PRGNAM-$VERSION/html
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/bogofilter-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bogofilter/bogofilter.info b/system/bogofilter/bogofilter.info
index 8ebcf6503d..7a1a8d022b 100644
--- a/system/bogofilter/bogofilter.info
+++ b/system/bogofilter/bogofilter.info
@@ -1,8 +1,8 @@
 PRGNAM="bogofilter"
-VERSION="1.2.4"
+VERSION="1.2.5"
 HOMEPAGE="http://bogofilter.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/bogofilter/bogofilter-1.2.4.tar.bz2"
-MD5SUM="d0a5eebb3274b23ceabe766a6443a1c5"
+DOWNLOAD="http://downloads.sourceforge.net/bogofilter/bogofilter-1.2.5.tar.xz"
+MD5SUM="8763f87adfff7b802ced177d8c654539"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/bonnie++/bonnie++.SlackBuild b/system/bonnie++/bonnie++.SlackBuild
index b9c011e052..6962676760 100644
--- a/system/bonnie++/bonnie++.SlackBuild
+++ b/system/bonnie++/bonnie++.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bonnie++
 # Written by Vincent Batts <vbatts@hashbangbash.com>
 # Modified by Michiel van Wessem <michiel@slackbuils.org>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bonnie++
 VERSION=${VERSION:-1.04}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -17,7 +20,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -82,4 +92,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bootchart/README b/system/bootchart/README
index ffbb73e1ac..31ebc32d7a 100644
--- a/system/bootchart/README
+++ b/system/bootchart/README
@@ -1,12 +1,12 @@
-Bootchart provides a shell script to be run by the kernel in the init phase. 
-The script will run in background and collect process information, CPU 
-statistics and disk usage statistics from the /proc file system. 
-The performance data are stored in memory and are written to disk once the 
-boot process completes.
+Bootchart provides a shell script to be run by the kernel in the
+init phase. The script will run in background and collect process
+information, CPU statistics and disk usage statistics from the /proc
+file system. The performance data are stored in memory and are
+written to disk once the boot process completes.
 
-The boot log file is later processed using a Java application which builds 
-the process tree and renders a performance chart in different formats (png, 
-svg, eps).
+The boot log file is later processed using a Java application which
+builds the process tree and renders a performance chart in different
+formats (png, svg, eps).
 
 After installation, to run bootchartd;
 a) if you run a huge kernel or custom kernel without initrd:
diff --git a/system/bootchart/bootchart.SlackBuild b/system/bootchart/bootchart.SlackBuild
index f02fc4ce63..c04ba1b401 100644
--- a/system/bootchart/bootchart.SlackBuild
+++ b/system/bootchart/bootchart.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bootchart
 
@@ -8,20 +8,30 @@
 
 # Maintained by Ozan Türkyılmaz ozan.turkyilmaz@gmail.com
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bootchart
 VERSION=${VERSION:-0.9}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -77,5 +87,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
 
diff --git a/system/bootchart/bootchart.info b/system/bootchart/bootchart.info
index 3d5e78ffc7..dd07d54e40 100644
--- a/system/bootchart/bootchart.info
+++ b/system/bootchart/bootchart.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/bootchart/bootchart-0.9.tar.bz2"
 MD5SUM="4be91177d19069e21beeb106f2f77dff"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="apache-ant jdk"
+REQUIRES="apache-ant zulu-openjdk8"
 MAINTAINER="Ozan Türkyılmaz"
 EMAIL="ozan.turkyilmaz@gmail.com"
diff --git a/system/borgbackup/README b/system/borgbackup/README
index 6d9f2dc9cf..23fb77667b 100644
--- a/system/borgbackup/README
+++ b/system/borgbackup/README
@@ -1,3 +1,5 @@
+borgbackup (deduplicating backup program)
+
 BorgBackup (short: Borg) is a deduplicating backup program.
 Optionally, it supports compression and authenticated encryption.
 
@@ -9,13 +11,8 @@ targets.
 
 Borg is a fork of Attic and is maintained by "The Borg collective".
 
-FIXME:
-  Due to outdated version of llfuse here at SBo, building borgbackup
-  with mount support using llfuse will fail.
-
 Optional dependencies:
-- llfuse is required if you wish to mount an archive using FUSE,
-- Sphinx, alabaster, guzzle_sphinx_theme, imagesize, python3-attrs,
-  python3-certifi and python-urllib3 are required if you wish to build
-  the docs (html, man). Please note that the build will fail if Sphinx
-  is installed, but the other required packages are not.
+
+- llfuse for mounting the archives.
+- Sphinx and guzzle_sphinx_theme are required if you wish to build the
+  HTML docs. Man pages are always included.
diff --git a/system/borgbackup/borgbackup.SlackBuild b/system/borgbackup/borgbackup.SlackBuild
index e7b71cf172..08fde234df 100644
--- a/system/borgbackup/borgbackup.SlackBuild
+++ b/system/borgbackup/borgbackup.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for borgbackup
 
-# Copyright 2020 Andrzej Telszewski, Szczecin
+# Copyright 2023 Andrzej Telszewski, Koszalin
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,23 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230809 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - stop the build from failing if Sphinx is installed but
+#   guzzle_sphinx_theme is not.
+# - always include man pages in package (upstream kindly included
+#   prebuilt ones in the tarball).
+# - clean up optional deps for HTML docs in README. python3-attrs
+#   is not required, and alabaster + imagesize are already required
+#   deps for Sphinx.
+# - make slack-desc say whether the HTML docs are included.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=borgbackup
-VERSION=${VERSION:-1.1.13}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.2.7}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,66 +48,56 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
+# 20230810 bkw: no flags or libdirsuffix, setup.py knows what to do.
 
-set -e
+set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
+
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod -R a-st,u+rwX,go-w+rX .
 
 python3 setup.py install --root=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# 20230810 bkw: faster than the find|file|xargs template stuff.
+find $PKG/usr/lib*/python* -name '*.so' | xargs strip --strip-unneeded
 
-if [ -x /usr/bin/sphinx-build ]; then
-  cd docs
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
 
-  make html
-  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-  cp -a _build/html $PKG/usr/doc/$PRGNAM-$VERSION
+# 20230809 bkw: stop the build from failing if Sphinx is installed
+# but guzzle_sphinx_theme is not. upstream's README documents this, even.
+make -C docs html && cp -a docs/_build/html $PKGDOC
 
-  make man
-  mkdir -p $PKG/usr/man/man1
-  cp -a _build/man/*.1 $PKG/usr/man/man1
-  gzip -9 $PKG/usr/man/man1/*.1
+# 20230810 bkw: for the slack-desc:
+WITH_HTML=WITHOUT
+[ -d $PKGDOC/html ] && WITH_HTML=WITH
 
-  cd ..
-fi
+# 20230809 bkw: upstream ships prebuilt man pages, always install.
+mkdir -p $PKG/usr/man/man1
+cp -a docs/man/*.1 $PKG/usr/man/man1
+gzip -9 $PKG/usr/man/man1/*
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGES.rst LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a AUTHORS CHANGES.rst LICENSE README.rst SECURITY.md $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@WITH_HTML@,$WITH_HTML," < $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/borgbackup/borgbackup.info b/system/borgbackup/borgbackup.info
index 57a140bdfd..a0be7661f2 100644
--- a/system/borgbackup/borgbackup.info
+++ b/system/borgbackup/borgbackup.info
@@ -1,10 +1,10 @@
 PRGNAM="borgbackup"
-VERSION="1.1.13"
+VERSION="1.2.7"
 HOMEPAGE="https://borgbackup.readthedocs.io/"
-DOWNLOAD="https://github.com/borgbackup/borg/releases/download/1.1.13/borgbackup-1.1.13.tar.gz"
-MD5SUM="a82d2bdf61bfaeebb90ac8ab1347657a"
+DOWNLOAD="https://github.com/borgbackup/borg/releases/download/1.2.7/borgbackup-1.2.7.tar.gz"
+MD5SUM="102dfa92073e00582a727b276e8548ce"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libb2 lz4 msgpack-python python3 setuptools-scm zstd"
+REQUIRES="msgpack-python python3-pkgconfig"
 MAINTAINER="Andrzej Telszewski"
-EMAIL="atelszewski@gmail.com"
+EMAIL="andrzej@telszewski.com"
diff --git a/system/borgbackup/slack-desc b/system/borgbackup/slack-desc
index f58dca23e6..cdd0b2e7dd 100644
--- a/system/borgbackup/slack-desc
+++ b/system/borgbackup/slack-desc
@@ -15,5 +15,5 @@ borgbackup: to backup data. The data deduplication technique used makes Borg
 borgbackup: suitable for daily backups since only changes are stored. The
 borgbackup: authenticated encryption technique makes it suitable for backups
 borgbackup: to not fully trusted targets.
-borgbackup:
 borgbackup: Homepage: https://borgbackup.readthedocs.io/
+borgbackup: This package was built @WITH_HTML@ the HTML documentation.
diff --git a/system/borgmatic/README b/system/borgmatic/README
new file mode 100644
index 0000000000..7ee14372a8
--- /dev/null
+++ b/system/borgmatic/README
@@ -0,0 +1,6 @@
+borgmatic is simple, configuration-driven backup software for servers
+and workstations. Protect your files with client-side encryption.
+Backup your databases too. Monitor it all with integrated third-party
+services.
+
+borgmatic uses BorgBackup (Borg) under the hood.
diff --git a/system/borgmatic/borgmatic.SlackBuild b/system/borgmatic/borgmatic.SlackBuild
new file mode 100644
index 0000000000..5de1de36bb
--- /dev/null
+++ b/system/borgmatic/borgmatic.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+# Slackware build script for borgmatic
+
+# Copyright 2023 Andrzej Telszewski, Koszalin
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=borgmatic
+VERSION=${VERSION:-1.8.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+chown -R root:root .
+chmod -R a-st,u+rwX,go-w+rX .
+
+python3 setup.py install --root=$PKG
+
+mkdir -p $PKG/etc/borgmatic
+mkdir -p $PKG/etc/borgmatic.d
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENSE NEWS {README,SECURITY}.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > \
+  $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/borgmatic/borgmatic.info b/system/borgmatic/borgmatic.info
new file mode 100644
index 0000000000..ad7697d67f
--- /dev/null
+++ b/system/borgmatic/borgmatic.info
@@ -0,0 +1,10 @@
+PRGNAM="borgmatic"
+VERSION="1.8.5"
+HOMEPAGE="https://torsion.org/borgmatic/"
+DOWNLOAD="https://github.com/borgmatic-collective/borgmatic/archive/1.8.5/borgmatic-1.8.5.tar.gz"
+MD5SUM="2fd9db3e930fb54164ba943295ebcd23"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="borgbackup colorama python3-ruamel.yaml"
+MAINTAINER="Andrzej Telszewski"
+EMAIL="andrzej@telszewski.com"
diff --git a/system/borgmatic/slack-desc b/system/borgmatic/slack-desc
new file mode 100644
index 0000000000..6a293a602d
--- /dev/null
+++ b/system/borgmatic/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+borgmatic: borgmatic (configuration-driven backup software)
+borgmatic:
+borgmatic: borgmatic is simple, configuration-driven backup software for servers
+borgmatic: and workstations. Protect your files with client-side encryption.
+borgmatic: Backup your databases too. Monitor it all with integrated third-party
+borgmatic: services.
+borgmatic:
+borgmatic: Homepage: https://torsion.org/borgmatic/
+borgmatic:
+borgmatic:
+borgmatic:
diff --git a/system/bottom/README b/system/bottom/README
new file mode 100644
index 0000000000..ad345361dc
--- /dev/null
+++ b/system/bottom/README
@@ -0,0 +1,12 @@
+bottom (system/process monitor for the terminal)
+
+bottom is a configurable, widget-based system and process monitor for
+the terminal.
+
+Completions are installed for bash and zsh by default, and for fish if
+fish is installed at the time of building. PowerShell completions can
+be enabled by adding ". _btm.ps1" to the profile. _btm.ps1 and btm.fish
+can be found in the doc directory.
+
+A default configuration file is generated at
+$HOME/.config/bottom/bottom.toml when running for the first time.
diff --git a/system/bottom/bottom.SlackBuild b/system/bottom/bottom.SlackBuild
new file mode 100644
index 0000000000..c89388f7c7
--- /dev/null
+++ b/system/bottom/bottom.SlackBuild
@@ -0,0 +1,198 @@
+#!/bin/bash
+
+# Slackware build script for bottom
+
+# Copyright 2022-2023 K. Eugene Carlson  Tsukuba, Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=bottom
+BINNAM=btm
+VERSION=${VERSION:-0.9.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+
+  if [ "$ARCH" = "i586" ]; then
+    if rustc -Vv | grep host | grep i686 > /dev/null ; then
+      ARCH=i686
+    fi
+  fi
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  CARGOTARGET="--target i586-unknown-linux-gnu"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  CARGOTARGET="--target i686-unknown-linux-gnu"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  CARGOTARGET="--target x86_64-unknown-linux-gnu"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  CARGOTARGET=""
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+# build offline
+# configuration tells cargo to use the configured directory
+# for dependencies instead of downloading from crates.io
+cat << EOF > .cargo/config
+[source.crates-io]
+registry = 'https://github.com/rust-lang/crates.io-index'
+replace-with = 'vendored-sources'
+
+[source.vendored-sources]
+directory = '$(pwd)/vendor'
+EOF
+
+# deps and versions come from Cargo.lock
+mkdir vendor
+(
+  cd vendor
+
+  grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
+    sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
+    awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \
+    grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do
+
+    ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
+    dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
+
+    tar xvf $CWD/$dep-$ver.crate
+
+    touch $dep-$ver/.cargo-ok
+
+    # generate checksum
+    {
+      printf "{\n"
+      printf '    "files": {\n'
+
+      (
+        cd $dep-$ver
+        find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/'
+      ) | sed '$ s/,$//'
+
+      printf "    },\n"
+      printf '    "package": "'
+
+      sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
+
+      printf "}\n"
+    } > $dep-$ver/.cargo-checksum.json
+  done
+)
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
+rm -f .cargo/config.toml
+
+CARGO_HOME=.cargo \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+cargo build --release $CARGOTARGET
+
+mkdir -p $PKG/usr/bin
+find target -name $BINNAM -exec install -m 755 {} $PKG/usr/bin \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Install the man page.
+tar xf $CWD/manpage.tar.gz
+mkdir -p $PKG/usr/man/man1
+install -m 0644 btm.1.gz $PKG/usr/man/man1/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -ar docs/content/* $PKG/usr/doc/$PRGNAM-$VERSION
+# The contents of docs/content/ can be used to generate a static web page with
+# mkdocs, but it would require a lot of dependencies, some of which are not on
+# SBo. Leaving everything as markdown documents instead.
+rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/{overrides,assets,index.md,mkdocs.yml,requirements.txt}
+cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a sample_configs/default_config.toml $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Completions
+tar xf $CWD/completion.tar.gz
+mkdir -p $PKG/usr/share/bash-completion/completions
+find . -name $BINNAM.bash -exec install -m 644 {} $PKG/usr/share/bash-completion/completions \;
+mkdir -p $PKG/usr/share/zsh/site-functions
+find . -name _$BINNAM -exec install -m 644 {} $PKG/usr/share/zsh/site-functions \;
+# Only install the fish completions if fish is installed.
+if [ -x /usr/bin/fish ]; then
+  mkdir -p $PKG/usr/share/fish/vendor_completions.d
+  find . -name $BINNAM.fish -exec install -m 644 {} $PKG/usr/share/fish/vendor_completions.d \;
+fi
+# Keep files for fish, PowerShell and Elvish completions in the doc directory.
+find . -name $BINNAM.fish -exec install -m 644 {} $PKG/usr/doc/$PRGNAM-$VERSION \;
+find . -name _$BINNAM.ps1 -exec install -m 644 {} $PKG/usr/doc/$PRGNAM-$VERSION \;
+find . -name $BINNAM.elv -exec install -m 644 {} $PKG/usr/doc/$PRGNAM-$VERSION \;
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bottom/bottom.info b/system/bottom/bottom.info
new file mode 100644
index 0000000000..85ec0d7481
--- /dev/null
+++ b/system/bottom/bottom.info
@@ -0,0 +1,352 @@
+PRGNAM="bottom"
+VERSION="0.9.6"
+HOMEPAGE="https://github.com/ClementTsang/bottom"
+DOWNLOAD="https://github.com/ClementTsang/bottom/archive/0.9.6/bottom-0.9.6.tar.gz \
+          https://github.com/ClementTsang/bottom/releases/download/0.9.6/completion.tar.gz \
+          https://github.com/ClementTsang/bottom/releases/download/0.9.6/manpage.tar.gz \
+          https://static.crates.io/crates/addr2line/addr2line-0.21.0.crate \
+          https://static.crates.io/crates/adler/adler-1.0.2.crate \
+          https://static.crates.io/crates/ahash/ahash-0.8.3.crate \
+          https://static.crates.io/crates/aho-corasick/aho-corasick-1.0.4.crate \
+          https://static.crates.io/crates/allocator-api2/allocator-api2-0.2.16.crate \
+          https://static.crates.io/crates/anstream/anstream-0.3.2.crate \
+          https://static.crates.io/crates/anstyle/anstyle-1.0.1.crate \
+          https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.1.crate \
+          https://static.crates.io/crates/anstyle-query/anstyle-query-1.0.0.crate \
+          https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-1.0.2.crate \
+          https://static.crates.io/crates/anyhow/anyhow-1.0.75.crate \
+          https://static.crates.io/crates/assert_cmd/assert_cmd-2.0.12.crate \
+          https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \
+          https://static.crates.io/crates/backtrace/backtrace-0.3.69.crate \
+          https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \
+          https://static.crates.io/crates/bitflags/bitflags-2.4.0.crate \
+          https://static.crates.io/crates/bstr/bstr-1.6.0.crate \
+          https://static.crates.io/crates/byteorder/byteorder-1.4.3.crate \
+          https://static.crates.io/crates/cargo-husky/cargo-husky-1.5.0.crate \
+          https://static.crates.io/crates/cassowary/cassowary-0.3.0.crate \
+          https://static.crates.io/crates/cc/cc-1.0.82.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://static.crates.io/crates/clap/clap-4.3.23.crate \
+          https://static.crates.io/crates/clap_builder/clap_builder-4.3.23.crate \
+          https://static.crates.io/crates/clap_complete/clap_complete-4.3.2.crate \
+          https://static.crates.io/crates/clap_lex/clap_lex-0.5.0.crate \
+          https://static.crates.io/crates/clap_mangen/clap_mangen-0.2.12.crate \
+          https://static.crates.io/crates/colorchoice/colorchoice-1.0.0.crate \
+          https://static.crates.io/crates/concat-string/concat-string-1.0.1.crate \
+          https://static.crates.io/crates/core-foundation/core-foundation-0.9.3.crate \
+          https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.4.crate \
+          https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.8.crate \
+          https://static.crates.io/crates/crossbeam-deque/crossbeam-deque-0.8.3.crate \
+          https://static.crates.io/crates/crossbeam-epoch/crossbeam-epoch-0.9.15.crate \
+          https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.16.crate \
+          https://static.crates.io/crates/crossterm/crossterm-0.26.1.crate \
+          https://static.crates.io/crates/crossterm/crossterm-0.27.0.crate \
+          https://static.crates.io/crates/crossterm_winapi/crossterm_winapi-0.9.1.crate \
+          https://static.crates.io/crates/ctrlc/ctrlc-3.4.0.crate \
+          https://static.crates.io/crates/darling/darling-0.10.2.crate \
+          https://static.crates.io/crates/darling_core/darling_core-0.10.2.crate \
+          https://static.crates.io/crates/darling_macro/darling_macro-0.10.2.crate \
+          https://static.crates.io/crates/deranged/deranged-0.3.7.crate \
+          https://static.crates.io/crates/difflib/difflib-0.4.0.crate \
+          https://static.crates.io/crates/dirs/dirs-5.0.1.crate \
+          https://static.crates.io/crates/dirs-sys/dirs-sys-0.4.1.crate \
+          https://static.crates.io/crates/doc-comment/doc-comment-0.3.3.crate \
+          https://static.crates.io/crates/either/either-1.9.0.crate \
+          https://static.crates.io/crates/enum-as-inner/enum-as-inner-0.5.1.crate \
+          https://static.crates.io/crates/equivalent/equivalent-1.0.1.crate \
+          https://static.crates.io/crates/errno/errno-0.3.2.crate \
+          https://static.crates.io/crates/errno-dragonfly/errno-dragonfly-0.1.2.crate \
+          https://static.crates.io/crates/fern/fern-0.6.2.crate \
+          https://static.crates.io/crates/filedescriptor/filedescriptor-0.8.2.crate \
+          https://static.crates.io/crates/float-cmp/float-cmp-0.9.0.crate \
+          https://static.crates.io/crates/fnv/fnv-1.0.7.crate \
+          https://static.crates.io/crates/getrandom/getrandom-0.2.10.crate \
+          https://static.crates.io/crates/gimli/gimli-0.28.0.crate \
+          https://static.crates.io/crates/hashbrown/hashbrown-0.14.0.crate \
+          https://static.crates.io/crates/heck/heck-0.4.1.crate \
+          https://static.crates.io/crates/hermit-abi/hermit-abi-0.3.2.crate \
+          https://static.crates.io/crates/humantime/humantime-2.1.0.crate \
+          https://static.crates.io/crates/ident_case/ident_case-1.0.1.crate \
+          https://static.crates.io/crates/indexmap/indexmap-2.0.0.crate \
+          https://static.crates.io/crates/indoc/indoc-2.0.3.crate \
+          https://static.crates.io/crates/io-lifetimes/io-lifetimes-1.0.11.crate \
+          https://static.crates.io/crates/is-terminal/is-terminal-0.4.9.crate \
+          https://static.crates.io/crates/itertools/itertools-0.10.5.crate \
+          https://static.crates.io/crates/itertools/itertools-0.11.0.crate \
+          https://static.crates.io/crates/itoa/itoa-1.0.9.crate \
+          https://static.crates.io/crates/kstring/kstring-2.0.0.crate \
+          https://static.crates.io/crates/lazycell/lazycell-1.3.0.crate \
+          https://static.crates.io/crates/libc/libc-0.2.147.crate \
+          https://static.crates.io/crates/libloading/libloading-0.7.4.crate \
+          https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.3.8.crate \
+          https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.5.crate \
+          https://static.crates.io/crates/lock_api/lock_api-0.4.10.crate \
+          https://static.crates.io/crates/log/log-0.4.20.crate \
+          https://static.crates.io/crates/mach2/mach2-0.4.1.crate \
+          https://static.crates.io/crates/memchr/memchr-2.5.0.crate \
+          https://static.crates.io/crates/memoffset/memoffset-0.9.0.crate \
+          https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.7.1.crate \
+          https://static.crates.io/crates/mio/mio-0.8.8.crate \
+          https://static.crates.io/crates/nix/nix-0.26.2.crate \
+          https://static.crates.io/crates/normalize-line-endings/normalize-line-endings-0.3.0.crate \
+          https://static.crates.io/crates/ntapi/ntapi-0.4.1.crate \
+          https://static.crates.io/crates/num-traits/num-traits-0.2.16.crate \
+          https://static.crates.io/crates/num_cpus/num_cpus-1.16.0.crate \
+          https://static.crates.io/crates/nvml-wrapper/nvml-wrapper-0.9.0.crate \
+          https://static.crates.io/crates/nvml-wrapper-sys/nvml-wrapper-sys-0.7.0.crate \
+          https://static.crates.io/crates/object/object-0.32.0.crate \
+          https://static.crates.io/crates/once_cell/once_cell-1.18.0.crate \
+          https://static.crates.io/crates/option-ext/option-ext-0.2.0.crate \
+          https://static.crates.io/crates/parking_lot/parking_lot-0.12.1.crate \
+          https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.9.8.crate \
+          https://static.crates.io/crates/paste/paste-1.0.14.crate \
+          https://static.crates.io/crates/predicates/predicates-3.0.3.crate \
+          https://static.crates.io/crates/predicates-core/predicates-core-1.0.6.crate \
+          https://static.crates.io/crates/predicates-tree/predicates-tree-1.0.9.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.66.crate \
+          https://static.crates.io/crates/quote/quote-1.0.33.crate \
+          https://static.crates.io/crates/ratatui/ratatui-0.22.0.crate \
+          https://static.crates.io/crates/rayon/rayon-1.7.0.crate \
+          https://static.crates.io/crates/rayon-core/rayon-core-1.11.0.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.2.16.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.3.5.crate \
+          https://static.crates.io/crates/redox_users/redox_users-0.4.3.crate \
+          https://static.crates.io/crates/regex/regex-1.9.4.crate \
+          https://static.crates.io/crates/regex-automata/regex-automata-0.3.7.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.7.5.crate \
+          https://static.crates.io/crates/roff/roff-0.2.1.crate \
+          https://static.crates.io/crates/rustc-demangle/rustc-demangle-0.1.23.crate \
+          https://static.crates.io/crates/rustix/rustix-0.37.23.crate \
+          https://static.crates.io/crates/rustix/rustix-0.38.9.crate \
+          https://static.crates.io/crates/ryu/ryu-1.0.15.crate \
+          https://static.crates.io/crates/same-file/same-file-1.0.6.crate \
+          https://static.crates.io/crates/scopeguard/scopeguard-1.2.0.crate \
+          https://static.crates.io/crates/serde/serde-1.0.188.crate \
+          https://static.crates.io/crates/serde_derive/serde_derive-1.0.188.crate \
+          https://static.crates.io/crates/serde_json/serde_json-1.0.105.crate \
+          https://static.crates.io/crates/serde_spanned/serde_spanned-0.6.3.crate \
+          https://static.crates.io/crates/signal-hook/signal-hook-0.3.17.crate \
+          https://static.crates.io/crates/signal-hook-mio/signal-hook-mio-0.2.3.crate \
+          https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.4.1.crate \
+          https://static.crates.io/crates/smallvec/smallvec-1.11.0.crate \
+          https://static.crates.io/crates/starship-battery/starship-battery-0.8.2.crate \
+          https://static.crates.io/crates/static_assertions/static_assertions-1.1.0.crate \
+          https://static.crates.io/crates/strsim/strsim-0.9.3.crate \
+          https://static.crates.io/crates/strsim/strsim-0.10.0.crate \
+          https://static.crates.io/crates/syn/syn-1.0.109.crate \
+          https://static.crates.io/crates/syn/syn-2.0.29.crate \
+          https://static.crates.io/crates/sysctl/sysctl-0.5.4.crate \
+          https://static.crates.io/crates/sysinfo/sysinfo-0.29.8.crate \
+          https://static.crates.io/crates/terminal_size/terminal_size-0.2.6.crate \
+          https://static.crates.io/crates/termtree/termtree-0.4.1.crate \
+          https://static.crates.io/crates/thiserror/thiserror-1.0.47.crate \
+          https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.47.crate \
+          https://static.crates.io/crates/time/time-0.3.27.crate \
+          https://static.crates.io/crates/time-core/time-core-0.1.1.crate \
+          https://static.crates.io/crates/time-macros/time-macros-0.2.13.crate \
+          https://static.crates.io/crates/toml_datetime/toml_datetime-0.6.3.crate \
+          https://static.crates.io/crates/toml_edit/toml_edit-0.19.14.crate \
+          https://static.crates.io/crates/typenum/typenum-1.16.0.crate \
+          https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.11.crate \
+          https://static.crates.io/crates/unicode-segmentation/unicode-segmentation-1.10.1.crate \
+          https://static.crates.io/crates/unicode-width/unicode-width-0.1.10.crate \
+          https://static.crates.io/crates/uom/uom-0.35.0.crate \
+          https://static.crates.io/crates/utf8parse/utf8parse-0.2.1.crate \
+          https://static.crates.io/crates/version_check/version_check-0.9.4.crate \
+          https://static.crates.io/crates/wait-timeout/wait-timeout-0.2.0.crate \
+          https://static.crates.io/crates/walkdir/walkdir-2.3.3.crate \
+          https://static.crates.io/crates/wasi/wasi-0.11.0+wasi-snapshot-preview1.crate \
+          https://static.crates.io/crates/winapi/winapi-0.3.9.crate \
+          https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi-util/winapi-util-0.1.5.crate \
+          https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/windows/windows-0.51.1.crate \
+          https://static.crates.io/crates/windows-core/windows-core-0.51.1.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.48.0.crate \
+          https://static.crates.io/crates/windows-targets/windows-targets-0.48.5.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.48.5.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.48.5.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.48.5.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.5.crate \
+          https://static.crates.io/crates/winnow/winnow-0.5.14.crate \
+          https://static.crates.io/crates/wrapcenum-derive/wrapcenum-derive-0.4.0.crate"
+MD5SUM="7a0b000bbf1e3db4ab78ca45d2ba8cbf \
+        4d4593e27a1e030d106110dbd8f1524d \
+        2f9916ba4fd317e1dd89fb89946d9a6b \
+        55e15000c4c210f0bb2aca6f38fbe424 \
+        669215548c64019c08c92b2c1afd3deb \
+        25bbf8d0145ba2670ba039c768bb4f44 \
+        c4f46fba4b9fbba4e468b8adb88d7101 \
+        a2d3656a58d89472063fd35db901f137 \
+        fefa6f663a171d17cd210af8a8cf979d \
+        b47f7f36350970f1d65728a25ecf349f \
+        a6c4e3f7eda9068fe0049c291e8e7d89 \
+        d2453c99c7af98286c2dc9017a8dba6d \
+        37585fdc04f6d6967dbaa2f13d9fa5d8 \
+        39a78bec5a0ae75f210c1f67250152b0 \
+        74e97e374c0c05d2dffc9568b7e135b8 \
+        05d77ef52e90ad161fdd41b252420467 \
+        66c5beb5a77eccb0d86ce626651f393b \
+        a295edb6953237ebbdfa8e731229f9a3 \
+        b6a33f8009be15391bb7ca1a3c1f5bc4 \
+        6f678db176b4331c3dab7d271e95e6fb \
+        1e704be5ddde9d6b5383ef1035309f91 \
+        a4f857ba050986342507b6f60371cc16 \
+        2c186ae5cf4d2d548d0f1cc901111e69 \
+        081070f78d8cf91e92677f03803eb1ac \
+        74634128440dbc3766bda76fdf0aaa05 \
+        b1059f2463142face822963f1483e5e9 \
+        e262f05980f2e291d98407f1a52fb512 \
+        0336bedd9717f0433b7713cb404b28cc \
+        174448468cf3c9ccffd07dddd68df964 \
+        3afbc7ab87429a4f8faba6857db59438 \
+        010f6d0e98cc2a2b99907a23c6cd6bbc \
+        dee1b3f1210135cd8be65397d428597e \
+        ae6dd0cd5319220586d8ace4c4be87ce \
+        b477cc1c7b45e2187b3cad0377b504d8 \
+        87789a9723d81ff7d65a093a085617ae \
+        fd98c74ef4f8e5abcd938173ae8e2ab5 \
+        9970b72159dfdaf0ebb3eab0edfd37a4 \
+        f0c49a1a8cb131110f9f14f440bf872c \
+        5f97ab6850664563218eba1deb775f18 \
+        f79b8bf7d9769418b6bbd51ccc68996c \
+        81b4ce6014002d0cb0415aa401a51578 \
+        8ceeca5c72544b89230e119dec636ce2 \
+        a42201f337a8d7cd51aae9e5ecad91f0 \
+        b1c8b47b8fc9077b6a6aadc47c819115 \
+        5663ea952316dfff411bc1ef78c1979d \
+        1ce4ade6870dc9ca40e963170a57ed57 \
+        bebc8338ae113a87a04564c97c1e3f0c \
+        88c7bfadd3b04a713230597fe4c54e3d \
+        6681f2b2a1b8854ec13b1d35edc6fdc3 \
+        dd1e49c76e9d5853e673a3b41ba02917 \
+        3c3ab76bd9ed94de350152f1af4c61e8 \
+        44abcdcfe2db0e7be1151bc7d101a051 \
+        bdf329a72ecd0605c296f25e53136706 \
+        5072ab44d452bc5f2833090cb2a4d713 \
+        fc65414dcac661c46f2cfad7722304f9 \
+        90dd7e5de8d668d26234ac4e308ef6a2 \
+        3773f6b59265e41ac47d521bb2883b04 \
+        94f11861c538d1a2fd56c86d140e4358 \
+        8dab3b3ec00dc56cffde0b0c410d47b5 \
+        f204ba6fc9394724826f177433fe9a98 \
+        6646a563c6f7e9b24d9db2271b720a2b \
+        33038e7352ed5bb005901e5df511ff68 \
+        b92fa50f56a1e06a7f1bf665442d4a73 \
+        303bfe302fa689022cb499be186c378a \
+        c01022fe0357c10ca1d48b16187f81bd \
+        fe77a3f609b6fd8d5b08f3b2ef14d2ad \
+        18dfeab855ade5255a7f1a68b0151b7a \
+        eaf764f119bf0d49ea712d041e4510f5 \
+        c6612f34c3ee98ced239da95fbede236 \
+        ad61af236140412c359cdfb6dc6ef39e \
+        20b9f5d97aaf06b0f580f12860b67ba8 \
+        d629ca093dfd23b5e9b4262c5f801928 \
+        c6e20d23948f86627f5d4668e7ca43e3 \
+        0c07198f804f9c9788567f8c061acaec \
+        23cc9e52c52465f5b225e62ab7cc3457 \
+        26c20e41bc14af441bdabca4bf2de865 \
+        02e14c7718a87f6c90ba05b62fd5c706 \
+        18fa61f2d92d4df309c67cb3f3197987 \
+        bee4957fca33c21ef5620739f5ccfb43 \
+        8d619139e1dec2be7ecd50cfe3efa2a0 \
+        8ee79b4fe4c43d9ab09f16344612a656 \
+        8a66543babe1f9121292fd0f7e8ae680 \
+        94b8bf179385ff071bdc33b58bf047c0 \
+        fb6241893b457ed69fae5c1ae19920da \
+        eb7e04508518ed8f29935ec874e1740a \
+        c2fcb0d833f465037c91bfeb3f1cefc8 \
+        580f8f88379ff0678e8336a781dda55d \
+        f9ddf92ded75c1df47b2dd1379a482fd \
+        01c0964cfb7b3653fd6f07f2d94255a5 \
+        256ede6773f2f67e26e92f36c04eb4f7 \
+        d443cbf9907b31a0f396fb13489d6cd0 \
+        9b2b23b34109d6bd354191473e47c533 \
+        0d86b6294cd8dcf9a6e7c9a4634399f7 \
+        9012cd90bef66ae4d721b3cc7d805847 \
+        2dc8aacabbc090f8025a4789d4d6d8f0 \
+        130db480add7c9dccf7c13aa9ca71c82 \
+        1be45f99109d447849f4244b58c5a470 \
+        ad1239c8377e9764ee2924fadcc73c5f \
+        1781b204ec7b6b1ef9232d429e6a973a \
+        45b89ed774f16acb4c97357e090ae589 \
+        be08d75820c528ad6143e9e42efccee0 \
+        175aaa67c5c9a4c8de2b944d51d0753d \
+        1220d83980fb7f591f310194dce2fc66 \
+        0ddb8bccd3198892d0dd0ec7151f7cd3 \
+        b0fcb9b95f75bc7b31b8577190a489ac \
+        e0db6bd215c51fe0bd255fba51a21f24 \
+        08db330bc0fb2b16a6c78c2870196852 \
+        16111f31a29feae4ce4a324b83dc0189 \
+        782ea88d8e5b517b1c9e7d870e20e9e3 \
+        2793ed3e6807d79ff72271baec586531 \
+        4d63051c6b34144ae3b36877b4c3fc06 \
+        aecc051a251ceacaa93d51976024e276 \
+        5ad40eb548ec91179c2e5bafd26f1d30 \
+        ca991859381ef2ddc2b3306de05c242c \
+        24fcbc2986fad09b25c9a4f9aef0a9e4 \
+        a81f0c106a2376e2f915fbecda6645bc \
+        4f3176be9e505944b29bb85bef2b2539 \
+        254042a2a29ae1d79b96a283c8cc251f \
+        2d8d8b377d144f5e32b4f65a69eb0b24 \
+        f1358be8c98b98837cbd2cf51e75f8b3 \
+        a0da7824f0a52f7712017aa48669cb32 \
+        8498aebd7ad22c00c2de49ac9c885112 \
+        c08cf648c4ef262c2b91a299b29ab06f \
+        7b051001fdb16029a1ae8847aa345c99 \
+        f60ab8537f924a65fbc0961e958d375b \
+        cd23eb9bc45514102af9b76e333230fb \
+        22e95901b912671da26457ac33e36a23 \
+        bff4a37f6c1150c5e491ea59ef309546 \
+        38c573dad0ac4e954ef3ec33852b4f52 \
+        c9defe80406280bcfce4ecf31c0200b3 \
+        90253ab52670a0551a533eb78a1f6b10 \
+        82d98dc87dc8503400aa095f5aa70f13 \
+        64d9f46e9ba78f68c30c486be3d8b7df \
+        d82a80bc62225f4ed3b113bc88dff562 \
+        37dfcf7987c647bec6492794c646ca5a \
+        ea75dc5a62ae4cd8b820fe882d006de5 \
+        1c4b4529618d2208937f63d3a4418003 \
+        b1372e62f53f0ad8d19a2be135c10c9d \
+        4765ef1452ff61c3942d4fdbb494b774 \
+        cb03f4cb4d4a71fc2b6a41875cc9b005 \
+        36b7e5717132718197dd49baadd8cb0d \
+        bc5e18ee22cd01d4100e3870a938279b \
+        f48536a2409dc87b959a594c6fad1f1a \
+        cedd4c0c821849a65af49836d6a1bb63 \
+        9b9b15a2cd57d248b1f935e2118807c3 \
+        63ce54e1fcbbdb45c15146fd082528bb \
+        8f2d81b2c9b0cac050c3953bfe56301f \
+        b145fb66e71c48f5f7b5b7ad98de963b \
+        7d6d4fc9fad200d6e295f6930e97e022 \
+        67ad63ed9ad0650b65f50f90af5a72b1 \
+        ceee1159c41351d05f4cf705490867b3 \
+        d18d362345c4fe512ef67b738b239fb8 \
+        6708629acf3d2ecb7404e43255d2df85 \
+        250acb3063bbdc870cbb54edcd6fff8f \
+        e972ea58ec203bfa6c79c1207852298b \
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        db96b50050277bf05a3c68534bbb9586 \
+        b9e37d5fc4ad28b612b78ad37816684d \
+        09de9d01e7331ff3da11f58be8bef0df \
+        1447eb72d5d00bdc8a8dd897cd327541 \
+        d343f3cc25259c518e594b7bcd4f144b \
+        f2797ade0e36f1e5d6be9d11b5076582 \
+        24c64817e85ef77765ed0f26c31c9b4c \
+        dae6d89034a6988042fd8be4cf5e037d \
+        de2839e16d9d7a9fd1c397da62f62b4a \
+        e0c35ffb8cfdb74a39bf799811f79304 \
+        d990172b607020701f9e84ca8e1c043c \
+        0a68848588e847ceccf504891584d00b \
+        45b469ad607b912256b7c80141fa2d17 \
+        7799baff9a5664205d9110a2624e8989 \
+        c474885826f269ebd0cd889f778f8e78 \
+        88e9b913d7f1d1b722179a38b795cdb1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="rust16"
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/bottom/slack-desc b/system/bottom/slack-desc
new file mode 100644
index 0000000000..6332b19c4d
--- /dev/null
+++ b/system/bottom/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+bottom: bottom (system/process monitor for the terminal)
+bottom:
+bottom: bottom is a configurable, widget-based system and process monitor for
+bottom: the terminal.
+bottom:
+bottom:
+bottom:
+bottom:
+bottom:
+bottom: Author: Clement Tsang
+bottom: Homepage: https://github.com/clementtsang/bottom
diff --git a/system/brasero/README b/system/brasero/README
index 9f102c59b8..d248922d5d 100644
--- a/system/brasero/README
+++ b/system/brasero/README
@@ -2,5 +2,5 @@ Brasero is a application to burn CD/DVD for the Gnome Desktop. It is
 designed to be as simple as possible and has some unique features to 
 enable users to create their discs easily and quickly.
 
-libburn, libisofs, and totem-pl-parser are optional dependencies,
+libisofs and totem-pl-parser are optional dependencies;
 and they will be used if they are installed.
diff --git a/system/brasero/brasero.SlackBuild b/system/brasero/brasero.SlackBuild
index cd1f003c30..49381115ea 100644
--- a/system/brasero/brasero.SlackBuild
+++ b/system/brasero/brasero.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for brasero
 # Originally written by Luis Henrique
-# Copyright 2014-2017  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2022  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=brasero
-VERSION=${VERSION:-3.12.2}
+VERSION=${VERSION:-3.12.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -75,7 +85,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=format-nonliteral -Wno-error=format-y2k" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -96,6 +106,10 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/brasero3/plugins/*.la
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -113,4 +127,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/brasero/brasero.info b/system/brasero/brasero.info
index 7038d3f196..f0fb1ebd04 100644
--- a/system/brasero/brasero.info
+++ b/system/brasero/brasero.info
@@ -1,8 +1,8 @@
 PRGNAM="brasero"
-VERSION="3.12.2"
+VERSION="3.12.3"
 HOMEPAGE="http://projects.gnome.org/brasero"
-DOWNLOAD="https://download.gnome.org/sources/brasero/3.12/brasero-3.12.2.tar.xz"
-MD5SUM="2dec59c179e49e37f1cfc0dd26344a2e"
+DOWNLOAD="https://download.gnome.org/sources/brasero/3.12/brasero-3.12.3.tar.xz"
+MD5SUM="ae48248dd36f89282d573eb7a0a1391f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/brightnessctl/README b/system/brightnessctl/README
new file mode 100644
index 0000000000..b7798cd1c5
--- /dev/null
+++ b/system/brightnessctl/README
@@ -0,0 +1,8 @@
+brightnessctl (cli device brightness control)
+
+This program allows you read and control device brightness. Devices,
+by default, include backlight and LEDs (searched for in corresponding
+classes). If omitted, the first found device is selected.
+
+Includes application, man-page, and installs a udev rule so
+non-root users can control the backlight.
diff --git a/system/brightnessctl/brightnessctl.SlackBuild b/system/brightnessctl/brightnessctl.SlackBuild
new file mode 100644
index 0000000000..4b9b77b1ed
--- /dev/null
+++ b/system/brightnessctl/brightnessctl.SlackBuild
@@ -0,0 +1,107 @@
+#!/bin/bash
+
+# Slackware build script for brightnessctl
+
+# Copyright 2022-23 Jay Lanagan (j@lngn.net), Detroit, MI, USA.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=brightnessctl
+VERSION=${VERSION:-0.5.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix man dir install location
+sed -i -e 's,share/man,man,g' Makefile
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $(find $PKG/usr/man -type l); do ln -s $(readlink $i).gz $i.gz; rm $i; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/brightnessctl/brightnessctl.info b/system/brightnessctl/brightnessctl.info
new file mode 100644
index 0000000000..6dedcc28ca
--- /dev/null
+++ b/system/brightnessctl/brightnessctl.info
@@ -0,0 +1,10 @@
+PRGNAM="brightnessctl"
+VERSION="0.5.1"
+HOMEPAGE="https://github.com/Hummer12007/brightnessctl"
+DOWNLOAD="https://github.com/Hummer12007/brightnessctl/archive/0.5.1/brightnessctl-0.5.1.tar.gz"
+MD5SUM="f65719e7e9070f212dd4e1162d5d6412"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jay Lanagan"
+EMAIL="j@lngn.net"
diff --git a/system/brightnessctl/slack-desc b/system/brightnessctl/slack-desc
new file mode 100644
index 0000000000..44c8c59615
--- /dev/null
+++ b/system/brightnessctl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+             |-----handy-ruler------------------------------------------------------|
+brightnessctl: brightnessctl (cli device brightness control)
+brightnessctl:
+brightnessctl: This program allows you read and control device brightness. Devices,
+brightnessctl: by default, include backlight and LEDs (searched for in corresponding
+brightnessctl: classes). If omitted, the first found device is selected.
+brightnessctl:
+brightnessctl: Homepage: https://github.com/Hummer12007/brightnessctl
+brightnessctl:
+brightnessctl:
+brightnessctl:
+brightnessctl:
diff --git a/system/brlaser/README b/system/brlaser/README
new file mode 100644
index 0000000000..3924691f96
--- /dev/null
+++ b/system/brlaser/README
@@ -0,0 +1,30 @@
+brlaser is a CUPS driver for Brother laser printers.
+
+Although most Brother printers support a standard printer language such
+as PCL or PostScript, not all do. If you have a monochrome Brother
+laser printer (or multi-function device) and the other open source
+drivers don't work, this one might help.
+
+Works with the Following printers:
+
+Lenovo  LJ2650DN
+Xerox   Fuji Xerox DocuPrint P265 dw
+Brother DCP-1510 series, DCP-1600 series, DCP-1610W series, DCP-7020,
+        DCP-7030, DCP-7040, DCP-7055, DCP-7055W, DCP-7060D,
+        DCP-7065DN, DCP-7070DW, DCP-7080, DCP-7080D, DCP-8065DN
+        DCP-L2500D series, DCP-L2510D series, DCP-L2520D series,
+        DCP-L2520DW series, DCP-L2537DW, DCP-L2540DW series,
+        DCP-L2550DW series, FAX-2820, FAX-2840, HL-1110 series,
+        HL-1200 series, HL-2030 series, HL-2130 series, HL-2140 series,
+        HL-2220 series, HL-2230 series, HL-2240D series,
+        HL-2250DN series, HL-2260, HL-2270DW series, HL-2280DW,
+        HL-5030 series, HL-5040 series, HL-5370DW series,
+        HL-L2300D series, HL-L2305 series, HL-L2310D series,
+        HL-L2320D series, HL-L2335D series, HL-L2340D series,
+        HL-L2350DW series, HL-L2360D series, HL-L2370DN series,
+        HL-L2375DW series, HL-L2380DW series, HL-L2390DW,
+        HL-L5000D series, MFC-1810 series, MFC-1910W series, MFC-7240,
+        MFC-7320, MFC-7340, MFC-7360N, MFC-7365DN, MFC-7420, MFC-7440N,
+        MFC-7460DN, MFC-7860DW, MFC-8710DW, MFC-8860DN, MFC-9160,
+        MFC-L2700DN series, MFC-L2700DW series, MFC-L2710DN series,
+        MFC-L2710DW series and MFC-L2750DW series
diff --git a/system/brlaser/brlaser.SlackBuild b/system/brlaser/brlaser.SlackBuild
new file mode 100644
index 0000000000..8bad050070
--- /dev/null
+++ b/system/brlaser/brlaser.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/bash
+
+# Slackware build script for brlaser
+
+# Copyright 2022 Juan M. Lasca <juanmlasca@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=brlaser
+VERSION=${VERSION:-6.2.6}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 0555 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 0555 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/brlaser/brlaser.info b/system/brlaser/brlaser.info
new file mode 100644
index 0000000000..33ace430b2
--- /dev/null
+++ b/system/brlaser/brlaser.info
@@ -0,0 +1,10 @@
+PRGNAM="brlaser"
+VERSION="6.2.6"
+HOMEPAGE="https://github.com/Owl-Maintain/brlaser"
+DOWNLOAD="https://github.com/Owl-Maintain/brlaser/archive/v6.2.6/brlaser-6.2.6.tar.gz"
+MD5SUM="b3433f6aadb9aaeb447217e9a4b6a7b0"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Juan M. Lasca"
+EMAIL="juanmlasca@gmail.com"
diff --git a/system/brlaser/slack-desc b/system/brlaser/slack-desc
new file mode 100644
index 0000000000..c28e7ea61e
--- /dev/null
+++ b/system/brlaser/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+brlaser: brlaser (CUPS driver for Brother laser printers)
+brlaser:
+brlaser: Although most Brother printers support a standard printer language
+brlaser: such as PCL or PostScript, not all do. If you have a monochrome
+brlaser: Brother laser printer (or multi-function device) and the other open
+brlaser: source drivers don't work, this one might help.
+brlaser:
+brlaser:
+brlaser:
+brlaser:
+brlaser:
diff --git a/system/btop/README b/system/btop/README
new file mode 100644
index 0000000000..8780098d6a
--- /dev/null
+++ b/system/btop/README
@@ -0,0 +1,3 @@
+Resource monitor that shows usage and stats for processor, memory,
+disks, network and processes.
+C++ version and continuation of bashtop and bpytop.
diff --git a/system/btop/btop.SlackBuild b/system/btop/btop.SlackBuild
new file mode 100644
index 0000000000..56ee840492
--- /dev/null
+++ b/system/btop/btop.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Slackware build script for btop
+
+# Copyright 2022-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# 20230203 bkw: fix PRINT_PACKAGE_NAME, add doinst.sh for desktop/icons.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=btop
+VERSION=${VERSION:-1.2.13}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+sed -i "s|-O2|$SLKCFLAGS|" Makefile || exit 1
+make PREFIX=/usr all
+make PREFIX=/usr install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md CHANGELOG.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/btop/btop.info b/system/btop/btop.info
new file mode 100644
index 0000000000..5fbd5b55aa
--- /dev/null
+++ b/system/btop/btop.info
@@ -0,0 +1,10 @@
+PRGNAM="btop"
+VERSION="1.2.13"
+HOMEPAGE="https://github.com/aristocratos/btop/"
+DOWNLOAD="https://github.com/aristocratos/btop/archive/v1.2.13/btop-1.2.13.tar.gz"
+MD5SUM="be23bfd87f885c0f606f467ccfebc5e3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/btop/doinst.sh b/system/btop/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/system/btop/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/btop/slack-desc b/system/btop/slack-desc
new file mode 100644
index 0000000000..9771f3dde1
--- /dev/null
+++ b/system/btop/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+btop: btop (system resources monitor)
+btop:
+btop: Resource monitor that shows usage and stats for processor, memory,
+btop: disks, network and processes.
+btop: C++ version and continuation of bashtop and bpytop.
+btop:
+btop: homepage: https://github.com/aristocratos/btop/
+btop:
+btop:
+btop:
+btop:
diff --git a/system/btrbk/btrbk.SlackBuild b/system/btrbk/btrbk.SlackBuild
index f12efd4c6a..ea5745d9bf 100644
--- a/system/btrbk/btrbk.SlackBuild
+++ b/system/btrbk/btrbk.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for btrbk
 
-# Copyright 2020 Alan Aversa
+# Copyright 2023 Alan Aversa
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,38 +22,28 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220404 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - make this noarch (it's just a perl script).
+# - gzip man pages.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=btrbk
-VERSION=${VERSION:-0.30.0}
+VERSION=${VERSION:-0.32.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG="$TMP"/package-"$PRGNAM"
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -65,19 +55,17 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 make install DESTDIR=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mv $PKG/usr/share/man $PKG/usr
+gzip -9 $PKG/usr/man/man*/*
 mv $PKG/usr/share/doc/btrbk/* $PKG/usr/doc/$PRGNAM-$VERSION/
 rm -rf $PKG/usr/share
 
@@ -88,4 +76,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 rm -fr $PKG/usr/lib/
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/btrbk/btrbk.info b/system/btrbk/btrbk.info
index 578b1c362b..825d1bad80 100644
--- a/system/btrbk/btrbk.info
+++ b/system/btrbk/btrbk.info
@@ -1,10 +1,10 @@
 PRGNAM="btrbk"
-VERSION="0.30.0"
+VERSION="0.32.6"
 HOMEPAGE="https://digint.ch/btrbk/"
-DOWNLOAD="https://digint.ch/download/btrbk/releases/btrbk-0.30.0.tar.xz"
-MD5SUM="b9c55a120c5c9842b963091608c810c7"
+DOWNLOAD="https://digint.ch/download/btrbk/releases/btrbk-0.32.6.tar.xz"
+MD5SUM="7836af48a515e90f5e8073e674eb54c3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="rubygem-asciidoctor"
+REQUIRES=""
 MAINTAINER="Alan Aversa"
 EMAIL="alan.aveNOrsaSP@AMcox.net (remove NO and SPAM)"
diff --git a/system/bubblewrap/README b/system/bubblewrap/README
index 279bc9034d..7ec2871653 100644
--- a/system/bubblewrap/README
+++ b/system/bubblewrap/README
@@ -1,8 +1,9 @@
 Bubblewrap
 
-Many container runtime tools like systemd-nspawn, docker, etc. focus on
-providing infrastructure for system administrators and orchestration tools
-(e.g. Kubernetes) to run containers.
+Many container runtime tools like systemd-nspawn, docker,
+etc. focus on providing infrastructure for system administrators and
+orchestration tools (e.g. Kubernetes) to run containers.
 
-These tools are not suitable to give to unprivileged users, because it is
-trivial to turn such access into to a fully privileged root shell on the host.
+These tools are not suitable to give to unprivileged users, because it
+is trivial to turn such access into to a fully privileged root shell
+on the host.
diff --git a/system/bubblewrap/bubblewrap.SlackBuild b/system/bubblewrap/bubblewrap.SlackBuild
index 53d6bef9fb..aa7b7d59c8 100644
--- a/system/bubblewrap/bubblewrap.SlackBuild
+++ b/system/bubblewrap/bubblewrap.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bubblewrap
 
@@ -23,10 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bubblewrap
-VERSION=${VERSION:-0.4.0}
+VERSION=${VERSION:-0.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -100,4 +107,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bubblewrap/bubblewrap.info b/system/bubblewrap/bubblewrap.info
index 9366cd4180..6cd31ee9fd 100644
--- a/system/bubblewrap/bubblewrap.info
+++ b/system/bubblewrap/bubblewrap.info
@@ -1,8 +1,8 @@
 PRGNAM="bubblewrap"
-VERSION="0.4.0"
+VERSION="0.8.0"
 HOMEPAGE="https://github.com/containers/bubblewrap/"
-DOWNLOAD="https://github.com/containers/bubblewrap/releases/download/v0.4.0/bubblewrap-0.4.0.tar.xz"
-MD5SUM="a0f3f2c80a3bad535af5bbd1b502450c"
+DOWNLOAD="https://github.com/containers/bubblewrap/releases/download/v0.8.0/bubblewrap-0.8.0.tar.xz"
+MD5SUM="fc0e14bc26df76225e8f8cc2df9fb657"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/buildah/README b/system/buildah/README
index 75d3214ce2..4c09600eb9 100644
--- a/system/buildah/README
+++ b/system/buildah/README
@@ -4,14 +4,14 @@ The Buildah package provides a command line tool that can be used to
 
 * create a working container, either from scratch or using an image as a
   starting point
-* create an image, either from a working container or via the instructions in a
-  Dockerfile
+* create an image, either from a working container or via the
+  instructions in a Dockerfile
 * images can be built in either the OCI image format or the traditional
   upstream docker image format
 * mount a working container's root filesystem for manipulation
 * unmount a working container's root filesystem
-* use the updated contents of a container's root filesystem as a filesystem
-  layer to create a new image
+* use the updated contents of a container's root filesystem as a
+  filesystem layer to create a new image
 * delete a working container or an image
 * rename a local container
 
@@ -21,15 +21,16 @@ For examples, see:
 
 non-root usage:
 
-plenty of kernel recent kernel's support the user-namespace sub uid/gid
-mapping. Only recent versions of shadow-utils will append a new mapping for
-users when they are created. You may have to add a mapping for your user like
-so:
+plenty of kernel recent kernel's support the user-namespace sub
+uid/gid mapping. Only recent versions of shadow-utils will append a
+new mapping for users when they are created. You may have to add a
+mapping for your user like so:
 
 ```shell
 echo "$YOURUSER:100000:65536" > /etc/subuid
 echo "$YOURGROUP:100000:65536" > /etc/subgid
 ```
 
-if you have more than one non-root user to add a mapping for, then their start
-number (like `100000` above) would begin after 100000+65536.
+if you have more than one non-root user to add a mapping for,
+then their start number (like `100000` above) would begin after
+100000+65536.
diff --git a/system/buildah/buildah.SlackBuild b/system/buildah/buildah.SlackBuild
index eb674e63c6..2dccf061e3 100644
--- a/system/buildah/buildah.SlackBuild
+++ b/system/buildah/buildah.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for buildah
 
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=buildah
 VERSION=${VERSION:-1.5}
 GIT_COMMIT="e94b4f9"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 # The domain part of the go package name, usually the hosting platform
 DOMAIN=github.com
@@ -41,7 +44,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -80,6 +90,7 @@ export GOPATH="$TMP/$PRGNAM-$VERSION"
 
 sed -i 's|GIT_COMMIT :=|GIT_COMMIT ?=|' Makefile
 
+export GO111MODULE="off"
 make binary docs GIT_COMMIT="$GIT_COMMIT" TAGS="'seccomp containers_image_ostree_stub'"
 make install install.completions GIT_COMMIT="$GIT_COMMIT" PREFIX="/usr" DESTDIR="$PKG" MANDIR="/usr/man"
 
@@ -99,4 +110,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bulk_extractor/README b/system/bulk_extractor/README
index 3679062b4b..37375ce4d8 100644
--- a/system/bulk_extractor/README
+++ b/system/bulk_extractor/README
@@ -1,23 +1,13 @@
-bulk_extractor is a C++ program that scans a disk image, a file, or a directory
-of files and extracts useful information without parsing the file system or
-file system structures. The results are stored in feature files that can be
-easily inspected, parsed, or processed with automated tools. bulk_extractor
-also creates histograms of features that it finds, as features that are more
-common tend to be more important.
-
-bulk_extractor is distinguished from other forensic tools by its speed and
-thoroughness.
-
-Optional dependancies include libewf (recognized if installed), afflib
-(recognized if installed), and liblightgrep.
-
-To add optional liblightgrep support:
-
-  LIGHTGREP_ENABLE=yes ./bulk_extractor.SlackBuild
-
-NOTE:
-  When running bulk_extractor with lightgrep, use
-  "-x find -e lightgrep -F findlist.txt" in addition to regular options.
-
-If you want to use the java based GUI (BEViewer), you will also need to have
-java installed. This has been tested with JDK.
+bulk_extractor is a C++ program that scans a disk image, a file, or
+a directory of files and extracts useful information without parsing
+the file system or file system structures. The results are stored in
+feature files that can be easily inspected, parsed, or processed with
+automated tools. bulk_extractor also creates histograms of features
+that it finds, as features that are more common tend to be more
+important.
+
+bulk_extractor is distinguished from other forensic tools by its speed
+and thoroughness.
+
+Optional dependencies include libewf (recognized if installed) and
+afflib (recognized if installed).
diff --git a/system/bulk_extractor/bulk_extractor.SlackBuild b/system/bulk_extractor/bulk_extractor.SlackBuild
index 2a7e955d4f..b5947af8a5 100644
--- a/system/bulk_extractor/bulk_extractor.SlackBuild
+++ b/system/bulk_extractor/bulk_extractor.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bulk_extractor
 
-# Copyright 2012-2014 Barry J. Grundy <bgrundy(at)linuxleo.com>
+# Copyright 2012-2023 Barry J. Grundy <bgrundy(at)linuxleo.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,28 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# edited for v 1.5.5 November 2014 - added LightGrep option.
+# 20220428 BJG: Updated to version 2.0.0
+# - remove LICENCE.md (removed from source)
+# - added licenses/ to doc dir.
+
+# 20220404 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - add missing README.md to doc dir.
+# - replace broken COPYING symlink with LICENSE.md in doc dir.
+
+# 20220323 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix 32-bit build.
+# - remove 0-byte README from doc dir.
+# - remove useless INSTALL from doc dir.
+
+# 20230703 Updated for 2.0.3
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=bulk_extractor
-VERSION=${VERSION:-1.5.5}
+VERSION=${VERSION:-2.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
-LIGHTGREP_ENABLE=${LIGHTGREP_ENABLE:-no}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -39,7 +53,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -62,21 +80,16 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Optional liblightgrep support (LIGHTGREP_ENABLE=yes)
-if [ "$LIGHTGREP_ENABLE" = "yes" ]; then
-  with_lightgrep="--enable-lightgrep"
-fi
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -99,13 +112,13 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -ar AUTHORS COPYING ChangeLog INSTALL NEWS README doc/ $PKG/usr/doc/$PRGNAM-$VERSION
+cp -ar AUTHORS README.md ChangeLog NEWS doc/ licenses/ $PKG/usr/doc/$PRGNAM-$VERSION
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc -type f -exec chmod 644 {} \;
+find $PKG/usr/doc -type f -exec chmod 644 {} \+
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bulk_extractor/bulk_extractor.info b/system/bulk_extractor/bulk_extractor.info
index 09b76412bb..7c108d5316 100644
--- a/system/bulk_extractor/bulk_extractor.info
+++ b/system/bulk_extractor/bulk_extractor.info
@@ -1,8 +1,8 @@
 PRGNAM="bulk_extractor"
-VERSION="1.5.5"
+VERSION="2.0.3"
 HOMEPAGE="https://github.com/simsong/bulk_extractor/wiki"
-DOWNLOAD="http://digitalcorpora.org/downloads/bulk_extractor/bulk_extractor-1.5.5.tar.gz"
-MD5SUM="7155ce6938876be91416def15e44d585"
+DOWNLOAD="https://github.com/simsong/bulk_extractor/releases/download/v2.0.3/bulk_extractor-2.0.3.tar.gz"
+MD5SUM="b1e1e9226cdec2f19dba3bfaf18dbbf1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/burp/README b/system/burp/README
index 98d0f7cc4c..08f3c20bce 100644
--- a/system/burp/README
+++ b/system/burp/README
@@ -1,5 +1,6 @@
-Burp is a backup and restore program. It uses librsync in order to save on
-the amount of space that is used by each backup. It also uses VSS (Volume
-Shadow Copy Service) to make snapshots when backing up Windows computers.
+Burp is a backup and restore program. It uses librsync in order to
+save on the amount of space that is used by each backup. It also uses
+VSS (Volume Shadow Copy Service) to make snapshots when backing up
+Windows computers.
 
 See README.SBo for information about starting and stopping burp.
diff --git a/system/burp/burp.SlackBuild b/system/burp/burp.SlackBuild
index efae17e0e1..1218091582 100644
--- a/system/burp/burp.SlackBuild
+++ b/system/burp/burp.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for burp
 
@@ -25,10 +25,13 @@
 
 # Maintained by David Spencer <baildon.research@googlemail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=burp
-VERSION=${VERSION:-2.1.32}
+VERSION=${VERSION:-2.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -118,4 +128,4 @@ for FILE in $(find etc -type f); do
   fi
 done
 
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/burp/burp.info b/system/burp/burp.info
index 46cc23024f..396a0f9e97 100644
--- a/system/burp/burp.info
+++ b/system/burp/burp.info
@@ -1,8 +1,8 @@
 PRGNAM="burp"
-VERSION="2.1.32"
+VERSION="2.4.0"
 HOMEPAGE="http://burp.grke.net"
-DOWNLOAD="http://sourceforge.net/projects/burp/files/burp-2.1.32/burp-2.1.32.tar.bz2"
-MD5SUM="d596f0493bc912883da7f474a3be270d"
+DOWNLOAD="https://github.com/grke/burp/releases/download/2.4.0/burp-2.4.0.tar.bz2"
+MD5SUM="320b77e9967ae2c72197b6c5f2b46e72"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="librsync uthash"
diff --git a/system/busybox/5-busybox-dot-config.1.32.x b/system/busybox/5-busybox-dot-config.1.32.x
new file mode 100644
index 0000000000..a9403d63d5
--- /dev/null
+++ b/system/busybox/5-busybox-dot-config.1.32.x
@@ -0,0 +1,1198 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.32.1
+# Sun Jan  3 01:47:48 2021
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Settings
+#
+CONFIG_DESKTOP=y
+# CONFIG_EXTRA_COMPAT is not set
+# CONFIG_FEDORA_COMPAT is not set
+CONFIG_INCLUDE_SUSv2=y
+CONFIG_LONG_OPTS=y
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+CONFIG_FEATURE_COMPRESS_USAGE=y
+CONFIG_LFS=y
+# CONFIG_PAM is not set
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_UTMP is not set
+# CONFIG_FEATURE_WTMP is not set
+CONFIG_FEATURE_PIDFILE=y
+CONFIG_PID_FILE_PATH="/run"
+CONFIG_BUSYBOX=y
+# CONFIG_FEATURE_SHOW_SCRIPT is not set
+CONFIG_FEATURE_INSTALLER=y
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SUID_CONFIG=y
+CONFIG_FEATURE_SUID_CONFIG_QUIET=y
+CONFIG_FEATURE_PREFER_APPLETS=y
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_SYSLOG_INFO=y
+CONFIG_FEATURE_SYSLOG=y
+CONFIG_PLATFORM_LINUX=y
+
+#
+# Build Options
+#
+CONFIG_STATIC=y
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_SYSROOT=""
+CONFIG_EXTRA_CFLAGS=""
+CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_LDLIBS=""
+# CONFIG_USE_PORTABLE_CODE is not set
+CONFIG_STACK_OPTIMIZATION_386=y
+
+#
+# Installation Options ("make install" behavior)
+#
+# CONFIG_INSTALL_APPLET_SYMLINKS is not set
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+CONFIG_INSTALL_APPLET_DONT=y
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_DEBUG_SANITIZE is not set
+# CONFIG_UNIT_TEST is not set
+# CONFIG_WERROR is not set
+# CONFIG_WARN_SIMPLE_MSG is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+
+#
+# Library Tuning
+#
+# CONFIG_FEATURE_USE_BSS_TAIL is not set
+CONFIG_FLOAT_DURATION=y
+CONFIG_FEATURE_RTMINMAX=y
+CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS=y
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SMALL=1
+CONFIG_SHA3_SMALL=0
+CONFIG_FEATURE_FAST_TOP=y
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+# CONFIG_FEATURE_ETC_SERVICES is not set
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=255
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_EDITING_SAVE_ON_EXIT=y
+CONFIG_FEATURE_REVERSE_SEARCH=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+CONFIG_FEATURE_USERNAME_COMPLETION=y
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+CONFIG_FEATURE_EDITING_WINCH=y
+# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
+CONFIG_LOCALE_SUPPORT=y
+CONFIG_UNICODE_SUPPORT=y
+CONFIG_UNICODE_USING_LOCALE=y
+# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_SUBST_WCHAR=63
+CONFIG_LAST_SUPPORTED_WCHAR=767
+# CONFIG_UNICODE_COMBINING_WCHARS is not set
+# CONFIG_UNICODE_WIDE_WCHARS is not set
+# CONFIG_UNICODE_BIDI_SUPPORT is not set
+# CONFIG_UNICODE_NEUTRAL_TABLE is not set
+# CONFIG_UNICODE_PRESERVE_BROKEN is not set
+# CONFIG_FEATURE_NON_POSIX_CP is not set
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_USE_SENDFILE=y
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_FEATURE_SKIP_ROOTFS=y
+# CONFIG_MONOTONIC_SYSCALL is not set
+CONFIG_IOCTL_HEX2STR_ERROR=y
+CONFIG_FEATURE_HWIB=y
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+CONFIG_FEATURE_SEAMLESS_XZ=y
+CONFIG_FEATURE_SEAMLESS_LZMA=y
+CONFIG_FEATURE_SEAMLESS_BZ2=y
+CONFIG_FEATURE_SEAMLESS_GZ=y
+CONFIG_FEATURE_SEAMLESS_Z=y
+CONFIG_AR=y
+CONFIG_FEATURE_AR_LONG_FILENAMES=y
+CONFIG_FEATURE_AR_CREATE=y
+CONFIG_UNCOMPRESS=y
+CONFIG_GUNZIP=y
+CONFIG_ZCAT=y
+CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y
+CONFIG_BUNZIP2=y
+CONFIG_BZCAT=y
+CONFIG_UNLZMA=y
+CONFIG_LZCAT=y
+CONFIG_LZMA=y
+CONFIG_UNXZ=y
+CONFIG_XZCAT=y
+CONFIG_XZ=y
+CONFIG_BZIP2=y
+CONFIG_BZIP2_SMALL=8
+CONFIG_FEATURE_BZIP2_DECOMPRESS=y
+CONFIG_CPIO=y
+CONFIG_FEATURE_CPIO_O=y
+# CONFIG_FEATURE_CPIO_P is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+CONFIG_GZIP=y
+# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
+CONFIG_GZIP_FAST=0
+CONFIG_FEATURE_GZIP_LEVELS=y
+CONFIG_FEATURE_GZIP_DECOMPRESS=y
+# CONFIG_LZOP is not set
+CONFIG_UNLZOP=y
+CONFIG_LZOPCAT=y
+# CONFIG_LZOP_COMPR_HIGH is not set
+# CONFIG_RPM is not set
+CONFIG_RPM2CPIO=y
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_AUTODETECT=y
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
+CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_TO_COMMAND=y
+CONFIG_FEATURE_TAR_UNAME_GNAME=y
+# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
+# CONFIG_FEATURE_TAR_SELINUX is not set
+CONFIG_UNZIP=y
+CONFIG_FEATURE_UNZIP_CDF=y
+CONFIG_FEATURE_UNZIP_BZIP2=y
+CONFIG_FEATURE_UNZIP_LZMA=y
+CONFIG_FEATURE_UNZIP_XZ=y
+CONFIG_FEATURE_LZMA_FAST=y
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+CONFIG_CAT=y
+CONFIG_FEATURE_CATN=y
+CONFIG_FEATURE_CATV=y
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
+CONFIG_CHROOT=y
+CONFIG_CKSUM=y
+CONFIG_COMM=y
+CONFIG_CP=y
+CONFIG_FEATURE_CP_LONG_OPTIONS=y
+CONFIG_FEATURE_CP_REFLINK=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+# CONFIG_FEATURE_DATE_NANO is not set
+CONFIG_FEATURE_DATE_COMPAT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_FEATURE_DD_STATUS=y
+CONFIG_DF=y
+CONFIG_FEATURE_DF_FANCY=y
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_EXPAND=y
+CONFIG_UNEXPAND=y
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FACTOR=y
+CONFIG_FALSE=y
+CONFIG_FOLD=y
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+CONFIG_HOSTID=y
+CONFIG_ID=y
+CONFIG_GROUPS=y
+CONFIG_INSTALL=y
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+CONFIG_LINK=y
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_WIDTH=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_SHA1SUM=y
+CONFIG_SHA256SUM=y
+CONFIG_SHA512SUM=y
+CONFIG_SHA3SUM=y
+
+#
+# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+CONFIG_MKDIR=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MKTEMP=y
+CONFIG_MV=y
+CONFIG_NICE=y
+CONFIG_NL=y
+CONFIG_NOHUP=y
+CONFIG_NPROC=y
+CONFIG_OD=y
+CONFIG_PASTE=y
+CONFIG_PRINTENV=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_SEQ=y
+CONFIG_SHRED=y
+CONFIG_SHUF=y
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set
+CONFIG_SPLIT=y
+CONFIG_FEATURE_SPLIT_FANCY=y
+CONFIG_STAT=y
+CONFIG_FEATURE_STAT_FORMAT=y
+CONFIG_FEATURE_STAT_FILESYSTEM=y
+CONFIG_STTY=y
+CONFIG_SUM=y
+CONFIG_SYNC=y
+CONFIG_FEATURE_SYNC_FANCY=y
+CONFIG_FSYNC=y
+CONFIG_TAC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TEST=y
+CONFIG_TEST1=y
+CONFIG_TEST2=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TIMEOUT=y
+CONFIG_TOUCH=y
+CONFIG_FEATURE_TOUCH_NODEREF=y
+CONFIG_FEATURE_TOUCH_SUSV3=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_TRUE=y
+CONFIG_TRUNCATE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNAME_OSNAME="GNU/Linux"
+CONFIG_BB_ARCH=y
+CONFIG_UNIQ=y
+CONFIG_UNLINK=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_BASE64=y
+CONFIG_UUENCODE=y
+CONFIG_WC=y
+CONFIG_FEATURE_WC_LARGE=y
+# CONFIG_WHO is not set
+# CONFIG_W is not set
+# CONFIG_USERS is not set
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options
+#
+CONFIG_FEATURE_VERBOSE=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+CONFIG_FGCONSOLE=y
+CONFIG_KBD_MODE=y
+CONFIG_LOADFONT=y
+CONFIG_SETFONT=y
+# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
+CONFIG_DEFAULT_SETFONT_DIR=""
+
+#
+# Common options for loadfont and setfont
+#
+CONFIG_FEATURE_LOADFONT_PSF2=y
+CONFIG_FEATURE_LOADFONT_RAW=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_RESIZE=y
+CONFIG_FEATURE_RESIZE_PRINT=y
+CONFIG_SETCONSOLE=y
+CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
+CONFIG_SHOWKEY=y
+
+#
+# Debian Utilities
+#
+CONFIG_PIPE_PROGRESS=y
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+CONFIG_FEATURE_RUN_PARTS_FANCY=y
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_WHICH=y
+
+#
+# klibc-utils
+#
+# CONFIG_MINIPS is not set
+# CONFIG_NUKE is not set
+CONFIG_RESUME=y
+CONFIG_RUN_INIT=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_LIBM=y
+CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
+CONFIG_FEATURE_DIFF_DIR=y
+CONFIG_ED=y
+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=4096
+# CONFIG_FEATURE_VI_8BIT is not set
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_ASK_TERMINAL=y
+CONFIG_FEATURE_VI_UNDO=y
+CONFIG_FEATURE_VI_UNDO_QUEUE=y
+CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_EXECUTABLE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+CONFIG_FEATURE_FIND_INUM=y
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_EXEC_PLUS=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+CONFIG_FEATURE_FIND_QUIT=y
+CONFIG_FEATURE_FIND_DELETE=y
+CONFIG_FEATURE_FIND_EMPTY=y
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_FEATURE_FIND_LINKS=y
+CONFIG_GREP=y
+CONFIG_EGREP=y
+CONFIG_FGREP=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
+CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y
+CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y
+
+#
+# Init Utilities
+#
+CONFIG_BOOTCHARTD=y
+CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER=y
+CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y
+CONFIG_HALT=y
+CONFIG_POWEROFF=y
+CONFIG_REBOOT=y
+# CONFIG_FEATURE_WAIT_FOR_INIT is not set
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
+CONFIG_INIT=y
+CONFIG_LINUXRC=y
+CONFIG_FEATURE_USE_INITTAB=y
+# CONFIG_FEATURE_KILL_REMOVED is not set
+CONFIG_FEATURE_KILL_DELAY=0
+CONFIG_FEATURE_INIT_SCTTY=y
+# CONFIG_FEATURE_INIT_SYSLOG is not set
+CONFIG_FEATURE_INIT_QUIET=y
+CONFIG_FEATURE_INIT_COREDUMPS=y
+CONFIG_INIT_TERMINAL_TYPE="linux"
+CONFIG_FEATURE_INIT_MODIFY_CMDLINE=y
+
+#
+# Login/Password Management Utilities
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+CONFIG_USE_BB_PWD_GRP=y
+CONFIG_USE_BB_SHADOW=y
+CONFIG_USE_BB_CRYPT=y
+CONFIG_USE_BB_CRYPT_SHA=y
+# CONFIG_ADD_SHELL is not set
+# CONFIG_REMOVE_SHELL is not set
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
+CONFIG_ADDUSER=y
+CONFIG_FEATURE_CHECK_NAMES=y
+CONFIG_LAST_ID=60000
+CONFIG_FIRST_SYSTEM_ID=100
+CONFIG_LAST_SYSTEM_ID=999
+CONFIG_CHPASSWD=y
+CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des"
+CONFIG_CRYPTPW=y
+CONFIG_MKPASSWD=y
+CONFIG_DELUSER=y
+CONFIG_DELGROUP=y
+CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
+CONFIG_GETTY=y
+CONFIG_LOGIN=y
+# CONFIG_LOGIN_SESSION_AS_CHILD is not set
+CONFIG_LOGIN_SCRIPTS=y
+CONFIG_FEATURE_NOLOGIN=y
+CONFIG_FEATURE_SECURETTY=y
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+# CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY is not set
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+CONFIG_LSATTR=y
+CONFIG_TUNE2FS=y
+
+#
+# Linux Module Utilities
+#
+CONFIG_MODPROBE_SMALL=y
+CONFIG_DEPMOD=y
+CONFIG_INSMOD=y
+CONFIG_LSMOD=y
+# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
+CONFIG_MODINFO=y
+CONFIG_MODPROBE=y
+# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
+CONFIG_RMMOD=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS=y
+CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y
+# CONFIG_FEATURE_2_4_MODULES is not set
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
+# CONFIG_FEATURE_MODUTILS_ALIAS is not set
+# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+
+#
+# Linux System Utilities
+#
+CONFIG_ACPID=y
+CONFIG_FEATURE_ACPID_COMPAT=y
+CONFIG_BLKDISCARD=y
+CONFIG_BLKID=y
+CONFIG_FEATURE_BLKID_TYPE=y
+CONFIG_BLOCKDEV=y
+CONFIG_CAL=y
+CONFIG_CHRT=y
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+CONFIG_EJECT=y
+CONFIG_FEATURE_EJECT_SCSI=y
+CONFIG_FALLOCATE=y
+CONFIG_FATATTR=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+CONFIG_FDFORMAT=y
+CONFIG_FDISK=y
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+CONFIG_FEATURE_GPT_LABEL=y
+CONFIG_FEATURE_FDISK_ADVANCED=y
+CONFIG_FINDFS=y
+CONFIG_FLOCK=y
+CONFIG_FDFLUSH=y
+CONFIG_FREERAMDISK=y
+CONFIG_FSCK_MINIX=y
+CONFIG_FSFREEZE=y
+CONFIG_FSTRIM=y
+CONFIG_GETOPT=y
+CONFIG_FEATURE_GETOPT_LONG=y
+CONFIG_HEXDUMP=y
+CONFIG_FEATURE_HEXDUMP_REVERSE=y
+CONFIG_HD=y
+CONFIG_XXD=y
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+CONFIG_IONICE=y
+CONFIG_IPCRM=y
+CONFIG_IPCS=y
+# CONFIG_LAST is not set
+# CONFIG_FEATURE_LAST_FANCY is not set
+CONFIG_LOSETUP=y
+CONFIG_LSPCI=y
+CONFIG_LSUSB=y
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+CONFIG_FEATURE_MDEV_RENAME=y
+CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
+CONFIG_FEATURE_MDEV_EXEC=y
+CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
+CONFIG_FEATURE_MDEV_DAEMON=y
+CONFIG_MESG=y
+CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
+CONFIG_MKE2FS=y
+CONFIG_MKFS_EXT2=y
+CONFIG_MKFS_MINIX=y
+CONFIG_FEATURE_MINIX2=y
+# CONFIG_MKFS_REISER is not set
+CONFIG_MKDOSFS=y
+CONFIG_MKFS_VFAT=y
+CONFIG_MKSWAP=y
+CONFIG_FEATURE_MKSWAP_UUID=y
+CONFIG_MORE=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_FAKE=y
+CONFIG_FEATURE_MOUNT_VERBOSE=y
+CONFIG_FEATURE_MOUNT_HELPERS=y
+CONFIG_FEATURE_MOUNT_LABEL=y
+# CONFIG_FEATURE_MOUNT_NFS is not set
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_FEATURE_MOUNT_OTHERTAB=y
+CONFIG_MOUNTPOINT=y
+# CONFIG_NOLOGIN is not set
+# CONFIG_NOLOGIN_DEPENDENCIES is not set
+CONFIG_NSENTER=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+CONFIG_RDEV=y
+CONFIG_READPROFILE=y
+CONFIG_RENICE=y
+CONFIG_REV=y
+CONFIG_RTCWAKE=y
+CONFIG_SCRIPT=y
+CONFIG_SCRIPTREPLAY=y
+CONFIG_SETARCH=y
+CONFIG_LINUX32=y
+CONFIG_LINUX64=y
+CONFIG_SETPRIV=y
+CONFIG_FEATURE_SETPRIV_DUMP=y
+CONFIG_FEATURE_SETPRIV_CAPABILITIES=y
+CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES=y
+CONFIG_SETSID=y
+CONFIG_SWAPON=y
+CONFIG_FEATURE_SWAPON_DISCARD=y
+CONFIG_FEATURE_SWAPON_PRI=y
+CONFIG_SWAPOFF=y
+CONFIG_FEATURE_SWAPONOFF_LABEL=y
+CONFIG_SWITCH_ROOT=y
+CONFIG_TASKSET=y
+CONFIG_FEATURE_TASKSET_FANCY=y
+CONFIG_FEATURE_TASKSET_CPULIST=y
+CONFIG_UEVENT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+CONFIG_UNSHARE=y
+# CONFIG_WALL is not set
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+CONFIG_VOLUMEID=y
+
+#
+# Filesystem/Volume identification
+#
+CONFIG_FEATURE_VOLUMEID_BCACHE=y
+CONFIG_FEATURE_VOLUMEID_BTRFS=y
+CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_EXFAT=y
+CONFIG_FEATURE_VOLUMEID_EXT=y
+CONFIG_FEATURE_VOLUMEID_F2FS=y
+CONFIG_FEATURE_VOLUMEID_FAT=y
+CONFIG_FEATURE_VOLUMEID_HFS=y
+CONFIG_FEATURE_VOLUMEID_ISO9660=y
+CONFIG_FEATURE_VOLUMEID_JFS=y
+# CONFIG_FEATURE_VOLUMEID_LFS is not set
+CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
+CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
+CONFIG_FEATURE_VOLUMEID_LUKS=y
+CONFIG_FEATURE_VOLUMEID_MINIX=y
+CONFIG_FEATURE_VOLUMEID_NILFS=y
+CONFIG_FEATURE_VOLUMEID_NTFS=y
+CONFIG_FEATURE_VOLUMEID_OCFS2=y
+CONFIG_FEATURE_VOLUMEID_REISERFS=y
+CONFIG_FEATURE_VOLUMEID_ROMFS=y
+CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
+CONFIG_FEATURE_VOLUMEID_SYSV=y
+CONFIG_FEATURE_VOLUMEID_UBIFS=y
+CONFIG_FEATURE_VOLUMEID_UDF=y
+CONFIG_FEATURE_VOLUMEID_XFS=y
+
+#
+# Miscellaneous Utilities
+#
+CONFIG_ADJTIMEX=y
+CONFIG_BBCONFIG=y
+CONFIG_FEATURE_COMPRESS_BBCONFIG=y
+CONFIG_BC=y
+CONFIG_DC=y
+CONFIG_FEATURE_DC_BIG=y
+# CONFIG_FEATURE_DC_LIBM is not set
+CONFIG_FEATURE_BC_INTERACTIVE=y
+CONFIG_FEATURE_BC_LONG_OPTIONS=y
+CONFIG_BEEP=y
+CONFIG_FEATURE_BEEP_FREQ=4000
+CONFIG_FEATURE_BEEP_LENGTH_MS=30
+CONFIG_CHAT=y
+CONFIG_FEATURE_CHAT_NOFAIL=y
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+# CONFIG_CONSPY is not set
+CONFIG_CROND=y
+CONFIG_FEATURE_CROND_D=y
+CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
+CONFIG_FEATURE_CROND_SPECIAL_TIMES=y
+CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
+CONFIG_CRONTAB=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_DEVMEM is not set
+CONFIG_FBSPLASH=y
+# CONFIG_FLASH_ERASEALL is not set
+# CONFIG_FLASH_LOCK is not set
+# CONFIG_FLASH_UNLOCK is not set
+# CONFIG_FLASHCP is not set
+CONFIG_HDPARM=y
+CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
+CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y
+CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y
+CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
+CONFIG_HEXEDIT=y
+CONFIG_I2CGET=y
+CONFIG_I2CSET=y
+CONFIG_I2CDUMP=y
+CONFIG_I2CDETECT=y
+CONFIG_I2CTRANSFER=y
+CONFIG_INOTIFYD=y
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+CONFIG_FEATURE_LESS_TRUNCATE=y
+CONFIG_FEATURE_LESS_MARKS=y
+CONFIG_FEATURE_LESS_REGEXP=y
+CONFIG_FEATURE_LESS_WINCH=y
+CONFIG_FEATURE_LESS_ASK_TERMINAL=y
+CONFIG_FEATURE_LESS_DASHCMD=y
+CONFIG_FEATURE_LESS_LINENUMS=y
+CONFIG_FEATURE_LESS_RAW=y
+CONFIG_FEATURE_LESS_ENV=y
+CONFIG_LSSCSI=y
+CONFIG_MAKEDEVS=y
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+CONFIG_FEATURE_MAKEDEVS_TABLE=y
+CONFIG_MAN=y
+CONFIG_MICROCOM=y
+# CONFIG_MIM is not set
+CONFIG_MT=y
+# CONFIG_NANDWRITE is not set
+# CONFIG_NANDDUMP is not set
+CONFIG_PARTPROBE=y
+CONFIG_RAIDAUTORUN=y
+CONFIG_READAHEAD=y
+CONFIG_RFKILL=y
+# CONFIG_RUNLEVEL is not set
+CONFIG_RX=y
+CONFIG_SETFATTR=y
+CONFIG_SETSERIAL=y
+CONFIG_STRINGS=y
+CONFIG_TIME=y
+CONFIG_TS=y
+CONFIG_TTYSIZE=y
+CONFIG_UBIATTACH=y
+CONFIG_UBIDETACH=y
+CONFIG_UBIMKVOL=y
+CONFIG_UBIRMVOL=y
+CONFIG_UBIRSVOL=y
+CONFIG_UBIUPDATEVOL=y
+CONFIG_UBIRENAME=y
+CONFIG_VOLNAME=y
+CONFIG_WATCHDOG=y
+
+#
+# Networking Utilities
+#
+CONFIG_FEATURE_IPV6=y
+CONFIG_FEATURE_UNIX_LOCAL=y
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_FEATURE_TLS_SHA1 is not set
+CONFIG_ARP=y
+CONFIG_ARPING=y
+CONFIG_BRCTL=y
+CONFIG_FEATURE_BRCTL_FANCY=y
+CONFIG_FEATURE_BRCTL_SHOW=y
+CONFIG_DNSD=y
+CONFIG_ETHER_WAKE=y
+CONFIG_FTPD=y
+CONFIG_FEATURE_FTPD_WRITE=y
+CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
+CONFIG_FEATURE_FTPD_AUTHENTICATION=y
+CONFIG_FTPGET=y
+CONFIG_FTPPUT=y
+CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
+CONFIG_HOSTNAME=y
+CONFIG_DNSDOMAINNAME=y
+CONFIG_HTTPD=y
+CONFIG_FEATURE_HTTPD_RANGES=y
+CONFIG_FEATURE_HTTPD_SETUID=y
+CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
+CONFIG_FEATURE_HTTPD_AUTH_MD5=y
+CONFIG_FEATURE_HTTPD_CGI=y
+CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
+CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
+CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
+CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
+CONFIG_FEATURE_HTTPD_PROXY=y
+CONFIG_FEATURE_HTTPD_GZIP=y
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+CONFIG_IFENSLAVE=y
+CONFIG_IFPLUGD=y
+CONFIG_IFUP=y
+CONFIG_IFDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+CONFIG_FEATURE_IFUPDOWN_IP=y
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
+CONFIG_INETD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
+CONFIG_IPNEIGH=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_ROUTE_DIR="y"
+CONFIG_FEATURE_IP_TUNNEL=y
+CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_NEIGH=y
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+CONFIG_IPCALC=y
+CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
+CONFIG_FEATURE_IPCALC_FANCY=y
+CONFIG_FAKEIDENTD=y
+CONFIG_NAMEIF=y
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+CONFIG_NBDCLIENT=y
+CONFIG_NC=y
+# CONFIG_NETCAT is not set
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
+CONFIG_NC_110_COMPAT=y
+CONFIG_NETSTAT=y
+CONFIG_FEATURE_NETSTAT_WIDE=y
+CONFIG_FEATURE_NETSTAT_PRG=y
+CONFIG_NSLOOKUP=y
+CONFIG_FEATURE_NSLOOKUP_BIG=y
+CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS=y
+CONFIG_NTPD=y
+CONFIG_FEATURE_NTPD_SERVER=y
+CONFIG_FEATURE_NTPD_CONF=y
+CONFIG_FEATURE_NTP_AUTH=y
+CONFIG_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_PSCAN=y
+CONFIG_ROUTE=y
+CONFIG_SLATTACH=y
+CONFIG_SSL_CLIENT=y
+CONFIG_TC=y
+CONFIG_FEATURE_TC_INGRESS=y
+CONFIG_TCPSVD=y
+CONFIG_UDPSVD=y
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+CONFIG_FEATURE_TELNET_WIDTH=y
+CONFIG_TELNETD=y
+CONFIG_FEATURE_TELNETD_STANDALONE=y
+# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
+CONFIG_TFTP=y
+# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+CONFIG_FEATURE_TFTP_HPA_COMPAT=y
+CONFIG_TFTPD=y
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+# CONFIG_TFTP_DEBUG is not set
+CONFIG_TLS=y
+CONFIG_TRACEROUTE=y
+CONFIG_TRACEROUTE6=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+CONFIG_TUNCTL=y
+CONFIG_FEATURE_TUNCTL_UG=y
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_TIMEOUT=y
+# CONFIG_FEATURE_WGET_HTTPS is not set
+# CONFIG_FEATURE_WGET_OPENSSL is not set
+CONFIG_WHOIS=y
+CONFIG_ZCIP=y
+CONFIG_UDHCPD=y
+CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y
+CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
+CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
+CONFIG_DUMPLEASES=y
+CONFIG_DHCPRELAY=y
+CONFIG_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC6=y
+CONFIG_FEATURE_UDHCPC6_RFC3646=y
+CONFIG_FEATURE_UDHCPC6_RFC4704=y
+CONFIG_FEATURE_UDHCPC6_RFC4833=y
+CONFIG_FEATURE_UDHCPC6_RFC5970=y
+
+#
+# Common options for DHCP applets
+#
+CONFIG_FEATURE_UDHCP_PORT=y
+CONFIG_UDHCP_DEBUG=9
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+CONFIG_FEATURE_UDHCP_RFC3397=y
+CONFIG_FEATURE_UDHCP_8021Q=y
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
+
+#
+# Print Utilities
+#
+CONFIG_LPD=y
+CONFIG_LPR=y
+CONFIG_LPQ=y
+
+#
+# Mail Utilities
+#
+CONFIG_MAKEMIME=y
+CONFIG_POPMAILDIR=y
+CONFIG_FEATURE_POPMAILDIR_DELIVERY=y
+CONFIG_REFORMIME=y
+CONFIG_FEATURE_REFORMIME_COMPAT=y
+CONFIG_SENDMAIL=y
+CONFIG_FEATURE_MIME_CHARSET="us-ascii"
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_IOSTAT=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+CONFIG_LSOF=y
+CONFIG_MPSTAT=y
+CONFIG_NMETER=y
+CONFIG_PGREP=y
+CONFIG_PKILL=y
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+CONFIG_PMAP=y
+CONFIG_POWERTOP=y
+CONFIG_FEATURE_POWERTOP_INTERACTIVE=y
+CONFIG_PS=y
+# CONFIG_FEATURE_PS_WIDE is not set
+# CONFIG_FEATURE_PS_LONG is not set
+CONFIG_FEATURE_PS_TIME=y
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
+CONFIG_PSTREE=y
+CONFIG_PWDX=y
+CONFIG_SMEMCAP=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_INTERACTIVE=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+CONFIG_FEATURE_TOP_SMP_CPU=y
+CONFIG_FEATURE_TOP_DECIMALS=y
+CONFIG_FEATURE_TOP_SMP_PROCESS=y
+CONFIG_FEATURE_TOPMEM=y
+CONFIG_UPTIME=y
+# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
+CONFIG_WATCH=y
+CONFIG_FEATURE_SHOW_THREADS=y
+
+#
+# Runit Utilities
+#
+CONFIG_CHPST=y
+CONFIG_SETUIDGID=y
+CONFIG_ENVUIDGID=y
+CONFIG_ENVDIR=y
+CONFIG_SOFTLIMIT=y
+CONFIG_RUNSV=y
+CONFIG_RUNSVDIR=y
+# CONFIG_FEATURE_RUNSVDIR_LOG is not set
+CONFIG_SV=y
+CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service"
+CONFIG_SVC=y
+CONFIG_SVOK=y
+CONFIG_SVLOGD=y
+# CONFIG_CHCON is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SESTATUS is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_SETSEBOOL is not set
+
+#
+# Shells
+#
+CONFIG_SH_IS_ASH=y
+# CONFIG_SH_IS_HUSH is not set
+# CONFIG_SH_IS_NONE is not set
+# CONFIG_BASH_IS_ASH is not set
+# CONFIG_BASH_IS_HUSH is not set
+CONFIG_BASH_IS_NONE=y
+CONFIG_SHELL_ASH=y
+CONFIG_ASH=y
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_INTERNAL_GLOB=y
+CONFIG_ASH_BASH_COMPAT=y
+CONFIG_ASH_BASH_SOURCE_CURDIR=y
+CONFIG_ASH_BASH_NOT_FOUND_HOOK=y
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
+CONFIG_ASH_IDLE_TIMEOUT=y
+CONFIG_ASH_MAIL=y
+CONFIG_ASH_ECHO=y
+CONFIG_ASH_PRINTF=y
+CONFIG_ASH_TEST=y
+CONFIG_ASH_HELP=y
+CONFIG_ASH_GETOPTS=y
+CONFIG_ASH_CMDCMD=y
+CONFIG_CTTYHACK=y
+# CONFIG_HUSH is not set
+# CONFIG_SHELL_HUSH is not set
+# CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_BRACE_EXPANSION is not set
+# CONFIG_HUSH_LINENO_VAR is not set
+# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_SAVEHISTORY is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
+# CONFIG_HUSH_MODE_X is not set
+# CONFIG_HUSH_ECHO is not set
+# CONFIG_HUSH_PRINTF is not set
+# CONFIG_HUSH_TEST is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_EXPORT is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_READONLY is not set
+# CONFIG_HUSH_KILL is not set
+# CONFIG_HUSH_WAIT is not set
+# CONFIG_HUSH_COMMAND is not set
+# CONFIG_HUSH_TRAP is not set
+# CONFIG_HUSH_TYPE is not set
+# CONFIG_HUSH_TIMES is not set
+# CONFIG_HUSH_READ is not set
+# CONFIG_HUSH_SET is not set
+# CONFIG_HUSH_UNSET is not set
+# CONFIG_HUSH_ULIMIT is not set
+# CONFIG_HUSH_UMASK is not set
+# CONFIG_HUSH_GETOPTS is not set
+# CONFIG_HUSH_MEMLEAK is not set
+
+#
+# Options common to all shells
+#
+CONFIG_FEATURE_SH_MATH=y
+CONFIG_FEATURE_SH_MATH_64=y
+CONFIG_FEATURE_SH_MATH_BASE=y
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+CONFIG_FEATURE_SH_STANDALONE=y
+# CONFIG_FEATURE_SH_NOFORK is not set
+CONFIG_FEATURE_SH_READ_FRAC=y
+CONFIG_FEATURE_SH_HISTFILESIZE=y
+# CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS is not set
+
+#
+# System Logging Utilities
+#
+CONFIG_KLOGD=y
+
+#
+# klogd should not be used together with syslog to kernel printk buffer
+#
+CONFIG_FEATURE_KLOGD_KLOGCTL=y
+CONFIG_LOGGER=y
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_SYSLOGD_DUP=y
+CONFIG_FEATURE_SYSLOGD_CFG=y
+CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS=y
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_FEATURE_KMSG_SYSLOG=y
diff --git a/system/busybox/busybox.SlackBuild b/system/busybox/busybox.SlackBuild
index f3653f94be..731a76deb4 100644
--- a/system/busybox/busybox.SlackBuild
+++ b/system/busybox/busybox.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for busybox
 
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=busybox
-VERSION=${VERSION:-1.28.1}
+VERSION=${VERSION:-1.32.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-K_CONFIG=${K_CONFIG:-4}		# set to 2 for kernel 2.*.*
+PKGTYPE=${PKGTYPE:-tgz}
+K_CONFIG=${K_CONFIG:-5}		# set to 2 for kernel 2.*.*
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -128,4 +138,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/busybox/busybox.info b/system/busybox/busybox.info
index f1ea50d6c3..11427bcb77 100644
--- a/system/busybox/busybox.info
+++ b/system/busybox/busybox.info
@@ -1,8 +1,8 @@
 PRGNAM="busybox"
-VERSION="1.28.1"
+VERSION="1.32.1"
 HOMEPAGE="https://www.busybox.net/"
-DOWNLOAD="https://www.busybox.net/downloads/busybox-1.28.1.tar.bz2"
-MD5SUM="928919a21e34d5c5507d872a4fb7b9f4"
+DOWNLOAD="https://www.busybox.net/downloads/busybox-1.32.1.tar.bz2"
+MD5SUM="6273c550ab6a32e8ff545e00e831efc5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/butterfly/butterfly.SlackBuild b/system/butterfly/butterfly.SlackBuild
index c2414bb0b6..489a5f9f7a 100644
--- a/system/butterfly/butterfly.SlackBuild
+++ b/system/butterfly/butterfly.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for butterfly
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=butterfly
 VERSION=${VERSION:-3.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -83,4 +93,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/byobu/README b/system/byobu/README
index ebdd74d427..33b6dd31b9 100644
--- a/system/byobu/README
+++ b/system/byobu/README
@@ -1,8 +1,9 @@
-Byobu is a Japanese term for decorative, multi-panel screens that serve as
-folding room dividers. As an open source project, Byobu is an elegant
-enhancement of the otherwise functional, plain, practical GNU Screen. Byobu
-includes an enhanced profile and configuration utilities for the GNU screen
-window manager, such as toggle-able system status notifications.
+Byobu is a Japanese term for decorative, multi-panel screens that
+serve as folding room dividers. As an open source project, Byobu is an
+elegant enhancement of the otherwise functional, plain, practical GNU
+Screen. Byobu includes an enhanced profile and configuration utilities
+for the GNU screen window manager, such as toggle-able system status
+notifications.
 
 To convert an already running screen session to byobu, just install this
 package, then run:
diff --git a/system/byobu/byobu.SlackBuild b/system/byobu/byobu.SlackBuild
index 1788e649aa..4e7c749eb0 100644
--- a/system/byobu/byobu.SlackBuild
+++ b/system/byobu/byobu.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Byobu
 
@@ -22,10 +22,18 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220404 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - remove empty /usr/share/doc from package.
+# - remove 0-byte NEWS from doc dir.
+# - make .desktop file validate.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=byobu
 VERSION=${VERSION:-2.82}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,12 +43,17 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS COPYING NEWS README"
+# 20220404 bkw: NEWS is a 0-byte placeholder.
+DOCS="AUTHORS COPYING README"
 
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
@@ -63,9 +76,9 @@ patch -p1 < $CWD/slackware.diff
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 if [ "$ARCH" = "x86_64" ]; then
   find usr -type f -exec sed -i -e "s/lib/lib${LIBDIRSUFFIX}/g" \{\} \;
@@ -86,8 +99,12 @@ mv $PKG/usr/share/man $PKG/usr/
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+# 20220404 bkw: deprecation warning from desktop-file-validate.
+sed -i '/^Encoding/d' $PKG/usr/share/applications/$PRGNAM.desktop
+
 mkdir -p $PKG/usr/doc
 mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG/usr/share/doc # 20220404 bkw: empty dir
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -97,4 +114,4 @@ cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
 chown -R root:root .
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bzip3/README b/system/bzip3/README
new file mode 100644
index 0000000000..0b21636580
--- /dev/null
+++ b/system/bzip3/README
@@ -0,0 +1,9 @@
+bzip3
+
+A better, faster and stronger spiritual successor to BZip2. 
+Features higher compression ratios and better performance thanks to a 
+order-0 context mixing entropy coder, a fast Burrows-Wheeler transform 
+code making use of suffix arrays and a RLE with Lempel Ziv+Prediction 
+pass based on LZ77-style string matching and PPM-style context modeling.
+
+
diff --git a/system/bzip3/bzip3.SlackBuild b/system/bzip3/bzip3.SlackBuild
new file mode 100644
index 0000000000..c846d1e085
--- /dev/null
+++ b/system/bzip3/bzip3.SlackBuild
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+# Copyright 2023 marav, FR
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=bzip3
+VERSION=${VERSION:-1.4.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i586 ;;
+    arm*) export ARCH=arm ;;
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z || exit 1
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \+
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux || exit 1
+
+make 
+make install DESTDIR=$PKG 
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE NEWS README.md PORTING.md \
+    $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/bzip3/bzip3.info b/system/bzip3/bzip3.info
new file mode 100644
index 0000000000..816a22c673
--- /dev/null
+++ b/system/bzip3/bzip3.info
@@ -0,0 +1,10 @@
+PRGNAM="bzip3"
+VERSION="1.4.0"
+HOMEPAGE="https://github.com/kspalaiologos/bzip3"
+DOWNLOAD="https://github.com/kspalaiologos/bzip3/releases/download/1.4.0/bzip3-1.4.0.tar.gz"
+MD5SUM="6c7aa082c510980072578f20df70f7ca"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="marav"
+EMAIL="marav8@free.fr"
diff --git a/system/bzip3/slack-desc b/system/bzip3/slack-desc
new file mode 100644
index 0000000000..c2db8a70f1
--- /dev/null
+++ b/system/bzip3/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+bzip3: bzip3 (A better and stronger spiritual successor to BZip2)
+bzip3:
+bzip3: Like its ancestor, BZip3 excels at compressing text or code.
+bzip3:
+bzip3:
+bzip3:
+bzip3:
+bzip3:
+bzip3: Homepage: https://github.com/kspalaiologos/bzip3
+bzip3:
+bzip3:
diff --git a/system/c-icap/c-icap.SlackBuild b/system/c-icap/c-icap.SlackBuild
index c5b0505b2c..486a7f5337 100644
--- a/system/c-icap/c-icap.SlackBuild
+++ b/system/c-icap/c-icap.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for c-icap
 
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=c-icap
 SRCNAM=c_icap
 VERSION=${VERSION:-0.5.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -104,9 +114,11 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cabextract/cabextract.SlackBuild b/system/cabextract/cabextract.SlackBuild
index 851684c820..b0a2464b63 100644
--- a/system/cabextract/cabextract.SlackBuild
+++ b/system/cabextract/cabextract.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cabextract
 
 # Copyright 2006-2010 Yalla-One <yallaone@gmail.com>
-# Copyright 2011 Gregory J. L. Tourter <artourter@gmail.com
+# Copyright 2011-2023 Gregory J. L. Tourte <artourter@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cabextract
-VERSION=${VERSION:-1.9.1}
+VERSION=${VERSION:-1.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -88,7 +98,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO doc/wince_cab_format.html $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README TODO doc/wince_cab_format.html $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
@@ -101,4 +111,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cabextract/cabextract.info b/system/cabextract/cabextract.info
index 2862b4afbb..9a786c4562 100644
--- a/system/cabextract/cabextract.info
+++ b/system/cabextract/cabextract.info
@@ -1,8 +1,8 @@
 PRGNAM="cabextract"
-VERSION="1.9.1"
+VERSION="1.11"
 HOMEPAGE="https://www.cabextract.org.uk"
-DOWNLOAD="https://www.cabextract.org.uk/cabextract-1.9.1.tar.gz"
-MD5SUM="cb0ee8eee4f6596fa18478d59e1973c2"
+DOWNLOAD="https://www.cabextract.org.uk/cabextract-1.11.tar.gz"
+MD5SUM="3f678e8cb815f26d73e9413913b20505"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/can-utils/can-utils.SlackBuild b/system/can-utils/can-utils.SlackBuild
index d2ab94e23a..6f7bc0d4c7 100644
--- a/system/can-utils/can-utils.SlackBuild
+++ b/system/can-utils/can-utils.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for can-utils
 
@@ -22,10 +22,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220211 bkw: Modified by SlackBuilds.org: updated for v2021.08.0,
+# since the previous version wouldn't build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=can-utils
-VERSION=${VERSION:-2018.02.0}
+VERSION=${VERSION:-2021.08.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,9 +75,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 ./autogen.sh
 
@@ -83,10 +93,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION
@@ -96,4 +103,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/can-utils/can-utils.info b/system/can-utils/can-utils.info
index 49fe82c710..5f0bb53786 100644
--- a/system/can-utils/can-utils.info
+++ b/system/can-utils/can-utils.info
@@ -1,8 +1,8 @@
 PRGNAM="can-utils"
-VERSION="2018.02.0"
+VERSION="2021.08.0"
 HOMEPAGE="https://github.com/linux-can/can-utils"
-DOWNLOAD="https://github.com/linux-can/can-utils/archive/v2018.02.0/can-utils-2018.02.0.tar.gz"
-MD5SUM="7b6cbd1a4a5884d785ab6a8d4b60635b"
+DOWNLOAD="https://github.com/linux-can/can-utils/archive/v2021.08.0/can-utils-2021.08.0.tar.gz"
+MD5SUM="0532c4ebebb56130585f73c7afa27bf7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/cantarell-fonts/cantarell-fonts.SlackBuild b/system/cantarell-fonts/cantarell-fonts.SlackBuild
index a036f99a4b..ce3224d1ce 100644
--- a/system/cantarell-fonts/cantarell-fonts.SlackBuild
+++ b/system/cantarell-fonts/cantarell-fonts.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for cantarell-fonts.
 #
-# Copyright 2015-2018  Edinaldo P. Silva, Rio de Janeiro, Brazil
+# Copyright 2015-2023  Edinaldo P. Silva, Rio de Janeiro, Brazil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cantarell-fonts
-VERSION=${VERSION:-0.0.25}
+VERSION=${VERSION:-0.303.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -49,28 +59,23 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/share/fonts/OTF
-mv $PKG/usr/share/fonts/cantarell $PKG/usr/share/fonts/OTF/
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+meson build -D useprebuilt=true
+meson compile -C build
+DESTDIR=$PKG meson install -C build
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+mkdir -p $PKG/usr/share/metainfo
+cp -a $PKG/usr/local/share/metainfo/org.gnome.cantarell.metainfo.xml $PKG/usr/share/metainfo/org.gnome.cantarell.metainfo.xml
+mkdir -p $PKG/usr/share/fonts/TTF/cantarell
+cp -a $PKG/usr/local/share/fonts/cantarell/* $PKG/usr/share/fonts/TTF/cantarell/
+rm -rf $PKG/usr/local
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp COPYING NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -78,4 +83,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cantarell-fonts/cantarell-fonts.info b/system/cantarell-fonts/cantarell-fonts.info
index f1d2933fb2..6843402e43 100644
--- a/system/cantarell-fonts/cantarell-fonts.info
+++ b/system/cantarell-fonts/cantarell-fonts.info
@@ -1,10 +1,10 @@
 PRGNAM="cantarell-fonts"
-VERSION="0.0.25"
-HOMEPAGE="https://github.com/GNOME/cantarell-fonts"
-DOWNLOAD="https://github.com/GNOME/cantarell-fonts/archive/0.0.25/cantarell-fonts-0.0.25.tar.gz"
-MD5SUM="dc5b0e9395e187f67623c60ece19fd7b"
+VERSION="0.303.1"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/cantarell-fonts"
+DOWNLOAD="https://download.gnome.org/sources/cantarell-fonts/0.303/cantarell-fonts-0.303.1.tar.xz"
+MD5SUM="a9be59ddb29204dcfd3357f201949b8c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gnome-common"
+REQUIRES="appstream-glib"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/system/cantarell-fonts/slack-desc b/system/cantarell-fonts/slack-desc
index 7b4b309cfd..42bb41cd31 100644
--- a/system/cantarell-fonts/slack-desc
+++ b/system/cantarell-fonts/slack-desc
@@ -16,4 +16,4 @@ cantarell-fonts: Cantarell was originally designed by Dave Crossland as part of
 cantarell-fonts: coursework for the MA Typeface Design programme at the Department
 cantarell-fonts: of Typography in the University of Reading, England.
 cantarell-fonts:
-cantarell-fonts: Home page: https://github.com/GNOME/cantarell-fonts
+cantarell-fonts: Home page: https://gitlab.gnome.org/GNOME/cantarell-fonts
diff --git a/system/capabilities/README b/system/capabilities/README
index 14427bfbcd..426afdc33c 100644
--- a/system/capabilities/README
+++ b/system/capabilities/README
@@ -1,4 +1,5 @@
-This is basically a simple form of shadow/unshadow kind of thingy for Linux CAPABILITIES(7)
+This is basically a simple form of shadow/unshadow kind of thingy for
+Linux CAPABILITIES(7)
 
 Just have a look at, and maybe add to: /etc/default/capabilities
 
diff --git a/system/capabilities/capabilities.SlackBuild b/system/capabilities/capabilities.SlackBuild
index e58605b3eb..191630a042 100644
--- a/system/capabilities/capabilities.SlackBuild
+++ b/system/capabilities/capabilities.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script forcapabilities
 
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=capabilities
 VERSION=${VERSION:-0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,4 +76,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/caprice32/README b/system/caprice32/README
index d106948bfb..3e50ca8b39 100644
--- a/system/caprice32/README
+++ b/system/caprice32/README
@@ -1,9 +1,10 @@
-Caprice32 is a software emulator of the Amstrad CPC 8bit home computer
-series. The emulator faithfully imitates the CPC464, CPC664, and CPC6128
-models. By recreating the operations of all hardware components at a low
-level, the emulator achieves a high degree of compatibility with original
-CPC software. These programs or games can be run unmodified at real-time
-or higher speeds, depending on the emulator host environment.
+Caprice32 is a software emulator of the Amstrad CPC 8bit home
+computer series. The emulator faithfully imitates the CPC464, CPC664,
+and CPC6128 models. By recreating the operations of all hardware
+components at a low level, the emulator achieves a high degree of
+compatibility with original CPC software. These programs or games
+can be run unmodified at real-time or higher speeds, depending on the
+emulator host environment.
 
 Usage:
   
diff --git a/system/caprice32/caprice32.SlackBuild b/system/caprice32/caprice32.SlackBuild
index ac27dd4df4..2823382be4 100644
--- a/system/caprice32/caprice32.SlackBuild
+++ b/system/caprice32/caprice32.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for caprice32
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=caprice32
 VERSION=${VERSION:-4.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -70,6 +80,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+sed -i "s|-O2|$SLKCFLAGS -Wno-narrowing|" makefile.unix
+
 make -f makefile.unix RELEASE=TRUE
 
 mkdir -p $PKG/usr/share/$PRGNAM $PKG/usr/bin
@@ -92,4 +104,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/capstone/capstone.SlackBuild b/system/capstone/capstone.SlackBuild
index 27aeb32b93..523dba767d 100644
--- a/system/capstone/capstone.SlackBuild
+++ b/system/capstone/capstone.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for capstone
 
@@ -22,10 +22,18 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix 32-bit build (libraries in /usr/lib, not /usr/lib64).
+# - do not install compile instructions or empty files in doc dir.
+# - don't install a pkgconfig .pc file to /usr/share.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=capstone
-VERSION=${VERSION:-4.0.1}
+VERSION=${VERSION:-5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,9 +77,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p build
 cd build
@@ -76,7 +88,7 @@ cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX="$LIBDIRSUFFIX" \
+    -DINSTALL_LIB_DIR=/usr/lib$LIBDIRSUFFIX \
     -DCAPSTONE_ARM_SUPPORT=1 \
     -DCAPSTONE_ARM64_SUPPORT=1 \
     -DCAPSTONE_M68K_SUPPORT=1 \
@@ -91,28 +103,26 @@ cmake \
     -DCAPSTONE_BUILD_STATIC=0 \
     -DCMAKE_BUILD_TYPE=Release ..
   make VERBOSE=1
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# 20220317 bkw: .pc file gets install to wrong place on 64-bit...
+rm -rf $PKG/usr/lib/pkgconfig
 
-# pkg-config (PKG_CONFIG_PATH environment variable)
-# to generate .pc file do: $ python setup.py build
-# inside bindings/python
-mkdir -p $PKG/usr/share/pkgconfig
-sed -e "s|@CMAKE_INSTALL_PREFIX@|/usr|" \
-    -e "s|@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@|$VERSION|" \
-    -e "s|@LIBSUFFIX@|$LIBDIRSUFFIX|" \
-  < capstone.pc.in \
-  > $PKG/usr/share/pkgconfig/capstone.pc
+# 20220317 bkw: updated the .pc.in file.
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig
+sed "s,@LIBDIRSUFFIX@,$LIBDIRSUFFIX,g" \
+    < $CWD/$PRGNAM.pc.in \
+    > $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/$PRGNAM.pc
 
+# 20220317 bkw: RELEASE_NOTES is a 0-byte placeholder.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COMPILE* CREDITS.TXT ChangeLog HACK.TXT LICENSE* README.md RELEASE_NOTES SPONSORS.TXT TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CREDITS.TXT ChangeLog HACK.TXT LICENSE* README.md SPONSORS.TXT \
+      $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/capstone/capstone.info b/system/capstone/capstone.info
index 7ced80cd88..272c902560 100644
--- a/system/capstone/capstone.info
+++ b/system/capstone/capstone.info
@@ -1,8 +1,8 @@
 PRGNAM="capstone"
-VERSION="4.0.1"
+VERSION="5.0"
 HOMEPAGE="http://www.capstone-engine.org"
-DOWNLOAD="https://github.com/aquynh/capstone/archive/4.0.1/capstone-4.0.1.tar.gz"
-MD5SUM="1b0a9a0d50d9515dcf7684ce0a2270a4"
+DOWNLOAD="https://github.com/aquynh/capstone/archive/5.0/capstone-5.0.tar.gz"
+MD5SUM="027fcaafea4acc47af9798dc520cef2c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/capstone/capstone.pc.in b/system/capstone/capstone.pc.in
index fa41c847fd..d7953bd793 100644
--- a/system/capstone/capstone.pc.in
+++ b/system/capstone/capstone.pc.in
@@ -1,8 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${prefix}/lib@LIBDIRSUFFIX@
+includedir=${prefix}/include/capstone
+
 Name: capstone
 Description: Capstone disassembly engine
-Version: %VERSION%
-libdir=/usr/lib%LIBDIRSUFFIX%
-includedir=/usr/include
-archive=${libdir}/libcapstone.a
+Version: 5.0
+URL: http://www.capstone-engine.org
 Libs: -L${libdir} -lcapstone
 Cflags: -I${includedir}
diff --git a/system/catatonit/README b/system/catatonit/README
new file mode 100644
index 0000000000..38e8108046
--- /dev/null
+++ b/system/catatonit/README
@@ -0,0 +1,6 @@
+A container init that is so simple it's effectively brain-dead.
+
+A container init that is so simple it's effectively brain-dead. This is
+a rewrite of initrs in C, because we found that it is not possible to
+statically compile Rust binaries without using musl. That was, in turn,
+a reimplementation of other container inits like tini and dumb-init.
diff --git a/system/catatonit/catatonit.SlackBuild b/system/catatonit/catatonit.SlackBuild
new file mode 100644
index 0000000000..97acc1d797
--- /dev/null
+++ b/system/catatonit/catatonit.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/bash
+
+# Slackware build script for swege
+
+# Copyright 2022 Ivan Kovmir <ikovmir@uninstance.cc>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd "$(dirname "$0")" ; CWD=$(pwd)
+
+PRGNAM=catatonit
+VERSION=${VERSION:-0.2.0}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+	case "$(uname -m)" in
+		i?86) ARCH=i586 ;;
+		arm*) ARCH=arm ;;
+		*) ARCH=$(uname -m) ;;
+	esac
+fi
+
+if [ -n "${PRINT_PACKAGE_NAME}" ]; then
+	echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+	exit 0
+fi
+
+TMP="${TMP:-/tmp/SBo}"
+SRC="$TMP/$PRGNAM-$VERSION"
+PKG="$TMP/package-$PRGNAM"
+OUTPUT="${OUTPUT:-/tmp}"
+
+if [ "$ARCH" = "i586" ]; then
+	SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+	SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+	SLKCFLAGS="-O2 -fPIC"
+else
+	SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf "$PKG"
+mkdir -p "$TMP" "$PKG" "$OUTPUT"
+cd "$TMP"
+rm -rf "$PRGNAM-$VERSION"
+tar xvf "$CWD/$PRGNAM-$VERSION.tar.gz"
+cd "$PRGNAM-$VERSION"
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
+
+./autogen.sh
+./configure --prefix='/usr'
+CFLAGS="$SLKCFLAGS" \
+	make
+DESTDIR="$PKG" \
+	make install-strip
+
+mkdir -p "$PKG/install"
+mkdir -p "$PKG/usr/doc/$PRGNAM-$VERSION"
+mkdir -p "$PKG/usr/share/$PRGNAM-$VERSION"
+cp "$CWD/$PRGNAM.SlackBuild" "$PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild"
+cp "$CWD/README" "$PKG/usr/doc/$PRGNAM-$VERSION/README"
+cp "$CWD/slack-desc" "$PKG/install/slack-desc"
+
+# Copy useful things directly from the repository folder.
+cp "$SRC/README.md" "$PKG/usr/share/$PRGNAM-$VERSION/repository-README.md"
+cp "$SRC/COPYING" "$PKG/usr/share/$PRGNAM-$VERSION/LICENSE"
+
+cd "$PKG"
+/sbin/makepkg -l y -c n "$OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
diff --git a/system/catatonit/catatonit.info b/system/catatonit/catatonit.info
new file mode 100644
index 0000000000..1f22c1770f
--- /dev/null
+++ b/system/catatonit/catatonit.info
@@ -0,0 +1,10 @@
+PRGNAM="catatonit"
+VERSION="0.2.0"
+HOMEPAGE="https://github.com/openSUSE/catatonit"
+DOWNLOAD="https://github.com/openSUSE/catatonit/archive/v0.2.0/catatonit-0.2.0.tar.gz"
+MD5SUM="54724a67659bc9919354b27e46411222"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Ivan Kovmir"
+EMAIL="i@kovmir.eu"
diff --git a/system/catatonit/slack-desc b/system/catatonit/slack-desc
new file mode 100644
index 0000000000..15239c25f7
--- /dev/null
+++ b/system/catatonit/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+catatonit: catatonit (Container init)
+catatonit:
+catatonit: A container init that is so simple it's effectively brain-dead.
+catatonit:
+catatonit:
+catatonit:
+catatonit:
+catatonit:
+catatonit:
+catatonit: https://github.com/openSUSE/catatonit
+catatonit:
diff --git a/system/cbmbasic/README b/system/cbmbasic/README
index 8fb257cf98..84386a8201 100644
--- a/system/cbmbasic/README
+++ b/system/cbmbasic/README
@@ -1,8 +1,9 @@
 cbmbasic (Commodore BASIC V2 as a scripting language)
 
 Commodore BASIC (cbmbasic) is a 100% compatible version of Commodore's
-version of Microsoft 6502 BASIC as found on the Commodore 64. You can use
-it in interactive mode or pass a BASIC file as a command line parameter.
+version of Microsoft 6502 BASIC as found on the Commodore 64. You
+can use it in interactive mode or pass a BASIC file as a command line
+parameter.
 
 This does not emulate 6502 code; all code is completely native. On a
 1GHz CPU you get about 1000x speed compared to a 1MHz 6502.
diff --git a/system/cbmbasic/cbmbasic.1 b/system/cbmbasic/cbmbasic.1
new file mode 100644
index 0000000000..2f4273baac
--- /dev/null
+++ b/system/cbmbasic/cbmbasic.1
@@ -0,0 +1,94 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "CBMBASIC" 1 "2022-12-27" "1.0+20221218_352a313" "SlackBuilds.org"
+.SH NAME
+cbmbasic \- port of Commodore 64 BASIC to modern systems
+.\" RST source for cbmbasic(1) man page. Convert with:
+.
+.\" rst2man.py cbmbasic.rst > cbmbasic.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+\fBcbmbasic\fP
+.sp
+\fBcbmbasic\fP \fIprogram.bas\fP
+.SH DESCRIPTION
+.sp
+\fBcbmbasic\fP is a 100% compatible version of Commodore\(aqs version of
+Microsoft BASIC 6502 as found on the Commodore 64. You can use it in
+interactive mode or pass a BASIC file as a command line parameter.
+.sp
+\fBcbmbasic\fP does not emulate 6502 code; all code is completely native. On a 1 GHz CPU you get about 1000x speed compared to a 1 MHz 6502.
+.sp
+There are no command\-line options.
+.SH USAGE
+.sp
+You can use \fBcbmbasic\fP in interactive mode by just running the binary
+without parameters, or you can specify an ASCII\-encoded BASIC program
+on the command line. You can also use \fBcbmbasic\fP as a UNIX scripting
+language by adding a hashbang line to your BASIC program and making
+it executable:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+$ ls \-l hello.bas
+\-rwxr\-xr\-x  1 mist  staff  40  7 Apr 21:30 hello.bas
+$ cat hello.bas
+#!/usr/bin/env cbmbasic
+PRINT"HELLO WORLD!"
+$ ./hello.bas
+HELLO WORLD!
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+\fBcbmbasic\fP implements a small plugin system that lets developers add
+additional statements, functions etc. Right now, you can turn this on
+with \fBSYS 1\fP (turn off with \fBSYS 0\fP) and use the new statements
+LOCATE \fIy\fP, \fIx\fP (set cursor position), SYSTEM \fIstring\fP (run shell
+command) and the extended WAIT \fIport\fP, \fImask\fP, which implements the
+Bill Gates easter egg.
+.SH AUTHORS
+.sp
+\fBcbmbasic\fP was ported by Michael Steil and James Abbatiello. The
+original 6502 version was written by Microsoft.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The cbmbasic homepage: \fI\%https://github.com/mist64/cbmbasic\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/system/cbmbasic/cbmbasic.SlackBuild b/system/cbmbasic/cbmbasic.SlackBuild
index c79a12ce26..3dfce9ebc4 100644
--- a/system/cbmbasic/cbmbasic.SlackBuild
+++ b/system/cbmbasic/cbmbasic.SlackBuild
@@ -1,15 +1,21 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cbmbasic
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20221227 bkw: update to latest git, add man page
+# 20210827 bkw: fix build on -current
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cbmbasic
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-1.0+20221218_352a313}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +25,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -44,25 +54,27 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 make CFLAGS="$SLKCFLAGS" LDFLAGS="-L/usr/lib$LIBDIRSUFFIX"
 mkdir -p $PKG/usr/bin
 install -s -m0755 $PRGNAM $PKG/usr/bin
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.txt test/*.bas $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC/examples
+cp -a README.* $PKGDOC
+cp -a test/*.bas $PKGDOC/examples
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cbmbasic/cbmbasic.info b/system/cbmbasic/cbmbasic.info
index ae226159f9..5723de8317 100644
--- a/system/cbmbasic/cbmbasic.info
+++ b/system/cbmbasic/cbmbasic.info
@@ -1,10 +1,10 @@
 PRGNAM="cbmbasic"
-VERSION="1.0"
-HOMEPAGE="http://cbmbasic.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/cbmbasic/cbmbasic/1.0/cbmbasic-1.0.tgz"
-MD5SUM="966cf93950809c3eace244af702cf895"
+VERSION="1.0+20221218_352a313"
+HOMEPAGE="https://github.com/mist64/cbmbasic"
+DOWNLOAD="https://slackware.uk/~urchlay/src/cbmbasic-1.0+20221218_352a313.tar.xz"
+MD5SUM="259ba3cda69d9436545e5e5ae6427330"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/cbmbasic/cbmbasic.rst b/system/cbmbasic/cbmbasic.rst
new file mode 100644
index 0000000000..bc34a0d8bb
--- /dev/null
+++ b/system/cbmbasic/cbmbasic.rst
@@ -0,0 +1,75 @@
+.. RST source for cbmbasic(1) man page. Convert with:
+..   rst2man.py cbmbasic.rst > cbmbasic.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 1.0+20221218_352a313
+.. |date| date::
+
+========
+cbmbasic
+========
+
+--------------------------------------------
+port of Commodore 64 BASIC to modern systems
+--------------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+**cbmbasic**
+
+**cbmbasic** *program.bas*
+
+DESCRIPTION
+===========
+
+**cbmbasic** is a 100% compatible version of Commodore's version of
+Microsoft BASIC 6502 as found on the Commodore 64. You can use it in
+interactive mode or pass a BASIC file as a command line parameter.
+
+**cbmbasic** does not emulate 6502 code; all code is completely native. On a 1 GHz CPU you get about 1000x speed compared to a 1 MHz 6502.
+
+There are no command-line options.
+
+USAGE
+=====
+
+You can use **cbmbasic** in interactive mode by just running the binary
+without parameters, or you can specify an ASCII-encoded BASIC program
+on the command line. You can also use **cbmbasic** as a UNIX scripting
+language by adding a hashbang line to your BASIC program and making
+it executable::
+
+    $ ls -l hello.bas
+    -rwxr-xr-x  1 mist  staff  40  7 Apr 21:30 hello.bas
+    $ cat hello.bas
+    #!/usr/bin/env cbmbasic
+    PRINT"HELLO WORLD!"
+    $ ./hello.bas
+    HELLO WORLD!
+
+**cbmbasic** implements a small plugin system that lets developers add
+additional statements, functions etc. Right now, you can turn this on
+with **SYS 1** (turn off with **SYS 0**) and use the new statements
+LOCATE *y*, *x* (set cursor position), SYSTEM *string* (run shell
+command) and the extended WAIT *port*, *mask*, which implements the
+Bill Gates easter egg.
+
+AUTHORS
+=======
+
+**cbmbasic** was ported by Michael Steil and James Abbatiello. The
+original 6502 version was written by Microsoft.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The cbmbasic homepage: https://github.com/mist64/cbmbasic
diff --git a/system/cbmbasic/git2tarxz.sh b/system/cbmbasic/git2tarxz.sh
new file mode 100644
index 0000000000..c2be8b2710
--- /dev/null
+++ b/system/cbmbasic/git2tarxz.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create
+# a tarball of. With no arg, HEAD is used.
+
+# Upstream doesn't use tags. Old (sourceforge) release was 1.0
+# before the move to github, so include 1.0 in VERSION.
+OLDVER=1.0
+
+PRGNAM=cbmbasic
+CLONE_URL=https://github.com/mist64/cbmbasic
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=${OLDVER}+${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/system/cbmfs/cbmfs.SlackBuild b/system/cbmfs/cbmfs.SlackBuild
index ce02add1e1..68a8c03df2 100644
--- a/system/cbmfs/cbmfs.SlackBuild
+++ b/system/cbmfs/cbmfs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "cbmfs".
 
@@ -24,26 +24,36 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cbmfs
 VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -87,4 +97,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ccat/ccat.SlackBuild b/system/ccat/ccat.SlackBuild
index 7a66f60abd..35480d05a9 100644
--- a/system/ccat/ccat.SlackBuild
+++ b/system/ccat/ccat.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ccat
 
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ccat
 SRCNAM=linux
 VERSION=${VERSION:-1.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -80,4 +90,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ccd2cue/ccd2cue.SlackBuild b/system/ccd2cue/ccd2cue.SlackBuild
index 743c380b2b..8f688aedd8 100644
--- a/system/ccd2cue/ccd2cue.SlackBuild
+++ b/system/ccd2cue/ccd2cue.SlackBuild
@@ -1,15 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ccd2cue
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230708 bkw: BUILD=2, add doinst/douninst for /usr/info/dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ccd2cue
 VERSION=${VERSION:-0.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +24,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -77,6 +86,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/doinst.sh > $PKG/install/douninst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ccd2cue/ccd2cue.info b/system/ccd2cue/ccd2cue.info
index 02c096e670..5bea4dacb6 100644
--- a/system/ccd2cue/ccd2cue.info
+++ b/system/ccd2cue/ccd2cue.info
@@ -1,10 +1,10 @@
 PRGNAM="ccd2cue"
 VERSION="0.5"
 HOMEPAGE="https://www.gnu.org/software/ccd2cue/"
-DOWNLOAD="http://ftpmirror.gnu.org/ccd2cue/ccd2cue-0.5.tar.gz"
+DOWNLOAD="https://ftpmirror.gnu.org/ccd2cue/ccd2cue-0.5.tar.gz"
 MD5SUM="565eb34e3ab5331ee5aab2fe215118aa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/ccd2cue/doinst.sh b/system/ccd2cue/doinst.sh
new file mode 100644
index 0000000000..1bef502028
--- /dev/null
+++ b/system/ccd2cue/doinst.sh
@@ -0,0 +1,6 @@
+if [ -x /usr/bin/install-info -a -d usr/info ]; then
+  ( cd usr/info
+    rm -f dir
+    for i in *.info*; do /usr/bin/install-info $i dir 2>/dev/null; done
+  )
+fi
diff --git a/system/ccd2iso/README b/system/ccd2iso/README
index 493b49dd03..340127601d 100644
--- a/system/ccd2iso/README
+++ b/system/ccd2iso/README
@@ -1,2 +1,3 @@
-ccd2iso converts CD backup files created using the non-free CloneCD program 
-to a format understood by most Free Software CD writing programs.
+ccd2iso converts CD backup files created using the non-free CloneCD
+program to a format understood by most Free Software CD writing
+programs.
diff --git a/system/ccd2iso/ccd2iso.SlackBuild b/system/ccd2iso/ccd2iso.SlackBuild
index b19bd41045..d28777ebd4 100644
--- a/system/ccd2iso/ccd2iso.SlackBuild
+++ b/system/ccd2iso/ccd2iso.SlackBuild
@@ -1,28 +1,38 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ccd2iso
 # Assumed to be public domain per our submission policy  --rworkman
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ccd2iso
 VERSION=${VERSION:-0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -75,4 +85,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ccid/README b/system/ccid/README
index c4ace30482..8bea866444 100644
--- a/system/ccid/README
+++ b/system/ccid/README
@@ -1,10 +1,11 @@
-libccid provides a PC/SC IFD handler implementation for the USB smart card
-drivers compliant to the Chip Card Interface Device (CCID) protocol.
+libccid provides a PC/SC IFD handler implementation for the USB
+smart card drivers compliant to the Chip Card Interface Device (CCID)
+protocol.
 
 This package is needed to communicate with the CCID smartcard readers
-through the PC/SC Lite resource manager (pcscd). It also supports various
-Gemplus serial smart card readers.
+through the PC/SC Lite resource manager (pcscd). It also supports
+various Gemplus serial smart card readers.
 
-You will need to edit the pcsc-lite config files to be able to use serial
-smart card readers. The INSTALL file in the documentation directory has
-all the details.
+You will need to edit the pcsc-lite config files to be able to use
+serial smart card readers. The INSTALL file in the documentation
+directory has all the details.
diff --git a/system/ccid/ccid.SlackBuild b/system/ccid/ccid.SlackBuild
index 61e8ec28c1..98ed787c54 100644
--- a/system/ccid/ccid.SlackBuild
+++ b/system/ccid/ccid.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ccid
 
@@ -29,26 +29,36 @@
 # Modified by Daniel R. <danielrodriguez.es@gmail.com>
 # 05 October 2009 -- Updated to version 1.3.11
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ccid
-VERSION=${VERSION:-1.4.21}
+VERSION=${VERSION:-1.4.36}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,7 +71,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCFILES="AUTHORS COPYING INSTALL README"
+DOCFILES="AUTHORS COPYING INSTALL README.md"
 
 set -e
 
@@ -111,4 +121,4 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-${BUILD}$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ccid/ccid.info b/system/ccid/ccid.info
index 17d33b87a7..84a021d1ae 100644
--- a/system/ccid/ccid.info
+++ b/system/ccid/ccid.info
@@ -1,8 +1,8 @@
 PRGNAM="ccid"
-VERSION="1.4.21"
-HOMEPAGE="https://github.com/LudovicRousseau/CCID"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/ccid-1.4.21.tar.bz2"
-MD5SUM="d1c3d5b447510cd507d1ecc09ac41b04"
+VERSION="1.4.36"
+HOMEPAGE="https://ccid.apdu.fr/"
+DOWNLOAD="https://ccid.apdu.fr/files/ccid-1.4.36.tar.bz2"
+MD5SUM="3108dad76c08648bc253d9286630b0d1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pcsc-lite"
diff --git a/system/ccrypt/README b/system/ccrypt/README
index 7ecb35a989..9efde9a5ec 100644
--- a/system/ccrypt/README
+++ b/system/ccrypt/README
@@ -1,5 +1,5 @@
-ccrypt is a utility for encrypting and decrypting files and streams. It was
-designed as a replacement for the standard unix crypt utility.  ccrypt is
-based on the Rijndael cipher (aka AES).
+ccrypt is a utility for encrypting and decrypting files and
+streams. It was designed as a replacement for the standard unix crypt
+utility. ccrypt is based on the Rijndael cipher (aka AES).
 
 Please see man page for details.
diff --git a/system/ccrypt/ccrypt.SlackBuild b/system/ccrypt/ccrypt.SlackBuild
index 16772f8087..ec559f454c 100644
--- a/system/ccrypt/ccrypt.SlackBuild
+++ b/system/ccrypt/ccrypt.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for ccrypt
 # Home Page http://ccrypt.sourceforge.net/
@@ -25,26 +25,38 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - remove empty NEWS from doc dir.
+# - add SlackBuild to doc dir.
+# - i486 => i586.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="ccrypt"
-VERSION=${VERSION:-1.10}
+VERSION=${VERSION:-1.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -67,9 +79,9 @@ cd $PRGNAM-$VERSION
 chown -R root.root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -94,10 +106,11 @@ make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog COPYING AUTHORS README \
-	INSTALL NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+      $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ccrypt/ccrypt.info b/system/ccrypt/ccrypt.info
index dcba2c3514..56e1f5f9c5 100644
--- a/system/ccrypt/ccrypt.info
+++ b/system/ccrypt/ccrypt.info
@@ -1,8 +1,8 @@
 PRGNAM="ccrypt"
-VERSION="1.10"
-HOMEPAGE="http://ccrypt.sourceforge.net/"
-DOWNLOAD="http://ccrypt.sourceforge.net/download/ccrypt-1.10.tar.gz"
-MD5SUM="44ddd763465c254df83f5d38851d04d7"
+VERSION="1.11"
+HOMEPAGE="https://ccrypt.sourceforge.net/"
+DOWNLOAD="https://ccrypt.sourceforge.net/download/1.11/ccrypt-1.11.tar.gz"
+MD5SUM="262573b04416b3b947f0d38807ec5246"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ccrypt/slack-desc b/system/ccrypt/slack-desc
index 5b774731c8..17c0960f2a 100644
--- a/system/ccrypt/slack-desc
+++ b/system/ccrypt/slack-desc
@@ -9,11 +9,11 @@
 ccrypt: ccrypt (unix crypt replacement)
 ccrypt:
 ccrypt: ccrypt is a utility for encrypting and decrypting files and
-ccrypt: streams.  It was designed as a replacement for the standard unix
+ccrypt: streams. It was designed as a replacement for the standard unix
 ccrypt: crypt utility and is based on based on the Rijndael cipher
 ccrypt: (aka AES)
 ccrypt:
-ccrypt: Home Page: http://ccrypt.sourceforge.net/
+ccrypt: Homepage: https://ccrypt.sourceforge.net/
 ccrypt:
 ccrypt:
 ccrypt:
diff --git a/system/cdemu-client/README b/system/cdemu-client/README
index ab29bfc0cf..e2f45c13be 100644
--- a/system/cdemu-client/README
+++ b/system/cdemu-client/README
@@ -1,4 +1,5 @@
-CDEmu client is a simple command-line client for controlling CDEmu-daemon.
-It provides a way to perform the key tasks related to controlling the
-CDEmu daemon, such as loading and unloading devices, displaying devices'
-status and retrieving/setting devices' debug masks.
+CDEmu client is a simple command-line client for controlling
+CDEmu-daemon. It provides a way to perform the key tasks related to
+controlling the CDEmu daemon, such as loading and unloading devices,
+displaying devices' status and retrieving/setting devices' debug
+masks.
diff --git a/system/cdemu-client/cdemu-client.SlackBuild b/system/cdemu-client/cdemu-client.SlackBuild
index 9afa65b685..ae8fbbaf74 100644
--- a/system/cdemu-client/cdemu-client.SlackBuild
+++ b/system/cdemu-client/cdemu-client.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cdemu-client
 # command-line client for cdemu-daemon
 
 # Copyright 2010-2013 Niels Horn, Rio de Janeiro, RJ, Brazil <niels.horn@gmail.com>
-# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2018-2022 Isaac Yu <isaacyu@protonmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,13 +24,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - remove empty NEWS and useless INSTALL from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cdemu-client
-VERSION=${VERSION:-3.2.4}
+VERSION=${VERSION:-3.2.5}
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -43,14 +53,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p build
 cd build
@@ -83,7 +93,7 @@ cat $CWD/cdemu-client.desktop > $PKG/usr/share/applications/cdemu-client.desktop
 cat $CWD/cdemu-client.png > $PKG/usr/share/pixmaps/cdemu-client.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp AUTHORS ChangeLog COPYING INSTALL NEWS README \
+cp AUTHORS ChangeLog COPYING README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -92,4 +102,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cdemu-client/cdemu-client.info b/system/cdemu-client/cdemu-client.info
index 1d646ff8f3..c9539435d9 100644
--- a/system/cdemu-client/cdemu-client.info
+++ b/system/cdemu-client/cdemu-client.info
@@ -1,10 +1,10 @@
 PRGNAM="cdemu-client"
-VERSION="3.2.4"
+VERSION="3.2.5"
 HOMEPAGE="https://cdemu.sourceforge.io/about/client/"
-DOWNLOAD="https://downloads.sourceforge.net/cdemu/cdemu-client-3.2.4.tar.bz2"
-MD5SUM="5eadc5691fabfc7c54e926d5d1ceb8bc"
+DOWNLOAD="https://downloads.sourceforge.net/cdemu/cdemu-client-3.2.5.tar.xz"
+MD5SUM="965b27c5b36848c3420740c92fd64aad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="cdemu-daemon pygobject3-python3"
+REQUIRES="cdemu-daemon"
 MAINTAINER="Isaac Yu"
-EMAIL="isaacyu1@isaacyu1.com"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/cdemu-daemon/cdemu-daemon.SlackBuild b/system/cdemu-daemon/cdemu-daemon.SlackBuild
index 691c02f314..bab95de9c7 100644
--- a/system/cdemu-daemon/cdemu-daemon.SlackBuild
+++ b/system/cdemu-daemon/cdemu-daemon.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cdemu-daemon
 
 # Copyright 2008 Niklas "Nille" Åkerström
 # Copyright 2010-2013 Niels Horn, Rio de Janeiro, RJ, Brazil <niels.horn@gmail.com>
-# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2018-2023 Isaac Yu <isaacyu@protonmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - remove empty NEWS from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cdemu-daemon
-VERSION=${VERSION:-3.2.4}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.2.6}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,14 +74,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p build
 cd build
@@ -83,41 +93,42 @@ cd build
     -DSYSTEM_BUS_SERVICE=ON \
     -DCMAKE_BUILD_TYPE=Release ..
   make VERBOSE=1
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
-
-# Fix standard configuration to make it more "Slackware"-like
-sed \
-  -e "/^LOG_FILE/s|/tmp/|/var/log/|" \
-  -e "/^CONFIG_FILE/s|/etc/sysconfig/|/etc/|" \
-  -i $PKG/usr/libexec/$PRGNAM-system.sh
-
-# Fix a silly error in the dbus file
-sed \
-  -e "/^Name=/s/CdemuDaemon/CDEmuDaemon/" \
-  -i $PKG/usr/share/dbus-1/system-services/net.sf.cdemu.CDEmuDaemon.service
+gzip -9 $PKG/usr/man/man*/*
 
 # Install init script
 mkdir -p $PKG/etc/rc.d
 install -m 0755 $CWD/rc.cdemud $PKG/etc/rc.d/rc.cdemud.new
 
-# dbus and udev rules
-mv $PKG/etc/dbus-1/system.d/cdemu-daemon-dbus.conf \
+# Install systemd sample services
+mkdir -p $PKG/usr/lib/systemd/user
+cp $TMP/$PRGNAM-$VERSION/service-example/cdemu-daemon.service \
+  $PKG/usr/lib/systemd/user/cdemu-daemon.service
+mkdir -p $PKG/usr/share/dbus-1/services
+cp $TMP/$PRGNAM-$VERSION/service-example/net.sf.cdemu.CDEmuDaemon.service \
+  $PKG/usr/share/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service
+
+# Adapt systemd service for Slackware
+sed \
+  -e "/^SystemdService/d" \
+  -e "/^Exec=/s|/bin/true|/usr/libexec/cdemu-daemon-session.sh|" \
+  -i $PKG/usr/share/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service
+mkdir -p $PKG/usr/libexec
+cp $CWD/config/cdemu-daemon-session.sh $PKG/usr/libexec/cdemu-daemon-session.sh
+
+# Install dbus and udev rules
+mkdir -p $PKG/etc/dbus-1/system.d
+cp $CWD/config/cdemu-daemon-dbus.conf \
   $PKG/etc/dbus-1/system.d/cdemu-daemon-dbus.conf.new
 sed -i 's/group="root"/group="'$GROUP'"/' \
   $PKG/etc/dbus-1/system.d/cdemu-daemon-dbus.conf.new
 mkdir -p $PKG/etc/udev/rules.d
-echo 'KERNEL=="vhba_ctl", NAME="%k", MODE="0660", OWNER="root", GROUP="'$GROUP'"' \
+echo 'KERNEL=="vhba_ctl", MODE="0660", OWNER="root", GROUP="'$GROUP'"' \
   > $PKG/etc/udev/rules.d/99-vhba.rules.new
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp AUTHORS ChangeLog COPYING NEWS README $CWD/README.SLACKWARE \
+cp AUTHORS ChangeLog COPYING README $CWD/README.SLACKWARE \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -126,4 +137,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cdemu-daemon/cdemu-daemon.info b/system/cdemu-daemon/cdemu-daemon.info
index 3a27c0b19b..bad8d1f5df 100644
--- a/system/cdemu-daemon/cdemu-daemon.info
+++ b/system/cdemu-daemon/cdemu-daemon.info
@@ -1,10 +1,10 @@
 PRGNAM="cdemu-daemon"
-VERSION="3.2.4"
+VERSION="3.2.6"
 HOMEPAGE="https://cdemu.sourceforge.io/about/daemon/"
-DOWNLOAD="https://downloads.sourceforge.net/cdemu/cdemu-daemon-3.2.4.tar.bz2"
-MD5SUM="9021f56fd95686f5b14d3b32f68e7b1a"
+DOWNLOAD="https://downloads.sourceforge.net/cdemu/cdemu-daemon-3.2.6.tar.xz"
+MD5SUM="21c8d2b4e8952999628ed755304b1b0f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libmirage vhba-module"
 MAINTAINER="Isaac Yu"
-EMAIL="isaacyu1@isaacyu1.com"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/cdemu-daemon/config/cdemu-daemon-dbus.conf b/system/cdemu-daemon/config/cdemu-daemon-dbus.conf
new file mode 100644
index 0000000000..c450d78cf0
--- /dev/null
+++ b/system/cdemu-daemon/config/cdemu-daemon-dbus.conf
@@ -0,0 +1,19 @@
+<!DOCTYPE busconfig PUBLIC
+    "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+    "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+    <!-- Only root can own the CDEmuDaemon service on bus -->
+    <policy user="root">
+        <allow own="net.sf.cdemu.CDEmuDaemon"/>
+    </policy>
+    <policy group="root">
+        <allow own="net.sf.cdemu.CDEmuDaemon"/>
+    </policy>
+
+    <!-- Allow anyone to invoke methods on the interface -->
+    <policy context="default">
+        <allow send_destination="net.sf.cdemu.CDEmuDaemon"/>
+    </policy>
+</busconfig>
+
diff --git a/system/cdemu-daemon/config/cdemu-daemon-session.sh b/system/cdemu-daemon/config/cdemu-daemon-session.sh
new file mode 100644
index 0000000000..c533612a73
--- /dev/null
+++ b/system/cdemu-daemon/config/cdemu-daemon-session.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Starts the CDEmu daemon instance on D-Bus *session* bus. Optional
+# configuration (number of devices, audio driver, log file) are read
+# from ~/.cdemu-daemon
+
+# Default settings
+NUM_DEVICES=1
+AUDIO_DRIVER=default
+LOG_FILE=~/.cdemu-daemon.log
+
+# Read the settings
+CONFIG_FILE=~/.cdemu-daemon
+
+if [ -f ${CONFIG_FILE} ]; then
+    . ${CONFIG_FILE};
+fi
+
+# Start the daemon
+exec cdemu-daemon --ctl-device=/dev/vhba_ctl --bus=session --num-devices=${NUM_DEVICES} --audio-driver=${AUDIO_DRIVER} --logfile=${LOG_FILE}
diff --git a/system/cdrkit/README b/system/cdrkit/README
index f10f9757ba..5328e1b21f 100644
--- a/system/cdrkit/README
+++ b/system/cdrkit/README
@@ -1,7 +1,8 @@
 This is a fork of the last free GPL version of cdrtools.
- icedax -- CD audio sampling utility (formerly cdda2wav).
- wodim -- burn discs in most ATAPI and SCSI CD-R drives (formerly cdrecord).
- genisoimage -- create ISO9660/HFS/Joliet CD-ROM images (formerly mkisofs).
+
+icedax: CD audio sampling utility (formerly cdda2wav).
+wodim: burn discs in most ATAPI/SCSI CD-R drives (formerly cdrecord).
+genisoimage: create ISO9660/HFS/Joliet CD-ROM images (formerly mkisofs).
 
 CDRKit was forked from CDRTools because of an alleged license 
 incompatibility that would make it impossible to distribute 
@@ -19,6 +20,3 @@ to remove cdrtools before installing cdrkit.
 
 This script will create symlinks for mkisofs and cdda2wav for backwards
 compatibility with cdrtools and previous versions of cdrkit.
-
-The script cdda2mp3 included in this package needs the optional
-dependency lame.
diff --git a/system/cdrkit/cdrkit-1.1.11-gcc10.patch b/system/cdrkit/cdrkit-1.1.11-gcc10.patch
new file mode 100644
index 0000000000..99f0c106d5
--- /dev/null
+++ b/system/cdrkit/cdrkit-1.1.11-gcc10.patch
@@ -0,0 +1,12 @@
+diff -up cdrkit-1.1.11/genisoimage/genisoimage.h.me cdrkit-1.1.11/genisoimage/genisoimage.h
+--- cdrkit-1.1.11/genisoimage/genisoimage.h.me	2020-02-24 15:10:35.542998992 +0100
++++ cdrkit-1.1.11/genisoimage/genisoimage.h	2020-02-24 15:10:50.011130450 +0100
+@@ -377,7 +377,7 @@ extern int	use_fileversion;
+ extern int	split_SL_component;
+ extern int	split_SL_field;
+ extern char	*trans_tbl;
+-char		*outfile;
++extern char	*outfile;
+ 
+ #define	JMAX		64	/* maximum Joliet file name length (spec) */
+ #define	JLONGMAX	103	/* out of spec Joliet file name length */
diff --git a/system/cdrkit/cdrkit.SlackBuild b/system/cdrkit/cdrkit.SlackBuild
index f778f25ff2..528cb1ed78 100644
--- a/system/cdrkit/cdrkit.SlackBuild
+++ b/system/cdrkit/cdrkit.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cdrkit
 
@@ -24,26 +24,37 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - i486 => i586.
+# - add SlackBuild to doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cdrkit
 VERSION=${VERSION:-1.1.11}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -63,9 +74,11 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
+
+patch -p1 < $CWD/cdrkit-1.1.11-gcc10.patch
 
 # Make Makefile prefix
 cmake -DCMAKE_INSTALL_PREFIX=/usr
@@ -111,14 +124,15 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  ABOUT COPYING Changelog FAQ FORK INSTALL START TODO VERSION doc/* \
+  ABOUT COPYING Changelog FAQ FORK START TODO VERSION doc/* \
   3rd-party/geteltorito/README.geteltorito \
   $PKG/usr/doc/$PRGNAM-$VERSION
 install -m 0644 3rd-party/dirsplit/README \
   $PKG/usr/doc/$PRGNAM-$VERSION/README.dirsplit
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cdw/README b/system/cdw/README
index 5d114e31d5..607e2f34e3 100644
--- a/system/cdw/README
+++ b/system/cdw/README
@@ -1,5 +1,6 @@
 cdw is a front-end for command-line tools: cdrecord/wodim, mkisofs/
-genisoimage, growisofs, dvd+rw-mediainfo, dvd+rw-format. It utilizes the
-ncurses library to build user-friendly interface and it can be used in UNIX
-terminal window or in a terminal emulator under the X Window environment.
-cdw supports only ISO9660 filesystem for optical media.
+genisoimage, growisofs, dvd+rw-mediainfo, dvd+rw-format. It utilizes
+the ncurses library to build user-friendly interface and it can be
+used in UNIX terminal window or in a terminal emulator under the X
+Window environment. cdw supports only ISO9660 filesystem for optical
+media.
diff --git a/system/cdw/cdw.SlackBuild b/system/cdw/cdw.SlackBuild
index 60bada76cc..3470ae6738 100644
--- a/system/cdw/cdw.SlackBuild
+++ b/system/cdw/cdw.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for cdw
 
 # New Maintainer: Edward W. Koenig | Vancouver, WA | kingbeowulf@gmail.com
@@ -21,10 +21,13 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cdw
 VERSION=${VERSION:-0.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,7 +37,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -98,4 +108,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cdw/cdw.info b/system/cdw/cdw.info
index eda8261d31..030c5bc974 100644
--- a/system/cdw/cdw.info
+++ b/system/cdw/cdw.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/cdw/cdw-0.8.1.tar.gz"
 MD5SUM="9e6b5c2bbe54e8f1dc0d20e3cb966e5c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libburn"
+REQUIRES=""
 MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
+EMAIL="kingbeowulf@linuxgalaxy.org"
diff --git a/system/cdwrite/cdwrite.SlackBuild b/system/cdwrite/cdwrite.SlackBuild
index 812c9c9702..a99446ef4c 100644
--- a/system/cdwrite/cdwrite.SlackBuild
+++ b/system/cdwrite/cdwrite.SlackBuild
@@ -1,16 +1,26 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cdwrite
 # Written by Cezary M. Kruk (c.kruk@bigfoot.com)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cdwrite
 VERSION=${VERSION:-3.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,4 +69,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cfengine/README b/system/cfengine/README
index 0032937102..ceea160639 100644
--- a/system/cfengine/README
+++ b/system/cfengine/README
@@ -2,3 +2,6 @@ cfengine (Automate and manage your IT infrastructure)
 
 CFEngine is a configuration management and automation framework that
 lets you securely manage your mission critical IT infrastructure.
+
+Optional dependency: if avahi is installed, cfengine will be built
+with support for it.
diff --git a/system/cfengine/cfengine.SlackBuild b/system/cfengine/cfengine.SlackBuild
index 829602948e..18010359ff 100644
--- a/system/cfengine/cfengine.SlackBuild
+++ b/system/cfengine/cfengine.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cfengine
 
@@ -22,10 +22,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220405 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix build when avahi is installed, and document avahi as optional.
+
+# 20220211 bkw: Modified by SlackBuilds.org: update for v3.15.2 since
+# the previous version wouldn't build on Slackware 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cfengine
-VERSION=${VERSION:-3.10.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.15.2}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +44,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,9 +78,11 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+SLKCFLAGS+=" -fcommon"
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -79,28 +94,20 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-workdir=/var/lib/cfengine \
-  --with-pam=no \
-  --without-pam \
   --enable-static=no \
   --enable-shared=yes \
   --build=$ARCH-slackware-linux
 
-make
-make install DESTDIR=$PKG
-
-if [ "$ARCH" = "x86_64" ]; then
-  mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
-fi
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make V=1
+make install-strip DESTDIR=$PKG
+rm -f $PKG/usr/lib*/*.la
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL README.md examples/ $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md examples/ $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cfengine/cfengine.info b/system/cfengine/cfengine.info
index a28a964000..ffd557cbf5 100644
--- a/system/cfengine/cfengine.info
+++ b/system/cfengine/cfengine.info
@@ -1,10 +1,10 @@
 PRGNAM="cfengine"
-VERSION="3.10.1"
+VERSION="3.15.2"
 HOMEPAGE="https://cfengine.com/"
-DOWNLOAD="https://cfengine-package-repos.s3.amazonaws.com/tarballs/cfengine-3.10.1.tar.gz"
-MD5SUM="ae7e2dc8b20faa89089002c9b9fd4e0a"
+DOWNLOAD="https://cfengine-package-repos.s3.amazonaws.com/tarballs/cfengine-3.15.2.tar.gz"
+MD5SUM="be04030c007dacd69ad705059a906495"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lmdb"
+REQUIRES=""
 MAINTAINER="Jeremy HOCDE"
 EMAIL="jeremyhocde@gmail.com"
diff --git a/system/cfpeek/cfpeek.SlackBuild b/system/cfpeek/cfpeek.SlackBuild
index c9b16c02fb..62c2e65e77 100644
--- a/system/cfpeek/cfpeek.SlackBuild
+++ b/system/cfpeek/cfpeek.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cfpeek
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cfpeek
 VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -101,4 +111,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/chipsec/chipsec.SlackBuild b/system/chipsec/chipsec.SlackBuild
index 0aeab00855..dc9bbc4bde 100644
--- a/system/chipsec/chipsec.SlackBuild
+++ b/system/chipsec/chipsec.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for chipsec
 
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=chipsec
-VERSION=${VERSION:-1.3.6}
+VERSION=${VERSION:-1.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+KERNEL=${KERNEL:-$(uname -r)}
+PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,10 +67,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# Don't have ARCH in the environment when building a kernel module
-SLKARCH=$ARCH
-unset -v ARCH
-
 set -e
 
 rm -rf $PKG
@@ -73,13 +82,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+mkdir -pv build/lib/chipsec/helper/linux
+env -u ARCH python3 setup.py build_ext install --root=$PKG
 
 # Sign the kernel module (if available)
 if [ -f /proc/config.gz ]
 then
   eval $(zgrep "^CONFIG_MODULE_SIG_HASH=" /proc/config.gz)
-  KERNSRC=${KERNSRC:-/lib/modules/$(uname -r)/source}
+  KERNSRC=${KERNSRC:-/lib/modules/$KERNEL/source}
   if [ -n "${CONFIG_MODULE_SIG_HASH}" ] && \
     [ -f $KERNSRC/certs/signing_key.pem ] && \
     [ -f $KERNSRC/certs/signing_key.x509 ] && \
@@ -89,7 +99,7 @@ then
       ${CONFIG_MODULE_SIG_HASH} \
       $KERNSRC/certs/signing_key.pem \
       $KERNSRC/certs/signing_key.x509 \
-      ${PKG}/usr/lib${LIBDIRSUFFIX}/python2.7/site-packages/chipsec/helper/linux/chipsec.ko
+      ${PKG}/usr/lib${LIBDIRSUFFIX}/python3.9/site-packages/chipsec/helper/linux/chipsec.ko
   fi
 fi
 
@@ -100,12 +110,11 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS COPYING LICENSE README README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
-mv -v ${PKG}/usr/share/doc/chipsec/chipsec-manual.pdf $PKG/usr/doc/$PRGNAM-$VERSION
-rmdir ${PKG}/usr/share/doc/chipsec ${PKG}/usr/share/doc ${PKG}/usr/share
+mv -v ${PKG}/usr/chipsec-manual.pdf $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$SLKARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/chipsec/chipsec.info b/system/chipsec/chipsec.info
index 0ee49438ce..f1fb6627e0 100644
--- a/system/chipsec/chipsec.info
+++ b/system/chipsec/chipsec.info
@@ -1,10 +1,10 @@
 PRGNAM="chipsec"
-VERSION="1.3.6"
+VERSION="1.9.0"
 HOMEPAGE="https://github.com/chipsec/chipsec"
-DOWNLOAD="https://github.com/chipsec/chipsec/archive/v1.3.6/chipsec-1.3.6.tar.gz"
-MD5SUM="2761761eb5bd236aca00aaa8da29f8ad"
+DOWNLOAD="https://github.com/chipsec/chipsec/archive/1.9.0/chipsec-1.9.0.tar.gz"
+MD5SUM="c9a9ea26c05ef4eb2a7ac525b13c2530"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="pyllyukko"
-EMAIL="pyllyukko AT maimed dot org"
+EMAIL="pyllyukko@maimed.org"
diff --git a/system/chkrootkit/README b/system/chkrootkit/README
index 31c9fa8506..0ea9bf08e8 100644
--- a/system/chkrootkit/README
+++ b/system/chkrootkit/README
@@ -1,16 +1,17 @@
-chkrootkit (Check Rootkit) is a common unix-based program intended to help 
-system administrators check their system for known rootkits. It is a shell 
-script using common UNIX/Linux tools like the strings and grep commands to 
-search core system programs for signatures and for comparing a traversal of the 
-/proc filesystem with the output of the ps (process status) command to look for 
-discrepancies.
+chkrootkit (Check Rootkit) is a common unix-based program intended to
+help system administrators check their system for known rootkits. It is
+a shell script using common UNIX/Linux tools like the strings and grep
+commands to search core system programs for signatures and for comparing
+a traversal of the /proc filesystem with the output of the ps (process
+status) command to look for discrepancies.
 
-It can be used from a "rescue disc" (typically a LiveCD) or it can optionally 
-use an alternative directory from which to run all of its own commands. These 
-techniques allow chkrootkit to trust the commands upon which it depends a bit 
-more.
+It can be used from a "rescue disc" (typically a LiveCD) or it can
+optionally use an alternative directory from which to run all of its own
+commands. These techniques allow chkrootkit to trust the commands upon
+which it depends a bit more.
 
-There are inherent limitations to the reliability of any program that attempts 
-to detect compromises (such as rootkits and computer viruses). Newer rootkits 
-may specifically attempt to detect and compromise copies of the chkrootkit 
-programs or take other measures to evade detection by them.
+There are inherent limitations to the reliability of any program that
+attempts to detect compromises (such as rootkits and computer viruses).
+Newer rootkits may specifically attempt to detect and compromise copies
+of the chkrootkit programs or take other measures to evade detection by
+them.
diff --git a/system/chkrootkit/chkrootkit.SlackBuild b/system/chkrootkit/chkrootkit.SlackBuild
index ae695b2ce1..36f1447f62 100644
--- a/system/chkrootkit/chkrootkit.SlackBuild
+++ b/system/chkrootkit/chkrootkit.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for chkrootkit
 
@@ -22,12 +22,15 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Updated by Emmanuel N. Millan 2020
+# Updated by Emmanuel N. Millan 2020-2021
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=chkrootkit
-VERSION=${VERSION:-0.53}
+VERSION=${VERSION:-0.58b}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -104,4 +114,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/chkrootkit/chkrootkit.info b/system/chkrootkit/chkrootkit.info
index e5ce8bb1ab..9238b3595a 100644
--- a/system/chkrootkit/chkrootkit.info
+++ b/system/chkrootkit/chkrootkit.info
@@ -1,8 +1,8 @@
 PRGNAM="chkrootkit"
-VERSION="0.53"
+VERSION="0.58b"
 HOMEPAGE="http://www.chkrootkit.org"
-DOWNLOAD="ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-0.53.tar.gz"
-MD5SUM="944c529c4846960bdede4be49ef66386"
+DOWNLOAD="ftp://ftp.chkrootkit.org/pub/seg/pac/chkrootkit-0.58b.tar.gz"
+MD5SUM="de110f07f37b1b5caff2e90cc6172dd8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/chronograf/chronograf.SlackBuild b/system/chronograf/chronograf.SlackBuild
index c87bcb4f14..38449a9219 100644
--- a/system/chronograf/chronograf.SlackBuild
+++ b/system/chronograf/chronograf.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Chronograf
 
-# Copyright 2017-2020 Ebben Aries <e@dscp.org>
+# Copyright 2017-2024 Ebben Aries <slackbuilds@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=chronograf
-VERSION=${VERSION:-1.8.10}
+VERSION=${VERSION:-1.10.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -46,7 +49,14 @@ elif ! getent passwd $PRGNAM; then
 	exit 1
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -102,4 +112,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/chronograf/chronograf.info b/system/chronograf/chronograf.info
index b8e6183cd4..9991aff83a 100644
--- a/system/chronograf/chronograf.info
+++ b/system/chronograf/chronograf.info
@@ -1,10 +1,10 @@
 PRGNAM="chronograf"
-VERSION="1.8.10"
+VERSION="1.10.3"
 HOMEPAGE="https://www.influxdata.com"
-DOWNLOAD="https://dl.influxdata.com/chronograf/releases/chronograf-1.8.10_linux_i386.tar.gz"
-MD5SUM="7a06e74733b7d7931dc64562940956c2"
-DOWNLOAD_x86_64="https://dl.influxdata.com/chronograf/releases/chronograf-1.8.10_linux_amd64.tar.gz"
-MD5SUM_x86_64="29a4e1c6676ab3014c2f7659b62cc8bc"
+DOWNLOAD="https://dl.influxdata.com/chronograf/releases/chronograf-1.10.3_linux_i386.tar.gz"
+MD5SUM="72385f53ae4dffff70a17973e172f7f6"
+DOWNLOAD_x86_64="https://dl.influxdata.com/chronograf/releases/chronograf-1.10.3_linux_amd64.tar.gz"
+MD5SUM_x86_64="493fe3362a03082472de8f83e57cdfc7"
 REQUIRES=""
 MAINTAINER="Ebben Aries"
-EMAIL="e@dscp.org"
+EMAIL="slackbuilds@dscp.org"
diff --git a/system/chronograf/slack-desc b/system/chronograf/slack-desc
index 3cee9ce4c5..6879cbbdbb 100644
--- a/system/chronograf/slack-desc
+++ b/system/chronograf/slack-desc
@@ -8,7 +8,7 @@
           |-----handy-ruler------------------------------------------------------|
 chronograf: chronograf (An Open-Source User Interface for InfluxData)
 chronograf:
-chronograf: Chronograf is the user interface component of InfluxData’s TICK
+chronograf: Chronograf is the user interface component of InfluxData's TICK
 chronograf: stack. It makes the monitoring and alerting for your infrastructure
 chronograf: easy to setup and maintain. It is simple to use and includes
 chronograf: templates and libraries to allow you to rapidly build dashboards
diff --git a/system/chrpath/chrpath.SlackBuild b/system/chrpath/chrpath.SlackBuild
index cc2c4b6142..3a697732fc 100644
--- a/system/chrpath/chrpath.SlackBuild
+++ b/system/chrpath/chrpath.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for chrpath
 
-# Copyright 2010-2016  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2010-2021  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=chrpath
 VERSION=${VERSION:-0.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -96,4 +106,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ciderpress-tools/README b/system/ciderpress-tools/README
new file mode 100644
index 0000000000..de431421ab
--- /dev/null
+++ b/system/ciderpress-tools/README
@@ -0,0 +1,11 @@
+ciderpress-tools (tools for working with Apple II disk images)
+
+CiderPress is a Windows utility for managing Apple II file archives
+and disk images. The application has not been ported to Linux, but it
+ships with various command-line tools which have been ported. This
+package contains cider-getfile, cider-iconv, cider-makedisk,
+cider-mdc, cider-packddd, and cider-sstasm.
+
+See /usr/doc/ciderpress-tools-4.1.0_d3/README-linux.md for usage.
+Note that the tools are installed with the cider- prefix, to avoid
+conflicts.
diff --git a/system/ciderpress-tools/ciderpress-tools.SlackBuild b/system/ciderpress-tools/ciderpress-tools.SlackBuild
new file mode 100644
index 0000000000..d4a22d03be
--- /dev/null
+++ b/system/ciderpress-tools/ciderpress-tools.SlackBuild
@@ -0,0 +1,142 @@
+#!/bin/bash
+
+# Slackware build script for ciderpress-tools
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# TODO:
+# - Write man pages. Or at least, one man page, describing all the
+#   tools. Not doing this now because I have absolutely no idea
+#   what some of these tools do (packddd, sstasm?) and because
+#   there's almost no documentation for the others.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ciderpress-tools
+VERSION=${VERSION:-4.1.1_d1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+# Slackware VERSION can't have hyphens, so:
+SRCNAM=ciderpress
+SRCVER="$( echo $VERSION | sed 's,_,-,g' )"
+
+# Undocumented (broken) option.
+# Someday, BZIP2=yes may work. Currently, you can compile with
+# bzip2 support, but it doesn't actually work (not a recognized
+# disk format).
+# In case you're wondering: libnufx supports bzip2, but the diskimg
+# library doesn't (and it's non-trivial to add support).
+BZIP2=${BZIP2:-no}
+if [ "$BZIP2" = "yes" ]; then
+  CONFIG_ARG="--enable-bzip2"
+  cat <<EOF
+***
+*** BZIP2=yes doesn't work yet. Remove this message if it's been fixed.
+***
+EOF
+  sleep 5
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$SRCVER
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+cd $SRCNAM-$SRCVER
+TOPDIR=$( pwd )
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Since we override OPT, and it contains this, we gotta add it here:
+SLKCFLAGS+=" -DHAVE_CONFIG_H"
+
+# DRY...
+runmake() {
+  make "$@" OPT="$SLKCFLAGS"
+}
+
+### nufxlib
+cd nufxlib
+
+# We don't need the full panoply of configure args here, they don't
+# do anything (and we're not installing this static library).
+./configure $CONFIG_ARG
+
+# Plain "make" fails with parallelism (tries to build the samples
+# before the library's been built), but this works:
+runmake libnufx.a
+
+# If we needed the samples:
+#runmake samples  
+
+### diskimg, then libhfs
+cd $TOPDIR/diskimg
+runmake
+cd libhfs
+runmake
+
+### Finally, the binaries that use the above libraries.
+cd $TOPDIR/linux
+
+# LIBS and LDFLAGS don't work, surgically implant the bzip2 library
+# if requested.
+[ "$BZIP2" = "yes" ] && sed -i 's,-lz,-lz -lbz2,' Makefile
+
+runmake
+
+### Compile done, no 'make install' so install manually.
+# Only going to install the "Sample" and "Bonus" programs that are
+# documented in README-linux.md. They all get a cider- prefix because
+# they have generic names like "getfile" and "makedisk" and even
+# worse, "iconv" (which would conflict with /usr/bin/iconv).
+for i in getfile iconv makedisk mdc packddd sstasm; do
+  install -s -D $i $PKG/usr/bin/cider-$i
+done
+
+cd $TOPDIR
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+# Very sparse documentation. The sed stuff omits the build directions.
+sed -n '/^Sample Programs/,$p' README-linux.md > $PKGDOC/README-linux.md
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ciderpress-tools/ciderpress-tools.info b/system/ciderpress-tools/ciderpress-tools.info
new file mode 100644
index 0000000000..b50749dad0
--- /dev/null
+++ b/system/ciderpress-tools/ciderpress-tools.info
@@ -0,0 +1,10 @@
+PRGNAM="ciderpress-tools"
+VERSION="4.1.1_d1"
+HOMEPAGE="http://a2ciderpress.com/"
+DOWNLOAD="https://github.com/fadden/ciderpress/archive/v4.1.1-d1/ciderpress-4.1.1-d1.tar.gz"
+MD5SUM="2449d265b89c7dd8df0c2ca6e15f3dc5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/ciderpress-tools/slack-desc b/system/ciderpress-tools/slack-desc
new file mode 100644
index 0000000000..704dbcc544
--- /dev/null
+++ b/system/ciderpress-tools/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+ciderpress-tools: ciderpress-tools (tools for working with Apple II disk images)
+ciderpress-tools:
+ciderpress-tools: CiderPress is a Windows utility for managing Apple II file archives
+ciderpress-tools: and disk images. The application has not been ported to Linux, but it
+ciderpress-tools: ships with various command-line tools which have been ported. This
+ciderpress-tools: package contains cider-getfile, cider-iconv, cider-makedisk,
+ciderpress-tools: cider-mdc, cider-packddd, and cider-sstasm.
+ciderpress-tools:
+ciderpress-tools:
+ciderpress-tools:
+ciderpress-tools:
diff --git a/system/ciopfs/README b/system/ciopfs/README
index 2c70999a57..5d1509807d 100644
--- a/system/ciopfs/README
+++ b/system/ciopfs/README
@@ -1,7 +1,7 @@
 ciopfs (case insensitive on purpose filesystem)
 
-ciopfs is a stackable or overlay linux userspace file system (implemented
-with FUSE) which mounts a normal directory on a regular file sytem in
-case insensitive fashion. It's useful for getting around issues where,
-say, a game is ported from Linux to Windows but the mods for that game
-still expect a case-insenitive filesystem.
+ciopfs is a stackable or overlay linux userspace file system
+(implemented with FUSE) which mounts a normal directory on a regular
+file sytem in case insensitive fashion. It's useful for getting around
+issues where, say, a game is ported from Linux to Windows but the mods
+for that game still expect a case-insenitive filesystem.
diff --git a/system/ciopfs/ciopfs.SlackBuild b/system/ciopfs/ciopfs.SlackBuild
index 6658402742..88cb9f58e7 100644
--- a/system/ciopfs/ciopfs.SlackBuild
+++ b/system/ciopfs/ciopfs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ciopfs
 
@@ -28,10 +28,13 @@
 # - i486 => i586
 # - include "links -dump" of web page as ciopfs.txt
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ciopfs
 VERSION=${VERSION:-0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -41,7 +44,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -90,4 +97,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ciopfs/ciopfs.info b/system/ciopfs/ciopfs.info
index 64b2a2ee75..9de6ff4e4c 100644
--- a/system/ciopfs/ciopfs.info
+++ b/system/ciopfs/ciopfs.info
@@ -1,10 +1,10 @@
 PRGNAM="ciopfs"
 VERSION="0.4"
-HOMEPAGE="http://www.brain-dump.org/projects/ciopfs/"
-DOWNLOAD="http://www.brain-dump.org/projects/ciopfs/ciopfs-0.4.tar.gz"
+HOMEPAGE="https://www.brain-dump.org/projects/ciopfs/"
+DOWNLOAD="https://www.brain-dump.org/projects/ciopfs/ciopfs-0.4.tar.gz"
 MD5SUM="1798fc043034f292efd887c05fc4ea1e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/ck4up/ck4up.SlackBuild b/system/ck4up/ck4up.SlackBuild
index dbb831f522..f69142640a 100644
--- a/system/ck4up/ck4up.SlackBuild
+++ b/system/ck4up/ck4up.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ck4up
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ck4up
 VERSION=${VERSION:-1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -85,4 +95,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/clamav/README b/system/clamav/README
index d5ea798980..8019f79bc4 100644
--- a/system/clamav/README
+++ b/system/clamav/README
@@ -4,10 +4,12 @@ scanning). The package provides a flexible and scalable multi-threaded
 daemon, a command line scanner, and a tool for automatic updating via
 Internet.
 
-This build script should build a package that "just works" after install.
-You will need to specify a two-letter country code (such as "us") as an
-argument to the COUNTRY variable when running the build script (this will
-default to "us" if nothing is specified).  For example:
+This build script should build a package that "just works" after
+install.  You will need to specify a two-letter country code (such
+as "us") as an argument to the COUNTRY variable when running the
+build script (this will default to "us" if nothing is specified).
+For example:
+
   COUNTRY=nl ./clamav.SlackBuild
 
 
diff --git a/system/clamav/clamav.SlackBuild b/system/clamav/clamav.SlackBuild
index 37869c15c3..77fad8b7b2 100644
--- a/system/clamav/clamav.SlackBuild
+++ b/system/clamav/clamav.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright (c) 2006,2007 Eric Hameleers <alien@slackware.com>
-# Copyright (c) 2011-2021 Matteo Bernardini <ponce@slackbuilds.org>
+# Copyright (c) 2011-2024 Matteo Bernardini <ponce@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,21 +26,32 @@
 # Version bump and various other changes by Robby Workman
 # New version bump and various other changes by Matteo Bernardini
 # No additional license terms added
+# Code to deal with multiple copies of the source by B. Watson
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=clamav
-VERSION=${VERSION:-0.103.1}
+VERSION=${VERSION:-1.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
+    i?86) ARCH=i686 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG="$TMP/package-$PRGNAM"
 OUTPUT=${OUTPUT:-/tmp}
@@ -78,34 +89,26 @@ elif ! getent passwd clamav 2>&1 > /dev/null; then
   bailout ;
 fi
 
-# check if json-c is there: if it is, build over it to enable
-# the file properties collection and analysis feature
-# http://blog.clamav.net/2014/11/intro-to-collection-and-analysis-of.html
-if pkg-config --exists json-c ; then
-  with_jsonc="--with-libjson"
-else
-  with_jsonc=""
-fi
+set -e
 
-# Some people don't have sendmail installed: don't build milter stuff
-# in this case.
-# This is your call, not having sendmail is *UNSUPPORTED*
-if [ ! -f /usr/lib$LIBDIRSUFFIX/libmilter.a ]; then
-  milter="dis"
-  milter_cf=""
-else
-  milter="en"
-  milter_cf="clamav-milter"
+# 20220209 bkw: the download filename ends up with a bunch of
+# gibberish (CGI params) if you use wget... I ended up with 2 copies
+# of the tarball with different gibberish in the names, and the "tar
+# xvf $CWD/$PRGNAM-$VERSION.tar.?z*" meant that both were passed as
+# args to tar (making it fail). So be a little more paranoid about
+# the filename.
+TARBALL=$CWD/$PRGNAM-$VERSION.tar.gz
+if [ ! -e "$TARBALL" ]; then
+  T="$( /bin/ls $CWD/$PRGNAM-$VERSION.tar.gz\?* 2>/dev/null | head -1 )"
+  [ -n "$T" ] && TARBALL="$T"
 fi
 
-set -e
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $TARBALL
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -113,6 +116,13 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
 # Specify the desired mirror in the update config file
 # http://www.iana.org/cctld/cctld-whois.htm
 sed -i "s/^\#DatabaseMirror.*/DatabaseMirror db.${COUNTRY}.clamav.net/" \
@@ -143,32 +153,29 @@ sed \
   -e "s/^\#ExitOnOOM/ExitOnOOM/" \
   -i etc/clamd.conf.sample || exit 1
 
-autoreconf -fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --mandir=/usr/man \
-  --with-user=clamav \
-  --with-group=clamav \
-  --with-dbdir=/var/lib/clamav \
-  --${milter}able-milter \
-  --enable-id-check \
-  --enable-clamdtop \
-  --disable-static \
-  --disable-experimental \
-  $with_jsonc \
-  --build=$ARCH-slackware-linux
-
-make V=1
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_FULL_LIBDIR=/usr/lib$LIBDIRSUFFIX \
+    -DAPP_CONFIG_DIRECTORY=/etc \
+    -DENABLE_MILTER=ON \
+    -DENABLE_SYSTEMD=OFF \
+    -DENABLE_TESTS=OFF \
+    -DDATABASE_DIRECTORY=/var/lib/clamav \
+    -DENABLE_EXTERNAL_MSPACK=ON \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+mv $PKG/usr/share/man $PKG/usr/man
+rm -fR $PKG/usr/share
 
 # Prepare the config files:
-for cf in clamd freshclam $milter_cf; do
+for cf in clamd freshclam clamav-milter; do
   mv $PKG/etc/$cf.conf.sample $PKG/etc/$cf.conf.new
 done
 
@@ -180,29 +187,27 @@ install -D -m 0644 $CWD/logrotate.clamav $PKG/etc/logrotate.d/clamav.new
 # init script must still ensure that /var/run/clamav exists
 # and has proper ownership and permissions though
 mkdir -p $PKG/var/lib/clamav $PKG/var/log/clamav $PKG/var/run/clamav
-chmod 771 $PKG/var/lib/clamav $PKG/var/log/clamav $PKG/var/run/clamav
+chmod 0771 $PKG/var/log/clamav $PKG/var/run/clamav
+chmod 0775 $PKG/var/lib/clamav
 
 # Fixup some ownership and permissions issues
 chown -R root:root $PKG
 chmod -R o-w $PKG
-if [ "$milter" = "en" ]; then
-  chown clamav $PKG/usr/sbin/clamav-milter
-  chmod 4700 $PKG/usr/sbin/clamav-milter
-fi
-chmod 0770 $PKG/var/lib/clamav
+chown clamav $PKG/usr/sbin/clamav-milter
+chmod 4700 $PKG/usr/sbin/clamav-milter
 touch $PKG/var/lib/clamav/main.cvd $PKG/var/lib/clamav/daily.cvd
 chmod 0660 $PKG/var/lib/clamav/*
 
 # Create log files in such a way that they won't clobber existing ones
 touch $PKG/var/log/clamav/clamd.log.new \
   $PKG/var/log/clamav/freshclam.log.new
-chmod 660 $PKG/var/log/clamav/clamd.log.new \
+chmod 0660 $PKG/var/log/clamav/clamd.log.new \
   $PKG/var/log/clamav/freshclam.log.new
 
 chown -R clamav:clamav $PKG/var/lib/clamav $PKG/var/log/clamav \
   $PKG/var/run/clamav
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Compress the man page(s)
@@ -222,4 +227,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/clamav/clamav.info b/system/clamav/clamav.info
index 71244e5107..924bba54fa 100644
--- a/system/clamav/clamav.info
+++ b/system/clamav/clamav.info
@@ -1,10 +1,10 @@
 PRGNAM="clamav"
-VERSION="0.103.1"
+VERSION="1.3.1"
 HOMEPAGE="https://www.clamav.net/"
-DOWNLOAD="https://www.clamav.net/downloads/production/clamav-0.103.1.tar.gz"
-MD5SUM="f895e9a261937ed91f5cb3ead4791555"
+DOWNLOAD="https://github.com/Cisco-Talos/clamav/releases/download/clamav-1.3.1/clamav-1.3.1.tar.gz"
+MD5SUM="a2617a04a69433f9f7c86ede5dcc82c6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="rust16 libmspack"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/system/clamsmtp/README b/system/clamsmtp/README
index 41c3f2f441..d1ab1a82e8 100644
--- a/system/clamsmtp/README
+++ b/system/clamsmtp/README
@@ -1,4 +1,6 @@
-ClamSMTP is an SMTP filter that allows you to check for viruses using the
-ClamAV anti-virus software. It accepts SMTP connections and forwards the
-SMTP commands and responses to another SMTP server. The 'DATA' email body
-is intercepted and scanned before forwarding.
+clamsmtp (ClamAV SMTP filter)
+
+ClamSMTP is an SMTP filter that allows you to check for viruses
+using the ClamAV anti-virus software. It accepts SMTP connections and
+forwards the SMTP commands and responses to another SMTP server. The
+'DATA' email body is intercepted and scanned before forwarding.
diff --git a/system/clamsmtp/clamsmtp.SlackBuild b/system/clamsmtp/clamsmtp.SlackBuild
index 2e56d765ce..af0cb6a7bb 100644
--- a/system/clamsmtp/clamsmtp.SlackBuild
+++ b/system/clamsmtp/clamsmtp.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for clamsmtp
 # Home Page http://memberwebs.com/stef/software/clamsmtp/
@@ -24,10 +24,17 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - install SlackBuild in doc dir.
+# 20220211 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=clamsmtp
 VERSION=${VERSION:-1.10}
 BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +44,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,10 +77,18 @@ cd $TMP/$PRGNAM-$VERSION
 chown -R root.root .
 find -L . \
   \( -perm 664 -o -perm 666 -o -perm 600 -o -perm 440 -o -perm 444 -o -perm 400 \) \
-  -exec chmod 644 {} \;
+  -exec chmod 644 {} \+
 find -L . \
   \( -perm 777 -o -perm 755 -o -perm 711 -o -perm 700 -o -perm 555 -o -perm 511 -o -perm 500 \) \
-  -exec chmod 755 {} \;
+  -exec chmod 755 {} \+
+
+# 20220211 bkw: These patches came from Debian:
+# http://deb.debian.org/debian/pool/main/c/clamsmtp/clamsmtp_1.10-17.diff.gz
+# They fix various issues, including one that kept this from compiling
+# on Slackware 15.0.
+for i in $(cat $CWD/patches/series); do
+  patch -p1 < $CWD/patches/$i
+done
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -83,29 +102,22 @@ CFLAGS="$SLKCFLAGS" \
   --build=${ARCH}-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 # Install init script and config file
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.clamsmtpd > $PKG/etc/rc.d/rc.clamsmtpd.new
 cat doc/clamsmtpd.conf > $PKG/etc/clamsmtpd.conf.new
 
-### strip binaries
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README \
+cp -a AUTHORS ChangeLog COPYING NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install $PKG/etc/rc.d
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/clamsmtp/doinst.sh b/system/clamsmtp/doinst.sh
index 6053858dd2..bcc73dc734 100644
--- a/system/clamsmtp/doinst.sh
+++ b/system/clamsmtp/doinst.sh
@@ -1,17 +1,14 @@
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
   elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
     rm $NEW
   fi
-  # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-# Keep same perms on rc.heimdal:
+# Keep same perms on rc.clamsmtpd:
 if [ -e etc/rc.d/rc.clamsmtpd ]; then
   cp -a etc/rc.d/rc.clamsmtpd etc/rc.d/rc.clamsmtpd.new.incoming
   cat etc/rc.d/rc.clamsmtpd.new > etc/rc.d/rc.clamsmtpd.new.incoming
diff --git a/system/clamsmtp/patches/300175-fileperms.patch b/system/clamsmtp/patches/300175-fileperms.patch
new file mode 100644
index 0000000000..d645b86076
--- /dev/null
+++ b/system/clamsmtp/patches/300175-fileperms.patch
@@ -0,0 +1,32 @@
+From: Samuel Tardieu <sam@rfc1149.net>
+Subject: Bug#300175: Patch for clamav/clamsmtp
+Date: Mon, 21 Mar 2005 11:07:48 +0100
+To: 300175@bugs.debian.org
+Cc: erwan@rail.eu.org
+Reply-To: sam@rfc1149.net
+
+On recent glibc, files created with mkstemp() are created with mode
+0600. If the mode is not changed, there is no way for another user to
+read the temporary file, regardless of the users' respective groups.
+
+This patch allows users in the same group to read the temporary files.
+This should solve Erwan's problem, and certainly has solved mine:
+
+Sam
+
+PS/ older glibc used to create the file in 0666 mode, which may explain
+    why not everyone has this problem
+
+Samuel Tardieu -- sam@rfc1149.net -- http://www.rfc1149.net/sam
+
+--- clamsmtp/common/smtppass.c.old	2005-01-27 01:22:56.000000000 +0100
++++ clamsmtp/common/smtppass.c	2005-03-21 10:58:38.000000000 +0100
+@@ -1270,6 +1270,7 @@
+             return -1;
+         }
+ 
++        fchmod(tfd, 0640);
+         fcntl(tfd, F_SETFD, fcntl(tfd, F_GETFD, 0) | FD_CLOEXEC);    
+         sp_messagex(ctx, LOG_DEBUG, "created cache file: %s", ctx->cachename);
+     }
+
diff --git a/system/clamsmtp/patches/gnu_source.patch b/system/clamsmtp/patches/gnu_source.patch
new file mode 100644
index 0000000000..22203e0b4f
--- /dev/null
+++ b/system/clamsmtp/patches/gnu_source.patch
@@ -0,0 +1,13 @@
+Remove GNU_SOURCE definition rom the only file that has it.
+
+--- ./common/smtppass.c	2014-07-06 12:26:26.000000000 +0200
++++ ./common/smtppass.c	2014-07-06 12:26:52.367104112 +0200
+@@ -38,8 +38,6 @@
+  *  Olivier Beyssac <ob@r14.freenix.org>
+  */ 
+ 
+-#define _GNU_SOURCE
+-
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
diff --git a/system/clamsmtp/patches/include_order.patch b/system/clamsmtp/patches/include_order.patch
new file mode 100644
index 0000000000..bf1526d0fa
--- /dev/null
+++ b/system/clamsmtp/patches/include_order.patch
@@ -0,0 +1,64 @@
+Fix order of includes
+
+--- clamsmtp-1.10/common/usuals.h       2007-05-27 01:57:56.000000000 +0200
++++ clamsmtp-patched/common/usuals.h    2015-03-01 16:48:10.684201573 +0100
+@@ -39,10 +39,10 @@
+ #ifndef __USUALS_H__
+ #define __USUALS_H__
+
+-#include <sys/types.h>
+-
+ #include "config.h"
+
++#include <sys/types.h>
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>
+diff -Nru clamsmtp-1.10/configure.in clamsmtp-patched/configure.in
+--- clamsmtp-1.10/configure.in  2008-06-30 19:01:48.000000000 +0200
++++ clamsmtp-patched/configure.in       2015-03-01 16:40:02.278986882 +0100
+@@ -51,6 +51,8 @@
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+
++AC_USE_SYSTEM_EXTENSIONS
++
+ # Debug mode
+ AC_ARG_ENABLE(debug,=20
+         AC_HELP_STRING([--enable-debug],
+
+diff -Nru clamsmtp-1.10/common/smtppass.c clamsmtp-patched/common/smtppass.c
+--- clamsmtp-1.10/common/smtppass.c	2015-03-02 09:36:27.793398352 +0100
++++ clamsmtp-patched/common/smtppass.c	2015-03-02 09:38:50.843467581 +0100
+@@ -38,6 +38,8 @@
+  *  Olivier Beyssac <ob@r14.freenix.org>
+  */ 
+ 
++#include "usuals.h"
++
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -58,17 +58,15 @@
+ #include <pwd.h>
+ #include <time.h>
+ 
+-#include "usuals.h"
+-
+-#ifdef LINUX_TRANSPARENT_PROXY
+-#include <linux/netfilter_ipv4.h>
+-#endif
+-
+ #include "compat.h"
+ #include "sock_any.h"
+ #include "stringx.h"
+ #include "sppriv.h"
+ 
++#ifdef LINUX_TRANSPARENT_PROXY
++#include <linux/netfilter_ipv4.h>
++#endif
++
+ /* -----------------------------------------------------------------------
+  *  STRUCTURES
+  */
diff --git a/system/clamsmtp/patches/leading_dots.patch b/system/clamsmtp/patches/leading_dots.patch
new file mode 100644
index 0000000000..983247146f
--- /dev/null
+++ b/system/clamsmtp/patches/leading_dots.patch
@@ -0,0 +1,121 @@
+--- clamsmtp-1.10.orig/common/smtppass.c
++++ clamsmtp-1.10/common/smtppass.c
+@@ -1389,16 +1389,34 @@ int sp_cache_data(spctx_t* ctx)
+ {
+     int r, count = 0;
+     const char* data;
++    int linestart;
++
++    linestart = 1;
+     
+     while((r = sp_read_data(ctx, &data)) != 0)
+     {
+-        if(r < 0)
+-            return -1;  /* Message already printed */
++	if(r < 0)
++	 return -1;  /* Message already printed */
++
++	/* SMTP RFCs say that servers must remove leading dots at the beginning
++	 * of a line. We do that here.
++	 */
++
++	if (linestart && (data[0] == '.'))
++	{
++	    data++;
++	    r--;
++	}
++
++	if (ctx->_crlf)
++	 linestart = 1;
++	else
++	 linestart = 0;	
+             
+-        count += r;
++	count += r;
+             
+-        if((r = sp_write_data(ctx, data, r)) < 0)
+-            return -1;  /* Message already printed */
++	if((r = sp_write_data(ctx, data, r)) < 0)
++	 return -1;  /* Message already printed */
+     }
+     
+     /* End the caching */
+@@ -1572,9 +1590,12 @@ int sp_done_data(spctx_t* ctx, const cha
+     int ret = 0;
+     char *line;    
+     char header[MAX_HEADER_LENGTH] = "";
+-    size_t header_len, line_len;
++    size_t header_len;
+     int header_prepend = 0;
+     ssize_t rc;
++    size_t buf_len;
++    int linestart;
++    char *buf;
+ 
+     ASSERT(ctx->cachename[0]);  /* Must still be around */
+     ASSERT(!ctx->cachefile);    /* File must be closed */
+@@ -1582,10 +1603,12 @@ int sp_done_data(spctx_t* ctx, const cha
+     memset(header, 0, sizeof(header));
+ 
+     /* Alloc line buffer */
+-    line_len = SP_LINE_LENGTH;
+-    if((line = (char *)malloc(line_len)) == NULL)
++    buf_len = SP_LINE_LENGTH;
++    if((buf = (char *)malloc(buf_len)) == NULL)
+         RETURN(-1);
+ 
++    buf[0] = '.';
++
+     /* Open the file */
+     file = fopen(ctx->cachename, "r");
+     if(file == NULL)
+@@ -1631,17 +1654,24 @@ int sp_done_data(spctx_t* ctx, const cha
+         header[0] = '\0';
+     }
+ 
+-    /* Transfer actual file data */    
+-    while((rc = getline(&line, &line_len, file)) != -1)
++    /* Transfer actual file data */
++    while(line = (fgets(buf + 1, buf_len - 1, file)))
+     {
+-        /* 
+-         * If the line is <CRLF>.<CRLF> we need to change it so that 
+-         * it doesn't end the email. We do this by adding a space. 
+-         * This won't occur much in clamsmtpd, but proxsmtpd might 
+-         * have filters that accidentally put this in.
+-         */
+-        if(strcmp(line, "." CRLF) == 0)
+-            strncpy(line, ". " CRLF, SP_LINE_LENGTH);
++	/* SMTP RFCs say that clients must prepend an additional dot
++	 * to every line starting with a dot. We do that here.
++	 */
++	if (linestart && (line[0] == '.'))
++	 line = buf;
++
++	rc = strlen(line);
++
++	if (strstr(line, CRLF))
++	 linestart = 1;
++	else
++	 linestart = 0;
++
++	if(strcmp(line, "." CRLF) == 0)
++	 strncpy(line, ". " CRLF, SP_LINE_LENGTH);
+       
+         if(header[0] != '\0')
+         {
+@@ -1683,10 +1713,10 @@ int sp_done_data(spctx_t* ctx, const cha
+         
+ cleanup:
+     
+-	if(line)
+-		free(line); 
+-    if(file)
+-        fclose(file); /* read-only so no error check */
++	if(buf)
++		free(buf); 
++	if(file)
++		fclose(file); /* read-only so no error check */
+     
+     return ret;
+ }
diff --git a/system/clamsmtp/patches/manpage.patch b/system/clamsmtp/patches/manpage.patch
new file mode 100644
index 0000000000..4a1514dfbb
--- /dev/null
+++ b/system/clamsmtp/patches/manpage.patch
@@ -0,0 +1,13 @@
+Fix syntax error in manpage.
+
+--- clamsmtp/doc/clamsmtpd.8.orig	2008-11-30 13:54:38.000000000 +0100
++++ clamsmtp/doc/clamsmtpd.8	2008-11-30 13:54:46.000000000 +0100
+@@ -146,7 +146,7 @@
+ machine under heavy load. Secondly as with running any program there are 
+ security implications to be considered. 
+ .Pp
+-.Please consider the above carefully before implementing a virus action. 
++Please consider the above carefully before implementing a virus action. 
+ .Pp
+ The script is run without its output being logged, or return value being 
+ checked. Because of this you should test it thoroughly. Make sure it runs
diff --git a/system/clamsmtp/patches/series b/system/clamsmtp/patches/series
new file mode 100644
index 0000000000..0ce65e1c6b
--- /dev/null
+++ b/system/clamsmtp/patches/series
@@ -0,0 +1,5 @@
+300175-fileperms.patch
+gnu_source.patch
+include_order.patch
+leading_dots.patch
+manpage.patch
diff --git a/system/clamtk/clamtk.SlackBuild b/system/clamtk/clamtk.SlackBuild
index 17e5d69ac1..bbc9085be2 100644
--- a/system/clamtk/clamtk.SlackBuild
+++ b/system/clamtk/clamtk.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for clamtk
 
-# Copyright 2012-2020 Petar Petrov slackalaxy@gmail.com
+# Copyright 2012-2023 Petar Petrov slackalaxy@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,10 +25,13 @@
 # With help and dependencies information from Arch linux AUR:
 # https://aur.archlinux.org/packages/clamtk/
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=clamtk
-VERSION=${VERSION:-6.05}
+VERSION=${VERSION:-6.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -63,7 +73,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -82,21 +92,17 @@ for i in lib/* ; do
   install -D -m644 $i $PKG/usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl/ClamTk/`basename $i`
 done
 
-for i in po/*.mo ; do
-  install -D -m644 $i $PKG/usr/share/locale/`basename $i .mo`/LC_MESSAGES/$PRGNAM.mo
-done
-
 install -D -m644 $PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz
 
 mkdir -p $PKG/usr/share/{applications,pixmaps}
 cp $PRGNAM.desktop $PKG/usr/share/applications
-cp images/$PRGNAM.png $PKG/usr/share/pixmaps
+cp images/{$PRGNAM.png,$PRGNAM.xpm} $PKG/usr/share/pixmaps
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES credits.md DISCLAIMER LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES credits.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -104,4 +110,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/clamtk/clamtk.info b/system/clamtk/clamtk.info
index a0a07e72d8..36021d1152 100644
--- a/system/clamtk/clamtk.info
+++ b/system/clamtk/clamtk.info
@@ -1,10 +1,10 @@
 PRGNAM="clamtk"
-VERSION="6.05"
-HOMEPAGE="https://dave-theunsub.github.io/clamtk/"
-DOWNLOAD="https://bitbucket.org/davem_/clamtk-gtk3/downloads/clamtk-6.05.tar.xz"
-MD5SUM="71896ca2ecabddf9938523a1f0e357ab"
+VERSION="6.16"
+HOMEPAGE="https://github.com/dave-theunsub/clamtk"
+DOWNLOAD="https://github.com/dave-theunsub/clamtk/archive/v6.16/clamtk-6.16.tar.gz"
+MD5SUM="a4ae3196b4ca6cb19f3136038eb25496"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libwww-perl perl-http-message perl-JSON perl-LWP-Protocol-https perl-Text-CSV perl-Gtk3 clamav zenity"
+REQUIRES="perl-JSON perl-LWP-Protocol-https perl-Text-CSV perl-Gtk3 clamav zenity"
 MAINTAINER="Petar Petrov"
 EMAIL="slackalaxy@gmail.com"
diff --git a/system/cldr-emoji-annotation/README b/system/cldr-emoji-annotation/README
deleted file mode 100644
index 48228e21c3..0000000000
--- a/system/cldr-emoji-annotation/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This package consists of CLDR annotation files
-from http://www.unicode.org/
-
-Based on https://github.com/fujiwarat/cldr-emoji-annotation
diff --git a/system/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild b/system/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild
deleted file mode 100644
index 0f548cdfba..0000000000
--- a/system/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for cldr-emoji-annotation
-
-# Copyright 2017 Ozan Türkyılmaz, Turkey
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=cldr-emoji-annotation
-VERSION=${VERSION:-31.0.1_1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS ChangeLog COPYING NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/cldr-emoji-annotation/cldr-emoji-annotation.info b/system/cldr-emoji-annotation/cldr-emoji-annotation.info
deleted file mode 100644
index 3cfd3754da..0000000000
--- a/system/cldr-emoji-annotation/cldr-emoji-annotation.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="cldr-emoji-annotation"
-VERSION="31.0.1_1"
-HOMEPAGE="https://github.com/fujiwarat/cldr-emoji-annotation/"
-DOWNLOAD="https://github.com/fujiwarat/cldr-emoji-annotation/releases/download/31.0.1_1/cldr-emoji-annotation-31.0.1_1.tar.gz"
-MD5SUM="1aac931f38e25518ec2602745037953f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Ozan Türkyılmaz"
-EMAIL="Ozan.Turkyilmaz@gmail.com"
diff --git a/system/cldr-emoji-annotation/slack-desc b/system/cldr-emoji-annotation/slack-desc
deleted file mode 100644
index a00211bff9..0000000000
--- a/system/cldr-emoji-annotation/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-                     |-----handy-ruler------------------------------------------------------|
-cldr-emoji-annotation: cldr-emoji-annotation (CLDR annotation files)
-cldr-emoji-annotation:
-cldr-emoji-annotation: This package consists of CLDR annotation files from
-cldr-emoji-annotation: http://www.unicode.org/
-cldr-emoji-annotation:
-cldr-emoji-annotation: Based on
-cldr-emoji-annotation: https://github.com/fujiwarat/cldr-emoji-annotation
-cldr-emoji-annotation:
-cldr-emoji-annotation:
-cldr-emoji-annotation:
-cldr-emoji-annotation:
diff --git a/system/clifm/README b/system/clifm/README
new file mode 100644
index 0000000000..ef58718f90
--- /dev/null
+++ b/system/clifm/README
@@ -0,0 +1,14 @@
+CliFM is a Command Line Interface File Manager: all input and 
+interaction is performed via commands. This is its main feature and 
+strength.
+Unlike most terminal file managers out there, indeed, CliFM replaces 
+the traditional TUI interface also known as curses or text-menu based 
+interface by a command-line interface (CLI),1 also known as REPL.2
+
+If working with the command-line, your workflow is not affected at all, 
+but just enriched with file management functionalities: automatic files 
+listing, files selection, bookmarks, tags, directory jumper, directory 
+and commands history, auto-cd and auto-open, bulk rename, TAB 
+completion, autosuggestions, and a trash system, among other features. 
+In this sense, CliFM is certainly a file manager, but also a shell 
+extension.
diff --git a/system/clifm/clifm.SlackBuild b/system/clifm/clifm.SlackBuild
new file mode 100644
index 0000000000..8731fb41c2
--- /dev/null
+++ b/system/clifm/clifm.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+# Slackware build script for clifm
+
+# Copyright 2022 Damian Perticone, Berisso, Argentina
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=clifm		
+VERSION=${VERSION:-1.7}	
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}		
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}	
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}	
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+sed -i 's/\/usr\/local/\/usr/g' Makefile
+
+make \
+  OPTS="$SLKCFLAGS" \
+  PREFIX=/usr \
+  MANPREFIX=/usr/man
+
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+LICENSE CHANGELOG CONTACT.md CONTRIBUTING.md README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/clifm/clifm.info b/system/clifm/clifm.info
new file mode 100644
index 0000000000..205ba80654
--- /dev/null
+++ b/system/clifm/clifm.info
@@ -0,0 +1,10 @@
+PRGNAM="clifm"
+VERSION="1.7"
+HOMEPAGE="https://github.com/leo-arch/clifm"
+DOWNLOAD="https://github.com/leo-arch/clifm/archive/v1.7/clifm-1.7.tar.gz"
+MD5SUM="26be014fc72fc27268c522cc861ad0c3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Damian Perticone"
+EMAIL="mjolnirdam@gmail.com"
diff --git a/system/clifm/doinst.sh b/system/clifm/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/system/clifm/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/clifm/slack-desc b/system/clifm/slack-desc
new file mode 100644
index 0000000000..47807e5e5e
--- /dev/null
+++ b/system/clifm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+clifm: clifm (Command Line File Manager)
+clifm:
+clifm: Clifm is a shell-like, command line terminal file manager: simple,
+clifm: fast, extensible, and lightweight
+clifm:
+clifm:
+clifm:
+clifm:
+clifm:
+clifm: Home: https://github.com/leo-arch/clifm
+clifm:
diff --git a/system/clinfo/README b/system/clinfo/README
new file mode 100644
index 0000000000..653554c05b
--- /dev/null
+++ b/system/clinfo/README
@@ -0,0 +1,8 @@
+clinfo is a simple command-line application that enumerates all
+possible (known) properties of the OpenCL platform and devices
+available on the system.
+
+Inspired by AMD's program of the same name, it is coded in pure C and
+it tries to output all possible information, including those provided
+by platform-specific extensions, trying not to crash on unsupported
+properties (e.g. 1.2 properties on 1.1 platforms).
diff --git a/system/clinfo/clinfo.SlackBuild b/system/clinfo/clinfo.SlackBuild
new file mode 100644
index 0000000000..9ac9d05b7a
--- /dev/null
+++ b/system/clinfo/clinfo.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+# Slackware build script for clinfo
+
+# Copyright 2022 Edward W. Koenig Vancouver WA USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=clinfo
+VERSION=${VERSION:-3.0.23.01.25}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+make
+
+install -Dm755 clinfo -t $PKG/usr/bin/
+install -Dm644 man1/clinfo.1 -t $PKG/usr//man/man1/
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+  
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/clinfo/clinfo.info b/system/clinfo/clinfo.info
new file mode 100644
index 0000000000..d9d0a97beb
--- /dev/null
+++ b/system/clinfo/clinfo.info
@@ -0,0 +1,10 @@
+PRGNAM="clinfo"
+VERSION="3.0.23.01.25"
+HOMEPAGE="https://github.com/Oblomov/clinfo"
+DOWNLOAD="https://github.com/Oblomov/clinfo/archive/3.0.23.01.25/clinfo-3.0.23.01.25.tar.gz"
+MD5SUM="52548a9bb96f22f47818d085e3a0aaa9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Edward W. Koenig"
+EMAIL="kingbeowulf@linuxgalaxy.org"
diff --git a/system/clinfo/slack-desc b/system/clinfo/slack-desc
new file mode 100644
index 0000000000..a21cfa0595
--- /dev/null
+++ b/system/clinfo/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+clinfo: clinfo (OpenCL platform and devices information)
+clinfo:
+clinfo: clinfo is a simple command-line application that enumerates all
+clinfo: possible (known) properties of the OpenCL platform and devices
+clinfo: available on the system.
+clinfo:
+clinfo:
+clinfo:
+clinfo: https://github.com/Oblomov/clinfo
+clinfo:
+clinfo:
diff --git a/system/cluster-glue/cluster-glue.SlackBuild b/system/cluster-glue/cluster-glue.SlackBuild
index 1ae6d7be73..ae30fb192f 100644
--- a/system/cluster-glue/cluster-glue.SlackBuild
+++ b/system/cluster-glue/cluster-glue.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cluster-glue
 
@@ -22,11 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220209 bkw: Modified by SlackBuilds.org: turn off fatal warnings to
+# fix the build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cluster-glue
 VERSION=${VERSION:-20161102_afaeeb}
 COMMIT=${COMMIT:-afaeeb2f3e2a576c8a50ee3ce98e83e4da635c76}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +42,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -95,6 +108,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-dependency-tracking \
+  --disable-fatal-warnings \
   --disable-static \
   --build=$ARCH-slackware-linux
 
@@ -113,8 +127,10 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cndrvcups-capt/README b/system/cndrvcups-capt/README
index 06da58eb9a..03d6c29117 100644
--- a/system/cndrvcups-capt/README
+++ b/system/cndrvcups-capt/README
@@ -1,7 +1,9 @@
 Canon CAPT Printer Driver for Linux
 
-This CAPT printer driver provides printing functions for Canon LBP printers
-operating under the CUPS (Common UNIX Printing System) environment.
+This CAPT printer driver provides printing functions for Canon LBP
+printers operating under the CUPS (Common UNIX Printing System)
+environment.
 
-This package contains parts that are binary only and compiled on a 32bit
-system. To get it up and running on 64bit, you will need multilib installed.
+This package contains parts that are binary only and compiled on
+a 32bit system. To get it up and running on 64bit, you will need
+multilib installed.
diff --git a/system/cndrvcups-capt/cndrvcups-capt.SlackBuild b/system/cndrvcups-capt/cndrvcups-capt.SlackBuild
index ac8c3017e8..74fe7eaad4 100644
--- a/system/cndrvcups-capt/cndrvcups-capt.SlackBuild
+++ b/system/cndrvcups-capt/cndrvcups-capt.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cndrvcups-capt
 
@@ -22,26 +22,35 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220212 bkw: Modified by SlackBuilds.org: fix the build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cndrvcups-capt
 VERSION=${VERSION:-2.71}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,13 +74,15 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Fix missing include
 patch -p1 <$CWD/ppapdata.c.diff
 
+SLKCFLAGS+=" -fcommon"
+
 (
   cd driver
   CFLAGS="$SLKCFLAGS" \
@@ -143,7 +154,7 @@ patch -p1 <$CWD/ppapdata.c.diff
   cd statusui
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
-  LIBS="-lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0" \
+  LIBS="$( pkg-config --libs gtk+-2.0) -lpthread" \
   ./autogen.sh \
     --prefix=/usr \
     --libdir=/usr/lib${LIBDIRSUFFIX}
@@ -232,9 +243,11 @@ cp -a COPYING LICENSE* README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cndrvcups-common/README b/system/cndrvcups-common/README
index b51a1f64e1..945f865002 100644
--- a/system/cndrvcups-common/README
+++ b/system/cndrvcups-common/README
@@ -2,5 +2,6 @@ Canon Printer Driver Common Module for Linux
 
 Modules required by CAPT printer driver.
 
-This package contains parts that are binary only and compiled on a 32bit
-system. To get it up and running on 64bit, you will need multilib installed.
+This package contains parts that are binary only and compiled on
+a 32bit system. To get it up and running on 64bit, you will need
+multilib installed.
diff --git a/system/cndrvcups-common/cndrvcups-common.SlackBuild b/system/cndrvcups-common/cndrvcups-common.SlackBuild
index a39ab0866e..154cf6c0a9 100644
--- a/system/cndrvcups-common/cndrvcups-common.SlackBuild
+++ b/system/cndrvcups-common/cndrvcups-common.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cndrvcups-common
 
@@ -22,26 +22,38 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220209 bkw: Modified by SlackBuilds.org, fix build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cndrvcups-common
 VERSION=${VERSION:-3.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,6 +81,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+SLKCFLAGS+=" -fcommon"
+
 (
   cd buftool
   CFLAGS="$SLKCFLAGS" \
@@ -80,8 +94,10 @@ find -L . \
   make install DESTDIR=$PKG
 )
 
+# 20220209 bkw: for some reason this wasn't picking up the libs it needs...
 (
   cd cngplp
+  LIBS="$( pkg-config --libs glib-2.0 gmodule-2.0 gtk+-2.0 )" \
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   ./autogen.sh \
@@ -145,4 +161,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cnijfilter2/README b/system/cnijfilter2/README
index bd7d23ec82..80d68b5572 100644
--- a/system/cnijfilter2/README
+++ b/system/cnijfilter2/README
@@ -1,20 +1,21 @@
 cnijfilter2 (Canon IJ Printer Driver)
 
-cnijfilter2 provides printing functions for Canon Inkjet printers operating
-under the CUPS (Common UNIX Printing System) environment.
+cnijfilter2 provides printing functions for Canon Inkjet printers
+operating under the CUPS (Common UNIX Printing System) environment.
 
 Supported series:
-- MG2900, MG3000, MG3600, MG5600, MG5700, MG6600, MG6700, MG6800, MG6900, MG7700,
-  MG7500
+- MG2900, MG3000, MG3600, MG5600, MG5700, MG6600, MG6700, MG6800,
+  MG6900, MG7700, MG7500
 - MB2700, MB2300, MB2100, MB2000, MB5000, MB5300
 - G4010, G4000, G3010, G3000
 - iB4100, iB4000, iP110
 - E450, E480, E470, E300, E200, E3100, E4200, MX490
 - TR4500, TR7500, TR7530, TR8500, TR8530, TR8580, TR9530
-- TS9500, TS8230, TS8280, TS8200, TS6280, TS6230, TS6200, TS200, TS300, TS3100,
-  TS5100, TS6100, TS6130, TS6180, TS8100, TS8180, TS9100, TS9180, TS8130, TS9580
+- TS9500, TS8230, TS8280, TS8200, TS6280, TS6230, TS6200, TS200, TS300,
+  TS3100, TS5100, TS6100, TS6130, TS6180, TS8100, TS8180, TS9100,
+  TS9180, TS8130, TS9580
 - XK80, XK70, XK50
 
 NB. see also SBo system/pixma SlackBuild for support of related Canon
-printers. It supports MG2500, MG2400, MG3500, MG5500, MG6400, MG6500, MG7100
-and P200 series.
+printers. It supports MG2500, MG2400, MG3500, MG5500, MG6400, MG6500,
+MG7100 and P200 series.
diff --git a/system/cnijfilter2/cnijfilter2.SlackBuild b/system/cnijfilter2/cnijfilter2.SlackBuild
index 32c58adad8..c54efd21a1 100644
--- a/system/cnijfilter2/cnijfilter2.SlackBuild
+++ b/system/cnijfilter2/cnijfilter2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cnijfilter2
 
@@ -22,23 +22,39 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - strip binaries.
+# - relative symlinks.
+# - remove INSTALL from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cnijfilter2
-VERSION=${VERSION:-5.90.1}
+VERSION=${VERSION:-6.50.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=$PRGNAM-source
-SRCVERSION=5.90-1
+SRCVERSION=6.50-1
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
+    aarch64) ARCH=aarch64 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -46,23 +62,28 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
-  LDFLAGS="-L$TMP/${SRCNAM}-${SRCVERSION}/com/libs_bin32"
-  BITS="i386"
+  BITS="i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-  LDFLAGS="-L$TMP/${SRCNAM}-${SRCVERSION}/com/libs_bin32"
-  BITS="i386"
+  BITS="i686"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  LDFLAGS="-L$TMP/${SRCNAM}-${SRCVERSION}/com/libs_bin64"
-  BITS="amd64"
+  BITS="x86_64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  BITS="aarch64"
 else
-  echo "Package for $(uname -m) architecture is not available."
+  echo "Package for $ARCH architecture is not available."
   exit 1
 fi
 
+export ARCH
+export SLKCFLAGS
+export LIBDIRSUFFIX
+
 set -e
 
 rm -rf $PKG
@@ -82,40 +103,71 @@ find -L . \
  \( -type f \! -name autogen.sh \) \
   -exec chmod 644 {} \;
 
+patch -p1 < $CWD/gcc10.patch
+
+for dir in cmdtocanonij2 cmdtocanonij3 ; do
+  pushd $dir
+  ./autogen.sh --prefix=/usr --datadir=/usr/share LDFLAGS="-L../../com/libs_bin_${BITS}"
+  make
+  popd
+done
+
+pushd cnijbe2
+  ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin
+  make
+popd
+
+pushd lgmon3
+  ./autogen.sh --prefix=/usr --enable-libpath=/usr/lib${LIBDIRSUFFIX}/bjlib2 --enable-progpath=/usr/bin \
+    --datadir=/usr/share LDFLAGS="-L../../com/libs_bin_${BITS}"
+  make
+popd
+
+pushd rastertocanonij
+  ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin
+  make
+popd
+
+for dir in tocanonij tocnpwg ; do
+  pushd $dir
+  ./autogen.sh --prefix=/usr
+  make
+  popd
+done
+
 common_pkg="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
 for dir in $common_pkg; do
-  cd $dir
-    ./autogen.sh --prefix=/usr LDFLAGS="$LDFLAGS"
-    make
-    make install-strip DESTDIR=$PKG
-  cd ..
+  pushd $dir
+    make install DESTDIR=$PKG
+  popd
 done
-cd lgmon3
-  ./autogen.sh --prefix=/usr --enable-libpath=/usr/lib/bjlib2 LDFLAGS="$LDFLAGS"
-  make
-  make install-strip DESTDIR=$PKG
-cd ..
 
 if [ "$ARCH" = "x86_64" ]; then
   mv $PKG/usr/lib $PKG/usr/lib64
-  mkdir $PKG/usr/lib64/bjlib2
-  install -c -m 644 com/ini/cnnet.ini $PKG/usr/lib64/bjlib2/
-  install -c -m 755 com/libs_bin64/libcnnet2.so.* $PKG/usr/lib64/
-  install -c -m 755 com/libs_bin64/libcnbpnet20.so.* $PKG/usr/lib64/
-  install -c -m 755 com/libs_bin64/libcnbpnet30.so.* $PKG/usr/lib64/
-  install -c -m 755 com/libs_bin64/libcnbpcnclapicom2.so.* $PKG/usr/lib64/
-elif [ "$ARCH" = "i686" ]; then
-  mkdir $PKG/usr/lib/bjlib2
-  install -c -m 644 com/ini/cnnet.ini $PKG/usr/lib/bjlib2/
-  install -c -m 755 com/libs_bin32/libcnnet2.so.* $PKG/usr/lib/
-  install -c -m 755 com/libs_bin32/libcnbpnet20.so.* $PKG/usr/lib/
-  install -c -m 755 com/libs_bin32/libcnbpnet30.so.* $PKG/usr/lib/
-  install -c -m 755 com/libs_bin32/libcnbpcnclapicom2.so.* $PKG/usr/lib/
+fi
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/bjlib2
+install -c -o lp -g lp -m 644 com/ini/cnnet.ini $PKG/usr/lib${LIBDIRSUFFIX}/bjlib2/
+install -c -m 755 com/libs_bin_${BITS}/*.so.* $PKG/usr/lib${LIBDIRSUFFIX}/
+
+# 20220409 bkw: this bit of template was missing.
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Run ldconfig in the build script so that /usr/lib{64}/libcn*.so
+# are tracked by doinst.sh
+if [ -x /sbin/ldconfig ]; then
+  /sbin/ldconfig $PKG/usr/lib${LIBDIRSUFFIX}
 fi
 
-mkdir -p $PKG/usr/share/ppd/cnijfilter2
+mkdir -p $PKG/usr/share/ppd/cnijfilter2 $PKG/usr/share/cups/model
 cp -a ppd/*.ppd $PKG/usr/share/ppd/cnijfilter2
 
+# 20220409 bkw: made these relative symlinks.
+PPD_FILES=$( cd $PKG/usr/share/ppd/cnijfilter2 ; ls *.ppd )
+for f in $PPD_FILES; do
+  ln -fs ../../ppd/cnijfilter2/${f} $PKG/usr/share/cups/model/${f}
+done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/lproptions
 cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a lproptions/lpr* $PKG/usr/doc/$PRGNAM-$VERSION/lproptions
@@ -123,11 +175,11 @@ cat ppd/NEWS > $PKG/usr/doc/$PRGNAM-$VERSION/NEWS
 # Copy all README to /usr/doc
 for dir in $common_pkg; do
   mkdir $PKG/usr/doc/$PRGNAM-$VERSION/$dir
-  cd $dir
-    for file in AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README; do
+  pushd $dir
+    for file in AUTHORS COPYING ChangeLog LICENSE* NEWS README; do
       [ -f $file ] && cp -a $file $PKG/usr/doc/$PRGNAM-$VERSION/$dir
     done
-  cd ..
+  popd
 done
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -136,4 +188,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cnijfilter2/cnijfilter2.info b/system/cnijfilter2/cnijfilter2.info
index f71f314189..f9d0ca98dd 100644
--- a/system/cnijfilter2/cnijfilter2.info
+++ b/system/cnijfilter2/cnijfilter2.info
@@ -1,8 +1,8 @@
 PRGNAM="cnijfilter2"
-VERSION="5.90.1"
-HOMEPAGE="https://asia.canon/en/support/0101048401"
-DOWNLOAD="http://gdlp01.c-wss.com/gds/4/0100010484/01/cnijfilter2-source-5.90-1.tar.gz"
-MD5SUM="11029121b7003a3ebd5d53a1331673a7"
+VERSION="6.50.1"
+HOMEPAGE="https://asia.canon/en/support/0101163901"
+DOWNLOAD="https://gdlp01.c-wss.com/gds/9/0100011639/01/cnijfilter2-source-6.50-1.tar.gz"
+MD5SUM="a1c4f44c64c97d0cfa58b93e6655ab2c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/cnijfilter2/gcc10.patch b/system/cnijfilter2/gcc10.patch
new file mode 100644
index 0000000000..449a9777f1
--- /dev/null
+++ b/system/cnijfilter2/gcc10.patch
@@ -0,0 +1,11 @@
+--- cnijfilter2-source-6.20-1.orig/lgmon3/src/cnijlgmon3.c	2021-02-20 22:08:56.000000000 +1300
++++ cnijfilter2-source-6.20-1/lgmon3/src/cnijlgmon3.c	2021-11-05 23:35:18.626436603 +1300
+@@ -55,7 +55,7 @@
+ int (*GET_STATUS)(char *, int, int *, int * , char *);
+ int (*GET_STATUS2)(char *, int, char *, int *, int * , char *, char *);
+ int (*GET_STATUS2_MAINTENANCE)(char *, int, char *, int *, int * , char *, char *);
+-int (*GET_PROTOCOL)(char *, size_t);
++static int (*GET_PROTOCOL)(char *, size_t);
+ 
+ 
+  int main(int argc, char *argv[])
diff --git a/system/cnijfilter2/slack-desc b/system/cnijfilter2/slack-desc
index 5d9d84e58f..2398d4681f 100644
--- a/system/cnijfilter2/slack-desc
+++ b/system/cnijfilter2/slack-desc
@@ -16,4 +16,4 @@ cnijfilter2: series, MG2900 series, MB2000 series, MB2300, iB4000 series,
 cnijfilter2: MB5000 series, MB5300 series, iP110 series, E450 series, MX490
 cnijfilter2: series, E480 series.
 cnijfilter2:
-cnijfilter2: Homepage: https://asia.canon/en/support/0101048401
+cnijfilter2: Homepage: https://asia.canon/en/support/0101163901
diff --git a/system/cntlm/README b/system/cntlm/README
index a96529671e..0e95928c4f 100644
--- a/system/cntlm/README
+++ b/system/cntlm/README
@@ -1,14 +1,16 @@
-Cntlm is an NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy 
-intended to help you break free from the chains of Microsoft proprietary world.
-You can use a free OS and honor our noble idea, but you can't hide. Once you're 
-behind those cold steel bars of a corporate proxy server requiring NTLM
-authentication, you're done with. The same even applies to 3rd party Windows 
-applications, which don't support NTLM natively.
+Cntlm is an NTLM / NTLM Session Response / NTLMv2 authenticating HTTP
+proxy intended to help you break free from the chains of Microsoft
+proprietary world. You can use a free OS and honor our noble idea,
+but you can't hide. Once you're behind those cold steel bars of a
+corporate proxy server requiring NTLM authentication, you're done
+with. The same even applies to 3rd party Windows applications, which
+don't support NTLM natively.
 
 This package contain a start/stop script: /etc/rc.d/rc.cntlm
 
-If you need start cntlm at boot add the following to your /etc/rc.d/rc.local
-script and make sure rc.cntlm has executable permissions set:
+If you need start cntlm at boot add the following to your
+/etc/rc.d/rc.local script and make sure rc.cntlm has executable
+permissions set:
 
   if [ -x /etc/rc.d/rc.cntlm ]; then
     /etc/rc.d/rc.cntlm start
diff --git a/system/cntlm/cntlm.SlackBuild b/system/cntlm/cntlm.SlackBuild
index e31d672907..debccca8a3 100644
--- a/system/cntlm/cntlm.SlackBuild
+++ b/system/cntlm/cntlm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cntlm
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cntlm
 VERSION=${VERSION:-0.92.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -101,4 +111,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/collectd/README b/system/collectd/README
index 64abd67633..8b886ee96e 100644
--- a/system/collectd/README
+++ b/system/collectd/README
@@ -1,12 +1,15 @@
-collectd is a daemon which collects system performance statistics periodically
-and provides mechanisms to store the values in a variety of ways, for example
-in RRD files and backends like Graphite.
+collectd (statistics collection daemon)
 
-collectd gathers statistics about the system it is running on and stores this
-information. Those statistics can then be used to find current performance
-bottlenecks (i.e. performance analysis) and predict future system load (i.e.
-capacity planning). Or if you just want pretty graphs of your private server
-and are fed up with some homegrown solution you're at the right place, too ;).
+collectd is a daemon which collects system performance statistics
+periodically and provides mechanisms to store the values in a variety
+of ways, for example in RRD files and backends like Graphite.
+
+collectd gathers statistics about the system it is running on and
+stores this information. Those statistics can then be used to find
+current performance bottlenecks (i.e. performance analysis) and
+predict future system load (i.e.  capacity planning). Or if you just
+want pretty graphs of your private server and are fed up with some
+homegrown solution you're at the right place, too ;).
 
 Optional, tested, recommended dependencies:
 rrdtool, yajl
@@ -17,6 +20,7 @@ libvirt, lua, postgresql
 This package has several more optional dependencies, which are
 autodetected, but are mostly not tested by me (feedback welcome!):
 
-ganglia, gpsd, hiredis, i2c-tools, kafka, libdbi, libesmtp, libmemcached,
-libmicrohttpd, libmodbus, libsigrok, libstatgrab, mongo-c, mosquitto,
-protobuf, protobuf-c, rabbitmq-c, tokyotyrant, varnish, xen
+ganglia, gpsd, hiredis, i2c-tools, kafka, libdbi, libesmtp,
+libmemcached, libmicrohttpd, libmodbus, libsigrok, libstatgrab,
+mongo-c, mosquitto, protobuf, protobuf-c, rabbitmq-c, tokyotyrant,
+varnish, xen
diff --git a/system/collectd/collectd.SlackBuild b/system/collectd/collectd.SlackBuild
index 7be7e16a63..f7dba59369 100644
--- a/system/collectd/collectd.SlackBuild
+++ b/system/collectd/collectd.SlackBuild
@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/bin/bash
+
 # Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
 # Copyright 2009, 2010, 2011, 2012  Eric Hameleers, Eindhoven, Netherlands
 
@@ -12,10 +13,15 @@
 
 # Copyright (c) 2017-2019, Modified by: Ricardo J. Barberis <ricardo.barberis@gmail.com>
 
+# 20220211 bkw: fix build on 15.0 (by updating to v5.12.0).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=collectd
-VERSION=${VERSION:-5.10.0}
+VERSION=${VERSION:-5.12.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -25,7 +31,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,9 +65,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -71,16 +81,16 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-perl-bindings="PREFIX=/usr INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=/usr/man/man3" \
   --enable-static=no \
   --without-java \
+  --disable-werror \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
+rm -f $PKG/usr/lib*/*.la
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# don't need these empty dirs in the package:
+rmdir $PKG/var/{log,run}
 
 install -m 0644 -D $CWD/rc.collectd $PKG/etc/rc.d/rc.collectd.new
 
@@ -95,9 +105,7 @@ find $PKG -name "perllocal.pod" \
 rm -fr $PKG/var/run $PKG/var/log
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -105,4 +113,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/collectd/collectd.info b/system/collectd/collectd.info
index 0669478a2b..dab3d73d39 100644
--- a/system/collectd/collectd.info
+++ b/system/collectd/collectd.info
@@ -1,8 +1,8 @@
 PRGNAM="collectd"
-VERSION="5.10.0"
+VERSION="5.12.0"
 HOMEPAGE="https://collectd.org"
-DOWNLOAD="https://collectd.org/files/collectd-5.10.0.tar.bz2"
-MD5SUM="a8344a199b124711bdbec57f1c0b624f"
+DOWNLOAD="https://collectd.org/files/collectd-5.12.0.tar.bz2"
+MD5SUM="2b23a65960bc323d065234776a542e04"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/collectd/doinst.sh b/system/collectd/doinst.sh
index 6359977249..8684b492f8 100644
--- a/system/collectd/doinst.sh
+++ b/system/collectd/doinst.sh
@@ -1,14 +1,11 @@
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
   elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
     rm $NEW
   fi
-  # Otherwise, we leave the .new copy for the admin to consider...
 }
 
 preserve_perms() {
diff --git a/system/colord-gtk/README b/system/colord-gtk/README
index 669ecf0092..e199dc4c60 100644
--- a/system/colord-gtk/README
+++ b/system/colord-gtk/README
@@ -1,6 +1,8 @@
 colord-gtk is the GTK+ support library for colord.
 
-You can use the following options:
+The default build options build gtk3 and gtk4 support.
 
-GTK2=no    disable extra GTK+2 support
-           (default: enabled, GTK2=yes)
+You can use the following option to add gtk2 support:
+
+  GTK2=true  enable gtk2 support
+             (default: disabled, GTK2=false)
diff --git a/system/colord-gtk/colord-gtk.SlackBuild b/system/colord-gtk/colord-gtk.SlackBuild
index 62466d6055..3c15c24599 100644
--- a/system/colord-gtk/colord-gtk.SlackBuild
+++ b/system/colord-gtk/colord-gtk.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for colord-gtk
 
@@ -21,11 +21,23 @@
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#  2023-05-06, Modified by Bob Funk:
+#   - Updated to colord-gtk 0.3.0
+#   - This version's default is to build only gtk3 and gtk4
+#   - Added a toggle for enabling gtk2
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=colord-gtk
-VERSION=${VERSION:-0.1.26}
+VERSION=${VERSION:-0.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# The default build is gtk4 & gtk3 enabled, and gtk2 disabled.
+# Leave the default as-is, but give a way to switch gtk2 from build env:
+GTK2=${GTK2:-false}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +47,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,37 +85,29 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-GTK2OPT='--enable-gtk2'
-if [ "$GTK2" = 'no' ]; then
-  GTK2OPT=''
-fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-static \
-  --enable-vala \
-  $GTK2OPT \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dgtk2=${GTK2} \
+    -Dman=false
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ABOUT-NLS AUTHORS COPYING INSTALL MAINTAINERS NEWS README TODO \
+cp -a AUTHORS COPYING MAINTAINERS NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -107,4 +115,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/colord-gtk/colord-gtk.info b/system/colord-gtk/colord-gtk.info
index 2dd21f5aa3..f8ac73a57b 100644
--- a/system/colord-gtk/colord-gtk.info
+++ b/system/colord-gtk/colord-gtk.info
@@ -1,10 +1,10 @@
 PRGNAM="colord-gtk"
-VERSION="0.1.26"
+VERSION="0.3.0"
 HOMEPAGE="http://www.freedesktop.org/software/colord"
-DOWNLOAD="http://www.freedesktop.org/software/colord/releases/colord-gtk-0.1.26.tar.xz"
-MD5SUM="bb9d6f3c037152ad791003375aa6c16c"
+DOWNLOAD="http://www.freedesktop.org/software/colord/releases/colord-gtk-0.3.0.tar.xz"
+MD5SUM="08c245d6482b3923a2b6a09f7fbbe612"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="colord"
-MAINTAINER="David Spencer"
-EMAIL="baildon.research@googlemail.com"
+MAINTAINER="Bob Funk"
+EMAIL="bobfunk11@gmail.com"
diff --git a/system/colord/colord.SlackBuild b/system/colord/colord.SlackBuild
index 2ac2cabcf3..2fb974a299 100644
--- a/system/colord/colord.SlackBuild
+++ b/system/colord/colord.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for colord
 
-# Copyright 2015-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2015-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=colord
-VERSION=${VERSION:-1.3.5}
+VERSION=${VERSION:-1.4.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -48,7 +51,11 @@ elif ! getent passwd colord 2>/dev/null 1>/dev/null ; then
   bailout
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -68,16 +75,9 @@ else
 fi
 
 if [ "${BASH_COMPLETION:-no}" = "yes" ]; then
-  USE_BASH="--enable-bash-completion"
+  USE_BASH="true"
 else
-  USE_BASH="--disable-bash-completion"
-fi
-
-# Check if ARGYLL is set to yes
-if [ "${ARGYLL:-no}" = "yes" ]; then
-  argyll="--enable-argyllcms-sensor"
-else
-  argyll="--disable-argyllcms-sensor"
+  USE_BASH="false"
 fi
 
 set -e
@@ -95,39 +95,41 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-static \
-  --enable-gusb \
-  --enable-udev \
-  --enable-polkit \
-  --enable-sane \
-  --enable-libcolordcompat \
-  $argyll \
-  --enable-vala \
-  --disable-systemd-login \
-  --with-daemon-user=colord \
-  --build=$ARCH-slackware-linux \
-  $USE_BASH
-
-make
-make install DESTDIR=$PKG
+# Since polkit in current apply upstream git
+# we have to reduce the polkit version used to test
+# https://github.com/hughsie/colord/issues/36
+sed -i "s|0.114|0.113|" meson.build
+
+mkdir -p build
+cd build
+meson --prefix=/usr \
+      --buildtype=release \
+      --localstatedir=/var \
+      --libdir=lib${LIBDIRSUFFIX} \
+      --libexecdir=/usr/lib${LIBDIRSUFFIX}/colord \
+      --mandir=/usr/man \
+      -Dlibcolordcompat=true \
+      -Dsane=true \
+      -Dvapi=true \
+      -Dsystemd=false \
+      -Dargyllcms_sensor=false \
+      -Dprint_profiles=false \
+      -Dtests=false \
+      -Dbash_completion=${USE_BASH} \
+      -Ddaemon_user=colord \
+      -Dman=false \
+      ../
+"${NINJA:=ninja}"
+DESTDIR=$PKG $NINJA install
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mv $PKG/etc/dbus-1/system.d/org.freedesktop.ColorManager.conf \
-   $PKG/etc/dbus-1/system.d/org.freedesktop.ColorManager.conf.new
+# Fix paths
+sed -i "s|/lib|/lib${LIBDIRSUFFIX}|g" $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/colord.pc
+sed -i "s|/lib|/lib${LIBDIRSUFFIX}|g" $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/colorhug.pc
+mv $PKG/usr/share/dbus-1/system.d/org.freedesktop.ColorManager.conf $PKG/usr/share/dbus-1/system.d/org.freedesktop.ColorManager.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING* MAINTAINERS $PKG/usr/doc/$PRGNAM-$VERSION
@@ -143,4 +145,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/colord/colord.info b/system/colord/colord.info
index b792b9d795..60a44b807f 100644
--- a/system/colord/colord.info
+++ b/system/colord/colord.info
@@ -1,8 +1,8 @@
 PRGNAM="colord"
-VERSION="1.3.5"
+VERSION="1.4.7"
 HOMEPAGE="http://www.freedesktop.org/software/colord"
-DOWNLOAD="http://www.freedesktop.org/software/colord/releases/colord-1.3.5.tar.xz"
-MD5SUM="a8e7fcf0a45383ca7a65cef91ca5e019"
+DOWNLOAD="http://www.freedesktop.org/software/colord/releases/colord-1.4.7.tar.xz"
+MD5SUM="94bd795efa1931a34990345e4ac439a8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libgusb"
diff --git a/system/colord/doinst.sh b/system/colord/doinst.sh
index a679353395..3560c635b9 100644
--- a/system/colord/doinst.sh
+++ b/system/colord/doinst.sh
@@ -8,7 +8,7 @@ config() {
   fi
 }
 
-config etc/dbus-1/system.d/org.freedesktop.ColorManager.conf.new
+config usr/share/dbus-1/system.d/org.freedesktop.ColorManager.conf.new
 
 if [ -e usr/share/glib-2.0/schemas ]; then
   if [ -x /usr/bin/glib-compile-schemas ]; then
diff --git a/system/colorize/colorize.SlackBuild b/system/colorize/colorize.SlackBuild
index 0bb6b9d8b4..135ede7cb9 100644
--- a/system/colorize/colorize.SlackBuild
+++ b/system/colorize/colorize.SlackBuild
@@ -1,15 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for colorize
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=colorize
 VERSION=${VERSION:-0.65}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +22,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -63,4 +70,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/colorize/colorize.info b/system/colorize/colorize.info
index 2643a9c7fe..c8c274f4bb 100644
--- a/system/colorize/colorize.info
+++ b/system/colorize/colorize.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/colortail/README b/system/colortail/README
new file mode 100644
index 0000000000..bad0d89b28
--- /dev/null
+++ b/system/colortail/README
@@ -0,0 +1,12 @@
+Colortail
+
+Colortail works like tail but can optionally read one or more config
+files where it's specified which patterns results in which colors.
+
+Colortail uses regular expressions (see regex(7)) to determine which
+lines and parts of lines to print in which colors.
+
+If you experience issues with color working, add the following line to
+your .bashrc or /etc/profile
+
+alias colortail='colortail --config=/etc/colortail/default.conf'
diff --git a/system/colortail/colortail.SlackBuild b/system/colortail/colortail.SlackBuild
new file mode 100644
index 0000000000..3929f44c35
--- /dev/null
+++ b/system/colortail/colortail.SlackBuild
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+# Slackware build script for colortail
+
+# Copyright 2023 Dustin Metcalf - USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=colortail
+VERSION=${VERSION:-0.3.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+find $PKG -name perllocal.pod \
+  -o -name ".packlist" \
+  -o -name "*.bs" \
+  | xargs rm -f
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+mkdir -p $PKG/etc/colortail
+cp $TMP/$PRGNAM-$VERSION/example-conf/conf.messages $PKG/etc/colortail/colortail.conf.new
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/colortail/colortail.info b/system/colortail/colortail.info
new file mode 100644
index 0000000000..7f7b71fa28
--- /dev/null
+++ b/system/colortail/colortail.info
@@ -0,0 +1,10 @@
+PRGNAM="colortail"
+VERSION="0.3.3"
+HOMEPAGE="https://github.com/joakim666/colortail"
+DOWNLOAD="https://github.com/joakim666/colortail/releases/download/0.3.3/colortail-0.3.3.tar.gz"
+MD5SUM="a6fc24230c0a2c7cd0313cd3b73f4a64"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dustin Metcalf"
+EMAIL="metcalf.nerd+SBo@gmail.com"
diff --git a/system/colortail/doinst.sh b/system/colortail/doinst.sh
new file mode 100644
index 0000000000..ef506ed046
--- /dev/null
+++ b/system/colortail/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/colortail/colortail.conf.new
diff --git a/system/colortail/slack-desc b/system/colortail/slack-desc
new file mode 100644
index 0000000000..3f78600bc6
--- /dev/null
+++ b/system/colortail/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+colortail: colortail (tail files with color)
+colortail:
+colortail: Colortail works like tail but can optionally read one or more config
+colortail: files where it's specified which patterns results in which colors.
+colortail:
+colortail: Colortail uses regular expressions (see regex(7)) to determine which
+colortail: lines and parts of lines to print in which colors.
+colortail:
+colortail: Homepage: https://github.com/joakim666/colortail
+colortail:
+colortail:
diff --git a/system/commons-daemon/README b/system/commons-daemon/README
index 8f56da8299..6bafd36099 100644
--- a/system/commons-daemon/README
+++ b/system/commons-daemon/README
@@ -1,5 +1,6 @@
-The scope of this package is to define an API in line with the current Java(tm)
-Platform APIs to support an alternative invocation mechanism which could be
-used instead of the above mentioned public static void main(String[]) method.
-This specification cover the behavior and life cycle of what we define as
-Java(tm) daemons, or, in other words, non interactive Java(tm) applications.
+The scope of this package is to define an API in line with the current
+Java(tm) Platform APIs to support an alternative invocation mechanism
+which could be used instead of the above mentioned public static void
+main(String[]) method. This specification covers the behavior and life
+cycle of what we define as Java(tm) daemons, or, in other words, non
+interactive Java(tm) applications.
diff --git a/system/commons-daemon/commons-daemon.SlackBuild b/system/commons-daemon/commons-daemon.SlackBuild
index d580b02332..fa10a328af 100644
--- a/system/commons-daemon/commons-daemon.SlackBuild
+++ b/system/commons-daemon/commons-daemon.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for commons-daemon
 
-# Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2021 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,21 +11,24 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=commons-daemon
-VERSION=${VERSION:-1.0.15}
+VERSION=${VERSION:-1.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,9 +69,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-src
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
-cd $PRGNAM-$VERSION-src
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION-bin.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,15 +79,26 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-ant dist
-
-mkdir -p $PKG/usr/{share/java,bin}
+mkdir -p $PKG/usr/share/java
 
-cp dist/$PRGNAM-$VERSION.jar $PKG/usr/share/java/
+cp $PRGNAM-$VERSION.jar $PKG/usr/share/java/
 cd $PKG/usr/share/java
   ln -s $PRGNAM-$VERSION.jar $PRGNAM.jar
 cd -
 
+cd $TMP
+rm -rf $PRGNAM-$VERSION-src
+tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
+cd $PRGNAM-$VERSION-src
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/{bin,man/man1}
+
 cd src/native/unix/
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
@@ -88,24 +109,33 @@ cd src/native/unix/
     --localstatedir=/var \
     --mandir=/usr/man \
     --build=$ARCH-slackware-linux
+
   make clean
   make
+
   install -m 0755 jsvc $PKG/usr/bin/jsvc
-cd -
+
+  cd man
+    docbook2x-man jsvc.1.xml
+    install -m 644 JSVC.1 $PKG/usr/man/man1/jsvc.1
+  cd ..
+cd ../../../
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/jsvc
-cd dist
-  cp -a docs/api LICENSE.txt NOTICE.txt RELEASE-NOTES.txt \
-    $PKG/usr/doc/$PRGNAM-$VERSION
-cd -
+cp -a src/docs LICENSE.txt NOTICE.txt RELEASE-NOTES.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cd src/native/unix/
-  cp -a CHANGES.txt INSTALL.txt $PKG/usr/doc/$PRGNAM-$VERSION/jsvc
+  cp -a INSTALL.txt $PKG/usr/doc/$PRGNAM-$VERSION/jsvc
 cd -
-cp -a src/docs $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/commons-daemon/commons-daemon.info b/system/commons-daemon/commons-daemon.info
index 4e8e6342c2..9e7fa8c5f7 100644
--- a/system/commons-daemon/commons-daemon.info
+++ b/system/commons-daemon/commons-daemon.info
@@ -1,10 +1,12 @@
 PRGNAM="commons-daemon"
-VERSION="1.0.15"
+VERSION="1.2.4"
 HOMEPAGE="http://commons.apache.org/daemon/index.html"
-DOWNLOAD="http://archive.apache.org/dist/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz"
-MD5SUM="e467bc1f332d47ad85d18ea8b8a897c3"
+DOWNLOAD="https://archive.apache.org/dist/commons/daemon/binaries/commons-daemon-1.2.4-bin.tar.gz \
+          https://archive.apache.org/dist/commons/daemon/source/commons-daemon-1.2.4-src.tar.gz"
+MD5SUM="01a2e531c9ecbc545492308c911aa570 \
+        928f6243a50f01f6b9dafcac585889ee"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="apache-ant jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+EMAIL="pprkut@slackbuilds.org"
diff --git a/system/compsize/compsize.SlackBuild b/system/compsize/compsize.SlackBuild
index 23cffad710..ffc0007ad8 100644
--- a/system/compsize/compsize.SlackBuild
+++ b/system/compsize/compsize.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for <compsize>
 #
 # Michales (clavisound) Michaloudes korgie@gmail.com <2017>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=compsize
-VERSION=${VERSION:-1.3}
+VERSION=${VERSION:-1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -16,7 +19,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -73,4 +83,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/compsize/compsize.info b/system/compsize/compsize.info
index be5d2e9ec1..ef7c7a2af2 100644
--- a/system/compsize/compsize.info
+++ b/system/compsize/compsize.info
@@ -1,8 +1,8 @@
 PRGNAM="compsize"
-VERSION="1.3"
+VERSION="1.5"
 HOMEPAGE="https://github.com/kilobyte/compsize"
-DOWNLOAD="https://github.com/kilobyte/compsize/archive/v1.3/compsize-1.3.tar.gz"
-MD5SUM="b16df5254e81160c5e7651f3e9da101a"
+DOWNLOAD="https://github.com/kilobyte/compsize/archive/v1.5/compsize-1.5.tar.gz"
+MD5SUM="41ded6559cd7d1750e5cf967bf2eae08"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/conky/README b/system/conky/README
index b7b4733768..67b2345e30 100644
--- a/system/conky/README
+++ b/system/conky/README
@@ -5,25 +5,14 @@ your root desktop or in its own window.  Conky has many built-in
 objects, as well as the ability to execute programs and scripts, then
 display the output from stdout.
 
-Starting with the 1.10.x branch of conky the conkyrc config files now
-use a lua based syntax.  This means that older conkyrc config files
-may not work.  Conky does attempt to convert older config scripts
-on the fly but if it doesn't work you can convert your config file
-with the convert.lua script that is provided in the /usr/doc
-directory.  It is not guaranteed to work but it should give you a
-good starting point to edit the converted script to make it work.
-If you can't get your script to work then you can install the
-1.9.0 version of conky that is provided here at SBo in the 14.1
-branch.
-
 Audacious is disabled by default because it requires libaudclient.
 libaudclient is available here at SBo.  You can enable audacious
-support the build by passing AUDACIOUS=yes ./conky.SlackBuild.
+support in the build by passing AUDACIOUS=yes ./conky.SlackBuild.
 
 If you are using the binary Nvidia drivers, conky has native support
-for monitoring your video cards hardware.  To enable this feature
+for monitoring your video cards hardware.  To enable this feature,
 you must install the binary drivers using the nvidia_kernel and
 nvidia_driver packages available here at SBo, or you can use the
 binary run installer provided by Nvidia. Once the driver is
-installed you must also install libxnvctrl, also available here
-at SBo.  Then pass NVIDIA=yes to the build script.
+installed, you must install libxnvctrl, also available at SBo.
+Then pass NVIDIA=yes to the build script.
diff --git a/system/conky/conky.1.gz b/system/conky/conky.1.gz
new file mode 100644
index 0000000000..3a0195da0d
--- /dev/null
+++ b/system/conky/conky.1.gz
diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild
index c3f4948c36..aadf569f1d 100644
--- a/system/conky/conky.SlackBuild
+++ b/system/conky/conky.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for conky
 
-# Copyright 2016 Matt Dinslage (daedra1980@gmail.com), Springfield, MO, USA
+# Copyright 2021 Matt Dinslage (daedra1980@gmail.com), Springfield, MO, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=conky
-VERSION=${VERSION:-1.10.8}
+VERSION=${VERSION:-1.20.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -83,12 +90,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# fix MANDIR
-sed -i 's,share/man/man1,man/man1,g' CMakeLists.txt
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p build
 cd build
@@ -98,42 +102,60 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DDOC_PATH=/usr/doc/$PRGNAM-$VERSION \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DMAINTAINER_MODE=ON \
+    -DMAINTAINER_MODE=OFF \
+    -DBUILD_DOCS=OFF \
+    -DBUILD_EXTRAS=ON \
     -DBUILD_XDBE=ON \
     -DBUILD_AUDACIOUS=$audacious \
     -DBUILD_NVIDIA=$nvidia \
     -DBUILD_CURL=ON \
     -DBUILD_WLAN=ON \
     -DBUILD_RSS=ON \
-    -DBUILD_WEATHER_METAR=ON \
-    -DBUILD_WEATHER_XOAP=ON \
+    -DBUILD_PULSEAUDIO=ON \
     -DBUILD_MPD=ON \
     -DBUILD_IMLIB2=ON \
     -DBUILD_LUA_CAIRO=ON \
     -DBUILD_LUA_IMLIB2=ON \
+    -DBUILD_WAYLAND=ON \
+    -DBUILD_MOUSE_EVENTS=ON \
     -DCMAKE_BUILD_TYPE=Release ..
 
-  make VERBOSE=1
+  make
   make install DESTDIR=$PKG
 cd ..
 
+# Don't ship .a files:
+find $PKG -type f -iname '*.a' -exec rm -rf {} \+
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# Conky now requires pandoc to generate the man pages.  
+# No need to add that dependency, we will use the
+# man page provided by the conky team.
+mkdir -p $PKG/usr/man/man1
+cp $CWD/conky.1.gz $PKG/usr/man/man1
 
 # Copy existing config files
 mkdir -p $PKG/etc/conky
 cp data/conky.conf $PKG/etc/conky/conky.conf.new
 cp data/conky_no_x11.conf $PKG/etc/conky/conky_no_x11.conf.new
 
+# Vim and Nano syntax highlighting files
+mkdir -p $PKG/usr/share/nano
+mkdir -p $PKG/usr/share/vim/vimfiles/{syntax,ftdetect}
+cp build/extras/vim/syntax/conkyrc.vim $PKG/usr/share/vim/vimfiles/syntax
+cp extras/vim/ftdetect/conkyrc.vim $PKG/usr/share/vim/vimfiles/ftdetect
+cp build/extras/nano/conky.nanorc $PKG/usr/share/nano/conky.nanorc
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog LICENSE.BSD README.md NEWS TODO \
+cp -a AUTHORS COPYING LICENSE.BSD README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# include copy of convert.lua script for old configs.
+cat extras/convert.lua > $PKG/usr/doc/$PRGNAM-$VERSION/convert.lua
+
 # Remove duplicate config files out of the docdir.
 rm -r $PKG/usr/doc/$PRGNAM-$VERSION/*.conf
 
@@ -142,4 +164,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/conky/conky.info b/system/conky/conky.info
index bbe1f2767b..30fd153122 100644
--- a/system/conky/conky.info
+++ b/system/conky/conky.info
@@ -1,10 +1,10 @@
 PRGNAM="conky"
-VERSION="1.10.8"
-HOMEPAGE="http://conky.sourceforge.net"
-DOWNLOAD="https://github.com/brndnmtthws/conky/archive/v1.10.8/conky-1.10.8.tar.gz"
-MD5SUM="b02bc92e4b02d4f18259ab3a26c8c5ba"
+VERSION="1.20.1"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+DOWNLOAD="https://github.com/brndnmtthws/conky/archive/v1.20.1/conky-1.20.1.tar.gz"
+MD5SUM="6abe61ff017c872487f6b7a184ad68c9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="tolua++ imlib2"
+REQUIRES="lua53 imlib2"
 MAINTAINER="M.Dinslage"
-EMAIL="daedra1980@gmail.com"
+EMAIL="matthewdinslage@gmail.com"
diff --git a/system/conky/doinst.sh b/system/conky/doinst.sh
index ffd3d4ab11..8945a41fc0 100644
--- a/system/conky/doinst.sh
+++ b/system/conky/doinst.sh
@@ -1,14 +1,21 @@
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
   elif [ "$(cat $OLD|md5sum)" = "$(cat $NEW|md5sum)" ]; then
-    # toss the redundant copy
     rm $NEW
   fi
-  # Otherwise, we leave the .new copy for the admin to consider...
 }
 config etc/conky/conky.conf.new
 config etc/conky/conky_no_x11.conf.new
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/conky/slack-desc b/system/conky/slack-desc
index ae5b923539..940546faea 100644
--- a/system/conky/slack-desc
+++ b/system/conky/slack-desc
@@ -15,5 +15,5 @@ conky: your root desktop or in its own window.  Conky has many built-in
 conky: objects, as well as the ability to execute programs and scripts, then
 conky: display the output from stdout.
 conky:
-conky: Homepage: http://conky.sourceforge.net
+conky: Homepage: https://github.com/brndnmtthws/conky
 conky:
diff --git a/system/conmon/README b/system/conmon/README
index 8c1e2691b9..8aec03abe1 100644
--- a/system/conmon/README
+++ b/system/conmon/README
@@ -1,24 +1,25 @@
 An OCI container runtime monitor.
 
-Conmon is a monitoring program and communication tool between a container
-manager (like podman or CRI-O) and an OCI runtime (like runc or crun) for a
-single container.
+Conmon is a monitoring program and communication tool between a
+container manager (like podman or CRI-O) and an OCI runtime (like runc
+or crun) for a single container.
 
-Upon being launched, it double-forks to daemonize and detach from the parent
-that launched it. It then launches the runtime as its child. This allows
-managing processes to die in the foreground, but still be able to watch over
-and connect to the child process (the container).
+Upon being launched, it double-forks to daemonize and detach from
+the parent that launched it. It then launches the runtime as its
+child. This allows managing processes to die in the foreground, but
+still be able to watch over and connect to the child process (the
+container).
 
 While the container runs, conmon does two things:
 
-    Provides a socket for attaching to the container, holding open the
-    container's standard streams and forwarding them over the socket.  Writes
-    the contents of the container's streams to a log file (or to the systemd
-    journal) so they can be read after the container's death.
+- Provides a socket for attaching to the container, holding open the
+  container's standard streams and forwarding them over the socket.
+- Writes the contents of the container's streams to a log file (or to
+  the systemd journal) so they can be read after the container's death.
 
-Finally, upon the containers death, conmon will record its exit time and code
-to be read by the managing programs.
+Finally, upon the containers death, conmon will record its exit time
+and code to be read by the managing programs.
 
-Written in C and designed to have a low memory footprint, conmon is intended
-to be run by a container managing library. Essentially, conmon is the smallest
-daemon a container can have.
+Written in C and designed to have a low memory footprint, conmon
+is intended to be run by a container managing library. Essentially,
+conmon is the smallest daemon a container can have.
diff --git a/system/conmon/conmon.SlackBuild b/system/conmon/conmon.SlackBuild
index cca924bf78..56ebfc1fbd 100644
--- a/system/conmon/conmon.SlackBuild
+++ b/system/conmon/conmon.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for conmon
 
@@ -23,12 +23,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=conmon
 REPONAME=conmon
-VERSION=${VERSION:-2.0.1}
-GIT_COMMIT="4dc8bcfec41e10ca760c8e2089474c2843dfd066"
+VERSION=${VERSION:-2.1.8}
+GIT_COMMIT="00e08f4a9ca5420de733bf542b930ad58e1a7e7d"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 # The domain part of the go package name, usually the hosting platform
 DOMAIN=github.com
@@ -43,7 +46,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -95,4 +102,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/conmon/conmon.info b/system/conmon/conmon.info
index c17ea64eed..6e35c530c9 100644
--- a/system/conmon/conmon.info
+++ b/system/conmon/conmon.info
@@ -1,8 +1,8 @@
 PRGNAM="conmon"
-VERSION="2.0.1"
+VERSION="2.1.8"
 HOMEPAGE="https://github.com/containers/conmon"
-DOWNLOAD="https://github.com/containers/conmon/archive/v2.0.1/conmon-2.0.1.tar.gz"
-MD5SUM="72eea27a2ac98ec35611dd91ee786c70"
+DOWNLOAD="https://github.com/containers/conmon/archive/v2.1.8/conmon-2.1.8.tar.gz"
+MD5SUM="753a2d554c6b5c55c93f069a20d9ebf9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/consolation/consolation.SlackBuild b/system/consolation/consolation.SlackBuild
index 4ed2efbde9..eb57994b74 100644
--- a/system/consolation/consolation.SlackBuild
+++ b/system/consolation/consolation.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for consolation
 
-# Copyright 2020  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2020,2021  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=consolation
-VERSION=${VERSION:-0.0.7}
+VERSION=${VERSION:-0.0.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -99,4 +109,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/consolation/consolation.info b/system/consolation/consolation.info
index dfa9635b08..47a63b5580 100644
--- a/system/consolation/consolation.info
+++ b/system/consolation/consolation.info
@@ -1,10 +1,10 @@
 PRGNAM="consolation"
-VERSION="0.0.7"
+VERSION="0.0.8"
 HOMEPAGE="https://salsa.debian.org/consolation-team/consolation/"
-DOWNLOAD="http://deb.debian.org/debian/pool/main/c/consolation/consolation_0.0.7.orig.tar.xz"
-MD5SUM="5ac2520190ec74ec9170b7a3395b264f"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/c/consolation/consolation_0.0.8.orig.tar.xz"
+MD5SUM="717a794c9a330b3eeb1589ea46cd89aa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libinput"
+REQUIRES=""
 MAINTAINER="Robby Workman"
 EMAIL="rworkman@slackbuilds.org"
diff --git a/system/conspy/conspy.SlackBuild b/system/conspy/conspy.SlackBuild
index ed1bb1afbc..ab29bf2cfa 100644
--- a/system/conspy/conspy.SlackBuild
+++ b/system/conspy/conspy.SlackBuild
@@ -1,15 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for conspy
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=conspy
 VERSION=${VERSION:-1.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +22,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -74,4 +81,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/conspy/conspy.info b/system/conspy/conspy.info
index 139f0ecb86..dc467ac8bf 100644
--- a/system/conspy/conspy.info
+++ b/system/conspy/conspy.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/containerd/README b/system/containerd/README
index a67e40b450..3d098dc732 100644
--- a/system/containerd/README
+++ b/system/containerd/README
@@ -1,4 +1,8 @@
 Containerd is a daemon to control runC, built for performance and
-density.  Containerd leverages runC's advanced features such as seccomp
-and user namespace support as well as checkpoint and restore for cloning
-and live migration of containers.
+density. Containerd leverages runC's advanced features such as seccomp
+and user namespace support as well as checkpoint and restore for
+cloning and live migration of containers.
+
+Warning: This SlackBuild requires network access when it runs, meaning
+it downloads files from the Internet with root access. You should
+decide for yourself whether or not you think this is a good idea.
diff --git a/system/containerd/containerd.SlackBuild b/system/containerd/containerd.SlackBuild
index 934a17ad35..71d63374d3 100644
--- a/system/containerd/containerd.SlackBuild
+++ b/system/containerd/containerd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for containerd
 
@@ -23,11 +23,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=containerd
-VERSION=${VERSION:-1.4.3}
-GITHASH=${GITHASH:-269548fa27e0089a8b8278fc4fc781d7f65a939b}
+VERSION=${VERSION:-1.7.14}
+GITHASH=${GITHASH:-dcf2847247e18caba8dce86522029642f60fe96b}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,11 +74,12 @@ mkdir build
 mv vendor build/src
 ln -sf $TMP/$PRGNAM-$VERSION build/src/github.com/containerd/containerd
 
+GO111MODULE=auto \
 make \
   BUILDTAGS="seccomp" \
   GIT_COMMIT=$GITHASH \
   GOPATH=$TMP/$PRGNAM-$VERSION/build
-make install DESTDIR=$PKG/usr
+make install DESTDIR=$PKG PREFIX=/usr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README.md LICENSE NOTICE $PKG/usr/doc/$PRGNAM-$VERSION
@@ -81,4 +89,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/containerd/containerd.info b/system/containerd/containerd.info
index 4d93b7af95..218890f33f 100644
--- a/system/containerd/containerd.info
+++ b/system/containerd/containerd.info
@@ -1,10 +1,10 @@
 PRGNAM="containerd"
-VERSION="1.4.3"
+VERSION="1.7.14"
 HOMEPAGE="https://containerd.io/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/containerd/containerd/archive/v1.4.3/containerd-1.4.3.tar.gz"
-MD5SUM_x86_64="8b0201fa609d511ad01fd52d5b544fe7"
+DOWNLOAD_x86_64="https://github.com/containerd/containerd/archive/v1.7.14/containerd-1.7.14.tar.gz"
+MD5SUM_x86_64="6aac366573fcfbb9e85ed135feab2204"
 REQUIRES="runc"
 MAINTAINER="Audrius Kažukauskas"
 EMAIL="audrius@neutrino.lt"
diff --git a/system/convmv/convmv.SlackBuild b/system/convmv/convmv.SlackBuild
index 7c56bc04eb..06f71f1dbf 100644
--- a/system/convmv/convmv.SlackBuild
+++ b/system/convmv/convmv.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for convmv
 # Written by Oleg O. Chukaev <oleg.chukaev@mail.ru>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=convmv
 VERSION=${VERSION:-1.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -16,7 +19,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,4 +57,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cool-retro-term/cool-retro-term.SlackBuild b/system/cool-retro-term/cool-retro-term.SlackBuild
index 97e7b8b515..b1b9068e9e 100644
--- a/system/cool-retro-term/cool-retro-term.SlackBuild
+++ b/system/cool-retro-term/cool-retro-term.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cool-retro-term
 
-# Copyright 2015-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2015-2022 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cool-retro-term
-VERSION=${VERSION:-1.1.1}
+VERSION=${VERSION:-1.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -89,4 +99,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cool-retro-term/cool-retro-term.info b/system/cool-retro-term/cool-retro-term.info
index 235d580e1f..9c624a6035 100644
--- a/system/cool-retro-term/cool-retro-term.info
+++ b/system/cool-retro-term/cool-retro-term.info
@@ -1,8 +1,8 @@
 PRGNAM="cool-retro-term"
-VERSION="1.1.1"
+VERSION="1.2.0"
 HOMEPAGE="https://github.com/Swordfish90/cool-retro-term"
-DOWNLOAD="https://github.com/Swordfish90/cool-retro-term/archive/1.1.1/cool-retro-term-1.1.1.tar.gz"
-MD5SUM="0450dd6b50907168aba63a64bb0fef16"
+DOWNLOAD="https://github.com/Swordfish90/cool-retro-term/archive/1.2.0/cool-retro-term-1.2.0.tar.gz"
+MD5SUM="3e8019a01c619bfd09014bad62bbe432"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qmltermwidget"
diff --git a/system/coolkey/README b/system/coolkey/README
index fb523d92e1..eea068ebec 100644
--- a/system/coolkey/README
+++ b/system/coolkey/README
@@ -1,7 +1,10 @@
 coolkey is a pkcs#11 smartcard library that can be used with a US
 Government CAC (Common Access Card), in conjunction with pcsc-lite.
-It is most commonly used by pkcs#11 aware web browsers or email clients, to
-use a CAC's client certificate for authentication or signing.
+It is most commonly used by pkcs#11 aware web browsers or email
+clients, to use a CAC's client certificate for authentication or
+signing.
 
 coolkey is commonly used with the DoD Configuration plugin for Firefox
-and Thunderbird, at https://addons.mozilla.org/en-US/thunderbird/addon/3182.
+and Thunderbird, at:
+
+https://addons.mozilla.org/en-US/thunderbird/addon/3182.
diff --git a/system/coolkey/coolkey.SlackBuild b/system/coolkey/coolkey.SlackBuild
index ff872a5af5..484ad11818 100644
--- a/system/coolkey/coolkey.SlackBuild
+++ b/system/coolkey/coolkey.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for coolkey
 
@@ -22,26 +22,36 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=coolkey
 VERSION=${VERSION:-1.1.0}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -110,4 +120,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/corectrl/README b/system/corectrl/README
new file mode 100644
index 0000000000..d1f955a7d0
--- /dev/null
+++ b/system/corectrl/README
@@ -0,0 +1,11 @@
+corectrl (Core control application)
+
+CoreCtrl is a Free and Open Source GNU/Linux application that 
+allows you to control with ease your computer hardware using
+application profiles.
+ 
+It aims to be flexible, comfortable, and accessible to regular 
+users.
+ 
+Homepage: https://gitlab.com/corectrl/corectrl/
+
diff --git a/system/corectrl/README.SBo b/system/corectrl/README.SBo
new file mode 100644
index 0000000000..c0ca22f31b
--- /dev/null
+++ b/system/corectrl/README.SBo
@@ -0,0 +1,35 @@
+Launch CoreCtrl on session startup
+
+Execute this command on a terminal:
+
+cp /usr/share/applications/org.corectrl.corectrl.desktop ~/.config/autostart/org.corectrl.corectrl.desktop
+
+Don't ask for user password
+
+CoreCtrl uses a helper with root privileges to control your system. In order to start the helper, the system will ask you to enter your user password. If you want to avoid being asked every time for your password, you can grant root access to the helper permanently.
+
+Create the file /etc/polkit-1/rules.d/90-corectrl.rules with the following contents:
+
+polkit.addRule(function(action, subject) {
+    if ((action.id == "org.corectrl.helper.init" ||
+         action.id == "org.corectrl.helperkiller.init") &&
+        subject.local == true &&
+        subject.active == true &&
+        subject.isInGroup("your-user-group")) {
+            return polkit.Result.YES;
+    }
+});
+Replace your-user-group with your user group name.
+
+Full AMD GPU controls
+
+Currently, to have full control of your AMD GPU while using the amdgpu driver, you need to append the boot parameter amdgpu.ppfeaturemask=0xffffffff to your bootloader configuration and reboot.
+NOTE: The following instructions are for guidance only. Check your distribution documentation on how to add a boot parameter before proceed.
+If your system uses Grub, edit the file (as root) /etc/default/grub and append the parameter to GRUB_CMDLINE_LINUX_DEFAULT:
+
+GRUB_CMDLINE_LINUX_DEFAULT="<other_params>... amdgpu.ppfeaturemask=0xffffffff"
+Then regenerate (as root) the bootloader configuration file with the command:
+
+grub-mkconfig -o /boot/grub/grub.cfg
+Reboot your system.
+You should have more controls when you select Advanced as Performance mode.
diff --git a/system/corectrl/corectrl.SlackBuild b/system/corectrl/corectrl.SlackBuild
new file mode 100644
index 0000000000..e2c2e5fb96
--- /dev/null
+++ b/system/corectrl/corectrl.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/bash
+
+# Slackware build script for corectrl
+
+# Copyright 2022 Matthew A. Miller Salina,Kansas,USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=corectrl
+VERSION=${VERSION:-v1.4.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Patch resources/launcher.desktop so that the program shows up in only
+# one category, e.g. System:
+patch -p1 < $CWD/corectrl.patch
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_FULL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTING=OFF ..
+
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/corectrl/corectrl.info b/system/corectrl/corectrl.info
new file mode 100644
index 0000000000..1df92bae08
--- /dev/null
+++ b/system/corectrl/corectrl.info
@@ -0,0 +1,10 @@
+PRGNAM="corectrl"
+VERSION="v1.4.0"
+HOMEPAGE="https://gitlab.com/corectrl/corectrl/"
+DOWNLOAD="https://gitlab.com/corectrl/corectrl/-/archive/v1.4.0/corectrl-v1.4.0.tar.gz"
+MD5SUM="b5f9571d64905a7594c54b9a419fe139"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="Botan pugixml spdlog"
+MAINTAINER="Matthew Miller"
+EMAIL="mattallmill@gmail.com"
diff --git a/system/corectrl/corectrl.patch b/system/corectrl/corectrl.patch
new file mode 100644
index 0000000000..bd92a1e54f
--- /dev/null
+++ b/system/corectrl/corectrl.patch
@@ -0,0 +1,11 @@
+--- corectrl-v1.3.0/resources/launcher.desktop	2022-09-18 12:56:52.000000000 -0500
++++ corectrl-v1.3.0/resources/launcher.desktop.new	2022-10-04 15:05:55.822235127 -0500
+@@ -8,7 +8,7 @@
+ StartupWMClass=corectrl
+ Terminal=false
+ Type=Application
+-Categories=System;Settings;Utility;
++Categories=System;
+ Keywords=core;control;system;hardware;
+ 
+ # Translations
diff --git a/system/corectrl/doinst.sh b/system/corectrl/doinst.sh
new file mode 100644
index 0000000000..625ced33d1
--- /dev/null
+++ b/system/corectrl/doinst.sh
@@ -0,0 +1,9 @@
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/system/corectrl/slack-desc b/system/corectrl/slack-desc
new file mode 100644
index 0000000000..57ba8c3512
--- /dev/null
+++ b/system/corectrl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+corectrl: corectrl (Core control application)
+corectrl:
+corectrl: CoreCtrl is a Free and Open Source GNU/Linux application that 
+corectrl: allows you to control with ease your computer hardware using
+corectrl: application profiles.
+corectrl:
+corectrl: It aims to be flexible, comfortable, and accessible to regular 
+corectrl: users.
+corectrl:
+corectrl: Homepage: https://gitlab.com/corectrl/corectrl/
+corectrl:
diff --git a/system/corosync/README b/system/corosync/README
index 7e3ff12c26..56f63b133f 100644
--- a/system/corosync/README
+++ b/system/corosync/README
@@ -1,7 +1,8 @@
 corosync (Cluster Engine)
 
-The Corosync Cluster Engine is a Group Communication System with additional
-features for implementing high availability within applications.
+The Corosync Cluster Engine is a Group Communication System with
+additional features for implementing high availability within
+applications.
 
-You might also want to install corosync, pacemaker, resource-agents, crmsh,
-fence-agents and eventually cluster-glue.
+You might also want to install corosync, pacemaker, resource-agents,
+crmsh, fence-agents and eventually cluster-glue.
diff --git a/system/corosync/corosync.SlackBuild b/system/corosync/corosync.SlackBuild
index bd5d435b25..3dd6de2c13 100644
--- a/system/corosync/corosync.SlackBuild
+++ b/system/corosync/corosync.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for corosync
 
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=corosync
 VERSION=${VERSION:-2.4.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -96,8 +106,10 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/courier-prime/courier-prime.SlackBuild b/system/courier-prime/courier-prime.SlackBuild
index cdb90b3ab0..64f21a3c08 100644
--- a/system/courier-prime/courier-prime.SlackBuild
+++ b/system/courier-prime/courier-prime.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for Courier Prime
 # Copyright 2015 klaatu@member.fsf.org
 #
@@ -8,14 +8,24 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - use correct doc dir (/usr/doc/$PRGNAM-$VERSION)
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=courier-prime
 VERSION=${VERSION:-03142015}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -29,8 +39,9 @@ rm -rvf $PRGNAM
 rm -rvf $TMP/`echo $PRGNAM | cut -f1 -d'-'`-{prime,sans,source}
 
 # grab one copy of OFL info
-mkdir -p $PKG/usr/doc/$PRGNAM
-unzip -vjo $CWD/$PRGNAM.zip "Courier Prime/LICENSE/*" -d $PKG/usr/doc/$PRGNAM || exit 1
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+unzip -vjo $CWD/$PRGNAM.zip "Courier Prime/LICENSE/*" -d $PKGDOC
 
 # install the fonts
 mkdir -p $PKG/usr/share/fonts/TTF
@@ -43,20 +54,20 @@ cd $PKG
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # grab the docs, such as they are
-unzip -vjp $CWD/$PRGNAM.zip "Courier Prime/Read*txt" > $PKG/usr/doc/$PRGNAM/readme-prime.txt || exit 1
-unzip -vjp $CWD/courier-sans.zip "Courier*/README.md" > $PKG/usr/doc/$PRGNAM/readme-sans.md || exit 1
-unzip -vjp $CWD/courier-source.zip "Courier*/README.md" > $PKG/usr/doc/$PRGNAM/readme-source.md || exit 1
+unzip -vjp $CWD/$PRGNAM.zip "Courier Prime/Read*txt" > $PKGDOC/readme-prime.txt
+unzip -vjp $CWD/courier-sans.zip "Courier*/README.md" > $PKGDOC/readme-sans.md
+unzip -vjp $CWD/courier-source.zip "Courier*/README.md" > $PKGDOC/readme-source.md
 
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM/$PRGNAM.SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/courier-prime/courier-prime.info b/system/courier-prime/courier-prime.info
index 3771b42c38..4cc19b1a7c 100644
--- a/system/courier-prime/courier-prime.info
+++ b/system/courier-prime/courier-prime.info
@@ -1,12 +1,12 @@
 PRGNAM="courier-prime"
 VERSION="03142015"
 HOMEPAGE="https://quoteunquoteapps.com/courierprime/"
-DOWNLOAD="https://quoteunquoteapps.com/downloads/courier-prime.zip \
-          https://quoteunquoteapps.com/downloads/courier-sans.zip \
-          https://quoteunquoteapps.com/downloads/courier-source.zip"
+DOWNLOAD="https://slackware.uk/~urchlay/src/courier-prime.zip \
+          https://slackware.uk/~urchlay/src/courier-sans.zip \
+          https://slackware.uk/~urchlay/src/courier-source.zip"
 MD5SUM="cf79336ce1cf439560a5364ab7856738 \
-865df64ca03a2b3b596dd61d943cb9bf \
-7df1a6a7bfe16220c76a2ce395d7a9ab"
+        865df64ca03a2b3b596dd61d943cb9bf \
+        7df1a6a7bfe16220c76a2ce395d7a9ab"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/courier-screenplay/courier-screenplay.SlackBuild b/system/courier-screenplay/courier-screenplay.SlackBuild
index ab5bc4d6d7..100778edb8 100644
--- a/system/courier-screenplay/courier-screenplay.SlackBuild
+++ b/system/courier-screenplay/courier-screenplay.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for courier-screenplay
 
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=courier-screenplay
 VERSION=${VERSION:-1.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -70,4 +80,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/courier-screenplay/courier-screenplay.info b/system/courier-screenplay/courier-screenplay.info
index f1e53aee13..37095d573a 100644
--- a/system/courier-screenplay/courier-screenplay.info
+++ b/system/courier-screenplay/courier-screenplay.info
@@ -2,7 +2,7 @@ PRGNAM="courier-screenplay"
 VERSION="1.0"
 HOMEPAGE="https://www.fadeinpro.com/page.pl?content=download#fonts"
 DOWNLOAD="https://www.fadeinpro.com/download/fonts/CourierScreenplay.zip"
-MD5SUM="1020c92c9cf69049447c070ffa15beb0"
+MD5SUM="0cc0252c07c2273d0e41f529b02acdd2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/cpmtools/cpmtools.SlackBuild b/system/cpmtools/cpmtools.SlackBuild
index 0a34b57dd3..6dc888f8fe 100644
--- a/system/cpmtools/cpmtools.SlackBuild
+++ b/system/cpmtools/cpmtools.SlackBuild
@@ -1,20 +1,25 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cpmtools
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230819 bkw: updated for v2.24.
+# 20221227 bkw: updated for v2.23.
 # 20201102 bkw:
 # - Updated for v2.21. Can't build older versions, sorry.
 # - Switch to freebsd distfile source, as upstream vanishes the old
 #   source immediately upon a new release.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cpmtools
-VERSION=${VERSION:-2.21}
+VERSION=${VERSION:-2.24}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -24,7 +29,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -80,4 +89,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cpmtools/cpmtools.info b/system/cpmtools/cpmtools.info
index 8777c5480b..16ff90ec17 100644
--- a/system/cpmtools/cpmtools.info
+++ b/system/cpmtools/cpmtools.info
@@ -1,10 +1,10 @@
 PRGNAM="cpmtools"
-VERSION="2.21"
+VERSION="2.24"
 HOMEPAGE="http://www.moria.de/~michael/cpmtools/"
-DOWNLOAD="http://distcache.freebsd.org/ports-distfiles/cpmtools-2.21.tar.gz"
-MD5SUM="b250cbcc09a0ca6fbdf850653f5f3e1f"
+DOWNLOAD="http://distcache.freebsd.org/ports-distfiles/cpmtools-2.24.tar.gz"
+MD5SUM="98dfb2f3e3246c6ddba63674b1e1af83"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/cpu-g/cpu-g b/system/cpu-g/cpu-g
index ed42e19513..58eefa6846 100644
--- a/system/cpu-g/cpu-g
+++ b/system/cpu-g/cpu-g
@@ -1,3 +1,3 @@
 #!/bin/sh
 cd /usr/share/cpu-g
-python2 cpu-g
\ No newline at end of file
+exec python2 cpu-g
diff --git a/system/cpu-g/cpu-g.SlackBuild b/system/cpu-g/cpu-g.SlackBuild
index 28a4a40570..d065f4cc77 100644
--- a/system/cpu-g/cpu-g.SlackBuild
+++ b/system/cpu-g/cpu-g.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cpu-g
 # Written by Eric Fernandes Ferreira <candelabrus@gmail.com>
@@ -24,13 +24,24 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix permissions: binary wasn't executable (!), .desktop was (?).
+# - remove deprecated Encoding from .desktop.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cpu-g
 VERSION=${VERSION:-0.9.0}
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -46,24 +57,22 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p  $PKG/usr/{bin,share/applications}
 mkdir -p $PKG/usr/share/$PRGNAM/data/logos
 
-cp $CWD/cpu-g $PKG/usr/bin
+install -m0755 $CWD/cpu-g $PKG/usr/bin
 cp $TMP/$PRGNAM-$VERSION/{COPYING,README,cpu-g.glade,cpu-g} $PKG/usr/share/$PRGNAM/
 cp $TMP/$PRGNAM-$VERSION/data/cpu-g.png $PKG/usr/share/$PRGNAM/data
 cp $TMP/$PRGNAM-$VERSION/data/logos/* $PKG/usr/share/$PRGNAM/data/logos
 
-sed -i "s_^Icon=cpu-g\$_Icon=/usr/share/$PRGNAM/data/cpu-g.png_" "$TMP/$PRGNAM-$VERSION/data/cpu-g.desktop"
-cp $TMP/$PRGNAM-$VERSION/data/cpu-g.desktop $PKG/usr/share/applications/
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+sed -i -e "s_^Icon=cpu-g\$_Icon=/usr/share/$PRGNAM/data/cpu-g.png_" \
+       -e '/^Encoding/d' \
+       "$TMP/$PRGNAM-$VERSION/data/cpu-g.desktop"
+install -m0644 $TMP/$PRGNAM-$VERSION/data/cpu-g.desktop $PKG/usr/share/applications/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/$PRGNAM/{COPYING,README} $PKG/usr/doc/$PRGNAM-$VERSION
@@ -74,4 +83,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cpuid/cpuid.SlackBuild b/system/cpuid/cpuid.SlackBuild
index bfef6337b9..0ed3705c53 100644
--- a/system/cpuid/cpuid.SlackBuild
+++ b/system/cpuid/cpuid.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cpuid
 
@@ -22,26 +22,37 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220211 bkw: Modified by SlackBuilds.org: updated to v20211210, partly
+# because the old 2014 version wouldn't compile, and partly because a
+# cpuid that only knows about CPUs made before 2015 isn't very useful.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cpuid
-VERSION=${VERSION:-20140123}
+VERSION=${VERSION:-20211210}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,9 +76,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -84,4 +95,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cpuid/cpuid.info b/system/cpuid/cpuid.info
index 8875c3e12b..75007d244b 100644
--- a/system/cpuid/cpuid.info
+++ b/system/cpuid/cpuid.info
@@ -1,8 +1,8 @@
 PRGNAM="cpuid"
-VERSION="20140123"
+VERSION="20211210"
 HOMEPAGE="http://www.etallen.com/cpuid.html"
-DOWNLOAD="http://www.etallen.com/cpuid/cpuid-20140123.src.tar.gz"
-MD5SUM="f1a6946a1ece87928ddd1d1e3b06ed4b"
+DOWNLOAD="http://www.etallen.com/cpuid/cpuid-20211210.src.tar.gz"
+MD5SUM="633a4b64f5940df7f4646905457f0d0e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/cpuid2cpuflags/cpuid2cpuflags.SlackBuild b/system/cpuid2cpuflags/cpuid2cpuflags.SlackBuild
index 68f01eac11..b70d037b26 100644
--- a/system/cpuid2cpuflags/cpuid2cpuflags.SlackBuild
+++ b/system/cpuid2cpuflags/cpuid2cpuflags.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for cpuid2cpuflags.
 #
-# Copyright 2017-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2017-2024  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cpuid2cpuflags
-VERSION=${VERSION:-11.0}
+VERSION=${VERSION:-14.0}
+SRCVER="14"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -56,8 +67,6 @@ fi
 
 set -e
 
-SRCVER="11"
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -98,4 +107,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cpuid2cpuflags/cpuid2cpuflags.info b/system/cpuid2cpuflags/cpuid2cpuflags.info
index 0e9efd6ba2..b90fad7b1c 100644
--- a/system/cpuid2cpuflags/cpuid2cpuflags.info
+++ b/system/cpuid2cpuflags/cpuid2cpuflags.info
@@ -1,8 +1,8 @@
 PRGNAM="cpuid2cpuflags"
-VERSION="11.0"
+VERSION="14.0"
 HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-DOWNLOAD="https://github.com/mgorny/cpuid2cpuflags/releases/download/v11/cpuid2cpuflags-11.tar.bz2"
-MD5SUM="c54deede1aee5d41decd5fd5969ff2d5"
+DOWNLOAD="https://github.com/mgorny/cpuid2cpuflags/releases/download/v14/cpuid2cpuflags-14.tar.bz2"
+MD5SUM="71f8aa626a05aeac93d305f65c293b7b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/cpulimit/cpulimit.SlackBuild b/system/cpulimit/cpulimit.SlackBuild
index 11e58b12ed..d8d3534a40 100644
--- a/system/cpulimit/cpulimit.SlackBuild
+++ b/system/cpulimit/cpulimit.SlackBuild
@@ -1,14 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cpulimit
 
 # Written by  Andrey Maraev <andrew.maraev60@yandex.ru>
 # update to v0.2 by clavisound
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cpulimit
 VERSION=${VERSION:-0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -18,7 +21,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -52,6 +62,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# https://github.com/opsengine/cpulimit/issues/96#issuecomment-748001523
+patch -p1 < $CWD/glibc-2.32.patch
+
 make
 
 mkdir -p $PKG/usr/bin
@@ -68,4 +81,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cpulimit/glibc-2.32.patch b/system/cpulimit/glibc-2.32.patch
new file mode 100644
index 0000000000..26eeadd4e2
--- /dev/null
+++ b/system/cpulimit/glibc-2.32.patch
@@ -0,0 +1,19 @@
+diff -Naur cpulimit-0.2.orig/src/cpulimit.c cpulimit-0.2/src/cpulimit.c
+--- cpulimit-0.2.orig/src/cpulimit.c	2015-06-17 08:46:59.000000000 +0200
++++ cpulimit-0.2/src/cpulimit.c	2021-01-23 11:01:12.298033000 +0100
+@@ -38,12 +38,14 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
++#ifdef __APPLE__
+ #include <sys/sysctl.h>
++#endif
+ #include <sys/resource.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ 
+-#ifdef __APPLE__ || __FREEBSD__
++#if defined(__APPLE__) || defined(__FREEBSD__)
+ #include <libgen.h>
+ #endif
+ 
diff --git a/system/crashplan/README b/system/crashplan/README
deleted file mode 100644
index d721b2648b..0000000000
--- a/system/crashplan/README
+++ /dev/null
@@ -1,12 +0,0 @@
-CrashPlan is a backup software product that backs up personal files once a
-day:
-
-* Free onsite backup, allowing you to back up to other computers and
-  attached external hard drives.
-* Free offsite backup when you back up to computers belonging to people you
-  know, like friends and family.
-* Paid cloud-storage backup: the free version of CrashPlan does not back up
-  to their cloud storage.
-
-The daemon is CrashPlanEngine, which is started by rc.crashplan.
-The GUI can be launched by using the command CrashPlanDesktop.
diff --git a/system/crashplan/crashplan.SlackBuild b/system/crashplan/crashplan.SlackBuild
deleted file mode 100644
index 770a665ee2..0000000000
--- a/system/crashplan/crashplan.SlackBuild
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/sh
-# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
-# Copyright 2009, 2010, 2011  Eric Hameleers, Eindhoven, Netherlands
-# Slackware build script for crashplan
-# Written by Lionel Young <redtricycle@gmail.com>
-# Based on http://slackbuilds.org/template.SlackBuild
-
-PRGNAM=crashplan
-VERSION=${VERSION:-4.3.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=CrashPlan
-TARGETDIR=/opt/crashplan
-MANIFESTDIR=/var/crashplan # Directory to store backups to
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# Pre-compiled binaries included only for i486 and x86_64
-if [ ! "$ARCH" = "i486" -a ! "$ARCH" = "x86_64" ]; then
-  echo "$ARCH architecture not supported."
-  exit 1
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-install
-tar xvf $CWD/${SRCNAM}_${VERSION}_Linux.tgz
-cd $SRCNAM-install
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Repackage everything into /opt
-mkdir -p $PKG/$TARGETDIR/bin/
-mkdir -p $PKG/usr/bin
-mkdir -p $PKG/etc/rc.d/
-mkdir -p $PKG/usr/share/applications/
-mkdir -p $PKG/$MANIFESTDIR
-
-# Expand the archive
-( cd $PKG/$TARGETDIR
-  cat $TMP/$SRCNAM-install/${SRCNAM}_${VERSION}.cpi | gzip -d -c - | cpio -i --no-preserve-owner
-)
-
-# Make the log file world writable
-chmod 777 $PKG/$TARGETDIR/log
-
-# create a file that has our install vars, which is required to run
-echo "" > $PKG/${TARGETDIR}/install.vars
-echo "TARGETDIR=${TARGETDIR}" >> $PKG/${TARGETDIR}/install.vars
-echo "BINSDIR=${TARGETDIR}/bin" >> $PKG/${TARGETDIR}/install.vars
-echo "MANIFESTDIR=${MANIFESTDIR}" >> $PKG/${TARGETDIR}/install.vars
-echo "INITDIR=/etc/rc.d" >> $PKG/${TARGETDIR}/install.vars
-echo "RUNLVLDIR=/etc/rc.d" >> $PKG/${TARGETDIR}/install.vars
-NOW=`date +%Y%m%d`
-echo "INSTALLDATE=$NOW" >> $PKG/${TARGETDIR}/install.vars
-cat install.defaults >> $PKG/${TARGETDIR}/install.vars
-JAVACOMMON=`which java`
-echo "JAVACOMMON=${JAVACOMMON}" >> $PKG/${TARGETDIR}/install.vars
-
-# Repackage the binaries in the appropriate directories
-cp -a scripts/CrashPlanDesktop scripts/CrashPlanEngine scripts/run.conf $PKG/$TARGETDIR/bin/
-ln -s $TARGETDIR/bin/CrashPlanDesktop $PKG/usr/bin/CrashPlanDesktop
-
-# Repackage the init script
-# Perform substitution on the init script; we need to make the value of INITSCRIPT available
-# to what lives in /etc/rc.d
-INITSCRIPT=$TARGETDIR/bin/CrashPlanEngine
-SEDEXPRSUB=`echo $INITSCRIPT | sed 's/\//\\\\\//g'`
-SEDEXPR="s/<INITSCRIPT>/$SEDEXPRSUB/g"
-sed $SEDEXPR scripts/crashplan > $PKG/etc/rc.d/rc.crashplan.new
-chmod 0755 $PKG/etc/rc.d/rc.crashplan.new
-
-# Desktop icon
-cp -a scripts/CrashPlan.desktop $PKG/usr/share/applications/
-sed -i \
-  -e "s#Categories=;#Categories=System;Utility;#" \
-  -e "s#Exec=.*#Exec=${TARGETDIR}/bin/CrashPlanDesktop#" \
-  -e "s#Icon=.*#Icon=${TARGETDIR}/skin/icon_app_128x128.png#" \
-  $PKG/usr/share/applications/CrashPlan.desktop
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  EULA.txt README \
-  $PKG/$TARGETDIR/doc/* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/crashplan/crashplan.info b/system/crashplan/crashplan.info
deleted file mode 100644
index b9c8226360..0000000000
--- a/system/crashplan/crashplan.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="crashplan"
-VERSION="4.3.0"
-HOMEPAGE="http://www.crashplan.com"
-DOWNLOAD="http://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_4.3.0_Linux.tgz"
-MD5SUM="3b06038c29692b4daf05df739fd19ff7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="jdk"
-MAINTAINER="Lionel Young"
-EMAIL="lionelyoung@gmail.com"
diff --git a/system/crashplan/doinst.sh b/system/crashplan/doinst.sh
deleted file mode 100644
index 6d96187db8..0000000000
--- a/system/crashplan/doinst.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-preserve_perms etc/rc.d/rc.crashplan.new
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
diff --git a/system/crashplan/slack-desc b/system/crashplan/slack-desc
deleted file mode 100644
index 448f1cbe20..0000000000
--- a/system/crashplan/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-         |-----handy-ruler------------------------------------------------------|
-crashplan: crashplan (on and off-site backup)
-crashplan:
-crashplan: CrashPlan is a backup software product that backs up personal files
-crashplan: once a day. Free onsite backup, allowing you to back up to other
-crashplan: computers and attached external hard drives. Free offsite backup
-crashplan: when you back up to computers belonging to people you know, like
-crashplan: friends and family. Paid cloud-storage backup; the free version of
-crashplan: CrashPlan does not back up to their cloud storage.
-crashplan:
-crashplan:
-crashplan: Home: http://www.crashplan.com
diff --git a/system/crc32_simple/crc32_simple.SlackBuild b/system/crc32_simple/crc32_simple.SlackBuild
index 759078b08d..dbc9f48677 100644
--- a/system/crc32_simple/crc32_simple.SlackBuild
+++ b/system/crc32_simple/crc32_simple.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for crc32_simple
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
@@ -12,10 +12,13 @@
 
 # VERSION is from the timestamp on the source file.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=crc32_simple
 VERSION=${VERSION:-20120911}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -25,7 +28,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,4 +71,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/crc32_simple/crc32_simple.info b/system/crc32_simple/crc32_simple.info
index ee890f6530..062ff3e650 100644
--- a/system/crc32_simple/crc32_simple.info
+++ b/system/crc32_simple/crc32_simple.info
@@ -1,10 +1,10 @@
 PRGNAM="crc32_simple"
 VERSION="20120911"
-HOMEPAGE="http://home.thep.lu.se/~bjorn/crc/"
-DOWNLOAD="http://home.thep.lu.se/~bjorn/crc/crc32_simple.c"
+HOMEPAGE="http://web.archive.org/web/20220523164124/http://home.thep.lu.se/~bjorn/crc/"
+DOWNLOAD="http://web.archive.org/web/20220523164124/http://home.thep.lu.se/~bjorn/crc/crc32_simple.c"
 MD5SUM="da200e9ec1cb4f9e72ed6bd87cb43017"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/createrepo_c/README b/system/createrepo_c/README
index c69040a2d0..92677a5e85 100644
--- a/system/createrepo_c/README
+++ b/system/createrepo_c/README
@@ -11,6 +11,3 @@ package set.
 Please note that deltarpm in this package is off as it very
 rare cases where it used in practice because of difficulties
 in support this case on repo side.
-
-0.15.5 is the last version that can be built with python2
-support only. All further version require python3.
diff --git a/system/createrepo_c/createrepo_c.SlackBuild b/system/createrepo_c/createrepo_c.SlackBuild
index 7595a494cd..acf17ae4da 100644
--- a/system/createrepo_c/createrepo_c.SlackBuild
+++ b/system/createrepo_c/createrepo_c.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for createrepo_c
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=createrepo_c
-VERSION=${VERSION:-0.15.5}
+VERSION=${VERSION:-0.20.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,13 +82,14 @@ find -L . \
 mkdir build
 cd build
 cmake .. \
- -DPYTHON_DESIRED:FILEPATH=/usr/bin/python \
+ -DPYTHON_DESIRED:FILEPATH=/usr/bin/python3 \
  -DWITH_ZCHUNK=OFF \
  -DWITH_LIBMODULEMD=OFF \
- -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_C_FLAGS="$SLKCFLAGS" \
  -DCMAKE_INSTALL_PREFIX=/usr \
  -DENABLE_THREADED_XZ_ENCODER=on \
+ -DWITH_LEGACY_HASHES=on \
  -DENABLE_DRPM=off
 
 make
@@ -101,4 +112,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/createrepo_c/createrepo_c.info b/system/createrepo_c/createrepo_c.info
index 450dcf3db9..4ba4a2ff95 100644
--- a/system/createrepo_c/createrepo_c.info
+++ b/system/createrepo_c/createrepo_c.info
@@ -1,8 +1,8 @@
 PRGNAM="createrepo_c"
-VERSION="0.15.5"
+VERSION="0.20.0"
 HOMEPAGE="https://github.com/rpm-software-management/createrepo_c"
-DOWNLOAD="https://github.com/rpm-software-management/createrepo_c/archive/0.15.5/createrepo_c-0.15.5.tar.gz"
-MD5SUM="207603d4c3594bf8f316ab3557fa0cce"
+DOWNLOAD="https://github.com/rpm-software-management/createrepo_c/archive/0.20.0/createrepo_c-0.20.0.tar.gz"
+MD5SUM="338b2185bc7c9ca280290a762896d4cc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/crelay/README b/system/crelay/README
new file mode 100644
index 0000000000..70ebced57f
--- /dev/null
+++ b/system/crelay/README
@@ -0,0 +1,6 @@
+Command line and gui software for controlling usb relays
+
+The package includes an init script provided by the developers 
+installed at /etc/rc.d/rc.crelayd, a sample config file at 
+/etc/crelayd.conf and a sample Monit config stanza installed at
+/usr/share/docs/crelay/monit
diff --git a/system/crelay/crelay.SlackBuild b/system/crelay/crelay.SlackBuild
new file mode 100644
index 0000000000..fddda9de24
--- /dev/null
+++ b/system/crelay/crelay.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+# Slackware build script for crelay
+
+# Copyright 2022 Sebastian Arcus, UK
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=crelay
+VERSION=${VERSION:-0.14.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION/src
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+
+make
+mkdir -p $PKG/usr/bin
+cat crelay > $PKG/usr/bin/crelay
+chmod 0755 $PKG/usr/bin/crelay
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cd ..
+cp -a LICENSE README.md HISTORY $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/etc/rc.d
+cp -a init.d/crelayd $PKG/etc/rc.d/rc.crelayd
+cp -a conf/$PRGNAM.conf $PKG/etc/$PRGNAM.conf.new
+
+mkdir -p $PKG/etc/monit/
+cp -a monit/crelayd $PKG/etc/monit/crelayd
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/crelay/crelay.info b/system/crelay/crelay.info
new file mode 100644
index 0000000000..e580dd89db
--- /dev/null
+++ b/system/crelay/crelay.info
@@ -0,0 +1,10 @@
+PRGNAM="crelay"
+VERSION="0.14.1"
+HOMEPAGE="https://github.com/ondrej1024/crelay"
+DOWNLOAD="https://github.com/ondrej1024/crelay/archive/V0.14.1/crelay-0.14.1.tar.gz"
+MD5SUM="2539c8a6eed5e8901f605149cb2da233"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libftdi hidapi"
+MAINTAINER="Sebastian Arcus"
+EMAIL="s.arcus@open-t.co.uk"
diff --git a/system/crelay/doinst.sh b/system/crelay/doinst.sh
new file mode 100644
index 0000000000..9004ee8dfc
--- /dev/null
+++ b/system/crelay/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/crelay.conf.new
diff --git a/system/crelay/slack-desc b/system/crelay/slack-desc
new file mode 100644
index 0000000000..11cbe8ca9b
--- /dev/null
+++ b/system/crelay/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+crelay: crelay (software for HID and FTDI usb relays)
+crelay:
+crelay: Command line and gui software for usb relays based on HID and FTDI 
+crelay: compatible chips.
+crelay:
+crelay: Usage instructions at: https://github.com/ondrej1024/crelay 
+crelay:
+crelay:
+crelay:
+crelay:
+crelay:
diff --git a/system/crikey/crikey.SlackBuild b/system/crikey/crikey.SlackBuild
index 6f1e4f1c82..4f4ec352a8 100644
--- a/system/crikey/crikey.SlackBuild
+++ b/system/crikey/crikey.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for crikey
 
@@ -24,26 +24,36 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=crikey
 VERSION=${VERSION:-0.8.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+    SLKCFLAGS="-O2 -march=i586 -mtune=i686"
     LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
     SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -92,4 +102,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/crmsh/README b/system/crmsh/README
index b18ec78d1c..0ea1a2cb76 100644
--- a/system/crmsh/README
+++ b/system/crmsh/README
@@ -1,7 +1,8 @@
-crmsh is a cluster management shell for the Pacemaker High Availability stack.
+crmsh is a cluster management shell for the Pacemaker High
+Availability stack.
 
-Configure, manage and troubleshoot clusters from the command line, with full
-tab completion and extensive help. crmsh also provides advanced features like
-low-level cluster configuration, cluster scripting, package management, and
-history exploration tools giving you a complete insight into the state of your
-cluster.
+Configure, manage and troubleshoot clusters from the command line,
+with full tab completion and extensive help. crmsh also provides
+advanced features like low-level cluster configuration, cluster
+scripting, package management, and history exploration tools giving
+you a complete insight into the state of your cluster.
diff --git a/system/crmsh/crmsh.SlackBuild b/system/crmsh/crmsh.SlackBuild
index 964d2de6d3..f64b0ac070 100644
--- a/system/crmsh/crmsh.SlackBuild
+++ b/system/crmsh/crmsh.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "crmsh".
 
@@ -24,10 +24,15 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=2: remove empty NEWS.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=crmsh
 VERSION=${VERSION:-2.2.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,9 +76,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 ./autogen.sh
 CFLAGS="$SLKCFLAGS" \
@@ -83,18 +92,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 mv $PKG/etc/crm/crm.conf $PKG/etc/crm/crm.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING NEWS TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -102,4 +106,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cronie/README b/system/cronie/README
index b3882462b5..03d2489e8f 100644
--- a/system/cronie/README
+++ b/system/cronie/README
@@ -1,7 +1,9 @@
-Cronie contains the standard UNIX daemon crond that runs specified programs
-at scheduled times and related tools. It is based on the original cron and
-has security and configuration enhancements like the ability to use pam
-and SELinux.
+cronie (The standard UNIX cron daemon)
+
+Cronie contains the standard UNIX daemon crond that runs specified
+programs at scheduled times and related tools. It is based on the
+original cron and has security and configuration enhancements like the
+ability to use pam and SELinux.
 
 By default this SlackBuild will include anacron in the package. If you
 don't want this, pass ANACRON=no to the SlackBuild.
@@ -11,14 +13,6 @@ conflict with dcron, so it is advised to remove dcron before installing
 cronie:
 
   Stop the dcron daemon and remove the dcron package:
-  # kill $(pgrep crond)
+  # /etc/rc.d/rc.crond stop
   # removepkg dcron
   # rm -rf /var/spool/cron
-
-Slackware's boot script assumes that you have dcron and thus has to be
-modified:
-
-Change this line in /etc/rc.d/rc.M
-  /usr/sbin/crond -l notice
-to:
-  /usr/sbin/crond 
diff --git a/system/cronie/add-l-option.diff b/system/cronie/add-l-option.diff
new file mode 100644
index 0000000000..c4c9b83fb4
--- /dev/null
+++ b/system/cronie/add-l-option.diff
@@ -0,0 +1,52 @@
+diff -Naur cronie-1.6.1/man/cron.8 cronie-1.6.1.patched/man/cron.8
+--- cronie-1.6.1/man/cron.8	2022-03-22 09:42:22.000000000 -0400
++++ cronie-1.6.1.patched/man/cron.8	2023-08-08 01:55:44.680979225 -0400
+@@ -22,7 +22,7 @@
+ .\"
+ .\" $Id: cron.8,v 1.8 2004/01/23 19:03:32 vixie Exp $
+ .\"
+-.TH CRON "8" "2013-09-26" "cronie" "System Administration"
++.TH CRON "8" "2023-08-08" "cronie" "System Administration"
+ .SH NAME
+ crond \- daemon to execute scheduled commands
+ .SH SYNOPSIS
+@@ -197,6 +197,9 @@
+ .TP
+ .B "\-V"
+ Print version and exit.
++.TP
++.B "\-l" <level>
++Ignored. Option added for compatibility with dcron.
+ .SH SIGNALS
+ When the
+ .I SIGHUP
+diff -Naur cronie-1.6.1/src/cron.c cronie-1.6.1.patched/src/cron.c
+--- cronie-1.6.1/src/cron.c	2022-03-22 09:42:22.000000000 -0400
++++ cronie-1.6.1.patched/src/cron.c	2023-08-08 01:52:41.016996510 -0400
+@@ -190,6 +190,7 @@
+ 	fprintf(stderr, " -s         log into syslog instead of sending mails\n");
+ 	fprintf(stderr, " -V         print version and exit\n");
+ 	fprintf(stderr, " -x <flag>  print debug information\n");
++	fprintf(stderr, " -l <arg>   ignored, for dcron compatibility\n");
+ 	fprintf(stderr, "\n");
+ 	fprintf(stderr, "Debugging flags are: ");
+ 	for (dflags = DebugFlagNames; *dflags; dflags++)
+@@ -691,7 +692,7 @@
+ static void parse_args(int argc, char *argv[]) {
+ 	int argch;
+ 
+-	while (-1 != (argch = getopt(argc, argv, "hnfpsiPx:m:cV"))) {
++	while (-1 != (argch = getopt(argc, argv, "hnfpsiPx:m:cVl:"))) {
+ 		switch (argch) {
+ 			case 'x':
+ 				if (!set_debug_flags(optarg))
+@@ -722,6 +723,9 @@
+ 			case 'V':
+ 				puts(PACKAGE_STRING);
+ 				exit(EXIT_SUCCESS);
++			case 'l':
++				/* do nothing (ignore -l <whatever>) */
++				break;
+ 			case 'h':
+ 			default:
+ 				usage();
diff --git a/system/cronie/crond.default b/system/cronie/crond.default
new file mode 100644
index 0000000000..e7eeaac12b
--- /dev/null
+++ b/system/cronie/crond.default
@@ -0,0 +1,9 @@
+# /etc/default/crond from SlackBuilds.org cronie package.
+# The default Slackware version of this file has this:
+#CROND_OPTS="-l notice"
+# ...which doesn't do anything in cronie's crond, though it's
+# been patched to accept (and ignore) the -l option so it can
+# work with dcron's leftover config file.
+
+# Default is, no options at all:
+CROND_OPTS=""
diff --git a/system/cronie/cronie.SlackBuild b/system/cronie/cronie.SlackBuild
index 5d8b8eb4b8..606bec3df2 100644
--- a/system/cronie/cronie.SlackBuild
+++ b/system/cronie/cronie.SlackBuild
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for cronie
 
 # Copyright 2012, 2013  Chris Abela, Malta
-# Copyright 2014  Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
-# Copyright 2017-2018  Aaditya Bagga <aaditya_gnulinux@zoho.com>
-# Copyright 2019 Ricardo J. Barberis <ricardo.barberis@gmail.com>
+# Copyright 2014  Ryan P.C. McQuen | Everett, WA
+# Copyright 2017-2018  Aaditya Bagga
+# Copyright 2019 Ricardo J. Barberis
+# Copyright 2023 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +25,26 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20240313 bkw: update for v1.7.1.
+# 20231108 bkw: update for v1.7.0.
+# 20230808 bkw:
+# - take over maintenance.
+# - update for v1.6.1.
+# - update README for modern Slackware.
+# - remove useless INSTALL from doc dir.
+# - add contrib/* to doc dir.
+# - patch crond so it accepts (and ignores) "-l notice", so we don't have
+#   to change Slackware's init stuff.
+# - add /etc/rc.d/rc.crond and /etc/default/crond.
+# - gzip run-parts man page.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cronie
-VERSION=${VERSION:-1.5.4}
+VERSION=${VERSION:-1.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +54,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,11 +86,14 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# 20230808 bkw: add the -l <level> option to crond, to allow Slackware's
+# /etc/default/crond to work without being modified. this doesn't actually
+# support changing the loglevel; it just makes crond accept and ignore
+# the option.
+patch -p1 < $CWD/add-l-option.diff
 
 # Enable anacron by default
 [ "$ANACRON" = no ] && unset ANACRONFLAG || ANACRONFLAG="--enable-anacron"
@@ -87,10 +111,8 @@ CXXFLAGS="$SLKCFLAGS" \
   "$ANACRONFLAG"
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/etc/cron.d  # The absence of this directory would be logged
 
@@ -102,25 +124,28 @@ chmod 600 $PKG/etc/cron.deny.new
 # These are copied from Slackware's dcron.SlackBuild
 cat $CWD/run-parts > $PKG/usr/bin/run-parts
 chmod 0755 $PKG/usr/bin/run-parts
-cat $CWD/run-parts.8 > $PKG/usr/man/man8/run-parts.8
+gzip -9c < $CWD/run-parts.8 > $PKG/usr/man/man8/run-parts.8.gz
 mkdir -p $PKG/etc/cron.{hourly,daily,weekly,monthly}
 mkdir -p $PKG/var/spool/cron/
 chmod 0700 $PKG/var/spool/cron/
 cat $CWD/crontab.root > $PKG/var/spool/cron/root.new
 chmod 0600 $PKG/var/spool/cron/root.new
+mkdir -p $PKG/etc/default $PKG/etc/rc.d
+cat $CWD/crond.default > $PKG/etc/default/crond.new # modified from Slackware
+cat $CWD/rc.crond > $PKG/etc/rc.d/rc.crond.new
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# default permissions are +x for the init script, though doinst.sh
+# can change them.
+chmod 755 $PKG/etc/rc.d/rc.crond.new
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING* ChangeLog NEWS README* contrib $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cronie/cronie.info b/system/cronie/cronie.info
index e8710de367..236f53e34f 100644
--- a/system/cronie/cronie.info
+++ b/system/cronie/cronie.info
@@ -1,10 +1,10 @@
 PRGNAM="cronie"
-VERSION="1.5.4"
+VERSION="1.7.1"
 HOMEPAGE="https://github.com/cronie-crond/cronie"
-DOWNLOAD="https://github.com/cronie-crond/cronie/releases/download/cronie-1.5.4-final/cronie-1.5.4.tar.gz"
-MD5SUM="20233b96997e17a142e1fbe0d7ce8223"
+DOWNLOAD="https://github.com/cronie-crond/cronie/releases/download/cronie-1.7.1/cronie-1.7.1.tar.gz"
+MD5SUM="e7528df4b0d7d59307677da7c82e4f70"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README%"
-MAINTAINER="Ricardo J. Barberis"
-EMAIL="ricardo.barberis@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/cronie/doinst.sh b/system/cronie/doinst.sh
index b3d680f840..9edca555ec 100644
--- a/system/cronie/doinst.sh
+++ b/system/cronie/doinst.sh
@@ -8,5 +8,18 @@ config() {
   fi
 }
 
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
 config var/spool/cron/root.new
 config etc/cron.deny.new
+config etc/default/crond.new
+preserve_perms etc/rc.d/rc.crond.new
diff --git a/system/cronie/rc.crond b/system/cronie/rc.crond
new file mode 100755
index 0000000000..d9076b330b
--- /dev/null
+++ b/system/cronie/rc.crond
@@ -0,0 +1,40 @@
+#!/bin/sh
+# /etc/rc.d/rc.crond - start/stop the cron daemon
+
+# To change the default options, edit /etc/default/crond.
+if [ -r /etc/default/crond ]; then
+  . /etc/default/crond
+fi
+
+start_crond() {
+  if ! /usr/bin/pgrep --ns $$ --euid root -f "^/usr/sbin/crond" 1> /dev/null 2> /dev/null ; then
+    echo "Starting crond:  /usr/sbin/crond $CROND_OPTS"
+    mkdir -p /run/cron
+    /usr/sbin/crond $CROND_OPTS
+  fi
+}
+
+stop_crond() {
+  echo "Stopping crond."
+  /usr/bin/pkill --ns $$ --euid root -f "^/usr/sbin/crond" 2> /dev/null 
+}
+
+restart_crond() {
+  stop_crond
+  sleep 1
+  start_crond
+}
+
+case "$1" in
+'start')
+  start_crond
+  ;;
+'stop')
+  stop_crond
+  ;;
+'restart')
+  restart_crond
+  ;;
+*)
+  echo "usage $0 start|stop|restart"
+esac
diff --git a/system/crunch/crunch.SlackBuild b/system/crunch/crunch.SlackBuild
index ed53ff6b44..b434b2f506 100644
--- a/system/crunch/crunch.SlackBuild
+++ b/system/crunch/crunch.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for crunch
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix permissions on docs and man page.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=crunch
 VERSION=${VERSION:-3.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,25 +75,25 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 make
-make install PREFIX=$PKG/usr MANDIR=$\(PREFIX\)/man/man1 DOCDIR=$\(PREFIX\)/doc/$PRGNAM-$VERSION
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# 20220409 bkw: 'make install' makes a mess, easier to do without.
+mkdir -p $PKG/usr/{bin,man/man1,share/$PRGNAM}
+install -s -m0755 $PRGNAM $PKG/usr/bin
+install -m0644 charset.lst $PKG/usr/share/$PRGNAM
+gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+install -m0644 COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
 
diff --git a/system/csh/README b/system/csh/README
index 12230bebd9..525cb405ec 100644
--- a/system/csh/README
+++ b/system/csh/README
@@ -1,9 +1,10 @@
 csh (C shell from BSD)
 
-The C shell was originally written at UCB to overcome limitations in the
-Bourne shell. Its flexibility and comfort (at that time) quickly made
-it the shell of choice until more advanced shells like ksh, bash, zsh
-or tcsh appeared. Most of the latter incorporate features original to csh.
+The C shell was originally written at UCB to overcome limitations in
+the Bourne shell. Its flexibility and comfort (at that time) quickly
+made it the shell of choice until more advanced shells like ksh, bash,
+zsh or tcsh appeared. Most of the latter incorporate features original
+to csh.
 
 This build is based on OpenBSD sources from 2011.
 
diff --git a/system/csh/README_Slackware.txt b/system/csh/README_Slackware.txt
index e3ebbcd0dc..453b858171 100644
--- a/system/csh/README_Slackware.txt
+++ b/system/csh/README_Slackware.txt
@@ -35,7 +35,7 @@ bad idea. Remove csh first, install tcsh, then install csh.
 
 As far as I know, nothing in Slackware depends on tcsh, so if you
 mess things up, you won't break your OS. You can always put things
-back to Slackware's default state by removing both csh and tsch, then
+back to Slackware's default state by removing both csh and tcsh, then
 reinstalling tcsh.
 
 
@@ -47,7 +47,7 @@ shipped /etc/csh.login (from the etc package) contains tcsh-specific
 code, which prevents the /etc/profile.d/*.csh scripts from running. This
 won't prevent you from logging in, but your environment won't be set up
 correctly, you'll see "[: No match." errors, and your prompt won't show
-your username, hostname, current directory as tsch does.
+your username, hostname, current directory as tcsh does.
 
 To fix this, you can replace /etc/csh.login with the /etc/csh.login.new
 installed with the csh package. It behaves the same as the original,
@@ -59,6 +59,13 @@ for tcsh, and has conditional code to make csh behave correctly.
 If you don't want to replace Slackware's csh.login, just rm
 /etc/csh.login.new and forget about it.
 
+Unfortunately, some of the /etc/profile.d/*.csh scripts shipped
+with Slackware (or various SBo packages) aren't compatible with the
+original csh. Specifically, qt5.csh will cause an "Illegal variable
+name" error. You can ignore this, or you can fix it by editing
+/etc/profile.d/qt5.csh and changing "$?" to "$status" (on line 27, in
+Slackware 15.0).
+
 
 Other notes
 -----------
@@ -70,10 +77,6 @@ re-read the NEW FEATURES section in tcsh's man page (it describes the
 tcsh features you won't find in csh).
 
 NEVER make csh the default shell for the root account! In fact, it's
-probably a bad idea to ever change root's default shell on any Linux or
-UNIX system, especially a third-party one that isn't shipped with the OS.
-
-The man page for csh states that "Words can be no longer than 1024
-characters", but this build of csh increases the limit to 8192 (actually,
-BUFSIZ as defined in stdio.h). This was done so Slackware's profile.d
-scripts will work correctly (particularly coreutils-dircolor.sh).
+probably a bad idea to ever change root's default shell on any Linux
+or UNIX system, especially to a third-party one that isn't shipped
+with the OS.
diff --git a/system/csh/bufsiz.diff b/system/csh/bufsiz.diff
deleted file mode 100644
index 21d58a124a..0000000000
--- a/system/csh/bufsiz.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur csh-20110502.orig/csh.h csh-20110502.patched/csh.h
---- csh-20110502.orig/csh.h	2014-04-25 17:31:52.000000000 -0400
-+++ csh-20110502.patched/csh.h	2014-04-25 17:34:08.000000000 -0400
-@@ -36,12 +36,10 @@
-  * Fundamental definitions which may vary from system to system.
-  *
-  *	BUFSIZ		The i/o buffering size; also limits word size
-+ *             20140425 bkw: moved below the #include <stdio.h> since
-+ *             we want to use the system's default BUFSIZ.
-  *	MAILINTVL	How often to mailcheck; more often is more expensive
-  */
--#ifndef BUFSIZ
--#define	BUFSIZ	1024		/* default buffer size */
--#endif				/* BUFSIZ */
--
- #ifndef MAXPATHLEN
- #define MAXPATHLEN BUFSIZ
- #endif
-@@ -96,6 +94,11 @@
- #include <stdio.h>
- FILE *cshin, *cshout, *csherr;
- 
-+/* 20140425 bkw: moved here so stdio.h is what initially defines BUFSIZ. */
-+#ifndef BUFSIZ
-+#define	BUFSIZ	1024		/* default buffer size */
-+#endif				/* BUFSIZ */
-+
- #include <stdio_ext.h>
- #define fpurge __fpurge
- 
diff --git a/system/csh/csh.SlackBuild b/system/csh/csh.SlackBuild
index 2adb56deea..bd4cb04f56 100644
--- a/system/csh/csh.SlackBuild
+++ b/system/csh/csh.SlackBuild
@@ -1,20 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for csh
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230919 bkw:
+# - update for v20230828_1 (sync with Debian sid).
+# - remove old no-longer-needed bufsiz.diff and glibc-2.32-sys_siglist.diff.
+# - add timespec.diff to work around breakage in csh's time builtin.
+# - add remove_publib_dep.diff to avoid an external publib dependency.
+# - update csh.login a bit (new csh has a different default $prompt).
+# - mention bad profile scripts in README_Slackware.txt.
+# - fix the man page slightly.
+
+# 20220409 bkw: BUILD=2
+# - fix doinst.sh: only create bin/csh symlink if bin exists, which
+#   fixes installing the package with 'installpkg -root /some/path'.
+
+# 20210827 bkw:
+# - update to latest debian patch (6), add deb version to VERSION.
+# - add -current fix for recent glibc.
+
 # 20170621 bkw:
 # - update to latest debian patch (-2.2, needed for -current).
 # - quit compiling with -Werror (also needed for -current).
 # - BUILD=2.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=csh
-VERSION=${VERSION:-20110502}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20230828_1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -24,7 +44,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -45,38 +69,59 @@ fi
 
 set -e
 
-DEBVER=2.2
+MAINVER="${VERSION%_*}"  # 123_4 => 123
+DEBVER="${VERSION#*_}"   # 123_4 => 4
 
 # Grr.
-TARNAM="${PRGNAM}_${VERSION}.orig"
-DIRNAM="${PRGNAM}-${VERSION}.orig"
+TARNAM="${PRGNAM}_${MAINVER}.orig"
+DIRNAM="${PRGNAM}-${MAINVER}"
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $DIRNAM
-tar xvf $CWD/$TARNAM.tar.gz
+tar xvf $CWD/$TARNAM.tar.xz
 cd $DIRNAM
-tar xvf $CWD/${PRGNAM}_${VERSION}-$DEBVER.debian.tar.[xg]z
+tar xvf $CWD/${PRGNAM}_${MAINVER}-$DEBVER.debian.tar.xz
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 # Apply all of Debian's patches.
-for diff in debian/patches/*.diff; do
-  patch -p1 < $diff
+for diff in $( cat debian/patches/series ); do
+  patch -p1 < debian/patches/$diff
 done
 
-# My own patch, keeps csh.h from defining its own (tiny) BUFSIZ. Might
-# make I/O more efficient, and allows /etc/profile.d/coreutils-dircolors.sh
-# to set a giant $LS_OPTIONS value without "Word too long" error.
-patch -p1 < $CWD/bufsiz.diff
-
-# use Slackware standard flags
-sed -i "1iCFLAGS=$SLKCFLAGS" Makefile
+# 20230919 bkw: My own patch. Provides an implementations of
+# xrealloc(), and replaces xfree() with free(), so we don't have
+# publib as a dependency.
+patch -p1 < $CWD/remove_publib_dep.diff
+
+# 20230919 bkw: My own patch. Fixes the mess caused by debian's
+# bsd_time.patch. We need the patch, but it introduces a bug where a
+# 'struct timeval' pointer is treated as a 'struct timespec' pointer,
+# leading to a broken time builtin.
+# This isn't *just* here to fix a compiler warning! Without this
+# patch, we get:
+# % time sleep 2.3
+# 0.0u 0.0s 0:02.99 0.0% 0+0k 0+0io 0pf+0w
+# ...it thinks a 2.3 second sleep took 2.99 sec. Sometimes this
+# will print as 0:02:00 instead (also wrong). With the patch:
+# % time sleep 2.3
+# 0.0u 0.0s 0:02.30 0.0% 0+0k 0+0io 0pf+0w
+# This wasn't an issue in the previous (20110502_6) version.
+patch -p1 < $CWD/timespec.diff
+
+# 20230919 bkw: Missing prototype for closefrom(). We don't want
+# to #include <bsd/unistd.h> to get it, so just prepend it. This
+# probably didn't cause a problem anyway.
+sed -i '1ivoid closefrom(int lowfd);' misc.c
+
+# use Slackware standard flags.
+# 20230919 bkw: _VIS thing just silences a meaningless warning. it's
+# meaningless because it only applies to strnvis() and strnunvis(),
+# neither of which is called by csh.
+sed -i "1iCFLAGS=$SLKCFLAGS -fcommon -DLIBBSD_OPENBSD_VIS" Makefile
 
 # The LIBC= isn't even used, but Slackware64's pmake is broken: it has
 # /usr/lib/libc.a hard-coded, and pmake wants to build that (and can't),
@@ -88,6 +133,11 @@ cd USD.doc
 pmake paper.ps paper.txt
 cd -
 
+# 20230919 bkw: word length is BUFSIZ (by default in 20230828_1, no
+# patching required). This is 8192 bytes on x86 and x86_64, so fix
+# the man page.
+sed -i '/Words can be no/s,1024,8192,' csh.1
+
 # I think this is the first time I've ever seen 'make install' gzip the
 # man pages and strip the binary! BSD FTW!
 mkdir -p $PKG/usr/bin $PKG/usr/man/man1
@@ -99,15 +149,15 @@ pmake install DESTDIR=$PKG BINDIR=/usr/bin MANDIR=/usr/man
 mkdir -p $PKG/etc
 cat $CWD/csh.login > $PKG/etc/csh.login.new
 
-DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
-mkdir -p $DOCDIR
-cp -a USD.doc/paper.* $DOCDIR
-cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$PRGNAM.SlackBuild
-cat $CWD/README_Slackware.txt > $DOCDIR/README_Slackware.txt
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a USD.doc/paper.* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+cat $CWD/README_Slackware.txt > $PKGDOC/README_Slackware.txt
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/csh/csh.info b/system/csh/csh.info
index a8ac38100a..d0709fbdae 100644
--- a/system/csh/csh.info
+++ b/system/csh/csh.info
@@ -1,12 +1,12 @@
 PRGNAM="csh"
-VERSION="20110502"
+VERSION="20230828_1"
 HOMEPAGE="https://packages.debian.org/sid/csh"
-DOWNLOAD="http://ftp.debian.org/debian/pool/main/c/csh/csh_20110502.orig.tar.gz \
-          http://http.debian.net/debian/pool/main/c/csh/csh_20110502-2.2.debian.tar.xz"
-MD5SUM="578c40bfa54c09c8affbc434e34fb40c \
-        a66e38ff89e978970a4ade6eb419a69a"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/c/csh/csh_20230828.orig.tar.xz \
+          http://deb.debian.org/debian/pool/main/c/csh/csh_20230828-1.debian.tar.xz"
+MD5SUM="9917fda92d8ea01c7858f59ece134a72 \
+        f176353bf84fd41a332f3652cc5edbcb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README% libbsd"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/csh/csh.login b/system/csh/csh.login
index e65a03c02f..191a6158c3 100644
--- a/system/csh/csh.login
+++ b/system/csh/csh.login
@@ -41,7 +41,11 @@ if ("$TERM" == "unknown") setenv TERM linux
 if $?tcsh then
 	set prompt = "%n@%m:%~%# "
 else
-	set _promptchar = $prompt
+   if ( `whoami` == "root" ) then
+	  set _promptchar = "#"
+   else
+	  set _promptchar = "%"
+   endif
    # cache the hostname, assume it will never change (usually true)
 	set _hostname = `hostname`
 	alias _setprompt 'set prompt="$user@${_hostname}:$cwd$_promptchar "'
diff --git a/system/csh/doinst.sh b/system/csh/doinst.sh
index 5dec6bfce4..9bd8ee77d8 100644
--- a/system/csh/doinst.sh
+++ b/system/csh/doinst.sh
@@ -1,19 +1,16 @@
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
   elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
     rm $NEW
   fi
-  # Otherwise, we leave the .new copy for the admin to consider...
 }
 
 config etc/csh.login.new
 
 # If there's no csh link, take over:
-if [ ! -r bin/csh ]; then
+if [ -d bin -a ! -r bin/csh ]; then
   ( cd bin ; ln -sf ../usr/bin/csh csh )
 fi
diff --git a/system/csh/remove_publib_dep.diff b/system/csh/remove_publib_dep.diff
new file mode 100644
index 0000000000..948fa72714
--- /dev/null
+++ b/system/csh/remove_publib_dep.diff
@@ -0,0 +1,54 @@
+diff -Naur csh-20230828/Makefile csh-20230828.patched/Makefile
+--- csh-20230828/Makefile	2023-09-19 03:56:12.687978921 -0400
++++ csh-20230828.patched/Makefile	2023-09-19 04:21:16.198719211 -0400
+@@ -8,7 +8,7 @@
+ SRCS=	alloc.c char.c const.c csh.c dir.c dol.c error.c exec.c exp.c file.c \
+ 	func.c glob.c hist.c init.c lex.c misc.c parse.c proc.c \
+ 	sem.c set.c str.c time.c
+-LDADD+=	-lbsd -lpub
++LDADD+=	-lbsd
+ 
+ CLEANFILES+=error.h const.h
+ 
+diff -Naur csh-20230828/alloc.c csh-20230828.patched/alloc.c
+--- csh-20230828/alloc.c	2023-08-28 05:51:57.000000000 -0400
++++ csh-20230828.patched/alloc.c	2023-09-19 04:21:16.198719211 -0400
+@@ -89,3 +89,15 @@
+     }
+     return (n);
+ }
++
++void *
++xrealloc(void *p, size_t n)
++{
++    void *ptr;
++
++    if ((ptr = realloc(p, n)) == NULL) {
++	child++;
++	stderror(ERR_NOMEM);
++    }
++    return (ptr);
++}
+diff -Naur csh-20230828/extern.h csh-20230828.patched/extern.h
+--- csh-20230828/extern.h	2023-08-28 05:51:57.000000000 -0400
++++ csh-20230828.patched/extern.h	2023-09-19 04:24:42.595566353 -0400
+@@ -284,6 +284,7 @@
+ void	*xreallocarray(void *, size_t, size_t);
+ void	*xcalloc(size_t, size_t);
+ char	*xstrdup(const char *);
++void	*xrealloc(void *p, size_t n);
+ 
+ /*
+  * str.c:
+diff -Naur csh-20230828/glob.c csh-20230828.patched/glob.c
+--- csh-20230828/glob.c	2023-09-19 03:56:12.707979197 -0400
++++ csh-20230828.patched/glob.c	2023-09-19 04:22:08.760444266 -0400
+@@ -455,7 +455,7 @@
+ 	 * Output is empty, or none of the magic patterns matched.
+ 	 * It's up to the caller to generate a "No match" error.
+ 	 */
+-	xfree(nv);
++	if(nv) free(nv);
+ 	return (NULL);
+     }
+     *nvp = NULL;
diff --git a/system/csh/timespec.diff b/system/csh/timespec.diff
new file mode 100644
index 0000000000..3877be355d
--- /dev/null
+++ b/system/csh/timespec.diff
@@ -0,0 +1,82 @@
+diff -Naur csh-20230828/extern.h csh-20230828.patched/extern.h
+--- csh-20230828/extern.h	2023-09-19 17:44:07.356219253 -0400
++++ csh-20230828.patched/extern.h	2023-09-19 18:07:32.732605839 -0400
+@@ -276,6 +276,7 @@
+ void	settimes(void);
+ void	pcsecs(long);
+ void	psecs(long);
++int	timespec_gettimeofday(struct timespec *restrict, struct timezone *restrict);
+ 
+ /*
+  * alloc.c
+diff -Naur csh-20230828/proc.c csh-20230828.patched/proc.c
+--- csh-20230828/proc.c	2023-09-19 17:44:07.349219157 -0400
++++ csh-20230828.patched/proc.c	2023-09-19 18:06:05.785406431 -0400
+@@ -121,7 +121,7 @@
+     }
+     else {
+ 	if (pp->p_flags & (PTIME | PPTIME) || adrof(STRtime))
+-	  (void) gettimeofday(&pp->p_etime, NULL);
++	  (void) timespec_gettimeofday(&pp->p_etime, NULL);
+ 
+ 
+ 	pp->p_rusage = ru;
+@@ -507,7 +507,7 @@
+     }
+     pp->p_next = proclist.p_next;
+     proclist.p_next = pp;
+-    (void) gettimeofday(&pp->p_btime, NULL);
++    (void) timespec_gettimeofday(&pp->p_btime, NULL);
+ 
+ }
+ 
+diff -Naur csh-20230828/time.c csh-20230828.patched/time.c
+--- csh-20230828/time.c	2023-09-19 17:44:07.350219170 -0400
++++ csh-20230828.patched/time.c	2023-09-19 18:08:07.012078715 -0400
+@@ -30,6 +30,7 @@
+  * SUCH DAMAGE.
+  */
+ 
++#include <sys/time.h>
+ #include <sys/types.h>
+ #include <stdarg.h>
+ 
+@@ -39,6 +40,20 @@
+ /*
+  * C Shell - routines handling process timing and niceing
+  */
++
++int
++timespec_gettimeofday(struct timespec *restrict ts, struct timezone *restrict)
++{
++    int rv;
++    struct timeval tv;
++
++    rv = gettimeofday(&tv, NULL);
++    ts->tv_sec = tv.tv_sec;
++    ts->tv_nsec = tv.tv_usec * 1000;
++
++    return rv;
++}
++
+ static void	pdeltat(struct timeval *, struct timeval *);
+ 
+ void
+@@ -46,7 +61,7 @@
+ {
+     struct rusage ruch;
+ 
+-    (void) gettimeofday(&time0, NULL);
++    (void) timespec_gettimeofday(&time0, NULL);
+     (void) getrusage(RUSAGE_SELF, &ru0);
+     (void) getrusage(RUSAGE_CHILDREN, &ruch);
+     ruadd(&ru0, &ruch);
+@@ -65,7 +80,7 @@
+     (void) getrusage(RUSAGE_SELF, &ru1);
+     (void) getrusage(RUSAGE_CHILDREN, &ruch);
+     ruadd(&ru1, &ruch);
+-    (void) gettimeofday(&timedol, NULL);
++    (void) timespec_gettimeofday(&timedol, NULL);
+     prusage(&ru0, &ru1, &timedol, &time0);
+ }
+ 
diff --git a/system/csv2sql/README b/system/csv2sql/README
new file mode 100644
index 0000000000..8de8ec9317
--- /dev/null
+++ b/system/csv2sql/README
@@ -0,0 +1,6 @@
+csv2sql (create sqlite database from a CSV file)
+
+csv2sql is a Ruby script for importing comma-separated-value files
+into SQLite. It can read from a file or from standard input, and can
+create a new database or insert new data into an existing one. It can
+handle various character encodings; the default is UTF-8.
diff --git a/system/csv2sql/csv2sql.1 b/system/csv2sql/csv2sql.1
new file mode 100644
index 0000000000..b45e065bc7
--- /dev/null
+++ b/system/csv2sql/csv2sql.1
@@ -0,0 +1,162 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "CSV2SQL" 1 "2022-07-09" "0.1" "SlackBuilds.org"
+.SH NAME
+csv2sql \- import data from CSV files into an SQLite database
+.\" RST source for csv2sql(1) man page. Convert with:
+.
+.\" rst2man.py csv2sql.rst > csv2sql.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+csv2sql [\fB\-d\fP | \fB\-\-database\fP  \fIdatabase\fP] [\fB\-e\fP | \fB\-\-encoding\fP \fIencoding\fP \fIINPUT\fP:\fIOUTPUT\fP] [\fB\-f\fP | \fB\-\-file\fP \fIfilename\fP] [\fB\-h\fP | \fB\-\-help\fP] [\fB\-t\fP | \fB\-table\fP \fItable\fP] [\fB\-v\fP | \fB\-\-verbose\fP] [\fB\-V\fP | \fB\-\-version\fP]
+.SH DESCRIPTION
+.sp
+\fBcsv2sql\fP is a Ruby script for importing comma\-separated value files
+into SQLite.
+.sp
+The destination table and database will automatically be created if
+they do not already exist.
+.sp
+If the destination table already exists, then \fBcsv2sql\fP assumes that
+it contains the same number of columns as the input data. The column
+names do not need to match.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.BI \-d\fP,\fB  \-\-database \ DATABASE
+Database to import into. Default is \fIcsv2sql.db\fP\&.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-e, \-\-encoding INPUT:OUTPUT
+Input and output encodings. Default is \fIUTF\-8:UTF\-8\fP\&.
+.UNINDENT
+.INDENT 0.0
+.TP
+.BI \-f\fP,\fB  \-\-file \ FILENAME
+CSV file to import. You can alternately read CSV data from standard input.
+.TP
+.B  \-h\fP,\fB  \-\-help
+Print built\-in help message and exit.
+.TP
+.BI \-t\fP,\fB  \-\-table \ TABLE
+Table to import into. Default is the name of the file being imported from or \fIstdin\fP if CSV data is from standard input. Periods in the filename are replaced with underscores.
+.TP
+.B  \-v\fP,\fB  \-\-verbose
+Print verbose output.
+.TP
+.B  \-V\fP,\fB  \-\-version
+Print version number and exit.
+.UNINDENT
+.SH NOTE
+.sp
+\fBcsv2sql\fP assumes the first line of CSV data is a header giving the
+column names. If your CSV file doesn\(aqt have column names (if the first
+line is just CSV data), you\(aqll have to edit it and add the column
+names for \fBcsv2sql\fP to work correctly with it.
+.SH EXAMPLES
+.INDENT 0.0
+.IP 1. 3
+Import widgets.csv into the default table (widgets_csv) and database (csv2sql.db):
+.INDENT 3.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+csv2sql \-f widgets.csv
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.IP 2. 3
+Import standard input into the "foo" table within the "bar.db" database:
+.INDENT 3.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+cat widgets.csv | csv2sql \-t foo \-d bar.db
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.IP 3. 3
+Import products.csv and more\-products.csv into the "products" table within the default database (csv2sql.db):
+.INDENT 3.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+csv2sql \-f products.csv \-t products
+csv2sql \-f more\-products.csv \-t products
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.IP 4. 3
+Export data from SQLite sorted by the "ProductName" column to output.csv:
+.INDENT 3.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+sqlite3 \-header \-csv csv2sql.db "SELECT * FROM products ORDER BY ProductName" > output.csv
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.SH COPYRIGHT
+.sp
+\fBcsv2sql\fP is open source software released under the MIT License. See:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+http://www.opensource.org/licenses/MIT
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.SH AUTHORS
+.sp
+\fBcsv2sql\fP was written by Matt Rideout.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The csv2sql homepage: \fI\%http://csv2sql.org/\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/system/csv2sql/csv2sql.SlackBuild b/system/csv2sql/csv2sql.SlackBuild
new file mode 100644
index 0000000000..3fd9a532e0
--- /dev/null
+++ b/system/csv2sql/csv2sql.SlackBuild
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+# Slackware build script for csv2sql
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=csv2sql
+VERSION=${VERSION:-0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+chmod 644 *
+
+# As shipped, csv2sql refuses to read stdin if it's a redirect from a file.
+# This works:
+#   cat file.csv | csv2sql
+# This doesn't work:
+#   csv2sql < file.csv
+# ...which violates the principle of least surprise. The patch makes
+# it read from stdin unconditionally, if no filename given (so the 2nd
+# example will work). This is how standard UNIX utilities like cat,
+# grep, sed have worked for decades.
+# For those of you who don't like me patching the code, don't bother
+# complaining via email/etc. I consider this a bugfix that enhances
+# usability. Feel free to comment out the next line, if it bothers you:
+patch -p1 < $CWD/stdin.diff
+
+mkdir -p $PKG/usr/bin
+install -oroot -groot -m0755 $PRGNAM $PKG/usr/bin/$PRGNAM
+
+# man page by SlackBuild author.
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/csv2sql/csv2sql.info b/system/csv2sql/csv2sql.info
new file mode 100644
index 0000000000..230f488ad8
--- /dev/null
+++ b/system/csv2sql/csv2sql.info
@@ -0,0 +1,10 @@
+PRGNAM="csv2sql"
+VERSION="0.1"
+HOMEPAGE="http://csv2sql.org/"
+DOWNLOAD="https://github.com/mrideout/csv2sql/archive/v0.1/csv2sql-0.1.tar.gz"
+MD5SUM="8efce15a7114dd9d1ed3c5b2023f32fa"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="sqlite3"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/csv2sql/csv2sql.rst b/system/csv2sql/csv2sql.rst
new file mode 100644
index 0000000000..586fc13404
--- /dev/null
+++ b/system/csv2sql/csv2sql.rst
@@ -0,0 +1,109 @@
+.. RST source for csv2sql(1) man page. Convert with:
+..   rst2man.py csv2sql.rst > csv2sql.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 0.1
+.. |date| date::
+
+=======
+csv2sql
+=======
+
+--------------------------------------------------
+import data from CSV files into an SQLite database
+--------------------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+csv2sql [**-d** | **--database**  *database*] [**-e** | **--encoding** *encoding* *INPUT*:*OUTPUT*] [**-f** | **--file** *filename*] [**-h** | **--help**] [**-t** | **-table** *table*] [**-v** | **--verbose**] [**-V** | **--version**]
+
+DESCRIPTION
+===========
+
+**csv2sql** is a Ruby script for importing comma-separated value files
+into SQLite.
+
+The destination table and database will automatically be created if
+they do not already exist.
+
+If the destination table already exists, then **csv2sql** assumes that
+it contains the same number of columns as the input data. The column
+names do not need to match.
+
+OPTIONS
+=======
+
+-d, --database DATABASE
+  Database to import into. Default is *csv2sql.db*.
+
+-e, --encoding INPUT:OUTPUT
+  Input and output encodings. Default is *UTF-8:UTF-8*.
+
+-f, --file FILENAME
+  CSV file to import. You can alternately read CSV data from standard input.
+
+-h, --help
+  Print built-in help message and exit.
+
+-t, --table TABLE
+  Table to import into. Default is the name of the file being imported from or *stdin* if CSV data is from standard input. Periods in the filename are replaced with underscores.
+
+-v, --verbose
+  Print verbose output.
+
+-V, --version
+  Print version number and exit.
+
+NOTE
+====
+
+**csv2sql** assumes the first line of CSV data is a header giving the
+column names. If your CSV file doesn't have column names (if the first
+line is just CSV data), you'll have to edit it and add the column
+names for **csv2sql** to work correctly with it.
+
+EXAMPLES
+========
+
+1. Import widgets.csv into the default table (widgets_csv) and database (csv2sql.db)::
+
+        csv2sql -f widgets.csv
+
+2. Import standard input into the "foo" table within the "bar.db" database::
+
+        cat widgets.csv | csv2sql -t foo -d bar.db
+
+3. Import products.csv and more-products.csv into the "products" table within the default database (csv2sql.db)::
+
+        csv2sql -f products.csv -t products
+        csv2sql -f more-products.csv -t products
+
+4. Export data from SQLite sorted by the "ProductName" column to output.csv::
+
+        sqlite3 -header -csv csv2sql.db "SELECT * FROM products ORDER BY ProductName" > output.csv
+
+COPYRIGHT
+=========
+
+**csv2sql** is open source software released under the MIT License. See::
+
+  http://www.opensource.org/licenses/MIT
+
+AUTHORS
+=======
+
+**csv2sql** was written by Matt Rideout.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The csv2sql homepage: http://csv2sql.org/
diff --git a/system/csv2sql/slack-desc b/system/csv2sql/slack-desc
new file mode 100644
index 0000000000..2579914e05
--- /dev/null
+++ b/system/csv2sql/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+csv2sql: csv2sql (create sqlite database from a CSV file)
+csv2sql:
+csv2sql: csv2sql is a Ruby script for importing comma-separated-value files
+csv2sql: into SQLite. It can read from a file or from standard input, and can
+csv2sql: create a new database or insert new data into an existing one. It can
+csv2sql: handle various character encodings; the default is UTF-8.
+csv2sql:
+csv2sql:
+csv2sql:
+csv2sql:
+csv2sql:
diff --git a/system/csv2sql/stdin.diff b/system/csv2sql/stdin.diff
new file mode 100644
index 0000000000..7e04eda97e
--- /dev/null
+++ b/system/csv2sql/stdin.diff
@@ -0,0 +1,19 @@
+diff -Naur csv2sql-0.1/csv2sql csv2sql-0.1.patched/csv2sql
+--- csv2sql-0.1/csv2sql	2015-03-07 13:20:09.000000000 -0500
++++ csv2sql-0.1.patched/csv2sql	2022-07-08 15:50:54.975335386 -0400
+@@ -24,13 +24,9 @@
+     else
+       error "the CSV file that you specified (#{file}) does not exist. Exiting."
+     end
+-  # Otherwise, verify that standard input exists
++  # Otherwise, read from stdin
+   else
+-    if $stdin.fcntl(Fcntl::F_GETFL, 0) == 0
+-      verbose "Will read data from standard input."
+-    else
+-      error "you did not specify a CSV input file, or provide standard input. Exiting."
+-    end
++    verbose "Will read data from standard input."
+   end
+ end
+ 
diff --git a/system/csvutils/README b/system/csvutils/README
new file mode 100644
index 0000000000..01c799a343
--- /dev/null
+++ b/system/csvutils/README
@@ -0,0 +1,16 @@
+csvutils (inspect and manipulate CSV data)
+
+csvutils is a set of command-line utilities that use libcsv to access
+comma (or actually, any delimiter) separated data files. Included
+programs:
+
+csvcount - print the number of fields and rows in CSV files.
+csvcheck - determine the validity of CSV data.
+csvfix   - convert malformed CSV data into well formed data, and convert
+           to CSV data with different quotes and/or delimiters.
+csvgrep  - search specific fields of CSV data for a pattern.
+csvcut   - output only the specified fields of a CSV file.
+csvbreak - break a file into multiple pieces based on the value of the
+           specified field.
+
+Each utility has a man page.
diff --git a/system/csvutils/csvcheck_exit_status.diff b/system/csvutils/csvcheck_exit_status.diff
new file mode 100644
index 0000000000..df395e061f
--- /dev/null
+++ b/system/csvutils/csvcheck_exit_status.diff
@@ -0,0 +1,51 @@
+diff -Naur csvutils-0.9.3+20161218_e57951b/src/csvcheck.c csvutils-0.9.3+20161218_e57951b.patched/src/csvcheck.c
+--- csvutils-0.9.3+20161218_e57951b/src/csvcheck.c	2022-01-26 02:05:12.660602834 -0500
++++ csvutils-0.9.3+20161218_e57951b.patched/src/csvcheck.c	2022-01-26 02:33:11.553450216 -0500
+@@ -89,6 +89,8 @@
+   }
+ }
+ 
++int errcnt = 0;
++
+ void
+ check_file(char *filename)
+ {
+@@ -112,6 +114,7 @@
+     fp = fopen(filename, "rb");
+     if (fp == NULL) {
+       fprintf(stderr, "Failed to open file %s: %s\n", filename, strerror(errno));
++      errcnt++;
+       csv_free(&p);
+       return;
+     }
+@@ -121,18 +124,21 @@
+     if ((retval = csv_parse(&p, buf, bytes_read, NULL, NULL, NULL)) != bytes_read) {
+       if (csv_error(&p) == CSV_EPARSE) {
+         printf("%s: malformed at byte %lu\n", filename ? filename : "stdin", (unsigned long)pos + retval + 1);
++        errcnt++;
+         goto end;
+       } else {
+         printf("Error while processing %s: %s\n", filename ? filename : "stdin", csv_strerror(csv_error(&p)));
++        errcnt++;
+         goto end;
+       }
+     }
+     pos += 1024;
+   }
+ 
+-  if (csv_fini(&p, NULL, NULL, NULL) != 0)
++  if (csv_fini(&p, NULL, NULL, NULL) != 0) {
+     printf("%s: missing closing quote at end of input\n", filename ? filename : "stdin");
+-  else
++    errcnt++;
++  } else
+     printf("%s well-formed\n", filename ? filename : "data is");
+ 
+   end:
+@@ -186,5 +192,5 @@
+     check_file(NULL);
+   }
+ 
+-  return EXIT_SUCCESS;
++  return (errcnt ? EXIT_FAILURE : EXIT_SUCCESS);
+ }
diff --git a/system/csvutils/csvutils.SlackBuild b/system/csvutils/csvutils.SlackBuild
new file mode 100644
index 0000000000..4464d2ee9e
--- /dev/null
+++ b/system/csvutils/csvutils.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+# Slackware build script for csvutils
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=csvutils
+VERSION=${VERSION:-0.9.3+20161218_e57951b}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+### Patches by SlackBuild author:
+
+# Fix the csvgrep -i option (which was broken for both POSIX and PCRE
+# regex matches, and only worked for fixed-string matches).
+patch -p1 < $CWD/fix_i_option.diff
+
+# Make csvcheck exit with nonzero status if any file failed the check.
+patch -p1 < $CWD/csvcheck_exit_status.diff
+
+# There's also a bug that makes cvsfix change this:
+#   "broken,"bad","line"
+# to this:
+#   "broken,""bad","line"
+# ...which csvcheck says is valid (which is another bug).
+# It should be:
+#   "broken","bad","line"
+
+###
+
+make CPPFLAGS="$SLKCFLAGS -Wl,-s"
+
+# N.B. non-canonical use of DESTDIR and MANDIR.
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1
+make install DESTDIR=$PKG/usr/bin MANDIR=$PKG/usr/man/man1
+
+# Amazingly, the man pages are already gzipped. Might be a first.
+# Annoyingly, they're distributed gzipped, so I didn't patch them for
+# typos (of which there are a few).
+
+# pdf/*.pdf are just PDF copies of the man pages, don't install.
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a Changelog LICENSE README $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/csvutils/csvutils.info b/system/csvutils/csvutils.info
new file mode 100644
index 0000000000..c8b178868e
--- /dev/null
+++ b/system/csvutils/csvutils.info
@@ -0,0 +1,10 @@
+PRGNAM="csvutils"
+VERSION="0.9.3+20161218_e57951b"
+HOMEPAGE="https://sourceforge.net/projects/csvutils/"
+DOWNLOAD="https://slackware.uk/~urchlay/src/csvutils-0.9.3+20161218_e57951b.tar.xz"
+MD5SUM="f312aa2c65db7b4ba45a3037c7a90be2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libcsv"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/csvutils/fix_i_option.diff b/system/csvutils/fix_i_option.diff
new file mode 100644
index 0000000000..b00c56904f
--- /dev/null
+++ b/system/csvutils/fix_i_option.diff
@@ -0,0 +1,21 @@
+diff -Naur csvutils-0.9.3+20161218_e57951b/src/csvgrep.c csvutils-0.9.3+20161218_e57951b.patched/src/csvgrep.c
+--- csvutils-0.9.3+20161218_e57951b/src/csvgrep.c	2022-01-26 02:05:12.660602834 -0500
++++ csvutils-0.9.3+20161218_e57951b.patched/src/csvgrep.c	2022-01-26 02:22:34.393508136 -0500
+@@ -788,7 +788,7 @@
+     #ifdef WITHOUT_PCRE
+     err("not compiled with pcre support");
+     #else
+-    re = pcre_compile(pattern, 0, &err_ptr, &rv, NULL);
++    re = pcre_compile(pattern, (ignore_case ? PCRE_CASELESS : 0), &err_ptr, &rv, NULL);
+     if (rv) {
+       fprintf(stderr, "Error parsing pattern expression: %s\n", err_ptr);
+       exit(EXIT_FAILURE);
+@@ -798,7 +798,7 @@
+     #ifdef WITHOUT_POSIX
+     err("not compiled with posix support");
+     #else
+-    if ((rv = regcomp(&preg, pattern, REG_EXTENDED | REG_NOSUB )) != 0) {
++    if ((rv = regcomp(&preg, pattern, REG_EXTENDED | REG_NOSUB | (ignore_case ? REG_ICASE : 0))) != 0) {
+       regerror(rv, &preg, errbuf, sizeof errbuf);
+       fprintf(stderr, "Error parsing pattern expression: %s\n", errbuf);
+       exit(EXIT_FAILURE);
diff --git a/system/csvutils/git2tarxz.sh b/system/csvutils/git2tarxz.sh
new file mode 100644
index 0000000000..10c1aa6909
--- /dev/null
+++ b/system/csvutils/git2tarxz.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create
+# a tarball of. With no arg, HEAD is used.
+
+PRGNAM=csvutils
+CLONE_URL=https://github.com/rgamble/csvutils
+
+# upstream doesn't use tags. csvutils was moved to github after
+# this release.
+OLDVER=0.9.3
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=$OLDVER+${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/system/csvutils/slack-desc b/system/csvutils/slack-desc
new file mode 100644
index 0000000000..df7f28db3e
--- /dev/null
+++ b/system/csvutils/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+csvutils: csvutils (inspect and manipulate CSV data)
+csvutils:
+csvutils: csvutils is a set of command-line utilities that use libcsv to access
+csvutils: comma (or actually, any delimiter) separated data files. Included
+csvutils: programs: csvcount, csvcheck, csvfix, csvgrep, csvcut, csvbreak.
+csvutils:
+csvutils:
+csvutils:
+csvutils:
+csvutils:
+csvutils:
diff --git a/system/culmus/culmus.SlackBuild b/system/culmus/culmus.SlackBuild
index 687b1e6d80..d3d5da8a77 100644
--- a/system/culmus/culmus.SlackBuild
+++ b/system/culmus/culmus.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for culmus
 # Copyright 2012, Niv Ierushalmi, Haifa, Israel
@@ -24,14 +24,26 @@
 # This script does not build anything, it only repackages the culmus fonts
 # into a slackware package
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=4:
+# - ignore ARCH in environment (generally it's set to x86_64 or i686,
+#   which is wrong for this build).
+# - add SlackBuild to doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=culmus
 VERSION=${VERSION:-0.130}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
 
-ARCH=${ARCH:-noarch}
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,9 +59,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p $PKG/usr/share/fonts/TTF/
 cp *.ttf $PKG/usr/share/fonts/TTF/
@@ -66,10 +78,11 @@ ln -sf ../conf.avail/61-culmus.conf $PKG/etc/fonts/conf.d
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CHANGES GNU-GPL LICENSE LICENSE-BITSTREAM $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cups-bjnp/README b/system/cups-bjnp/README
index 230f05788f..542f5dda29 100644
--- a/system/cups-bjnp/README
+++ b/system/cups-bjnp/README
@@ -1,4 +1,6 @@
-This is a CUPS back-end for the canon printers using the proprietary USB over 
-IP BJNP protocol. This back-end allows Cups to print over the network
-to a Canon printer. It currently supports Cups 1.2 and later. It is
-designed using reverse engineering of the protocol.
+cups-bjnp (CUPS backend using the BJNP protocol)
+
+This is a CUPS back-end for the Canon printers using the proprietary
+USB over IP BJNP protocol. This back-end allows CUPS to print over
+the network to a Canon printer. It currently supports CUPs 1.2 and
+later. It is designed using reverse engineering of the protocol.
diff --git a/system/cups-bjnp/cups-bjnp.SlackBuild b/system/cups-bjnp/cups-bjnp.SlackBuild
index 1829168b60..faeb7851c1 100644
--- a/system/cups-bjnp/cups-bjnp.SlackBuild
+++ b/system/cups-bjnp/cups-bjnp.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cups-bjnp
 
@@ -22,26 +22,36 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220212 bkw: Modified by SlackBuilds.org: updated for v2.0.3,
+# for Slackware 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cups-bjnp
-VERSION=${VERSION:-1.2}
+VERSION=${VERSION:-2.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,26 +75,21 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error" \
 ./configure \
   --prefix=/usr \
   --with-cupsbackenddir=/usr/lib${LIBDIRSUFFIX}/cups/backend \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+cp -a AUTHORS COPYING ChangeLog NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -92,4 +97,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cups-bjnp/cups-bjnp.info b/system/cups-bjnp/cups-bjnp.info
index 1d96d3b238..925ff4f886 100644
--- a/system/cups-bjnp/cups-bjnp.info
+++ b/system/cups-bjnp/cups-bjnp.info
@@ -1,8 +1,8 @@
 PRGNAM="cups-bjnp"
-VERSION="1.2"
+VERSION="2.0.3"
 HOMEPAGE="https://sourceforge.net/projects/cups-bjnp/"
-DOWNLOAD="https://downloads.sourceforge.net/cups-bjnp/cups-bjnp-1.2.tar.gz"
-MD5SUM="8672b4585b71dee6dcefa00fbbbe7698"
+DOWNLOAD="https://downloads.sourceforge.net/cups-bjnp/cups-bjnp-2.0.3.tar.gz"
+MD5SUM="1d5a1588f3649ce7c5758cbea5a86900"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/cups-bjnp/slack-desc b/system/cups-bjnp/slack-desc
index 84480ebce1..f350ccbd42 100644
--- a/system/cups-bjnp/slack-desc
+++ b/system/cups-bjnp/slack-desc
@@ -8,9 +8,9 @@
          |-----handy-ruler------------------------------------------------------|
 cups-bjnp: cups-bjnp (CUPS backend using the BJNP protocol)
 cups-bjnp:
-cups-bjnp: CUPS back-end for the canon printers using the proprietary USB over
-cups-bjnp: IP BJNP protocol. This back-end allows Cups to print over the network
-cups-bjnp: to a Canon printer. It currently supports Cups 1.2 and later. It is
+cups-bjnp: CUPS back-end for the Canon printers using the proprietary USB over
+cups-bjnp: IP BJNP protocol. This back-end allows CUPS to print over the network
+cups-bjnp: to a Canon printer. It currently supports CUPS 1.2 and later. It is
 cups-bjnp: designed using reverse engineering of the protocol.
 cups-bjnp:
 cups-bjnp:
diff --git a/system/curlftpfs/curlftpfs.SlackBuild b/system/curlftpfs/curlftpfs.SlackBuild
index 29f53b67d8..8d3fd9e58e 100644
--- a/system/curlftpfs/curlftpfs.SlackBuild
+++ b/system/curlftpfs/curlftpfs.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for curlftpfs
 
-# Copyright 2008-2011 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2022 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - get rid of 0-byte "documentation" and useless INSTALL.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=curlftpfs
 VERSION=${VERSION:-0.9.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,9 +75,37 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# Apply patch from Gentoo
+
+# https://sourceforge.net/p/curlftpfs/bugs/65/
+# May also fix these:
+# https://sourceforge.net/p/curlftpfs/bugs/34/
+# https://sourceforge.net/p/curlftpfs/bugs/74/
+patch -p1 -i $CWD/patches/curlftpfs-0.9.2-fix-escaping.patch
+
+# Apply patches from Fedora
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=962015
+patch -p1 -i $CWD/patches/curlftpfs-0.9.2-create-fix.patch
+
+# https://sourceforge.net/p/curlftpfs/bugs/52/
+patch -p1 -i $CWD/patches/curlftpfs-0.9.2-memleak-591298.patch
+
+# https://sourceforge.net/p/curlftpfs/bugs/58/
+patch -p1 -i $CWD/patches/curlftpfs-0.9.2-memleak-cached-591299.patch
+
+# https://sourceforge.net/p/curlftpfs/bugs/50/
+patch -p1 -i $CWD/patches/curlftpfs-0.9.2-offset_64_another.patch
+
+# Apply patch from Arch
+
+# https://bugs.archlinux.org/task/47906
+# https://sourceforge.net/p/curlftpfs/bugs/67/
+patch -p1 -i $CWD/patches/no-verify-hostname.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -87,7 +125,7 @@ make install-strip DESTDIR=$PKG
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README \
+cp -a ChangeLog COPYING README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -95,4 +133,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/curlftpfs/curlftpfs.info b/system/curlftpfs/curlftpfs.info
index c68e3c194f..bdafa9e9c8 100644
--- a/system/curlftpfs/curlftpfs.info
+++ b/system/curlftpfs/curlftpfs.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+EMAIL="pprkut@slackbuilds.org"
diff --git a/system/curlftpfs/patches/curlftpfs-0.9.2-create-fix.patch b/system/curlftpfs/patches/curlftpfs-0.9.2-create-fix.patch
new file mode 100644
index 0000000000..4389d9d18a
--- /dev/null
+++ b/system/curlftpfs/patches/curlftpfs-0.9.2-create-fix.patch
@@ -0,0 +1,33 @@
+diff -NaurEbBH -x '*.Plo' -x Makefile -x '*.log' -x '*.status' -x '*.list' -x '*.Po' -x libtool -x nbproject curlftpfs-0.9.2.orig/ftpfs.c curlftpfs-0.9.2/ftpfs.c
+--- curlftpfs-0.9.2.orig/ftpfs.c	2013-05-12 14:31:57.000000000 +0400
++++ curlftpfs-0.9.2/ftpfs.c	2013-05-12 14:29:00.906721322 +0400
+@@ -759,13 +759,13 @@
+ 		err = -ENOTSUP;
+ 	  }
+ 	  
+-	  if ((fi->flags & O_EXCL))
+-	  {
+-		DEBUG(1, "opening %s with O_EXCL - testing existence\n", path);
+-		int exists_r = test_exists(path);
+-		if (exists_r != -ENOENT)
+-			err = -EACCES;
+-	  }
++//	  if ((fi->flags & O_EXCL))
++//	  {
++//		DEBUG(1, "opening %s with O_EXCL - testing existence\n", path);
++//		int exists_r = test_exists(path);
++//		if (exists_r != -ENOENT)
++//			err = -EACCES;
++//	  }
+ 	  
+ 	  if (!err)
+ 	  {
+@@ -816,6 +816,8 @@
+ #if FUSE_VERSION >= 25
+ static int ftpfs_create(const char* path, mode_t mode,
+                         struct fuse_file_info* fi) {
++//	return ftpfs_open_common(path, mode, fi);
++	ftpfs_mknod(path, mode, NULL);
+   return ftpfs_open_common(path, mode, fi);
+ }
+ #endif
diff --git a/system/curlftpfs/patches/curlftpfs-0.9.2-fix-escaping.patch b/system/curlftpfs/patches/curlftpfs-0.9.2-fix-escaping.patch
new file mode 100644
index 0000000000..df15bddd56
--- /dev/null
+++ b/system/curlftpfs/patches/curlftpfs-0.9.2-fix-escaping.patch
@@ -0,0 +1,420 @@
+fix handling of special symbols in file operations.
+
+Path fixes at least following cases:
+  - attempt to enter directory named '#'
+  - attempt to open file named '#'
+  - attempt to dereference link named '#'
+  - attempt to chown file / dir named '#'
+
+The fix is basically following mechanical conversion:
+---    curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, something);
++++    something_uri = path_to_uri(something);
++++    curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, something_uri);
+===    curl_easy_perform();
++++    free_uri(something_uri);
+
+What is not yet converted is ftp hostname.
+
+Reported-by: Jaakko Perttilä
+Gentoo-bug: http://bugs.gentoo.org/458110
+Based-on-patch: https://github.com/jomat/curlftpfs/commit/da20298fd0d0dcefc7d6d69ffecbc5544e783cfe
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+diff --git a/ftpfs.c b/ftpfs.c
+index ffd0b28..f21a267 100644
+--- a/ftpfs.c
++++ b/ftpfs.c
+@@ -257,6 +257,7 @@ static int ftpfs_getdir(const char* path, fuse_cache_dirh_t h,
+   int err = 0;
+   CURLcode curl_res;
+   char* dir_path = get_fulldir_path(path);
++  char* dir_path_uri = path_to_uri(dir_path);
+ 
+   DEBUG(1, "ftpfs_getdir: %s\n", dir_path);
+   struct buffer buf;
+@@ -264,7 +265,7 @@ static int ftpfs_getdir(const char* path, fuse_cache_dirh_t h,
+ 
+   pthread_mutex_lock(&ftpfs.lock);
+   cancel_previous_multi();
+-  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, dir_path);
++  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, dir_path_uri);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf);
+   curl_res = curl_easy_perform(ftpfs.connection);
+   pthread_mutex_unlock(&ftpfs.lock);
+@@ -278,6 +279,7 @@ static int ftpfs_getdir(const char* path, fuse_cache_dirh_t h,
+               NULL, NULL, NULL, 0, h, filler); 
+   }
+ 
++  free_uri(dir_path_uri);
+   free(dir_path);
+   buf_free(&buf);
+   return op_return(err, "ftpfs_getdir");
+@@ -287,6 +289,7 @@ static int ftpfs_getattr(const char* path, struct stat* sbuf) {
+   int err;
+   CURLcode curl_res;
+   char* dir_path = get_dir_path(path);
++  char* dir_path_uri = path_to_uri(dir_path);
+ 
+   DEBUG(2, "ftpfs_getattr: %s dir_path=%s\n", path, dir_path);
+   struct buffer buf;
+@@ -294,7 +297,7 @@ static int ftpfs_getattr(const char* path, struct stat* sbuf) {
+ 
+   pthread_mutex_lock(&ftpfs.lock);
+   cancel_previous_multi();
+-  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, dir_path);
++  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, dir_path_uri);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf);
+   curl_res = curl_easy_perform(ftpfs.connection);
+   pthread_mutex_unlock(&ftpfs.lock);
+@@ -309,6 +312,7 @@ static int ftpfs_getattr(const char* path, struct stat* sbuf) {
+   err = parse_dir((char*)buf.p, dir_path + strlen(ftpfs.host) - 1,
+                   name, sbuf, NULL, 0, NULL, NULL); 
+ 
++  free_uri(dir_path_uri);
+   free(dir_path);
+   buf_free(&buf);
+   if (err) return op_return(-ENOENT, "ftpfs_getattr");
+@@ -329,6 +333,7 @@ static size_t ftpfs_read_chunk(const char* full_path, char* rbuf,
+   int running_handles = 0;
+   int err = 0;
+   struct ftpfs_file* fh = get_ftpfs_file(fi);
++  char* full_path_uri = path_to_uri(full_path); /* TODO: optimize bu pushing up conversion to context */
+ 
+   DEBUG(2, "ftpfs_read_chunk: %s %p %zu %lld %p %p\n",
+         full_path, rbuf, size, offset, fi, fh);
+@@ -355,7 +360,7 @@ static size_t ftpfs_read_chunk(const char* full_path, char* rbuf,
+ 
+       cancel_previous_multi();
+       
+-      curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path);
++      curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path_uri);
+       curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &fh->buf);
+       if (offset) {
+         char range[15];
+@@ -444,6 +449,7 @@ static size_t ftpfs_read_chunk(const char* full_path, char* rbuf,
+ 
+   pthread_mutex_unlock(&ftpfs.lock);
+ 
++  free_uri(full_path_uri);
+   if (err) return CURLFTPFS_BAD_READ;
+   return size;
+ }
+@@ -497,11 +503,12 @@ int write_thread_ctr = 0;
+ static void *ftpfs_write_thread(void *data) {
+   struct ftpfs_file *fh = data;
+   char range[15];
+-  
++  char* full_path_uri = path_to_uri(fh->full_path); /* TODO: optimize bu pushing up conversion to context */
++
+   DEBUG(2, "enter streaming write thread #%d path=%s pos=%lld\n", ++write_thread_ctr, fh->full_path, fh->pos);
+   
+   
+-  curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, fh->full_path);
++  curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, full_path_uri);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_UPLOAD, 1);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, (curl_off_t)-1);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READFUNCTION, write_data_bg);
+@@ -541,6 +548,8 @@ static void *ftpfs_write_thread(void *data) {
+   
+   sem_post(&fh->data_written); /* ftpfs_write may return */
+ 
++  free_uri(full_path_uri);
++
+   return NULL;
+ }
+ 
+@@ -621,16 +630,19 @@ static void free_ftpfs_file(struct ftpfs_file *fh) {
+ }
+ 
+ static int buffer_file(struct ftpfs_file *fh) {
++  char* full_path_uri = path_to_uri(fh->full_path); /* TODO: optimize bu pushing up conversion to context */
+   // If we want to write to the file, we have to load it all at once,
+   // modify it in memory and then upload it as a whole as most FTP servers
+   // don't support resume for uploads.
+   pthread_mutex_lock(&ftpfs.lock);
+   cancel_previous_multi();
+-  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, fh->full_path);
++  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path_uri);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &fh->buf);
+   CURLcode curl_res = curl_easy_perform(ftpfs.connection);
+   pthread_mutex_unlock(&ftpfs.lock);
+ 
++  free_uri(full_path_uri);
++
+   if (curl_res != 0) {
+     return -EACCES;
+   }
+@@ -643,10 +655,11 @@ static int create_empty_file(const char * path)
+   int err = 0;
+ 
+   char *full_path = get_full_path(path);
++  char* full_path_uri = path_to_uri(full_path);
+ 
+   pthread_mutex_lock(&ftpfs.lock);
+   cancel_previous_multi();
+-  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path);
++  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path_uri);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_INFILESIZE, 0);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_UPLOAD, 1);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_READDATA, NULL);
+@@ -656,7 +669,9 @@ static int create_empty_file(const char * path)
+ 
+   if (curl_res != 0) {
+     err = -EPERM;
+-  }	
++  }
++
++  free_uri(full_path_uri);
+   free(full_path);
+   return err;
+ }
+@@ -875,6 +890,7 @@ static int ftpfs_chmod(const char* path, mode_t mode) {
+   
+   struct curl_slist* header = NULL;
+   char* full_path = get_dir_path(path);
++  char* full_path_uri = path_to_uri(full_path);
+   char* filename = get_file_name(path);
+   char* cmd = g_strdup_printf("SITE CHMOD %.3o %s", mode_c, filename);
+   struct buffer buf;
+@@ -885,7 +901,7 @@ static int ftpfs_chmod(const char* path, mode_t mode) {
+   pthread_mutex_lock(&ftpfs.lock);
+   cancel_previous_multi();
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_POSTQUOTE, header);
+-  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path);
++  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path_uri);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_NOBODY, ftpfs.safe_nobody);
+   CURLcode curl_res = curl_easy_perform(ftpfs.connection);
+@@ -896,12 +912,13 @@ static int ftpfs_chmod(const char* path, mode_t mode) {
+   if (curl_res != 0) {
+     err = -EPERM;
+   }
+-  
++
+   buf_free(&buf);
+   curl_slist_free_all(header);
++  free_uri(full_path_uri);
+   free(full_path);
+   free(filename);
+-  free(cmd); 
++  free(cmd);
+   return op_return(err, "ftpfs_chmod");
+ }
+ 
+@@ -912,6 +929,7 @@ static int ftpfs_chown(const char* path, uid_t uid, gid_t gid) {
+   
+   struct curl_slist* header = NULL;
+   char* full_path = get_dir_path(path);
++  char* full_path_uri = path_to_uri(full_path);
+   char* filename = get_file_name(path);
+   char* cmd = g_strdup_printf("SITE CHUID %i %s", uid, filename);
+   char* cmd2 = g_strdup_printf("SITE CHGID %i %s", gid, filename);
+@@ -924,7 +942,7 @@ static int ftpfs_chown(const char* path, uid_t uid, gid_t gid) {
+   pthread_mutex_lock(&ftpfs.lock);
+   cancel_previous_multi();
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_POSTQUOTE, header);
+-  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path);
++  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path_uri);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_NOBODY, ftpfs.safe_nobody);
+   CURLcode curl_res = curl_easy_perform(ftpfs.connection);
+@@ -938,6 +956,7 @@ static int ftpfs_chown(const char* path, uid_t uid, gid_t gid) {
+   
+   buf_free(&buf);
+   curl_slist_free_all(header);
++  free_uri(full_path_uri);
+   free(full_path);
+   free(filename);
+   free(cmd); 
+@@ -1001,6 +1020,7 @@ static int ftpfs_rmdir(const char* path) {
+   int err = 0;
+   struct curl_slist* header = NULL;
+   char* full_path = get_dir_path(path);
++  char* full_path_uri = path_to_uri(full_path);
+   char* filename = get_file_name(path);
+   char* cmd = g_strdup_printf("RMD %s", filename);
+   struct buffer buf;
+@@ -1014,7 +1034,7 @@ static int ftpfs_rmdir(const char* path) {
+   pthread_mutex_lock(&ftpfs.lock);
+   cancel_previous_multi();
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_POSTQUOTE, header);
+-  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path);
++  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path_uri);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_NOBODY, ftpfs.safe_nobody);
+   CURLcode curl_res = curl_easy_perform(ftpfs.connection);
+@@ -1028,6 +1048,7 @@ static int ftpfs_rmdir(const char* path) {
+   
+   buf_free(&buf);
+   curl_slist_free_all(header);
++  free_uri(full_path_uri);
+   free(full_path);
+   free(filename);
+   free(cmd);
+@@ -1038,6 +1059,7 @@ static int ftpfs_mkdir(const char* path, mode_t mode) {
+   int err = 0;
+   struct curl_slist* header = NULL;
+   char* full_path = get_dir_path(path);
++  char* full_path_uri = path_to_uri(full_path);
+   char* filename = get_file_name(path);
+   char* cmd = g_strdup_printf("MKD %s", filename);
+   struct buffer buf;
+@@ -1048,7 +1070,7 @@ static int ftpfs_mkdir(const char* path, mode_t mode) {
+   pthread_mutex_lock(&ftpfs.lock);
+   cancel_previous_multi();
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_POSTQUOTE, header);
+-  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path);
++  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path_uri);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_NOBODY, ftpfs.safe_nobody);
+   CURLcode curl_res = curl_easy_perform(ftpfs.connection);
+@@ -1062,6 +1084,7 @@ static int ftpfs_mkdir(const char* path, mode_t mode) {
+   
+   buf_free(&buf);
+   curl_slist_free_all(header);
++  free_uri(full_path_uri);
+   free(full_path);
+   free(filename);
+   free(cmd);
+@@ -1076,6 +1099,7 @@ static int ftpfs_unlink(const char* path) {
+   int err = 0;
+   struct curl_slist* header = NULL;
+   char* full_path = get_dir_path(path);
++  char* full_path_uri = path_to_uri(full_path);
+   char* filename = get_file_name(path);
+   char* cmd = g_strdup_printf("DELE %s", filename);
+   struct buffer buf;
+@@ -1086,7 +1110,7 @@ static int ftpfs_unlink(const char* path) {
+   pthread_mutex_lock(&ftpfs.lock);
+   cancel_previous_multi();
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_POSTQUOTE, header);
+-  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path);
++  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path_uri);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_NOBODY, ftpfs.safe_nobody);
+   CURLcode curl_res = curl_easy_perform(ftpfs.connection);
+@@ -1100,6 +1124,7 @@ static int ftpfs_unlink(const char* path) {
+   
+   buf_free(&buf);
+   curl_slist_free_all(header);
++  free_uri(full_path_uri);
+   free(full_path);
+   free(filename);
+   free(cmd);
+@@ -1301,6 +1326,7 @@ static int ftpfs_readlink(const char *path, char *linkbuf, size_t size) {
+   int err;
+   CURLcode curl_res;
+   char* dir_path = get_dir_path(path);
++  char* dir_path_uri = path_to_uri(dir_path);
+ 
+   DEBUG(2, "dir_path: %s %s\n", path, dir_path);
+   struct buffer buf;
+@@ -1308,7 +1334,7 @@ static int ftpfs_readlink(const char *path, char *linkbuf, size_t size) {
+ 
+   pthread_mutex_lock(&ftpfs.lock);
+   cancel_previous_multi();
+-  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, dir_path);
++  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, dir_path_uri);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_WRITEDATA, &buf);
+   curl_res = curl_easy_perform(ftpfs.connection);
+   pthread_mutex_unlock(&ftpfs.lock);
+@@ -1323,6 +1349,7 @@ static int ftpfs_readlink(const char *path, char *linkbuf, size_t size) {
+   err = parse_dir((char*)buf.p, dir_path + strlen(ftpfs.host) - 1,
+                   name, NULL, linkbuf, size, NULL, NULL); 
+ 
++  free_uri(dir_path_uri);
+   free(dir_path);
+   buf_free(&buf);
+   if (err) return op_return(-ENOENT, "ftpfs_readlink");
+diff --git a/path_utils.c b/path_utils.c
+index db3d7e4..214b5e6 100644
+--- a/path_utils.c
++++ b/path_utils.c
+@@ -92,3 +92,72 @@ char* get_dir_path(const char* path) {
+ 
+   return ret;
+ }
++
++/*
++ * the chars not needed to be escaped:
++ *    unreserved  = ALPHA / DIGIT / "-" / "." / "_" / "~"
++ */
++static inline int is_unreserved_rfc3986(char c)
++{
++    int is_locase_alpha = (c >= 'a' && c <= 'z');
++    int is_upcase_alpha = (c >= 'a' && c <= 'z');
++    int is_digit        = (c >= '0' && c <= '9');
++    int is_special      = c == '-'
++                       || c == '.'
++                       || c == '_'
++                       || c == '~';
++    int is_unreserved = is_locase_alpha
++                      || is_upcase_alpha
++                      || is_digit
++                      || is_special;
++
++    return is_unreserved;
++}
++
++static inline int is_unreserved(char c)
++{
++    return is_unreserved_rfc3986(c) || c == '/';
++}
++
++char* path_to_uri(const char* path)
++{
++    static const char hex[] = "0123456789ABCDEF";
++    size_t path_len = strlen(path);
++    size_t host_len = strlen(ftpfs.host);
++    /* at worst: c -> %XX */
++    char * encoded_path = malloc (3 * path_len + 1);
++    const char * s = path;
++    char * d       = encoded_path;
++
++    /*
++     * 'path' is always prefixed with 'ftpfs.host'
++     */
++    memcpy (d, ftpfs.host, host_len);
++    s += host_len;
++    d += host_len;
++
++    for (; *s; ++s)
++    {
++        char c = *s;
++        if (is_unreserved (c))
++        {
++            *d++ = c;
++        }
++        else
++        {
++            unsigned int hi = ((unsigned)c >> 4) & 0xF;
++            unsigned int lo = ((unsigned)c >> 0) & 0xF;
++            *d++ = '%';
++            *d++ = hex[hi];
++            *d++ = hex[lo];
++        }
++    }
++    *d = '\0';
++
++    return encoded_path;
++}
++
++void free_uri(char* path)
++{
++    free(path);
++}
+diff --git a/path_utils.h b/path_utils.h
+index 084ae4d..e3e9bca 100644
+--- a/path_utils.h
++++ b/path_utils.h
+@@ -6,4 +6,11 @@ char* get_full_path(const char* path);
+ char* get_fulldir_path(const char* path);
+ char* get_dir_path(const char* path);
+ 
++/*
++ * Transforms UNIX path to RFC3986 encoded path
++ * (CURLOPT_URL accepts only such paths)
++ */
++char* path_to_uri(const char* path);
++void free_uri(char* path);
++
+ #endif   /* __CURLFTPFS_PATH_UTILS_H__ */
diff --git a/system/curlftpfs/patches/curlftpfs-0.9.2-memleak-591298.patch b/system/curlftpfs/patches/curlftpfs-0.9.2-memleak-591298.patch
new file mode 100644
index 0000000000..94f46ba5c3
--- /dev/null
+++ b/system/curlftpfs/patches/curlftpfs-0.9.2-memleak-591298.patch
@@ -0,0 +1,15 @@
+@@ -, +, @@ 
+---
+ ftpfs.c |    2 	2 +	0 -	0 !
+ 1 file changed, 2 insertions(+)
+--- b/ftpfs.c	
++++ b/ftpfs.c	
+@@ -615,6 +615,8 @@ static void free_ftpfs_file(struct ftpfs
+   sem_destroy(&fh->data_need);
+   sem_destroy(&fh->data_written);
+   sem_destroy(&fh->ready);
++  if (fh->buf.size) { buf_free(&fh->buf); }
++  if (fh->stream_buf.size) { buf_free(&fh->stream_buf); }
+   free(fh);
+ }
+ 
diff --git a/system/curlftpfs/patches/curlftpfs-0.9.2-memleak-cached-591299.patch b/system/curlftpfs/patches/curlftpfs-0.9.2-memleak-cached-591299.patch
new file mode 100644
index 0000000000..d08c1f82d4
--- /dev/null
+++ b/system/curlftpfs/patches/curlftpfs-0.9.2-memleak-cached-591299.patch
@@ -0,0 +1,58 @@
+@@ -, +, @@ 
+---
+ cache.c    |    2 	1 +	1 -	0 !
+ ftpfs-ls.c |   19 	15 +	4 -	0 !
+ 2 files changed, 16 insertions(+), 5 deletions(-)
+--- b/cache.c	
++++ b/cache.c	
+@@ -25,7 +25,7 @@ struct cache {
+     time_t last_cleaned;
+ };
+ 
+-static struct cache cache;
++struct cache cache;
+ 
+ struct node {
+     struct stat stat;
+--- b/ftpfs-ls.c	
++++ b/ftpfs-ls.c	
+@@ -25,6 +25,13 @@ 
+ #include "charset_utils.h"
+ #include "ftpfs-ls.h"
+ 
++struct cache {
++    int on;
++    char incomplete[];
++};
++
++extern struct cache cache;
++
+ static int parse_dir_unix(const char *line,
+                           struct stat *sbuf,
+                           char *file,
+@@ -243,8 +250,10 @@ int parse_dir(const char* list, const ch
+           reallink = g_strdup(link);
+         }
+         int linksize = strlen(reallink);
+-        cache_add_link(full_path, reallink, linksize+1);
+-        DEBUG(1, "cache_add_link: %s %s\n", full_path, reallink);
++        if (cache.on) {
++          cache_add_link(full_path, reallink, linksize+1);
++          DEBUG(1, "cache_add_link: %s %s\n", full_path, reallink);
++        }
+         if (linkbuf && linklen) {
+           if (linksize > linklen) linksize = linklen - 1;
+           strncpy(linkbuf, reallink, linksize);
+@@ -257,8 +266,10 @@ int parse_dir(const char* list, const ch
+         DEBUG(1, "filler: %s\n", file);
+         filler(h, file, &stat_buf);
+       } else {
+-        DEBUG(1, "cache_add_attr: %s\n", full_path);
+-        cache_add_attr(full_path, &stat_buf);
++        if (cache.on) {
++          DEBUG(1, "cache_add_attr: %s\n", full_path);
++          cache_add_attr(full_path, &stat_buf);
++        }
+       }
+ 
+       DEBUG(2, "comparing %s %s\n", name, file);
diff --git a/system/curlftpfs/patches/curlftpfs-0.9.2-offset_64_another.patch b/system/curlftpfs/patches/curlftpfs-0.9.2-offset_64_another.patch
new file mode 100644
index 0000000000..f3d85df32b
--- /dev/null
+++ b/system/curlftpfs/patches/curlftpfs-0.9.2-offset_64_another.patch
@@ -0,0 +1,21 @@
+@@ -, +, @@ 
+ ftpfs.c |    4 	2 +	2 -	0 !
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+--- b/ftpfs.c	
++++ b/ftpfs.c	
+@@ -503,7 +503,6 @@ static void *ftpfs_write_thread(void *da
+   
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, full_path_uri);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_UPLOAD, 1);
+-  curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, -1);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READFUNCTION, write_data_bg);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READDATA, fh);
+   curl_easy_setopt_or_die(fh->write_conn, CURLOPT_LOW_SPEED_LIMIT, 1);
+@@ -645,7 +645,6 @@ static int create_empty_file(const char 
+   pthread_mutex_lock(&ftpfs.lock);
+   cancel_previous_multi();
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path_uri);
+-  curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_INFILESIZE, 0);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_UPLOAD, 1);
+   curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_READDATA, NULL);
+   CURLcode curl_res = curl_easy_perform(ftpfs.connection);
diff --git a/system/curlftpfs/patches/no-verify-hostname.patch b/system/curlftpfs/patches/no-verify-hostname.patch
new file mode 100644
index 0000000000..cf0d410ad9
--- /dev/null
+++ b/system/curlftpfs/patches/no-verify-hostname.patch
@@ -0,0 +1,14 @@
+diff -aur curlftpfs-0.9.2.orig/ftpfs.c curlftpfs-0.9.2.new/ftpfs.c
+--- curlftpfs-0.9.2.orig/ftpfs.c	2016-01-25 17:01:32.150581272 +0100
++++ curlftpfs-0.9.2.new/ftpfs.c	2016-01-25 17:02:08.566538053 +0100
+@@ -1625,9 +1625,7 @@
+   }
+ 
+   if (ftpfs.no_verify_hostname) {
+-    /* The default is 2 which verifies even the host string. This sets to 1
+-     * which means verify the host but not the string. */
+-    curl_easy_setopt_or_die(easy, CURLOPT_SSL_VERIFYHOST, 1);
++    curl_easy_setopt_or_die(easy, CURLOPT_SSL_VERIFYHOST, 0);
+   }
+ 
+   curl_easy_setopt_or_die(easy, CURLOPT_INTERFACE, ftpfs.interface);
diff --git a/system/cutecom/cutecom.SlackBuild b/system/cutecom/cutecom.SlackBuild
index c5713c78cf..b6d64c8ae4 100644
--- a/system/cutecom/cutecom.SlackBuild
+++ b/system/cutecom/cutecom.SlackBuild
@@ -1,29 +1,41 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cutecom
 
 # Written by Vincent Batts, vbatts@hashbangbash.com
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - get rid of KDECONFIG_EXECUTABLE in cmake command, we don't have
+#   it on Slackware 15.0.
+# - i486 => i586.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cutecom
 VERSION=${VERSION:-0.22.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -47,9 +59,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 mkdir -p build
 cd build
@@ -57,17 +69,13 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDECONFIG_EXECUTABLE=/usr/bin/kde4-config \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DMAN_INSTALL_DIR=/usr/man \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 # MAN_INSTALL_DIR is ignored, I guess
 mv $PKG/usr/share/man $PKG/usr/man
 
@@ -90,4 +98,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cutecom/cutecom.info b/system/cutecom/cutecom.info
index 6983f55ec6..c9185c3b2e 100644
--- a/system/cutecom/cutecom.info
+++ b/system/cutecom/cutecom.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://cutecom.sourceforge.net/cutecom-0.22.0.tar.gz"
 MD5SUM="dd85ceecf5a60b4d9e4b21a338920561"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt4"
 MAINTAINER="Vincent Batts"
 EMAIL="vbatts@hashbangbash.com"
diff --git a/system/cve-check-tool/cve-check-tool.SlackBuild b/system/cve-check-tool/cve-check-tool.SlackBuild
index f793654a6a..37036f3f20 100644
--- a/system/cve-check-tool/cve-check-tool.SlackBuild
+++ b/system/cve-check-tool/cve-check-tool.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cve-check-tool
 
@@ -23,10 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cve-check-tool
 VERSION=${VERSION:-5.6.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -73,7 +83,7 @@ find -L . \
 # Patch for new database format
 patch -p1 --verbose < $CWD/update-fmt.diff
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=deprecated-declarations" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -102,4 +112,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cw/README b/system/cw/README
new file mode 100644
index 0000000000..4b0fd1e2e7
--- /dev/null
+++ b/system/cw/README
@@ -0,0 +1,3 @@
+cw - The best way to tail AWS CloudWatch Logs from your terminal.
+
+NOTE: You need awscli in order to setup AWS credentials
diff --git a/system/cw/cw.SlackBuild b/system/cw/cw.SlackBuild
new file mode 100644
index 0000000000..7ebfb2c21b
--- /dev/null
+++ b/system/cw/cw.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/bash
+
+# Slackware build script for cw
+
+# Copyright 2023 Andrew Clemons, Tokyo Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=cw
+VERSION=${VERSION:-4.1.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SRCARCH=i386
+elif [ "$ARCH" = "i686" ]; then
+  SRCARCH=i386
+elif [ "$ARCH" = "x86_64" ]; then
+  SRCARCH=x86_64
+elif [ "$ARCH" = "aarch64" ]; then
+  SRCARCH=arm64
+elif [ "$ARCH" = "arm" ]; then
+  SRCARCH=armv6
+else
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+tar xvf $CWD/"$PRGNAM"_"$VERSION"_Linux_"$SRCARCH".tar.gz -C $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/bin
+install -m 0755 cw $PKG/usr/bin/cw
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/share/bash-completion/completions/
+install -m 0644 cw.bash $PKG/usr/share/bash-completion/completions/cw
+
+mkdir -p $PKG/usr/share/zsh/site-functions/
+install -m 0644 cw.zsh $PKG/usr/share/zsh/site-functions/_cw
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cw/cw.info b/system/cw/cw.info
new file mode 100644
index 0000000000..c4950f7de5
--- /dev/null
+++ b/system/cw/cw.info
@@ -0,0 +1,14 @@
+PRGNAM="cw"
+VERSION="4.1.3"
+HOMEPAGE="https://github.com/lucagrulla/cw"
+DOWNLOAD="https://github.com/lucagrulla/cw/releases/download/v4.1.3/cw_4.1.3_Linux_i386.tar.gz \
+         https://github.com/lucagrulla/cw/releases/download/v4.1.3/cw_4.1.3_Linux_armv6.tar.gz"
+MD5SUM="275a1064db86335badafb944cd50a35a \
+        9474fe382668991a1b6f7760b4da0da9"
+DOWNLOAD_x86_64="https://github.com/lucagrulla/cw/releases/download/v4.1.3/cw_4.1.3_Linux_x86_64.tar.gz \
+                 https://github.com/lucagrulla/cw/releases/download/v4.1.3/cw_4.1.3_Linux_arm64.tar.gz"
+MD5SUM_x86_64="d7424fd11f775a96b65d4315e0909d28 \
+               7e9945a40a99a1ccff69b8d85e415ac4"
+REQUIRES=""
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"
diff --git a/system/cw/slack-desc b/system/cw/slack-desc
new file mode 100644
index 0000000000..8aeef252e1
--- /dev/null
+++ b/system/cw/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+  |-----handy-ruler------------------------------------------------------|
+cw: cw ( The best way to tail AWS CloudWatch Logs from your terminal)
+cw:
+cw: https://github.com/lucagrulla/cw
+cw:
+cw:
+cw:
+cw:
+cw:
+cw:
+cw:
+cw:
diff --git a/system/cwtex-q-fonts-TTFs/README b/system/cwtex-q-fonts-TTFs/README
index f465f9e27e..38af11881c 100644
--- a/system/cwtex-q-fonts-TTFs/README
+++ b/system/cwtex-q-fonts-TTFs/README
@@ -1,7 +1,7 @@
-cwtex-q-fonts-TTFs contains five kinds of Chinese fonts: Fangsong, Hei, Kai,
-Ming and yuan, which are originally to be the default fonts in XeLaTeX.
-These fonts are based on cwtex fonts made by Tsong-Min Wu and 
-Tsong-Huey Wu in 1999-2004, then modified by Edward G.J. Lee, and this
-project is started by Chen-Pan Liao.
+cwtex-q-fonts-TTFs contains five kinds of Chinese fonts: Fangsong,
+Hei, Kai, Ming and yuan, which are originally to be the default fonts
+in XeLaTeX. These fonts are based on cwtex fonts made by Tsong-Min Wu
+and Tsong-Huey Wu in 1999-2004, then modified by Edward G.J. Lee, and
+this project is started by Chen-Pan Liao.
 
 The license is GPL 2.0 or later.
diff --git a/system/cwtex-q-fonts-TTFs/cwtex-q-fonts-TTFs.SlackBuild b/system/cwtex-q-fonts-TTFs/cwtex-q-fonts-TTFs.SlackBuild
index ca9b4fbf02..2d2097d52d 100644
--- a/system/cwtex-q-fonts-TTFs/cwtex-q-fonts-TTFs.SlackBuild
+++ b/system/cwtex-q-fonts-TTFs/cwtex-q-fonts-TTFs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cwtex-q-fonts
 
@@ -22,13 +22,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cwtex-q-fonts-TTFs
 VERSION=${VERSION:-0.4}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,4 +75,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cyberjack/README b/system/cyberjack/README
new file mode 100644
index 0000000000..858bcbdbce
--- /dev/null
+++ b/system/cyberjack/README
@@ -0,0 +1,5 @@
+ReinerSCT cyberJack USB chipcard reader driver.
+
+This driver allows you to use ReinerSCT chipcard readers from user
+space. It does not include a driver for the ReinerSCT cyberJack
+RFID basis.
diff --git a/system/cyberjack/cyberjack.SlackBuild b/system/cyberjack/cyberjack.SlackBuild
new file mode 100644
index 0000000000..f33220158d
--- /dev/null
+++ b/system/cyberjack/cyberjack.SlackBuild
@@ -0,0 +1,124 @@
+#!/bin/bash
+
+# Slackware build script for cyberjack
+
+# Copyright 2024 n1to <n1to-slack@posteo.net>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=cyberjack
+VERSION=${VERSION:-3.99.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+SRCNAM=pcsc-${PRGNAM}-${VERSION}final.SP16
+SRCDNAM=pcsc-${PRGNAM}-${VERSION}final.SP16
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM
+tar xvf $CWD/$SRCNAM.tar.bz2
+cd $SRCDNAM
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --enable-udev \
+  --enable-release \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/pcsc/drivers/libifd-cyberjack.bundle/Contents/Linux/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+   COPYRIGHT.GPL \
+   COPYRIGHT.LGPL \
+   debian/changelog \
+   doc/README.txt \
+   doc/verifypin_ascii.c \
+   doc/verifypin_fpin2.c \
+   doc/verify_pin_direct.cpp \
+   doc/modify_pin_direct.cpp \
+   $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cyberjack/cyberjack.info b/system/cyberjack/cyberjack.info
new file mode 100644
index 0000000000..20a7dadd74
--- /dev/null
+++ b/system/cyberjack/cyberjack.info
@@ -0,0 +1,10 @@
+PRGNAM="cyberjack"
+VERSION="3.99.5"
+HOMEPAGE="https://www.reiner-sct.com"
+DOWNLOAD="https://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP16/pcsc-cyberjack-3.99.5final.SP16.tar.bz2"
+MD5SUM="462f141acfa8d9c94b97677018a3f159"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pcsc-lite"
+MAINTAINER="n1to"
+EMAIL="n1to-slack@posteo.net"
diff --git a/system/cyberjack/slack-desc b/system/cyberjack/slack-desc
new file mode 100644
index 0000000000..305aab3b66
--- /dev/null
+++ b/system/cyberjack/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+cyberjack: cyberjack (driver for cyberJack card reader)
+cyberjack:
+cyberjack: Drivers for ReinerSCT cyberJack card reader devices.
+cyberjack:
+cyberjack: Homepage: https://www.reiner-sct.com
+cyberjack:
+cyberjack:
+cyberjack:
+cyberjack:
+cyberjack:
+cyberjack:
diff --git a/system/d-feet/d-feet.SlackBuild b/system/d-feet/d-feet.SlackBuild
index b0da3a0878..c2fe7e4e0a 100644
--- a/system/d-feet/d-feet.SlackBuild
+++ b/system/d-feet/d-feet.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for d-feet
 
-# Copyright 2010,2016,2017  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2010-2021  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - add glib-compile-schemas to doinst.sh.
+# - use relative symlinks in /usr/share/help.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=d-feet
-VERSION=${VERSION:-0.3.11}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.3.15}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,29 +76,36 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-tests \
-  --build=$ARCH-slackware-linux
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-make
-make install DESTDIR=$PKG
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --prefix=/usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --infodir=/usr/info \
+    --buildtype=release \
+    -Dstrip=true \
+    -Dtests=false
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# 20220409 bkw: absolute symlinks suck.
+for i in $PKG/usr/share/help/??/$PRGNAM/figures; do
+  rm -f $i/icon.png
+  ln -s ../../../C/$PRGNAM/figures/icon.png $i/icon.png
+done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING HACKING NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -95,4 +113,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/d-feet/d-feet.info b/system/d-feet/d-feet.info
index d9756d1dc3..635aff86d6 100644
--- a/system/d-feet/d-feet.info
+++ b/system/d-feet/d-feet.info
@@ -1,8 +1,8 @@
 PRGNAM="d-feet"
-VERSION="0.3.11"
+VERSION="0.3.15"
 HOMEPAGE="http://live.gnome.org/DFeet/"
-DOWNLOAD="http://download.gnome.org/sources/d-feet/0.3/d-feet-0.3.11.tar.xz"
-MD5SUM="a31834a127892692061732f4b09da64c"
+DOWNLOAD="https://download.gnome.org/sources/d-feet/0.3/d-feet-0.3.15.tar.xz"
+MD5SUM="44f046c5c35256f346db516dab3f938a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/d-feet/doinst.sh b/system/d-feet/doinst.sh
index 4a25de5e6f..401d987795 100644
--- a/system/d-feet/doinst.sh
+++ b/system/d-feet/doinst.sh
@@ -8,3 +8,8 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   fi
 fi
 
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
+fi
diff --git a/system/d52/d52.SlackBuild b/system/d52/d52.SlackBuild
index 9873caf030..73c2e3c6d2 100644
--- a/system/d52/d52.SlackBuild
+++ b/system/d52/d52.SlackBuild
@@ -1,15 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for d52
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=d52
 VERSION=${VERSION:-3.4.1}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +22,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -50,11 +57,8 @@ rm -rf $PRGNAM-$VERSION.orig
 tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz
 cd $PRGNAM-$VERSION.orig
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Patch from Debian, fix minor security flaw
 zcat $CWD/20-fix-format-security-error.patch.gz | patch -p1
@@ -85,4 +89,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/d52/d52.info b/system/d52/d52.info
index fc92cfb8c9..8e915418bb 100644
--- a/system/d52/d52.info
+++ b/system/d52/d52.info
@@ -1,10 +1,10 @@
 PRGNAM="d52"
 VERSION="3.4.1"
-HOMEPAGE="http://packages.debian.org/sid/d52"
-DOWNLOAD="http://ftp.debian.org/debian/pool/main/d/d52/d52_3.4.1.orig.tar.gz"
+HOMEPAGE="https://packages.debian.org/sid/d52"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/d/d52/d52_3.4.1.orig.tar.gz"
 MD5SUM="0d6fefeb3f30922d1c5046569f2ad665"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/daa2iso/daa2iso.SlackBuild b/system/daa2iso/daa2iso.SlackBuild
index 036aa72869..414f688d21 100644
--- a/system/daa2iso/daa2iso.SlackBuild
+++ b/system/daa2iso/daa2iso.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for daa2iso
 
@@ -24,10 +24,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=daa2iso
 VERSION=${VERSION:-0.1.7e}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -91,4 +101,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/daa2iso/daa2iso.info b/system/daa2iso/daa2iso.info
index 9a68ed33a8..45e1786e50 100644
--- a/system/daa2iso/daa2iso.info
+++ b/system/daa2iso/daa2iso.info
@@ -6,5 +6,5 @@ MD5SUM="6930ebcd8568e8ade0a175352d4a3481"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
+MAINTAINER="D Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/system/daemonize/daemonize.SlackBuild b/system/daemonize/daemonize.SlackBuild
index 81bad1dafa..7d33da6b92 100644
--- a/system/daemonize/daemonize.SlackBuild
+++ b/system/daemonize/daemonize.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for daemonize
 
@@ -9,26 +9,36 @@
 #
 # This script is placed into the public domain by the author
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=daemonize
 VERSION=${VERSION:-1.7.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
   BITS=32
 elif [ "$ARCH" = "i686" ]; then
@@ -80,4 +90,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/daemontools-bin/daemontools-bin.SlackBuild b/system/daemontools-bin/daemontools-bin.SlackBuild
index 96ec1969e5..519898ef44 100644
--- a/system/daemontools-bin/daemontools-bin.SlackBuild
+++ b/system/daemontools-bin/daemontools-bin.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for daemontools
 
 # Copyright 2017 Duncan Roe Melbourne, Australia
-# Copyright 2019 Aaditya Bagga, India
+# Copyright 2019 Aaditya <aaditya_gnulinux@zoho.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=daemontools-bin
 SRCNAM=daemontools
 VERSION=${VERSION:-0.76}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -102,4 +112,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l n -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l n -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/daemontools-bin/daemontools-bin.info b/system/daemontools-bin/daemontools-bin.info
index 7f0cc81fd7..f964881092 100644
--- a/system/daemontools-bin/daemontools-bin.info
+++ b/system/daemontools-bin/daemontools-bin.info
@@ -8,5 +8,5 @@ MD5SUM="1871af2453d6e464034968a0fbcb2bfc \
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Aaditya Bagga"
+MAINTAINER="Aaditya"
 EMAIL="aaditya_gnulinux@zoho.com"
diff --git a/system/daemontools/README b/system/daemontools/README
index 90afd09995..cfcbde1804 100644
--- a/system/daemontools/README
+++ b/system/daemontools/README
@@ -1,4 +1,5 @@
-N.B. You probably only want to install this package if you aready run qmail.
+N.B. You probably only want to install this package if you aready run
+qmail.
 
 daemontools is a collection of tools for managing UNIX services.
 
@@ -36,8 +37,8 @@ N.B. Installing this package starts the svscanboot service,
      however it won't actually manage anything because there
      will be no symlinks in /service.
 
-Otherwise, you will have to edit /etc/inittab yourself, as per the instructions
-in README.SBo.
+Otherwise, you will have to edit /etc/inittab yourself, as per the
+instructions in README.SBo.
 
 ----------------------------
 
diff --git a/system/daemontools/daemontools.SlackBuild b/system/daemontools/daemontools.SlackBuild
index 6bba35bb9e..4793fae8f1 100644
--- a/system/daemontools/daemontools.SlackBuild
+++ b/system/daemontools/daemontools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for daemontools
 
@@ -21,10 +21,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=daemontools
 VERSION=${VERSION:-0.76}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,7 +37,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -116,4 +126,4 @@ else
 fi
 
 cd $PKG
-/sbin/makepkg -l n -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l n -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dahdi-complete/LICENSE b/system/dahdi-complete/LICENSE
deleted file mode 100644
index 341c30bda4..0000000000
--- a/system/dahdi-complete/LICENSE
+++ /dev/null
@@ -1,166 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-
diff --git a/system/dahdi-complete/README b/system/dahdi-complete/README
deleted file mode 100644
index 32c4ef4cfb..0000000000
--- a/system/dahdi-complete/README
+++ /dev/null
@@ -1,11 +0,0 @@
-dahdi-complete provides everything necessary for using DAHDI (Digium/Asterisk 
-Hardware Device Interface) telephony hardware with Linux. This includes:
-
-* drivers
-* configuration tools
-* example configuration files
-* firmware
-
-As this package contains kernel modules that will be built for your current
-kernel, you will need to rebuild (not simply reinstall) this SlackBuild if you
-change/upgrade your kernel.
diff --git a/system/dahdi-complete/README.SLACKWARE b/system/dahdi-complete/README.SLACKWARE
deleted file mode 100644
index bfcd8b3762..0000000000
--- a/system/dahdi-complete/README.SLACKWARE
+++ /dev/null
@@ -1,13 +0,0 @@
-README.SLACKWARE for dahdi-complete
-
-To start dahdi-complete at boot, add the following to /etc/rc.d/rc.local:
-
-  if [ -x /etc/rc.d/rc.dahdi ];  then
-    /etc/rc.d/rc.dahdi start
-  fi
-
-This goes in /etc/rc.d/rc.local_shutdown:
-
-  if [ -x /etc/rc.d/rc.dahdi ];  then
-    /etc/rc.d/rc.dahdi stop
-  fi
diff --git a/system/dahdi-complete/dahdi-complete.SlackBuild b/system/dahdi-complete/dahdi-complete.SlackBuild
deleted file mode 100644
index c6984aae30..0000000000
--- a/system/dahdi-complete/dahdi-complete.SlackBuild
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/sh
-
-# Slackware Package Build Script for DAHDI complete package (http://www.asterisk.org/downloads/dahdi)
-# SlackBuild source at https://github.com/chapmajs/dahdi-complete-slackbuild
-
-# See LICENSE included in the project root for licensing information.
-
-# Copyright (c) 2015 Jonathan Chapman
-# glitch@glitchwrks.com
-# All rights reserved.
-
-PRGNAM=dahdi-complete
-VERSION=${VERSION:-2.10.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-KERNEL=${KERNEL:-$(uname -r)}
-PKGKERNEL=$(echo $KERNEL | tr - _)
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-ARCHIVE_NAME=dahdi-linux-complete
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $ARCHIVE_NAME-$VERSION+$VERSION
-tar zxvf $CWD/$ARCHIVE_NAME-$VERSION+$VERSION.tar.gz
-cd $ARCHIVE_NAME-$VERSION+$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-sed -i -e 's/ -Werror//' tools/acinclude.m4 tools/xpp/Makefile
-sed -i -e 's/-Werror //' tools/Makefile
-
-# Fix Perl install location (otherwise it installs to /usr/local/share/perl5)
-sed -i -e 's/sitelib/vendorlib/' linux/build_tools/live_dahdi tools/xpp/Makefile
-
-cd linux
-make all
-
-cd ../tools
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-dahdi=../linux \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-cd ..
-make config DESTDIR=$PKG
-
-# move config files to .new
-cd $PKG/etc
-for file in $(find . -type f); do
-	mv $file "$file.new"
-done
-
-install -D -m 0644 $TMP/$ARCHIVE_NAME-$VERSION+$VERSION/tools/dahdi.init $PKG/etc/rc.d/rc.dahdi.new
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-# Clean up zero-length firmware files
-find $PKG/lib/firmware -size 0 -delete
-# Remove unused directory
-rm -rf $PKG/usr/lib
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_$PKGKERNEL-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/dahdi-complete/dahdi-complete.info b/system/dahdi-complete/dahdi-complete.info
deleted file mode 100644
index 545f353e9a..0000000000
--- a/system/dahdi-complete/dahdi-complete.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dahdi-complete"
-VERSION="2.10.2"
-HOMEPAGE="http://www.asterisk.org/downloads/dahdi"
-DOWNLOAD="http://downloads.asterisk.org/pub/telephony/dahdi-linux-complete/releases/dahdi-linux-complete-2.10.2+2.10.2.tar.gz"
-MD5SUM="9b5ae61dc6202b45284d71481ec758c0"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Jonathan Chapman"
-EMAIL="glitch@glitchwrks.com"
diff --git a/system/dahdi-complete/doinst.sh b/system/dahdi-complete/doinst.sh
deleted file mode 100644
index 33374db8b9..0000000000
--- a/system/dahdi-complete/doinst.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-# Post-install configuration scripts, borrowed from the fail2ban
-# Slackbuild: 
-
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-preserve_perms etc/rc.d/rc.dahdi.new
-
-config etc/udev/rules.d/xpp.rules.new
-config etc/udev/rules.d/dahdi.rules.new
-config etc/hotplug/usb/xpp_fxloader.usermap.new
-config etc/dahdi/system.conf.new
-config etc/dahdi/assigned-spans.conf.sample.new
-config etc/dahdi/span-types.conf.sample.new
-config etc/dahdi/init.conf.new
-config etc/dahdi/modules.new
-config etc/dahdi/genconf_parameters.new
-config etc/bash_completion.d/dahdi.new
-config etc/modprobe.d/dahdi.conf.new
-config etc/modprobe.d/dahdi.blacklist.conf.new
-
-chroot . /sbin/depmod -a
diff --git a/system/dahdi-complete/slack-desc b/system/dahdi-complete/slack-desc
deleted file mode 100644
index 42f917c5c5..0000000000
--- a/system/dahdi-complete/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-              |-----handy-ruler------------------------------------------------------|
-dahdi-complete: dahdi-complete (DAHDI hardware drivers for Asterisk)
-dahdi-complete:
-dahdi-complete: DAHDI (Digium/Asterisk Hardware Device Interface) is the open source
-dahdi-complete: device technology used to control Digium and other legacy telephony
-dahdi-complete: interface cards.
-dahdi-complete:
-dahdi-complete:
-dahdi-complete:
-dahdi-complete:
-dahdi-complete: Homepage: http://www.asterisk.org/downloads/dahdi
-dahdi-complete:
diff --git a/system/dar/dar.SlackBuild b/system/dar/dar.SlackBuild
index 632ea13418..c3ab50827c 100644
--- a/system/dar/dar.SlackBuild
+++ b/system/dar/dar.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for Disk ARchive (DAR)
 # Home Page http://dar.linux.free.fr/
@@ -29,10 +29,17 @@
 # consistency with other scripts in our repository
 # No additional license terms added  :-)
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - remove useless INSTALL from doc dir.
+# - fix permissions in doc dir, add missing SlackBuild.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="dar"
 VERSION=${VERSION:-2.6.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -42,7 +49,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -71,9 +82,9 @@ cd $PRGNAM-$VERSION
 chown -R root.root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 LDFLAGS="-L/usr/lib${LIBDIRSUFFIX} -L/lib${LIBDIRSUFFIX}" \
 CFLAGS="$SLKCFLAGS" \
@@ -92,21 +103,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 mv $PKG/etc/darrc $PKG/etc/darrc.new
 
 mkdir -p $PKG/usr/doc
 mv $PKG/usr/share/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO THANKS \
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a AUTHORS ChangeLog COPYING NEWS README TODO THANKS \
   $PKG/usr/doc/$PRGNAM-$VERSION
-( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $PRGNAM )
+chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/samples/*
 chown -R root:root $PKG/usr/doc
 
 mkdir -p $PKG/install
@@ -116,4 +123,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dash/README b/system/dash/README
deleted file mode 100644
index 4f1ca583a5..0000000000
--- a/system/dash/README
+++ /dev/null
@@ -1,4 +0,0 @@
-DASH is a POSIX-compliant implementation of /bin/sh that aims to be as
-small as possible. It does this without sacrificing speed where
-possible. In fact, it is significantly faster than bash (the GNU
-Bourne-Again SHell) for most tasks.
diff --git a/system/dash/dash.SlackBuild b/system/dash/dash.SlackBuild
deleted file mode 100644
index e0d4ada3e3..0000000000
--- a/system/dash/dash.SlackBuild
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for dash
-
-# Written by Vincent Batts, http://hashbangbash.com/
-# Copyright 2017-2020 Donald Cooley South Haven, Indiana USA
-
-PRGNAM=dash
-VERSION=${VERSION:-0.5.11.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/ \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux \
-  --with-libedit
-
-make
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/bin
-( cd $PKG/usr/bin ; ln -s /bin/dash dash )
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING ChangeLog \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/dash/dash.info b/system/dash/dash.info
deleted file mode 100644
index 8404d7fbad..0000000000
--- a/system/dash/dash.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dash"
-VERSION="0.5.11.2"
-HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
-DOWNLOAD="http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.2.tar.gz"
-MD5SUM="b9b71c72e40fdc4db9b4ffb81fc3bebc"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libedit"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
diff --git a/system/dash/slack-desc b/system/dash/slack-desc
deleted file mode 100644
index 83489625d6..0000000000
--- a/system/dash/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-    |-----handy-ruler------------------------------------------------------|
-dash: dash (POSIX compliant shell)
-dash:
-dash: DASH is a POSIX-compliant implementation of /bin/sh that aims
-dash: to be as small as possible. It does this without sacrificing
-dash: speed where possible. In fact, it is significantly faster than
-dash: bash (the GNU Bourne-Again SHell) for most tasks.
-dash:
-dash:
-dash:
-dash:
-dash:
diff --git a/system/dateutils/dateutils.SlackBuild b/system/dateutils/dateutils.SlackBuild
index 9a8919aa22..9643d5b837 100644
--- a/system/dateutils/dateutils.SlackBuild
+++ b/system/dateutils/dateutils.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dateutils
 
@@ -24,10 +24,13 @@
 
 # Update by: blizzack <slackbuilds@blizzack.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dateutils
-VERSION=${VERSION:-0.4.7}
+VERSION=${VERSION:-0.4.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -96,4 +106,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dateutils/dateutils.info b/system/dateutils/dateutils.info
index a7901ac93e..310ac74429 100644
--- a/system/dateutils/dateutils.info
+++ b/system/dateutils/dateutils.info
@@ -1,8 +1,8 @@
 PRGNAM="dateutils"
-VERSION="0.4.7"
+VERSION="0.4.9"
 HOMEPAGE="http://www.fresse.org/dateutils/"
-DOWNLOAD="https://bitbucket.org/hroptatyr/dateutils/downloads/dateutils-0.4.7.tar.xz"
-MD5SUM="41b11e705802768356abc4e1e9920055"
+DOWNLOAD="https://bitbucket.org/hroptatyr/dateutils/downloads/dateutils-0.4.9.tar.xz"
+MD5SUM="fa7bd5e99d3826a60952a12fc7c30950"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/davfs2/README b/system/davfs2/README
index ac75c77e1b..b5a3835359 100644
--- a/system/davfs2/README
+++ b/system/davfs2/README
@@ -1,11 +1,13 @@
-Web Distributed Authoring and Versioning (WebDAV), an extension to the HTTP-
-protocol, allows authoring of resources on a remote web server. davfs2 
-provides the ability to access such resources like a typical filesystem, 
-allowing for use by standard applications with no built-in support for WebDAV.
+Web Distributed Authoring and Versioning (WebDAV), an extension to
+the HTTP- protocol, allows authoring of resources on a remote web
+server. davfs2 provides the ability to access such resources like a
+typical filesystem, allowing for use by standard applications with no
+built-in support for WebDAV.
 
-Before running this SlackBuild, define a davfs2 group and a davfs2 user. The 
-davfs2 user shall have davfs2 as its initial login group, shall not have no
-shell and the home directory shall be /var/cache/davfs. Examples:
+Before running this SlackBuild, define a davfs2 group and a davfs2
+user. The davfs2 user shall have davfs2 as its initial login
+group, shall not have no shell and the home directory shall be
+/var/cache/davfs. Examples:
 
 # groupadd -g 230 davfs2
 # useradd -u 230 -d /var/cache/davfs2 -g davfs2 -s /bin/false davfs2
diff --git a/system/davfs2/davfs2.SlackBuild b/system/davfs2/davfs2.SlackBuild
index b49822ae5a..2326062697 100644
--- a/system/davfs2/davfs2.SlackBuild
+++ b/system/davfs2/davfs2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for davfs2
 
@@ -21,10 +21,13 @@
 
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=davfs2
-VERSION=${VERSION:-1.5.6}
+VERSION=${VERSION:-1.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 DAVFS2_USER=${DAVFS2_USER:-davfs2}
 DAVFS2_GROUP=${DAVFS2_GROUP:-davfs2}
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -128,4 +138,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/davfs2/davfs2.info b/system/davfs2/davfs2.info
index 7a0a62c2d0..9fad8962b1 100644
--- a/system/davfs2/davfs2.info
+++ b/system/davfs2/davfs2.info
@@ -1,8 +1,8 @@
 PRGNAM="davfs2"
-VERSION="1.5.6"
+VERSION="1.6.1"
 HOMEPAGE="http://savannah.nongnu.org/projects/davfs2"
-DOWNLOAD="http://ftp.cc.uoc.gr/mirrors/nongnu.org/davfs2/davfs2-1.5.6.tar.gz"
-MD5SUM="eb9948097dc08664cbc19ad06eeacd97"
+DOWNLOAD="http://ftp.cc.uoc.gr/mirrors/nongnu.org/davfs2/davfs2-1.6.1.tar.gz"
+MD5SUM="04c82c25663f7dae5931002aa8ffea06"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ddcutil/ddcutil.SlackBuild b/system/ddcutil/ddcutil.SlackBuild
index 9a88356804..eda169c742 100644
--- a/system/ddcutil/ddcutil.SlackBuild
+++ b/system/ddcutil/ddcutil.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ddcutil
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ddcutil
-VERSION=${VERSION:-0.8.6}
+VERSION=${VERSION:-1.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,10 +79,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-./autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
+./autogen.sh \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -91,7 +100,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog NEWS.md README.md \
+cp -a AUTHORS COPYING CHANGELOG.md NEWS.md README.md README.gitignore \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -99,4 +108,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ddcutil/ddcutil.info b/system/ddcutil/ddcutil.info
index acd1af4c28..6058f2987d 100644
--- a/system/ddcutil/ddcutil.info
+++ b/system/ddcutil/ddcutil.info
@@ -1,8 +1,8 @@
 PRGNAM="ddcutil"
-VERSION="0.8.6"
+VERSION="1.4.1"
 HOMEPAGE="http://ddcutil.com/"
-DOWNLOAD="https://github.com/rockowitz/ddcutil/archive/v0.8.6/ddcutil-0.8.6.tar.gz"
-MD5SUM="4cb18bb13505e1713736c35f5e8f6237"
+DOWNLOAD="https://github.com/rockowitz/ddcutil/archive/v1.4.1/ddcutil-1.4.1.tar.gz"
+MD5SUM="a011e615c050e76a6fb9ce6b2bbf1d2a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ddg/ddg.SlackBuild b/system/ddg/ddg.SlackBuild
index e25328bed0..2a97e5378e 100644
--- a/system/ddg/ddg.SlackBuild
+++ b/system/ddg/ddg.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ddg
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ddg
 VERSION=${VERSION:-0.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -82,4 +92,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ddrescue-gui/README b/system/ddrescue-gui/README
deleted file mode 100644
index a6b071294b..0000000000
--- a/system/ddrescue-gui/README
+++ /dev/null
@@ -1,27 +0,0 @@
-ddrescue-gui (GUI for ddrescue)
-
-DDRescue-GUI is a program designed to make it easier to use GNU
-ddrescue (A Command-Line data recovery tool). It provides a simple
-graphical method for using ddrescue. This is designed to be as
-user-friendly as possible so users new to Linux can use ddrescue
-easily.
-
-DDRescue-GUI is a simple GUI written in Python 2 designed to make
-the data recovery tool, ddrescue, easier for beginners to use.
-
-It's designed for Linux, and more recently Apple OS X, as
-KDiskRescue appears to be abandoned, with the last update in 2006.
-
-DDRescue-GUI is desgined to look native on almost all Desktop
-Environments, so whichever one you use, it should look familiar.
-
-DDRescue-GUI uses very few rescources, with the current version
-using about 38MB RAM, and <80MHz CPU power so it'll run on almost
-any system, and give you the best battery life possible on laptops.
-
-DDRescue-GUI is cross-platform: It's runs on Linux and macOS
-(previously known as OS X).
-
-Note that this program uses GNU ddrescue, not the outdated dd_rescue,
-and it's available in my package archive for automatic updates at:
-www.launchpad.net/~hamishmb/+archive/myppa
diff --git a/system/ddrescue-gui/ddrescue-gui.1 b/system/ddrescue-gui/ddrescue-gui.1
deleted file mode 100644
index cf926b5913..0000000000
--- a/system/ddrescue-gui/ddrescue-gui.1
+++ /dev/null
@@ -1,70 +0,0 @@
-.\" Man page generated from reStructuredText.
-.
-.TH "DDRESCUE-GUI" "1" "Jun 30, 2018" "2.0.0" "DDRescue-GUI"
-.SH NAME
-ddrescue-gui \- DDRescue-GUI Developer Documentation
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\n[an-margin]
-level \\n[rst2man-indent-level]
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
--
-\\n[rst2man-indent0]
-\\n[rst2man-indent1]
-\\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \\n[an-margin]
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
-..
-.sp
-\fBNOTE:\fP
-.INDENT 0.0
-.INDENT 3.5
-Most of the docstrings in this project don\(aqt follow any particular format at this time, and don\(aqt always provide helpful information. This will be remedied in due course.
-.UNINDENT
-.UNINDENT
-.sp
-Contents:
-.SH DOCUMENTATION FOR THE MAIN EXECUTABLE FILE (DDRESCUE_GUI.PY)
-.SH DOCUMENTATION FOR THE PY2APP SETUP FILE (SETUP.PY)
-.SH DOCUMENTATION FOR THE UNIT TESTS RUNNER FILE (TESTS.PY)
-.SH DOCUMENTATION FOR THE UNIT TESTS PACKAGE (TESTS)
-.SH DOCUMENTATION FOR THE TOOLS PACKAGE (TOOLS)
-.SH DOCUMENTATION FOR THE BACKEND TOOLS MODULE IN THE TOOLS PACKAGE (TOOLS/TOOLS.PY)
-.SH DOCUMENTATION FOR THE DDRESCUE TOOLS PACKAGE IN THE TOOLS PACKAGE (TOOLS/DDRESCUETOOLS)
-.SH DOCUMENTATION FOR THE SETUP MODULE IN THE DDRESCUE TOOLS PACKAGE IN THE TOOLS PACKAGE (TOOLS/DDRESCUETOOLS/SETUP.PY)
-.SH DOCUMENTATION FOR THE DECORATORS MODULE IN THE DDRESCUE TOOLS PACKAGE IN THE TOOLS PACKAGE (TOOLS/DDRESCUETOOLS/DECORATORS.PY)
-.SH DOCUMENTATION FOR THE ALLVERSIONS MODULE IN THE DDRESCUE TOOLS PACKAGE IN THE TOOLS PACKAGE (TOOLS/DDRESCUETOOLS/ALLVERSIONS.PY)
-.SH DOCUMENTATION FOR THE DDRESCUE TOOLS FOR DDRESCUE VERSION 1.14 IN THE DDRESCUE TOOLS PACKAGE IN THE TOOLS PACKAGE (TOOLS/DDRESCUETOOLS/ONE_POINT_FORTEEN.PY)
-.SH DOCUMENTATION FOR THE DDRESCUE TOOLS FOR DDRESCUE VERSION 1.18 IN THE DDRESCUE TOOLS PACKAGE IN THE TOOLS PACKAGE (TOOLS/DDRESCUETOOLS/ONE_POINT_EIGHTEEN.PY)
-.SH DOCUMENTATION FOR THE DDRESCUE TOOLS FOR DDRESCUE VERSION 1.20 IN THE DDRESCUE TOOLS PACKAGE IN THE TOOLS PACKAGE (TOOLS/DDRESCUETOOLS/ONE_POINT_TWENTY.PY)
-.SH DOCUMENTATION FOR THE DDRESCUE TOOLS FOR DDRESCUE VERSION 1.21 IN THE DDRESCUE TOOLS PACKAGE IN THE TOOLS PACKAGE (TOOLS/DDRESCUETOOLS/ONE_POINT_TWENTY_ONE.PY)
-.SH DOCUMENTATION FOR THE DDRESCUE TOOLS FOR DDRESCUE VERSION 1.22 IN THE DDRESCUE TOOLS PACKAGE IN THE TOOLS PACKAGE (TOOLS/DDRESCUETOOLS/ONE_POINT_TWENTY_TWO.PY)
-.INDENT 0.0
-.IP \(bu 2
-genindex
-.IP \(bu 2
-modindex
-.IP \(bu 2
-search
-.UNINDENT
-.SH AUTHOR
-Hamish McIntyre-Bhatty
-.SH COPYRIGHT
-2013-2018, Hamish McIntyre-Bhatty
-.\" Generated by docutils manpage writer.
-.
diff --git a/system/ddrescue-gui/ddrescue-gui.SlackBuild b/system/ddrescue-gui/ddrescue-gui.SlackBuild
deleted file mode 100644
index f94df137a7..0000000000
--- a/system/ddrescue-gui/ddrescue-gui.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for ddrescue-gui.
-#
-# Copyright 2015-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=ddrescue-gui
-VERSION=${VERSION:-2.0.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-SRCVER=${SRCVER:-2.0.2~otherdistro-0ubuntu1~ppa1}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_${SRCVER}.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-DATA="Tests Tools docs images other DDRescue_GUI.py tests.py"
-
-mkdir -p $PKG/usr/share/$PRGNAM
-cp -r $DATA $PKG/usr/share/$PRGNAM
-
-install -Dm644 org.hamishmb.ddrescue-gui.policy $PKG/usr/share/polkit-1/actions/org.hamishmb.ddrescue-gui.policy
-install -Dm644 $CWD/ddrescue-gui.desktop $PKG/usr/share/applications/ddrescue-gui.desktop
-install -Dm644 ddrescue-gui.png $PKG/usr/share/pixmaps/ddrescue-gui.png
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp debian/changelog $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog
-cp debian/copyright $PKG/usr/doc/$PRGNAM-$VERSION/copyright
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-install -Dm644 $CWD/ddrescue-gui.1 $PKG/usr/man/man1/ddrescue-gui.1
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/ddrescue-gui/ddrescue-gui.desktop b/system/ddrescue-gui/ddrescue-gui.desktop
deleted file mode 100644
index 480708e807..0000000000
--- a/system/ddrescue-gui/ddrescue-gui.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=DDRescue-GUI
-GenericName=GUI Frontend for ddrescue
-Comment=Easily recover data graphically with DDRescue-GUI
-Exec=python3 /usr/share/ddrescue-gui/DDRescue_GUI.py
-Icon=ddrescue-gui
-Terminal=false
-Type=Application
-Categories=System;
-StartupNotify=true
diff --git a/system/ddrescue-gui/ddrescue-gui.info b/system/ddrescue-gui/ddrescue-gui.info
deleted file mode 100644
index 0991194016..0000000000
--- a/system/ddrescue-gui/ddrescue-gui.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ddrescue-gui"
-VERSION="2.0.2"
-HOMEPAGE="https://launchpad.net/ddrescue-gui"
-DOWNLOAD="https://launchpad.net/ddrescue-gui/2.x/2.0.2/+download/ddrescue-gui_2.0.2~otherdistro-0ubuntu1~ppa1.tar.gz"
-MD5SUM="963eb832ff9861af5f09e20029bf0cd2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="wxPython4 python-requests getdevinfo"
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
diff --git a/system/ddrescue-gui/slack-desc b/system/ddrescue-gui/slack-desc
deleted file mode 100644
index 8ae574f353..0000000000
--- a/system/ddrescue-gui/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-            |-----handy-ruler------------------------------------------------------|
-ddrescue-gui: ddrescue-gui (GUI for ddrescue)
-ddrescue-gui:
-ddrescue-gui: DDRescue-GUI  is  a  program  designed  to  make it easier to use GNU
-ddrescue-gui: ddrescue (A Command-Line data recovery tool).  It provides  a  simple
-ddrescue-gui: graphical method for using  ddrescue.  This  is  designed  to  be  as
-ddrescue-gui: user-friendly  as  possible  so  users  new to Linux can use ddrescue
-ddrescue-gui: easily.
-ddrescue-gui:
-ddrescue-gui: Home page: https://launchpad.net/ddrescue-gui
-ddrescue-gui:
-ddrescue-gui:
diff --git a/system/ddrescueview/README b/system/ddrescueview/README
new file mode 100644
index 0000000000..13d58bd945
--- /dev/null
+++ b/system/ddrescueview/README
@@ -0,0 +1,7 @@
+ddrescueview (Graphical viewer for GNU ddrescue mapfiles)
+
+This small tool allows the user to graphically examine ddrescue's
+mapfiles in a user friendly GUI application. The Main window displays
+a block grid with each block's color representing the block types it
+contains. Many people know this type of view from defragmentation
+programs.
diff --git a/system/ddrescueview/ddrescueview.SlackBuild b/system/ddrescueview/ddrescueview.SlackBuild
new file mode 100644
index 0000000000..580e615b67
--- /dev/null
+++ b/system/ddrescueview/ddrescueview.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+# Slackware build script for ddrescueview
+
+# Copyright 2022 Jeremy Hansen  jebrhansen+SBo@gmail.com
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - install man page in /usr/man/man1, not /usr/man/man/man1 (ugh).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ddrescueview
+VERSION=${VERSION:-0.4.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-source-$VERSION.tar.xz
+cd $PRGNAM-source-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# Build ddrescueview
+lazbuild "source/ddrescueview.lpi" --lazarusdir=/usr/share/lazarus
+
+# Install ddrescueview manually since the build system doesn't support targets
+install -s -D -m 755 source/ddrescueview $PKG/usr/bin/ddrescueview
+
+# Move over desktop files
+mkdir -p $PKG/usr/share
+cp -r resources/linux/icons $PKG/usr/share/
+install -D -m 644 resources/linux/applications/ddrescueview.desktop $PKG/usr/share/applications/ddrescueview.desktop
+
+# Move over manpage
+mkdir -p $PKG/usr/man/man1
+gzip -9c < resources/linux/man/man1/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  changelog.txt gpl.txt readme.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ddrescueview/ddrescueview.info b/system/ddrescueview/ddrescueview.info
new file mode 100644
index 0000000000..58c1e97f83
--- /dev/null
+++ b/system/ddrescueview/ddrescueview.info
@@ -0,0 +1,10 @@
+PRGNAM="ddrescueview"
+VERSION="0.4.5"
+HOMEPAGE="https://sourceforge.net/projects/ddrescueview/"
+DOWNLOAD="https://sourceforge.net/projects/ddrescueview/files/Test%20builds/v0.4.5/ddrescueview-source-0.4.5.tar.xz"
+MD5SUM="c0ad98bacd47428c1ce3894e0c55723e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="lazarus"
+MAINTAINER="Jeremy Hansen"
+EMAIL="jebrhansen+SBo@gmail.com"
diff --git a/system/ddrescueview/doinst.sh b/system/ddrescueview/doinst.sh
new file mode 100644
index 0000000000..aea0f894eb
--- /dev/null
+++ b/system/ddrescueview/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/ddrescueview/slack-desc b/system/ddrescueview/slack-desc
new file mode 100644
index 0000000000..2a841bc99d
--- /dev/null
+++ b/system/ddrescueview/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+ddrescueview: ddrescueview (Graphical viewer for GNU ddrescue mapfiles)
+ddrescueview:
+ddrescueview: This small tool allows the user to graphically examine ddrescue's
+ddrescueview: mapfiles in a user friendly GUI application. The Main window displays
+ddrescueview: a block grid with each block's color representing the block types it
+ddrescueview: contains. Many people know this type of view from defragmentation
+ddrescueview: programs.
+ddrescueview:
+ddrescueview: HOMEPAGE: https://sourceforge.net/projects/ddrescueview/
+ddrescueview:
+ddrescueview:
diff --git a/system/debootstrap/README b/system/debootstrap/README
index cdd078cf71..e05eb3c3f7 100644
--- a/system/debootstrap/README
+++ b/system/debootstrap/README
@@ -1,9 +1,10 @@
-Debootstrap is used to create a Debian base system from scratch, without
-requiring the availability of dpkg or apt. It does this by downloading .deb
-files from a mirror site, and carefully unpacking them into a directory which
-can eventually be chrooted into.
-It's especially useful if you need to work on debian-like systems without having
-to install them over our beloved Slackware ;-)
+Debootstrap is used to create a Debian base system from scratch,
+without requiring the availability of dpkg or apt. It does this by
+downloading .deb files from a mirror site, and carefully unpacking
+them into a directory which can eventually be chrooted into.
 
-As we do not have dpkg, remember to always pass an architecture to debootstrap
-using the --arch switch.
+It's especially useful if you need to work on debian-like systems
+without having to install them over our beloved Slackware ;-)
+
+As we do not have dpkg, remember to always pass an architecture to
+debootstrap using the --arch switch.
diff --git a/system/debootstrap/debootstrap.SlackBuild b/system/debootstrap/debootstrap.SlackBuild
index 44b00fbe81..1fa82ce652 100644
--- a/system/debootstrap/debootstrap.SlackBuild
+++ b/system/debootstrap/debootstrap.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Debootstrap
 
 # Copyright 2009 Marco Bonetti <sid77@slackware.it>
+# Copyright 2022, 2024  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,13 +23,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=debootstrap
-VERSION=${VERSION:-1.0.79}
+VERSION=${VERSION:-1.0.134}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -42,9 +53,10 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
 tar xvf $CWD/${PRGNAM}_$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+cd $PRGNAM || cd $PRGNAM-$VERSION
 
-cp $CWD/devices.tar.gz .
+# Excise all devices.tar.gz code. Closes: #830869
+#cp $CWD/devices.tar.gz .
 
 chown -R root:root .
 find -L . \
@@ -70,4 +82,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/debootstrap/debootstrap.info b/system/debootstrap/debootstrap.info
index 0a11c788ba..190e9f4296 100644
--- a/system/debootstrap/debootstrap.info
+++ b/system/debootstrap/debootstrap.info
@@ -1,10 +1,10 @@
 PRGNAM="debootstrap"
-VERSION="1.0.79"
-HOMEPAGE="http://packages.debian.org/sid/debootstrap"
-DOWNLOAD="https://launchpad.net/debian/+archive/primary/+files/debootstrap_1.0.79.tar.gz"
-MD5SUM="5d2facd22ad3cad32529bf5704aa214b"
+VERSION="1.0.134"
+HOMEPAGE="https://wiki.debian.org/Debootstrap"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.134.tar.gz"
+MD5SUM="faa51b403aebee9ed297b02fdb2bc55f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Matt Arnold"
-EMAIL="matt@thegnuguru.org"
+MAINTAINER="Mario Preksavec"
+EMAIL="mario at slackware dot hr"
diff --git a/system/ded/README b/system/ded/README
index 928748cac9..fa5cc29882 100644
--- a/system/ded/README
+++ b/system/ded/README
@@ -4,9 +4,9 @@ ded (pronounced "dee-eee-dee") allows you to navigate through multiple
 file lists or a directory tree, viewing or changing file attributes
 rapidly. In addition to conventional file information, it operates on
 the file's RCS or SCCS archives (or CVS or SVN, etc), making it useful
-for source-control as well as system administration. Curses-based,
-it runs on UNIX systems.
+for source-control as well as system administration. Curses-based, it
+runs on UNIX systems.
 
-For those unfamiliar with ded, it's vaguely similar to Midnight Commander,
-or dired mode in Emacs, but with vi-like key bindings. Press h while
-ded is running to see its help screen.
+For those unfamiliar with ded, it's vaguely similar to Midnight
+Commander, or dired mode in Emacs, but with vi-like key
+bindings. Press h while ded is running to see its help screen.
diff --git a/system/ded/ded.SlackBuild b/system/ded/ded.SlackBuild
index fa67c0955b..a8b24da3c3 100644
--- a/system/ded/ded.SlackBuild
+++ b/system/ded/ded.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ded
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
@@ -10,6 +10,11 @@
 # This build script was written from scratch for 14.1, without referring
 # to the old script.
 
+# 20240416 bkw: this fucking thing has been broken for ages. fix it
+#               by breaking td_lib out into a separate build.
+# 20221227 bkw: updated for 20221011 release
+# 20210220 bkw: updated for 20210110. get rid of configure patch, found
+#               a better way to disable the long filename test.
 # 20200111 bkw: updated for 20200428 release
 # 20200111 bkw: updated for 20191226 release
 # 20180915 bkw: updated for 20180324 release
@@ -25,10 +30,13 @@
 # - updated for 20140722 release
 # - added td_lib docs in /usr/doc
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ded
-VERSION=${VERSION:-20200428}
+VERSION=${VERSION:-20230122}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +46,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,61 +71,15 @@ fi
 
 set -e
 
-# not going to make td_lib a separate package. If anyone's packaging up any
-# of the (very few) apps that use td_lib, let them list ded as a dependency.
-LIBNAM=td_lib
-LIBVER=${LIBVER:-$VERSION}
-
-# build everything here so it's easy to clean up after
-BUILDDIR=$TMP/$PRGNAM-build
-
-rm -rf $PKG $BUILDDIR
-mkdir -p $BUILDDIR $PKG $OUTPUT
-
-cd $BUILDDIR
-rm -rf $LIBNAM-$LIBVER
-tar xvf $CWD/$LIBNAM-$LIBVER.tgz
-cd $LIBNAM-$LIBVER
-chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-# "checking for long filenames" wants to create files in /usr/lib and
-# /var/lib. Violates the principle of least surprise: users don't expect
-# configure scripts (or SlackBuilds) to touch their system directories.
-patch -p1 < $CWD/td_lib_no_write_usr.diff
-
-# NB: the -j1's are necessary, even on 'make install'.
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
-
-make -j1
-
-# actually, don't really need to make install, ded's configure will find
-# the static lib just fine, but there do exist other apps that use td_lib
-# so we'll include it in the package too. Upstream doesn't let us build
-# it as a shared lib.
-make -j1 install DESTDIR=$PKG
-
-# let's include the td_lib docs
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/$LIBNAM-$LIBVER
-cp -a CHANGES COPYING README $PKG/usr/doc/$PRGNAM-$VERSION/$LIBNAM-$LIBVER
-
-cd $BUILDDIR
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tgz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -139,4 +105,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ded/ded.info b/system/ded/ded.info
index ffd293fa42..4949cc723f 100644
--- a/system/ded/ded.info
+++ b/system/ded/ded.info
@@ -1,12 +1,10 @@
 PRGNAM="ded"
-VERSION="20200428"
+VERSION="20230122"
 HOMEPAGE="http://invisible-island.net/ded/"
-DOWNLOAD="http://invisible-mirror.net/archives/ded/ded-20200428.tgz \
-          http://invisible-mirror.net/archives/ded/td_lib-20200428.tgz"
-MD5SUM="8002fc7e13f830abe9b2e6f547433d78 \
-        c1fd18b0e91d9372c5eb298de4b6616c"
+DOWNLOAD="https://invisible-mirror.net/archives/ded/ded-20230122.tgz"
+MD5SUM="d44b731ad16c7bcf6efeca7dbce4a885"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="td_lib"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/ded/td_lib_no_write_usr.diff b/system/ded/td_lib_no_write_usr.diff
deleted file mode 100644
index 455b1a85bf..0000000000
--- a/system/ded/td_lib_no_write_usr.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur td_lib-20150704/configure td_lib-20150704.patched/configure
---- td_lib-20150704/configure	2015-07-04 11:20:27.000000000 -0400
-+++ td_lib-20150704.patched/configure	2017-03-05 11:29:40.888486013 -0500
-@@ -5031,7 +5031,7 @@
- else
-   ac_tmpdirs='/tmp /var/tmp /usr/tmp'
- fi
--for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
-+for ac_dir in  . $ac_tmpdirs  ; do
-   test -d $ac_dir || continue
-   test -w $ac_dir || continue # It is less confusing to not echo anything here.
-   ac_xdir=$ac_dir/cf$$
diff --git a/system/dehydrated/README b/system/dehydrated/README
deleted file mode 100644
index 32deb77d68..0000000000
--- a/system/dehydrated/README
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a client for signing ssl-certificates with an ACME-server.
--Signing of a list of domains, including wildcard domains
--Signing of a CSR, standalone or completely automated using hooks
--Renewal if a cert is about to expire or included domains changed
--Certificate revocation
diff --git a/system/dehydrated/dehydrated.SlackBuild b/system/dehydrated/dehydrated.SlackBuild
deleted file mode 100644
index 0ad52ff36f..0000000000
--- a/system/dehydrated/dehydrated.SlackBuild
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for dehydrated
-
-# Copyright 2016 - 2019  Johannes Schoepfer, Germany
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=dehydrated
-VERSION=${VERSION:-0.6.5}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p $PKG/usr/bin/
-install -m 755 $PRGNAM $PKG/usr/bin/$PRGNAM
-mkdir -p $PKG/etc/$PRGNAM
-cp docs/examples/config $PKG/etc/$PRGNAM/config.new
-
-mkdir -p $PKG/usr/man/man1
-mv docs/man/dehydrated.1 $PKG/usr/man/man1
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-# cron
-mkdir -p $PKG/etc/cron.d/
-echo '0 0 * * * /usr/bin/dehydrated -c >/dev/null' > $PKG/etc/cron.d/$PRGNAM.new
-
-# docs
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-rm docs/logo.jpg
-mv docs/* $PKG/usr/doc/$PRGNAM-$VERSION/
-mv CHANGELOG LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/dehydrated/dehydrated.info b/system/dehydrated/dehydrated.info
deleted file mode 100644
index 88215e61fa..0000000000
--- a/system/dehydrated/dehydrated.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="dehydrated"
-VERSION="0.6.5"
-HOMEPAGE="https://dehydrated.io/"
-DOWNLOAD="https://github.com/lukas2511/dehydrated/archive/v0.6.5/dehydrated-0.6.5.tar.gz"
-MD5SUM="cedf07369517c317c4e1075540b94699"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Johannes Schoepfer"
-EMAIL="slackbuilds@schoepfer.info"
diff --git a/system/dehydrated/doinst.sh b/system/dehydrated/doinst.sh
deleted file mode 100644
index 5255932c43..0000000000
--- a/system/dehydrated/doinst.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-preserve_perms etc/dehydrated/config.new
-preserve_perms etc/cron.d/dehydrated.new
diff --git a/system/dehydrated/slack-desc b/system/dehydrated/slack-desc
deleted file mode 100644
index 2abcc2d4bb..0000000000
--- a/system/dehydrated/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-          |-----handy-ruler------------------------------------------------------|
-dehydrated: dehydrated (letsencrypt/acme client implemented as a shell-script)
-dehydrated:
-dehydrated: This is a client for signing ssl-certificates with an ACME-server.
-dehydrated: -Signing of a list of domains, including wildcard domains
-dehydrated: -Signing of a CSR, standalone or completely automated using hooks
-dehydrated: -Renewal if a cert is about to expire or included domains changed
-dehydrated: -Certificate revocation
-dehydrated:
-dehydrated: Homepage: https://dehydrated.io/
-dehydrated:
-dehydrated:
diff --git a/system/dell_bios_fan_control/README b/system/dell_bios_fan_control/README
new file mode 100644
index 0000000000..3e4ef7c4dc
--- /dev/null
+++ b/system/dell_bios_fan_control/README
@@ -0,0 +1,13 @@
+dell-bios-fan-control
+
+A user space utility to set control of fans by bios on Dell 9560 (and
+some other Dell) Laptops.
+
+Use by dell-bios-fan-control 1 to let BIOS control fan speed (default),
+and dell-bios-fan-control 0 to turn BIOS control off.
+
+Presumably, you need to turn it off in order to let i8kctl or some other
+userspace fan speed daemon do the job.
+
+Just leaving it off without any control might overheat and damage your
+computer.
diff --git a/system/dell_bios_fan_control/dell_bios_fan_control.SlackBuild b/system/dell_bios_fan_control/dell_bios_fan_control.SlackBuild
new file mode 100644
index 0000000000..2c9181f85f
--- /dev/null
+++ b/system/dell_bios_fan_control/dell_bios_fan_control.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+# Slackware build script for dell_bios_fan_control
+
+# Copyright 2023 Lockywolf
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=dell_bios_fan_control
+TGZNAM=dell-bios-fan-control
+VERSION=${VERSION:-20220119_270061}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+COMMIT=27006106595bccd6c309da4d1499f93d38903f9a
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $TGZNAM-$COMMIT
+tar xvf $CWD/$TGZNAM-$COMMIT.tar.gz
+cd $TGZNAM-$COMMIT
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make
+mkdir -p $PKG/usr/sbin/
+cp dell-bios-fan-control $PKG/usr/sbin/
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dell_bios_fan_control/dell_bios_fan_control.info b/system/dell_bios_fan_control/dell_bios_fan_control.info
new file mode 100644
index 0000000000..8881a9a74a
--- /dev/null
+++ b/system/dell_bios_fan_control/dell_bios_fan_control.info
@@ -0,0 +1,10 @@
+PRGNAM="dell_bios_fan_control"
+VERSION="20220119_270061"
+HOMEPAGE="https://github.com/TomFreudenberg/dell-bios-fan-control"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/TomFreudenberg/dell-bios-fan-control/archive/27006106595bccd6c309da4d1499f93d38903f9a/dell-bios-fan-control-27006106595bccd6c309da4d1499f93d38903f9a.tar.gz"
+MD5SUM_x86_64="b4b9d5e8d6b1c63645d89df8b6943d10"
+REQUIRES=""
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.dell-bios-fan-control_2023-05-15@lockywolf.net"
diff --git a/system/dell_bios_fan_control/slack-desc b/system/dell_bios_fan_control/slack-desc
new file mode 100644
index 0000000000..ab12e3de2b
--- /dev/null
+++ b/system/dell_bios_fan_control/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                     |-----handy-ruler------------------------------------------------------|
+dell_bios_fan_control: dell_bios_fan_control (utility to set on/off of fans by bios on Dell)
+dell_bios_fan_control:
+dell_bios_fan_control: On some Dell laptops, BIOS controls the fans, not userspace. This
+dell_bios_fan_control: utility lets you turn that control off, and let some userspace
+dell_bios_fan_control: process (if any) do the job.
+dell_bios_fan_control:
+dell_bios_fan_control: Warning: just turning it off might damage your machine.
+dell_bios_fan_control:
+dell_bios_fan_control:
+dell_bios_fan_control:
+dell_bios_fan_control:
diff --git a/system/detox/detox.SlackBuild b/system/detox/detox.SlackBuild
index f02350a061..f8a3f57be8 100644
--- a/system/detox/detox.SlackBuild
+++ b/system/detox/detox.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for detox.
 
@@ -22,26 +22,36 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=detox
 VERSION=${VERSION:-1.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -101,4 +111,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dfc/dfc.SlackBuild b/system/dfc/dfc.SlackBuild
index be9a7faeb6..06a9ec596b 100644
--- a/system/dfc/dfc.SlackBuild
+++ b/system/dfc/dfc.SlackBuild
@@ -1,24 +1,34 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dfc
 
 # Written by Kent Fritz <fritz.kent@gmail.com
 # Updated by Donald Cooley <dfc@warpmail.net>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dfc
 VERSION=${VERSION:-3.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -79,4 +89,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dfc/dfc.info b/system/dfc/dfc.info
index 5709c4dc32..6b1707ddde 100644
--- a/system/dfc/dfc.info
+++ b/system/dfc/dfc.info
@@ -1,7 +1,7 @@
 PRGNAM="dfc"
 VERSION="3.1.1"
 HOMEPAGE="https://projects.gw-computing.net/projects/dfc"
-DOWNLOAD="https://projects.gw-computing.net/attachments/download/615/dfc-3.1.1.tar.gz"
+DOWNLOAD="http://distcache.freebsd.org/ports-distfiles/dfc-3.1.1.tar.gz"
 MD5SUM="26fd905a07078332d98c2806cdd0fc0e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/dfu-util/dfu-util.SlackBuild b/system/dfu-util/dfu-util.SlackBuild
index 056010437e..23e162eac3 100644
--- a/system/dfu-util/dfu-util.SlackBuild
+++ b/system/dfu-util/dfu-util.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for dfu-util
 # Written by Damien Durand <splinux25@gmail.com>
 # From 2018, maintained by Christoph Willing <chris.willing@linux.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dfu-util
-VERSION=${VERSION:-0.10}
+VERSION=${VERSION:-0.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -16,7 +19,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -78,4 +88,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dfu-util/dfu-util.info b/system/dfu-util/dfu-util.info
index ecd8609d4e..aca10f72c1 100644
--- a/system/dfu-util/dfu-util.info
+++ b/system/dfu-util/dfu-util.info
@@ -1,8 +1,8 @@
 PRGNAM="dfu-util"
-VERSION="0.10"
+VERSION="0.11"
 HOMEPAGE="http://dfu-util.gnumonks.org"
-DOWNLOAD="http://dfu-util.sourceforge.net/releases/dfu-util-0.10.tar.gz"
-MD5SUM="8cf55663703cdc6b40f377f999eb8d3d"
+DOWNLOAD="http://dfu-util.sourceforge.net/releases/dfu-util-0.11.tar.gz"
+MD5SUM="31c983543a1fe8f03260ca4d56ad4f43"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/dget/dget.SlackBuild b/system/dget/dget.SlackBuild
index 020bd65d4b..37cb28fa8a 100644
--- a/system/dget/dget.SlackBuild
+++ b/system/dget/dget.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for dget.
 #
-# Copyright 2018-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2018-2023  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dget
-VERSION=${VERSION:-2.20.5}
+VERSION=${VERSION:-2.23.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -102,4 +112,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dget/dget.info b/system/dget/dget.info
index f2c54ec3b9..bb4c79b51f 100644
--- a/system/dget/dget.info
+++ b/system/dget/dget.info
@@ -1,10 +1,10 @@
 PRGNAM="dget"
-VERSION="2.20.5"
+VERSION="2.23.4"
 HOMEPAGE="https://goo.gl/mr1Uz3"
-DOWNLOAD="http://http.us.debian.org/debian/pool/main/d/devscripts/devscripts_2.20.5_i386.deb"
-MD5SUM="064723c6fac020a141c0990c2e70c218"
-DOWNLOAD_x86_64="http://http.us.debian.org/debian/pool/main/d/devscripts/devscripts_2.20.5_amd64.deb"
-MD5SUM_x86_64="cf5cb14bfc90c75cc91772e2436f6c9e"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/d/devscripts/devscripts_2.23.4_i386.deb"
+MD5SUM="d121430038cd22f5987c1dc433e39ffd"
+DOWNLOAD_x86_64="http://deb.debian.org/debian/pool/main/d/devscripts/devscripts_2.23.4_amd64.deb"
+MD5SUM_x86_64="97bd20212c18db5721d4bfa72c78a0ff"
 REQUIRES="dpkg"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/system/dieharder/dieharder.SlackBuild b/system/dieharder/dieharder.SlackBuild
index 6b032e90d2..cf55237585 100644
--- a/system/dieharder/dieharder.SlackBuild
+++ b/system/dieharder/dieharder.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # SlackBuild for dieharder, 5 January 2017
 # awg <awg@cock.li>
@@ -26,10 +26,16 @@
 ## GNU GPL v2 (with beverage provision).  Please see the file COPYING
 ## in the dieharder source distribution for more on this.
 
+# 20220211 bkw: Modified by SlackBuilds.org: add -j1 to the make commands
+# because parallel builds are broken.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dieharder
 VERSION=${VERSION:-3.31.1}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -39,7 +45,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,9 +79,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # apply patches, mostly to appease crusty autoconf.
 patch -p1 < $CWD/$PRGNAM.patch
@@ -79,7 +89,7 @@ mkdir -p manual/m4  # a stub.
 
 ./autogen.sh
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -D_GNU_SOURCE -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -92,14 +102,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-gnu-ld \
   --build=$ARCH-slackware-linux
 
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make -j1
+make -j1 install-strip DESTDIR=$PKG
+rm -f $PKG/usr/lib*/*.la
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING NOTES AUTHORS $PKG/usr/doc/$PRGNAM-$VERSION
@@ -113,4 +119,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dieharder/dieharder.info b/system/dieharder/dieharder.info
index aa7496f4bd..fbf00d6bf7 100644
--- a/system/dieharder/dieharder.info
+++ b/system/dieharder/dieharder.info
@@ -1,7 +1,7 @@
 PRGNAM="dieharder"
 VERSION="3.31.1"
-HOMEPAGE="http://www.phy.duke.edu/~rgb/General/dieharder.php"
-DOWNLOAD="http://www.phy.duke.edu/~rgb/General/dieharder/dieharder-3.31.1.tgz"
+HOMEPAGE="https://webhome.phy.duke.edu/~rgb/General/dieharder.php"
+DOWNLOAD="http://webhome.phy.duke.edu/~rgb/General/dieharder/dieharder-3.31.1.tgz"
 MD5SUM="b57404dfb812d4548caaf71a05be2d17"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/diit/README b/system/diit/README
deleted file mode 100644
index 57e5b885d7..0000000000
--- a/system/diit/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Digital Invisible Ink Toolkit is a Java steganography tool that can
-hide any sort of file inside a digital image (regarding that the
-message will fit, and the image is 24 bit colour). There are four
-highly customisable algorithms in the tool, as well as an open-source
-implementation of RS Analysis (an extremely good steganalysis method).
-The tool has the additional advantage of being able to simulate hiding
-- so you can get an accurate map of where the information is hidden.
diff --git a/system/diit/diit.SlackBuild b/system/diit/diit.SlackBuild
deleted file mode 100644
index 14af8aac9d..0000000000
--- a/system/diit/diit.SlackBuild
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Digital Invisible Ink Toolkit
-
-# Copyright 2012  Fridrich von Stauffenberg <cancellor2@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=diit
-VERSION=${VERSION:-1.5}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $OUTPUT $TMP $PKG/usr/share/$PRGNAM
-cat $CWD/$PRGNAM-$VERSION.jar > $PKG/usr/share/$PRGNAM/$PRGNAM.jar
-
-mkdir -p $PKG/usr/bin
-cat $CWD/$PRGNAM.sh > $PKG/usr/bin/$PRGNAM
-chmod 755 $PKG/usr/bin/$PRGNAM
-
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/diit/diit.desktop b/system/diit/diit.desktop
deleted file mode 100644
index e87bfb5e42..0000000000
--- a/system/diit/diit.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Name=DIIT
-GenericName=Digital Invisible Ink Toolkit
-Comment=Steganography tool
-Icon=diit
-Exec=diit
-Categories=System;
-MimeType=
diff --git a/system/diit/diit.info b/system/diit/diit.info
deleted file mode 100644
index 4a194239ce..0000000000
--- a/system/diit/diit.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="diit"
-VERSION="1.5"
-HOMEPAGE="http://diit.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/diit/diit-1.5.jar"
-MD5SUM="dc6a4cd2af804f2dd69dcd4f9b524a70"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="jdk"
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere.com"
diff --git a/system/diit/diit.png b/system/diit/diit.png
deleted file mode 100644
index 009127d6b1..0000000000
--- a/system/diit/diit.png
+++ /dev/null
diff --git a/system/diit/diit.sh b/system/diit/diit.sh
deleted file mode 100644
index 180e18b989..0000000000
--- a/system/diit/diit.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec java -Xmx512m -jar /usr/share/diit/diit.jar
diff --git a/system/diit/doinst.sh b/system/diit/doinst.sh
deleted file mode 100644
index 4e8ba7071d..0000000000
--- a/system/diit/doinst.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/system/diit/slack-desc b/system/diit/slack-desc
deleted file mode 100644
index eee4e49ad2..0000000000
--- a/system/diit/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-    |-----handy-ruler------------------------------------------------------|
-diit: diit (Digital Invisible Ink Toolkit)
-diit:
-diit: Digital Invisible Ink Toolkit is a Java steganography tool that can
-diit: hide any sort of file inside a digital image (regarding that the
-diit: message will fit, and the image is 24 bit colour). There are four
-diit: highly customisable algorithms in the tool, as well as an open-source
-diit: implementation of RS Analysis (an extremely good steganalysis method).
-diit: The tool has the additional advantage of being able to simulate hiding
-diit: - so you can get an accurate map of where the information is hidden.
-diit:
-diit: Homepage: http://diit.sourceforge.net
diff --git a/system/dina-font/README b/system/dina-font/README
index db843e934a..3335053618 100644
--- a/system/dina-font/README
+++ b/system/dina-font/README
@@ -4,17 +4,18 @@ Dina is a monospace bitmap font, primarily aimed at programmers. It is
 relatively compact to allow a lot of code on screen while clear enough
 to remain readable even at high resolutions.
 
-After the package is installed, X applications using fontconfig will be
-able to use the Dina fonts right away. To make them visible to old-style X
-apps (such as xterm), run "xset fp rehash" in your X session. After that,
-try e.g. "xterm -fn Dina_10" (Dina_6, Dina_8, Dina_9 are also available).
+After the package is installed, X applications using fontconfig will
+be able to use the Dina fonts right away. To make them visible to
+old-style X apps (such as xterm), run "xset fp rehash" in your X
+session. After that, try e.g. "xterm -fn Dina_10" (Dina_6, Dina_8,
+Dina_9 are also available).
 
 Optionally, console fonts can be included in the package. To do this,
-install psftools before running this SlackBuild. To view the fonts, use
-e.g. "setfont Dina_10" (or Dina_6, Dina_8, Dina_9). To use as the system
-default, edit /etc/rc.d/rc.font and change the setfont line there. Don't
-forget that rc.font needs to be executable.
+install psftools before running this SlackBuild. To view the fonts,
+use e.g. "setfont Dina_10" (or Dina_6, Dina_8, Dina_9). To use as the
+system default, edit /etc/rc.d/rc.font and change the setfont line
+there. Don't forget that rc.font needs to be executable.
 
 The X11 fonts use the Windows-1252 character set (compatible with
-Latin-1). The console fonts are available in Windows-1252, codepage 437,
-and codepage 850.
+Latin-1). The console fonts are available in Windows-1252, codepage
+437, and codepage 850.
diff --git a/system/dina-font/dina-font.SlackBuild b/system/dina-font/dina-font.SlackBuild
index f3aa6aef87..41a01e03b7 100644
--- a/system/dina-font/dina-font.SlackBuild
+++ b/system/dina-font/dina-font.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dina-font
 
 # Originally written by Binh Nguyen <email removed>.
 # Formerly maintained by Ryan P.C. McQuen <email removed>.
-# Now maintained by B. Watson <yalhcru@gmail.com>.
+# Now maintained by B. Watson <urchlay@slackware.uk>.
 
 # Copyright 2010  Binh Nguyen <email removed>
 # All rights reserved.
@@ -26,6 +26,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230307 bkw: BUILD=2, add douninst.sh.
+
 # 20180117 bkw:
 # - update for v2.93, BUILD=1
 # - original site has gone away, use gentoo distfiles for download and
@@ -48,14 +50,21 @@
 # - install the docs in /usr/doc/$PRGNAM-$VERSION.
 # - BUILD=2
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dina-font
 VERSION=${VERSION:-2.93}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,11 +81,8 @@ mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 unzip $CWD/$SRCNAM-$VERSION.zip
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 mkdir -p $PKG/usr/share/fonts/misc
 
@@ -139,6 +145,7 @@ sed -e "s,@ANDCONSOLE@,$ANDCONSOLE," \
     -e "s,@ONLY@,$ONLY," \
     $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/douninst.sh > $PKG/install/douninst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dina-font/dina-font.info b/system/dina-font/dina-font.info
index 7eb5a04848..c3417c5c53 100644
--- a/system/dina-font/dina-font.info
+++ b/system/dina-font/dina-font.info
@@ -1,10 +1,10 @@
 PRGNAM="dina-font"
 VERSION="2.93"
 HOMEPAGE="http://web.archive.org/web/20170706192353/http://www.donationcoder.com/Software/Jibz/Dina/index.html"
-DOWNLOAD="http://ftp.osuosl.org/pub/gentoo/distfiles/dina-2.93.zip"
+DOWNLOAD="http://ftp.osuosl.org/pub/gentoo/distfiles/fe/dina-2.93.zip"
 MD5SUM="04cf107a6bbc54011c03b34ef296bbae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/dina-font/doinst.sh b/system/dina-font/doinst.sh
index 96b0162ebe..8bf0ea71d1 100644
--- a/system/dina-font/doinst.sh
+++ b/system/dina-font/doinst.sh
@@ -1,6 +1,6 @@
 if [ -x /usr/bin/mkfontdir ]; then
   ( cd usr/share/fonts/misc
-    if ! grep -q ^Dina_ fonts.alias 2>/dev/null; then
+    if ! grep -q '^Dina_\([689]\|10\) ' fonts.alias 2>/dev/null; then
       echo 'Dina_6 -windows-dina-medium-r-normal--8-60-96-96-c-60-microsoft-cp1252' >> fonts.alias
       echo 'Dina_8 -windows-dina-medium-r-normal--10-80-96-96-c-70-microsoft-cp1252' >> fonts.alias
       echo 'Dina_9 -windows-dina-medium-r-normal--12-90-96-96-c-70-microsoft-cp1252' >> fonts.alias
@@ -10,6 +10,9 @@ if [ -x /usr/bin/mkfontdir ]; then
     mkfontdir .
   )
 fi
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
 if [ -x usr/bin/fc-cache ]; then
   usr/bin/fc-cache -f
 fi
diff --git a/system/dina-font/douninst.sh b/system/dina-font/douninst.sh
new file mode 100644
index 0000000000..f1bc56ae86
--- /dev/null
+++ b/system/dina-font/douninst.sh
@@ -0,0 +1,14 @@
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd usr/share/fonts/misc
+    grep -v '^Dina_\([689]\|10\) ' fonts.alias > fonts.alias.new
+    mv fonts.alias.new fonts.alias
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x usr/bin/fc-cache ]; then
+  usr/bin/fc-cache -f
+fi
diff --git a/system/direvent/direvent.SlackBuild b/system/direvent/direvent.SlackBuild
index a0e7c0c952..5b4ba36fc6 100644
--- a/system/direvent/direvent.SlackBuild
+++ b/system/direvent/direvent.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for direvent
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=direvent
 VERSION=${VERSION:-5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -103,4 +113,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/disk-manager/disk-manager.SlackBuild b/system/disk-manager/disk-manager.SlackBuild
index 73f3962e34..ca512a9b74 100644
--- a/system/disk-manager/disk-manager.SlackBuild
+++ b/system/disk-manager/disk-manager.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for disk-manager.
 #
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=disk-manager
 VERSION=${VERSION:-1.1.1}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -106,4 +116,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/diskscan/README b/system/diskscan/README
index 44c4ac5beb..7ab5365c5b 100644
--- a/system/diskscan/README
+++ b/system/diskscan/README
@@ -1,9 +1,8 @@
-DiskScan is a tool to scan a block device and check if there are unreadable
-sectors, in addition it uses read latency times as an assessment for a near
-failure as sectors that are problematic to read usually entail many retries.
+DiskScan is a tool to scan a block device and check if there are
+unreadable sectors, in addition it uses read latency times as an
+assessment for a near failure as sectors that are problematic to read
+usually entail many retries.
 
-Diskscan will only perform reads in its disk surface scan so it is not
-destructive in any way and it will report on all the key metrics needed to
-decide if the disk is good or not.
-
- 
+Diskscan will only perform reads in its disk surface scan so it is
+not destructive in any way and it will report on all the key metrics
+needed to decide if the disk is good or not.
diff --git a/system/diskscan/diskscan.SlackBuild b/system/diskscan/diskscan.SlackBuild
index 6f089fc7d8..48cde7f318 100644
--- a/system/diskscan/diskscan.SlackBuild
+++ b/system/diskscan/diskscan.SlackBuild
@@ -1,30 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for diskscan
 
 # Written by  Andrey Maraev <andrew.maraev60@yandex.ru>
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=diskscan
 VERSION=${VERSION:-0.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -79,4 +89,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/diskscan/diskscan.info b/system/diskscan/diskscan.info
index 1df80c552d..e517fcb088 100644
--- a/system/diskscan/diskscan.info
+++ b/system/diskscan/diskscan.info
@@ -1,7 +1,7 @@
 PRGNAM="diskscan"
 VERSION="0.19"
 HOMEPAGE="http://blog.disksurvey.org/proj/diskscan"
-DOWNLOAD="https://github.com/baruch/diskscan/archive/0.19.tar.gz"
+DOWNLOAD="https://github.com/baruch/diskscan/archive/0.19/diskscan-0.19.tar.gz"
 MD5SUM="14aad4aa22d97e691f48082e9d26199b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/disksearch/README b/system/disksearch/README
index 495b08abe5..5ec8af61ca 100644
--- a/system/disksearch/README
+++ b/system/disksearch/README
@@ -1,5 +1,6 @@
-DiskSearch is a tool for searching for files on all your removable media disks,
-DVD's, SD cards or backup tapes. For instance you can search for songs on your
-MP3-CD's or for a document on your backup DVD's. For advanced queries there is
-a regular expression search mode. The search is based on a simple database file
-needs to be filled once by adding all your disks to it.
+DiskSearch is a tool for searching for files on all your removable
+media disks, DVD's, SD cards or backup tapes. For instance you can
+search for songs on your MP3-CD's or for a document on your backup
+DVD's. For advanced queries there is a regular expression search
+mode. The search is based on a simple database file needs to be filled
+once by adding all your disks to it.
diff --git a/system/disksearch/disksearch.SlackBuild b/system/disksearch/disksearch.SlackBuild
index 13cc8e46d3..3536ccc475 100644
--- a/system/disksearch/disksearch.SlackBuild
+++ b/system/disksearch/disksearch.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for disksearch
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=disksearch
 VERSION=${VERSION:-1.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -91,4 +101,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dislocker/dislocker.SlackBuild b/system/dislocker/dislocker.SlackBuild
index 1b3a653ec8..65296c6a7a 100644
--- a/system/dislocker/dislocker.SlackBuild
+++ b/system/dislocker/dislocker.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dislocker
 
-# Copyright 2018 Leonardo Citrolo, Italy
+# Copyright 2018-2020 Leonardo Citrolo, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dislocker
-VERSION=${VERSION:-0.7.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.7.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,6 +79,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p1 < $CWD/ruby3.patch
+
 mkdir -p build
 cd build
   cmake \
@@ -93,4 +105,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dislocker/dislocker.info b/system/dislocker/dislocker.info
index 585be4f1ab..ed5b9bfa5a 100644
--- a/system/dislocker/dislocker.info
+++ b/system/dislocker/dislocker.info
@@ -1,8 +1,8 @@
 PRGNAM="dislocker"
-VERSION="0.7.1"
+VERSION="0.7.3"
 HOMEPAGE="https://github.com/Aorimn/dislocker"
-DOWNLOAD="https://github.com/Aorimn/dislocker/archive/v0.7.1/dislocker-0.7.1.tar.gz"
-MD5SUM="df1454a1631d6c171d2d01610f83b344"
+DOWNLOAD="https://github.com/Aorimn/dislocker/archive/v0.7.3/dislocker-0.7.3.tar.gz"
+MD5SUM="ff1a5a0120cedf04c6146da91dfbd27c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="mbedtls"
diff --git a/system/dislocker/ruby3.patch b/system/dislocker/ruby3.patch
new file mode 100644
index 0000000000..8f8b16ce9f
--- /dev/null
+++ b/system/dislocker/ruby3.patch
@@ -0,0 +1,170 @@
+From 77fcdd8e00e6934d4e503aaf9743d563f249129d Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Thu, 7 Jan 2021 20:53:55 +0900
+Subject: [PATCH] Fix build failure with ruby 3.0
+
+With ruby 3.0, build fails like:
+
+```
+/builddir/build/BUILD/dislocker-0.7.3/src/config.c: In function 'setclearkey':
+/builddir/build/BUILD/dislocker-0.7.3/src/config.c:59:13: error: expected identifier or '(' before numeric constant
+   59 |         int true = TRUE;
+```
+
+This is because ruby 3.0 header will include <stdbool.h>, which defines
+"true"/"false", ref:
+https://pubs.opengroup.org/onlinepubs/009695399/basedefs/stdbool.h.html
+
+So using "true" as variable must be renamed.
+---
+ src/config.c | 50 +++++++++++++++++++++++++-------------------------
+ 1 file changed, 25 insertions(+), 25 deletions(-)
+
+diff --git a/src/config.c b/src/config.c
+index 2f1bdbc..f9b9423 100644
+--- a/src/config.c
++++ b/src/config.c
+@@ -56,13 +56,13 @@ static void hide_opt(char* opt)
+ static void setclearkey(dis_context_t dis_ctx, char* optarg)
+ {
+ 	(void) optarg;
+-	int true = TRUE;
+-	dis_setopt(dis_ctx, DIS_OPT_USE_CLEAR_KEY, &true);
++	int trueval = TRUE;
++	dis_setopt(dis_ctx, DIS_OPT_USE_CLEAR_KEY, &trueval);
+ }
+ static void setbekfile(dis_context_t dis_ctx, char* optarg)
+ {
+-	int true = TRUE;
+-	dis_setopt(dis_ctx, DIS_OPT_USE_BEK_FILE, &true);
++	int trueval = TRUE;
++	dis_setopt(dis_ctx, DIS_OPT_USE_BEK_FILE, &trueval);
+ 	dis_setopt(dis_ctx, DIS_OPT_SET_BEK_FILE_PATH, optarg);
+ }
+ static void setforceblock(dis_context_t dis_ctx, char* optarg)
+@@ -76,14 +76,14 @@ static void setforceblock(dis_context_t dis_ctx, char* optarg)
+ }
+ static void setfvek(dis_context_t dis_ctx, char* optarg)
+ {
+-	int true = TRUE;
+-	dis_setopt(dis_ctx, DIS_OPT_USE_FVEK_FILE, &true);
++	int trueval = TRUE;
++	dis_setopt(dis_ctx, DIS_OPT_USE_FVEK_FILE, &trueval);
+ 	dis_setopt(dis_ctx, DIS_OPT_SET_FVEK_FILE_PATH, optarg);
+ }
+ static void setvmk(dis_context_t dis_ctx, char* optarg)
+ {
+-	int true = TRUE;
+-	dis_setopt(dis_ctx, DIS_OPT_USE_VMK_FILE, &true);
++	int trueval = TRUE;
++	dis_setopt(dis_ctx, DIS_OPT_USE_VMK_FILE, &trueval);
+ 	dis_setopt(dis_ctx, DIS_OPT_SET_VMK_FILE_PATH, optarg);
+ }
+ static void setlogfile(dis_context_t dis_ctx, char* optarg)
+@@ -97,8 +97,8 @@ static void setoffset(dis_context_t dis_ctx, char* optarg)
+ }
+ static void setrecoverypwd(dis_context_t dis_ctx, char* optarg)
+ {
+-	int true = TRUE;
+-	dis_setopt(dis_ctx, DIS_OPT_USE_RECOVERY_PASSWORD, &true);
++	int trueval = TRUE;
++	dis_setopt(dis_ctx, DIS_OPT_USE_RECOVERY_PASSWORD, &trueval);
+ 	dis_setopt(dis_ctx, DIS_OPT_SET_RECOVERY_PASSWORD, optarg);
+ 	hide_opt(optarg);
+ }
+@@ -111,19 +111,19 @@ static void setquiet(dis_context_t dis_ctx, char* optarg)
+ static void setro(dis_context_t dis_ctx, char* optarg)
+ {
+ 	(void) optarg;
+-	int true = TRUE;
+-	dis_setopt(dis_ctx, DIS_OPT_READ_ONLY, &true);
++	int trueval = TRUE;
++	dis_setopt(dis_ctx, DIS_OPT_READ_ONLY, &trueval);
+ }
+ static void setstateok(dis_context_t dis_ctx, char* optarg)
+ {
+ 	(void) optarg;
+-	int true = TRUE;
+-	dis_setopt(dis_ctx, DIS_OPT_DONT_CHECK_VOLUME_STATE, &true);
++	int trueval = TRUE;
++	dis_setopt(dis_ctx, DIS_OPT_DONT_CHECK_VOLUME_STATE, &trueval);
+ }
+ static void setuserpassword(dis_context_t dis_ctx, char* optarg)
+ {
+-	int true = TRUE;
+-	dis_setopt(dis_ctx, DIS_OPT_USE_USER_PASSWORD, &true);
++	int trueval = TRUE;
++	dis_setopt(dis_ctx, DIS_OPT_USE_USER_PASSWORD, &trueval);
+ 	dis_setopt(dis_ctx, DIS_OPT_SET_USER_PASSWORD, optarg);
+ 	hide_opt(optarg);
+ }
+@@ -266,7 +266,7 @@ int dis_getopts(dis_context_t dis_ctx, int argc, char** argv)
+ 		return -1;
+ 
+ 	dis_config_t* cfg = &dis_ctx->cfg;
+-	int true = TRUE;
++	int trueval = TRUE;
+ 
+ 
+ 	long_opts = malloc(nb_options * sizeof(struct option));
+@@ -285,12 +285,12 @@ int dis_getopts(dis_context_t dis_ctx, int argc, char** argv)
+ 		{
+ 			case 'c':
+ 			{
+-				dis_setopt(dis_ctx, DIS_OPT_USE_CLEAR_KEY, &true);
++				dis_setopt(dis_ctx, DIS_OPT_USE_CLEAR_KEY, &trueval);
+ 				break;
+ 			}
+ 			case 'f':
+ 			{
+-				dis_setopt(dis_ctx, DIS_OPT_USE_BEK_FILE, &true);
++				dis_setopt(dis_ctx, DIS_OPT_USE_BEK_FILE, &trueval);
+ 				dis_setopt(dis_ctx, DIS_OPT_SET_BEK_FILE_PATH, optarg);
+ 				break;
+ 			}
+@@ -312,13 +312,13 @@ int dis_getopts(dis_context_t dis_ctx, int argc, char** argv)
+ 			}
+ 			case 'k':
+ 			{
+-				dis_setopt(dis_ctx, DIS_OPT_USE_FVEK_FILE, &true);
++				dis_setopt(dis_ctx, DIS_OPT_USE_FVEK_FILE, &trueval);
+ 				dis_setopt(dis_ctx, DIS_OPT_SET_FVEK_FILE_PATH, optarg);
+ 				break;
+ 			}
+ 			case 'K':
+ 			{
+-				dis_setopt(dis_ctx, DIS_OPT_USE_VMK_FILE, &true);
++				dis_setopt(dis_ctx, DIS_OPT_USE_VMK_FILE, &trueval);
+ 				dis_setopt(dis_ctx, DIS_OPT_SET_VMK_FILE_PATH, optarg);
+ 				break;
+ 			}
+@@ -340,7 +340,7 @@ int dis_getopts(dis_context_t dis_ctx, int argc, char** argv)
+ 			}
+ 			case 'p':
+ 			{
+-				dis_setopt(dis_ctx, DIS_OPT_USE_RECOVERY_PASSWORD, &true);
++				dis_setopt(dis_ctx, DIS_OPT_USE_RECOVERY_PASSWORD, &trueval);
+ 				dis_setopt(dis_ctx, DIS_OPT_SET_RECOVERY_PASSWORD, optarg);
+ 				hide_opt(optarg);
+ 				break;
+@@ -353,17 +353,17 @@ int dis_getopts(dis_context_t dis_ctx, int argc, char** argv)
+ 			}
+ 			case 'r':
+ 			{
+-				dis_setopt(dis_ctx, DIS_OPT_READ_ONLY, &true);
++				dis_setopt(dis_ctx, DIS_OPT_READ_ONLY, &trueval);
+ 				break;
+ 			}
+ 			case 's':
+ 			{
+-				dis_setopt(dis_ctx, DIS_OPT_DONT_CHECK_VOLUME_STATE, &true);
++				dis_setopt(dis_ctx, DIS_OPT_DONT_CHECK_VOLUME_STATE, &trueval);
+ 				break;
+ 			}
+ 			case 'u':
+ 			{
+-				dis_setopt(dis_ctx, DIS_OPT_USE_USER_PASSWORD, &true);
++				dis_setopt(dis_ctx, DIS_OPT_USE_USER_PASSWORD, &trueval);
+ 				dis_setopt(dis_ctx, DIS_OPT_SET_USER_PASSWORD, optarg);
+ 				hide_opt(optarg);
+ 				break;
diff --git a/system/displaylink/README b/system/displaylink/README
index 475511c89e..bd56290dbd 100644
--- a/system/displaylink/README
+++ b/system/displaylink/README
@@ -1,10 +1,14 @@
 Driver for DisplayLink devices.
 
-Notes:
-  - This SlackBuild is a binary repacking. To download this pack you
-    need to navigate to download URL and accept the license.
-    Another option is to use the following commands:
-
-    . ./displaylink.info
-    wget -O displaylink-driver-$VERSION.zip \
-         --post-data="fileId=1057&accept_submit=Accept" $DOWNLOAD
+This SlackBuild is a binary repackaging. To download the "source", you
+must navigate to download URL and accept the license.
+
+Another option is to use the following command:
+
+wget \
+https://www.synaptics.com/sites/default/files/exe_files/2021-02/DisplayLink%20USB%20Graphics%20Software%20for%20Ubuntu1.4-EXE.zip
+
+Note that this command may stop working at some point, if Synaptics
+changes the layout of their web site. Also note that this is
+proprietary software with a non-free license. Using wget does not
+exempt you from the license terms.
diff --git a/system/displaylink/displaylink.SlackBuild b/system/displaylink/displaylink.SlackBuild
index da9a8b9d70..787e99c083 100644
--- a/system/displaylink/displaylink.SlackBuild
+++ b/system/displaylink/displaylink.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for DisplayLink Driver
 
@@ -22,10 +22,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220223 bkw: Modified by SlackBuilds.org: update the wget
+# instructions in README. I could have just put the new URL in
+# DOWNLOAD, but doing it this way prompts users to accept the license.
+# Also, I have no DisplayLink hardware to test the driver with, and
+# it's quite an old version (they're up to version 5.4.1 now).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=displaylink
 VERSION=${VERSION:-1.4.210}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +44,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -51,22 +64,26 @@ fi
 
 set -e
 
+ZIPFILE="$CWD/DisplayLink%20USB%20Graphics%20Software%20for%20Ubuntu1.4-EXE.zip"
+if [ ! -e "$ZIPFILE" ]; then
+  ZIPFILE="$CWD/DisplayLink USB Graphics Software for Ubuntu1.4-EXE.zip"
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-driver-$VERSION.zip -d $PRGNAM-$VERSION
+unzip "$ZIPFILE" -d $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 
-chmod +x displaylink-driver-$VERSION.run
-./displaylink-driver-$VERSION.run --target . --noexec
+sh ./displaylink-driver-$VERSION.run --target . --noexec
 
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 install -d -m755 $PKG/usr/lib$LIBDIRSUFFIX/displaylink
 install -D -m755 $PACK_ARCH-$PACK_DISTRO/DisplayLinkManager \
@@ -98,4 +115,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/displaylink/displaylink.info b/system/displaylink/displaylink.info
index 0868349059..b884446e32 100644
--- a/system/displaylink/displaylink.info
+++ b/system/displaylink/displaylink.info
@@ -1,7 +1,7 @@
 PRGNAM="displaylink"
 VERSION="1.4.210"
 HOMEPAGE="http://www.displaylink.com/downloads/ubuntu.php"
-DOWNLOAD="http://www.displaylink.com/downloads/file?id=1057"
+DOWNLOAD="http://www.displaylink.com/downloads/ubuntu.php"
 MD5SUM="eb65a2abb3aa120c9bb1d337a26e5e8b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/distrobox/README b/system/distrobox/README
new file mode 100644
index 0000000000..2d0fbc00a3
--- /dev/null
+++ b/system/distrobox/README
@@ -0,0 +1,2 @@
+fancy wrapper around podman, docker or lilipod to create and start
+containers highly integrated with the hosts.
diff --git a/system/distrobox/distrobox.SlackBuild b/system/distrobox/distrobox.SlackBuild
new file mode 100644
index 0000000000..693318d378
--- /dev/null
+++ b/system/distrobox/distrobox.SlackBuild
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+# Slackware build script for distrobox
+
+# Copyright 2023-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=distrobox
+VERSION=${VERSION:-1.7.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/bin $PKG/usr/share/{bash-completions,icons}
+cp -rf distrobox* $PKG/usr/bin
+cp -rf man/ $PKG/usr/
+cp -rf completions $PKG/usr/share/bash-completions/
+rm $PKG/usr/man/gen-man
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -rf docs/* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/distrobox/distrobox.info b/system/distrobox/distrobox.info
new file mode 100644
index 0000000000..3a44b50f50
--- /dev/null
+++ b/system/distrobox/distrobox.info
@@ -0,0 +1,10 @@
+PRGNAM="distrobox"
+VERSION="1.7.1"
+HOMEPAGE="https://github.com/89luca89/distrobox"
+DOWNLOAD="https://github.com/89luca89/distrobox/archive/1.7.1/distrobox-1.7.1.tar.gz"
+MD5SUM="25e413dbc60fbea908542c392e2affda"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="podman"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/system/distrobox/slack-desc b/system/distrobox/slack-desc
new file mode 100644
index 0000000000..e2e7fc6af4
--- /dev/null
+++ b/system/distrobox/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+distrobox: distrobox (fancy wrapper around podman, docker or lilipod)
+distrobox:
+distrobox: fancy wrapper around podman, docker or lilipod to create and start
+distrobox: containers highly integrated with the hosts.
+distrobox:
+distrobox:
+distrobox:
+distrobox: Project URL: https://github.com/89luca89/distrobox
+distrobox:
+distrobox:
+distrobox:
diff --git a/system/dlm/README b/system/dlm/README
index e9d8c9db5d..8904c0428b 100644
--- a/system/dlm/README
+++ b/system/dlm/README
@@ -1,4 +1,5 @@
 DLM is the lock manager that provides a mechanism for other cluster
-infrastructure components to synchronize their access to shared resources.
+infrastructure components to synchronize their access to shared
+resources.
 
 More information post-install can be found in README.SLACKWARE
diff --git a/system/dlm/dlm.SlackBuild b/system/dlm/dlm.SlackBuild
index ccebfec1f9..5fa66cb784 100644
--- a/system/dlm/dlm.SlackBuild
+++ b/system/dlm/dlm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dlm
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dlm
 VERSION=${VERSION:-4.0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -105,4 +115,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/docbook-xml/docbook-xml.SlackBuild b/system/docbook-xml/docbook-xml.SlackBuild
index a8204c060c..74757f94a3 100644
--- a/system/docbook-xml/docbook-xml.SlackBuild
+++ b/system/docbook-xml/docbook-xml.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for docbook-xml
 
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=docbook-xml
 VERSION=${VERSION:-4.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -70,4 +80,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/docbook-xml5/README b/system/docbook-xml5/README
new file mode 100644
index 0000000000..733596e825
--- /dev/null
+++ b/system/docbook-xml5/README
@@ -0,0 +1,20 @@
+'docbook-xml5' is a group of shell scripts and 
+required files used for creating a removable 
+SlackBuild package for DocBook5 XML dtd and schemas
+with XML stylesheets in a namespace.
+
+After the installation of the DocBook5 XML dtd and schemas
+with XML stylesheets in a namespace /etc/xml/docbook 
+catalog file will be created if it DOESN'T exist otherwise
+it will be updated accordingly depending on the installation
+state of the 'docbookMathML1mods' package. Also following
+symbolic links will be created for the XML stylesheets
+that must be used with DocBook5 XML dtd and schemas:
+
+    /usr/share/xml/docbook/stylesheet/docbook-xsl-ns
+    /usr/share/xml/docbook/xsl-ns-stylesheets
+
+After uninstallation of the 'docbook-xml5' package
+/etc/xml/docbook and /usr/share/xml/ will be reset
+automatically to the original state defined by the 
+'linuxdoc-tools'
diff --git a/system/docbook-xml5/docbook-xml5.SlackBuild b/system/docbook-xml5/docbook-xml5.SlackBuild
new file mode 100644
index 0000000000..523d5416aa
--- /dev/null
+++ b/system/docbook-xml5/docbook-xml5.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/bash
+
+# docbook-xml5.SlackBuild - SlackBuild script for creating a pkg. of DocBook5 DTD and Schemas
+# Copyright © 2022 Necib ÇAPAR <necipcapar@gmail.com>
+
+# This file is part of docbook-xml5
+
+# docbook-xml5 is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# docbook-xml5 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=docbook-xml5
+VERSION=${VERSION:-5.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# create installation directory tree for the original files
+mkdir --parents $PKG/usr/share/xml/docbook/5.0
+cp --archive $TMP/$PRGNAM-$VERSION/docbook-5.0/* $PKG/usr/share/xml/docbook/5.0/
+cp --archive $TMP/$PRGNAM-$VERSION/catalog_docbook-5.0.0.xml $PKG/usr/share/xml/docbook/5.0/
+cp --archive $TMP/$PRGNAM-$VERSION/xsl-ns-stylesheets-1.79.2 $PKG/usr/share/xml/docbook/
+# create symbolic-links
+mkdir --parents $PKG/usr/share/xml/docbook/stylesheet
+cd $PKG/usr/share/xml/docbook/stylesheet
+ln -sf ../xsl-ns-stylesheets-1.79.2 docbook-xsl-ns
+cd ..
+ln -sf xsl-ns-stylesheets-1.79.2 xsl-ns-stylesheets
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/xml/docbook/5.0/{ChangeLog,README,VERSION,docs} $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/douninst.sh > $PKG/install/douninst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/docbook-xml5/docbook-xml5.info b/system/docbook-xml5/docbook-xml5.info
new file mode 100644
index 0000000000..4b59e67ea4
--- /dev/null
+++ b/system/docbook-xml5/docbook-xml5.info
@@ -0,0 +1,10 @@
+PRGNAM="docbook-xml5"
+VERSION="5.0.0"
+HOMEPAGE="https://github.com/N-Tek/docbook-xml5"
+DOWNLOAD="https://github.com/N-Tek/docbook-xml5/releases/download/v5.0.0/docbook-xml5-5.0.0.tar.gz"
+MD5SUM="d2c9b3f7469e691c2c7c81c0c9090901"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="%README%"
+MAINTAINER="Necib ÇAPAR"
+EMAIL="necipcapar@gmail.com"
diff --git a/system/docbook-xml5/doinst.sh b/system/docbook-xml5/doinst.sh
new file mode 100644
index 0000000000..784c61c307
--- /dev/null
+++ b/system/docbook-xml5/doinst.sh
@@ -0,0 +1,114 @@
+catalog_filepath=etc/xml/docbook
+
+if [ ! -e etc/xml ]; then
+    mkdir -p etc/xml
+    xmlcatalog --noout --create $catalog_filepath
+fi
+
+# DocBook V4.5 Entries
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//DTD DocBook XML V4.5//EN" \
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+ "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
+ "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteSystem' \
+  "http://www.oasis-open.org/docbook/xml/4.5" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteURI' \
+  "http://www.oasis-open.org/docbook/xml/4.5" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//DTD DocBook XML V4.1.2//EN" \
+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteSystem' \
+  "http://www.oasis-open.org/docbook/xml/4.1.2" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteURI' \
+  "http://www.oasis-open.org/docbook/xml/4.1.2" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//DTD DocBook XML V4.2//EN" \
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteSystem' \
+  "http://www.oasis-open.org/docbook/xml/4.2" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteURI' \
+  "http://www.oasis-open.org/docbook/xml/4.2" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//DTD DocBook XML V4.3//EN" \
+  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteSystem' \
+  "http://www.oasis-open.org/docbook/xml/4.3" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteURI' \
+  "http://www.oasis-open.org/docbook/xml/4.3" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//DTD DocBook XML V4.4//EN" \
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteSystem' \
+  "http://www.oasis-open.org/docbook/xml/4.4" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteURI' \
+  "http://www.oasis-open.org/docbook/xml/4.4" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+ 
+# 'docbookMathML1mods' package installation check
+if [ -e var/lib/pkgtools/packages/docbookMathML1mods* ]; then
+    xmlcatalog --noout --add 'nextCatalog' \
+      '' \
+      "file:///usr/share/xml/docbook/custom/mathml/catalog_DocBook_MathML1_mods.xml" \
+      $catalog_filepath
+fi
+
+# DocBook V5.0.0 catalog entry
+xmlcatalog --noout --add 'nextCatalog' \
+  '' \
+  "file:///usr/share/xml/docbook/5.0/catalog_docbook-5.0.0.xml" \
+  $catalog_filepath
diff --git a/system/docbook-xml5/douninst.sh b/system/docbook-xml5/douninst.sh
new file mode 100644
index 0000000000..898113f8f4
--- /dev/null
+++ b/system/docbook-xml5/douninst.sh
@@ -0,0 +1,6 @@
+catalog_filepath=etc/xml/docbook
+
+# Remove DocBook V5.0.0 catalog entry
+xmlcatalog --noout --del \
+  "file:///usr/share/xml/docbook/5.0/catalog_docbook-5.0.0.xml" \
+  $catalog_filepath
diff --git a/system/docbook-xml5/slack-desc b/system/docbook-xml5/slack-desc
new file mode 100644
index 0000000000..847d417628
--- /dev/null
+++ b/system/docbook-xml5/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+docbook-xml5: docbook-xml5 (DocBook XML V5.0)
+docbook-xml5:
+docbook-xml5: DocBook XML v5.0 dtd and schemas with XML stylesheets in a namespace
+docbook-xml5:
+docbook-xml5:
+docbook-xml5:
+docbook-xml5:
+docbook-xml5:
+docbook-xml5:
+docbook-xml5: https://cdn.docbook.org/release/xsl/current/
+docbook-xml5: http://docbook.org/xml/5.0/docbook-5.0.zip
diff --git a/system/docbookMathML1mods/README b/system/docbookMathML1mods/README
new file mode 100644
index 0000000000..1de359c304
--- /dev/null
+++ b/system/docbookMathML1mods/README
@@ -0,0 +1,13 @@
+'docbookMathML1mods' is a group of shell scripts, SGML catalog
+and required files used for creating a removable 
+SlackBuild package for DocBook MathML modules' DTDs.
+
+After the installation of DocBook MathML modules' DTDs
+/etc/xml/docbook catalog file will be created if it DOESN'T 
+exist otherwise it will be updated accordingly depending on 
+the installation state of the 'docbook-xml5' package.
+
+After uninstallation of the 'docbookMathML1mods' package
+/etc/xml/docbook and /usr/share/xml/ will be reset
+automatically to the original state defined by the 
+'linuxdoc-tools'
diff --git a/system/docbookMathML1mods/docbookMathML1mods.SlackBuild b/system/docbookMathML1mods/docbookMathML1mods.SlackBuild
new file mode 100644
index 0000000000..049724c857
--- /dev/null
+++ b/system/docbookMathML1mods/docbookMathML1mods.SlackBuild
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+# docbookMathML1mods.SlackBuild - SlackBuild script for creating a pkg. of MathML modules
+# Copyright © 2022 Necib ÇAPAR <necipcapar@gmail.com>
+
+# This file is part of docbookMathML1mods
+
+# docbookMathML1mods is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# docbookMathML1mods is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=docbookMathML1mods
+VERSION=${VERSION:-1.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# create installation directory tree for the original files
+mkdir --parents $PKG/usr/share/xml/docbook/custom/
+cp --archive ./mathml $PKG/usr/share/xml/docbook/custom/mathml
+cp --archive $TMP/$PRGNAM-$VERSION/catalog_DocBook_MathML1_mods.xml $PKG/usr/share/xml/docbook/custom/mathml
+cp --archive $TMP/$PRGNAM-$VERSION/catalog_DocBook_MathML1_mods $PKG/usr/share/xml/docbook/custom/mathml
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/douninst.sh > $PKG/install/douninst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/docbookMathML1mods/docbookMathML1mods.info b/system/docbookMathML1mods/docbookMathML1mods.info
new file mode 100644
index 0000000000..e74fec06aa
--- /dev/null
+++ b/system/docbookMathML1mods/docbookMathML1mods.info
@@ -0,0 +1,10 @@
+PRGNAM="docbookMathML1mods"
+VERSION="1.0.0"
+HOMEPAGE="https://github.com/N-Tek/docbookMathML1mods"
+DOWNLOAD="https://github.com/N-Tek/docbookMathML1mods/releases/download/v1.0.0/docbookMathML1mods-1.0.0.tar.gz"
+MD5SUM="ef9773243803aa1c1823cf147f4a5f81"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="%README%"
+MAINTAINER="Necib ÇAPAR"
+EMAIL="necipcapar@gmail.com"
diff --git a/system/docbookMathML1mods/doinst.sh b/system/docbookMathML1mods/doinst.sh
new file mode 100644
index 0000000000..ba6d5a25d7
--- /dev/null
+++ b/system/docbookMathML1mods/doinst.sh
@@ -0,0 +1,117 @@
+catalog_filepath=etc/xml/docbook
+
+if [ ! -e etc/xml ]; then
+    mkdir -p etc/xml
+    xmlcatalog --noout --create $catalog_filepath
+fi
+
+# DocBook V4.5 Entries
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//DTD DocBook XML V4.5//EN" \
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+ "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
+ "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteSystem' \
+  "http://www.oasis-open.org/docbook/xml/4.5" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteURI' \
+  "http://www.oasis-open.org/docbook/xml/4.5" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//DTD DocBook XML V4.1.2//EN" \
+  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteSystem' \
+  "http://www.oasis-open.org/docbook/xml/4.1.2" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteURI' \
+  "http://www.oasis-open.org/docbook/xml/4.1.2" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//DTD DocBook XML V4.2//EN" \
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteSystem' \
+  "http://www.oasis-open.org/docbook/xml/4.2" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteURI' \
+  "http://www.oasis-open.org/docbook/xml/4.2" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//DTD DocBook XML V4.3//EN" \
+  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteSystem' \
+  "http://www.oasis-open.org/docbook/xml/4.3" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteURI' \
+  "http://www.oasis-open.org/docbook/xml/4.3" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'public' \
+  "-//OASIS//DTD DocBook XML V4.4//EN" \
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteSystem' \
+  "http://www.oasis-open.org/docbook/xml/4.4" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteURI' \
+  "http://www.oasis-open.org/docbook/xml/4.4" \
+  "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+  $catalog_filepath
+ 
+# DocBook MathML1 modules' catalog entry
+xmlcatalog --noout --add 'nextCatalog' \
+  '' \
+  "file:///usr/share/xml/docbook/custom/mathml/catalog_DocBook_MathML1_mods.xml" \
+  $catalog_filepath
+
+# 'docbook-xml5' package installation check
+if [ -e var/lib/pkgtools/packages/docbook-xml5* ]; then
+    xmlcatalog --noout --del \
+      "file:///usr/share/xml/docbook/5.0/catalog_docbook-5.0.0.xml" \
+      $catalog_filepath
+    xmlcatalog --noout --add 'nextCatalog' \
+      '' \
+      "file:///usr/share/xml/docbook/5.0/catalog_docbook-5.0.0.xml" \
+      $catalog_filepath
+fi
diff --git a/system/docbookMathML1mods/douninst.sh b/system/docbookMathML1mods/douninst.sh
new file mode 100644
index 0000000000..9c41b1c65c
--- /dev/null
+++ b/system/docbookMathML1mods/douninst.sh
@@ -0,0 +1,6 @@
+catalog_filepath=etc/xml/docbook
+
+# Remove DocBook MathML1 modules' catalog entry
+xmlcatalog --noout --del \
+  "file:///usr/share/xml/docbook/custom/mathml/catalog_DocBook_MathML1_mods.xml" \
+  $catalog_filepath
diff --git a/system/docbookMathML1mods/slack-desc b/system/docbookMathML1mods/slack-desc
new file mode 100644
index 0000000000..7ab6d07891
--- /dev/null
+++ b/system/docbookMathML1mods/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+docbookMathML1mods: docbookMathML1mods (DocBook MathML1 modules)
+docbookMathML1mods:
+docbookMathML1mods: DocBook MathML modules for version 1.0, 1.1CR1, 1.1b1  
+docbookMathML1mods: (Modular superset of DocBook XML V4.3)
+docbookMathML1mods:
+docbookMathML1mods:
+docbookMathML1mods:
+docbookMathML1mods:
+docbookMathML1mods:
+docbookMathML1mods:
+docbookMathML1mods: https://docbook.org/xml/mathml/
diff --git a/system/docker-buildx/README b/system/docker-buildx/README
new file mode 100644
index 0000000000..e51746bfc4
--- /dev/null
+++ b/system/docker-buildx/README
@@ -0,0 +1,2 @@
+buildx is a Docker CLI plugin for extended build capabilities with
+BuildKit.
diff --git a/system/docker-buildx/docker-buildx.SlackBuild b/system/docker-buildx/docker-buildx.SlackBuild
new file mode 100644
index 0000000000..6dab03e6f3
--- /dev/null
+++ b/system/docker-buildx/docker-buildx.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+# Slackware build script for docker-buildx
+
+# Copyright 2022-2024 Andrew Clemons, Tokyo Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=docker-buildx
+VERSION=${VERSION:-0.13.1}
+GITHASH=${GITHASH:-788433953af10f2a698f5c07611dddce2e08c7a0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM=buildx
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+GITURI=github.com/docker/buildx
+
+CGO_ENABLED=0 \
+GOFLAGS=-mod=vendor \
+GO111MODULE=on \
+  go build -ldflags "-X $GITURI/version.Version=${VERSION} -X $GITURI/version.Revision=${GITHASH} -X $GITURI/version.Package=$GITURI -w -s" \
+  -o docker-buildx ./cmd/buildx
+
+mkdir -p $PKG/usr/libexec/docker/cli-plugins/
+install -Dm755 docker-buildx $PKG/usr/libexec/docker/cli-plugins/
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS LICENSE MAINTAINERS README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/docker-buildx/docker-buildx.info b/system/docker-buildx/docker-buildx.info
new file mode 100644
index 0000000000..625dad5d7c
--- /dev/null
+++ b/system/docker-buildx/docker-buildx.info
@@ -0,0 +1,10 @@
+PRGNAM="docker-buildx"
+VERSION="0.13.1"
+HOMEPAGE="https://github.com/docker/buildx"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/docker/buildx/archive/v0.13.1/buildx-0.13.1.tar.gz"
+MD5SUM_x86_64="42a6b7cc084755ff69b7109fb728f29d"
+REQUIRES="google-go-lang"
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"
diff --git a/system/docker-buildx/slack-desc b/system/docker-buildx/slack-desc
new file mode 100644
index 0000000000..5e298b297c
--- /dev/null
+++ b/system/docker-buildx/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+docker-buildx: docker-buildx (plugin for extended build capabilities with BuildKit)
+docker-buildx:
+docker-buildx: buildx is a Docker CLI plugin for extended build capabilities with
+docker-buildx: BuildKit.
+docker-buildx:
+docker-buildx: Homepage: https://github.com/docker/buildx
+docker-buildx:
+docker-buildx:
+docker-buildx:
+docker-buildx:
+docker-buildx:
diff --git a/system/docker-cli/docker-cli.SlackBuild b/system/docker-cli/docker-cli.SlackBuild
index b6451ec6fe..e987fd9259 100644
--- a/system/docker-cli/docker-cli.SlackBuild
+++ b/system/docker-cli/docker-cli.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for docker-cli
 
@@ -22,11 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=2: strip binary.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=docker-cli
-VERSION=${VERSION:-20.10.2}
-GITHASH=${GITHASH:-2291f61}
+VERSION=${VERSION:-24.0.9}
+GITHASH=${GITHASH:-293681613032e6d1a39cc88115847d3984195c24}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=cli
 
@@ -38,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,21 +63,22 @@ cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir build
 mv vendor build/src
 ln -sf $TMP/$SRCNAM-$VERSION build/src/github.com/docker/cli
 
+GO111MODULE=auto \
 DISABLE_WARN_OUTSIDE_CONTAINER=1 \
 make dynbinary \
   GITCOMMIT=$GITHASH \
   VERSION=$VERSION \
   GOPATH=$TMP/$SRCNAM-$VERSION/build
 
-install -D -m 0755 build/docker-linux-amd64 $PKG/usr/bin/docker
+install -D -m 0755 -s build/docker-linux-* $PKG/usr/bin/docker
 
 # Completion.
 ( cd contrib/completion
@@ -85,4 +95,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/docker-cli/docker-cli.info b/system/docker-cli/docker-cli.info
index e004f9f2b5..a20abbf13c 100644
--- a/system/docker-cli/docker-cli.info
+++ b/system/docker-cli/docker-cli.info
@@ -1,10 +1,10 @@
 PRGNAM="docker-cli"
-VERSION="20.10.2"
+VERSION="24.0.9"
 HOMEPAGE="https://www.docker.com/products/container-runtime"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/docker/cli/archive/v20.10.2/cli-20.10.2.tar.gz"
-MD5SUM_x86_64="b3e97ba282605d0c511d394d7a7be3b4"
+DOWNLOAD_x86_64="https://github.com/docker/cli/archive/v24.0.9/cli-24.0.9.tar.gz"
+MD5SUM_x86_64="86192b20170567bda2b92f0f0c9548a9"
 REQUIRES="docker"
 MAINTAINER="Audrius Kažukauskas"
 EMAIL="audrius@neutrino.lt"
diff --git a/system/docker-compose/README b/system/docker-compose/README
index c2fe93df16..11259004f9 100644
--- a/system/docker-compose/README
+++ b/system/docker-compose/README
@@ -1,7 +1,17 @@
-Compose is a tool for defining and running multi-container Docker
-applications.  With Compose, you use a Compose file to configure your
-application's services.  Then, using a single command, you create and
-start all the services from your configuration.
+Docker Compose v2 (Utility for running containers on Docker)
 
-Compose is great for development, testing, and staging environments, as
-well as CI workflows.
+Docker Compose is a tool for running multi-container applications on
+Docker defined using the Compose file format. A Compose file is used to
+define how one or more containers that make up your application are
+configured. Once you have a Compose file, you can create and start your
+application with a single command: docker compose up.
+
+Docker Compose V2 is a major version bump release of Docker Compose. It
+has been completely rewritten from scratch in Golang (V1 was in Python).
+The installation instructions for Compose V2 differ from V1. V2 is not a
+standalone binary anymore, and installation scripts will have to be
+adjusted. Some commands are different.
+
+Warning: This SlackBuild requires network access when it runs, meaning
+it downloads files from the Internet with root access. You should
+decide for yourself whether or not you think this is a good idea.
diff --git a/system/docker-compose/docker-compose.SlackBuild b/system/docker-compose/docker-compose.SlackBuild
index 8229ebbad6..463bd6d7ef 100644
--- a/system/docker-compose/docker-compose.SlackBuild
+++ b/system/docker-compose/docker-compose.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for docker-compose
 
-# Copyright 2017-2018 Audrius Kažukauskas <audrius@neutrino.lt>
+# Copyright 2023 Ebben Aries <slackbuilds@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=docker-compose
-VERSION=${VERSION:-1.21.1}
+VERSION=${VERSION:-2.26.1}
+GITHASH=${GITHASH:-b929810}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM=compose
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -45,9 +55,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -55,25 +65,24 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Remove upper bound on requires.
-sed -i "s/, < .*',$/',/" setup.py
+GO111MODULE=auto \
+DISABLE_WARN_OUTSIDE_CONTAINER=1 \
+make \
+  GITCOMMIT=$GITHASH \
+  VERSION=$VERSION
 
-python setup.py install --root=$PKG
+install -D -m 0755 bin/build/$PRGNAM $PKG/usr/bin/$PRGNAM
 
-# Completion.
-install -D -m 0644 contrib/completion/bash/docker-compose \
-  $PKG/usr/share/bash-completion/completions/docker-compose
-install -D -m 0644 contrib/completion/zsh/_docker-compose \
-  $PKG/usr/share/zsh/site-functions/_docker-compose
-install -D -m 0644 contrib/completion/fish/docker-compose.fish \
-  $PKG/usr/share/fish/vendor_completions.d/docker-compose.fish
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG.md LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a BUILDING.md LICENSE MAINTAINERS NOTICE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/docker-compose/docker-compose.info b/system/docker-compose/docker-compose.info
index 976f25eabd..d7bf6ea891 100644
--- a/system/docker-compose/docker-compose.info
+++ b/system/docker-compose/docker-compose.info
@@ -1,10 +1,10 @@
 PRGNAM="docker-compose"
-VERSION="1.21.1"
+VERSION="2.26.1"
 HOMEPAGE="https://docs.docker.com/compose/"
-DOWNLOAD="https://files.pythonhosted.org/packages/04/93/8547a7701e44b0ea24735d1950fe7e6fe90951f0ebb6757dabf76ee64473/docker-compose-1.21.1.tar.gz"
-MD5SUM="9dbc93a798fcda7b871ed6d580dc1a18"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="PyYAML docopt enum34 jsonschema python-cached-property python-docker python-dockerpty python-texttable"
-MAINTAINER="Audrius Kažukauskas"
-EMAIL="audrius@neutrino.lt"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/docker/compose/archive/v2.26.1/compose-2.26.1.tar.gz"
+MD5SUM_x86_64="64ac36e75914803274d074d107cf3e17"
+REQUIRES="docker-cli"
+MAINTAINER="Ebben Aries"
+EMAIL="slackbuilds@dscp.org"
diff --git a/system/docker-compose/doinst.sh b/system/docker-compose/doinst.sh
new file mode 100644
index 0000000000..a05dcabbd4
--- /dev/null
+++ b/system/docker-compose/doinst.sh
@@ -0,0 +1,8 @@
+# Install docker-compose to docker-cli global plugin directory
+PLUGIN_DIR="/usr/libexec/docker/cli-plugins"
+
+if [ ! -d "$PLUGIN_DIR" ]; then
+    mkdir -p $PLUGIN_DIR
+fi
+
+ln -sf /usr/bin/docker-compose $PLUGIN_DIR/docker-compose
diff --git a/system/docker-compose/slack-desc b/system/docker-compose/slack-desc
index 4ce7ddc508..82c2b7d297 100644
--- a/system/docker-compose/slack-desc
+++ b/system/docker-compose/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
               |-----handy-ruler------------------------------------------------------|
-docker-compose: docker-compose (multi-container orchestration for docker)
+docker-compose: docker-compose (Utility for running containers on Docker)
 docker-compose:
-docker-compose: Compose is a tool for defining and running multi-container Docker
-docker-compose: applications.  With Compose, you use a Compose file to configure your
-docker-compose: application's services.  Then, using a single command, you create and
-docker-compose: start all the services from your configuration.
+docker-compose: Docker Compose is a tool for running multi-container
+docker-compose: applications on Docker defined using the Compose file format. A
+docker-compose: Compose file is used to define how one or more containers that make
+docker-compose: up your application are configured. Once you have a Compose file, you
+docker-compose: can create and start your application with a single command: docker
+docker-compose: compose up.
 docker-compose:
 docker-compose: Homepage: https://docs.docker.com/compose/
 docker-compose:
-docker-compose:
-docker-compose:
diff --git a/system/docker-machine-kvm/docker-machine-kvm.SlackBuild b/system/docker-machine-kvm/docker-machine-kvm.SlackBuild
index 86b36a70db..0b8dbff6e6 100644
--- a/system/docker-machine-kvm/docker-machine-kvm.SlackBuild
+++ b/system/docker-machine-kvm/docker-machine-kvm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for docker-machine-kvm
 
@@ -22,10 +22,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=2: strip binary.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=docker-machine-kvm
 VERSION=${VERSION:-0.10.0}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-6}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -71,10 +80,14 @@ find -L . \
 mkdir -p build/src/github.com/dhiltgen
 ln -sf $TMP/$PRGNAM-$VERSION build/src/github.com/dhiltgen/$PRGNAM
 
+# https://bugs.gentoo.org/893080
+sed -e 's: -i::' -i cmd/docker-machine-driver-kvm/Makefile
+
+export GO111MODULE="off"
 make -C cmd/docker-machine-driver-kvm \
   GOPATH=$TMP/$PRGNAM-$VERSION/build
 
-install -D -m 0755 cmd/docker-machine-driver-kvm/docker-machine-driver-kvm \
+install -D -m 0755 -s cmd/docker-machine-driver-kvm/docker-machine-driver-kvm \
   $PKG/usr/bin/docker-machine-driver-kvm
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -85,4 +98,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/docker-machine-kvm/docker-machine-kvm.info b/system/docker-machine-kvm/docker-machine-kvm.info
index 26d23b79a7..7d3b2795b0 100644
--- a/system/docker-machine-kvm/docker-machine-kvm.info
+++ b/system/docker-machine-kvm/docker-machine-kvm.info
@@ -5,10 +5,10 @@ DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
 DOWNLOAD_x86_64="https://github.com/dhiltgen/docker-machine-kvm/archive/v0.10.0/docker-machine-kvm-0.10.0.tar.gz \
                  https://github.com/libvirt/libvirt-go/archive/v4.5.0/libvirt-go-4.5.0.tar.gz \
-                 https://github.com/docker/machine/archive/v0.16.0/machine-0.16.0.tar.gz"
+                 https://github.com/docker/machine/archive/v0.16.2/machine-0.16.2.tar.gz"
 MD5SUM_x86_64="ad81e6900ace350cbf19be148211dc72 \
                a3acc9b5d1c75100a36a91fbff5269aa \
-               0a114be15896b6d8cc1c2517097bd12a"
+               29ea13839260c51d7e34068acd37e627"
 REQUIRES="docker-machine libvirt"
 MAINTAINER="Audrius Kažukauskas"
 EMAIL="audrius@neutrino.lt"
diff --git a/system/docker-machine/README b/system/docker-machine/README
index 8776f2b482..8e939b1c4b 100644
--- a/system/docker-machine/README
+++ b/system/docker-machine/README
@@ -2,3 +2,5 @@ Machine lets you create Docker hosts on your computer, on cloud
 providers, and inside your own data center.  It creates servers,
 installs Docker on them, then configures the Docker client to talk to
 them.
+
+NOTE: This project is now ARCHIVED by upstream.
diff --git a/system/docker-machine/docker-machine.SlackBuild b/system/docker-machine/docker-machine.SlackBuild
index c9a7dc83c6..fd82606118 100644
--- a/system/docker-machine/docker-machine.SlackBuild
+++ b/system/docker-machine/docker-machine.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for docker-machine
 
@@ -22,12 +22,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=docker-machine
 SRCNAM=machine
-VERSION=${VERSION:-0.16.0}
-GITHASH=${GITHASH:-702c267}
+VERSION=${VERSION:-0.16.2}
+GITHASH=${GITHASH:-bd45ab1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,6 +74,7 @@ mkdir build
 mv vendor build/src
 ln -sf $TMP/$SRCNAM-$VERSION build/src/github.com/docker/machine
 
+GO111MODULE=auto \
 make build \
   PREFIX=$PKG/usr \
   GOPATH=$TMP/$SRCNAM-$VERSION/build
@@ -82,4 +93,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/docker-machine/docker-machine.info b/system/docker-machine/docker-machine.info
index f4485e44a8..eabacb6901 100644
--- a/system/docker-machine/docker-machine.info
+++ b/system/docker-machine/docker-machine.info
@@ -1,10 +1,10 @@
 PRGNAM="docker-machine"
-VERSION="0.16.0"
+VERSION="0.16.2"
 HOMEPAGE="https://docs.docker.com/machine/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/docker/machine/archive/v0.16.0/machine-0.16.0.tar.gz"
-MD5SUM_x86_64="0a114be15896b6d8cc1c2517097bd12a"
+DOWNLOAD_x86_64="https://github.com/docker/machine/archive/v0.16.2/machine-0.16.2.tar.gz"
+MD5SUM_x86_64="29ea13839260c51d7e34068acd37e627"
 REQUIRES="google-go-lang"
 MAINTAINER="Audrius Kažukauskas"
 EMAIL="audrius@neutrino.lt"
diff --git a/system/docker-proxy/docker-proxy.SlackBuild b/system/docker-proxy/docker-proxy.SlackBuild
index ee04af839e..bcbb1cf962 100644
--- a/system/docker-proxy/docker-proxy.SlackBuild
+++ b/system/docker-proxy/docker-proxy.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for docker-proxy
 
@@ -22,11 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2: strip binary.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=docker-proxy
-VERSION=${VERSION:-20201215_fa125a3}
-GITHASH=${GITHASH:-fa125a3512ee0f6187721c88582bf8c4378bd4d7}
+VERSION=${VERSION:-20231021_3797618}
+GITHASH=${GITHASH:-3797618f9a38372e8107d8c06f6ae199e1133ae8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +42,12 @@ if [ -z "$ARCH" ]; then
 fi
 
 SRCNAM=libnetwork
-CWD=$(pwd)
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -53,15 +63,17 @@ cd $SRCNAM-$GITHASH
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir build
 mv vendor build/src
 
+GO111MODULE=auto \
 GOPATH=$TMP/$SRCNAM-$GITHASH/build \
 go build -o $PKG/usr/bin/docker-proxy ./cmd/proxy
+strip $PKG/usr/bin/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
@@ -71,4 +83,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/docker-proxy/docker-proxy.info b/system/docker-proxy/docker-proxy.info
index 6329993d4c..646b221012 100644
--- a/system/docker-proxy/docker-proxy.info
+++ b/system/docker-proxy/docker-proxy.info
@@ -1,10 +1,10 @@
 PRGNAM="docker-proxy"
-VERSION="20201215_fa125a3"
+VERSION="20231021_3797618"
 HOMEPAGE="https://github.com/moby/libnetwork"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/moby/libnetwork/archive/fa125a3/libnetwork-fa125a3512ee0f6187721c88582bf8c4378bd4d7.tar.gz"
-MD5SUM_x86_64="0fa46e48ffcf64148df15a0739c06df4"
+DOWNLOAD_x86_64="https://github.com/moby/libnetwork/archive/3797618f9a38372e8107d8c06f6ae199e1133ae8/libnetwork-3797618f9a38372e8107d8c06f6ae199e1133ae8.tar.gz"
+MD5SUM_x86_64="b6a2f940c4aacff23d1707ef453a177f"
 REQUIRES="google-go-lang"
 MAINTAINER="Audrius Kažukauskas"
 EMAIL="audrius@neutrino.lt"
diff --git a/system/docker/docker.SlackBuild b/system/docker/docker.SlackBuild
index c6631b2487..398e643d75 100644
--- a/system/docker/docker.SlackBuild
+++ b/system/docker/docker.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for docker
 
@@ -23,11 +23,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=docker
-VERSION=${VERSION:-20.10.2}
-GITHASH=${GITHASH:-8891c58}
+VERSION=${VERSION:-24.0.9}
+GITHASH=${GITHASH:-fca702d}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=moby
 
@@ -39,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,17 +66,18 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir build
-mv vendor build/src
-ln -sf $TMP/$SRCNAM-$VERSION build/src/github.com/docker/docker
+mkdir -p src/github.com/docker
+ln -sf "$(pwd)" src/github.com/docker/docker
 
+AUTO_GOPATH=1 \
+GO111MODULE=off \
 DOCKER_GITCOMMIT=$GITHASH \
 DOCKER_BUILDTAGS="seccomp" \
 VERSION=$VERSION \
-GOPATH=$TMP/$SRCNAM-$VERSION/build \
+GOPATH="$(pwd)" \
 ./hack/make.sh dynbinary
 
-install -D -m 0755 bundles/dynbinary-daemon/dockerd-$VERSION \
+install -D -m 0755 bundles/dynbinary-daemon/dockerd \
   $PKG/usr/bin/dockerd
 
 # Integrate required components.
@@ -96,4 +104,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/docker/docker.info b/system/docker/docker.info
index caf6c4c8b8..eaa0fb4a47 100644
--- a/system/docker/docker.info
+++ b/system/docker/docker.info
@@ -1,10 +1,10 @@
 PRGNAM="docker"
-VERSION="20.10.2"
+VERSION="24.0.9"
 HOMEPAGE="https://www.docker.com/products/container-runtime"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/moby/moby/archive/v20.10.2/moby-20.10.2.tar.gz"
-MD5SUM_x86_64="4a1025fd2affef73fb32e863ff6873bd"
+DOWNLOAD_x86_64="https://github.com/moby/moby/archive/v24.0.9/moby-24.0.9.tar.gz"
+MD5SUM_x86_64="2d217965883f091d0d29f6d8b0b55cab"
 REQUIRES="containerd docker-proxy tini"
 MAINTAINER="Audrius Kažukauskas"
 EMAIL="audrius@neutrino.lt"
diff --git a/system/dool/README b/system/dool/README
new file mode 100644
index 0000000000..4420fac3da
--- /dev/null
+++ b/system/dool/README
@@ -0,0 +1,9 @@
+Dool is a versatile replacement for vmstat, iostat, netstat, nfsstat
+and ifstat. Dool overcomes some of their limitations and adds some
+extra features, more counters and flexibility. Dool is handy for
+monitoring systems during performance tuning tests, benchmarks or
+troubleshooting. It can be easily extended with Python plugins for
+almost any kind of system monitoring.
+
+Dool is the drop-in replacement for dstat, after dstat development was
+discontinued.
diff --git a/system/dool/dool.SlackBuild b/system/dool/dool.SlackBuild
new file mode 100644
index 0000000000..059e60811b
--- /dev/null
+++ b/system/dool/dool.SlackBuild
@@ -0,0 +1,80 @@
+#!/bin/bash
+#
+# Slackware build script for dool
+#
+# (C) 2024 by Brent Spillner, following dstat.SlackBuild from Erik W. Hanson.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=dool
+VERSION=${VERSION:-1.3.1}
+ARCH=noarch
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+rm -f examples/dstat.py packaging/snap/python2    # broken symlinks
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make install DESTDIR=$PKG
+
+# We want the examples and the man page.
+mkdir -p $PKG/usr/{man/man1,share/dool/examples}
+install -Dp -m0755 examples/*.py $PKG/usr/share/dool/examples/
+install -Dp -m0644 docs/dool.1 $PKG/usr/man/man1/dool.1
+gzip -9 $PKG/usr/man/man1/dool.1
+rm -rf $PKG/usr/share/man
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog LICENSE README.md \
+  docs/*.html docs/*.adoc $PKG/usr/doc/$PRGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dool/dool.info b/system/dool/dool.info
new file mode 100644
index 0000000000..4830c93a19
--- /dev/null
+++ b/system/dool/dool.info
@@ -0,0 +1,10 @@
+PRGNAM="dool"
+VERSION="1.3.1"
+HOMEPAGE="https://github.com/scottchiefbaker/dool"
+DOWNLOAD="https://github.com/scottchiefbaker/dool/archive/v1.3.1/dool-1.3.1.tar.gz"
+MD5SUM="227cea6002bf83e9eebe992033a155db"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Brent Spillner"
+EMAIL="spillner@acm.org"
diff --git a/system/dool/slack-desc b/system/dool/slack-desc
new file mode 100644
index 0000000000..1745139b27
--- /dev/null
+++ b/system/dool/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+dool: dool (Versatile resource statistics tool)
+dool:
+dool: Dool is a simple, extensible tool for collecting and displaying
+dool: statistics about any kind of system load or resource usage. It can
+dool: replace vmstat, iostat, netstat, nfsstat, and ifstat, and complements
+dool: real-time monitoring tools such as iotop, htop, and btop. dool comes
+dool: with a large set of plugins for common monitoring tasks, and it is
+dool: easy to add custom plugins for your system. dool is handy for system
+dool: health monitoring, performance tuning, benchmarks or troubleshooting.
+dool:
+dool: Dool is a fork of the original 'dstat' (which is now discontinued).
diff --git a/system/dos33fsprogs/README b/system/dos33fsprogs/README
index bf3aa82137..6c0cec6ff4 100644
--- a/system/dos33fsprogs/README
+++ b/system/dos33fsprogs/README
@@ -26,6 +26,8 @@ pcx2hgr: converts a 140x160 (or 140x192) PCX image file
 
 mkdos33fs: create an Apple ][ DOS 3.3 filesystem
 
-asoft_presenter: create a slide presentation disk image for use on apple II
+asoft_presenter: create a slide presentation disk image for use on
+                 Apple II
 
-shape_table: create an Apple shape table for use with DRAW/XDRAW commands
+shape_table: create an Apple shape table for use with DRAW/XDRAW
+             commands
diff --git a/system/dos33fsprogs/dos33fsprogs.SlackBuild b/system/dos33fsprogs/dos33fsprogs.SlackBuild
index 4314602123..4032a41a12 100644
--- a/system/dos33fsprogs/dos33fsprogs.SlackBuild
+++ b/system/dos33fsprogs/dos33fsprogs.SlackBuild
@@ -1,15 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dos33fsprogs
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dos33fsprogs
 VERSION=${VERSION:-0.0.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +22,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -49,11 +56,8 @@ rm -rf $PRGNAM-$VERSION
 gunzip < $CWD/$PRGNAM-$VERSION.tar.gz | tar xvfz -
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # For some reason, these aren't installed by 'make install'. Not including
 # char2hex, since it's trivial and not documented.
@@ -90,4 +94,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dos33fsprogs/dos33fsprogs.info b/system/dos33fsprogs/dos33fsprogs.info
index 6091c74ecc..f71743d9c8 100644
--- a/system/dos33fsprogs/dos33fsprogs.info
+++ b/system/dos33fsprogs/dos33fsprogs.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/dosbox-dev/README b/system/dosbox-dev/README
index 7a7e9f3c7e..b2f490c7cf 100644
--- a/system/dosbox-dev/README
+++ b/system/dosbox-dev/README
@@ -4,23 +4,15 @@ as well as many apps designed to run on DOS.
 
 SDL_sound is an optional dependency.
 
-This is the latest-or-almost development version, hence it is not labeled
-stable by upstream.
-dosbox-dev does conflict with the stable dosbox 0.74 Slackbuild, and isn't
-meant to be used alongside.
-If you want to have both dosbox and dosbox-dev packages installed set
-DOSBOXDEV=yes, and man page, icon, desktop entry and dosbox binary will be
-renamed dosbox-dev.
+This is the latest-or-almost development version, hence it is not
+labeled stable by upstream.
+
+dosbox-dev does conflict with the stable dosbox 0.74 Slackbuild, and
+isn't meant to be used alongside.
 
-If you want to use another revision of the SVN codebase,
-get it and put it in a directory called dosbox-dev, then create a
-dosbox-dev-0.74.rXXXX.tar.xz archive.
-After that you can do REVISION=XXXX ./dosbox-dev.SlackBuild
-There'll be some available at :
-https://sourceforge.net/projects/slackbuildsdirectlinks/files/dosbox/
+If you want to have both dosbox and dosbox-dev packages installed set
+DOSBOXDEV=yes, and man page, icon, desktop entry and dosbox binary
+will be renamed dosbox-dev.
 
-For example for the latest available revision :
-# svn checkout https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk dosbox-dev
-# REVISION=$(cd dosbox-dev && LANG=C svn info | grep "Revision"| cut -d' ' -f2)
-# tar cfa dosbox-dev-0.74.r$REVISION.tar.xz dosbox-dev/
-# ./dosbox-dev.SlackBuild
+If you want to use another revision of the SVN codebase, see
+README.SBo.
diff --git a/system/dosbox-dev/README.SBo b/system/dosbox-dev/README.SBo
new file mode 100644
index 0000000000..cc1bc10874
--- /dev/null
+++ b/system/dosbox-dev/README.SBo
@@ -0,0 +1,13 @@
+If you want to use another revision of the SVN codebase,
+get it and put it in a directory called dosbox-dev, then create a
+dosbox-dev-0.74.rXXXX.tar.xz archive.
+After that you can do REVISION=XXXX ./dosbox-dev.SlackBuild
+There'll be some available at:
+https://sourceforge.net/projects/slackbuildsdirectlinks/files/dosbox/
+
+For example for the latest available revision:
+# svn checkout https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk dosbox-dev
+# REVISION=$(cd dosbox-dev && LANG=C svn info | grep "Revision"| cut -d' ' -f2)
+# tar cfa dosbox-dev-0.74.r$REVISION.tar.xz dosbox-dev/
+# export REVISION
+# ./dosbox-dev.SlackBuild
diff --git a/system/dosbox-dev/dosbox-dev.SlackBuild b/system/dosbox-dev/dosbox-dev.SlackBuild
index 4577846ffe..d49cb38e65 100644
--- a/system/dosbox-dev/dosbox-dev.SlackBuild
+++ b/system/dosbox-dev/dosbox-dev.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dosbox-dev
 
@@ -25,11 +25,14 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dosbox-dev
-REVISION=${REVISION:-4430}
-VERSION=${VERSION:-0.75_pre4430}
+REVISION=${REVISION:-4482}
+VERSION=${VERSION:-0.75_pre4482}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 DOSBOXDEV=${DOSBOXDEV:-no}
 
 if [ -z "$ARCH" ]; then
@@ -40,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -71,9 +78,9 @@ cd $PRGNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 ./autogen.sh
 CFLAGS="$SLKCFLAGS" \
@@ -97,12 +104,12 @@ for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i
 install -D -m 0644 $CWD/dosbox.desktop \
   $PKG/usr/share/applications/dosbox.desktop
 
-# Add the dosbox.ico file to /usr/share/pixmaps
-install -D -m 0644 src/dosbox.ico $PKG/usr/share/pixmaps/dosbox.ico
+mkdir -p $PKG/usr/share/pixmaps
+convert 'src/dosbox.ico[1]' $PKG/usr/share/pixmaps/dosbox.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
-  docs/PORTING docs/README.video  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README THANKS \
+  docs/PORTING docs/README.video $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -112,11 +119,11 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 # Change dosbox filenames to $PRGNAM for using it alongside stable dosbox
 if [ "$DOSBOXDEV" = "yes" ]; then
 	mv $PKG/usr/share/applications/dosbox.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-	mv $PKG/usr/share/pixmaps/dosbox.ico $PKG/usr/share/pixmaps/$PRGNAM.ico
+	mv $PKG/usr/share/pixmaps/dosbox.png $PKG/usr/share/pixmaps/$PRGNAM.png
 	mv $PKG/usr/man/man1/dosbox.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz
 	mv $PKG/usr/bin/dosbox $PKG/usr/bin/$PRGNAM
 	sed -i "s/dosbox/dosbox-dev/g" $PKG/usr/share/applications/$PRGNAM.desktop
 fi
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dosbox-dev/dosbox-dev.info b/system/dosbox-dev/dosbox-dev.info
index ed73e5cb9f..dd2edf62a3 100644
--- a/system/dosbox-dev/dosbox-dev.info
+++ b/system/dosbox-dev/dosbox-dev.info
@@ -1,8 +1,8 @@
 PRGNAM="dosbox-dev"
-VERSION="0.75_pre4430"
+VERSION="0.75_pre4482"
 HOMEPAGE="http://dosbox.sourceforge.net"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/dosbox/dosbox-dev-0.75_pre4430.tar.xz"
-MD5SUM="7f9d59a9d5beb2469c1145d0cd21f01a"
+DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/dosbox/dosbox-dev-0.75_pre4482.tar.xz"
+MD5SUM="76c9cfb0df265b386a50e6e414af2253"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/dosbox-dev/dosbox.desktop b/system/dosbox-dev/dosbox.desktop
index 9816ffd81c..55d96227ea 100644
--- a/system/dosbox-dev/dosbox.desktop
+++ b/system/dosbox-dev/dosbox.desktop
@@ -4,7 +4,7 @@ Name=dosbox
 Comment=DOS Emulator Development version
 GenericName=dosbox
 Exec=dosbox
-Icon=/usr/share/pixmaps/dosbox.ico
+Icon=/usr/share/pixmaps/dosbox.png
 Terminal=false
 Type=Application
 Categories=System;
diff --git a/system/dosbox-x/doinst.sh b/system/dosbox-x/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/system/dosbox-x/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/dosbox-x/dosbox-x.SlackBuild b/system/dosbox-x/dosbox-x.SlackBuild
index 5a04069ac3..1c18fbb18f 100644
--- a/system/dosbox-x/dosbox-x.SlackBuild
+++ b/system/dosbox-x/dosbox-x.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dosbox-x
 
 # Copyright 2019-2020 Leonardo Citrolo, Italy
+# Copyright 2023 Yth | Pont-en-Royans, France | yth@ythogtha.org
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dosbox-x
-VERSION=${VERSION:-0.83.2}
+VERSION=${VERSION:-2024.03.01}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -49,6 +60,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -63,7 +77,7 @@ cd $TMP
 # in the sources tarball filename and/or main dirname
 rm -rf $PRGNAM-v$VERSION $PRGNAM-$PRGNAM-v$VERSION
 tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-v$VERSION.tar.gz
-cd $PRGNAM-v$VERSION || cd $PRGNAM-$PRGNAM-v$VERSION
+cd $PRGNAM-v$VERSION 2>/dev/null || cd $PRGNAM-$PRGNAM-v$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,32 +85,35 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-./autogen.sh
-
+# Don't force make -j3
+sed -i 's#make -j3#make#' build-sdl2
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
+./build-sdl2 \
   --prefix=/usr \
+  --mandir=/usr/man \
   --build=$ARCH-slackware-linux \
   --enable-sdl2 \
   --enable-d3d9 \
   --enable-d3d-shaders
 
-make
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS CHANGELOG CODE_OF_CONDUCT.md CONTRIBUTING.md COPYING \
-  "DOS GAMES THAT NEED A HIGHER MCB BASE SEGMENT.TXT" INSTALL NEWS \
-  README* THANKS \
+  CREDITS.md INSTALL.md NEWS README* THANKS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dosbox-x/dosbox-x.info b/system/dosbox-x/dosbox-x.info
index 0b95690601..c5a83b561c 100644
--- a/system/dosbox-x/dosbox-x.info
+++ b/system/dosbox-x/dosbox-x.info
@@ -1,10 +1,10 @@
 PRGNAM="dosbox-x"
-VERSION="0.83.2"
+VERSION="2024.03.01"
 HOMEPAGE="http://dosbox-x.com/"
-DOWNLOAD="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v0.83.2/dosbox-x-dosbox-x-v0.83.2.tar.gz"
-MD5SUM="3da8a408deaf9518da1423dff8021f53"
+DOWNLOAD="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v2024.03.01/dosbox-x-dosbox-x-v2024.03.01.tar.gz"
+MD5SUM="82f68d294e739c2616130b15a65f582c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL2"
-MAINTAINER="Leo C."
-EMAIL="leoc@gmx.com"
+REQUIRES=""
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/system/dosbox/dosbox.SlackBuild b/system/dosbox/dosbox.SlackBuild
index dd32ec9133..cd140784d3 100644
--- a/system/dosbox/dosbox.SlackBuild
+++ b/system/dosbox/dosbox.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dosbox
 
@@ -27,11 +27,14 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dosbox
 VERSION=${VERSION:-0.74.3}
 SRCVER=$(sed 's/\(.*\)\./\1-/' <<< $VERSION)
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -41,7 +44,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,6 +62,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
     SLKCFLAGS="-O2 -fPIC"
     LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
     SLKCFLAGS="-O2"
     LIBDIRSUFFIX=""
@@ -71,9 +81,9 @@ cd $PRGNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -96,11 +106,11 @@ for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i
 install -D -m 0644 $CWD/dosbox.desktop \
   $PKG/usr/share/applications/dosbox.desktop
 
-# Add the dosbox.ico file to /usr/share/pixmaps
-install -D -m 0644 src/dosbox.ico $PKG/usr/share/pixmaps/dosbox.ico
+mkdir -p $PKG/usr/share/pixmaps
+convert 'src/dosbox.ico[1]' $PKG/usr/share/pixmaps/dosbox.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
+cp -a AUTHORS COPYING ChangeLog NEWS README THANKS \
   docs/PORTING docs/README.video  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -109,4 +119,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dosbox/dosbox.desktop b/system/dosbox/dosbox.desktop
index 3741d36079..6b01168321 100644
--- a/system/dosbox/dosbox.desktop
+++ b/system/dosbox/dosbox.desktop
@@ -4,7 +4,7 @@ Name=dosbox
 Comment=DOS Emulator
 GenericName=dosbox
 Exec=dosbox
-Icon=/usr/share/pixmaps/dosbox.ico
+Icon=/usr/share/pixmaps/dosbox.png
 Terminal=false
 Type=Application
 Categories=System;
diff --git a/system/dosemu-fonts/README b/system/dosemu-fonts/README
new file mode 100644
index 0000000000..231b129594
--- /dev/null
+++ b/system/dosemu-fonts/README
@@ -0,0 +1,17 @@
+dosemu-fonts (fonts from dosemu, packaged for system-wide use)
+
+DOSEmu includes various VGA-style fonts, which get installed to a
+private directory, used only by DOSEmu. This package installs the same
+fonts in the system-wide /usr/share/fonts/misc directory, so other
+software can use them.
+
+These fonts are for codepages 437, 866, and 1125. ASCII text displays
+correctly with them, but they don't support Unicode or ISO-8859-*
+encodings. They're useful for applications such as BitchX (which uses
+codepage 437) and viewing old text files from MS-DOS.
+
+After the package is installed, you may have to run "xset fp rehash"
+to make the fonts available to X. You can get a list of the fonts
+with "xlsfonts -fn -dosemu-*". Also, there are short aliases, so you
+can run e.g. "xterm -fn vga11x19". These are: vga vga8x19 vga11x19
+vga10x24 vga12x30 vgacyr vga10x20 vga-ua vga10x20-ua.
diff --git a/system/dosemu-fonts/doinst.sh b/system/dosemu-fonts/doinst.sh
new file mode 100644
index 0000000000..9ebe5c1d5b
--- /dev/null
+++ b/system/dosemu-fonts/doinst.sh
@@ -0,0 +1,14 @@
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f &> /dev/null
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd usr/share/fonts/misc ; /usr/bin/mkfontdir )
+fi
+
+if [ -x /usr/bin/mkfontscale ]; then
+  ( cd usr/share/fonts/misc ; /usr/bin/mkfontscale )
+fi
+
+# This may or may not work, but will do no harm:
+DISPLAY=:0 /usr/bin/xset fp rehash &>/dev/null
diff --git a/system/dosemu-fonts/dosemu-fonts.SlackBuild b/system/dosemu-fonts/dosemu-fonts.SlackBuild
new file mode 100644
index 0000000000..23fd01cd34
--- /dev/null
+++ b/system/dosemu-fonts/dosemu-fonts.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Slackware build script for dosemu-fonts
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=dosemu-fonts
+VERSION=${VERSION:-20130804_35054ba}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+chmod 644 *
+
+mkdir -p $PKG/usr/share/fonts/misc
+cp -a *.pcf.gz $PKG/usr/share/fonts/misc
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# The first parts of doinst.sh and douninst.sh are identical...
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/doinst.sh > $PKG/install/douninst.sh
+
+# ...the rest is generated.
+# doinst adds the aliases to fonts.alias if they're not already there.
+# We won't get duplicate aliases even if the package is installpkg'ed
+# multiple times without being removed.
+# douninst removes them, if they're still there.
+ALIAS=usr/share/fonts/misc/fonts.alias
+while read line; do
+  set $line
+  cat >> $PKG/install/doinst.sh <<EOF
+
+if ! /bin/grep -q "^$1 " $ALIAS; then
+  echo "$line" >> $ALIAS
+fi
+EOF
+
+  cat >> $PKG/install/douninst.sh <<EOF
+
+/bin/grep -v "^$1 " $ALIAS > $ALIAS.\$\$
+/bin/mv $ALIAS.\$\$ $ALIAS
+EOF
+
+done < dosemu.alias
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dosemu-fonts/dosemu-fonts.info b/system/dosemu-fonts/dosemu-fonts.info
new file mode 100644
index 0000000000..a565b065c1
--- /dev/null
+++ b/system/dosemu-fonts/dosemu-fonts.info
@@ -0,0 +1,10 @@
+PRGNAM="dosemu-fonts"
+VERSION="20130804_35054ba"
+HOMEPAGE="http://www.dosemu.org"
+DOWNLOAD="https://slackware.uk/~urchlay/src/dosemu-fonts-20130804_35054ba.tar.xz"
+MD5SUM="8c7a1ee65da005eb28d1a4749d903a0f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/dosemu-fonts/slack-desc b/system/dosemu-fonts/slack-desc
new file mode 100644
index 0000000000..d5f4a0e7c6
--- /dev/null
+++ b/system/dosemu-fonts/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+dosemu-fonts: dosemu-fonts (fonts from dosemu, packaged for system-wide use)
+dosemu-fonts:
+dosemu-fonts: DOSEmu includes various VGA-style fonts, which get installed to a
+dosemu-fonts: private directory, used only by DOSEmu. This package installs the same
+dosemu-fonts: fonts in the system-wide /usr/share/fonts/misc directory, so other
+dosemu-fonts: software can use them.
+dosemu-fonts:
+dosemu-fonts:
+dosemu-fonts:
+dosemu-fonts:
+dosemu-fonts:
diff --git a/system/dosemu/dosemu.SlackBuild b/system/dosemu/dosemu.SlackBuild
index 58b842b584..e3f35c91b7 100644
--- a/system/dosemu/dosemu.SlackBuild
+++ b/system/dosemu/dosemu.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dosemu
 
@@ -23,26 +23,46 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220318 bkw: Modified by SlackBuilds.org, BUILD=3: fix build on 15.0.
+# Actually it was *building* OK, but would segfault on startup.
+# - add gcc5 as a dep, use it for the build.
+# - build without fluidsynth, 15.0's is too new for this old code.
+#   looks like there's still OPL emulation for MIDI.
+# - build without svgalib, 15.0's is too old. I haven't seen svgalib
+#   do anything but crash and lock up the console any time I've tried
+#   it in the last 20 years or so, anyway.
+
+# Note to self: there's a smorgasboard of patches here:
+# https://gitweb.gentoo.org/repo/gentoo.git/tree/app-emulation/dosemu/files
+# ...none of which fix the segfaults or the fluidsynth issues.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dosemu
 VERSION=${VERSION:-20130804_35054ba}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -57,6 +77,8 @@ fi
 
 set -e
 
+source /etc/profile.d/gcc5.sh
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -66,9 +88,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -76,19 +98,18 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc/dosemu \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --with-x \
-  --with-svgalib \
+  --without-svgalib \
+  --without-fluidsynth \
   --with-docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-fdtarball=$CWD/dosemu-freedos-1.0-bin.tgz
 
 make
 make install DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/* $PKG/usr/man/??/man*/*
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 ( cd $PKG/etc/dosemu
@@ -104,4 +125,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dosemu/dosemu.info b/system/dosemu/dosemu.info
index 5f5755a869..98d9194283 100644
--- a/system/dosemu/dosemu.info
+++ b/system/dosemu/dosemu.info
@@ -7,6 +7,6 @@ MD5SUM="190c77107fa23847eaa0bade762091ff \
         2e09774fe91cff4372cb4a393eb467f5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="gcc5"
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/system/doublecmd-qt5/README b/system/doublecmd-qt5/README
new file mode 100644
index 0000000000..34fe9f50be
--- /dev/null
+++ b/system/doublecmd-qt5/README
@@ -0,0 +1,8 @@
+Double Commander (Qt5 version)
+
+Double Commander is a free cross-platform open source file manager 
+with two panels side by side (or one above the other). This is the Qt
+version of the program.
+
+Since it is written in Pascal, lazarus, fpc, and libqtpas packages must
+be installed before building.
diff --git a/system/doublecmd-qt5/doinst.sh b/system/doublecmd-qt5/doinst.sh
new file mode 100644
index 0000000000..aea0f894eb
--- /dev/null
+++ b/system/doublecmd-qt5/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/doublecmd-qt5/doublecmd-qt5.SlackBuild b/system/doublecmd-qt5/doublecmd-qt5.SlackBuild
new file mode 100644
index 0000000000..add4b121b6
--- /dev/null
+++ b/system/doublecmd-qt5/doublecmd-qt5.SlackBuild
@@ -0,0 +1,131 @@
+#!/bin/bash
+
+# Copyright (C) 2023 Hao Chi Kiang <no@no.noooo.ooo>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+# revision date: 2023/11/11
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=doublecmd-qt5
+UPSTR_PRGNAME=doublecmd
+VERSION=${VERSION:-1.1.12}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKLAZBUILDFLAGS="--cpu=i386"
+  CPU_TARGET=i386
+elif [ "$ARCH" = "i686" ]; then
+  SLKLAZBUILDFLAGS="--cpu=i386"
+  CPU_TARGET=i386
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKLAZBUILDFLAGS="--cpu=x86_64"
+  CPU_TARGET=$ARCH
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKLAZBUILDFLAGS="--cpu=aarch64"
+  CPU_TARGET=$ARCH
+else
+  SLKLAZBUILDFLAGS=""
+  CPU_TARGET=$ARCH
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+tar -zxvf $CWD/$UPSTR_PRGNAME-$VERSION-src.tar.gz
+cd $UPSTR_PRGNAME-$VERSION
+
+# 20240113 ALe: this symlink is mistargeted... removed
+rm -rf doublecmd.app/Contents/MacOS/doublecmd
+
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+
+# Build it. Adapted from
+# https://gitlab.archlinux.org/archlinux/packaging/packages/doublecmd/-/blob/5afa60350dcbce809f26081537032c70620e91e1/PKGBUILD
+cp -a /usr/share/lazarus ./
+sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i install/linux/install.sh
+sed -e "s@=\$(which lazbuild)@=\"\$(which lazbuild) --lazarusdir=$(pwd)/lazarus\"@" -i build.sh
+sed -e '/doublecmd.zdli/d' -i install/linux/install.sh
+lcl=qt5 CPU_TARGET=$CPU_TARGET ./build.sh components
+lcl=qt5 CPU_TARGET=$CPU_TARGET ./build.sh plugins
+/usr/bin/lazbuild \
+    $SLKLAZBUILDFLAGS \
+    --lazarusdir="$(pwd)/lazarus" \
+    src/doublecmd.lpi \
+    --bm="NoDebug Full Optimizations" \
+    --widgetset=qt5
+
+# Install it into the package
+chmod +x ./install/linux/install.sh
+sed -i "s|share/doublecmd/doc|doc/${PRGNAM}-${VERSION}|g" ./install/linux/install.sh
+sed -i "s|share/man|man|g" ./install/linux/install.sh
+./install/linux/install.sh --install-prefix="$PKG"
+
+# make plugins executable:
+chmod -R +x $PKG/usr/lib/doublecmd/plugins/*
+
+# Strip everything.
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Gzip man page
+gzip $PKG/usr/man/man1/doublecmd.1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/doublecmd-qt5/doublecmd-qt5.info b/system/doublecmd-qt5/doublecmd-qt5.info
new file mode 100644
index 0000000000..1703ce0fbd
--- /dev/null
+++ b/system/doublecmd-qt5/doublecmd-qt5.info
@@ -0,0 +1,10 @@
+PRGNAM="doublecmd-qt5"
+VERSION="1.1.12"
+HOMEPAGE="http://doublecmd.sourceforge.net/"
+DOWNLOAD="https://downloads.sourceforge.net/project/doublecmd/Double%20Commander%20Source/doublecmd-1.1.12-src.tar.gz"
+MD5SUM="c3a5c06c9ba44b51d454aca00b42ca4c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="lazarus libqtpas"
+MAINTAINER="Hao Chi Kiang"
+EMAIL="no@no.noooo.ooo"
diff --git a/system/doublecmd-qt5/slack-desc b/system/doublecmd-qt5/slack-desc
new file mode 100644
index 0000000000..79c23af8e0
--- /dev/null
+++ b/system/doublecmd-qt5/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+doublecmd-qt5: doublecmd-qt5 (Double-panel File Manager)
+doublecmd-qt5:
+doublecmd-qt5: Double Commander is a free cross-platform open source file manager
+doublecmd-qt5: with two panels side by side (or one above the other). This is the Qt
+doublecmd-qt5: version of the program.
+doublecmd-qt5:
+doublecmd-qt5: Since it is written in Pascal, lazarus, fpc, and qt5pas packages must
+doublecmd-qt5: be installed before building.
+doublecmd-qt5:
+doublecmd-qt5: Homepage at http://doublecmd.sourceforge.net
+doublecmd-qt5:
diff --git a/system/dracut/README b/system/dracut/README
new file mode 100644
index 0000000000..8e6054d4e1
--- /dev/null
+++ b/system/dracut/README
@@ -0,0 +1,5 @@
+dracut (dracut is an event driven initramfs infrastructure.)
+
+dracut (the tool) is used to create an initramfs image by copying
+tools and files from an installed system and combining it with the
+dracut framework, usually found in /usr/lib/dracut/modules.d.
diff --git a/system/dracut/dracut.SlackBuild b/system/dracut/dracut.SlackBuild
new file mode 100644
index 0000000000..12a5a7bba4
--- /dev/null
+++ b/system/dracut/dracut.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/bash
+
+# Slackware build script for dracut
+
+# Copyright 2023 Matt Egger USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=dracut
+VERSION=${VERSION:-059}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# edit upstream scripts to use architecture appropiate libdir location
+sed -i "s|/usr/lib/dracut|/usr/lib$LIBDIRSUFFIX/dracut|" *.sh
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man
+
+make
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a docs $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a NEWS.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dracut/dracut.info b/system/dracut/dracut.info
new file mode 100644
index 0000000000..dff836b11f
--- /dev/null
+++ b/system/dracut/dracut.info
@@ -0,0 +1,10 @@
+PRGNAM="dracut"
+VERSION="059"
+HOMEPAGE="https://github.com/dracutdevs/dracut"
+DOWNLOAD="https://github.com/dracutdevs/dracut/archive/059/dracut-059.tar.gz"
+MD5SUM="bce69baf6f633ecf84dea7e3bb63dd32"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matt Egger"
+EMAIL="bru.barwal@sdf.org"
diff --git a/system/dracut/slack-desc b/system/dracut/slack-desc
new file mode 100644
index 0000000000..01797ba5c4
--- /dev/null
+++ b/system/dracut/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+dracut: dracut (an event driven initramfs infrastructure)
+dracut:
+dracut: dracut (the tool) is used to create an initramfs image by copying
+dracut: tools and files from an installed system and combining it with the
+dracut: dracut framework, usually found in /usr/lib/dracut/modules.d.
+dracut:
+dracut:
+dracut:
+dracut:
+dracut:
+dracut: https://github.com/dracutdevs/dracut
diff --git a/system/drbd-utils/README b/system/drbd-utils/README
index 003a96006a..22cd0ac8f1 100644
--- a/system/drbd-utils/README
+++ b/system/drbd-utils/README
@@ -1,7 +1,8 @@
 drbd-utils (Management utilities for DRBD)
 
 DRBD refers to block devices designed as a building block to form high
-availability (HA) clusters. This is done by mirroring a whole block device
-via an assigned network. DRBD can be understood as network based raid-1.
+availability (HA) clusters. This is done by mirroring a whole block
+device via an assigned network. DRBD can be understood as network
+based raid-1.
 
 This packages includes the DRBD administration tools.
diff --git a/system/drbd-utils/drbd-utils.SlackBuild b/system/drbd-utils/drbd-utils.SlackBuild
index e6eeb7f4ae..e353a17020 100644
--- a/system/drbd-utils/drbd-utils.SlackBuild
+++ b/system/drbd-utils/drbd-utils.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for drbd-utils
 
-# Copyright 2014, 2015, 2016, 2017, 2018, 2019, 2020  Mario Preksavec, Zagreb, Croatia
+# Copyright 2014, 2021  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=drbd-utils
-VERSION=${VERSION:-9.15.1}
+VERSION=${VERSION:-9.18.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -129,4 +139,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/drbd-utils/drbd-utils.info b/system/drbd-utils/drbd-utils.info
index 49f7312a95..ba5baeeba0 100644
--- a/system/drbd-utils/drbd-utils.info
+++ b/system/drbd-utils/drbd-utils.info
@@ -1,8 +1,8 @@
 PRGNAM="drbd-utils"
-VERSION="9.15.1"
+VERSION="9.18.2"
 HOMEPAGE="http://www.drbd.org"
-DOWNLOAD="https://www.linbit.com/downloads/drbd/utils/drbd-utils-9.15.1.tar.gz"
-MD5SUM="5ff3c956aab8f022f676455162c91b21"
+DOWNLOAD="https://slackware.uk/~urchlay/src/drbd-utils-9.18.2.tar.gz"
+MD5SUM="700f28309ff90ac45ed80cc3c5fc446f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/driconf/README b/system/driconf/README
index 5f87c5d991..5e7b2a4ab0 100644
--- a/system/driconf/README
+++ b/system/driconf/README
@@ -1,3 +1,4 @@
-DRIconf is a configuration applet for the Direct Rendering Infrastructure.
-It allows customizing performance and visual quality settings of OpenGL
-drivers on a per-driver, per-screen and/or per-application level.
+DRIconf is a configuration applet for the Direct Rendering
+Infrastructure. It allows customizing performance and visual
+quality settings of OpenGL drivers on a per-driver, per-screen and/or
+per-application level.
diff --git a/system/Eterm/doinst.sh b/system/driconf/doinst.sh
index 5fb28930db..5fb28930db 100644
--- a/system/Eterm/doinst.sh
+++ b/system/driconf/doinst.sh
diff --git a/system/driconf/driconf.SlackBuild b/system/driconf/driconf.SlackBuild
index 42f886f8d0..f2e0c03551 100644
--- a/system/driconf/driconf.SlackBuild
+++ b/system/driconf/driconf.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for driconf
 # Copyright 2011 David Woodfall <dave@slackbuilds.org>
@@ -23,10 +23,17 @@
 
 # Thanks to James Powell for the .desktop file.
 
+# 20220410 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - install icon where the .desktop file expects to find it.
+# - add doinst.sh (need because we have a .desktop).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=driconf
 VERSION=${VERSION:-0.9.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,9 +77,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 cat $CWD/driconf-0.9.1-2.diff | patch --verbose -p1
 
@@ -76,8 +87,7 @@ python setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/share/{applications,driconf}
 cp $CWD/driconf.desktop $PKG/usr/share/applications/driconf.desktop
-cp -a driconf-icon.png $PKG/usr/share/applications/driconf-icon.png
-
+cp -a driconf-icon.png $PKG/usr/share/driconf/driconf-icon.png
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -88,6 +98,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/driconf/driconf.info b/system/driconf/driconf.info
index 4cd402ce10..19c4c03f59 100644
--- a/system/driconf/driconf.info
+++ b/system/driconf/driconf.info
@@ -1,10 +1,10 @@
 PRGNAM="driconf"
 VERSION="0.9.1"
 HOMEPAGE="http://dri.freedesktop.org/wiki/DriConf"
-DOWNLOAD="http://unrealize.co.uk/source/driconf-0.9.1.tar.gz"
+DOWNLOAD="http://distcache.FreeBSD.org/ports-distfiles/driconf-0.9.1.tar.gz"
 MD5SUM="76d610bcd56aa5e8a489debb5081178a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
+MAINTAINER="D Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/system/ds4drv/ds4drv.SlackBuild b/system/ds4drv/ds4drv.SlackBuild
index 5a69df1f47..028d4efa2d 100644
--- a/system/ds4drv/ds4drv.SlackBuild
+++ b/system/ds4drv/ds4drv.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ds4drv
 
@@ -22,26 +22,33 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ds4drv
-VERSION=${VERSION:-0.5.0}
+VERSION=${VERSION:-0.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,7 +76,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -89,4 +96,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ds4drv/ds4drv.info b/system/ds4drv/ds4drv.info
index e55f01ed87..f5efd499a9 100644
--- a/system/ds4drv/ds4drv.info
+++ b/system/ds4drv/ds4drv.info
@@ -1,8 +1,8 @@
 PRGNAM="ds4drv"
-VERSION="0.5.0"
+VERSION="0.5.1"
 HOMEPAGE="https://github.com/chrippa/ds4drv"
-DOWNLOAD="https://pypi.python.org/packages/source/d/ds4drv/ds4drv-0.5.0.tar.gz"
-MD5SUM="705d48f45634f9dbd3f40c8876fb2c96"
+DOWNLOAD="https://github.com/chrippa/ds4drv/archive/v0.5.1/ds4drv-0.5.1.tar.gz"
+MD5SUM="5a116106debdaaaed138d337282e1985"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pyudev python-evdev"
diff --git a/system/dse-typewriter-font/README b/system/dse-typewriter-font/README
index 7a8d65d7a2..adc01fa6f2 100644
--- a/system/dse-typewriter-font/README
+++ b/system/dse-typewriter-font/README
@@ -3,15 +3,16 @@ dse-typewriter-font (typewriter-style TrueType font)
 dse-typewriter-font is a coding font inspired by early 20th-century
 typewriters, with good Unicode coverage.
 
-This font is not the result of any scans or traces of samples, specimens,
-or other output from an actual typewriter. It's more like an amalgamation
-of old-school typewriter fonts with features semi-arbitrarily picked
-from each one, as well as a few not in use on actual typewriters.
+This font is not the result of any scans or traces of samples,
+specimens, or other output from an actual typewriter. It's more
+like an amalgamation of old-school typewriter fonts with features
+semi-arbitrarily picked from each one, as well as a few not in use on
+actual typewriters.
 
 Features and Characteristics:
 
 * Relatively low ex-height.
 * Coding-friendly distinctive characters: li1| Oo0 `'"
 * Elite scale typeface (12 characters per inch at 12-point font size).
-* Perfectly useful as a traditional typewriter face for other purposes, if you
-  don’t mind the zero (0) having a dot in the middle.
+* Perfectly useful as a traditional typewriter face for other purposes,
+  if you don’t mind the zero (0) having a dot in the middle.
diff --git a/system/dse-typewriter-font/dse-typewriter-font.SlackBuild b/system/dse-typewriter-font/dse-typewriter-font.SlackBuild
index 857bfbcc46..ded51192d8 100644
--- a/system/dse-typewriter-font/dse-typewriter-font.SlackBuild
+++ b/system/dse-typewriter-font/dse-typewriter-font.SlackBuild
@@ -1,18 +1,27 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dse-typewriter-font
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230307 bkw: BUILD=2, add douninst.sh.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dse-typewriter-font
-VERSION=${VERSION:-20200507_1795eb8}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.1.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -23,7 +32,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 # upstream permissions are bad
@@ -42,6 +51,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cp $PKG/install/doinst.sh $PKG/install/douninst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dse-typewriter-font/dse-typewriter-font.info b/system/dse-typewriter-font/dse-typewriter-font.info
index 7e30ee6d05..f18477cede 100644
--- a/system/dse-typewriter-font/dse-typewriter-font.info
+++ b/system/dse-typewriter-font/dse-typewriter-font.info
@@ -1,10 +1,10 @@
 PRGNAM="dse-typewriter-font"
-VERSION="20200507_1795eb8"
+VERSION="1.1.0"
 HOMEPAGE="https://webonastick.com/fonts/dse-typewriter/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/dse-typewriter-font-20200507_1795eb8.tar.xz"
-MD5SUM="fc138176cffc5e8acb8937132a16d4c6"
+DOWNLOAD="https://github.com/dse/dse-typewriter-font/archive/1.1.0/dse-typewriter-font-1.1.0.tar.gz"
+MD5SUM="ce76dabe1171a7a1fbc5533151d3f338"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/dstat/README b/system/dstat/README
index 5acfbc9f36..b48d89909a 100644
--- a/system/dstat/README
+++ b/system/dstat/README
@@ -1,4 +1,5 @@
-Dstat is a versatile replacement for vmstat, iostat, netstat, nfsstat and
-ifstat. Dstat overcomes some of their limitations and adds some extra features,
-more counters and flexibility. Dstat is handy for monitoring systems during
-performance tuning tests, benchmarks or troubleshooting.
+Dstat is a versatile replacement for vmstat, iostat, netstat, nfsstat
+and ifstat. Dstat overcomes some of their limitations and adds some
+extra features, more counters and flexibility. Dstat is handy for
+monitoring systems during performance tuning tests, benchmarks or
+troubleshooting.
diff --git a/system/dstat/dstat.SlackBuild b/system/dstat/dstat.SlackBuild
index 53c97ca391..82d7bdb6d5 100644
--- a/system/dstat/dstat.SlackBuild
+++ b/system/dstat/dstat.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for dstat
 #
-# Copyright 2009-2017  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009-2022  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,13 +22,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dstat
-VERSION=${VERSION:-0.7.3}
+VERSION=${VERSION:-0.7.4}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,4 +77,4 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dstat/dstat.info b/system/dstat/dstat.info
index 32eac1cf66..c0be45f696 100644
--- a/system/dstat/dstat.info
+++ b/system/dstat/dstat.info
@@ -1,8 +1,8 @@
 PRGNAM="dstat"
-VERSION="0.7.3"
-HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
-DOWNLOAD="https://github.com/dagwieers/dstat/archive/0.7.3.tar.gz"
-MD5SUM="be27c905e6737993306dbbcee735e8ad"
+VERSION="0.7.4"
+HOMEPAGE="https://github.com/dstat-real/dstat"
+DOWNLOAD="https://github.com/dstat-real/dstat/archive/refs/tags/v0.7.4.tar.gz"
+MD5SUM="9d6a11d1f8cff1e4bf953958c824c798"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/dtach/README b/system/dtach/README
index 4a0b946266..b82155a954 100644
--- a/system/dtach/README
+++ b/system/dtach/README
@@ -1,3 +1,5 @@
+dtach (detaches/reattaches programs from/to their terminals)
+
 dtach is a tiny program that emulates the detach feature of screen,
 allowing you to run a program in an environment that is protected from
 the controlling terminal and attach to it later. dtach does not keep
diff --git a/system/dtach/dtach.SlackBuild b/system/dtach/dtach.SlackBuild
index f2f831b2a3..1eb8d7854c 100644
--- a/system/dtach/dtach.SlackBuild
+++ b/system/dtach/dtach.SlackBuild
@@ -1,29 +1,41 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dtach
 # Written by slakmagik <slakmagik@gmail.com>
 # Released under the WTFPL
 
+# 20220410 bkw: Modified by SlackBuilds.org:
+# - updated for v0.9.
+# - strip binary.
+# - i486 => i586.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dtach
-VERSION=${VERSION:-0.8}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.9}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -47,16 +59,16 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
+  -exec chmod 755 {} \+ -o \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
-  -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./configure --prefix=/usr
 make
 
 # no 'install' target, so...
 mkdir -p $PKG/usr/bin
-cp -a dtach $PKG/usr/bin
+install -s -m0755 dtach $PKG/usr/bin
 
 mkdir -p $PKG/usr/man/man1
 gzip -9c dtach.1 > $PKG/usr/man/man1/dtach.1.gz
@@ -69,4 +81,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dtach/dtach.info b/system/dtach/dtach.info
index 8f476cdcd1..4cbdec25c3 100644
--- a/system/dtach/dtach.info
+++ b/system/dtach/dtach.info
@@ -1,8 +1,8 @@
 PRGNAM="dtach"
-VERSION="0.8"
+VERSION="0.9"
 HOMEPAGE="http://dtach.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/dtach/dtach-0.8.tar.gz"
-MD5SUM="ec5999f3b6bb67da19754fcb2e5221f3"
+DOWNLOAD="https://github.com/crigler/dtach/archive/v0.9/dtach-0.9.tar.gz"
+MD5SUM="41509258606a47c0a88fed180929bdeb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/dtrx/dtrx.SlackBuild b/system/dtrx/dtrx.SlackBuild
index 66ac134d48..e28280c20d 100644
--- a/system/dtrx/dtrx.SlackBuild
+++ b/system/dtrx/dtrx.SlackBuild
@@ -1,47 +1,96 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dtrx
 
-# Petr Kletecka petr@kle.cz <2020>
+# Copyright 2024 Petr Kletecka Orlando, FL
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=dtrx
-VERSION=${VERSION:-7.1}
-ARCHIVE=${ARCHIVE:-671ccf7d1b7ea90a6e6e6cc44234ef14874d59bf}
+VERSION=${VERSION:-8.5.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
 
-ARCH=noarch
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip -o $CWD/$PRGNAM-$ARCHIVE.zip
-cd $PRGNAM-$ARCHIVE
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 -m build --wheel --no-isolation
+python3 -m installer --destdir "$PKG" dist/*.whl
 
-python setup.py install --prefix $PKG
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dtrx/dtrx.info b/system/dtrx/dtrx.info
index 411479487b..9128edce7e 100644
--- a/system/dtrx/dtrx.info
+++ b/system/dtrx/dtrx.info
@@ -1,10 +1,10 @@
 PRGNAM="dtrx"
-VERSION="7.1"
+VERSION="8.5.3"
 HOMEPAGE="https://github.com/brettcs/dtrx"
-DOWNLOAD="https://github.com/brettcs/dtrx/archive/671ccf7d1b7ea90a6e6e6cc44234ef14874d59bf/dtrx-671ccf7d1b7ea90a6e6e6cc44234ef14874d59bf.zip"
-MD5SUM="80a5abf4324824e3bcaf70d03db37bdb"
+DOWNLOAD="https://github.com/dtrx-py/dtrx/releases/download/8.5.3/dtrx-8.5.3.tar.gz"
+MD5SUM="cc1039aff57398b8c31a255ddaf5c737"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3-build python3-wheel"
 MAINTAINER="Petr Kletecka"
 EMAIL="petr@kle.cz"
diff --git a/system/dump/README b/system/dump/README
index cfe5c863aa..c7d17c0f13 100644
--- a/system/dump/README
+++ b/system/dump/README
@@ -1,13 +1,14 @@
+dump (dump and restore backup commands)
+
 Dump examines files in a filesystem, determines which ones need to
 be backed up, and copies those files to a specified disk, tape or
-other storage medium.  Subsequent incremental backups can then be
+other storage medium. Subsequent incremental backups can then be
 layered on top of the full backup.
 
-The restore command performs the inverse function of dump; it can
-restore a full backup of a filesystem. Single files and directory
-subtrees may also be restored from full or partial backups in
-interactive mode.
-
+The restore.dump command performs the inverse function of dump;
+it can restore a full backup of a filesystem. Single files and
+directory subtrees may also be restored from full or partial backups
+in interactive mode.
 
 You might want to read this post by Linus:
   http://lwn.net/2001/0503/a/lt-dump.php3
@@ -15,11 +16,7 @@ and the counter-argument on:
   http://dump.sourceforge.net/isdumpdeprecated.html
 
 Slackware's tar package already has rmt, therefore this SlackBuild
-excludes it.
+excludes it. It also has a "restore" command, so dump's restore
+command (and man page) has been renamed "restore.dump".
 
 This SlackBuild disables the SELinux functionality and dependency.
-
-Note that Slackware comes with another "restore" command:
-/usr/sbin/restore The package built by this SlackBuild however will
-install: /sbin/restore Thus you might need to call the dump package
-restore by its full path.
diff --git a/system/dump/dump.SlackBuild b/system/dump/dump.SlackBuild
index af8e64ec2a..9ba445a141 100644
--- a/system/dump/dump.SlackBuild
+++ b/system/dump/dump.SlackBuild
@@ -1,32 +1,26 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dump
+
+# Copyright 2022 B. Watson <urchlay@slackware.uk>
 # Copyright 2017 Donald Cooley, South Haven, Indiana USA
-# Copyright 2012  Chris Abela, Malta
-# Copyright 2014  Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Copyright 2014 Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
+# Copyright 2012 Chris Abela, Malta
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20220425 bkw: BUILD=2
+# - take over maintenance.
+# - relicense as WTFPL (with permission; see mailing list).
+# - rename /sbin/restore command (and man page) to restore.dump.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=dump
-VERSION=${VERSION:-0.4b46}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.4b47}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +30,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,11 +62,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # rmt is available on Slack's tar package, so I am disabling it
 # The full path for mandir is necessary
@@ -84,23 +79,39 @@ EXT2FS_LIBS="-lext2fs -lcom_err" \
   --enable-selinux=no
 
 make
-make prefix=$PKG install # According to fhs-2.3, dump goes in /sbin
+make prefix=$PKG install-strip # According to fhs-2.3, dump goes in /sbin
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# 20220425 bkw: avoid conflicting with Slackware's restore. the old
+# version of this script installed dump's restore in /sbin, and didn't
+# mess with Slackware's /usr/sbin/restore... technically not a conflict,
+# but a landmine anyway (it would be all too easy to type the wrong
+# path to the restore command). rename it.
+cd $PKG/sbin
+mv restore restore.dump
+rm -f rrestore
+ln -s restore.dump rrestore
+cd -
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+# 20220425 bkw: rename the man page, for consistency. note that
+# rdump.8 just used ".so dump.8" (and likewise for rrestore); replace
+# with symlinks.
+cd $PKG/usr/man/man8
+mv restore.8 restore.dump.8
+rm -f rdump.8 rrestore.8
+gzip -9 *
+ln -s restore.dump.8.gz rrestore.8.gz
+ln -s dump.8.gz rdump.8.gz
+cd -
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
 cp -a \
-  AUTHORS COPYING INSTALL *BUGS MAINTAINERS NEWS README TODO ChangeLog examples \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+  AUTHORS COPYING *BUGS MAINTAINERS NEWS README TODO ChangeLog examples \
+  $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dump/dump.info b/system/dump/dump.info
index 18f8d44904..e0e18ca731 100644
--- a/system/dump/dump.info
+++ b/system/dump/dump.info
@@ -1,10 +1,10 @@
 PRGNAM="dump"
-VERSION="0.4b46"
-HOMEPAGE="http://dump.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/dump/files/dump/0.4b46/dump-0.4b46.tar.gz"
-MD5SUM="4c463f797e7e8a1112fabf5cbf8e1855"
+VERSION="0.4b47"
+HOMEPAGE="https://dump.sourceforge.io/"
+DOWNLOAD="https://sourceforge.net/projects/dump/files/dump/0.4b47/dump-0.4b47.tar.gz"
+MD5SUM="620f02f1a5c5e7954a2948f0331824d2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="%README%"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/duperemove/README b/system/duperemove/README
new file mode 100644
index 0000000000..b535b70f0c
--- /dev/null
+++ b/system/duperemove/README
@@ -0,0 +1,22 @@
+Duperemove is a simple tool for finding duplicated extents and
+submitting them for deduplication. When given a list of files it will
+hash their contents on an extent by extent basis and compare those
+hashes to each other, finding and categorizing extents that match each
+other. Optionally, a per-block hash can be applied for further
+duplication lookup. When given the -d option, duperemove will submit
+those extents for deduplication using the Linux kernel FIDEDUPRANGE
+ioctl.
+
+Duperemove can store the hashes it computes in a 'hashfile'. If given an
+existing hashfile, duperemove will only compute hashes for those files
+which have changed since the last run. Thus you can run duperemove
+repeatedly on your data as it changes, without having to re-checksum
+unchanged data.
+
+Duperemove can also take input from the fdupes program.
+
+Deduplication is currently only supported by the btrfs and xfs
+filesystems.
+
+fdupes is an optional runtime dependency (allows the use of the --fdupes
+command line option).
diff --git a/system/duperemove/duperemove.SlackBuild b/system/duperemove/duperemove.SlackBuild
new file mode 100644
index 0000000000..b798424160
--- /dev/null
+++ b/system/duperemove/duperemove.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/bash
+
+# Slackware build script for duperemove
+
+# Copyright 2022-2023 Erich Ritz, Jenks, Oklahoma, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=duperemove
+VERSION=${VERSION:-0.14.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# No need to add "-O2"; it is set in the Makefile.
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-Wall -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-Wall -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-Wall -fPIC"
+else
+  SLKCFLAGS="-Wall"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make CFLAGS="$SLKCFLAGS"
+make install PREFIX=/usr MANDIR=/usr/man DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md LICENSE LICENSE.xxhash rbtree.txt docs markdown \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/duperemove/duperemove.info b/system/duperemove/duperemove.info
new file mode 100644
index 0000000000..3293b64869
--- /dev/null
+++ b/system/duperemove/duperemove.info
@@ -0,0 +1,10 @@
+PRGNAM="duperemove"
+VERSION="0.14.1"
+HOMEPAGE="https://markfasheh.github.io/duperemove/"
+DOWNLOAD="https://github.com/markfasheh/duperemove/archive/refs/tags/v0.14.1/duperemove-0.14.1.tar.gz"
+MD5SUM="78439c1d0a100a8742fd569a67e6183d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Erich Ritz"
+EMAIL="erich.public@protonmail.com"
diff --git a/system/duperemove/slack-desc b/system/duperemove/slack-desc
new file mode 100644
index 0000000000..af0530208e
--- /dev/null
+++ b/system/duperemove/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+duperemove: duperemove (find duplicated extents and submit for deduplication)
+duperemove:
+duperemove: Duperemove is a simple tool for finding duplicated extents and
+duperemove: submitting them for deduplication. When given a list of files it will
+duperemove: hash their contents on a block by block basis and compare those hashes
+duperemove: to each other, finding and categorizing extents that match each other.
+duperemove: When given the -d option, duperemove will submit those extents for
+duperemove: deduplication using the Linux kernel extent-same ioctl.
+duperemove:
+duperemove: Homepage: https://markfasheh.github.io/duperemove/
+duperemove:
diff --git a/system/duplicity/README b/system/duplicity/README
index 7f2d79d064..ee7d5ab755 100644
--- a/system/duplicity/README
+++ b/system/duplicity/README
@@ -1,8 +1,9 @@
 duplicity - Encrypted bandwidth-efficient backup using rsync algorithm
 
-Duplicity backs up directories by producing encrypted tar-format volumes and
-uploading them to a remote or local file server. Because duplicity uses
-librsync, the incremental archives are space efficient and only record the
-parts of files that have changed since the last backup.  Because duplicity
-uses GnuPG to encrypt and/or sign these archives, they will be safe from
-spying and/or modification by the server.
+Duplicity backs up directories by producing encrypted tar-format
+volumes and uploading them to a remote or local file server. Because
+duplicity uses librsync, the incremental archives are space efficient
+and only record the parts of files that have changed since the last
+backup. Because duplicity uses GnuPG to encrypt and/or sign these
+archives, they will be safe from spying and/or modification by the
+server.
diff --git a/system/duplicity/duplicity.SlackBuild b/system/duplicity/duplicity.SlackBuild
index 2630fa48a1..70ab63d1f8 100644
--- a/system/duplicity/duplicity.SlackBuild
+++ b/system/duplicity/duplicity.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for duplicity
 
 # Written by Richard Ellis <rellis@dp100.com>
@@ -24,10 +24,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=duplicity
 VERSION=${VERSION:-0.7.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -88,4 +98,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/duplicity/duplicity.info b/system/duplicity/duplicity.info
index a37512f9fa..5ea5d58961 100644
--- a/system/duplicity/duplicity.info
+++ b/system/duplicity/duplicity.info
@@ -1,10 +1,10 @@
 PRGNAM="duplicity"
 VERSION="0.7.19"
 HOMEPAGE="http://duplicity.nongnu.org/"
-DOWNLOAD="https://code.launchpad.net/duplicity/0.7-series/0.7.19/+download/duplicity-0.7.19.tar.gz"
+DOWNLOAD="http://distcache.FreeBSD.org/ports-distfiles/duplicity-0.7.19.tar.gz"
 MD5SUM="b4decdb60275c87b4fafab55c31dc5ce"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="librsync lockfile fasteners rename six"
+REQUIRES="librsync python2-lockfile fasteners rename"
 MAINTAINER="Jeff Parent"
 EMAIL="jeff+SBo@sh0.xyz"
diff --git a/system/duply/duply.SlackBuild b/system/duply/duply.SlackBuild
index ade04d8aa5..47161e647f 100644
--- a/system/duply/duply.SlackBuild
+++ b/system/duply/duply.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for duply
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=duply
 VERSION=${VERSION:-2.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,4 +82,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dust/README b/system/dust/README
index 84a1a21a62..8d3a404d63 100644
--- a/system/dust/README
+++ b/system/dust/README
@@ -1,6 +1,8 @@
-Dust is meant to give you an instant overview of which directories are using
-disk space without requiring sort or head.
+Dust is meant to give you an instant overview of which directories are
+using disk space without requiring sort or head. Dust will print a
+maximum of one 'Did not have permissions' message.
 
-Dust will list the 20 biggest sub directories or files and will smartly recurse
-down the tree to find the larger ones. There is no need for a '-d' flag or a
-'-h' flag. The largest sub directory will have its size shown in red.
+Dust will list a slightly-less-than-the-terminal-height number of the
+biggest subdirectories or files and will smartly recurse down the tree
+to find the larger ones. There is no need for a '-d' flag or a '-h'
+flag. The largest subdirectories will be colored.
diff --git a/system/dust/dust.SlackBuild b/system/dust/dust.SlackBuild
index 38b03cb019..e097215ed8 100644
--- a/system/dust/dust.SlackBuild
+++ b/system/dust/dust.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dust
 
-# Copyright 2019-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2021-2024 Erich Ritz, Jenks, Oklahoma, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dust
-VERSION=${VERSION:-0.5.3}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.0.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -41,7 +45,11 @@ if [ -z "$ARCH" ]; then
   fi
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -77,13 +85,13 @@ cd $PRGNAM-$VERSION
 # configuration tells cargo to use the configured directory
 # for dependencies intead of downloading from crates.io
 mkdir .cargo
-cat << EOF >> .cargo/config
+cat << EOF >> .cargo/config.toml
+[source]
 [source.crates-io]
-registry = 'https://github.com/rust-lang/crates.io-index'
-replace-with = 'vendored-sources'
+replace-with = "vendored-sources"
 
 [source.vendored-sources]
-directory = '$(pwd)/vendor'
+directory = "vendor"
 EOF
 
 # deps and versions come from Cargo.lock
@@ -91,15 +99,31 @@ mkdir vendor
 (
   cd vendor
 
-  grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
-    sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
-    awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \
-    grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do
-
+  grep -h -A 4 "\[\[package\]\]" \
+      $(find "../" -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
+      sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
+      awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4, $5 }' | \
+      sed 's/"//g;s/name=//;s/ version=/=/' | \
+      grep " source=" | \
+      sed 's/ dependencies=.*$//' | \
+      sed 's/ source=[^ ]*//' | \
+      sed 's/ checksum=/=/' | \
+      sort -u | \
+      while read -r dep ; do
+
+    cksum="$(printf "%s\n" "$dep" | cut -d= -f3)"
     ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
     dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
 
-    tar xvf $CWD/$dep-$ver.crate
+    CRATE_FILE=$CWD/$dep-$ver.crate
+
+    if [ -z "$cksum" ] ; then
+      mkdir $dep-$ver
+      tar xvf $CRATE_FILE -C $dep-$ver --strip-components=1
+      cksum="null"
+    else
+      tar xvf $CRATE_FILE
+    fi
 
     touch $dep-$ver/.cargo-ok
 
@@ -114,12 +138,10 @@ mkdir vendor
       ) | sed '$ s/,$//'
 
       printf "    },\n"
-      printf '    "package": "'
-
-      sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
+      printf '    "package": "%s"'  "$cksum"
 
       printf "}\n"
-    } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json
+    } | python3 -c "import sys, json; data = sys.stdin.read(); print (json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : ')))" > $dep-$ver/.cargo-checksum.json
   done
 )
 
@@ -130,6 +152,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
+CARGO_HOME=.cargo \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 cargo build --offline --release $CARGOTARGET
@@ -138,12 +168,20 @@ mkdir -p $PKG/usr/bin/
 
 find target -name $PRGNAM -exec install -m 755 {} $PKG/usr/bin/$PRGNAM \;
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+mkdir -p $PKG/usr/share/bash-completion/completions
+mv completions/dust.bash $PKG/usr/share/bash-completion/completions/dust
+mkdir -p $PKG/usr/share/zsh/site-functions
+mv completions/_dust $PKG/usr/share/zsh/site-functions/
+mkdir -p $PKG/usr/share/fish/vendor_completions.d
+mv completions/dust.fish $PKG/usr/share/fish/vendor_completions.d/
+
+mkdir -p $PKG/usr/man/man1
+mv man-page/dust.1 $PKG/usr/man/man1/
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a -r \
-  LICENSE README.md \
+cp -a \
+  LICENSE README.md config completions \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -151,4 +189,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dust/dust.info b/system/dust/dust.info
index b6e0d3185b..5e1446e632 100644
--- a/system/dust/dust.info
+++ b/system/dust/dust.info
@@ -1,118 +1,214 @@
 PRGNAM="dust"
-VERSION="0.5.3"
+VERSION="1.0.0"
 HOMEPAGE="https://github.com/bootandy/dust/"
-DOWNLOAD="https://github.com/bootandy/dust/archive/v0.5.3/dust-0.5.3.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.12.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/assert_cmd/assert_cmd-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bstr/bstr-0.2.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.4.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/difference/difference-2.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/doc-comment/doc-comment-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/globset/globset-0.4.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.15.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ignore/ignore-0.4.16.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.74.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lscolors/lscolors-0.7.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ppv-lite86/ppv-lite86-0.2.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates/predicates-1.0.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates-core/predicates-core-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates-tree/predicates-tree-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.7.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.57.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.3.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.18.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tempfile/tempfile-3.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/terminal_size/terminal_size-0.1.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thousands/thousands-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/treeline/treeline-0.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wait-timeout/wait-timeout-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate"
-MD5SUM="9f9502393b21e8b9b658bc7facbbe1f4 \
-        837ec91351db79aee59d6c96111460b0 \
-        294a49d3c53865fa7ac5d0ce2f5d5735 \
+DOWNLOAD="https://github.com/bootandy/dust/archive/v1.0.0/dust-1.0.0.tar.gz \
+          https://static.crates.io/crates/aho-corasick/aho-corasick-1.1.3.crate \
+          https://static.crates.io/crates/ansi_term/ansi_term-0.12.1.crate \
+          https://static.crates.io/crates/anstream/anstream-0.6.13.crate \
+          https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.3.crate \
+          https://static.crates.io/crates/anstyle-query/anstyle-query-1.0.2.crate \
+          https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-3.0.2.crate \
+          https://static.crates.io/crates/anstyle/anstyle-1.0.6.crate \
+          https://static.crates.io/crates/assert_cmd/assert_cmd-2.0.14.crate \
+          https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \
+          https://static.crates.io/crates/bitflags/bitflags-2.5.0.crate \
+          https://static.crates.io/crates/bstr/bstr-1.9.1.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://static.crates.io/crates/cfg_aliases/cfg_aliases-0.1.1.crate \
+          https://static.crates.io/crates/clap/clap-4.5.4.crate \
+          https://static.crates.io/crates/clap_builder/clap_builder-4.5.2.crate \
+          https://static.crates.io/crates/clap_complete/clap_complete-4.5.1.crate \
+          https://static.crates.io/crates/clap_lex/clap_lex-0.7.0.crate \
+          https://static.crates.io/crates/clap_mangen/clap_mangen-0.2.20.crate \
+          https://static.crates.io/crates/colorchoice/colorchoice-1.0.0.crate \
+          https://static.crates.io/crates/config-file/config-file-0.2.3.crate \
+          https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.6.crate \
+          https://static.crates.io/crates/crossbeam-deque/crossbeam-deque-0.8.5.crate \
+          https://static.crates.io/crates/crossbeam-epoch/crossbeam-epoch-0.9.18.crate \
+          https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.19.crate \
+          https://static.crates.io/crates/ctrlc/ctrlc-3.4.4.crate \
+          https://static.crates.io/crates/difflib/difflib-0.4.0.crate \
+          https://static.crates.io/crates/directories/directories-4.0.1.crate \
+          https://static.crates.io/crates/dirs-sys/dirs-sys-0.3.7.crate \
+          https://static.crates.io/crates/doc-comment/doc-comment-0.3.3.crate \
+          https://static.crates.io/crates/either/either-1.10.0.crate \
+          https://static.crates.io/crates/errno/errno-0.3.8.crate \
+          https://static.crates.io/crates/fastrand/fastrand-2.0.2.crate \
+          https://static.crates.io/crates/filesize/filesize-0.2.0.crate \
+          https://static.crates.io/crates/getrandom/getrandom-0.2.12.crate \
+          https://static.crates.io/crates/hermit-abi/hermit-abi-0.3.9.crate \
+          https://static.crates.io/crates/io-lifetimes/io-lifetimes-1.0.11.crate \
+          https://static.crates.io/crates/libc/libc-0.2.153.crate \
+          https://static.crates.io/crates/libredox/libredox-0.0.1.crate \
+          https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.3.8.crate \
+          https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.13.crate \
+          https://static.crates.io/crates/lscolors/lscolors-0.13.0.crate \
+          https://static.crates.io/crates/memchr/memchr-2.7.1.crate \
+          https://static.crates.io/crates/nix/nix-0.28.0.crate \
+          https://static.crates.io/crates/ntapi/ntapi-0.4.1.crate \
+          https://static.crates.io/crates/nu-ansi-term/nu-ansi-term-0.46.0.crate \
+          https://static.crates.io/crates/once_cell/once_cell-1.19.0.crate \
+          https://static.crates.io/crates/overload/overload-0.1.1.crate \
+          https://static.crates.io/crates/predicates-core/predicates-core-1.0.6.crate \
+          https://static.crates.io/crates/predicates-tree/predicates-tree-1.0.9.crate \
+          https://static.crates.io/crates/predicates/predicates-3.1.0.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.79.crate \
+          https://static.crates.io/crates/quote/quote-1.0.35.crate \
+          https://static.crates.io/crates/rayon-core/rayon-core-1.12.1.crate \
+          https://static.crates.io/crates/rayon/rayon-1.10.0.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.4.1.crate \
+          https://static.crates.io/crates/redox_users/redox_users-0.4.4.crate \
+          https://static.crates.io/crates/regex-automata/regex-automata-0.4.6.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.2.crate \
+          https://static.crates.io/crates/regex/regex-1.10.4.crate \
+          https://static.crates.io/crates/roff/roff-0.2.1.crate \
+          https://static.crates.io/crates/rustix/rustix-0.37.27.crate \
+          https://static.crates.io/crates/rustix/rustix-0.38.32.crate \
+          https://static.crates.io/crates/serde/serde-1.0.197.crate \
+          https://static.crates.io/crates/serde_derive/serde_derive-1.0.197.crate \
+          https://static.crates.io/crates/stfu8/stfu8-0.2.7.crate \
+          https://static.crates.io/crates/strsim/strsim-0.11.0.crate \
+          https://static.crates.io/crates/syn/syn-2.0.55.crate \
+          https://static.crates.io/crates/sysinfo/sysinfo-0.27.8.crate \
+          https://static.crates.io/crates/tempfile/tempfile-3.10.1.crate \
+          https://static.crates.io/crates/terminal_size/terminal_size-0.2.6.crate \
+          https://static.crates.io/crates/termtree/termtree-0.4.1.crate \
+          https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.58.crate \
+          https://static.crates.io/crates/thiserror/thiserror-1.0.58.crate \
+          https://static.crates.io/crates/thousands/thousands-0.2.0.crate \
+          https://static.crates.io/crates/toml/toml-0.5.11.crate \
+          https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.12.crate \
+          https://static.crates.io/crates/unicode-width/unicode-width-0.1.11.crate \
+          https://static.crates.io/crates/utf8parse/utf8parse-0.2.1.crate \
+          https://static.crates.io/crates/wait-timeout/wait-timeout-0.2.0.crate \
+          https://static.crates.io/crates/wasi/wasi-0.11.0+wasi-snapshot-preview1.crate \
+          https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi-util/winapi-util-0.1.6.crate \
+          https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi/winapi-0.3.9.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.48.0.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.52.0.crate \
+          https://static.crates.io/crates/windows-targets/windows-targets-0.48.5.crate \
+          https://static.crates.io/crates/windows-targets/windows-targets-0.52.4.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.48.5.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.52.4.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.48.5.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.52.4.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.48.5.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.52.4.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.48.5.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.52.4.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.52.4.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.52.4.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.52.4.crate"
+MD5SUM="6ceedb7e3f923769fc24fbc889f83bf0 \
+        03b2d126766ed746706241b4c7487654 \
         f44e8d1d2e61974b268852797530ea41 \
-        57d3fb06fb030f614a8cb6847cf3643d \
-        142cb4b9a653e56e56311f0c883b8582 \
-        7c6515c4b7f4c7723a3c6d1f07acc261 \
-        6799c26a7eacaf8e58d3e45c6c5add89 \
-        d25e25d08adce75c63f3969191141f28 \
-        882dbbc613a93f64c3709b0a2bd0d6dc \
-        bc79e0eb364df515a33755ac9a581cfd \
-        5016fb83c6aa4409a362728db9f90a35 \
-        ff67cf2eb9668167782b8012d3b48e7b \
-        5e49f4c3f9076fe30ae207fe951f9195 \
+        d1dbe19a84ecc8388654099d69c77b09 \
+        e188f6de00a35235da008cd39e1a003d \
+        b06d6c6d9a7bdcdd9bf78f20f2d08f01 \
+        87cc1a50f0dcc09d7223df42eae95119 \
+        dff7c2613686577772e6eaeaf76d6f5c \
+        1c2bb905c30c21cbe50e9e18c6a73fa2 \
+        a295edb6953237ebbdfa8e731229f9a3 \
+        f3406374808b01be3a263666aa9aa2f5 \
+        db089af54479a055c39ca84bcf915f27 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        126712a51ed2962e587048a634186390 \
+        ec573c80325dcb85a463103cf3878a73 \
+        6a7300e86333500f11f30e3e20e68808 \
+        31f09812c68c3d67e0abc29ebcf74f1a \
+        f780b94573a4c3e9261b0ef07ace6529 \
+        d7e22f14f70a89ab8c77f414dc75ecc3 \
+        010f6d0e98cc2a2b99907a23c6cd6bbc \
+        41cd47cb4fcd7c67c6ae8a2a8e9c2759 \
+        d7624e4ff046ae83eda8e82d90887bdb \
+        396f4f63322338c26d76b2f638646178 \
+        44505199ec0964feb5488051b4ac92d5 \
+        398f4cce1d3067cc7a56662e52a33384 \
+        5777335209150ceb1dc2164612afe6da \
+        bebc8338ae113a87a04564c97c1e3f0c \
+        43a06fc27e2bc54b4b06c4eeda880895 \
+        4c21da37e71a52f26c8c5490f3ec4837 \
         dd1e49c76e9d5853e673a3b41ba02917 \
-        8dab3b3ec00dc56cffde0b0c410d47b5 \
-        de1228e571c94ef53ec4c21db57279ab \
-        976eacc1e28ff6a04a08e7f4a2a5466a \
-        9e4eacf58977b54f76be2b80d7d3b776 \
-        3f7016c18518df85f6316e5ca2447ec6 \
-        fba3b040a55c01be7376d3dd5c4d4920 \
-        62aa95833e666183ae81aa141545d755 \
-        f50d2e280b4a3491fffda43b90982544 \
-        f3373fd861a0066fa446a8ab3dabc749 \
-        124ec4f35274a0e9c1a4ef3dc0958643 \
-        c36d452e37c73b1e99f40bae18cddfdb \
-        d8bd5a8204fe41dc04b344884b55381b \
-        90334ab24d9b7f3934dcf3b3cb85c48c \
-        d7994a5881ead65b583339d8c7fc31c8 \
-        7d6ee412648063d4ef8062b466a41115 \
-        66d1cb32dce999907409f636f004b884 \
-        0a80ed36a125ac3cdfa09f8707055873 \
-        a0f55fda89c0f97784edb18f4c253a49 \
-        b269356e8646f3184a0e8d52a58cee69 \
-        3cc3a4bd5861ca93d7c0d19129334703 \
-        eee136546e9f4735577dd20f45727c69 \
-        24118e5657591c6f208dbb1d77fbc482 \
-        0538d1da369f3e3f0412aa4d735c1b61 \
-        2d8d8b377d144f5e32b4f65a69eb0b24 \
-        781d4ccf5d04c98fa02af207a9639249 \
-        bb3ae104a9fa1b31568cc98c920a4653 \
-        37432cda34fdcf9f2b67dda7e69104e9 \
-        a8de006fe0c7e373c560dd51599287a8 \
+        cfa0423cdca197fe5e67129d7e0bb6a8 \
+        349e0ae5420f0b7e6ff835cd03cc7428 \
+        840d04b67c8e340315332a53cb8a186c \
+        9362cfdf53ef5eab4a7669b199f72784 \
+        ba5684833f6b40a3aa32ae4989c40f79 \
+        4daeb6abd6951210bed659c3c1ea01b4 \
+        c6612f34c3ee98ced239da95fbede236 \
+        49d77531898b3d7846b149c0fb4788c4 \
+        4d3764b253ae871241c2f327e519f382 \
+        18fa61f2d92d4df309c67cb3f3197987 \
+        f2d8f01a4e5c5236ab55240d09c6e82f \
+        9a5bbc0cbd40daa8e1e5b91435ea26d2 \
+        f8cc1978aae22df3e656d12810cdf994 \
+        fef6cd95c83025d64b8cb50171a4bb74 \
+        01c0964cfb7b3653fd6f07f2d94255a5 \
+        a56461a712a83abc691cf473d1835228 \
+        8390247ae7126c00e162732b249be9d7 \
+        03a7ad2814bd9dd34e0acec8ca4f855e \
+        be08d75820c528ad6143e9e42efccee0 \
+        175aaa67c5c9a4c8de2b944d51d0753d \
+        c53da10df6d399239c5869a292065557 \
+        e0c30e3bc29a1b33c71f2823cd5b5365 \
+        0358b31bf59c7915bb03f9e66f2d1ea3 \
+        7604a19f6ff2021e9fc02f9bce604494 \
+        7ee7a2b2f09d09fa2b1fb4c594fc8396 \
+        ff1d093069cfc9eb161907e17a51208b \
+        bca57d7079177ca0aa651d452c7099fe \
+        520b920d0c711ec1a17fb19a6060446a \
+        91b60a71d44302a8b05bd398eca56c37 \
+        e19600513eaf0823f25a621088b44d2c \
+        ca991859381ef2ddc2b3306de05c242c \
+        44eb6c30c79e4213a42dc2d1c1f3d345 \
+        c74beacbda25822857d315b64c167575 \
+        956ace3f4e2b8a6ac55aa74549cc38de \
+        e8b93865e80b67f03df2faa417960b88 \
+        b37c60ece73904fc7655776662f1a9bb \
+        5a9054761bf275878e3c4076192d5472 \
+        d67ac85d39d181f0f1f9ca0791dabad1 \
+        a980016132a9c929e1542021acf62c7c \
+        449c7bb37fc298d2026fbf2855eb8db0 \
+        1c4b4529618d2208937f63d3a4418003 \
+        b1372e62f53f0ad8d19a2be135c10c9d \
+        f443b2cca547d22f994c2dd99a6e5581 \
+        361668f9f11e4f0eba45f70c24fa8614 \
         eca4f78f2f4293611dccd41ad47a3be9 \
-        a5dd75e77c7324f5c1d2d372c990d0a7 \
-        8f1da9ba3b7b793efa8a39a159d06035 \
-        4272c279b06b88f8b0ffce7109348e27 \
-        333b4ba3f64c35b6f89b521e8d64548b \
+        b21820f2664242498beba7783b32bef4 \
+        ca65153603a1a7240bbd9d2ce19f2d67 \
+        908ec8a89821b72f3a35726bab24461f \
+        ceee1159c41351d05f4cf705490867b3 \
         6708629acf3d2ecb7404e43255d2df85 \
-        1092a4a24e80f8856efc71af51a06114 \
-        6e23e0eee42b1ba9ec61a6db7ec2dc08 \
-        0498c4a11448bfc35dc7bb2caa64c753 \
+        e972ea58ec203bfa6c79c1207852298b \
         db96b50050277bf05a3c68534bbb9586 \
-        b9e37d5fc4ad28b612b78ad37816684d \
-        09de9d01e7331ff3da11f58be8bef0df"
+        306c0281447d1876e8220007b7a7e053 \
+        09de9d01e7331ff3da11f58be8bef0df \
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        f2797ade0e36f1e5d6be9d11b5076582 \
+        2376de634160158ece40c4bc2ab3eb41 \
+        24c64817e85ef77765ed0f26c31c9b4c \
+        da06678965a6a18bd802a4dfc0ff16a6 \
+        dae6d89034a6988042fd8be4cf5e037d \
+        37de98e52a65c26a9ea5d1c64ac70ff7 \
+        de2839e16d9d7a9fd1c397da62f62b4a \
+        08d0a285a0002da66dd555876cf0b278 \
+        e0c35ffb8cfdb74a39bf799811f79304 \
+        b6834054fd9736252087791fdda2e73a \
+        d990172b607020701f9e84ca8e1c043c \
+        05b3e5d30c79a17e5c14c64f092326fe \
+        0a68848588e847ceccf504891584d00b \
+        af0110497c2fc215c55297232f3e6665 \
+        45b469ad607b912256b7c80141fa2d17 \
+        b08b96f50cdba558c550c985252c3fd6 \
+        7799baff9a5664205d9110a2624e8989 \
+        ff740ff52ecfd509004f54630f94c3e4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
+REQUIRES="rust16"
+MAINTAINER="Erich Ritz"
+EMAIL="erich.public@protonmail.com"
diff --git a/system/dvdisaster/README b/system/dvdisaster/README
index 8128430674..1497b61dc9 100644
--- a/system/dvdisaster/README
+++ b/system/dvdisaster/README
@@ -1,4 +1,5 @@
-dvdisaster stores data on CD/DVD/BD (supported media) in a way that it is 
-fully recoverable even after some read errors have developed.  This enables 
-you to rescue the complete data to a new medium.  It works at the image 
-level so that the recovery does not depend on the file system of the medium.
+dvdisaster stores data on CD/DVD/BD (supported media) in a way that it
+is fully recoverable even after some read errors have developed. This
+enables you to rescue the complete data to a new medium. It works
+at the image level so that the recovery does not depend on the file
+system of the medium.
diff --git a/system/dvdisaster/doinst.sh b/system/dvdisaster/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/system/dvdisaster/doinst.sh
+++ b/system/dvdisaster/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/dvdisaster/dvdisaster.SlackBuild b/system/dvdisaster/dvdisaster.SlackBuild
index 2b5d5b9906..bf918d30a3 100644
--- a/system/dvdisaster/dvdisaster.SlackBuild
+++ b/system/dvdisaster/dvdisaster.SlackBuild
@@ -1,29 +1,43 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dvdisaster
 
 # Written by Giovanne Castro <giovannefc@ig.com.br>
 
+# 20220410 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - update icon cache in doinst.sh.
+
+# 20220211 bkw: Modified by SlackBuilds.org:
+# - fix parallel build on 15.0.
+# - new-style icons.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dvdisaster
-VERSION=${VERSION:-0.79.5}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.79.9}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -47,9 +61,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -66,25 +80,37 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-nls=yes \
   --build=$ARCH-slackware-linux
 
+# 20220211 bkw: doing this first allows parallel makes to succeed.
+make -j1 -C locale
+
 make
 make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+strip $PKG/usr/bin/$PRGNAM
+gzip -9 $PKG/usr/man/man*/* $PKG/usr/man/de/man*/*
 
 # Delete unnecessary file
 rm -rf $PKG/usr/bin/dvdisaster-uninstall.sh
 
-# Install icons
+# 20220211 bkw: make the .desktop file validate.
 mkdir -p $PKG/usr/share/applications
-cp -a contrib/dvdisaster.desktop $PKG/usr/share/applications
+sed -e 's,dvdisaster48\.png,dvdisaster,' \
+    -e 's,Application;,,' \
+  < contrib/dvdisaster.desktop \
+  > $PKG/usr/share/applications/dvdisaster.desktop
+
+# 20220211 bkw: new-style icons.
+for png in contrib/$PRGNAM*.png; do
+  px="$( echo $png | sed 's,.*\(..\)\.png$,\1,' )"
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  cp -a $png $dir/$PRGNAM.png
+done
+
 mkdir -p $PKG/usr/share/pixmaps
-cp -a contrib/dvdisaster48.png $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
-cp -a INSTALL README TRANSLATION.HOWTO $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a README TRANSLATION.HOWTO $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -92,4 +118,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dvdisaster/dvdisaster.info b/system/dvdisaster/dvdisaster.info
index b81a32f007..0758483148 100644
--- a/system/dvdisaster/dvdisaster.info
+++ b/system/dvdisaster/dvdisaster.info
@@ -1,8 +1,8 @@
 PRGNAM="dvdisaster"
-VERSION="0.79.5"
-HOMEPAGE="https://htmlpreview.github.io/?https://github.com/lrq3000/dvdisaster/blob/stable/dvdisaster/documentation/en/index.html"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/dvdisaster-0.79.5.tar.bz2"
-MD5SUM="ceef990a2239c43314bc6427c6afb181"
+VERSION="0.79.9"
+HOMEPAGE="https://dvdisaster.jcea.es/"
+DOWNLOAD="https://dvdisaster.jcea.es/downloads/dvdisaster-0.79.9.tar.bz2"
+MD5SUM="3fc730d39df329dc6e39cf5ac3a70fe6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/dymo-cups-drivers/cups-2.6-api.patch b/system/dymo-cups-drivers/cups-2.6-api.patch
new file mode 100644
index 0000000000..9864b0ff9f
--- /dev/null
+++ b/system/dymo-cups-drivers/cups-2.6-api.patch
@@ -0,0 +1,10 @@
+--- dymo-cups-drivers-1.4.0.5/src/common/CupsPrintEnvironment.cpp.orig	2012-02-07 08:22:37.000000000 -0500
++++ dymo-cups-drivers-1.4.0.5/src/common/CupsPrintEnvironment.cpp	2019-10-27 11:27:37.899169865 -0400
+@@ -23,6 +23,7 @@
+ #include "CupsPrintEnvironment.h"
+ #include <errno.h>
+ #include <cups/cups.h>
++#include <cups/sidechannel.h>
+ #include <cassert>
+ 
+ namespace DymoPrinterDriver
diff --git a/system/dymo-cups-drivers/cups-ppd-header.patch b/system/dymo-cups-drivers/cups-ppd-header.patch
new file mode 100644
index 0000000000..46b366915d
--- /dev/null
+++ b/system/dymo-cups-drivers/cups-ppd-header.patch
@@ -0,0 +1,40 @@
+diff -ur dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h dymo-cups-drivers-1.4.0.5-patch/src/common/CupsFilter.h
+--- dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h	2012-02-07 08:22:37.000000000 -0500
++++ dymo-cups-drivers-1.4.0.5-patch/src/common/CupsFilter.h	2016-10-27 20:13:46.267013540 -0400
+@@ -23,6 +23,7 @@
+ 
+ #include <cups/cups.h>
+ #include <cups/raster.h>
++#include <cups/ppd.h>
+ #include <memory>
+ #include <string>
+ #include "CupsPrintEnvironment.h"
+diff -ur dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h dymo-cups-drivers-1.4.0.5-patch/src/lm/CupsFilterLabelManager.h
+--- dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h	2012-02-07 08:22:38.000000000 -0500
++++ dymo-cups-drivers-1.4.0.5-patch/src/lm/CupsFilterLabelManager.h	2016-10-27 20:14:00.407310094 -0400
+@@ -23,6 +23,7 @@
+ 
+ #include <cups/cups.h>
+ #include <cups/raster.h>
++#include <cups/ppd.h>
+ #include "LabelManagerDriver.h"
+ #include "LabelManagerLanguageMonitor.h"
+ #include "DummyLanguageMonitor.h"
+@@ -50,4 +51,4 @@
+ 
+ /*
+  * End of "$Id: CupsFilterLabelManager.h 14880 2011-03-31 16:29:05Z aleksandr $".
+- */
+\ No newline at end of file
++ */
+diff -ur dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h dymo-cups-drivers-1.4.0.5-patch/src/lw/CupsFilterLabelWriter.h
+--- dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h	2012-02-07 08:22:37.000000000 -0500
++++ dymo-cups-drivers-1.4.0.5-patch/src/lw/CupsFilterLabelWriter.h	2016-10-27 20:14:23.717798963 -0400
+@@ -23,6 +23,7 @@
+ 
+ #include <cups/cups.h>
+ #include <cups/raster.h>
++#include <cups/ppd.h>
+ #include "LabelWriterDriver.h"
+ #include "LabelWriterLanguageMonitor.h"
+ #include "DummyLanguageMonitor.h"
diff --git a/system/dymo-cups-drivers/dymo-cups-drivers.SlackBuild b/system/dymo-cups-drivers/dymo-cups-drivers.SlackBuild
index d75cb09fca..83bb2ff7ea 100644
--- a/system/dymo-cups-drivers/dymo-cups-drivers.SlackBuild
+++ b/system/dymo-cups-drivers/dymo-cups-drivers.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for DYMO Label SDK and CUPS Drivers
 
@@ -22,10 +22,13 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dymo-cups-drivers
 VERSION=${VERSION:-1.4.0.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,6 +79,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Patch for the newer cups - thanks archlinux!
+patch -p1 < $CWD/cups-ppd-header.patch
+patch -p1 < $CWD/cups-2.6-api.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -96,4 +110,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dymo-cups-drivers/dymo-cups-drivers.info b/system/dymo-cups-drivers/dymo-cups-drivers.info
index 7ae50f6c00..72657c94ec 100644
--- a/system/dymo-cups-drivers/dymo-cups-drivers.info
+++ b/system/dymo-cups-drivers/dymo-cups-drivers.info
@@ -1,7 +1,7 @@
 PRGNAM="dymo-cups-drivers"
 VERSION="1.4.0.5"
 HOMEPAGE="http://www.dymo.com/en-US/dymo-label-sdk-and-cups-drivers-for-linux-dymo-label-sdk-cups-linux-p--1"
-DOWNLOAD="http://download.dymo.com/dymo/Software/Download%20Drivers/Linux/Download/dymo-cups-drivers-1.4.0.tar.gz"
+DOWNLOAD="http://distcache.freebsd.org/ports-distfiles/dymo-cups-drivers-1.4.0.tar.gz"
 MD5SUM="8774f98bbe8d57f5b337019ae86a23f0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/dynamips/dynamips.SlackBuild b/system/dynamips/dynamips.SlackBuild
index a9edf005e9..6284f4698c 100644
--- a/system/dynamips/dynamips.SlackBuild
+++ b/system/dynamips/dynamips.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dynamips
 
@@ -22,28 +22,35 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dynamips
 VERSION=${VERSION:-0.2.8_RC3}
 SRCVER=$(echo $VERSION | tr _ -)
 SUFFIX=community # additional suffix in tarball-name
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -67,29 +74,28 @@ cd $PRGNAM-$SRCVER-$SUFFIX
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 sed -i 's/^\(\.PHONY: all dynamips\)/# \1/' Makefile
+sed -i "s/-L\/usr\/lib\ -L\.\ -ldl/-L\/usr\/lib${LIBDIRSUFFIX} -L. -ldl -lz/" stable/Makefile
 
-if [ $ARCH == "x86_64" ]
-then
-				make dynamips.stable DYNAMIPS_ARCH=amd64 DYNAMIPS_LIB=lib64
+# 20220211 bkw: actually use SLKCFLAGS... and show me the compile commands.
+sed -i -e "s,-O3,$SLKCFLAGS," \
+       -e 's,@\$(CC),$(CC),g' \
+    stable/Makefile
+
+if [ $ARCH == "x86_64" ]; then
+  make -j1 dynamips.stable DYNAMIPS_ARCH=amd64 DYNAMIPS_LIB=lib64
 else
-				make dynamips.stable
+  make -j1 dynamips.stable
 fi
 
-make install DESTDIR=$PKG/usr
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make -j1 install DESTDIR=$PKG/usr
+strip $PKG/usr/bin/*
+gzip -9 $PKG/usr/man/man*/*
+rm -rf $PKG/usr/etc # 'make install' creates this, empty, useless.
 
 chmod 644 README.community
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -100,4 +106,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l n -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l n -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/eaglemode/eaglemode.SlackBuild b/system/eaglemode/eaglemode.SlackBuild
index e59a9be49e..0bb187d8d3 100644
--- a/system/eaglemode/eaglemode.SlackBuild
+++ b/system/eaglemode/eaglemode.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for eaglemode
 
-# Copyright 2015-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2015-2024  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -17,10 +17,13 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=eaglemode
-VERSION=${VERSION:-0.94.1}
+VERSION=${VERSION:-0.96.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -30,7 +33,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -82,4 +92,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/eaglemode/eaglemode.info b/system/eaglemode/eaglemode.info
index 2dbbbe250a..2a938d99a3 100644
--- a/system/eaglemode/eaglemode.info
+++ b/system/eaglemode/eaglemode.info
@@ -1,10 +1,10 @@
 PRGNAM="eaglemode"
-VERSION="0.94.1"
+VERSION="0.96.1"
 HOMEPAGE="http://eaglemode.sourceforge.net/"
-DOWNLOAD="https://downloads.sourceforge.net/project/eaglemode/eaglemode-0.94.1/eaglemode-0.94.1.tar.bz2"
-MD5SUM="949a65b983480e65b5f73451316ac685"
+DOWNLOAD="http://downloads.sourceforge.net/eaglemode/eaglemode-0.96.1.tar.bz2"
+MD5SUM="404536d3b624f71423a2797864682521"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/system/early-ssh/early-ssh.SlackBuild b/system/early-ssh/early-ssh.SlackBuild
index 0405940a32..8fc56d0668 100644
--- a/system/early-ssh/early-ssh.SlackBuild
+++ b/system/early-ssh/early-ssh.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for early-ssh
 
@@ -22,16 +22,23 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=early-ssh
-VERSION=${VERSION:-git4acf000}
+VERSION=${VERSION:-gitac34845}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-GITREV=4acf000ddbe564dcafec626ec0dc7eadd821a857
+GITREV=ac34845521070c13aff8bc428ffe966ca3688387
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -70,4 +77,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/early-ssh/early-ssh.info b/system/early-ssh/early-ssh.info
index 9ddcea7867..bc7cbd757d 100644
--- a/system/early-ssh/early-ssh.info
+++ b/system/early-ssh/early-ssh.info
@@ -1,8 +1,8 @@
 PRGNAM="early-ssh"
-VERSION="git4acf000"
-HOMEPAGE="http://dev.kakaopor.hu/early-ssh/"
-DOWNLOAD="https://github.com/gheja/early-ssh/archive/4acf000ddbe564dcafec626ec0dc7eadd821a857/early-ssh-4acf000ddbe564dcafec626ec0dc7eadd821a857.tar.gz"
-MD5SUM="a7b27f5f6b28ea7ce76fdcae249b8225"
+VERSION="gitac34845"
+HOMEPAGE="https://github.com/gheja/early-ssh"
+DOWNLOAD="https://github.com/gheja/early-ssh/archive/ac34845521070c13aff8bc428ffe966ca3688387/early-ssh-ac34845521070c13aff8bc428ffe966ca3688387.tar.gz"
+MD5SUM="9a347fc1234ebb21242321ed174e9e23"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dropbear"
diff --git a/system/early-ssh/slack-desc b/system/early-ssh/slack-desc
index 79f73599c1..58b6f09a4e 100644
--- a/system/early-ssh/slack-desc
+++ b/system/early-ssh/slack-desc
@@ -15,5 +15,5 @@ early-ssh: to be at the console of your server. You can also scp files to your
 early-ssh: server so you can even start your key-encrypted system.
 early-ssh:
 early-ssh:
-early-ssh: http://dev.kakaopor.hu/early-ssh/
+early-ssh: https://github.com/gheja/early-ssh
 early-ssh:
diff --git a/system/earlyoom/README b/system/earlyoom/README
new file mode 100644
index 0000000000..95f8c2fbec
--- /dev/null
+++ b/system/earlyoom/README
@@ -0,0 +1,30 @@
+earlyoom (the early out-of-memory daemon)
+
+The Linux kernel's OOM-killer generally has a bad reputation among
+Linux users. One may have to sit in front of an unresponsive system,
+listening to the grinding disk for minutes, and press the reset
+button to quickly get back to what one was doing after running out of
+patience.
+
+earlyoom is a userspace daemon that can be triggered earlier than the
+kernel's OOM-killer. It checks the amount of available memory and free
+swap up to 10 times a second (less often if there is a lot of free
+memory). By default if both are below 10%, it will kill the largest
+process (highest oom_score). The percentage value is configurable via
+command line arguments.
+
+To enable it, put this line in your rc.local after running chmod +x on
+/etc/rc.d/rc.earlyoom:
+
+if [ -x /etc/rc.d/rc.earlyoom ]; then
+    /etc/rc.d/rc.earlyoom start
+fi
+
+...and to have it exit at shutdown, put this in your rc.local_shutdown:
+
+if [ -x /etc/rc.d/rc.earlyoom ]; then
+    /etc/rc.d/rc.earlyoom stop
+fi
+
+A log file for it is kept at /var/log/earlyoom.log, and earlyoom can
+be configured by modifying /etc/default/earlyoom.
diff --git a/system/earlyoom/doinst.sh b/system/earlyoom/doinst.sh
new file mode 100644
index 0000000000..e32196a11c
--- /dev/null
+++ b/system/earlyoom/doinst.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+config() {
+	NEW="$1"
+	OLD="$(dirname $NEW)/$(basename $NEW .new)"
+	if [ ! -r $OLD ]; then
+		mv $NEW $OLD
+	elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+		rm $NEW
+	fi
+}
+
+preserve_perms() {
+	NEW="$1"
+	OLD="$(dirname $NEW)/$(basename $NEW .new)"
+	if [ -e $OLD ]; then
+		cp -a $OLD ${NEW}.incoming
+		cat $NEW > ${NEW}.incoming
+		mv ${NEW}.incoming $NEW
+	fi
+	config $NEW
+}
+
+config etc/default/earlyoom.new
+preserve_perms etc/rc.d/rc.earlyoom.new
diff --git a/system/earlyoom/earlyoom.8 b/system/earlyoom/earlyoom.8
new file mode 100644
index 0000000000..9431b55a44
--- /dev/null
+++ b/system/earlyoom/earlyoom.8
@@ -0,0 +1,270 @@
+.TH "earlyoom" "8" "August 2023" "1.7" "Linux System Administrator's Manual"
+.hy
+.SH NAME
+.PP
+earlyoom - Early OOM Daemon
+.SH SYNOPSIS
+.PP
+\f[B]earlyoom\f[R] [\f[B]OPTION\f[R]]\&...
+.SH DESCRIPTION
+.PP
+The oom-killer generally has a bad reputation among Linux users.
+One may have to sit in front of an unresponsive system, listening to the
+grinding disk for minutes, and press the reset button to quickly get
+back to what one was doing after running out of patience.
+.PP
+\f[B]earlyoom\f[R] checks the amount of available memory and free swap
+up to 10 times a second (less often if there is a lot of free memory).
+If \f[B]both\f[R] memory \f[B]and\f[R] swap are below 10%, it will kill
+the largest process (highest \f[C]oom_score\f[R]).
+The percentage value is configurable via command line arguments.
+.PP
+If there is a failure when trying to kill a process, \f[B]earlyoom\f[R]
+sleeps for 1 second to limit log spam due to recurring errors.
+.SH OPTIONS
+.SS -m PERCENT[,KILL_PERCENT]
+.PP
+set available memory minimum to PERCENT of total (default 10 %).
+.PP
+earlyoom starts sending SIGTERM once \f[B]both\f[R] memory \f[B]and\f[R]
+swap are below their respective PERCENT setting.
+It sends SIGKILL once \f[B]both\f[R] are below their respective
+KILL_PERCENT setting (default PERCENT/2).
+.PP
+Use the same value for PERCENT and KILL_PERCENT if you always want to
+use SIGKILL.
+.PP
+Examples:
+.IP
+.nf
+\f[C]
+earlyoom              # sets PERCENT=10, KILL_PERCENT=5
+earlyoom -m 30        # sets PERCENT=30, KILL_PERCENT=15
+earlyoom -m 20,18     # sets PERCENT=20, KILL_PERCENT=18
+\f[R]
+.fi
+.SS -s PERCENT[,KILL_PERCENT]
+.PP
+set free swap minimum to PERCENT of total (default 10 %).
+Send SIGKILL if at or below KILL_PERCENT (default PERCENT/2), otherwise
+SIGTERM.
+.PP
+You can use \f[C]-s 100\f[R] to have earlyoom effectively ignore swap
+usage: Processes are killed once available memory drops below the
+configured minimum, no matter how much swap is free.
+.PP
+Use the same value for PERCENT and KILL_PERCENT if you always want to
+use SIGKILL.
+.SS -M SIZE[,KILL_SIZE]
+.PP
+As an alternative to specifying a percentage of total memory,
+\f[C]-M\f[R] sets the available memory minimum to SIZE KiB.
+The value is internally converted to a percentage.
+If you pass both \f[C]-M\f[R] and \f[C]-m\f[R], the lower value is used.
+Example: Reserve 10% of RAM but at most 1 GiB:
+.IP
+.nf
+\f[C]
+earlyoom -m 10 -M 1048576
+\f[R]
+.fi
+.PP
+earlyoom sends SIGKILL if at or below KILL_SIZE (default SIZE/2),
+otherwise SIGTERM.
+.SS -S SIZE[,KILL_SIZE]
+.PP
+As an alternative to specifying a percentage of total swap, \f[C]-S\f[R]
+sets the free swap minimum to SIZE KiB.
+The value is internally converted to a percentage.
+If you pass both \f[C]-S\f[R] and \f[C]-s\f[R], the lower value is used.
+.PP
+Send SIGKILL if at or below KILL_SIZE (default SIZE/2), otherwise
+SIGTERM.
+.SS -k
+.PP
+removed in earlyoom v1.2, ignored for compatibility
+.SS -i
+.PP
+removed in earlyoom v1.7, ignored for compatibility
+.SS -d
+.PP
+enable debugging messages
+.SS -v
+.PP
+print version information and exit
+.SS -r INTERVAL
+.PP
+Time between printing periodic memory reports, in seconds (default 1.0).
+A memory report looks like this:
+.IP
+.nf
+\f[C]
+mem avail: 21790 of 23909 MiB (91.14%), swap free:    0 of    0 MiB ( 0.00%)
+\f[R]
+.fi
+.PP
+Set to 3600 to print a report every hour, to 86400 to print once a day
+etc.
+Set to 0 to disable printing periodic memory reports.
+Free memory monitoring and low-memory killing runs independently of this
+option at an adaptive poll rate that only depends on free memory.
+Due to the adaptive poll rate, when there is a lot of free memory, the
+actual interval may be up to 1 second longer than the setting.
+.SS -p
+.PP
+Increase earlyoom\[cq]s priority: set niceness of earlyoom to -20 and
+oom_score_adj to -100.
+.PP
+When earlyoom is run through its default systemd service, the
+\f[C]-p\f[R] switch doesn\[cq]t work.
+To achieve the same effect, enter the following three lines into
+\f[C]sudo systemctl edit earlyoom\f[R]:
+.IP
+.nf
+\f[C]
+[Service]
+OOMScoreAdjust=-100
+Nice=-20
+\f[R]
+.fi
+.SS -n
+.PP
+Enable notifications via d-bus.
+.PP
+To actually see the notifications in your GUI session, you need to have
+systembus-notify (https://github.com/rfjakob/systembus-notify) running
+as your user.
+.SS -N /PATH/TO/SCRIPT
+.PP
+Run the given script for each process killed.
+Must be an absolute path.
+.PP
+Within the script, information about the killed process can be obtained
+via the following environment variables:
+.IP
+.nf
+\f[C]
+EARLYOOM_PID     Process PID
+EARLYOOM_NAME    Process name truncated to 16 bytes (as reported in /proc/PID/comm)
+EARLYOOM_UID     UID of the user running the process
+\f[R]
+.fi
+.PP
+WARNING: \f[C]EARLYOOM_NAME\f[R] can contain spaces, newlines, special
+characters and is controlled by the user, or it can be empty!
+Make sure that your notification script can handle that!
+.SS -g
+.PP
+Kill all processes that have same process group id (PGID) as the process
+with excessive memory usage.
+.PP
+For example, with this flag turned on, the whole application will be
+killed when one of its subprocess consumes too much memory (as long as
+they all have the same PGID, of course).
+.PP
+Enable this flag when completely cleaning up the \[lq]entire
+application\[rq] is more desirable, and you are sure that the
+application puts all its processes in the same PGID.
+.PP
+Note that some desktop environments (GNOME, for example) put all desktop
+application in the same process group as \f[C]gnome-shell\f[R].
+earlyoom might kill all such processes including \f[C]gnome-shell\f[R]
+when this flag is turned on.
+.PP
+Be sure to check how your environment behaves beforehand.
+Use
+.IP
+.nf
+\f[C]
+pstree -gT
+\f[R]
+.fi
+.PP
+to show all processes with the PGID in brackets.
+.SS --prefer REGEX
+.PP
+prefer killing processes matching REGEX (adds 300 to oom_score)
+.SS --avoid REGEX
+.PP
+avoid killing processes matching REGEX (subtracts 300 from oom_score)
+.SS --ignore REGEX
+.PP
+ignore processes matching REGEX.
+.PP
+Unlike the --avoid option, this option disables any potential killing of
+the matched processes that might have occurred due to the processes
+attaining a high oom_score.
+.PP
+Use this option with caution as other processes might be sacrificed in
+place of the ignored processes when earlyoom determines to kill
+processes.
+.SS --dryrun
+.PP
+dry run (do not kill any processes)
+.SS -h, --help
+.PP
+this help text
+.SH EXIT STATUS
+.PP
+0: Successful program execution.
+.PP
+1: Other error - inspect message for details
+.PP
+2: Switch conflict.
+.PP
+4: Could not cd to /proc
+.PP
+5: Could not open proc
+.PP
+7: Could not open /proc/sysrq-trigger
+.PP
+13: Unknown options.
+.PP
+14: Wrong parameters for other options.
+.PP
+15: Wrong parameters for memory threshold.
+.PP
+16: Wrong parameters for swap threshold.
+.PP
+102: Could not open /proc/meminfo
+.PP
+103: Could not read /proc/meminfo
+.PP
+104: Could not find a specific entry in /proc/meminfo
+.PP
+105: Could not convert number when parse the contents of /proc/meminfo
+.SH Why not trigger the kernel oom killer?
+.PP
+Earlyoom does not use \f[C]echo f > /proc/sysrq-trigger\f[R] because the
+Chrome people made their browser always be the first (innocent!)
+victim by setting \f[C]oom_score_adj\f[R] very high.
+Instead, earlyoom finds out itself by reading through
+\f[C]/proc/*/status\f[R] (actually \f[C]/proc/*/statm\f[R], which
+contains the same information but is easier to parse programmatically).
+.PP
+Additionally, in recent kernels (tested on 4.0.5), triggering the kernel
+oom killer manually may not work at all.
+That is, it may only free some graphics memory (that will be allocated
+immediately again) and not actually kill any process.
+.SH MEMORY USAGE
+.PP
+About 2 MiB VmRSS.
+All memory is locked using mlockall() to make sure earlyoom does not
+slow down in low memory situations.
+.SH BUGS
+.PP
+If there is zero total swap on earlyoom startup, any \f[C]-S\f[R]
+(uppercase \[lq]S\[rq]) values are ignored, a warning is printed, and
+default swap percentages are used.
+.PP
+For processes matched by \f[C]--prefer\f[R], negative
+\f[C]oom_score_adj\f[R] values are not taken into account, and the
+process gets an effective \f[C]oom_score\f[R] of at least 300.
+See https://github.com/rfjakob/earlyoom/issues/159 for details.
+.SH AUTHOR
+.PP
+The author of earlyoom is Jakob Unterwurzacher
+<jakobunt@gmail.com>.
+.PP
+This manual page was written by Yangfl <mmyangfl@gmail.com>,
+for the Debian project (and may be used by others).
diff --git a/system/earlyoom/earlyoom.SlackBuild b/system/earlyoom/earlyoom.SlackBuild
new file mode 100644
index 0000000000..9a04c78429
--- /dev/null
+++ b/system/earlyoom/earlyoom.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/bash
+
+# Slackware build script for earlyoom
+
+# Copyright 2022 Charadon US
+# Copyright 2023 B. Watson
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# 20230829 bkw: BUILD=2
+# - add LICENSE and README.md to the doc dir.
+# - binary in /usr/sbin, man page in section 8, since this is admin stuff.
+# - have the init script delete the PID file after stop or force_stop.
+# - actually use SLKCFLAGS.
+# - make /etc/default/earlyoom a .new config file.
+# - add a bit more detail to README.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=earlyoom
+VERSION=${VERSION:-1.7}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+    *) ARCH=$( uname -m ) ;;
+esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}"  ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# 20230829 bkw: don't generate the man page even if pandoc is installed,
+# since we're going to use a prebuilt one.
+sed -i '/^PANDOC *:=/d' Makefile
+
+# 20230829 bkw: no way to do this on the make command line:
+sed -i "/^CFLAGS/s,-Wall,& $SLKCFLAGS," Makefile
+
+# 20230829 bkw: note to self: non-canonical use of BINDIR here. It's not
+# the full path (/usr/sbin), it gets PREFIX prepended to it.
+make PREFIX=/usr BINDIR=/sbin
+strip $PRGNAM
+make DESTDIR=$PKG PREFIX=/usr BINDIR=/sbin install-bin
+
+# 20230829 bkw: prebuilt man page is a bit different from the generated one:
+# - it's a section 8 page.
+# - it has the date and "Linux System Administrator's Manual" filled in.
+# - get rid of fancy unicode angle brackets for email addresses, just use <>.
+mkdir -p $PKG/usr/man/man8
+gzip -9 < $CWD/earlyoom.8 > $PKG/usr/man/man8/earlyoom.8.gz
+
+install -Dm644 $CWD/rc.earlyoom $PKG/etc/rc.d/rc.earlyoom.new
+install -Dm644 earlyoom.default $PKG/etc/default/earlyoom.new
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README* LICENSE* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/earlyoom/earlyoom.info b/system/earlyoom/earlyoom.info
new file mode 100644
index 0000000000..bb2d219617
--- /dev/null
+++ b/system/earlyoom/earlyoom.info
@@ -0,0 +1,10 @@
+PRGNAM="earlyoom"
+VERSION="1.7"
+HOMEPAGE="https://github.com/rfjakob/earlyoom"
+DOWNLOAD="https://github.com/rfjakob/earlyoom/archive/v1.7/earlyoom-1.7.tar.gz"
+MD5SUM="9c567930c60b2ccdc536951b005d413d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/earlyoom/rc.earlyoom b/system/earlyoom/rc.earlyoom
new file mode 100644
index 0000000000..0e1cbb303d
--- /dev/null
+++ b/system/earlyoom/rc.earlyoom
@@ -0,0 +1,97 @@
+#!/bin/sh
+set -eu
+
+. /etc/default/earlyoom
+
+do_start() {
+	if [ -f /var/run/earlyoom.pid ];
+	then
+		if ps -p "$(cat /var/run/earlyoom.pid)" > /dev/null 2>&1
+		then
+			echo "earlyoom is already running."
+			exit 0
+		fi
+	fi
+	echo "Starting earlyoom..."
+	# shellcheck disable=2086
+	nohup /usr/sbin/earlyoom $EARLYOOM_ARGS > /var/log/earlyoom.log 2>&1 &
+	echo "$!" > /var/run/earlyoom.pid
+	exit 0
+}
+
+do_stop() {
+	if [ -f /var/run/earlyoom.pid ];
+	then
+		if ps -p "$(cat /var/run/earlyoom.pid)" > /dev/null 2>&1
+		then
+			echo "Stopping earlyoom..."
+			kill -15 "$(cat /var/run/earlyoom.pid)" > /dev/null 2>&1
+			rm -f /var/run/earlyoom.pid
+			exit 0
+		fi
+	fi
+	echo "earlyoom is not running..."
+}
+
+do_force_stop() {
+	if [ -f /var/run/earlyoom.pid ];
+	then
+		if ps -p "$(cat /var/run/earlyoom.pid)" > /dev/null 2>&1
+		then
+			echo "Killing earlyoom..."
+			kill -9 "$(cat /var/run/earlyoom.pid)" > /dev/null 2>&1
+			rm -f /var/run/earlyoom.pid
+			exit 0
+		fi
+	fi
+	echo "earlyoom appears to not be running."
+	exit 0
+}
+
+do_restart() {
+	do_stop
+	do_start
+}
+
+do_status() {
+	if [ -f /var/run/earlyoom.pid ];
+	then
+		if ps -p "$(cat /var/run/earlyoom.pid)" > /dev/null 2>&1
+		then
+			echo "earlyoom is running with pid $(cat /var/run/earlyoom.pid)."
+			exit 0
+		fi
+	fi
+	echo "earlyoom is not running."
+}
+
+do_help() {
+	echo "USAGE: rc.earlyoom (start|stop|force-stop|restart|status)"
+	exit 0
+}
+
+if [ -z "${1-}" ];
+then
+	do_help
+fi
+
+case $1 in
+	start)
+		do_start
+		;;
+	stop)
+		do_stop
+		;;
+	restart)
+		do_restart
+		;;
+	force-stop)
+		do_force_stop
+		;;
+	status)
+		do_status
+		;;
+	*)
+		do_help
+		;;
+esac
diff --git a/system/earlyoom/slack-desc b/system/earlyoom/slack-desc
new file mode 100644
index 0000000000..5eef07ce20
--- /dev/null
+++ b/system/earlyoom/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+earlyoom: earlyoom (the early out-of-memory daemon)
+earlyoom:
+earlyoom: earlyoom is a userspace daemon that can be triggered earlier than the
+earlyoom: kernel's OOM-killer. It checks the amount of available memory and free
+earlyoom: swap up to 10 times a second (less often if there is a lot of free
+earlyoom: memory). By default if both are below 10%, it will kill the largest
+earlyoom: process (highest oom_score). The percentage value is configurable via
+earlyoom: command line arguments.
+earlyoom:
+earlyoom:
+earlyoom:
diff --git a/system/ecm-tools/ecm-tools.SlackBuild b/system/ecm-tools/ecm-tools.SlackBuild
index 00e13f4553..29a5481ee5 100644
--- a/system/ecm-tools/ecm-tools.SlackBuild
+++ b/system/ecm-tools/ecm-tools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ecm-tools
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ecm-tools
 VERSION=${VERSION:-1.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -83,4 +93,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ecofont-ttf/ecofont-ttf.SlackBuild b/system/ecofont-ttf/ecofont-ttf.SlackBuild
index b4c0371556..47edaa460e 100644
--- a/system/ecofont-ttf/ecofont-ttf.SlackBuild
+++ b/system/ecofont-ttf/ecofont-ttf.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ecofont-ttf
 
@@ -22,13 +22,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ecofont-ttf
 VERSION=${VERSION:-2.02}
 ARCH=noarch
 BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,4 +74,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ecryptfs-utils/README b/system/ecryptfs-utils/README
index 44fbafb7c2..3a4711448c 100644
--- a/system/ecryptfs-utils/README
+++ b/system/ecryptfs-utils/README
@@ -1,15 +1,16 @@
-eCryptfs is a cryptographic stacked Linux filesystem. eCryptfs stores
-cryptographic metadata in the header of each file written, so that encrypted
-files can be copied between hosts; the file will be decrypted with the proper
-key in the Linux kernel keyring. There is no need to keep track of any
-additional information aside from what is already in the encrypted file
-itself. You may think of eCryptfs as a sort of "gnupgfs", or "gnupg as a
-filesystem".
+eCryptfs is a cryptographic stacked Linux filesystem. eCryptfs
+stores cryptographic metadata in the header of each file written,
+so that encrypted files can be copied between hosts; the file will be
+decrypted with the proper key in the Linux kernel keyring. There is no
+need to keep track of any additional information aside from what is
+already in the encrypted file itself. You may think of eCryptfs as a
+sort of "gnupgfs", or "gnupg as a filesystem".
 
-On Slackware, the Slackbuild script does not install the mount helper binaries
-into /sbin, but to /usr/sbin. Because of this, using `mount -t ecryptfs` won't
-work, and you must call the `[u]mount.ecryptfs*` binaries explicitly.
+On Slackware, the Slackbuild script does not install the mount helper
+binaries into /sbin, but to /usr/sbin. Because of this, using `mount
+-t ecryptfs` won't work, and you must call the `[u]mount.ecryptfs*`
+binaries explicitly.
 
-For an unprivileged user to use the `[u]mount.ecryptfs_private` executables,
-it is necessary to set the suid bit on them, which the Slackbuild script also
-does not do.
+For an unprivileged user to use the `[u]mount.ecryptfs_private`
+executables, it is necessary to set the suid bit on them, which the
+Slackbuild script also does not do.
diff --git a/system/ecryptfs-utils/ecryptfs-utils.SlackBuild b/system/ecryptfs-utils/ecryptfs-utils.SlackBuild
index 27ba7c2bbb..0be38eceba 100644
--- a/system/ecryptfs-utils/ecryptfs-utils.SlackBuild
+++ b/system/ecryptfs-utils/ecryptfs-utils.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ecryptfs-utils
 
@@ -25,10 +25,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ecryptfs-utils
 VERSION=${VERSION:-111}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,6 +82,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p0 < $CWD/openssl.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -84,7 +96,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-pam \
   --enable-gpg \
-  --enable-tests \
+  --disable-tests \
   --build=$ARCH-slackware-linux
 make -j1 all check
 
@@ -102,8 +114,10 @@ cp -a AUTHORS INSTALL ChangeLog COPYING NEWS THANKS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ecryptfs-utils/openssl.patch b/system/ecryptfs-utils/openssl.patch
new file mode 100644
index 0000000000..5c3e419a91
--- /dev/null
+++ b/system/ecryptfs-utils/openssl.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c	2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c	2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++                 const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++   if (n != NULL)
++       *n = r->n;
++   if (e != NULL)
++       *e = r->e;
++   if (d != NULL)
++       *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ 	char *path;
+ 	char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ 	int len, nbits, ebits, i;
+ 	int nbytes, ebytes;
++	const BIGNUM *key_n, *key_e;
+ 	unsigned char *hash;
+ 	unsigned char *data = NULL;
+ 	int rc = 0;
+@@ -152,11 +167,13 @@
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	nbits = BN_num_bits(key->n);
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	nbits = BN_num_bits(key_n);
+ 	nbytes = nbits / 8;
+ 	if (nbits % 8)
+ 		nbytes++;
+-	ebits = BN_num_bits(key->e);
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	ebits = BN_num_bits(key_e);
+ 	ebytes = ebits / 8;
+ 	if (ebits % 8)
+ 		ebytes++;
+@@ -179,11 +196,13 @@
+ 	data[i++] = '\02';
+ 	data[i++] = (nbits >> 8);
+ 	data[i++] = nbits;
+-	BN_bn2bin(key->n, &(data[i]));
++	RSA_get0_key(key, &key_n, NULL, NULL);
++	BN_bn2bin(key_n, &(data[i]));
+ 	i += nbytes;
+ 	data[i++] = (ebits >> 8);
+ 	data[i++] = ebits;
+-	BN_bn2bin(key->e, &(data[i]));
++	RSA_get0_key(key, NULL, &key_e, NULL);
++	BN_bn2bin(key_e, &(data[i]));
+ 	i += ebytes;
+ 	SHA1(data, len + 3, hash);
+ 	to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ 	BIO *in = NULL;
+ 	int rc;
+ 
++	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	CRYPTO_malloc_init();
++	#endif
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_algorithms();
+ 	ENGINE_load_builtin_engines();
+
+
diff --git a/system/edid-decode/README b/system/edid-decode/README
index 71d34939f1..93ab5deae3 100644
--- a/system/edid-decode/README
+++ b/system/edid-decode/README
@@ -4,14 +4,14 @@ edid-decode decodes EDID monitor description data in human-readable
 format. Input may be raw binary files or ASCII text in various formats
 (see man page).
 
-EDID data may be read with get-edid (from the read-edid build) or from
-the /sys filesystem, e.g. /sys/class/drm/card0-HDMI-A-1/edid (the filename
-may vary on your system).
+EDID data may be read with get-edid (from the read-edid build) or
+from the /sys filesystem, e.g. /sys/class/drm/card0-HDMI-A-1/edid (the
+filename may vary on your system).
 
-Also, sample EDID data from various displays is included in the package.
-See "/usr/doc/edid-decode-$VERSION/data/".
+Also, sample EDID data from various displays is included in the
+package.  See "/usr/doc/edid-decode-$VERSION/data/".
 
-edid-decode does the same job as the parse-edid command from the read-edid
-build, but edid-decode shows more detailed info than parse-edid. Also,
-edid-decode is still under development as of December 2018, while
-read-edid was last updated in April 2015.
+edid-decode does the same job as the parse-edid command from the
+read-edid build, but edid-decode shows more detailed info than
+parse-edid. Also, edid-decode is still under development as of
+December 2020, while read-edid was last updated in April 2015.
diff --git a/system/edid-decode/edid-decode.SlackBuild b/system/edid-decode/edid-decode.SlackBuild
index 042b3e0dab..3372c0eeb3 100644
--- a/system/edid-decode/edid-decode.SlackBuild
+++ b/system/edid-decode/edid-decode.SlackBuild
@@ -1,17 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for edid-decode
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 # The version number comes from Debian. Ugly but informative.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=edid-decode
-VERSION=${VERSION:-0.1~git20180813.b2da1516}
+VERSION=${VERSION:-0.1~git20220315.cb74358c2896}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -21,7 +24,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -75,4 +82,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/edid-decode/edid-decode.info b/system/edid-decode/edid-decode.info
index e857915c55..d4a508bb7a 100644
--- a/system/edid-decode/edid-decode.info
+++ b/system/edid-decode/edid-decode.info
@@ -1,10 +1,10 @@
 PRGNAM="edid-decode"
-VERSION="0.1~git20180813.b2da1516"
+VERSION="0.1~git20220315.cb74358c2896"
 HOMEPAGE="https://git.linuxtv.org/edid-decode.git/"
-DOWNLOAD="http://deb.debian.org/debian/pool/main/e/edid-decode/edid-decode_0.1~git20180813.b2da1516.orig.tar.xz"
-MD5SUM="e2515d4fc7bd4426951a34bcd028bce3"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/e/edid-decode/edid-decode_0.1~git20220315.cb74358c2896.orig.tar.xz"
+MD5SUM="b8ba8484c99a6333bc45abff19c42112"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/edk2-aarch64/README b/system/edk2-aarch64/README
new file mode 100644
index 0000000000..ab927afef3
--- /dev/null
+++ b/system/edk2-aarch64/README
@@ -0,0 +1,4 @@
+edk2-aarch64 (aarch64 UEFI firmware for Qemu)
+
+These binaries are required to emulate aarch64 machines
+on QEMU.
diff --git a/system/edk2-aarch64/edk2-aarch64.SlackBuild b/system/edk2-aarch64/edk2-aarch64.SlackBuild
new file mode 100644
index 0000000000..e184a4dc79
--- /dev/null
+++ b/system/edk2-aarch64/edk2-aarch64.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/bash
+#
+# Slackware build script for edk2-aarch64
+#
+# Copyright 2023 Lockywolf
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=edk2-aarch64
+VERSION=${VERSION:-20230524}
+FEDVER=${FEDVER:-3.fc38}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+rpm2cpio $CWD/$PRGNAM-$VERSION-$FEDVER.noarch.rpm | cpio -idmv
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/share
+cp -r usr/share/edk2/aarch64/ $PKG/usr/share/edk2-aarch64
+# Firmware-loading specifications; the files do not conflict with Qemu.
+cp -r usr/share/qemu $PKG/usr/share/qemu
+#cp -r usr/share/AAVMF $PKG/usr/share/AAVMF
+mkdir -p $PKG/usr/share/AAVMF
+sed -i 's|edk2/aarch64|edk2-aarch64|g' $PKG/usr/share/qemu/firmware/*aarch64*
+(cd $PKG
+( cd usr/share/AAVMF ; rm -rf AAVMF_CODE.fd )
+( cd usr/share/AAVMF ; ln -sf ../edk2-aarch64/QEMU_EFI-silent-pflash.raw AAVMF_CODE.fd )
+( cd usr/share/AAVMF ; rm -rf AAVMF_CODE.verbose.fd )
+( cd usr/share/AAVMF ; ln -sf ../edk2-aarch64/QEMU_EFI-pflash.raw AAVMF_CODE.verbose.fd )
+( cd usr/share/AAVMF ; rm -rf AAVMF_VARS.fd )
+( cd usr/share/AAVMF ; ln -sf ../edk2-aarch64/vars-template-pflash.raw AAVMF_VARS.fd )
+)
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp usr/share/licenses/edk2-aarch64//* $PKG/usr/doc/$PRGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/edk2-aarch64/edk2-aarch64.info b/system/edk2-aarch64/edk2-aarch64.info
new file mode 100644
index 0000000000..920082efae
--- /dev/null
+++ b/system/edk2-aarch64/edk2-aarch64.info
@@ -0,0 +1,10 @@
+PRGNAM="edk2-aarch64"
+VERSION="20230524"
+HOMEPAGE="https://github.com/tianocore/edk2/tree/master/ArmVirtPkg"
+DOWNLOAD="https://kojipkgs.fedoraproject.org/packages/edk2/20230524/3.fc38/noarch/edk2-aarch64-20230524-3.fc38.noarch.rpm"
+MD5SUM="2f3f99087bdfc14ecec0dbcae5a782f6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.edk2-avmf_2023-10-31@lockywolf.net"
diff --git a/system/edk2-aarch64/slack-desc b/system/edk2-aarch64/slack-desc
new file mode 100644
index 0000000000..5ff54159c3
--- /dev/null
+++ b/system/edk2-aarch64/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+edk2-aarch64: edk2-aarch64 (aarch64 UEFI firmware for Qemu)
+edk2-aarch64:
+edk2-aarch64: edk2-aarch64 provides aarch64 firmware and EFI for use with Qemu
+edk2-aarch64:
+edk2-aarch64:
+edk2-aarch64:
+edk2-aarch64:
+edk2-aarch64:
+edk2-aarch64:
+edk2-aarch64:
+edk2-aarch64:
diff --git a/system/edk2-ovmf/README b/system/edk2-ovmf/README
new file mode 100644
index 0000000000..bab6e62d06
--- /dev/null
+++ b/system/edk2-ovmf/README
@@ -0,0 +1,14 @@
+edk2-ovmf (Secure Boot enabled UEFI firmware for Qemu)
+
+edk2-ovmf provides Secure Boot enabled 64- and 32-bit UEFI firmware
+that can be used with Qemu, as well as EFI varstores with pre-enrolled
+Secure Boot keys. This allows for running virtual machines with
+operating systems that require Secure Boot on Qemu, such as Windows 11.
+
+Please note that, according to the TianoCore team, although the firmware
+is sufficient to run virtual machines, it does not provide the full
+protective capabilities of Secure Boot. See the whitepaper in the doc
+directory for details.
+
+Qemu needs to connect to TPM v2 in order to run Windows 11; see swtpm
+on SBo.
diff --git a/system/edk2-ovmf/edk2-ovmf.SlackBuild b/system/edk2-ovmf/edk2-ovmf.SlackBuild
new file mode 100644
index 0000000000..f12da413ae
--- /dev/null
+++ b/system/edk2-ovmf/edk2-ovmf.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/bash
+#
+# Slackware build script for edk2-ovmf
+#
+# Copyright 2023-2024 K. Eugene Carlson  Tsukuba, Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=edk2-ovmf
+VERSION=${VERSION:-202402}
+FEDVER=${FEDVER:-14-2.fc40}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+rpm2cpio $CWD/$PRGNAM-$VERSION$FEDVER.noarch.rpm | cpio -idmv
+rpm2cpio $CWD/$PRGNAM-ia32-$VERSION$FEDVER.noarch.rpm | cpio -idmv
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/share
+cp -r usr/share/edk2/ovmf $PKG/usr/share/edk2-ovmf-x64
+cp -r usr/share/edk2/ovmf-ia32 $PKG/usr/share/edk2-ovmf-ia32
+# Firmware-loading specifications; the files do not conflict with Qemu.
+cp -r usr/share/qemu $PKG/usr/share/qemu
+sed -i 's|edk2/ovmf|edk2-ovmf-x64|g' $PKG/usr/share/qemu/firmware/*x64*
+sed -i 's|edk2/ovmf|edk2-ovmf|g' $PKG/usr/share/qemu/firmware/*ia32*
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp usr/share/licenses/edk2-ovmf/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp usr/share/doc/edk2-ovmf/* $PKG/usr/doc/$PRGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/edk2-ovmf/edk2-ovmf.info b/system/edk2-ovmf/edk2-ovmf.info
new file mode 100644
index 0000000000..3df5cccb30
--- /dev/null
+++ b/system/edk2-ovmf/edk2-ovmf.info
@@ -0,0 +1,12 @@
+PRGNAM="edk2-ovmf"
+VERSION="202402"
+HOMEPAGE="https://github.com/tianocore/tianocore.github.io/wiki/OVMF"
+DOWNLOAD="https://kojipkgs.fedoraproject.org/packages/edk2/20240214/2.fc40/noarch/edk2-ovmf-20240214-2.fc40.noarch.rpm \
+          https://kojipkgs.fedoraproject.org/packages/edk2/20240214/2.fc40/noarch/edk2-ovmf-ia32-20240214-2.fc40.noarch.rpm"
+MD5SUM="236712d5db08e01dde16dde8e1797237 \
+        e919fa16b67cf12b9f976d76d838e020"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/edk2-ovmf/slack-desc b/system/edk2-ovmf/slack-desc
new file mode 100644
index 0000000000..51fff72ba3
--- /dev/null
+++ b/system/edk2-ovmf/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+edk2-ovmf: edk2-ovmf (Secure Boot enabled UEFI firmware for Qemu)
+edk2-ovmf:
+edk2-ovmf: edk2-ovmf provides Secure Boot enabled UEFI firmware that can be used
+edk2-ovmf: with Qemu.
+edk2-ovmf:
+edk2-ovmf:
+edk2-ovmf:
+edk2-ovmf:
+edk2-ovmf:
+edk2-ovmf:
+edk2-ovmf: Homepage: http://www.tianocore.org/ovmf/
diff --git a/system/efiboots/README b/system/efiboots/README
new file mode 100644
index 0000000000..d799279a7a
--- /dev/null
+++ b/system/efiboots/README
@@ -0,0 +1,3 @@
+efiboots is a Python/GTK3 application that acts as a frontend for
+efibootmgr. It provides an easy to use interface for managing
+UEFI boot options.
diff --git a/system/efiboots/doinst.sh b/system/efiboots/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/system/efiboots/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/efiboots/efiboots-1.0-fix-python-exception.patch b/system/efiboots/efiboots-1.0-fix-python-exception.patch
new file mode 100644
index 0000000000..6900f0fd0a
--- /dev/null
+++ b/system/efiboots/efiboots-1.0-fix-python-exception.patch
@@ -0,0 +1,12 @@
+diff -Naur efiboots-1.0.orig/efiboots.py efiboots-1.0/efiboots.py
+--- efiboots-1.0.orig/efiboots.py	2022-04-12 01:36:59.888996574 -0400
++++ efiboots-1.0/efiboots.py	2022-04-12 01:37:32.991997960 -0400
+@@ -272,7 +272,7 @@
+ 			boot = run_efibootmgr()
+ 		except subprocess.CalledProcessError as e:
+ 			logging.exception("Error running efibootmgr. Please check that it is correctly installed.")
+-			error_dialog(parent=self.window, title="efibootmgr utility not installed!", message="Please check that the efibootmgr utility is correctly installed, as this program requires its output.\n" + e)
++			error_dialog(parent=self.window, title="efibootmgr utility not installed!", message="Please check that the efibootmgr utility is correctly installed, as this program requires its output.\n" + e.output)
+ 			sys.exit(-1)
+ 		except UnicodeDecodeError as e:
+ 			logging.exception("Error decoding efibootmgr -v output.")
diff --git a/system/efiboots/efiboots.SlackBuild b/system/efiboots/efiboots.SlackBuild
new file mode 100644
index 0000000000..e27d593921
--- /dev/null
+++ b/system/efiboots/efiboots.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+# Slackware build script for efiboots
+
+# Copyright © 2022 Logan Rathbone <poprocks@gmail.com> Province of Ontario,
+# Canada.
+#
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=efiboots
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+# fix python exception crash if efibootmgr throws an error
+patch -p1 < $CWD/efiboots-1.0-fix-python-exception.patch
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE README* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/efiboots/efiboots.info b/system/efiboots/efiboots.info
new file mode 100644
index 0000000000..091eaea5d4
--- /dev/null
+++ b/system/efiboots/efiboots.info
@@ -0,0 +1,10 @@
+PRGNAM="efiboots"
+VERSION="1.0"
+HOMEPAGE="https://github.com/Elinvention/efiboots"
+DOWNLOAD="https://github.com/Elinvention/efiboots/archive/refs/tags/1.0/efiboots-1.0.tar.gz"
+MD5SUM="a3e5fc6372638a007aa4aebbf2f7fcbd"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Logan Rathbone"
+EMAIL="poprocks@gmail.com"
diff --git a/system/efiboots/slack-desc b/system/efiboots/slack-desc
new file mode 100644
index 0000000000..ecd1511708
--- /dev/null
+++ b/system/efiboots/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+efiboots: efiboots (GTK3 frontend for efibootmgr)
+efiboots:
+efiboots: efiboots is a Python/GTK3 application that acts as a frontend for
+efiboots: efibootmgr. It provides an easy to use interface for managing
+efiboots: UEFI boot options.
+efiboots:
+efiboots: homepage: https://github.com/Elinvention/efiboots
+efiboots:
+efiboots:
+efiboots:
+efiboots:
diff --git a/system/efitools/README b/system/efitools/README
index 796f9b00d2..d10aac7922 100644
--- a/system/efitools/README
+++ b/system/efitools/README
@@ -1,17 +1,33 @@
+## README efitools
 efitools is a set of tools for manipulating EFI secure boot platforms.
 
 If you ever plan to use LockDown.efi (it's an EFI program that
-installs a predefined set of Secure Boot keys if you run it while your
-machine is in setup mode) you will want to use your own Secure Boot
-keys and maybe specify an owner GUID (in hex). The keys should be placed
-in the SlackBuild directory and named:
+installs a predefined set of Secure Boot keys if you run it while
+your machine is in setup mode) you will want to use your own Secure
+Boot keys and maybe specify an owner GUID (in hex). The keys should
+be placed in the SlackBuild directory and named:
 Platform Key public/private keys - PK.crt, PK.key
 Key Exchange public/private keys - KEK.crt, KEK.key
 Signature Database public/private keys - DB.crt, DB.key
 
 and the SlackBuild should be executed using:
 
-GUID=xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx USE_KEYS=yes ./efitools.SlackBuild
+GUID=xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx USE_KEYS=yes \
+  ./efitools.SlackBuild
 
-It's unlikely that you'll use LockDown.efi and there are alternate methods
-to do what it does, so it's fine just to ignore it.
+efitool-mkusb to make a bootable usbstick, the process will delete
+all files on the usbstick.
+
+It's unlikely that you'll use LockDown.efi and there are alternate
+methods to do what it does, so it's fine just to ignore it.
+
+WARNING!!!! PLEASE MAKE SURE YOU KNOW EXACTLY WHAT YOU ARE DOING
+BEFORE PROCEEDING.
+
+SlackBuilds.org 2023 accepts no liability for any issues caused by
+using this software. The software is provided as is and requires a
+working knowledge, of setting up
+secure booting and keys.
+
+For information how to use this software for secure/boot on Linux
+please see the included. README.Secure_Boot
diff --git a/system/efitools/README.Secure_Boot b/system/efitools/README.Secure_Boot
new file mode 100644
index 0000000000..41a45914c8
--- /dev/null
+++ b/system/efitools/README.Secure_Boot
@@ -0,0 +1,116 @@
+## README_Secure_Boot
+
+WARNING!!!! PLEASE MAKE SURE YOU KNOW EXACTLY WHAT YOU ARE DOING BEFORE PROCEEDING.
+
+SlackBuilds.org 2023 accepts no liability for any issues caused by
+using this software. The software is provided as is and requires
+a working knowledge, of setting up secure booting and keys.
+
+
+How to use these files
+
+simply typing make will build you everything including sample certificates for
+PK, KEK and db.
+
+The prerequisites are the standard development environment,
+gnu-efi version 3.0q or later, help2man and sbsigntools.
+
+There will be one file called LockDown.efi.  If run on your
+efi platform in Setup Mode, this binary will *replace* all the
+values in thePK, KEK and db
+variables with the ones you just generated and place the platform
+back into User Mode (booting securely).  If you don't
+want to replace allthe variables, take a dump of your current
+variables,
+see sig-list-to-cert(1), and add them
+to the EFI signature list files before creating LockDown.efi
+
+Say you want to concatenate an existing platform-db.esl file,
+do this:
+
+make DB.esl
+cat platform.esl DB.esl > newDB.esl
+mv newDB.esl DB.esl
+
+and then make LockDown.efi in the usual way.
+
+All of the EFI programs are also generated in signed form
+(signed by both db and KEK).
+
+
+Loader.efi
+==========
+
+This EFI binary is created to boot an unsigned EFI file on the
+platform. Since this explicitly breaks the security of the
+platform, it will first check to see if the boot binary is
+naturally executable and execute it if it is
+(either it's properly signed or the platform isn't in Secure
+Boot mode).
+
+If the binary gives an EFI_ACCESS_DENIED error meaning it
+isn't properly signed,
+Loader.efi will request present user authorisation before
+proceeding to boot.
+
+The idea is that Loader.efi may serve as a chain for elilo.efi
+or another boot loader on distributed linux live and install
+CDs and even as
+the boot loader for the distribution on the hard disk
+assuming the user does not wish to take control of the platform
+and replace the keys.
+
+To build a secure bootable CD, simply use Loader.efi as the usual
+/efi/boot/bootX64.efi and place the usual loader in the same
+directory as the file boot.efi.
+
+In order to add further convenience, if the user places
+the platform in setup mode and re-runs the loader,
+it will ask permission to add the signature the unsigned
+boot loader, boot.efi, to the authorised signatures
+database, meaningLoader.efi will now no longer
+ask for present user authorisation every time the system is
+started.
+
+
+Creating, using and installing your own keys
+============================================
+
+To create PEM files with the certificate and the key for PK for
+example, do
+
+openssl req -new -x509 -newkey rsa:2048 -subj "/CN=PK/" -keyout \
+PK.key -out PK.crt -days 3650 -nodes -sha256
+
+Which will create a self signed X509 certificate for PK in PK.crt
+(using unprotected key PK.key with the subject common name PK
+(that's what the CN=PK is doing).
+
+You need to create at least three sets of certificates: one for PK,
+one for KEK and one for db.
+
+Now you need to take all the efi binaries in
+/usr/share/efitools/efi and sign them with your own db key
+using,
+sbsign --key db.key --cert db.crt --output \
+HelloWorld-signed.efi HelloWorld.efi
+
+To install your new keys on the platform, first create your
+authorised update bundles:
+
+cert-to-sig-list PK.crt PK.esl
+sign-efi-sig-list -k PK.key -c PK.crt PK PK.esl PK.auth
+
+And repeat for KEK and db.  In setup mode, it only matters that
+the PK update PK.auth is signed by the new platform key.
+None of the other variables will have their signatures checked.
+
+Now on your platform update the variables, remembering to do PK
+last because an update to PK usually puts the platform
+into secure mode
+
+UpdateVars db db.auth
+UpdateVars KEK KEK.auth
+UpdateVars PK PK.auth
+
+And you should now be running in secure mode with your own keys.
diff --git a/system/efitools/efitools.SlackBuild b/system/efitools/efitools.SlackBuild
index b2f041bed3..6670f971bd 100644
--- a/system/efitools/efitools.SlackBuild
+++ b/system/efitools/efitools.SlackBuild
@@ -1,10 +1,12 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for efitools
 
 # Copyright 2015 Jonathan Li
 # All rights reserved.
 #
+# With changes made by Sam Wright December 2023
+#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -22,30 +24,40 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=efitools
-VERSION=${VERSION:-1.5.3}
+VERSION=${VERSION:-1.9.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 MYGUID=${MYGUID:-11111111-2222-3333-4444-123456789abc}
 USE_KEYS=${USE_KEYS:-no}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # It's not safe to specify build flags since some EFI programs are built.
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
   EFI_ARCH=ia32
 elif [ "$ARCH" = "i686" ]; then
@@ -93,6 +105,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# https://github.com/vathpela/gnu-efi/commit/d34132e62f666904158c7ec2f1eef5a9d5281c36
+sed -i "s|EFI_WARN_UNKOWN_GLYPH|EFI_WARN_UNKNOWN_GLYPH|" lib/console.c
+
 make \
   CRTPATH=/usr/lib${LIBDIRSUFFIX}/gnuefi \
   MYGUID=${MYGUID} \
@@ -114,11 +129,11 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cd $PKG/usr/share/efitools
-mv README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+mv README README_Secure_Boot COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$PKGARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$PKGARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/efitools/efitools.info b/system/efitools/efitools.info
index 8946a7cacf..c2dbacddce 100644
--- a/system/efitools/efitools.info
+++ b/system/efitools/efitools.info
@@ -1,10 +1,10 @@
 PRGNAM="efitools"
-VERSION="1.5.3"
+VERSION="1.9.2"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/efitools-1.5.3.tar.gz"
-MD5SUM="19ed4d83cfbb10987b84fca5a744715a"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/efitools-1.9.2.tar.gz"
+MD5SUM="a3a3f04ed6aa5486c97dd206edeebe0a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-File-Slurp sbsigntools"
-MAINTAINER="Jonathan Li"
-EMAIL="jonathan dot li at hotmail dot co dot uk"
+MAINTAINER="Sam Wright"
+EMAIL="proaudiomanuk@gmail.com"
diff --git a/system/efitools/slack-desc b/system/efitools/slack-desc
index f29b47e2c8..a93ab08e6a 100644
--- a/system/efitools/slack-desc
+++ b/system/efitools/slack-desc
@@ -9,7 +9,7 @@
 efitools: efitools (Tools for manipulating UEFI secure boot platforms)
 efitools:
 efitools: efitools is a set of tools for manipulating EFI secure boot platforms.
-efitools:
+efitools: and make a efi boot usb-stick.
 efitools:
 efitools:
 efitools:
diff --git a/system/eibd/README b/system/eibd/README
index 1aa3c662d6..8badc49cd2 100644
--- a/system/eibd/README
+++ b/system/eibd/README
@@ -1,5 +1,6 @@
-The BCU SDK is a free development environment for BCU1 and BCU2 devices for the
-KNX home automation bus (formerly known as the European Installation Bus, EIB).
+The BCU SDK is a free development environment for BCU1 and BCU2
+devices for the KNX home automation bus (formerly known as the
+European Installation Bus, EIB).
 
 The eibd daemon is the key component of the BCU SDK. It provides an
 interface to the EIB/KNX bus. It supports the following backends:
@@ -11,4 +12,5 @@ interface to the EIB/KNX bus. It supports the following backends:
 Eibd provides APIs for various programming languages and a number of
 example programs written in C.
 
-A sample startup script for Slackware is provided along with the SlackBuild.
+A sample startup script for Slackware is provided along with the
+SlackBuild.
diff --git a/system/eibd/eibd.SlackBuild b/system/eibd/eibd.SlackBuild
index 41d8466b80..96c223e4e9 100644
--- a/system/eibd/eibd.SlackBuild
+++ b/system/eibd/eibd.SlackBuild
@@ -1,30 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for eibd.
 
 # Written by V'yacheslav Stetskevych
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=eibd
 SRCNAM=bcusdk
 VERSION=${VERSION:-0.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -89,4 +99,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/eibd/eibd.info b/system/eibd/eibd.info
index 1c9a77cff6..d22565d8d9 100644
--- a/system/eibd/eibd.info
+++ b/system/eibd/eibd.info
@@ -1,7 +1,7 @@
 PRGNAM="eibd"
 VERSION="0.0.4"
 HOMEPAGE="http://www.auto.tuwien.ac.at/~mkoegler/index.php/eibd"
-DOWNLOAD="http://www.auto.tuwien.ac.at/~mkoegler/eib/bcusdk_0.0.4.tar.gz"
+DOWNLOAD="http://distcache.freebsd.org/ports-distfiles/bcusdk_0.0.4.tar.gz"
 MD5SUM="14138f457d6530bf45cf6a966fde9d5f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/elasticsearch/README b/system/elasticsearch/README
index 4d20f2c192..ae3c8aac9a 100644
--- a/system/elasticsearch/README
+++ b/system/elasticsearch/README
@@ -2,7 +2,8 @@ ElasticSearch
 
 A Distributed RESTful Search Engine
 
-ElasticSearch is a distributed RESTful search engine built for the cloud.
+ElasticSearch is a distributed RESTful search engine built for the
+cloud.
 
 Features include:
 
@@ -23,7 +24,8 @@ Various set of APIs
 
 Document oriented
   No need for upfront schema definition.
-  Schema can be defined per type for customization of the indexing process.
+  Schema can be defined per type for customization of the indexing
+  process.
 
 Reliable, Asynchronous Write Behind for long term persistency.
 (Near) Real Time Search.
@@ -37,7 +39,9 @@ Per operation consistency
   Single document level operations are atomic, consistent, isolated
   and durable.
 
-This script requires a 'elasticsearch' user/group to exist before running.
-The recommended UID/GID is 280. You can create these like so:
+This script requires a 'elasticsearch' user/group to exist before
+running.  The recommended UID/GID is 280. You can create these like
+so:
+
 groupadd -g 280 elasticsearch
 useradd -u 280 -g elasticsearch -s /bin/sh elasticsearch
diff --git a/system/elasticsearch/elasticsearch.SlackBuild b/system/elasticsearch/elasticsearch.SlackBuild
index 52399ed13e..99c0d453d3 100644
--- a/system/elasticsearch/elasticsearch.SlackBuild
+++ b/system/elasticsearch/elasticsearch.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ElasticSearch
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=elasticsearch
 VERSION=${VERSION:-1.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ES_USER=${ES_USER:-elasticsearch}
 ES_UID=${ES_UID:-280}
@@ -34,19 +37,26 @@ ES_GID=${ES_GID:-280}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -121,4 +131,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/elasticsearch/elasticsearch.info b/system/elasticsearch/elasticsearch.info
index de673df40c..dc7cb4bdc3 100644
--- a/system/elasticsearch/elasticsearch.info
+++ b/system/elasticsearch/elasticsearch.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://download.elasticsearch.org/elasticsearch/elasticsearch/elastic
 MD5SUM="8766b54a2d9c5349acca19deb958c192"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Daniel Romero"
 EMAIL="infoslack@gmail.com"
diff --git a/system/elo-mt-usb/README b/system/elo-mt-usb/README
deleted file mode 100644
index 60bfd1d678..0000000000
--- a/system/elo-mt-usb/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Driver for ELO multitouch USB conected touch screen.
-This is the proprietary driver; wget cannot be used for downloading
-the 'source' package. You have to use a browser and accept
-the license.
diff --git a/system/elo-mt-usb/doinst.sh b/system/elo-mt-usb/doinst.sh
deleted file mode 100644
index 9ea0e9e46d..0000000000
--- a/system/elo-mt-usb/doinst.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-preserve_perms etc/rc.d/rc.elo-mt-usb.new
-config etc/elo/eloconfig.new
-rm -f etc/elo/eloconfig.new
-
-chroot . /sbin/modprobe
diff --git a/system/elo-mt-usb/elo-mt-usb.SlackBuild b/system/elo-mt-usb/elo-mt-usb.SlackBuild
deleted file mode 100644
index ed72f1d25b..0000000000
--- a/system/elo-mt-usb/elo-mt-usb.SlackBuild
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for elo-mt-usb
-
-# Copyright 2018 Jan F. Chadima <jfch@jagda.eu>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=elo-mt-usb
-VERSION=${VERSION:-2.5.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-KERN=${KERN:-"$(uname -r)"}
-PKGVER="$(printf %s "${VERSION}_${KERN}" | tr - _)"
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf elo-mt-usb
-case "$ARCH" in
-  i?86)
-    tar xvf $CWD/SW602616_Elo_Linux_MT_USB_Driver_v${VERSION}_i686.tgz
-    ;;
-  x86_64)
-    tar xvf $CWD/SW602617_Elo_Linux_MT_USB_Driver_v${VERSION}_x86_64.tgz
-    ;;
-#  arm*)
-#    tar xvf $CWD/SW602618_Elo_Linux_MT_USB_Driver_v${VERSION}_armv7l.tgz
-#    ;;
-  *)
-    echo "Unsupported architecture" >&2
-    exit 1
-esac
-cd bin-mt-usb
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-cd elo_mt_input_mod_src
-
-  # Add source of the module
-  mkdir -p $PKG/usr/src/elo-mt-usb
-  install -m 644 Makefile $PKG/usr/src/elo-mt-usb
-  install -m 644 elo_mt_input.c $PKG/usr/src/elo-mt-usb
-
-  # Make module and install it
-  make CFLAGS="$SLKCFLAGS" KDIR=/lib/modules/$KERN/build
-  mkdir -p $PKG/lib/modules/$KERN/elo-mt-usb
-  install -m 644 elo_mt_input_mod.ko $PKG/lib/modules/$KERN/elo-mt-usb/
-
-cd -
-
-# Install udev rules
-mkdir -p $PKG/lib/udev/rules.d
-install -m 644 99-elotouch.rules $PKG/lib/udev/rules.d/
-
-# Prepare "directory" for drivers and eloconfig
-mkdir -p $PKG/etc/opt
-mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/elo-mt-usb
-ln -s ../../usr/lib$LIBDIRSUFFIX/elo-mt-usb $PKG/etc/opt
-
-mkdir -p $PKG/etc/elo
-touch $PKG/etc/elo/eloconfig.new
-ln -s ../../etc/elo $PKG/usr/lib$LIBDIRSUFFIX/elo-mt-usb/
-
-# Patch cpl program
-hexdump -ve '1/1 "%.2X"' cpl | sed "s/6C6962586D2E736F2E33/6C6962586D2E736F2E34/g" | xxd -r -p > cpl.patched
-
-# Install content to a separate directory
-install -s -m 755 cpl.patched $PKG/usr/lib$LIBDIRSUFFIX/elo-mt-usb/cpl
-install -s -m 755 cplcmd $PKG/usr/lib$LIBDIRSUFFIX/elo-mt-usb/
-install -s -m 755 elomtusbd $PKG/usr/lib$LIBDIRSUFFIX/elo-mt-usb/
-install -s -m 755 elova $PKG/usr/lib$LIBDIRSUFFIX/elo-mt-usb/
-
-# Install rc.script
-mkdir -p $PKG/etc/rc.d
-install -m 755 $CWD/rc.elo-mt-usb.new $PKG/etc/rc.d
-
-# Create /usr/bin programs
-mkdir -p $PKG/usr/bin
-
-cat > $PKG/usr/bin/cpl << EOF
-#!/bin/sh
-
-exec /etc/opt/elo-mt-usb/cpl
-EOF
-chmod +x $PKG/usr/bin/cpl
-ln -s cpl $PKG/usr/bin/touchscreen_setup
-ln -s cpl $PKG/usr/bin/touchscreen_setup.elo-mt-usb
-
-cat > $PKG/usr/bin/cplcmd << EOF
-#!/bin/sh
-
-exec /etc/opt/elo-mt-usb/cplcmd
-EOF
-chmod +x $PKG/usr/bin/cplcmd
-
-cat > $PKG/usr/bin/elova << EOF
-#!/bin/sh
-
-exec /etc/opt/elo-mt-usb/elova
-EOF
-chmod +x $PKG/usr/bin/elova
-ln -s elova $PKG/usr/bin/touchscreen_calibrate
-ln -s elova $PKG/usr/bin/touchscreen_calibrate.elo-mt-usb
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  readme.txt Elo_OEM_\&_EU_LA.txt Elo-Linux-MT-USB-Driver_List-of-New-Features.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/*
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/elo-mt-usb/elo-mt-usb.info b/system/elo-mt-usb/elo-mt-usb.info
deleted file mode 100644
index 1a81600e24..0000000000
--- a/system/elo-mt-usb/elo-mt-usb.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="elo-mt-usb"
-VERSION="2.5.0"
-HOMEPAGE="https://support.elotouch.com/TechnicalSupport/Drivers/Linux/"
-DOWNLOAD="http://support.elotouch.com/download/Drivers/DriverDownload/SW602616_Elo_Linux_MT_USB_Driver_v2.5.0_i686.tgz"
-MD5SUM="f77eb5e3ce75acb6ed6ceb9ef1132ed6"
-DOWNLOAD_x86_64="http://support.elotouch.com/download/Drivers/DriverDownload/SW602617_Elo_Linux_MT_USB_Driver_v2.5.0_x86_64.tgz"
-MD5SUM_x86_64="47d55760f200b66b1b930d28c411fb25"
-REQUIRES=""
-MAINTAINER="Jan F. Chadima"
-EMAIL="jfch@jagda.eu"
diff --git a/system/elo-mt-usb/rc.elo-mt-usb.new b/system/elo-mt-usb/rc.elo-mt-usb.new
deleted file mode 100644
index 14b884617b..0000000000
--- a/system/elo-mt-usb/rc.elo-mt-usb.new
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# rc script for elo-mt-usb touch screen driver
-#
-# Avoid being interrupted by child or keyboard
-#
-trap "echo" SIGINT SIGSEGV SIGQUIT SIGTERM
-set +e
-
-case "$1" in
-  start)
-    # Create Elo Devices for communication
-
-    mode="776"		# Why is it group writtable ?
-    elo_usb_device_path="/dev/elo-mt-usb/"
-    elo_usb_rspfifo="rsp_fifo"
-    elo_usb_cmdfifo="cmd_fifo"
-
-    rm -f $elo_usb_device_path$elo_usb_cmdfifo
-    rm -f $elo_usb_device_path$elo_usb_rspfifo
-
-    mkdir -p $elo_usb_device_path
-
-    mkfifo $elo_usb_device_path$elo_usb_rspfifo
-    mkfifo $elo_usb_device_path$elo_usb_cmdfifo
-
-    chmod $mode $elo_usb_device_path$elo_usb_cmdfifo
-    chmod $mode $elo_usb_device_path$elo_usb_rspfifo
-
-    # Load the Elo kernel module [input device driver]
-    modprobe elo_mt_input_mod
-
-    # Load the PC speaker kernel module into memory for Beep-On-Touch
-    #modprobe pcspkr
-
-    sleep 1		# Why?
-
-    # Load the Elo USB Touchscreen Daemon into memory
-    /etc/opt/elo-mt-usb/elomtusbd
-  ;;
-  stop)
-  ;;
-  *)
-    echo "Usage: $0 {start}" >&2
-    exit 1
-esac
diff --git a/system/elo-mt-usb/slack-desc b/system/elo-mt-usb/slack-desc
deleted file mode 100644
index 20f69ef64d..0000000000
--- a/system/elo-mt-usb/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-          |-----handy-ruler------------------------------------------------------|
-elo-mt-usb: elo-mt-usb (driver for elo multitouch screen controllers over USB)
-elo-mt-usb:
-elo-mt-usb: Proprietary driver for the Elo multitouch touch screen.
-elo-mt-usb: Version for USB connected devices.
-elo-mt-usb:
-elo-mt-usb:
-elo-mt-usb:
-elo-mt-usb:
-elo-mt-usb:
-elo-mt-usb:
-elo-mt-usb:
diff --git a/system/eltclsh/README b/system/eltclsh/README
index 7e996206e6..f8c7d5bb62 100644
--- a/system/eltclsh/README
+++ b/system/eltclsh/README
@@ -1,8 +1,9 @@
-eltclsh (editline tcl shell) is an interactive shell for the TCL programming
-language. It provides command line editing, history browsing as well as
-variables and command completion thanks to editline features. The completion
-engine is programmable in a way similar to tcsh, and comes with an intelligent
-completion for the full tcl language by default.
+eltclsh (editline tcl shell) is an interactive shell for the TCL
+programming language. It provides command line editing, history
+browsing as well as variables and command completion thanks to
+editline features. The completion engine is programmable in a way
+similar to tcsh, and comes with an intelligent completion for the full
+tcl language by default.
 
 The package also provides elwish, an interactive interpreter for the Tk
 toolkit.
diff --git a/system/eltclsh/eltclsh.SlackBuild b/system/eltclsh/eltclsh.SlackBuild
index a4fb49b150..bb86271625 100644
--- a/system/eltclsh/eltclsh.SlackBuild
+++ b/system/eltclsh/eltclsh.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for eltclsh
 
-# Copyright 2016,2018 Khronosschoty
+# Copyright 2016,2018,2022 Khronosschoty
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=eltclsh
-VERSION=${VERSION:-1.17}
+VERSION=${VERSION:-1.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -92,8 +102,10 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/eltclsh/eltclsh.info b/system/eltclsh/eltclsh.info
index 131202e41f..792aa8a6c8 100644
--- a/system/eltclsh/eltclsh.info
+++ b/system/eltclsh/eltclsh.info
@@ -1,10 +1,10 @@
 PRGNAM="eltclsh"
-VERSION="1.17"
+VERSION="1.18"
 HOMEPAGE="http://homepages.laas.fr/mallet/soft/shell/eltclsh"
-DOWNLOAD="http://distfiles.openrobots.org/eltclsh/eltclsh-1.17.tar.gz"
-MD5SUM="e698f5969970feafeff934b1294a37c0"
+DOWNLOAD="http://distfiles.openrobots.org/eltclsh/eltclsh-1.18.tar.gz"
+MD5SUM="f4d5982491b13072a90fffbf0bb37fd5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libedit"
+REQUIRES=""
 MAINTAINER="Khronosschoty"
 EMAIL="khronosschoty@posteo.org"
diff --git a/system/em/README b/system/em/README
index e897683250..bcecf3313f 100644
--- a/system/em/README
+++ b/system/em/README
@@ -2,5 +2,5 @@ Em is a terminal tool that prints FILE(s), or standard input to
 standard output and highlights the expressions that are matched
 the PATTERN.
 
-The expression will be highlighted iff stdout refers to the tty
+The expression will be highlighted if stdout refers to a tty
 and that tty is ANSI-compatible.
diff --git a/system/em/em.SlackBuild b/system/em/em.SlackBuild
index c512440709..d9e087a51e 100644
--- a/system/em/em.SlackBuild
+++ b/system/em/em.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for em
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=em
 VERSION=${VERSION:-0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,11 +72,11 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
-python setup.py install --root=$PKG
+python2 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -83,4 +90,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/em/em.info b/system/em/em.info
index 3e24f09c4e..8c09ee0b20 100644
--- a/system/em/em.info
+++ b/system/em/em.info
@@ -1,7 +1,7 @@
 PRGNAM="em"
 VERSION="0.4"
 HOMEPAGE="http://em.readthedocs.org/"
-DOWNLOAD="https://github.com/ikalnitsky/em/archive/0.4.tar.gz"
+DOWNLOAD="https://github.com/ikalnitsky/em/archive/0.4/em-0.4.tar.gz"
 MD5SUM="a1ab1d1d87491e1881657817492e80bd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/em/slack-desc b/system/em/slack-desc
index 8521f01376..2b6d485eb6 100644
--- a/system/em/slack-desc
+++ b/system/em/slack-desc
@@ -12,7 +12,7 @@ em: Em is a terminal tool that prints FILE(s), or standard input
 em: to standard output and highlights the expressions that are
 em: matched the PATTERN.
 em:
-em: The expression will be highlighted iff the terminal is
+em: The expression will be highlighted if the terminal is
 em: is ANSI-compatible.
 em:
 em: Homepage: http://em.readthedocs.org/
diff --git a/system/emelfm2/emelfm2.SlackBuild b/system/emelfm2/emelfm2.SlackBuild
index e617d17a43..ab97e5b2bf 100644
--- a/system/emelfm2/emelfm2.SlackBuild
+++ b/system/emelfm2/emelfm2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for emelFM2
 
@@ -22,26 +22,36 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=emelfm2
 VERSION=${VERSION:-0.9.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -64,11 +74,13 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+CFLAGS="$SLKCFLAGS -fcommon" \
+CXXFLAGS="$SLKCFLAGS" \
 make \
   PREFIX=/usr \
   USE_LATEST=1 \
@@ -91,13 +103,11 @@ for i in 24 32 48 ; do
   )
 done
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -110,4 +120,4 @@ if [ "$ARCH" = "x86_64" ]; then
 fi
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/encfs/encfs-openssl-1.1.patch b/system/encfs/encfs-openssl-1.1.patch
deleted file mode 100644
index 95d57bf235..0000000000
--- a/system/encfs/encfs-openssl-1.1.patch
+++ /dev/null
@@ -1,350 +0,0 @@
-diff --git a/encfs/SSL_Cipher.cpp b/encfs/SSL_Cipher.cpp
-index e9ba424..4d14755 100644
---- a/encfs/SSL_Cipher.cpp
-+++ b/encfs/SSL_Cipher.cpp
-@@ -36,6 +36,7 @@
- #include "Interface.h"
- #include "Mutex.h"
- #include "Range.h"
-+#include "SSL_Compat.h"
- #include "SSL_Cipher.h"
- #include "intl/gettext.h"
- 
-@@ -74,19 +75,19 @@ int BytesToKey(int keyLen, int ivLen, const EVP_MD *md,
-   int nkey = key ? keyLen : 0;
-   int niv = iv ? ivLen : 0;
- 
--  EVP_MD_CTX cx;
--  EVP_MD_CTX_init(&cx);
-+  EVP_MD_CTX *cx = EVP_MD_CTX_new();
-+  EVP_MD_CTX_init(cx);
- 
-   for (;;) {
--    EVP_DigestInit_ex(&cx, md, NULL);
--    if (addmd++) EVP_DigestUpdate(&cx, mdBuf, mds);
--    EVP_DigestUpdate(&cx, data, dataLen);
--    EVP_DigestFinal_ex(&cx, mdBuf, &mds);
-+    EVP_DigestInit_ex(cx, md, NULL);
-+    if (addmd++) EVP_DigestUpdate(cx, mdBuf, mds);
-+    EVP_DigestUpdate(cx, data, dataLen);
-+    EVP_DigestFinal_ex(cx, mdBuf, &mds);
- 
-     for (unsigned int i = 1; i < rounds; ++i) {
--      EVP_DigestInit_ex(&cx, md, NULL);
--      EVP_DigestUpdate(&cx, mdBuf, mds);
--      EVP_DigestFinal_ex(&cx, mdBuf, &mds);
-+      EVP_DigestInit_ex(cx, md, NULL);
-+      EVP_DigestUpdate(cx, mdBuf, mds);
-+      EVP_DigestFinal_ex(cx, mdBuf, &mds);
-     }
- 
-     int offset = 0;
-@@ -106,7 +107,7 @@ int BytesToKey(int keyLen, int ivLen, const EVP_MD *md,
-     }
-     if ((nkey == 0) && (niv == 0)) break;
-   }
--  EVP_MD_CTX_cleanup(&cx);
-+  EVP_MD_CTX_free(cx);
-   OPENSSL_cleanse(mdBuf, sizeof(mdBuf));
- 
-   return keyLen;
-@@ -229,12 +230,12 @@ class SSLKey : public AbstractCipherKey {
-   // followed by iv of _ivLength bytes,
-   unsigned char *buffer;
- 
--  EVP_CIPHER_CTX block_enc;
--  EVP_CIPHER_CTX block_dec;
--  EVP_CIPHER_CTX stream_enc;
--  EVP_CIPHER_CTX stream_dec;
-+  EVP_CIPHER_CTX *block_enc;
-+  EVP_CIPHER_CTX *block_dec;
-+  EVP_CIPHER_CTX *stream_enc;
-+  EVP_CIPHER_CTX *stream_dec;
- 
--  HMAC_CTX mac_ctx;
-+  HMAC_CTX *mac_ctx;
- 
-   SSLKey(int keySize, int ivLength);
-   ~SSLKey();
-@@ -251,11 +252,16 @@ SSLKey::SSLKey(int keySize_, int ivLength_) {
-   // kernel patch is applied..
-   mlock(buffer, keySize + ivLength);
- 
--  EVP_CIPHER_CTX_init(&block_enc);
--  EVP_CIPHER_CTX_init(&block_dec);
--  EVP_CIPHER_CTX_init(&stream_enc);
--  EVP_CIPHER_CTX_init(&stream_dec);
--  HMAC_CTX_init(&mac_ctx);
-+  block_enc = EVP_CIPHER_CTX_new();
-+  EVP_CIPHER_CTX_init(block_enc);
-+  block_dec = EVP_CIPHER_CTX_new();
-+  EVP_CIPHER_CTX_init(block_dec);
-+  stream_enc = EVP_CIPHER_CTX_new();
-+  EVP_CIPHER_CTX_init(stream_enc);
-+  stream_dec = EVP_CIPHER_CTX_new();
-+  EVP_CIPHER_CTX_init(stream_dec);
-+  mac_ctx = HMAC_CTX_new();
-+  HMAC_CTX_reset(mac_ctx);
- }
- 
- SSLKey::~SSLKey() {
-@@ -268,12 +274,11 @@ SSLKey::~SSLKey() {
-   ivLength = 0;
-   buffer = 0;
- 
--  EVP_CIPHER_CTX_cleanup(&block_enc);
--  EVP_CIPHER_CTX_cleanup(&block_dec);
--  EVP_CIPHER_CTX_cleanup(&stream_enc);
--  EVP_CIPHER_CTX_cleanup(&stream_dec);
--
--  HMAC_CTX_cleanup(&mac_ctx);
-+  EVP_CIPHER_CTX_free(block_enc);
-+  EVP_CIPHER_CTX_free(block_dec);
-+  EVP_CIPHER_CTX_free(stream_enc);
-+  EVP_CIPHER_CTX_free(stream_dec);
-+  HMAC_CTX_free(mac_ctx);
- 
-   pthread_mutex_destroy(&mutex);
- }
-@@ -290,27 +295,27 @@ void initKey(const std::shared_ptr<SSLKey> &key, const EVP_CIPHER *_blockCipher,
-   Lock lock(key->mutex);
-   // initialize the cipher context once so that we don't have to do it for
-   // every block..
--  EVP_EncryptInit_ex(&key->block_enc, _blockCipher, NULL, NULL, NULL);
--  EVP_DecryptInit_ex(&key->block_dec, _blockCipher, NULL, NULL, NULL);
--  EVP_EncryptInit_ex(&key->stream_enc, _streamCipher, NULL, NULL, NULL);
--  EVP_DecryptInit_ex(&key->stream_dec, _streamCipher, NULL, NULL, NULL);
--
--  EVP_CIPHER_CTX_set_key_length(&key->block_enc, _keySize);
--  EVP_CIPHER_CTX_set_key_length(&key->block_dec, _keySize);
--  EVP_CIPHER_CTX_set_key_length(&key->stream_enc, _keySize);
--  EVP_CIPHER_CTX_set_key_length(&key->stream_dec, _keySize);
--
--  EVP_CIPHER_CTX_set_padding(&key->block_enc, 0);
--  EVP_CIPHER_CTX_set_padding(&key->block_dec, 0);
--  EVP_CIPHER_CTX_set_padding(&key->stream_enc, 0);
--  EVP_CIPHER_CTX_set_padding(&key->stream_dec, 0);
--
--  EVP_EncryptInit_ex(&key->block_enc, NULL, NULL, KeyData(key), NULL);
--  EVP_DecryptInit_ex(&key->block_dec, NULL, NULL, KeyData(key), NULL);
--  EVP_EncryptInit_ex(&key->stream_enc, NULL, NULL, KeyData(key), NULL);
--  EVP_DecryptInit_ex(&key->stream_dec, NULL, NULL, KeyData(key), NULL);
--
--  HMAC_Init_ex(&key->mac_ctx, KeyData(key), _keySize, EVP_sha1(), 0);
-+  EVP_EncryptInit_ex(key->block_enc, _blockCipher, NULL, NULL, NULL);
-+  EVP_DecryptInit_ex(key->block_dec, _blockCipher, NULL, NULL, NULL);
-+  EVP_EncryptInit_ex(key->stream_enc, _streamCipher, NULL, NULL, NULL);
-+  EVP_DecryptInit_ex(key->stream_dec, _streamCipher, NULL, NULL, NULL);
-+
-+  EVP_CIPHER_CTX_set_key_length(key->block_enc, _keySize);
-+  EVP_CIPHER_CTX_set_key_length(key->block_dec, _keySize);
-+  EVP_CIPHER_CTX_set_key_length(key->stream_enc, _keySize);
-+  EVP_CIPHER_CTX_set_key_length(key->stream_dec, _keySize);
-+
-+  EVP_CIPHER_CTX_set_padding(key->block_enc, 0);
-+  EVP_CIPHER_CTX_set_padding(key->block_dec, 0);
-+  EVP_CIPHER_CTX_set_padding(key->stream_enc, 0);
-+  EVP_CIPHER_CTX_set_padding(key->stream_dec, 0);
-+
-+  EVP_EncryptInit_ex(key->block_enc, NULL, NULL, KeyData(key), NULL);
-+  EVP_DecryptInit_ex(key->block_dec, NULL, NULL, KeyData(key), NULL);
-+  EVP_EncryptInit_ex(key->stream_enc, NULL, NULL, KeyData(key), NULL);
-+  EVP_DecryptInit_ex(key->stream_dec, NULL, NULL, KeyData(key), NULL);
-+
-+  HMAC_Init_ex(key->mac_ctx, KeyData(key), _keySize, EVP_sha1(), 0);
- }
- 
- SSL_Cipher::SSL_Cipher(const Interface &iface_, const Interface &realIface_,
-@@ -451,8 +456,8 @@ static uint64_t _checksum_64(SSLKey *key, const unsigned char *data,
-   unsigned char md[EVP_MAX_MD_SIZE];
-   unsigned int mdLen = EVP_MAX_MD_SIZE;
- 
--  HMAC_Init_ex(&key->mac_ctx, 0, 0, 0, 0);
--  HMAC_Update(&key->mac_ctx, data, dataLen);
-+  HMAC_Init_ex(key->mac_ctx, 0, 0, 0, 0);
-+  HMAC_Update(key->mac_ctx, data, dataLen);
-   if (chainedIV) {
-     // toss in the chained IV as well
-     uint64_t tmp = *chainedIV;
-@@ -462,10 +467,10 @@ static uint64_t _checksum_64(SSLKey *key, const unsigned char *data,
-       tmp >>= 8;
-     }
- 
--    HMAC_Update(&key->mac_ctx, h, 8);
-+    HMAC_Update(key->mac_ctx, h, 8);
-   }
- 
--  HMAC_Final(&key->mac_ctx, md, &mdLen);
-+  HMAC_Final(key->mac_ctx, md, &mdLen);
- 
-   rAssert(mdLen >= 8);
- 
-@@ -636,10 +641,10 @@ void SSL_Cipher::setIVec(unsigned char *ivec, uint64_t seed,
-     }
- 
-     // combine ivec and seed with HMAC
--    HMAC_Init_ex(&key->mac_ctx, 0, 0, 0, 0);
--    HMAC_Update(&key->mac_ctx, ivec, _ivLength);
--    HMAC_Update(&key->mac_ctx, md, 8);
--    HMAC_Final(&key->mac_ctx, md, &mdLen);
-+    HMAC_Init_ex(key->mac_ctx, 0, 0, 0, 0);
-+    HMAC_Update(key->mac_ctx, ivec, _ivLength);
-+    HMAC_Update(key->mac_ctx, md, 8);
-+    HMAC_Final(key->mac_ctx, md, &mdLen);
-     rAssert(mdLen >= _ivLength);
- 
-     memcpy(ivec, md, _ivLength);
-@@ -731,17 +736,17 @@ bool SSL_Cipher::streamEncode(unsigned char *buf, int size, uint64_t iv64,
-   shuffleBytes(buf, size);
- 
-   setIVec(ivec, iv64, key);
--  EVP_EncryptInit_ex(&key->stream_enc, NULL, NULL, NULL, ivec);
--  EVP_EncryptUpdate(&key->stream_enc, buf, &dstLen, buf, size);
--  EVP_EncryptFinal_ex(&key->stream_enc, buf + dstLen, &tmpLen);
-+  EVP_EncryptInit_ex(key->stream_enc, NULL, NULL, NULL, ivec);
-+  EVP_EncryptUpdate(key->stream_enc, buf, &dstLen, buf, size);
-+  EVP_EncryptFinal_ex(key->stream_enc, buf + dstLen, &tmpLen);
- 
-   flipBytes(buf, size);
-   shuffleBytes(buf, size);
- 
-   setIVec(ivec, iv64 + 1, key);
--  EVP_EncryptInit_ex(&key->stream_enc, NULL, NULL, NULL, ivec);
--  EVP_EncryptUpdate(&key->stream_enc, buf, &dstLen, buf, size);
--  EVP_EncryptFinal_ex(&key->stream_enc, buf + dstLen, &tmpLen);
-+  EVP_EncryptInit_ex(key->stream_enc, NULL, NULL, NULL, ivec);
-+  EVP_EncryptUpdate(key->stream_enc, buf, &dstLen, buf, size);
-+  EVP_EncryptFinal_ex(key->stream_enc, buf + dstLen, &tmpLen);
- 
-   dstLen += tmpLen;
-   if (dstLen != size) {
-@@ -765,17 +770,17 @@ bool SSL_Cipher::streamDecode(unsigned char *buf, int size, uint64_t iv64,
-   int dstLen = 0, tmpLen = 0;
- 
-   setIVec(ivec, iv64 + 1, key);
--  EVP_DecryptInit_ex(&key->stream_dec, NULL, NULL, NULL, ivec);
--  EVP_DecryptUpdate(&key->stream_dec, buf, &dstLen, buf, size);
--  EVP_DecryptFinal_ex(&key->stream_dec, buf + dstLen, &tmpLen);
-+  EVP_DecryptInit_ex(key->stream_dec, NULL, NULL, NULL, ivec);
-+  EVP_DecryptUpdate(key->stream_dec, buf, &dstLen, buf, size);
-+  EVP_DecryptFinal_ex(key->stream_dec, buf + dstLen, &tmpLen);
- 
-   unshuffleBytes(buf, size);
-   flipBytes(buf, size);
- 
-   setIVec(ivec, iv64, key);
--  EVP_DecryptInit_ex(&key->stream_dec, NULL, NULL, NULL, ivec);
--  EVP_DecryptUpdate(&key->stream_dec, buf, &dstLen, buf, size);
--  EVP_DecryptFinal_ex(&key->stream_dec, buf + dstLen, &tmpLen);
-+  EVP_DecryptInit_ex(key->stream_dec, NULL, NULL, NULL, ivec);
-+  EVP_DecryptUpdate(key->stream_dec, buf, &dstLen, buf, size);
-+  EVP_DecryptFinal_ex(key->stream_dec, buf + dstLen, &tmpLen);
- 
-   unshuffleBytes(buf, size);
- 
-@@ -796,7 +801,7 @@ bool SSL_Cipher::blockEncode(unsigned char *buf, int size, uint64_t iv64,
-   rAssert(key->ivLength == _ivLength);
- 
-   // data must be integer number of blocks
--  const int blockMod = size % EVP_CIPHER_CTX_block_size(&key->block_enc);
-+  const int blockMod = size % EVP_CIPHER_CTX_block_size(key->block_enc);
-   if (blockMod != 0)
-     throw Error("Invalid data size, not multiple of block size");
- 
-@@ -807,9 +812,9 @@ bool SSL_Cipher::blockEncode(unsigned char *buf, int size, uint64_t iv64,
-   int dstLen = 0, tmpLen = 0;
-   setIVec(ivec, iv64, key);
- 
--  EVP_EncryptInit_ex(&key->block_enc, NULL, NULL, NULL, ivec);
--  EVP_EncryptUpdate(&key->block_enc, buf, &dstLen, buf, size);
--  EVP_EncryptFinal_ex(&key->block_enc, buf + dstLen, &tmpLen);
-+  EVP_EncryptInit_ex(key->block_enc, NULL, NULL, NULL, ivec);
-+  EVP_EncryptUpdate(key->block_enc, buf, &dstLen, buf, size);
-+  EVP_EncryptFinal_ex(key->block_enc, buf + dstLen, &tmpLen);
-   dstLen += tmpLen;
- 
-   if (dstLen != size) {
-@@ -828,7 +833,7 @@ bool SSL_Cipher::blockDecode(unsigned char *buf, int size, uint64_t iv64,
-   rAssert(key->ivLength == _ivLength);
- 
-   // data must be integer number of blocks
--  const int blockMod = size % EVP_CIPHER_CTX_block_size(&key->block_dec);
-+  const int blockMod = size % EVP_CIPHER_CTX_block_size(key->block_dec);
-   if (blockMod != 0)
-     throw Error("Invalid data size, not multiple of block size");
- 
-@@ -839,9 +844,9 @@ bool SSL_Cipher::blockDecode(unsigned char *buf, int size, uint64_t iv64,
-   int dstLen = 0, tmpLen = 0;
-   setIVec(ivec, iv64, key);
- 
--  EVP_DecryptInit_ex(&key->block_dec, NULL, NULL, NULL, ivec);
--  EVP_DecryptUpdate(&key->block_dec, buf, &dstLen, buf, size);
--  EVP_DecryptFinal_ex(&key->block_dec, buf + dstLen, &tmpLen);
-+  EVP_DecryptInit_ex(key->block_dec, NULL, NULL, NULL, ivec);
-+  EVP_DecryptUpdate(key->block_dec, buf, &dstLen, buf, size);
-+  EVP_DecryptFinal_ex(key->block_dec, buf + dstLen, &tmpLen);
-   dstLen += tmpLen;
- 
-   if (dstLen != size) {
-diff --git a/encfs/SSL_Compat.h b/encfs/SSL_Compat.h
-new file mode 100644
-index 0000000..f7b1629
---- /dev/null
-+++ b/encfs/SSL_Compat.h
-@@ -0,0 +1,52 @@
-+/*****************************************************************************
-+ * Author:   Rogelio Dominguez Hernandez <rogelio.dominguez@gmail.com>
-+ *
-+ *****************************************************************************
-+ * Copyright (c) 2016, Rogelio Dominguez Hernandez
-+ *
-+ * This program is free software: you can redistribute it and/or modify it
-+ * under the terms of the GNU Lesser General Public License as published by the
-+ * Free Software Foundation, either version 3 of the License, or (at your
-+ * option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-+ * for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef _SSL_Compat_incl_
-+#define _SSL_Compat_incl_
-+
-+// OpenSSL < 1.1.0
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+
-+// Equivalent methods
-+#define EVP_MD_CTX_new EVP_MD_CTX_create
-+#define EVP_MD_CTX_free EVP_MD_CTX_destroy
-+#define HMAC_CTX_reset HMAC_CTX_cleanup
-+
-+// Missing methods (based on 1.1.0 versions)
-+HMAC_CTX *HMAC_CTX_new(void)
-+{
-+  HMAC_CTX *ctx = (HMAC_CTX *)OPENSSL_malloc(sizeof(HMAC_CTX));
-+  if (ctx != NULL) {
-+    memset(ctx, 0, sizeof(HMAC_CTX));
-+    HMAC_CTX_reset(ctx);
-+  }
-+  return ctx;
-+}
-+
-+void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+  if (ctx != NULL) {
-+    HMAC_CTX_cleanup(ctx);
-+    OPENSSL_free(ctx);
-+  }
-+}
-+#endif
-+
-+#endif
-diff --git a/encfs/encfssh b/encfs/encfssh
-old mode 100755
-new mode 100644
-
diff --git a/system/encfs/encfs.SlackBuild b/system/encfs/encfs.SlackBuild
index aaf0e3538f..d6dff42a4b 100644
--- a/system/encfs/encfs.SlackBuild
+++ b/system/encfs/encfs.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for encfs
 
-# Copyright 2007-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2007-2021 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,21 +11,24 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=encfs
-VERSION=${VERSION:-1.9.1}
+VERSION=${VERSION:-1.9.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,9 +79,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix building against openssl 1.1
-patch -p1 -i $CWD/encfs-openssl-1.1.patch
-
 mkdir -p build
 cd build
   cmake \
@@ -102,4 +109,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/encfs/encfs.info b/system/encfs/encfs.info
index dbdbeeeaa9..7d51a45e9d 100644
--- a/system/encfs/encfs.info
+++ b/system/encfs/encfs.info
@@ -1,10 +1,10 @@
 PRGNAM="encfs"
-VERSION="1.9.1"
+VERSION="1.9.5"
 HOMEPAGE="https://vgough.github.io/encfs/"
-DOWNLOAD="https://github.com/vgough/encfs/releases/download/v1.9.1/encfs-1.9.1.tar.gz"
-MD5SUM="7cbf9cc3c5af49b46703ce6ba70d22a4"
+DOWNLOAD="https://github.com/vgough/encfs/releases/download/v1.9.5/encfs-1.9.5.tar.gz"
+MD5SUM="0244c6a6c0399a068c02ea078ce393d1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="tinyxml2"
 MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+EMAIL="pprkut@slackbuilds.org"
diff --git a/system/entr/entr.SlackBuild b/system/entr/entr.SlackBuild
index 275bbf4d1f..122010ab42 100644
--- a/system/entr/entr.SlackBuild
+++ b/system/entr/entr.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for entr
 
-# Copyright 2014-2020 Kent Fritz, Mountain View, CA
+# Copyright 2014-2022 Kent Fritz, Mountain View, CA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=entr
-VERSION=${VERSION:-4.6}
+VERSION=${VERSION:-5.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -86,4 +96,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/entr/entr.info b/system/entr/entr.info
index e789b0c1fd..10dd307e5a 100644
--- a/system/entr/entr.info
+++ b/system/entr/entr.info
@@ -1,8 +1,8 @@
 PRGNAM="entr"
-VERSION="4.6"
-HOMEPAGE="http://entrproject.org"
-DOWNLOAD="http://entrproject.org/code/entr-4.6.tar.gz"
-MD5SUM="e91417c7096bb94cbe8a8d2976223cb8"
+VERSION="5.3"
+HOMEPAGE="http://eradman.com/entrproject"
+DOWNLOAD="http://eradman.com/entrproject/code/entr-5.3.tar.gz"
+MD5SUM="824b606a63e7b7c50dd4fb26cf34214b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild
index 88dbdefd43..8f179cca53 100644
--- a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild
+++ b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for escpr
 
@@ -24,11 +24,14 @@
 
 # Update by: blizzack <slackbuilds@blizzack.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=epson-inkjet-printer-escpr
 VERSION=${VERSION:-1.7.8}
 TARNAM=$PRGNAM-$VERSION-1lsb3.2.tar.gz
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -94,8 +104,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp $CWD/LICENSE.html COPYING README INSTALL AUTHORS ChangeLog NEWS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/epson-inkjet-printer-escpr2/README.models b/system/epson-inkjet-printer-escpr2/README.models
index 3db13f693f..6a93c06132 100644
--- a/system/epson-inkjet-printer-escpr2/README.models
+++ b/system/epson-inkjet-printer-escpr2/README.models
@@ -1,35 +1,50 @@
 EC-4020 Series, EC-4030 Series, EC-4040 Series, EC-C7000 Series
 EP-50V Series, EP-879A Series, EP-880A Series, EP-881A Series
-EP-882A Series, EP-883A Series, EP-982A3 Series, ET-15000 Series
-ET-16150 Series, ET-16600 Series, ET-16650 Series, ET-3700 Series
-ET-3710 Series, ET-3750 Series, ET-3760 Series, ET-4750 Series
-ET-4760 Series, ET-5150 Series, ET-5170 Series, ET-5800 Series
-ET-5850 Series, ET-5880 Series, ET-8700 Series, ET-M1140 Series
-ET-M1170 Series, ET-M1180 Series, ET-M16600 Series, ET-M2140 Series
+EP-882A Series, EP-883A Series, EP-884A Series, EP-885A Series
+EP-982A3 Series, ET-15000 Series, ET-16150 Series, ET-16600 Series
+ET-16650 Series, ET-16680 Series, ET-18100 Series, ET-2830 Series
+ET-2840 Series, ET-3700 Series, ET-3710 Series, ET-3750 Series
+ET-3760 Series, ET-3800 Series, ET-3830 Series, ET-3840 Series
+ET-3850 Series, ET-4750 Series, ET-4760 Series, ET-4810 Series
+ET-4850 Series, ET-5150 Series, ET-5170 Series, ET-5180 Series
+ET-5800 Series, ET-5850 Series, ET-5880 Series, ET-8500 Series
+ET-8550 Series, ET-8700 Series, ET-M1140 Series, ET-M1170 Series
+ET-M1180 Series, ET-M16600 Series, ET-M16680 Series, ET-M2140 Series
 ET-M2170 Series, ET-M3140 Series, ET-M3170 Series, ET-M3180 Series
-EW-M530F Series, EW-M5610FT Series, EW-M630T Series, EW-M670FT Series
-EW-M752T Series, EW-M873T Series, EW-M973A3T Series, L11160 Series
-L14150 Series, L15150 Series, L15160 Series, L6160 Series, L6170 Series
-L6190 Series, L6550 Series, L6570 Series, L6580 Series, M1140 Series
-M1170 Series, M1180 Series, M15140 Series, M2140 Series, M2170 Series
-M3140 Series, M3170 Series, M3180 Series, PM-520 Series
-PX-M270FT Series, PX-M270T Series, PX-M380F, PX-M381FL
-PX-M5080F Series, PX-M5081F Series, PX-M6010F Series, PX-M6011F Series
-PX-M6711FT Series, PX-M6712FT Series, PX-M680F Series, PX-M7070FX
-PX-M7080FX, PX-M7090FX, PX-M7110F, PX-M7110FP, PX-M730F Series
-PX-M780F Series, PX-M781F Series, PX-M791FT Series, PX-M880FX, PX-M884F
-PX-M885F, PX-M886FL, PX-S270T Series, PX-S380, PX-S381L
-PX-S5010 Series, PX-S5080 Series, PX-S6710T Series, PX-S7070X
-PX-S7090X, PX-S7110, PX-S7110P, PX-S880X, PX-S884, PX-S885
-ST-3000 Series, ST-4000 Series, ST-C8000 Series, ST-M1000 Series
-ST-M3000 Series, WF-2860 Series, WF-3720 Series, WF-3730 Series
-WF-3820 Series, WF-4720 Series, WF-4730 Series, WF-4740 Series
-WF-4820 Series, WF-4830 Series, WF-7210 Series, WF-7710 Series
-WF-7720 Series, WF-7820 Series, WF-7830 Series, WF-7840 Series
-WF-C5210 Series, WF-C5290 Series, WF-C5290BA, WF-C529R Series
-WF-C529RB, WF-C5710 Series, WF-C5790 Series, WF-C5790BA
-WF-C579R Series, WF-C579RB, WF-C8190 Series, WF-C8190B, WF-C8610 Series
-WF-C8690 Series, WF-C8690B, WF-C869R Series, WF-C878R Series, WF-C878RB
-WF-C879R Series, WF-C879RB, WF-M5298 Series, WF-M5299 Series
-WF-M5799 Series, XP-15000 Series, XP-5100 Series, XP-6000 Series
-XP-6100 Series, XP-8500 Series, XP-8600 Series, XP-970 Series
+EW-M530F Series, EW-M5610FT Series, EW-M630T Series, EW-M634T Series
+EW-M670FT Series, EW-M674FT Series, EW-M752T Series, EW-M754T Series
+EW-M873T Series, EW-M973A3T Series, L11160 Series, L14150 Series
+L15150 Series, L15160 Series, L15180 Series, L18050 Series
+L3550 Series, L3560 Series, L5590 Series, L6160 Series, L6170 Series
+L6190 Series, L6260 Series, L6270 Series, L6290 Series, L6460 Series
+L6490 Series, L6550 Series, L6570 Series, L6580 Series, L8050 Series
+L8160 Series, L8180 Series, M1140 Series, M1170 Series, M1180 Series
+M15140 Series, M15180 Series, M2140 Series, M2170 Series, M3140 Series
+M3170 Series, M3180 Series, PM-520 Series, PX-M270FT Series
+PX-M270T Series, PX-M380F, PX-M381FL, PX-M5080F Series
+PX-M5081F Series, PX-M6010F Series, PX-M6011F Series, PX-M6711FT Series
+PX-M6712FT Series, PX-M680F Series, PX-M7070FX, PX-M7080FX, PX-M7090FX
+PX-M7110F, PX-M7110FP, PX-M730F Series, PX-M780F Series
+PX-M781F Series, PX-M791FT Series, PX-M880FX, PX-M884F, PX-M885F
+PX-M886FL, PX-M887F, PX-S270T Series, PX-S380, PX-S381L
+PX-S5010 Series, PX-S5080 Series, PX-S6010 Series, PX-S6710T Series
+PX-S7070X, PX-S7090X, PX-S7110, PX-S7110P, PX-S730 Series, PX-S880X
+PX-S884, PX-S885, PX-S887, ST-3000 Series, ST-4000 Series
+ST-C4100 Series, ST-C8000 Series, ST-C8090 Series, ST-M1000 Series
+ST-M3000 Series, WF-2860 Series, WF-2880 Series, WF-2960 Series
+WF-3720 Series, WF-3730 Series, WF-3820 Series, WF-4720 Series
+WF-4730 Series, WF-4740 Series, WF-4820 Series, WF-4830 Series
+WF-7210 Series, WF-7310 Series, WF-7710 Series, WF-7720 Series
+WF-7820 Series, WF-7830 Series, WF-7840 Series, WF-C4310 Series
+WF-C4810 Series, WF-C5210 Series, WF-C5290 Series, WF-C5290BA
+WF-C5290BAM, WF-C529R Series, WF-C529RB, WF-C529RBAM, WF-C5310 Series
+WF-C5390 Series, WF-C5390BAM, WF-C5710 Series, WF-C5790 Series
+WF-C5790BA, WF-C5790BAM, WF-C579R Series, WF-C579RB, WF-C579RBAM
+WF-C5810 Series, WF-C5890 Series, WF-C5890BAM, WF-C8190 Series
+WF-C8190B, WF-C8610 Series, WF-C8690 Series, WF-C8690B, WF-C869R Series
+WF-C878R Series, WF-C878RB, WF-C879R Series, WF-C879RB, WF-C879RBAM
+WF-M4119 Series, WF-M4619 Series, WF-M5298 Series, WF-M5299 Series
+WF-M5299BAM, WF-M5799 Series, WF-M5799BAM, XP-15000 Series
+XP-5100 Series, XP-5150 Series, XP-5200 Series, XP-6000 Series
+XP-6100 Series, XP-8500 Series, XP-8600 Series, XP-8700 Series
+XP-970 Series
diff --git a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
index 55f2f47e2c..dd98940f61 100644
--- a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
+++ b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for escpr2
 
-# Copyright 2018-2020 Tim Dickson
+# Copyright 2018-2023 Tim Dickson
 # All rights reserved.
 #
 # thanks to Ruben Schuller for escpr slack build, which this is
@@ -27,14 +27,18 @@
 
 #note to self. paste list of supported models into first line of empty README.models
 #file. run sh ./fixrm to spread the model list evenly over as many lines as needed
-#also request upload of source to slackbuildsdirectlinks.
+#also upload source to slackbuildsdirectlinks, as epson keeps changing the url
+#of their own download link.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=epson-inkjet-printer-escpr2
-VERSION=${VERSION:-1.1.25}
-EXTRABIT=1lsb3.2
+VERSION=${VERSION:-1.2.9}
+EXTRABIT=1
 TARNAM=$PRGNAM-$VERSION-$EXTRABIT.tar.gz
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -44,15 +48,13 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
-#lets get the source tarball from the rpm and clean up the bits we don't need
-rpm2tgz $PRGNAM-$VERSION-$EXTRABIT.src.rpm
-tar -xzf $PRGNAM-$VERSION-$EXTRABIT.src.tgz
-cp $PRGNAM-$VERSION-$EXTRABIT/$PRGNAM-$VERSION-$EXTRABIT.tar.gz ./
-rm $PRGNAM-$VERSION-$EXTRABIT.src.tgz
-rm -r $PRGNAM-$VERSION-$EXTRABIT
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
 TMP=${TMP:-/tmp/SBo}
+EXTRACTTMP=${TMP}/epson-inkjet-printer-escpr2-src
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
@@ -73,13 +75,23 @@ fi
 set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
+mkdir -p $TMP $PKG $OUTPUT $EXTRACTTMP
+#lets get the source tarball from the rpm and clean up the bits we don't need
+cd $EXTRACTTMP
+rpm2tgz $CWD/$PRGNAM-$VERSION-$EXTRABIT.src.rpm
+tar -xzf $PRGNAM-$VERSION-$EXTRABIT.src.tgz
+#fix for dave and others whose rpm2tgz behaves differently. :-)
+if [ -e $PRGNAM-$VERSION-$EXTRABIT/$PRGNAM-$VERSION-$EXTRABIT.tar.gz ]; then
+  cp $PRGNAM-$VERSION-$EXTRABIT/$PRGNAM-$VERSION-$EXTRABIT.tar.gz ./
+fi
+rm -f $PRGNAM-$VERSION-$EXTRABIT.src.tgz
+rm -rf $PRGNAM-$VERSION-$EXTRABIT
+rm -f lsb-rpm.spec
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$TARNAM
-#we remove the tarnam as the original is an rpm
-#this keeps things tidy.
-rm $CWD/$TARNAM
+tar xvf $EXTRACTTMP/$TARNAM
+#lets remove our temp extraction directory
+rm -rf $EXTRACTTMP
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -107,12 +119,16 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $CWD/LICENCE.html COPYING COPYING.EPSON COPYING.LIB README INSTALL AUTHORS ChangeLog NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+#fix ownership of licence file.
+cp -a $CWD/LICENCE.html COPYING COPYING.EPSON COPYING.LIB README AUTHORS ChangeLog NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+chown root:root $PKG/usr/doc/$PRGNAM-$VERSION/LICENCE.html
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh >$PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info
index 38b8450014..ffb32306bc 100644
--- a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info
+++ b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info
@@ -1,8 +1,8 @@
 PRGNAM="epson-inkjet-printer-escpr2"
-VERSION="1.1.25"
+VERSION="1.2.9"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/epson-printer/epson-inkjet-printer-escpr2-1.1.25-1lsb3.2.src.rpm"
-MD5SUM="a4ed8267f0d9cecf144d142168b1fe45"
+DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/epson-printer/epson-inkjet-printer-escpr2-1.2.9-1.src.rpm"
+MD5SUM="6cd6c9d35866fa17f62893acb1d52c73"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/epson-printer-utility/README.models b/system/epson-printer-utility/README.models
index 0cc3c61591..243f65fba1 100644
--- a/system/epson-printer-utility/README.models
+++ b/system/epson-printer-utility/README.models
@@ -1,147 +1,167 @@
-, Artisan 1430, Artisan 50, Artisan 630, Artisan 700, Artisan 710
+Artisan 1430, Artisan 50, Artisan 630, Artisan 700, Artisan 710
 Artisan 720, Artisan 730, Artisan 800, Artisan 810, Artisan 830
 Artisan 837, E-150, E-200, E-300, E-330, E-330S, E-340, E-350
 E-360 Series, E-370 Series, E-500, E-520, E-530, E-530P, E-530S, E-600
 E-700, E-720, E-800, E-810, E-820, E-830 Series, E-840 Series
 E-850 Series, EC-4020 Series, EC-4030 Series, EC-4040 Series
 EC-C110 Series, EC-C7000 Series, EP-10VA Series, EP-302, EP-306 Series
-EP-30VA Series, EP-4004, EP-50V Series, EP-702A, EP-703A, EP-704A
-EP-705A Series, EP-706A Series, EP-707A Series, EP-708A Series
-EP-710A Series, EP-711A Series, EP-712A Series, EP-774A, EP-775A Series
+EP-30VA Series, EP-315 Series, EP-4004, EP-50V Series, EP-702A, EP-703A
+EP-704A, EP-705A Series, EP-706A Series, EP-707A Series, EP-708A Series
+EP-710A Series, EP-711A Series, EP-712A Series, EP-713A Series
+EP-714A Series, EP-715A Series, EP-716A Series, EP-774A, EP-775A Series
 EP-776A Series, EP-777A Series, EP-801A, EP-802A, EP-803A, EP-804A
 EP-805A Series, EP-806A Series, EP-807A Series, EP-808A Series
-EP-810A Series, EP-811A Series, EP-812A Series, EP-879A Series
-EP-880A Series, EP-881A Series, EP-882A Series, EP-901A, EP-901F
+EP-810A Series, EP-811A Series, EP-812A Series, EP-813A Series
+EP-814A Series, EP-815A Series, EP-816A Series, EP-879A Series
+EP-880A Series, EP-881A Series, EP-882A Series, EP-883A Series
+EP-884A Series, EP-885A Series, EP-886A Series, EP-901A, EP-901F
 EP-902A, EP-903A, EP-903F, EP-904A, EP-904F, EP-905A Series
 EP-905F Series, EP-906F Series, EP-907F Series, EP-976A3 Series
-EP-977A3 Series, EP-978A3 Series, EP-982A3 Series, EP-M552T Series
-EP-M570T Series, ET-1110 Series, ET-14000 Series, ET-15000 Series
-ET-16150 Series, ET-16600 Series, ET-16650 Series, ET-2500 Series
-ET-2550 Series, ET-2600 Series, ET-2610 Series, ET-2650 Series
-ET-2700 Series, ET-2710 Series, ET-2720 Series, ET-2750 Series
-ET-2760 Series, ET-3700 Series, ET-3710 Series, ET-3750 Series
-ET-3760 Series, ET-4500 Series, ET-4550 Series, ET-4700 Series
-ET-4750 Series, ET-4760 Series, ET-5800 Series, ET-5850 Series
-ET-5880 Series, ET-7700 Series, ET-7750 Series, ET-8700 Series
+EP-977A3 Series, EP-978A3 Series, EP-982A3 Series, EP-M476T Series
+EP-M552T Series, EP-M553T Series, EP-M570T Series, ET-1110 Series
+ET-14000 Series, ET-14100 Series, ET-15000 Series, ET-16150 Series
+ET-16600 Series, ET-16650 Series, ET-16680 Series, ET-1810 Series
+ET-18100 Series, ET-2400 Series, ET-2500 Series, ET-2550 Series
+ET-2600 Series, ET-2610 Series, ET-2650 Series, ET-2700 Series
+ET-2710 Series, ET-2720 Series, ET-2750 Series, ET-2760 Series
+ET-2800 Series, ET-2810 Series, ET-2820 Series, ET-2830 Series
+ET-2840 Series, ET-2850 Series, ET-3700 Series, ET-3710 Series
+ET-3750 Series, ET-3760 Series, ET-3800 Series, ET-3830 Series
+ET-3840 Series, ET-3850 Series, ET-4500 Series, ET-4550 Series
+ET-4700 Series, ET-4750 Series, ET-4760 Series, ET-4810 Series
+ET-4850 Series, ET-5150 Series, ET-5170 Series, ET-5180 Series
+ET-5800 Series, ET-5850 Series, ET-5880 Series, ET-7700 Series
+ET-7750 Series, ET-8500 Series, ET-8550 Series, ET-8700 Series
 ET-M1100 Series, ET-M1120 Series, ET-M1140 Series, ET-M1170 Series
-ET-M1180 Series, ET-M2120 Series, ET-M2140 Series, ET-M2170 Series
-ET-M3140 Series, ET-M3170 Series, ET-M3180 Series, EW-052A Series
-EW-452A Series, EW-M5071FT Series, EW-M5610FT Series, EW-M571T Series
-EW-M630T Series, EW-M660FT Series, EW-M670FT Series, EW-M752T Series
-EW-M770T Series, EW-M970A3T Series, K100, K200, K300, L110 Series
-L1110 Series, L11160 Series, L120 Series, L130 Series, L1300 Series
-L132 Series, L14150 Series, L1455 Series, L15150 Series, L15160 Series
-L1800 Series, L210 Series, L220 Series, L222 Series, L300 Series
+ET-M1180 Series, ET-M16600 Series, ET-M16680 Series, ET-M2120 Series
+ET-M2140 Series, ET-M2170 Series, ET-M3140 Series, ET-M3170 Series
+ET-M3180 Series, EW-052A Series, EW-452A Series, EW-M5071FT Series
+EW-M530F Series, EW-M5610FT Series, EW-M571T Series, EW-M630T Series
+EW-M634T Series, EW-M660FT Series, EW-M670FT Series, EW-M674FT Series
+EW-M752T Series, EW-M754T Series, EW-M770T Series, EW-M873T Series
+EW-M970A3T Series, EW-M973A3T Series, K100, K200, K300, L110 Series
+L11050 Series, L1110 Series, L11160 Series, L120 Series, L1210 Series
+L1250 Series, L130 Series, L1300 Series, L132 Series, L14150 Series
+L1455 Series, L15150 Series, L15160 Series, L15180 Series, L1800 Series
+L18050 Series, L210 Series, L220 Series, L222 Series, L300 Series
 L3050 Series, L3060 Series, L3070 Series, L310 Series, L3100 Series
-L3110 Series, L312 Series, L3150 Series, L3160 Series, L350 Series
-L355 Series, L360 Series, L362 Series, L364 Series, L365 Series
-L366 Series, L375 Series, L380 Series, L382 Series, L386 Series
-L395 Series, L396 Series, L405 Series, L4150 Series, L4160 Series
-L455 Series, L456 Series, L475 Series, L486 Series, L495 Series
-L5190 Series, L550 Series, L555 Series, L565 Series, L566 Series
-L575 Series, L605 Series, L6160 Series, L6170 Series, L6190 Series
-L655 Series, L6550 Series, L6570 Series, L6580 Series, L7160 Series
-L7180 Series, L800, L805 Series, L810 Series, L850 Series, LX-10000F
-LX-10000FK, LX-10050KF, LX-10050MF, LX-6050MF, LX-7000F, LX-7550MF
-M100 Series, M105 Series, M1100 Series, M1120 Series, M1140 Series
-M1170 Series, M1180 Series, M15140 Series, M200 Series, M205 Series
-M2110 Series, M2120 Series, M2140 Series, M2170 Series, M3140 Series
-M3170 Series, M3180 Series, ME 10, ME 200, ME 32, ME 320, ME 33, ME 330
-ME 340, ME OFFICE 520, ME OFFICE 530, ME OFFICE 560W, ME OFFICE 570
-ME OFFICE 620F, ME OFFICE 82WD, ME OFFICE 85ND, ME OFFICE 900WD
-ME OFFICE 940FW, ME OFFICE 960FWD, ME Office 510, ME Office 600F
-ME Office 650FN, ME Office 700FW, ME-10 Series, ME-100 Series
-ME-301 Series, ME-303 Series, ME-400 Series, NX130 TX130, NX230 TX230
-NX430 TX435, PF-70 Series, PF-71 Series, PF-81 Series, PM-400 Series
-PM-520 Series, PM-A750, PM-A820, PM-A840, PM-A840S, PM-A890, PM-A920
-PM-A940, PM-A950, PM-A970, PM-D600, PM-D800, PM-D870, PM-G4500, PM-G850
-PM-T960, PM-T990, PX-045A Series, PX-046A Series, PX-047A Series
-PX-048A Series, PX-105 Series, PX-1200, PX-1600F, PX-1700F, PX-203
-PX-204, PX-205 Series, PX-402A, PX-403A, PX-404A, PX-405A Series
-PX-434A, PX-435A Series, PX-436A Series, PX-437A Series, PX-501A
-PX-502A, PX-503A, PX-504A, PX-505F Series, PX-535F Series, PX-5600
-PX-5V, PX-601F, PX-602F, PX-603F, PX-605F Series, PX-673F
+L3110 Series, L312 Series, L3150 Series, L3160 Series, L3200 Series
+L3210 Series, L3250 Series, L3260 Series, L350 Series, L355 Series
+L3550 Series, L3560 Series, L360 Series, L362 Series, L364 Series
+L365 Series, L366 Series, L375 Series, L380 Series, L382 Series
+L386 Series, L395 Series, L396 Series, L405 Series, L4150 Series
+L4160 Series, L4260 Series, L455 Series, L456 Series, L475 Series
+L486 Series, L495 Series, L5190 Series, L5290 Series, L550 Series
+L555 Series, L5590 Series, L565 Series, L566 Series, L575 Series
+L605 Series, L6160 Series, L6170 Series, L6190 Series, L6260 Series
+L6270 Series, L6290 Series, L6460 Series, L6490 Series, L655 Series
+L6550 Series, L6570 Series, L6580 Series, L7160 Series, L7180 Series
+L800, L805 Series, L8050 Series, L810 Series, L8160 Series
+L8180 Series, L850 Series, LX-10000F, LX-10000FK, LX-10020M, LX-10050KF
+LX-10050MF, LX-6050MF, LX-7000F, LX-7550MF, M100 Series, M105 Series
+M1050 Series, M1100 Series, M1120 Series, M1140 Series, M1170 Series
+M1180 Series, M15140 Series, M15180 Series, M200 Series, M205 Series
+M2050 Series, M2110 Series, M2120 Series, M2140 Series, M2170 Series
+M3140 Series, M3170 Series, M3180 Series, ME 10, ME 200, ME 32, ME 320
+ME 33, ME 330, ME 340, ME OFFICE 520, ME OFFICE 530, ME OFFICE 560W
+ME OFFICE 570, ME OFFICE 620F, ME OFFICE 82WD, ME OFFICE 85ND
+ME OFFICE 900WD, ME OFFICE 940FW, ME OFFICE 960FWD, ME Office 510
+ME Office 600F, ME Office 650FN, ME Office 700FW, ME-10 Series
+ME-100 Series, ME-301 Series, ME-303 Series, ME-400 Series, NX130 TX130
+NX230 TX230, NX430 TX435, PF-70 Series, PF-71 Series, PF-81 Series
+PM-400 Series, PM-520 Series, PM-A750, PM-A820, PM-A840, PM-A840S
+PM-A890, PM-A920, PM-A940, PM-A950, PM-A970, PM-D600, PM-D800, PM-D870
+PM-G4500, PM-G850, PM-T960, PM-T990, PX-045A Series, PX-046A Series
+PX-047A Series, PX-048A Series, PX-105 Series, PX-1200, PX-1600F
+PX-1700F, PX-203, PX-204, PX-205 Series, PX-402A, PX-403A, PX-404A
+PX-405A Series, PX-434A, PX-435A Series, PX-436A Series, PX-437A Series
+PX-501A, PX-502A, PX-503A, PX-504A, PX-505F Series, PX-535F Series
+PX-5600, PX-5V, PX-601F, PX-602F, PX-603F, PX-605F Series, PX-673F
 PX-675F Series, PX-7V, PX-A620, PX-A640, PX-A650, PX-A720, PX-A740
 PX-B700, PX-B750F, PX-FA700, PX-G5300, PX-K100, PX-K150 Series
-PX-M160T Series, PX-M270FT Series, PX-M270T Series, PX-M270UT Series
-PX-M350F, PX-M380F, PX-M381FL, PX-M5040F, PX-M5041F, PX-M5080F Series
-PX-M5081F Series, PX-M650A, PX-M650F, PX-M6711FT Series
+PX-M160T Series, PX-M161T Series, PX-M270FT Series, PX-M270T Series
+PX-M270UT Series, PX-M350F, PX-M380F, PX-M381FL, PX-M382F, PX-M5040F
+PX-M5041F, PX-M5080F Series, PX-M5081F Series, PX-M6010F Series
+PX-M6011F Series, PX-M650A, PX-M650F, PX-M6711FT Series
 PX-M6712FT Series, PX-M680F Series, PX-M7050 Series, PX-M7050FP
 PX-M7050FX, PX-M7070FX, PX-M7080FX, PX-M7090FX, PX-M7110F, PX-M7110FP
-PX-M740F, PX-M741F, PX-M780F Series, PX-M781F Series, PX-M791FT Series
-PX-M840F, PX-M840FX, PX-M860F, PX-M880FX, PX-M884F, PX-M885F, PX-M886FL
-PX-S05 Series, PX-S06 Series, PX-S160T Series, PX-S170T Series
-PX-S170UT Series, PX-S270T Series, PX-S350, PX-S380, PX-S381L
-PX-S5010 Series, PX-S5040, PX-S5080 Series, PX-S7050 Series, PX-S7050PS
-PX-S7070X, PX-S7090X, PX-S7110, PX-S7110P, PX-S740, PX-S840, PX-S860
-PX-S880X, PX-S884, PX-S885, PictureMate 500, PictureMate Deluxe
-PictureMate PM 200, PictureMate PM 210, PictureMate PM 215
-PictureMate PM 225, PictureMate PM 235, PictureMate PM 240
-PictureMate PM 245, PictureMate PM 250, PictureMate PM 260
-PictureMate PM 270, PictureMate PM 280, PictureMate PM 290
-PictureMate PM 300, PictureMate PM 310, ST-2000 Series, ST-3000 Series
-ST-4000 Series, ST-C8000 Series, ST-M1000 Series, ST-M3000 Series
-Epson Stylus CX2800, Epson Stylus CX2900, Epson Stylus CX3700
-Epson Stylus CX3800, Epson Stylus CX3900, Epson Stylus CX4200
-Epson Stylus CX4800, Epson Stylus CX4900, Epson Stylus CX5000
-Epson Stylus CX5900, Epson Stylus CX6000, Epson Stylus CX7300
-Epson Stylus CX7400, Epson Stylus CX7700, Epson Stylus CX7800
-Epson Stylus CX8300, Epson Stylus CX8400, Epson Stylus CX9300F
-Epson Stylus CX9400Fax, Epson Stylus DX3800, Epson Stylus DX4000
-Epson Stylus DX4200, Epson Stylus DX4800, Epson Stylus DX5000
-Epson Stylus DX7400, Epson Stylus DX8400, Epson Stylus DX9400F
-Epson Stylus N10 N11, Epson Stylus NX110, Epson Stylus NX125 NX127
-Epson Stylus NX130, Epson Stylus NX200, Epson Stylus NX210
-Epson Stylus NX215, Epson Stylus NX230, Epson Stylus NX300
-Epson Stylus NX330, Epson Stylus NX400, Epson Stylus NX410
-Epson Stylus NX420, Epson Stylus NX430, Epson Stylus NX510
-Epson Stylus NX530, Epson Stylus NX620, Epson Stylus NX635
-Epson Stylus Office B42WD, Epson Stylus Office BX300F
-Epson Stylus Office BX305, Epson Stylus Office BX305 Plus
-Epson Stylus Office BX310FN, Epson Stylus Office BX320FW
-Epson Stylus Office BX525WD, Epson Stylus Office BX535WD
-Epson Stylus Office BX600FW, Epson Stylus Office BX610FW
-Epson Stylus Office BX620FWD, Epson Stylus Office BX630FW
-Epson Stylus Office BX635FWD, Epson Stylus Office BX925
-Epson Stylus Office BX935FWD, Epson Stylus Office TX300F
-Epson Stylus Office TX320F, Epson Stylus Office TX510FN
-Epson Stylus Office TX515FN, Epson Stylus Office TX525FW
-Epson Stylus Office TX600FW, Epson Stylus Office TX610FW
-Epson Stylus Office TX620FWD, Epson Stylus Photo 1400
-Epson Stylus Photo 1410, Epson Stylus Photo 1430
-Epson Stylus Photo 1500, Epson Stylus Photo P50
-Epson Stylus Photo PX650, Epson Stylus Photo PX660
-Epson Stylus Photo PX700W, Epson Stylus Photo PX710W
-Epson Stylus Photo PX720WD, Epson Stylus Photo PX730
-Epson Stylus Photo PX800FW, Epson Stylus Photo PX810FW
-Epson Stylus Photo PX820FWD, Epson Stylus Photo PX830
-Epson Stylus Photo R1900, Epson Stylus Photo R2000
-Epson Stylus Photo R240, Epson Stylus Photo R250
-Epson Stylus Photo R260, Epson Stylus Photo R265
-Epson Stylus Photo R270, Epson Stylus Photo R2880
-Epson Stylus Photo R3000, Epson Stylus Photo R340
-Epson Stylus Photo R350, Epson Stylus Photo R360
-Epson Stylus Photo R380, Epson Stylus Photo R390
-Epson Stylus Photo RX520, Epson Stylus Photo RX530
-Epson Stylus Photo RX560, Epson Stylus Photo RX580
-Epson Stylus Photo RX585, Epson Stylus Photo RX590
-Epson Stylus Photo RX595, Epson Stylus Photo RX610
-Epson Stylus Photo RX640, Epson Stylus Photo RX650
-Epson Stylus Photo RX680, Epson Stylus Photo RX685
-Epson Stylus Photo RX690, Epson Stylus Photo T50
-Epson Stylus Photo T60, Epson Stylus Photo TX650
-Epson Stylus Photo TX700W, Epson Stylus Photo TX710W
-Epson Stylus Photo TX720WD, Epson Stylus Photo TX730
-Epson Stylus Photo TX800FW, Epson Stylus Photo TX810FW
-Epson Stylus S21, Epson Stylus S22, Epson Stylus SX110
-Epson Stylus SX125, Epson Stylus SX130, Epson Stylus SX200
-Epson Stylus SX210, Epson Stylus SX215, Epson Stylus SX218
-Epson Stylus SX230, Epson Stylus SX235, Epson Stylus SX400
-Epson Stylus SX410, Epson Stylus SX420W, Epson Stylus SX430
-Epson Stylus SX440, Epson Stylus SX510W, Epson Stylus SX525WD
-Epson Stylus SX535WD, Epson Stylus SX600FW, Epson Stylus SX610FW
-Epson Stylus SX620FW, Epson Stylus T21, Epson Stylus T22
-Epson Stylus T24, Epson Stylus T25, Epson Stylus T27
+PX-M730F Series, PX-M740F, PX-M741F, PX-M780F Series, PX-M781F Series
+PX-M791FT Series, PX-M840F, PX-M840FX, PX-M860F, PX-M880FX, PX-M884F
+PX-M885F, PX-M886FL, PX-M887F, PX-S05 Series, PX-S06 Series
+PX-S155 Series, PX-S160T Series, PX-S161T Series, PX-S170T Series
+PX-S170UT Series, PX-S270T Series, PX-S350, PX-S380, PX-S381L, PX-S382
+PX-S383L, PX-S5010 Series, PX-S5040, PX-S505 Series, PX-S5080 Series
+PX-S6010 Series, PX-S6710T Series, PX-S7050 Series, PX-S7050PS
+PX-S7070X, PX-S7090X, PX-S7110, PX-S7110P, PX-S730 Series, PX-S740
+PX-S840, PX-S860, PX-S880X, PX-S884, PX-S885, PX-S887, PictureMate 500
+PictureMate Deluxe, PictureMate PM 200, PictureMate PM 210
+PictureMate PM 215, PictureMate PM 225, PictureMate PM 235
+PictureMate PM 240, PictureMate PM 245, PictureMate PM 250
+PictureMate PM 260, PictureMate PM 270, PictureMate PM 280
+PictureMate PM 290, PictureMate PM 300, PictureMate PM 310
+ST-2000 Series, ST-3000 Series, ST-4000 Series, ST-C2100 Series
+ST-C4100 Series, ST-C5000 Series, ST-C5500 Series, ST-C8000 Series
+ST-C8090 Series, ST-M1000 Series, ST-M3000 Series, Epson Stylus CX2800
+Epson Stylus CX2900, Epson Stylus CX3700, Epson Stylus CX3800
+Epson Stylus CX3900, Epson Stylus CX4200, Epson Stylus CX4800
+Epson Stylus CX4900, Epson Stylus CX5000, Epson Stylus CX5900
+Epson Stylus CX6000, Epson Stylus CX7300, Epson Stylus CX7400
+Epson Stylus CX7700, Epson Stylus CX7800, Epson Stylus CX8300
+Epson Stylus CX8400, Epson Stylus CX9300F, Epson Stylus CX9400Fax
+Epson Stylus DX3800, Epson Stylus DX4000, Epson Stylus DX4200
+Epson Stylus DX4800, Epson Stylus DX5000, Epson Stylus DX7400
+Epson Stylus DX8400, Epson Stylus DX9400F, Epson Stylus N10 N11
+Epson Stylus NX110, Epson Stylus NX125 NX127, Epson Stylus NX130
+Epson Stylus NX200, Epson Stylus NX210, Epson Stylus NX215
+Epson Stylus NX230, Epson Stylus NX300, Epson Stylus NX330
+Epson Stylus NX400, Epson Stylus NX410, Epson Stylus NX420
+Epson Stylus NX430, Epson Stylus NX510, Epson Stylus NX530
+Epson Stylus NX620, Epson Stylus NX635, Epson Stylus Office B42WD
+Epson Stylus Office BX300F, Epson Stylus Office BX305
+Epson Stylus Office BX305 Plus, Epson Stylus Office BX310FN
+Epson Stylus Office BX320FW, Epson Stylus Office BX525WD
+Epson Stylus Office BX535WD, Epson Stylus Office BX600FW
+Epson Stylus Office BX610FW, Epson Stylus Office BX620FWD
+Epson Stylus Office BX630FW, Epson Stylus Office BX635FWD
+Epson Stylus Office BX925, Epson Stylus Office BX935FWD
+Epson Stylus Office TX300F, Epson Stylus Office TX320F
+Epson Stylus Office TX510FN, Epson Stylus Office TX515FN
+Epson Stylus Office TX525FW, Epson Stylus Office TX600FW
+Epson Stylus Office TX610FW, Epson Stylus Office TX620FWD
+Epson Stylus Photo 1400, Epson Stylus Photo 1410
+Epson Stylus Photo 1430, Epson Stylus Photo 1500
+Epson Stylus Photo P50, Epson Stylus Photo PX650
+Epson Stylus Photo PX660, Epson Stylus Photo PX700W
+Epson Stylus Photo PX710W, Epson Stylus Photo PX720WD
+Epson Stylus Photo PX730, Epson Stylus Photo PX800FW
+Epson Stylus Photo PX810FW, Epson Stylus Photo PX820FWD
+Epson Stylus Photo PX830, Epson Stylus Photo R1900
+Epson Stylus Photo R2000, Epson Stylus Photo R240
+Epson Stylus Photo R250, Epson Stylus Photo R260
+Epson Stylus Photo R265, Epson Stylus Photo R270
+Epson Stylus Photo R2880, Epson Stylus Photo R3000
+Epson Stylus Photo R340, Epson Stylus Photo R350
+Epson Stylus Photo R360, Epson Stylus Photo R380
+Epson Stylus Photo R390, Epson Stylus Photo RX520
+Epson Stylus Photo RX530, Epson Stylus Photo RX560
+Epson Stylus Photo RX580, Epson Stylus Photo RX585
+Epson Stylus Photo RX590, Epson Stylus Photo RX595
+Epson Stylus Photo RX610, Epson Stylus Photo RX640
+Epson Stylus Photo RX650, Epson Stylus Photo RX680
+Epson Stylus Photo RX685, Epson Stylus Photo RX690
+Epson Stylus Photo T50, Epson Stylus Photo T60
+Epson Stylus Photo TX650, Epson Stylus Photo TX700W
+Epson Stylus Photo TX710W, Epson Stylus Photo TX720WD
+Epson Stylus Photo TX730, Epson Stylus Photo TX800FW
+Epson Stylus Photo TX810FW, Epson Stylus S21, Epson Stylus S22
+Epson Stylus SX110, Epson Stylus SX125, Epson Stylus SX130
+Epson Stylus SX200, Epson Stylus SX210, Epson Stylus SX215
+Epson Stylus SX218, Epson Stylus SX230, Epson Stylus SX235
+Epson Stylus SX400, Epson Stylus SX410, Epson Stylus SX420W
+Epson Stylus SX430, Epson Stylus SX440, Epson Stylus SX510W
+Epson Stylus SX525WD, Epson Stylus SX535WD, Epson Stylus SX600FW
+Epson Stylus SX610FW, Epson Stylus SX620FW, Epson Stylus T21
+Epson Stylus T22, Epson Stylus T24, Epson Stylus T25, Epson Stylus T27
 Epson Stylus TX110, Epson Stylus TX111, Epson Stylus TX112 
 Epson Stylus TX115, Epson Stylus TX117, Epson Stylus TX120
 Epson Stylus TX121, Epson Stylus TX125, Epson Stylus TX130
@@ -151,58 +171,69 @@ Epson Stylus TX235, Epson Stylus TX400, Epson Stylus TX410
 Epson Stylus TX420W, Epson Stylus TX430, Epson Stylus TX550W
 Epson Stylus TX560WD, T12 T22 N11, T13 T22E, TX120 NX120, TX133 TX135
 TX220 NX220, TX320 WorkForce320, TX420 NX420, WF-100 Series
-WF-110 Series, WF-2010 Series, WF-2510 Series, WF-2520 Series
-WF-2530 Series, WF-2540 Series, WF-2630 Series, WF-2650 Series
-WF-2660 Series, WF-2750 Series, WF-2760 Series, WF-2810 Series
-WF-2830 Series, WF-2850 Series, WF-2860 Series, WF-3010 Series
-WF-3520 Series, WF-3530 Series, WF-3540 Series, WF-3620 Series
-WF-3640 Series, WF-3720 Series, WF-3730 Series, WF-3820 Series
-WF-4630 Series, WF-4640 Series, WF-4720 Series, WF-4730 Series
-WF-4740 Series, WF-4820 Series, WF-4830 Series, WF-5110 Series
-WF-5190 Series, WF-5620 Series, WF-5690 Series, WF-6090 Series
-WF-6530 Series, WF-6590 Series, WF-7010 Series, WF-7011 Series
-WF-7012 Series, WF-7015 Series, WF-7018 Series, WF-7110 Series
-WF-7210 Series, WF-7510 Series, WF-7511 Series, WF-7515 Series
-WF-7520 Series, WF-7521 Series, WF-7525 Series, WF-7610 Series
-WF-7620 Series, WF-7710 Series, WF-7720 Series, WF-7820 Series
-WF-7830 Series, WF-7840 Series, WF-8010 Series, WF-8090 Series
-WF-8510 Series, WF-8590 Series, WF-C17590 Series, WF-C20590 Series
-WF-C20600 Series, WF-C20750 Series, WF-C21000 Series, WF-C5210 Series
-WF-C5290 Series, WF-C5290BA, WF-C529R Series, WF-C529RB
-WF-C5710 Series, WF-C5790 Series, WF-C5790BA, WF-C579R Series
-WF-C579RB, WF-C8190 Series, WF-C8190B, WF-C8610 Series, WF-C8690 Series
-WF-C8690B, WF-C869R Series, WF-C878R Series, WF-C878RB, WF-C879R Series
-WF-C879RB, WF-M1030 Series, WF-M1560 Series, WF-M20590 Series
-WF-M5190 Series, WF-M5298 Series, WF-M5299 Series, WF-M5690 Series
-WF-M5799 Series, WF-R4640 Series, WF-R5190 Series, WF-R5690 Series
-WF-R8590 Series, WP-4010 Series, WP-4011 Series, WP-4015 Series
-WP-4020 Series, WP-4022 Series, WP-4023 Series, WP-4025 Series
-WP-4090 Series, WP-4091 Series, WP-4092 Series, WP-4095 Series
-WP-4511 Series, WP-4515 Series, WP-4520 Series, WP-4521 Series
-WP-4525 Series, WP-4530 Series, WP-4531 Series, WP-4532 Series
-WP-4533 Series, WP-4535 Series, WP-4540 Series, WP-4545 Series
-WP-4590 Series, WP-4592 Series, WP-4595 Series, WP-M4011 Series
-WP-M4015 Series, WP-M4095 Series, WP-M4521 Series, WP-M4525 Series
-WP-M4595 Series, WorkForce 310, WorkForce 320, WorkForce 435
-WorkForce 500, WorkForce 520, WorkForce 545, WorkForce 60
-WorkForce 600, WorkForce 610, WorkForce 620, WorkForce 630
-WorkForce 645, WorkForce 840, WorkForce 845, WorkForce T42WD
-XP-100 Series, XP-102 103 Series, XP-15000 Series, XP-200 Series
-XP-201 204 208 Series, XP-202 203 206 Series, XP-205 207 Series
-XP-2100 Series, XP-211 214 216 Series, XP-212 213 Series
-XP-215 217 Series, XP-220 Series, XP-225 Series, XP-235 Series
-XP-240 Series, XP-243 245 247 Series, XP-255 257 Series, XP-300 Series
+WF-110 Series, WF-2010 Series, WF-2110 Series, WF-2510 Series
+WF-2520 Series, WF-2530 Series, WF-2540 Series, WF-2630 Series
+WF-2650 Series, WF-2660 Series, WF-2750 Series, WF-2760 Series
+WF-2810 Series, WF-2820 Series, WF-2830 Series, WF-2840 Series
+WF-2850 Series, WF-2860 Series, WF-2870 Series, WF-2880 Series
+WF-2910 Series, WF-2930 Series, WF-2950 Series, WF-2960 Series
+WF-3010 Series, WF-3520 Series, WF-3530 Series, WF-3540 Series
+WF-3620 Series, WF-3640 Series, WF-3720 Series, WF-3730 Series
+WF-3820 Series, WF-4630 Series, WF-4640 Series, WF-4720 Series
+WF-4730 Series, WF-4740 Series, WF-4820 Series, WF-4830 Series
+WF-5110 Series, WF-5190 Series, WF-5620 Series, WF-5690 Series
+WF-6090 Series, WF-6530 Series, WF-6590 Series, WF-7010 Series
+WF-7011 Series, WF-7012 Series, WF-7015 Series, WF-7018 Series
+WF-7110 Series, WF-7210 Series, WF-7310 Series, WF-7510 Series
+WF-7511 Series, WF-7515 Series, WF-7520 Series, WF-7521 Series
+WF-7525 Series, WF-7610 Series, WF-7620 Series, WF-7710 Series
+WF-7720 Series, WF-7820 Series, WF-7830 Series, WF-7840 Series
+WF-8010 Series, WF-8090 Series, WF-8510 Series, WF-8590 Series
+WF-C17590 Series, WF-C20590 Series, WF-C20600 Series, WF-C20750 Series
+WF-C21000 Series, WF-C4310 Series, WF-C4810 Series, WF-C5210 Series
+WF-C5290 Series, WF-C5290BA, WF-C5290BAM, WF-C529R Series, WF-C529RB
+WF-C529RBAM, WF-C5310 Series, WF-C5390 Series, WF-C5390BAM
+WF-C5710 Series, WF-C5790 Series, WF-C5790BA, WF-C5790BAM
+WF-C579R Series, WF-C579RB, WF-C579RBAM, WF-C5810 Series
+WF-C5890 Series, WF-C5890BAM, WF-C8190 Series, WF-C8190B
+WF-C8610 Series, WF-C8690 Series, WF-C8690B, WF-C869R Series
+WF-C878R Series, WF-C878RB, WF-C879R Series, WF-C879RB, WF-C879RBAM
+WF-M1030 Series, WF-M1130 Series, WF-M1560 Series, WF-M20590 Series
+WF-M21000 Series, WF-M4119 Series, WF-M4619 Series, WF-M5190 Series
+WF-M5298 Series, WF-M5299 Series, WF-M5299BAM, WF-M5399 Series
+WF-M5399BAM, WF-M5690 Series, WF-M5799 Series, WF-M5799BAM
+WF-M5899 Series, WF-M5899BAM, WF-R4640 Series, WF-R5190 Series
+WF-R5690 Series, WF-R8590 Series, WP-4010 Series, WP-4011 Series
+WP-4015 Series, WP-4020 Series, WP-4022 Series, WP-4023 Series
+WP-4025 Series, WP-4090 Series, WP-4091 Series, WP-4092 Series
+WP-4095 Series, WP-4511 Series, WP-4515 Series, WP-4520 Series
+WP-4521 Series, WP-4525 Series, WP-4530 Series, WP-4531 Series
+WP-4532 Series, WP-4533 Series, WP-4535 Series, WP-4540 Series
+WP-4545 Series, WP-4590 Series, WP-4592 Series, WP-4595 Series
+WP-M4011 Series, WP-M4015 Series, WP-M4095 Series, WP-M4521 Series
+WP-M4525 Series, WP-M4595 Series, WorkForce 310, WorkForce 320
+WorkForce 435, WorkForce 500, WorkForce 520, WorkForce 545
+WorkForce 60, WorkForce 600, WorkForce 610, WorkForce 620
+WorkForce 630, WorkForce 645, WorkForce 840, WorkForce 845
+WorkForce T42WD, XP-100 Series, XP-102 103 Series, XP-15000 Series
+XP-200 Series, XP-201 204 208 Series, XP-202 203 206 Series
+XP-205 207 Series, XP-2100 Series, XP-211 214 216 Series
+XP-212 213 Series, XP-215 217 Series, XP-2150 Series, XP-220 Series
+XP-2200 Series, XP-225 Series, XP-235 Series, XP-240 Series
+XP-243 245 247 Series, XP-255 257 Series, XP-300 Series
 XP-302 303 305 306 Series, XP-310 Series, XP-3100 Series
-XP-312 313 315 Series, XP-320 Series, XP-322 323 325 Series
-XP-330 Series, XP-332 335 Series, XP-340 Series, XP-342 343 345 Series
-XP-352 355 Series, XP-400 Series, XP-402 403 405 406 Series
-XP-410 Series, XP-4100 Series, XP-412 413 415 Series, XP-420 Series
+XP-312 313 315 Series, XP-3150 Series, XP-320 Series, XP-3200 Series
+XP-322 323 325 Series, XP-330 Series, XP-332 335 Series, XP-340 Series
+XP-342 343 345 Series, XP-352 355 Series, XP-400 Series
+XP-402 403 405 406 Series, XP-410 Series, XP-4100 Series
+XP-412 413 415 Series, XP-4150 Series, XP-420 Series, XP-4200 Series
 XP-422 423 425 Series, XP-430 Series, XP-432 435 Series, XP-440 Series
 XP-442 445 Series, XP-452 455 Series, XP-510 Series, XP-5100 Series
-XP-520 Series, XP-530 Series, XP-540 Series, XP-55 Series
-XP-600 Series, XP-6000 Series, XP-610 Series, XP-6100 Series
-XP-620 Series, XP-630 Series, XP-640 Series, XP-700 Series
-XP-710 Series, XP-7100 Series, XP-720 Series, XP-750 Series
-XP-760 Series, XP-800 Series, XP-810 Series, XP-820 Series
-XP-830 Series, XP-850 Series, XP-8500 Series, XP-860 Series
-XP-8600 Series, XP-950 Series, XP-960 Series, XP-970 Series
+XP-5150 Series, XP-520 Series, XP-5200 Series, XP-530 Series
+XP-540 Series, XP-55 Series, XP-600 Series, XP-6000 Series
+XP-610 Series, XP-6100 Series, XP-620 Series, XP-630 Series
+XP-640 Series, XP-65 Series, XP-700 Series, XP-710 Series
+XP-7100 Series, XP-720 Series, XP-750 Series, XP-760 Series
+XP-800 Series, XP-810 Series, XP-820 Series, XP-830 Series
+XP-850 Series, XP-8500 Series, XP-860 Series, XP-8600 Series
+XP-8700 Series, XP-950 Series, XP-960 Series, XP-970 Series
diff --git a/system/epson-printer-utility/doinst.sh b/system/epson-printer-utility/doinst.sh
index e41ff8a5fe..4826abc83f 100644
--- a/system/epson-printer-utility/doinst.sh
+++ b/system/epson-printer-utility/doinst.sh
@@ -19,7 +19,7 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
-if [ -e /usr/share/icons/hicolor/icon-theme.cache ]; then
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
   fi
@@ -30,8 +30,15 @@ if [ -x /usr/bin/kbuildsycoca4 ]; then
 fi
 
 echo
-echo "********************* NOTICE *********************************"
-echo "ecbd needs to be running for the printer monitor to be usable:"
+echo "************************* NOTICE *********************************"
+echo "ecbd needs to be running for the printer monitor to be usable. run"
 echo "/etc/rc.d/rc.ecbd restart"
-echo "**************************************************************"
+if [ x`grep "rc.ecbd start" /etc/rc.d/rc.local|wc -l` = "x0" ]; then
+  echo "to get it to run automatically at startup, add the following"
+  echo "to /etc/rc.d/rc.local"
+  echo "if [ -x /etc/rc.d/rc.ecbd ]; then"
+  echo "  /etc/rc.d/rc.ecbd start"
+  echo "fi"
+fi
+echo "******************************************************************"
 echo
diff --git a/system/epson-printer-utility/epson-printer-utility.SlackBuild b/system/epson-printer-utility/epson-printer-utility.SlackBuild
index c9e1b2bfce..0e87b2491c 100644
--- a/system/epson-printer-utility/epson-printer-utility.SlackBuild
+++ b/system/epson-printer-utility/epson-printer-utility.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for epson-printer-utility
 
-# Copyright 2020 Tim Dickson
+# Copyright 2020-2024 Tim Dickson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,24 @@
 
 #thanks to B.Watson for support on this build. :-)
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=4:
+# - fix build on 15.0.
+# - add qt4 as a dependency, and modify the script to use it.
+# - fix weird libtool issue (libcutils.la wasn't being built).
+# - stop writing to $CWD. use a top-level build dir instead.
+# - fix hardcoded /usr/lib64 in rm command (fix build on 32-bit)!
+# in 1.1.2 epson updated things so it actually works with qt5 now.
+# 20240131 update to 1.1.3
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=epson-printer-utility
-VERSION=${VERSION:-1.1.1}
-EXTRABIT=1lsb3.2
-TARNAM=$PRGNAM-$VERSION.tar.gz
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.1.3}
+EXTRABIT=1
+TARNAM=$PRGNAM-$VERSION-$EXTRABIT.src.tgz
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -39,14 +51,13 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
-#lets get the source tarball from the rpm and clean up the bits we don't need
-rpm2tgz $PRGNAM-$VERSION-$EXTRABIT.src.rpm
-tar -xzf $PRGNAM-$VERSION-$EXTRABIT.src.tgz
-cp $PRGNAM-$VERSION-$EXTRABIT/$PRGNAM-$VERSION.tar.gz ./
-cp $PRGNAM-$VERSION-$EXTRABIT/epson-backend-$VERSION.tar.gz ./
-rm $PRGNAM-$VERSION-$EXTRABIT.src.tgz
-rm -r $PRGNAM-$VERSION-$EXTRABIT
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -68,66 +79,43 @@ fi
 
 set -e
 
+TOPDIR=$TMP/$PRGNAM-$VERSION-build
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$TARNAM
-#we remove the tarnam as the original is an rpm
-#this keeps things tidy.
-rm $CWD/$TARNAM
-cd $PRGNAM-$VERSION
+rm -rf $TOPDIR
+mkdir -p $TOPDIR
+cd $TOPDIR
+
+#lets get the source tarball from the rpm and clean up the bits we don't need
+ln -s $CWD/$PRGNAM-$VERSION-$EXTRABIT.src.rpm .
+rpm2tgz $PRGNAM-$VERSION-$EXTRABIT.src.rpm
+rm $PRGNAM-$VERSION-$EXTRABIT.src.rpm
+tar xzf $TARNAM
+rm $TARNAM
+tar xzf epson-printer-utility.tar.gz
+tar xzf epson-backend.tar.gz
+cd $PRGNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 echo "patch configure.ac"
-sed -i 's_/opt/lsb/bin/lsbc++_/usr/bin/c++_g' configure.ac
+#remove automake error, fix udev typo and fix qt source paths
 sed -i '/^AM_INIT_AUTOMAKE/a AM_PROG_AR()' configure.ac
-#fix typo in path of udev stuff
 sed -i 's_/ect_/etc_g' configure.ac
-#fix source code. We shouldn't have to do this, but hey ho!....
-mv EPSCommonLib/epsmp/linux/XAsyncSocket.cpp EPSCommonLib/epsmp/linux/XAsyncSocket.c
-#patch png files to remove incorrect sRGB profile in all of them.
-mogrify -strip PrinterUtility/Images/*.png
-#patch the Resources.qrc file to include missing png's
-sed -i 'sZInklow.png</file>ZInklow.png</file>\n        <file>Images/Inklow_.png</file>\n        <file>Images/printer_status_OLD.png</file>\n        <file>Images/printer_status_error_laser.png</file>\n        <file>Images/printer_status_warning_laser.png</file>\n        <file>Images/warning.png</file>Zg' PrinterUtility/Resources.qrc
-#we need to regenerate qrc_Resources.cpp (which would have been generated by qmake)
-#as the one shipped has all the png's with iCCP invalid sRGB profiles.
-#echo "create new qrc_resources.cpp file using our patched Resources.qrc file"
-cd PrinterUtility
-rm -f qrc_Resources.cpp
-rcc -o qrc_Resources.cpp Resources.qrc
-cd ..
-#echo "now we have a resources file with fixed pngs embeded in it"
-#lets run qmake :-) - or lets not. it looks like a bunch of stuff is missing.!
-#the list of stuff reported missing by qmake was sent to linux-printer@epson.jp 28/09/2020
-#with a request for them to include the missing source code. hopefully they will supply
-#the missing code, so we can update this script and remove some of the patches.
-
-#keep next few lines incase we can actually use it in the future.
-#cd PrinterUtility
-#qmake PrinterUtility.pro
-#cd ..
-
-echo "running aclocal"
+sed -i 'sZ/opt/Qt/5.15.0/gcc_64/includeZ/usr/include/qt5Zg' configure.ac
+
 aclocal
-echo "running autoreconf"
 autoreconf --install --force
-
-#we still have to fix the Makefile.am files that autoreconf didn't sort out
-#fix hardcoded /opt/lsb stuff
-sed -i 's_/opt/lsb_/usr_g' EPSCommonLib/Makefile.am
-#patch qtlibs reference in wrong place
-sed -i "s_/usr/include/QtCore_/usr/lib${LIBDIRSUFFIX}/qt/include/QtCore_g" EPSCommonLib/Makefile.am
-sed -i 's_/opt/lsb_/usr_g' PrinterUtility/Makefile.am
-sed -i "s_/usr/include/QtCore_/usr/lib${LIBDIRSUFFIX}/qt/include/QtCore_g" PrinterUtility/Makefile.am
-sed -i "s_/usr/include/QtGui_/usr/lib${LIBDIRSUFFIX}/qt/include/QtGui_g" PrinterUtility/Makefile.am
-sed -i "s_include/QtNetwork_lib${LIBDIRSUFFIX}/qt/include/QtNetwork_g" PrinterUtility/Makefile.am
-echo "running configure"
+#patch things to point to the correct dir
+echo "patch makefile.am configs"
+sed -i "sZ/x86_64-linux-gnu/qt5Z/qt5Zg" EPSCommonLib/Makefile.am
+sed -i "sZ/x86_64-linux-gnu/qt5Z/qt5Zg" PrinterUtility/Makefile.am
 
 CC=/usr/bin/c++ \
 CXX=/usr/bin/c++ \
@@ -144,23 +132,12 @@ CXXFLAGS="$SLKCFLAGS -fpermissive" \
   --disable-static \
   --build=$ARCH-slackware-linux
 
-echo "more patching of source files"
-#add missing header for sleep
-sed -i "1 i #include <unistd.h>" PrinterUtility/EPUMainController.cpp
-sed -i "1 i #include <unistd.h>" PrinterUtility/EPUPrinterListDialog.cpp
-#we need to patch the moc files so they work with qt 4.8.7 that ships with slackware 14.2
-#when the source is complete and we can run qmake, that should fix this.
-for i in `ls PrinterUtility/moc_*.cpp`; do
-  sed -i 's/59/63/g' $i
-done
-#patch hardcoded path in Main.cpp so it can find language files
+##patch hardcoded path in Main.cpp so it can find language files
+echo "patch Main.cpp to fix language file paths"
 sed -i "s_/opt/epson_/usr/share/epson_g" PrinterUtility/Main.cpp
-echo "running make"
 make
-
-echo "running make install"
 make install DESTDIR=$PKG
-#as make install doesn't do much we do it manually
+#as make install doesn't do much we sort it out manually
 mkdir -p $PKG/usr/bin
 cp -a PrinterUtility/epson-printer-utility $PKG/usr/bin/
 #udev rule to allow set permissions so any user can monitor the printer.
@@ -171,30 +148,21 @@ mv $PKG/usr/resource/Languages/*.qm $PKG/usr/share/epson-printer-utility/resourc
 rm -r $PKG/usr/resource
 mkdir -p $PKG/usr/share/pixmaps
 cp PrinterUtility/Images/AppIcon.png $PKG/usr/share/pixmaps/epson-printer-utility.png
-#+-----------------------------------------------------------+
-#| we now have to process the communication daemon           |
-#+-----------------------------------------------------------+
-cd $TMP
-rm -rf epson-backend-$VERSION
-tar -xzf $CWD/epson-backend-$VERSION.tar.gz
-#we remove the tarnam as the original is an rpm
-#this keeps things tidy.
-rm $CWD/epson-backend-$VERSION.tar.gz
-cd epson-backend-$VERSION
+#=====now for backend.
+cd $TOPDIR/epson-backend
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-echo "running aclocal"
+#i don't think next line is needed. Seems to work without it.
 aclocal
-echo "running autoreconf"
+#next line is needed to make things work with 1.1.3
+touch m4-macros
 autoreconf --install --force
 
-echo "running configure"
-
 CC=/usr/bin/gcc \
 CXX=/usr/bin/c++ \
 CFLAGS="$SLKCFLAGS -Wno-unused-but-set-variable -Wno-unused-function -Wno-implicit-function-declaration -Wno-pointer-sign -Wno-unused-variable" \
@@ -209,21 +177,10 @@ CXXFLAGS="$SLKCFLAGS -fpermissive" \
   --disable-static \
   --build=$ARCH-slackware-linux
 
-echo "patching source for backend daemon. epmnt.c"
+#we need to patch the source
 sed -i "1 i #include <stdlib.h>\n#include <string.h>" daemon/epmnt.c
-echo "running make"
 make
-echo "running make install"
 make install DESTDIR=$PKG
-
-#now lets tidy everything up. after all, we are not debian :-)
-#there are three important program files, /usr/bin/epson-printer-utility
-#/usr/lib/epson-backend/ecbd the communication daemon, and 
-#/usr/lib64/cups/backend/ecblp  the cups backend
-#we will trash the contents of /usr/lib64/epson-backend  for now, it looks like it is just debian daemon stuff.
-#we need to create our own rc.ecbd file to start/stop/restart the backend
-#this should be added into rc.local to make it active at startup
-rm -r $PKG/usr/lib64/epson-backend
 mkdir -p $PKG/etc/rc.d
 cp $CWD/rc.ecbd $PKG/etc/rc.d/rc.ecbd.new
 #the utility won't work without the daemon, so reduce steps admin has to do to get
@@ -237,7 +194,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING NEWS README INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -245,4 +202,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh >$PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/epson-printer-utility/epson-printer-utility.desktop b/system/epson-printer-utility/epson-printer-utility.desktop
index 08e9588c8f..199bc4cd05 100644
--- a/system/epson-printer-utility/epson-printer-utility.desktop
+++ b/system/epson-printer-utility/epson-printer-utility.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=Epson Printer Utility
-Comment=monitor ink levels, print nozzle check pattern
+Comment=monitor ink levels, print nozzle check pattern, clean print head
 Exec=epson-printer-utility
 Terminal=false
 Type=Application
 Icon=epson-printer-utility
-Categories=System;Printing;
+Categories=System;Printing;Settings
diff --git a/system/epson-printer-utility/epson-printer-utility.info b/system/epson-printer-utility/epson-printer-utility.info
index 04281e9828..4e710d8479 100644
--- a/system/epson-printer-utility/epson-printer-utility.info
+++ b/system/epson-printer-utility/epson-printer-utility.info
@@ -1,8 +1,8 @@
 PRGNAM="epson-printer-utility"
-VERSION="1.1.1"
+VERSION="1.1.3"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/epson-printer/epson-printer-utility-1.1.1-1lsb3.2.src.rpm"
-MD5SUM="4285b0585dd559d53f2c233fb96b4a00"
+DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/epson-printer/epson-printer-utility-1.1.3-1.src.rpm"
+MD5SUM="3aba3e2565a7b6a986d97096d952e191"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/esekeyd/esekeyd.SlackBuild b/system/esekeyd/esekeyd.SlackBuild
index aca4698c74..4da676c46c 100644
--- a/system/esekeyd/esekeyd.SlackBuild
+++ b/system/esekeyd/esekeyd.SlackBuild
@@ -1,15 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for esekeyd
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=esekeyd
 VERSION=${VERSION:-1.2.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +22,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -97,4 +104,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/esekeyd/esekeyd.info b/system/esekeyd/esekeyd.info
index 385c0e8a92..473414ea98 100644
--- a/system/esekeyd/esekeyd.info
+++ b/system/esekeyd/esekeyd.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/etckeeper/etckeeper.SlackBuild b/system/etckeeper/etckeeper.SlackBuild
index 2a3a7cc305..984152d22b 100644
--- a/system/etckeeper/etckeeper.SlackBuild
+++ b/system/etckeeper/etckeeper.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for etckeeper
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=etckeeper
 VERSION=${VERSION:-1.18.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -76,4 +86,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/etsh/doinst.sh b/system/etsh/doinst.sh
new file mode 100644
index 0000000000..2e23c07769
--- /dev/null
+++ b/system/etsh/doinst.sh
@@ -0,0 +1 @@
+grep -q '^/bin/etsh$' etc/shells 2>/dev/null || echo "/bin/etsh" >> etc/shells
diff --git a/system/etsh/etsh.SlackBuild b/system/etsh/etsh.SlackBuild
index d1cb0cad9e..4122b46507 100644
--- a/system/etsh/etsh.SlackBuild
+++ b/system/etsh/etsh.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for etsh
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
@@ -18,15 +18,21 @@
 # The name means "Extended Thompson Shell", it's nothing to do with
 # phoning home...
 
+# 20220507 bkw, BUILD=2:
+# - add doinst.sh: add /bin/etsh to /etc/shells, but not /bin/tsh
+#   per upstream's recommendation.
 # 20191201 bkw: updated for v5.4.0.
 # 20180902 bkw: updated for v5.3.1.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=etsh
 VERSION=${VERSION:-5.4.0}    # main etsh version
 V6S_VER=${V6S_VER:-20180109} # v6scripts version
 LT_VER=${LT_VER:-20180115}   # looptest  version
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -95,6 +105,7 @@ cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/etsh/etsh.info b/system/etsh/etsh.info
index dad0393dcb..75e074aab1 100644
--- a/system/etsh/etsh.info
+++ b/system/etsh/etsh.info
@@ -11,4 +11,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/evdi-kernel/evdi-kernel.SlackBuild b/system/evdi-kernel/evdi-kernel.SlackBuild
index 2f1f8bc0a0..8ca2df51ff 100644
--- a/system/evdi-kernel/evdi-kernel.SlackBuild
+++ b/system/evdi-kernel/evdi-kernel.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for DisplayLink EVDI kernel Module
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=evdi-kernel
-VERSION=${VERSION:-1.5.0}
+VERSION=${VERSION:-1.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 KERNEL=${KERNEL:-$(uname -r)}
 KERNELPATH=${KERNELPATH:-/lib/modules/$KERNEL/build}
@@ -39,7 +42,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,22 +69,23 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-pushd module
-env -u ARCH make KERN_DIR=${KERNELPATH}
-popd
+(
+  cd module
+  env -u ARCH make KVER=$KERNEL KDIR=$KERNELPATH
+)
 
 mkdir -p $PKG/lib/modules/$KERNEL/misc
 install -m 0644 module/evdi.ko $PKG/lib/modules/$KERNEL/misc/
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER
 cp -a \
   README.md docs/{details.md,index.md,quickstart.md} \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+  $PKG/usr/doc/$PRGNAM-$PKGVER
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/evdi-kernel/evdi-kernel.info b/system/evdi-kernel/evdi-kernel.info
index 133fa1e0be..2933cfa658 100644
--- a/system/evdi-kernel/evdi-kernel.info
+++ b/system/evdi-kernel/evdi-kernel.info
@@ -1,8 +1,8 @@
 PRGNAM="evdi-kernel"
-VERSION="1.5.0"
+VERSION="1.10.0"
 HOMEPAGE="https://github.com/DisplayLink/evdi/"
-DOWNLOAD="https://github.com/DisplayLink/evdi/archive/v1.5.0/evdi-1.5.0.tar.gz"
-MD5SUM="9f3b61b20baa56dd946cbc91414504ac"
+DOWNLOAD="https://github.com/DisplayLink/evdi/archive/v1.10.0/evdi-1.10.0.tar.gz"
+MD5SUM="e7de92376c43cc6ee7e6e4cee8600dcb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/evdi/evdi.SlackBuild b/system/evdi/evdi.SlackBuild
index 11942dff05..4399230815 100644
--- a/system/evdi/evdi.SlackBuild
+++ b/system/evdi/evdi.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for DisplayLink EVDI
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=evdi
-VERSION=${VERSION:-1.5.0}
+VERSION=${VERSION:-1.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -90,4 +100,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/evdi/evdi.info b/system/evdi/evdi.info
index e24b8c16e4..c7588194b5 100644
--- a/system/evdi/evdi.info
+++ b/system/evdi/evdi.info
@@ -1,8 +1,8 @@
 PRGNAM="evdi"
-VERSION="1.5.0"
+VERSION="1.10.0"
 HOMEPAGE="https://github.com/DisplayLink/evdi/"
-DOWNLOAD="https://github.com/DisplayLink/evdi/archive/v1.5.0/evdi-1.5.0.tar.gz"
-MD5SUM="9f3b61b20baa56dd946cbc91414504ac"
+DOWNLOAD="https://github.com/DisplayLink/evdi/archive/v1.10.0/evdi-1.10.0.tar.gz"
+MD5SUM="e7de92376c43cc6ee7e6e4cee8600dcb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="evdi-kernel"
diff --git a/system/eventlog/README b/system/eventlog/README
index 2a25c655ea..e328beb884 100644
--- a/system/eventlog/README
+++ b/system/eventlog/README
@@ -1,10 +1,10 @@
-The EventLog library aims to be a replacement of the simple syslog() API
-provided on UNIX systems. The major difference between EventLog and syslog
-is that EventLog tries to add structure to messages.
+The EventLog library aims to be a replacement of the simple syslog()
+API provided on UNIX systems. The major difference between EventLog
+and syslog is that EventLog tries to add structure to messages.
 
 Where you had a simple non-structrured string in syslog() you have a
 combination of description and tag/value pairs.
 
-EventLog provides an interface to build, format and output an event record.
-The exact format and output method can be customized by the administrator 
-via a configuration file.
+EventLog provides an interface to build, format and output an event
+record. The exact format and output method can be customized by the
+administrator via a configuration file.
diff --git a/system/eventlog/eventlog.SlackBuild b/system/eventlog/eventlog.SlackBuild
index 5c1edc1b50..c8a5db023f 100644
--- a/system/eventlog/eventlog.SlackBuild
+++ b/system/eventlog/eventlog.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for EventLog
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=eventlog
 VERSION=${VERSION:-20151122_a5c1916}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -91,8 +101,10 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/evhz/evhz.SlackBuild b/system/evhz/evhz.SlackBuild
index 5a395e1381..d05355f8f9 100644
--- a/system/evhz/evhz.SlackBuild
+++ b/system/evhz/evhz.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for evhz
 
@@ -22,11 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=evhz
-VERSION=${VERSION:-3b656489}
-COMMIT=${COMMIT:-3b656489b70838afaeb33359cb0086e2a184c81f}
+VERSION=${VERSION:-35b7526e}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,9 +69,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-$COMMIT
-tar xvf $CWD/$PRGNAM-$VERSION-$COMMIT.tar.gz || tar xvf $CWD/archive.tar.gz\?ref\=${VERSION}
-cd $PRGNAM-$VERSION-$COMMIT
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -87,4 +96,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/evhz/evhz.info b/system/evhz/evhz.info
index d0df61bf53..d533eca98e 100644
--- a/system/evhz/evhz.info
+++ b/system/evhz/evhz.info
@@ -1,8 +1,8 @@
 PRGNAM="evhz"
-VERSION="3b656489"
-HOMEPAGE="https://gitlab.com/iankelling/evhz"
-DOWNLOAD="https://gitlab.com/iankelling/evhz/repository/archive.tar.gz?ref=3b656489"
-MD5SUM="e30535abab8c58470660681ed080ef01"
+VERSION="35b7526e"
+HOMEPAGE="https://sr.ht/~iank/evhz/"
+DOWNLOAD="https://git.sr.ht/~iank/evhz/archive/35b7526e.tar.gz"
+MD5SUM="dc3ac6b793bd64e73b420cfa99d0216a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/evhz/slack-desc b/system/evhz/slack-desc
index b5bfae3821..34dcd48b4f 100644
--- a/system/evhz/slack-desc
+++ b/system/evhz/slack-desc
@@ -10,7 +10,7 @@ evhz: evhz (show mouse refresh rate)
 evhz:
 evhz: Show mouse refresh rate under linux + evdev
 evhz:
-evhz: https://gitlab.com/iankelling/evhz
+evhz: https://sr.ht/~iank/evhz/
 evhz:
 evhz:
 evhz:
diff --git a/system/evilvte/README b/system/evilvte/README
deleted file mode 100644
index dc3e08e25a..0000000000
--- a/system/evilvte/README
+++ /dev/null
@@ -1,11 +0,0 @@
-evilvte (VTE based, highly customizable terminal emulator)
-
-Evilvte is a VTE based, highly customizable terminal emulator.
-
-Features:
-
- * tabs;
- * tabbar autohide;
- * right click to switch encoding;
- * supports almost all VTE features;
- * build-time configuration.
diff --git a/system/evilvte/evilvte.SlackBuild b/system/evilvte/evilvte.SlackBuild
deleted file mode 100644
index 18dbc4a4f6..0000000000
--- a/system/evilvte/evilvte.SlackBuild
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for evilvte.
-#
-# Copyright 2015-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=evilvte
-VERSION=${VERSION:-20140330}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-SRCVER=${SRCVER:-8dfa41e26bc640dd8d8c7317ff7d04e3c01ded8a}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz || tar xvf $CWD/$SRCVER.tar.gz
-mv $PRGNAM-$SRCVER $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mv $PKG/usr/share/man $PKG/usr/man
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp ChangeLog gpl-2.0.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/evilvte/evilvte.info b/system/evilvte/evilvte.info
deleted file mode 100644
index 9ec5d1d50e..0000000000
--- a/system/evilvte/evilvte.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="evilvte"
-VERSION="20140330"
-HOMEPAGE="http://www.calno.com/evilvte/"
-DOWNLOAD="https://github.com/caleb-/evilvte/archive/8dfa41e26bc640dd8d8c7317ff7d04e3c01ded8a.tar.gz"
-MD5SUM="e09c34ac7d5afaf6ca785b7984df70ed"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
diff --git a/system/evilvte/slack-desc b/system/evilvte/slack-desc
deleted file mode 100644
index d548cc1f1b..0000000000
--- a/system/evilvte/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-evilvte: evilvte (VTE based, highly customizable terminal emulator)
-evilvte:
-evilvte: Evilvte is a VTE based, highly customizable terminal emulator.
-evilvte:
-evilvte: Home page: http://www.calno.com/evilvte/
-evilvte:
-evilvte:
-evilvte:
-evilvte:
-evilvte:
-evilvte:
diff --git a/system/evolution-data-server/3.36.5-gtk-doc-1.32-compat.patch b/system/evolution-data-server/3.36.5-gtk-doc-1.32-compat.patch
new file mode 100644
index 0000000000..3a202bee15
--- /dev/null
+++ b/system/evolution-data-server/3.36.5-gtk-doc-1.32-compat.patch
@@ -0,0 +1,32 @@
+From 24c7ca17eaf69211b75f2882c11aeff01a3cad01 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 8 Aug 2020 18:59:25 +0300
+Subject: [PATCH] I#158 - Workaround build error with gtk-doc-1.32
+
+---
+ src/calendar/libecal/e-cal-time-util.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/calendar/libecal/e-cal-time-util.h b/src/calendar/libecal/e-cal-time-util.h
+index 8acb13061..11c9d3369 100644
+--- a/src/calendar/libecal/e-cal-time-util.h
++++ b/src/calendar/libecal/e-cal-time-util.h
+@@ -150,6 +150,7 @@ void		time_to_gdate_with_zone	(GDate *date,
+  * struct tm manipulation
+  **************************************************************************/
+ 
++#ifndef __GTK_DOC_IGNORE__
+ struct tm	e_cal_util_icaltime_to_tm
+ 					(const ICalTime *itt);
+ struct tm	e_cal_util_icaltime_to_tm_with_zone
+@@ -159,6 +160,7 @@ struct tm	e_cal_util_icaltime_to_tm_with_zone
+ ICalTime *	e_cal_util_tm_to_icaltime
+ 					(struct tm *tm,
+ 					 gboolean is_date);
++#endif
+ 
+ G_END_DECLS
+ 
+-- 
+2.20.1
+
diff --git a/system/evolution-data-server/README b/system/evolution-data-server/README
new file mode 100644
index 0000000000..a06682602f
--- /dev/null
+++ b/system/evolution-data-server/README
@@ -0,0 +1,22 @@
+Evolution Data Server manages access to the calendar, tasks and 
+addressbook information available for Evolution and other applications.
+
+It is a CORBA component which, when activated, allows concurrent access 
+by several client applications to the same data, adding to that 
+notifications of changes, which are signalled to all clients. 
+
+Its extensible architecture, allows the addition of plugins to manage 
+different kinds of calendar/tasks/addressbook sources, by just writing 
+a shared library, which will be loaded by evolution-data-server on 
+startup. 
+
+Below variables can be used to configure the build:
+    INTROSPECTION=no  : Enable GObject introspection
+                        the dependecies must be compiled with 
+                        introspection or the build will fail.
+    VALA=no           : Generate VALA bindings
+                        Requires INTROSPECTION=YES
+    GTKDOC=yes        : Use gtk-doc to build documentation
+    TESTS=yes         : Enable installed tests
+    GCOV=yes          : Enable build with GCOV code coverage
+                        Requires gcov
diff --git a/system/evolution-data-server/doinst.sh b/system/evolution-data-server/doinst.sh
new file mode 100644
index 0000000000..4e32ba1722
--- /dev/null
+++ b/system/evolution-data-server/doinst.sh
@@ -0,0 +1,10 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
+fi
diff --git a/system/evolution-data-server/evolution-data-server.SlackBuild b/system/evolution-data-server/evolution-data-server.SlackBuild
new file mode 100644
index 0000000000..df1d1ae960
--- /dev/null
+++ b/system/evolution-data-server/evolution-data-server.SlackBuild
@@ -0,0 +1,166 @@
+#!/bin/bash
+
+# Slackware build script for evolution-data-server
+
+# Copyright 2022 Ozan Türkyılmaz
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=evolution-data-server
+VERSION=${VERSION:-3.44.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+INTROSPECTION=${INTROSPECTION:-yes}
+VALA=${VALA:-yes}
+GTKDOC=${GTKDOC:-NO}
+TESTS=${TESTS:-NO}
+GCOV=${GCOV:-NO}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+if [ "$VALA" = "yes" ]; then
+  VALAP="YES"
+  INTROSPECTION="yes"
+else
+  VALAP="NO"
+fi
+
+if [ "$INTROSPECTION" = "yes" ]; then
+  INTROSPECTIONP="YES"
+else
+  INTROSPECTIONP="NO"
+fi
+
+if [ "$GTKDOC" = "yes" ]; then
+  GTKDOCP="YES"
+else
+  GTKDOCP="NO"
+fi
+
+if [ "$TESTS" = "yes" ]; then
+  TESTSP="YES"
+else
+  TESTSP="NO"
+fi
+
+if [ "$GCOV" = "yes" ]; then
+  GCOVP="YES"
+else
+  GCOVP="NO"
+fi
+
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+#This is patch to fix build with gtkdoc from Gentoo
+patch -p1 < $CWD/3.36.5-gtk-doc-1.32-compat.patch
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSYSCONF_INSTALL_DIR=/etc \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DENABLE_INTROSPECTION="$INTROSPECTIONP" \
+    -DENABLE_UOA=OFF \
+    -DENABLE_VALA_BINDINGS="$VALAP" \
+    -DENABLE_INSTALLED_TESTS="$TESTSP" \
+    -DENABLE_GOOGLE=ON \
+    -DENABLE_GOOGLE_AUTH=ON \
+    -DWITH_LDAP=ON \
+    -DWITH_GWEATHER4=ON \
+    -DENABLE_GTK_DOC="$GTKDOCP" \
+    -DWITH_SYSTEMDUSERUNITDIR=no \
+    -DENABLE_GOA=ON \
+    -DENABLE_GTK=ON \
+    -DENABLE_CODE_COVERAGE="$GCOVP" \
+    -DENABLE_SMIME=ON \
+    -DENABLE_IPV6=ON \
+    -DBUILD_TESTING=OFF \
+    -DCMAKE_BUILD_TYPE=Release ..\
+    -G Ninja
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING NEWS ChangeLog MAINTAINERS README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/evolution-data-server/evolution-data-server.info b/system/evolution-data-server/evolution-data-server.info
new file mode 100644
index 0000000000..df86e99474
--- /dev/null
+++ b/system/evolution-data-server/evolution-data-server.info
@@ -0,0 +1,10 @@
+PRGNAM="evolution-data-server"
+VERSION="3.44.4"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution/"
+DOWNLOAD="https://download.gnome.org/sources/evolution-data-server/3.44/evolution-data-server-3.44.4.tar.xz"
+MD5SUM="fe8f0b1b77594589d6897de4b160015e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libgweather4 libgdata"
+MAINTAINER="Ozan Türkyılmaz"
+EMAIL="ozan.turkyilmaz@gmail.com"
diff --git a/system/evolution-data-server/slack-desc b/system/evolution-data-server/slack-desc
new file mode 100644
index 0000000000..5f78ce69db
--- /dev/null
+++ b/system/evolution-data-server/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+                     |-----handy-ruler------------------------------------------------------|
+evolution-data-server: evolution-data-server (Desktop Information Store)
+evolution-data-server:
+evolution-data-server: The evolution-data-server provides a single database for common,
+evolution-data-server: desktop-wide information such as a user's address book.
+evolution-data-server:
+evolution-data-server:
+evolution-data-server:
+evolution-data-server:
+evolution-data-server: https://wiki.gnome.org/Apps/Evolution/
+evolution-data-server:
+evolution-data-server:
diff --git a/system/evtest/README b/system/evtest/README
new file mode 100644
index 0000000000..e5344d4898
--- /dev/null
+++ b/system/evtest/README
@@ -0,0 +1,15 @@
+evtest (utility to monitor Linux input device events)
+
+evtest is a tool to print evdev kernel events. It reads directly from
+the kernel device and prints a device description and the events with
+the value and the symbolic name. It can be used to determine mice
+button bindings, keymaps for exotic keyboards. It is commonly used to
+debug issues with input devices in X.Org.
+
+Note: If your user is a member of the 'input' group, you should be
+able to use evtest without root privilege. Otherwise, use "su" or
+"sudo" to run it as root.
+
+Note: On the one of the SlackBuild author's systems, running evtest
+enables Numlock. Not a real problem, but it was surprising the first
+time it happened.
diff --git a/system/evtest/evtest.SlackBuild b/system/evtest/evtest.SlackBuild
new file mode 100644
index 0000000000..3065017ce3
--- /dev/null
+++ b/system/evtest/evtest.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+# Slackware build script for evtest
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Using the source as (re)packaged by Debian, because upstream doesn't
+# seem to release tarballs (not even auto-generated git snapshot
+# ones).
+
+# 20221227 bkw: updated for v1.3.5, fixed PKGTYPE in template.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=evtest
+VERSION=${VERSION:-1.35}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+sh autogen.sh
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+
+# evtest.txt is just a preformatted copy of the man page, don't bother.
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/evtest/evtest.info b/system/evtest/evtest.info
new file mode 100644
index 0000000000..5e5d94c3f8
--- /dev/null
+++ b/system/evtest/evtest.info
@@ -0,0 +1,10 @@
+PRGNAM="evtest"
+VERSION="1.35"
+HOMEPAGE="https://cgit.freedesktop.org/evtest/"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/e/evtest/evtest_1.35.orig.tar.xz"
+MD5SUM="636241eb1d8369c8f40f73ccddd930ac"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/evtest/slack-desc b/system/evtest/slack-desc
new file mode 100644
index 0000000000..7829de9ed6
--- /dev/null
+++ b/system/evtest/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+evtest: evtest (utility to monitor Linux input device events)
+evtest:
+evtest: evtest is a tool to print evdev kernel events. It reads directly from
+evtest: the kernel device and prints a device description and the events with
+evtest: the value and the symbolic name.
+evtest:
+evtest: Note: If your user is a member of the 'input' group, you should be
+evtest: able to use evtest without root privilege. Otherwise, use "su" or
+evtest: "sudo" to run it as root.
+evtest:
+evtest:
diff --git a/system/exa/exa.SlackBuild b/system/exa/exa.SlackBuild
index 48b039ed4b..578e021306 100644
--- a/system/exa/exa.SlackBuild
+++ b/system/exa/exa.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for exa
 
-# Copyright 2017-2019 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-2021 Andrew Clemons, Wellington New Zealand
+# Copyright 2022-2023 Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=exa
-VERSION=${VERSION:-0.9.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.10.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -41,7 +45,11 @@ if [ -z "$ARCH" ]; then
   fi
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -49,15 +57,15 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
-  CARGOTARGET="--target i586-unknown-linux-gnu"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-  CARGOTARGET="--target i686-unknown-linux-gnu"
-elif [ "$ARCH" = "x86_64" ]; then
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
+elif [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "aarch64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  CARGOTARGET="--target x86_64-unknown-linux-gnu"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -130,23 +138,31 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+sed -i "s/version = \"0.11.0-pre\"/version = \"$VERSION\"/" Cargo.lock
+
+CARGO_HOME=.cargo \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-cargo build --release --no-default-features --features default $CARGOTARGET
+cargo build --offline --release $CARGOTARGET
 
 mkdir -p $PKG/usr/bin
-find target -name exa -exec install -m 755 {} $PKG/usr/bin/exa \;
 
-mkdir -p $PKG/usr/share/bash-completion/completions
-mkdir -p $PKG/usr/share/zsh/site-functions
-make install-man install-bash-completions install-zsh-completions DESTDIR=$PKG PREFIX=/usr BASHDIR=/usr/share/bash-completion/completions ZSHDIR=/usr/share/zsh/site-functions
+find target -name $PRGNAM -exec install -m 755 {} $PKG/usr/bin/$PRGNAM \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+unzip -q -d accoutrements $CWD/$PRGNAM-accoutrements-v$VERSION.zip
+
+install -Dm644 accoutrements/man/exa.1 $PKG/usr/man/man1/exa.1
+install -Dm644 accoutrements/man/exa_colors.5 $PKG/usr/man/man5/exa_colors.5
 
-mv $PKG/usr/share/man/ $PKG/usr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+install -Dm644 accoutrements/completions/*.bash $PKG/usr/share/bash-completion/completions/exa
+install -Dm644 accoutrements/completions/*.fish $PKG/usr/share/fish/completions/exa.fish
+install -Dm644 accoutrements/completions/*.zsh $PKG/usr/share/zsh/site-functions/_exa
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENCE README.md $PKG/usr/doc/$PRGNAM-$VERSION
@@ -156,4 +172,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/exa/exa.info b/system/exa/exa.info
index bf7123b84c..3eb3ef16bf 100644
--- a/system/exa/exa.info
+++ b/system/exa/exa.info
@@ -1,134 +1,98 @@
 PRGNAM="exa"
-VERSION="0.9.0"
+VERSION="0.10.1"
 HOMEPAGE="https://github.com/ogham/exa"
-DOWNLOAD="https://github.com/ogham/exa/archive/v0.9.0/exa-0.9.0.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.12.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-0.1.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.35.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/datetime/datetime-0.4.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/env_logger/env_logger-0.6.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/git2/git2-0.9.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/glob/glob-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/humantime/humantime-1.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/idna/idna-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/iso8601/iso8601-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/kernel32-sys/kernel32-sys-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.51.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libgit2-sys/libgit2-sys-0.8.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.0.25.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/locale/locale-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/matches/matches-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/natord/natord-1.0.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nom/nom-1.2.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.1.43.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.10.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/number_prefix/number_prefix-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-src/openssl-src-111.3.0+1.1.1c.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-sys/openssl-sys-0.9.47.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pad/pad-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/percent-encoding/percent-encoding-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quick-error/quick-error-1.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.54.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_termios/redox_termios-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.1.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/scoped_threadpool/scoped_threadpool-0.1.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-0.6.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/term_grid/term_grid-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/term_size/term_size-0.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/termion/termion-1.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-0.3.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ucd-util/ucd-util-0.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-bidi/unicode-bidi-0.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-1.7.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/users/users-0.9.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8-ranges/utf8-ranges-1.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-build/winapi-build-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.2.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wincolor/wincolor-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/zoneinfo_compiled/zoneinfo_compiled-0.4.8.crate"
-MD5SUM="7eff17e086fe4a809dbf8c612945eabe \
-        cb23a78f4c35abcb2d8d1394645674fe \
-        badb073223ca5a3a22f1dbf0267808a0 \
-        5d7155b7fbc0e234c017f418f0dc9d64 \
-        3664ceb4b5c686f1adabe1f57931c425 \
-        e5767560aad375059c975285c07022c0 \
-        85562346cef4a44a32cc1fadcdd06b50 \
-        9ffb6955a3e044b99bd60c1ea934bcc2 \
-        0cd2bb93a82da2e4ca526b40ae8b341e \
-        244e19eb0ab4ad90aa523890f7104465 \
-        a52ad1aa4f05f96817c8c8e66deebf29 \
-        1df8c7ed6101088c436ca467160fb646 \
+DOWNLOAD="https://github.com/ogham/exa/archive/v0.10.1/exa-0.10.1.tar.gz \
+          https://github.com/ogham/exa/releases/download/v0.10.1/exa-accoutrements-v0.10.1.zip \
+          https://static.crates.io/crates/ansi_term/ansi_term-0.12.1.crate \
+          https://static.crates.io/crates/autocfg/autocfg-1.0.1.crate \
+          https://static.crates.io/crates/bitflags/bitflags-1.2.1.crate \
+          https://static.crates.io/crates/byteorder/byteorder-1.4.3.crate \
+          https://static.crates.io/crates/cc/cc-1.0.67.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://static.crates.io/crates/datetime/datetime-0.5.2.crate \
+          https://static.crates.io/crates/form_urlencoded/form_urlencoded-1.0.1.crate \
+          https://static.crates.io/crates/git2/git2-0.13.17.crate \
+          https://static.crates.io/crates/glob/glob-0.3.0.crate \
+          https://static.crates.io/crates/hermit-abi/hermit-abi-0.1.18.crate \
+          https://static.crates.io/crates/idna/idna-0.2.2.crate \
+          https://static.crates.io/crates/jobserver/jobserver-0.1.21.crate \
+          https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \
+          https://static.crates.io/crates/libc/libc-0.2.93.crate \
+          https://static.crates.io/crates/libgit2-sys/libgit2-sys-0.12.18+1.1.0.crate \
+          https://static.crates.io/crates/libz-sys/libz-sys-1.1.2.crate \
+          https://static.crates.io/crates/locale/locale-0.2.2.crate \
+          https://static.crates.io/crates/log/log-0.4.14.crate \
+          https://static.crates.io/crates/matches/matches-0.1.8.crate \
+          https://static.crates.io/crates/natord/natord-1.0.9.crate \
+          https://static.crates.io/crates/num_cpus/num_cpus-1.13.0.crate \
+          https://static.crates.io/crates/number_prefix/number_prefix-0.4.0.crate \
+          https://static.crates.io/crates/openssl-src/openssl-src-111.15.0+1.1.1k.crate \
+          https://static.crates.io/crates/openssl-sys/openssl-sys-0.9.61.crate \
+          https://static.crates.io/crates/pad/pad-0.1.6.crate \
+          https://static.crates.io/crates/percent-encoding/percent-encoding-2.1.0.crate \
+          https://static.crates.io/crates/pkg-config/pkg-config-0.3.19.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.1.57.crate \
+          https://static.crates.io/crates/scoped_threadpool/scoped_threadpool-0.1.9.crate \
+          https://static.crates.io/crates/term_grid/term_grid-0.1.7.crate \
+          https://static.crates.io/crates/term_size/term_size-0.3.2.crate \
+          https://static.crates.io/crates/tinyvec/tinyvec-1.2.0.crate \
+          https://static.crates.io/crates/tinyvec_macros/tinyvec_macros-0.1.0.crate \
+          https://static.crates.io/crates/unicode-bidi/unicode-bidi-0.3.5.crate \
+          https://static.crates.io/crates/unicode-normalization/unicode-normalization-0.1.17.crate \
+          https://static.crates.io/crates/unicode-width/unicode-width-0.1.8.crate \
+          https://static.crates.io/crates/url/url-2.2.1.crate \
+          https://static.crates.io/crates/users/users-0.11.0.crate \
+          https://static.crates.io/crates/vcpkg/vcpkg-0.2.11.crate \
+          https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi/winapi-0.3.9.crate \
+          https://static.crates.io/crates/zoneinfo_compiled/zoneinfo_compiled-0.5.1.crate"
+MD5SUM="01f0ac8192de592f8db0acc99c101429 \
+        b579973e74923df3b0e8fe35f695d84d \
+        f44e8d1d2e61974b268852797530ea41 \
+        c6443ec8d007c729ba5482008d0c864d \
+        6799c26a7eacaf8e58d3e45c6c5add89 \
+        1e704be5ddde9d6b5383ef1035309f91 \
+        8637708206e07c0b9e726c7b2f4412d6 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        483eecc236461c493fd1aab629cee9e2 \
+        7ee8703970c3fa6a2e37893de742824b \
+        b257bd23af7cae27874de1a97a89a1c6 \
         e7c07242a95ee1df865efe9534e10a34 \
-        4583a67acf00a437e5cd27857210a526 \
-        89cabfcb37602a7b200b1a9cd660ee2e \
-        4867b6387128434a377e6ab91ea65af8 \
-        9d033cc2daa6924420a4a89e6705773f \
-        1c9fee8f180b6f3402849983a45bbd6d \
-        0d58929587967a437054a48d3df3d74f \
-        c754f4e4df5f266482842053824f53a4 \
-        8a79353ba205d0a86f695053dd4d15be \
+        2c4bc5c16b345ce4d4bbf977577fab35 \
+        26da31c4133576b7abd1d7b60c758bbc \
+        04a84513cdad48c92d8363d627904227 \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        7273a349a0cb997f92b8863fc526d4fd \
+        b5b2006aeb90fbd6a12b32ed9c19bb37 \
+        e5768043e447a7423f030c1394440502 \
         4b6711425b661ef923c9ff3ef9ba8c67 \
-        cc65f96341390c0f60f5216e829486e7 \
+        40e508baeee8cdccbc471489b0f449ff \
         7916dcd738a8fa6a2798754c20d6e146 \
-        514a89ff59a9bf0671d7db4812725459 \
         5a9b94ba54ea1f52f2a496ba982e3282 \
-        3796b5abe0f8c5f3a9e9441c5757a52c \
-        4667779e8bc2c1c564a2f8ee1d431b35 \
-        cbdebc326641fcab42bc92a113548740 \
-        9fc51e79791f918b643e3802a2e0e88f \
-        0951beec2d7a0016cfdc535649c58fc6 \
-        116a226eb8cbd3e1f7feec24f51dba15 \
-        e9841fe3647cb717ba37bd36d17eee22 \
-        127403beb2fe017f7ad1b153b1538882 \
-        8a5fc6ba84f3ac8a7e43ecb99322866c \
-        87a9d36f5ebe5eae0c3e8d69d58752e1 \
-        4563373184ff931ec276dc1a659d52d2 \
-        14fab6ea3c2c94779d3c50dd2dffd10e \
-        01cb5402c0fd99cebac702b76f2f2669 \
-        4ee4b798e15d09f65c6e66c7d3c503fd \
-        9d1baf9d7576dd51ecd02dcc76810678 \
+        c36d452e37c73b1e99f40bae18cddfdb \
+        4bbea6a7f7b7715c2e4eb553cf62913c \
+        f81856d4c7022b74e582e81326f8ef70 \
+        fe33e6c7f00ecf6f6a13c7996a1a236c \
+        9ef4dc6ae75b107b9b8eb13d5824bba8 \
+        f490982aceabdbd515348f63e638a782 \
+        448bc61aee07661464d98da7660e9a1d \
+        3cc3a4bd5861ca93d7c0d19129334703 \
         b492e0a70603c3903a44ec5cabd3ba21 \
-        decf47fcc527d6ff7315570be2a9de0f \
         225ea4b479317c9db74e6e74db8ef198 \
-        adf9d2250c2a622c6274514e38d1f559 \
-        6b70927d96d7e02a00964cbd0732dec3 \
-        de04800c89d374b8a843f91d26fa05ad \
-        baaa166f66e90e94b76b7418afd5df90 \
-        d34a9f507f3ecf7d93c07deb74f1cd7c \
-        f403bbb812ce1a2d9270d9159cf9e8d3 \
-        60eec117e8efaa29b898e43319da2b05 \
-        d7c493ca4f84a7d50b53646421a37487 \
-        32f0ced8a8881d2c0572b879bf15b91e \
-        4e027f7213c520594ef3a334d44f162c \
-        9c27232c12abb96c68e10e21f2012639 \
-        e75c0721667b6bc86472ecf7b286d9fc \
-        c900e7dbce808ff8ced375077b17a163 \
+        73d602cc41e3e431bf4fabd129ae1616 \
+        9750b80eb8a2fc79cb20c86752503ddd \
+        7bfcad253aff26bc26c5e3521f3ba891 \
+        2453c0de41d2b13b33c8cc648d0eff15 \
+        9acda194d3610e7d42e09b6de24c717a \
+        4272c279b06b88f8b0ffce7109348e27 \
+        871061b3dab2a322a13effd0a800b05f \
+        d4c929fc9daf131daef04ee7eaa91fd4 \
+        e17e2583e10c6947982de78aeae42a5c \
         db96b50050277bf05a3c68534bbb9586 \
-        4724370f3179d1ab61f3fd8fa60a2368 \
         09de9d01e7331ff3da11f58be8bef0df \
-        b44489eb4799c4fabac3fceb48de54f7 \
-        38569b37293d94fc57b6e1449a1c38aa \
-        2f9f840bd479751f715a8f530976b6bf \
-        800e62b2bcdb24b8095ea9d6ba70ddea"
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        cebfcf2c00532e4559ecad9c9ebaca0a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/execline/README b/system/execline/README
index c3019a5055..d93c027cd2 100644
--- a/system/execline/README
+++ b/system/execline/README
@@ -1,23 +1,22 @@
 execline is a (non-interactive) scripting language, like sh; but its
-syntax is quite different from a traditional shell syntax. The
-execlineb program is meant to be used as an interpreter for a text
-file; the other commands are essentially useful inside an execlineb
-script.
+syntax is quite different from a traditional shell syntax. The execlineb
+program is meant to be used as an interpreter for a text file; the other
+commands are essentially useful inside an execlineb script.
 
 execline is as powerful as a shell: it features conditional loops,
 getopt-style option handling, filename globbing, and more. Meanwhile,
-its syntax is far more logic and predictable than the shell's syntax,
+its syntax is far more logical and predictable than the shell's syntax,
 and has no security issues.
 
 NOTE:
-Upstream recommends building skarnet.org softwares with static libraries
-as most of skarnet.org softwares are small enough that using shared
-libraries are generally not worth using. Therefore, by default, shared
-libraries are not built and binaries are linked against the static
-versions of the skarnet.org libraries.
+Upstream recommends building skarnet.org software with static libraries,
+as most of skarnet.org software are small enough that shared libraries
+are generally not worth using. Therefore, by default, shared libraries
+are not built and binaries are linked against the static versions of the
+skarnet.org libraries.
 
 If you want to also build the shared libraries, pass BUILD_SHARED=yes
-environment variable to the SlackBuild script like below:
+environment variable to this SlackBuild script like below:
 
     BUILD_SHARED=yes ./execline.SlackBuild
 
@@ -27,8 +26,10 @@ libraries and not the static ones, you can do something like:
 
     BUILD_SHARED=yes BUILD_STATIC=no ./execline.SlackBuild
 
-If you just want to build and use skarnet.org softwares, building only
+If you just want to build and use skarnet.org software, building only
 the static libraries should be sufficient.
 
 If you want the binaries to be linked against the shared versions of the
-skarnet.org libraries, pass LINK_SHARED=yes to the script.
+skarnet.org libraries, pass LINK_SHARED=yes to the script, i.e.,
+
+    LINK_SHARED=yes ./execline.SlackBuild
diff --git a/system/execline/execline.SlackBuild b/system/execline/execline.SlackBuild
index dac9e7f781..9f6c55eaa3 100644
--- a/system/execline/execline.SlackBuild
+++ b/system/execline/execline.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for execline
 
@@ -23,10 +23,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix doc dir permissions.
+# - remove useless INSTALL from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=execline
-VERSION=${VERSION:-2.7.0.1}
+VERSION=${VERSION:-2.9.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,17 +66,19 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# By default, only static libraries are built. If you need to build the shared libraries, just pass
-# BUILD_SHARED=yes to this script
+# By default, only static libraries are built. If you want to also build the
+# shared libraries, just pass BUILD_SHARED=yes to this script.
 BUILD_STATIC=${BUILD_STATIC:-yes}
 BUILD_SHARED=${BUILD_SHARED:-no}
 [ "$BUILD_STATIC" = "no" ] && LIBS_CONF="--disable-static"
 [ "$BUILD_SHARED" = "yes" ] && LIBS_CONF="--enable-shared $LIBS_CONF"
 
-# By default, all binaries are linked against the static versions of the skarnet.org libraries
-# Pass LINK_SHARED=yes to link the binaries against the shared versions of the skarnet.org libraries
-# Also, if you only built the shared versions of the skarnet.org libraries, the binaries will be
-# linked against shared libraries automatically, as though LINK_SHARED=yes is passed to this script
+# By default, all binaries are linked against the static versions of the
+# skarnet.org libraries. Pass LINK_SHARED=yes to link the binaries against the
+# shared versions of the skarnet.org libraries. If you only built the shared
+# versions of the skarnet.org libraries, the binaries will be linked against
+# shared libraries automatically, as though LINK_SHARED=yes is passed to this
+# script.
 LINK_SHARED=${LINK_SHARED:-no}
 [ "$LINK_SHARED" = "yes" ] && LIBS_CONF="--disable-allstatic $LIBS_CONF"
 
@@ -80,13 +93,13 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
+sh ./configure \
   --dynlibdir=/lib${LIBDIRSUFFIX} \
   --bindir=/bin \
   --libexecdir=/usr/libexec \
@@ -100,12 +113,18 @@ make
 make strip
 make install DESTDIR=$PKG
 
+# 20220410 bkw: these dirs get installed setgid, ugh.
+chmod g-s doc examples{,/etc{,/env-startup}}
+
+# 20220410 bkw: this is supposed to be an example, make it exemplary:
+echo '/var/mail/<username>' > examples/etc/env-startup/MAIL
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README doc examples $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README doc examples $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/execline/execline.info b/system/execline/execline.info
index 9c13ab0f5e..079aaac2e0 100644
--- a/system/execline/execline.info
+++ b/system/execline/execline.info
@@ -1,8 +1,8 @@
 PRGNAM="execline"
-VERSION="2.7.0.1"
+VERSION="2.9.4.0"
 HOMEPAGE="https://skarnet.org/software/execline/"
-DOWNLOAD="https://skarnet.org/software/execline/execline-2.7.0.1.tar.gz"
-MD5SUM="8caf152cd354c7b0e805242828fbc409"
+DOWNLOAD="https://skarnet.org/software/execline/execline-2.9.4.0.tar.gz"
+MD5SUM="ab98d90c068f99c854277c6c8c696072"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="skalibs"
diff --git a/system/exfat-utils/README b/system/exfat-utils/README
index 0e76c3b0d0..27c3334be0 100644
--- a/system/exfat-utils/README
+++ b/system/exfat-utils/README
@@ -1,5 +1,5 @@
-This project aims to provide a full-featured exFAT file system implementation
-for GNU/Linux and other Unix-like systems as a FUSE module and a set of
-utilities.
+This project aims to provide a full-featured exFAT file system
+implementation for GNU/Linux and other Unix-like systems as a FUSE
+module and a set of utilities.
 
 This package contains the utilities.
diff --git a/system/exfat-utils/exfat-utils.SlackBuild b/system/exfat-utils/exfat-utils.SlackBuild
index adc970fca0..550720942f 100644
--- a/system/exfat-utils/exfat-utils.SlackBuild
+++ b/system/exfat-utils/exfat-utils.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for exfat-utils
 
@@ -23,26 +23,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=exfat-utils
 VERSION=${VERSION:-1.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -98,4 +108,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/exomizer/exomizer.SlackBuild b/system/exomizer/exomizer.SlackBuild
index a945e68be4..862cdb6885 100644
--- a/system/exomizer/exomizer.SlackBuild
+++ b/system/exomizer/exomizer.SlackBuild
@@ -1,11 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for exomizer
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210826 bkw: update for v3.1.1.
+
+# 20210225 bkw: update for v3.1.0, try using upstream's download
+# URL again. Handle bitbucket adding ?rev=<hash> to the filename, by
+# using .zip* as the source filename. Not ideal, but workable.
+
 # 20191201 bkw: update for v3.0.2
 # 20180829 bkw: update for v3.0.1
 
@@ -16,10 +22,13 @@
 # - only install exoraw if it exists (was removed in 3.0.0)
 # - can still build with VERSION=2.0.9 or VERSION=2.0.10, if needed
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=exomizer
-VERSION=${VERSION:-3.0.2}
+VERSION=${VERSION:-3.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -29,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -56,8 +69,11 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-unzip $CWD/${PRGNAM}${VERSION//./}.zip -x dos/\* win32/\* || \
-  unzip $CWD/$PRGNAM-$VERSION.zip -x dos/\* win32/\*
+
+# 20221227 bkw: stop this from failing when I've got 2 copies of
+# the zip file in my directory (one with .1 at the end of the name).
+ZIPFILE=$( /bin/ls $CWD/$PRGNAM-$VERSION.zip* | head -1 )
+unzip $ZIPFILE -x win32/\*
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
@@ -78,4 +94,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/exomizer/exomizer.info b/system/exomizer/exomizer.info
index 0333729a20..06d4d3ba0c 100644
--- a/system/exomizer/exomizer.info
+++ b/system/exomizer/exomizer.info
@@ -1,10 +1,10 @@
 PRGNAM="exomizer"
-VERSION="3.0.2"
+VERSION="3.1.1"
 HOMEPAGE="https://bitbucket.org/magli143/exomizer/wiki/Home"
-DOWNLOAD="https://slackware.uk/~urchlay/src/exomizer-3.0.2.zip"
-MD5SUM="5fa0cbb09ed83a6f1898e8a9879508a6"
+DOWNLOAD="https://bytebucket.org/magli143/exomizer/wiki/downloads/exomizer-3.1.1.zip?rev=f0759c901918f9fd8a3690241ec9ec09fbd0dfbc"
+MD5SUM="c50423f0d3fd26de352991b0430a73a7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/ext4magic/01-i_dir_acl.patch b/system/ext4magic/01-i_dir_acl.patch
new file mode 100644
index 0000000000..37e9c47510
--- /dev/null
+++ b/system/ext4magic/01-i_dir_acl.patch
@@ -0,0 +1,29 @@
+From: Gokturk Yuksek <gokturk@gentoo.org>
+Subject: [PATCH] src/inode: supersede i_dir_acl with i_size_high
+
+The upstream has removed the macro that defined i_dir_acl as
+i_size_high which causes a build failure with the later versions of
+e2fsprogs. Replace every reference to inode->i_dir_acl with
+inode->i_size_high.
+
+[0] https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=578fcbfd2e61e0b13ce8c7b62804c941d6c1eb8e
+
+--- a/src/inode.c
++++ b/src/inode.c
+@@ -404,14 +404,14 @@
+         fprintf(out,
+                         "%sFile ACL: %d    Directory ACL: %d Translator: %d\n",
+                         prefix,
+-                        inode->i_file_acl, LINUX_S_ISDIR(inode->i_mode) ? inode->i_dir_acl : 0,
++                        inode->i_file_acl, LINUX_S_ISDIR(inode->i_mode) ? inode->i_size_high : 0,
+                         inode->osd1.hurd1.h_i_translator);
+         else
+                 fprintf(out, "%sFile ACL: %llu    Directory ACL: %d\n",
+                         prefix,
+                         inode->i_file_acl | ((long long)
+                                 (inode->osd2.linux2.l_i_file_acl_high) << 32),
+-                        LINUX_S_ISDIR(inode->i_mode) ? inode->i_dir_acl : 0);
++                        LINUX_S_ISDIR(inode->i_mode) ? inode->i_size_high : 0);
+         if (os == EXT2_OS_LINUX)
+                 fprintf(out, "%sLinks: %d   Blockcount: %llu\n",
+                         prefix, inode->i_links_count,
diff --git a/system/ext4magic/02-Fix-undefined-reference-to-makedev.patch b/system/ext4magic/02-Fix-undefined-reference-to-makedev.patch
new file mode 100644
index 0000000000..d3b4ba4016
--- /dev/null
+++ b/system/ext4magic/02-Fix-undefined-reference-to-makedev.patch
@@ -0,0 +1,30 @@
+From d412778d45774225ff4b36470193a6056ecc03cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= <seblu@seblu.net>
+Date: Sun, 11 Nov 2018 14:42:38 +0100
+Subject: [PATCH] Fix undefined reference to `makedev'
+
+Add include to sys/sysmacros.h to fix compilation with gcc 8.2.1
+
+Error:
+gcc -O2 -g -D_FILE_OFFSET_BITS=64 -g -O2 -o ext4magic ext4magic-block.o ext4magic-dir_list.o ext4magic-ext4magic.o ext4magic-extent_db.o ext4magic-file_type.o ext4magic-hard_link_stack.o ext4magic-imap_search.o ext4magic-inode.o ext4magic-journal.o ext4magic-lookup_local.o ext4magic-magic_block_scan.o ext4magic-recover.o ext4magic-ring_buf.o ext4magic-util.o  -le2p -luuid -lblkid -lz -lbz2 -lmagic -lext2fs
+/bin/ld: ext4magic-recover.o: in function `recover_file':
+/home/seblu/scm/foss/ext4magic/src/recover.c:478: undefined reference to `makedev'
+---
+ src/recover.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/recover.c b/src/recover.c
+index 41b4aee..30b5d8f 100644
+--- a/src/recover.c
++++ b/src/recover.c
+@@ -24,6 +24,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <utime.h>
++#include <sys/sysmacros.h>
+ 
+ #ifndef O_LARGEFILE
+ #define O_LARGEFILE 0
+-- 
+2.19.1
+
diff --git a/system/ext4magic/ext4magic.SlackBuild b/system/ext4magic/ext4magic.SlackBuild
index fe8743755b..34de5c3da7 100644
--- a/system/ext4magic/ext4magic.SlackBuild
+++ b/system/ext4magic/ext4magic.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ext4magic
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ext4magic
 VERSION=${VERSION:-0.3.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -62,6 +72,9 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+# thanks arch maintainers
+patch -p1 < $CWD/01-i_dir_acl.patch
+patch -p1 < $CWD/02-Fix-undefined-reference-to-makedev.patch
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -97,4 +110,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/extract-xiso/README b/system/extract-xiso/README
deleted file mode 100644
index 7fa80c6622..0000000000
--- a/system/extract-xiso/README
+++ /dev/null
@@ -1,5 +0,0 @@
-extract-xiso (extract disc image .iso's of XBox games)
-
-extract-xiso  is  the premier backup tool for creating and extracting
-disc image .iso's of XBox games. OS support includes  Linux, FreeBSD,
-Mac OS X (i386 and PowerPC), Windows and other UNIXes.
diff --git a/system/extract-xiso/extract-xiso.SlackBuild b/system/extract-xiso/extract-xiso.SlackBuild
deleted file mode 100644
index 9b0442cc50..0000000000
--- a/system/extract-xiso/extract-xiso.SlackBuild
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for extract-xiso.
-#
-# Copyright 2015-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=extract-xiso
-VERSION=${VERSION:-2.7.1}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-mv $PRGNAM $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-make prefix=/usr DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/bin
-cp extract-xiso $PKG/usr/bin
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.TXT README.TXT $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/extract-xiso/extract-xiso.info b/system/extract-xiso/extract-xiso.info
deleted file mode 100644
index 9be9114975..0000000000
--- a/system/extract-xiso/extract-xiso.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="extract-xiso"
-VERSION="2.7.1"
-HOMEPAGE="https://sourceforge.net/projects/extract-xiso/"
-DOWNLOAD="https://ufpr.dl.sourceforge.net/project/extract-xiso/extract-xiso%20source/extract-xiso-2.7.1.tar.gz"
-MD5SUM="464aeb312aca6f4a1ffee42384b3c738"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
diff --git a/system/extract-xiso/slack-desc b/system/extract-xiso/slack-desc
deleted file mode 100644
index 6b7ae475be..0000000000
--- a/system/extract-xiso/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-            |-----handy-ruler------------------------------------------------------|
-extract-xiso: extract-xiso (extract disc image)
-extract-xiso:
-extract-xiso: extract-xiso  is  the premier backup tool for creating and extracting
-extract-xiso: disc image .iso's of XBox games.  OS support includes  Linux, FreeBSD,
-extract-xiso: Mac OS X (i386 and PowerPC), Windows and other UNIXes.
-extract-xiso:
-extract-xiso: Home page: https://sourceforge.net/projects/extract-xiso/
-extract-xiso:
-extract-xiso:
-extract-xiso:
-extract-xiso:
diff --git a/system/extundelete/extundelete-e2fsprogs-1.44.1.patch b/system/extundelete/extundelete-e2fsprogs-1.44.1.patch
new file mode 100644
index 0000000000..61c078bfb8
--- /dev/null
+++ b/system/extundelete/extundelete-e2fsprogs-1.44.1.patch
@@ -0,0 +1,12 @@
+diff -ru extundelete-0.2.4.orig/src/insertionops.cc extundelete-0.2.4/src/insertionops.cc
+--- extundelete-0.2.4.orig/src/insertionops.cc	2018-06-04 22:19:22.460051515 +0000
++++ extundelete-0.2.4/src/insertionops.cc	2018-06-04 22:19:49.256717673 +0000
+@@ -33,7 +33,7 @@
+   os << "File flags: " << inode.i_flags << std::endl;
+   os << "File version (for NFS): " << inode.i_generation << std::endl;
+   os << "File ACL: " << inode.i_file_acl << std::endl;
+-  os << "Directory ACL: " << inode.i_dir_acl << std::endl;
++  os << "Directory ACL: " << inode.i_size_high << std::endl;
+   os << "Fragment address: " << inode.i_faddr << std::endl;
+   os << "Direct blocks: ";
+   for (int n = 0; n < EXT2_NDIR_BLOCKS; n++)
diff --git a/system/extundelete/extundelete.1 b/system/extundelete/extundelete.1
new file mode 100644
index 0000000000..0eadd3efad
--- /dev/null
+++ b/system/extundelete/extundelete.1
@@ -0,0 +1,117 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH EXTUNDELETE 1 "September 29, 2010"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+extundelete \- utility to undelete files from an ext3 or ext4 partition.
+.SH SYNOPSIS
+.B extundelete
+.RI [ options ] " device-file" ...
+.br
+.SH DESCRIPTION
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBextundelete\fP is a utility that can recover deleted files from an ext3 or ext4 partition
+.br
+extundelete uses the information stored in the partition's journal to attempt to recover
+a file that has been deleted from the partition.
+.br
+There is no guarantee that any particular file will be able to be undeleted, so always try to have
+a good backup system in place, or at least put one in place after recovering your files!
+
+.SH OPTIONS
+.TP
+.B \-\-version
+Prints the version number of extundelete.
+.TP
+.B \-\-help
+Print a brief usage summary for extundelete.
+.TP
+.B Partition name
+Name of the partition that has deleted files, such as /dev/sda3.
+.br
+Could also be the file name of a copy of the partition, such as that made with dd.
+.TP
+.B \-\-superblock
+Prints information about the filesystem from the superblock.
+.TP
+.B \-\-journal \-\-superblock
+Prints information about the journal from the journal's superblock.
+.TP
+.B \-\-inode #
+Prints the information from the inode number of the filesystem given, such as "\-\-inode 2".
+.TP
+.B \-\-block #
+Prints the contents of the block, called as "\-\-block 9652".
+.TP	
+.B \-\-restore\-file path/to/deleted/file
+Attempts to restore the file which was deleted at the given filename, called as "\-\-restore-file dirname/filename".
+.TP
+.B \-\-restore\-inode #
+Used to restore inodes by number, called as "\-\-restore-inode 2569".
+.br
+Also accepts a list of inodes separated by only commas, such as "\-\-restore-inode 2569,5692,6925".
+.TP
+.B \-\-restore\-files filename
+Restores a list of files. First, construct a list of files in the same style as would be
+.br
+used in the \-\-restore\-file option, and save it to the file "filename". 
+.br
+Then, this option may be used to attempt to restore those files with a single call to extundelete.
+.br
+This form also reduces redundancy from multiple calls parsing the journal multiple times.
+.TP
+.B \-\-restore\-all
+Restores all files possible to undelete to their names before deletion, when possible.
+Other files are restored to a filename like "file.NNNN". 
+.TP
+.B \-\-restore\-directory path/of/directory
+Restores all files possible to link to specified directory to their names before deletion, when possible.
+.TP
+.B \-j journal_dev
+Specifies the device that is the external journal of the file system.
+.TP
+.B \-b block_number
+Specifies the block number of the backup superblock to be used when opening the file system.
+.TP
+.B \-B block_size
+Specifies the block size of the partition to be used when opening the file system.
+.TP
+.B \-\-before date
+Only restore files deleted before the date specified, which should be in the form of the number of seconds since the UNIX epoch.
+Use a shell command like
+.br
+$ date \-d "Aug 1 9:02" +%s
+.br
+to convert a human-readable date to the proper format. The conversion from the number of seconds to a readable format may be found 
+by using either of the following:
+.br
+$ date \-d@1234567890
+.br
+$ perl \-le "print scalar localtime 1234567890" 
+.TP
+.B \-\-after date
+Only restore files deleted after the date specified, which should be in the form of the number of seconds since the UNIX epoch.
+.br
+See the notes for the \-\-before option for more information. 
+.br
+.SH AUTHOR
+extundelete was written by Nic Case <number9652@users.sourceforge.net> Copyright (C) 2009, 2012
+.PP
+This manual page was written by Elías Alejandro Año Mendoza <ealmdz@gmail.com>,
+for the Debian project (and may be used by others).
diff --git a/system/extundelete/extundelete.SlackBuild b/system/extundelete/extundelete.SlackBuild
index 5707b90896..6d5b37af11 100644
--- a/system/extundelete/extundelete.SlackBuild
+++ b/system/extundelete/extundelete.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for extundelete
 
@@ -23,38 +23,45 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 #
-# Markus Reichelt, slackbuilds@mareichelt.de, 0xCCEEF115
+# Markus Reichelt, (email removed)
+
+# 20230709 bkw: BUILD=2
+# - new maintainer.
+# - add man page, cribbed from Debian.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=extundelete
 VERSION=${VERSION:-0.2.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
     *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -66,30 +73,29 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+patch -p1 < $CWD/extundelete-e2fsprogs-1.44.1.patch
 
-mkdir -p $PKG/usr/bin $PKG/usr/doc
+mkdir -p $PKG/usr/bin
 
-DFLAGS=$LDFLAGS \
 CFLAGS=$SLKCFLAGS \
-./configure --prefix=$PKG/usr
+./configure --prefix=/usr
 
 make
-make install
+make install-strip DESTDIR=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE* README* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a LICENSE* README* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/extundelete/extundelete.info b/system/extundelete/extundelete.info
index d6558bd741..c7127dc206 100644
--- a/system/extundelete/extundelete.info
+++ b/system/extundelete/extundelete.info
@@ -6,5 +6,5 @@ MD5SUM="77e626ad31433680c0a222069295d2ca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Markus Reichelt"
-EMAIL="slackbuilds@mareichelt.de"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/f2fs_tools/README b/system/f2fs_tools/README
deleted file mode 100644
index 9b03454053..0000000000
--- a/system/f2fs_tools/README
+++ /dev/null
@@ -1 +0,0 @@
-Userland tools for the f2fs filesystem.
diff --git a/system/f2fs_tools/f2fs_tools.SlackBuild b/system/f2fs_tools/f2fs_tools.SlackBuild
deleted file mode 100644
index 198eb74854..0000000000
--- a/system/f2fs_tools/f2fs_tools.SlackBuild
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-# Slackware build script for <f2fs_tools>
-#
-# Michales (clavisound) Michaloudes korgie@gmail.com <2014>
-
-PRGNAM=f2fs_tools
-SRCNAM=f2fs-tools
-VERSION=${VERSION:-1.6.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-v$VERSION
-tar xvf $CWD/$SRCNAM-v$VERSION.tar.gz
-cd $SRCNAM-v$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" 
-
-autoreconf --install
-
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-static \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog README VERSION \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/f2fs_tools/f2fs_tools.info b/system/f2fs_tools/f2fs_tools.info
deleted file mode 100644
index cda93b1788..0000000000
--- a/system/f2fs_tools/f2fs_tools.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="f2fs_tools"
-VERSION="1.6.1"
-HOMEPAGE="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git"
-DOWNLOAD="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-v1.6.1.tar.gz"
-MD5SUM="3fc6caa14569e059fc41807e42641a11"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Michales Michaloudes"
-EMAIL="korgie@gmail.com"
diff --git a/system/f2fs_tools/slack-desc b/system/f2fs_tools/slack-desc
deleted file mode 100644
index cb5332d95f..0000000000
--- a/system/f2fs_tools/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-          |-----handy-ruler------------------------------------------------------|
-f2fs_tools: f2fs_tools (Userland tools for the f2fs filesystem)
-f2fs_tools:
-f2fs_tools: Project URL:
-f2fs_tools: https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git
-f2fs_tools:
-f2fs_tools:
-f2fs_tools:
-f2fs_tools:
-f2fs_tools:
-f2fs_tools:
-f2fs_tools:
diff --git a/system/f3/f3.SlackBuild b/system/f3/f3.SlackBuild
index 60368eeffa..2acb0a6fde 100644
--- a/system/f3/f3.SlackBuild
+++ b/system/f3/f3.SlackBuild
@@ -1,25 +1,50 @@
-#!/bin/sh
-#
+#!/bin/bash
+
 # Slackware build script for f3
+
+# Copyright 2022 Konrad J Hambrick Round Rock TX US
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
 #
-# adapted by Konrad J Hambrick <kjhambrick@gmail.com>
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM="f3"
-VERSION=${VERSION:-7.0}
+VERSION=${VERSION:-8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
+       *) ARCH=$(uname -m) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$PRGNAM}
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
@@ -42,7 +67,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -64,6 +89,8 @@ if [ "$EXTRA" = "YES" ]; then
    make extra PREFIX=$PKG/usr && make install-extra PREFIX=$PKG/usr
 fi
 
+strip $PKG/usr/bin/*
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 install -m 0644 changelog README.rst LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 install -m 0755 log-f3wr f3write.h2w $PKG/usr/doc/$PRGNAM-$VERSION
@@ -78,4 +105,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/f3/f3.info b/system/f3/f3.info
index b12bc741f6..3661f690da 100644
--- a/system/f3/f3.info
+++ b/system/f3/f3.info
@@ -1,8 +1,8 @@
 PRGNAM="f3"
-VERSION="7.0"
+VERSION="8.0"
 HOMEPAGE="http://oss.digirati.com.br/f3/"
-DOWNLOAD="https://github.com/AltraMayor/f3/archive/v7.0/f3-7.0.tar.gz"
-MD5SUM="d3501d47064c28ac962f4043e582c144"
+DOWNLOAD="https://github.com/AltraMayor/f3/archive/v8.0/f3-8.0.tar.gz"
+MD5SUM="d6ffaa87dfb51a816085a25e49a18e70"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/facter/README b/system/facter/README
index d1c815947d..bcc2b93978 100644
--- a/system/facter/README
+++ b/system/facter/README
@@ -1,3 +1,5 @@
+facter (executable and ruby module for collecting OS information)
+
 Facter is a lightweight program that gathers basic node information
 about the hardware and operating system. Facter is especially useful
 for retrieving things like operating system names, hardware
diff --git a/system/facter/facter.SlackBuild b/system/facter/facter.SlackBuild
index 7788f94801..b0921898ef 100644
--- a/system/facter/facter.SlackBuild
+++ b/system/facter/facter.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for facter
 
@@ -22,26 +22,35 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220211 bkw: Modified by SlackBuilds.org, to fix the build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=facter
 VERSION=${VERSION:-3.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,33 +74,35 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
+
+# 20220211 bkw: I curse all who put -Werror in released source code.
+sed -i 's,-Werror,,g' vendor/leatherman/cmake/cflags.cmake
 
 if [ "$ARCH" == "x86_64" ]; then
   patch -p0 < $CWD/facter-lib64.patch
 fi
 
+# 20220211 bkw: 15.0 needs:
+SLKCFLAGS+=" -fpermissive"
+
 mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=misleading-indentation" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
 mv $PKG/usr/share/man $PKG/usr/man
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+rmdir $PKG/usr/share
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CONTRIBUTING.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
@@ -101,4 +112,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/facter/slack-desc b/system/facter/slack-desc
index c9aa0411dd..e6913b4b6f 100644
--- a/system/facter/slack-desc
+++ b/system/facter/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-facter: facter (Ruby module for collecting facts about a host OS)
+facter: facter (executable and ruby module for collecting OS information)
 facter:
 facter: Facter is a lightweight program that gathers basic node information
 facter: about the hardware and operating system. Facter is especially useful
diff --git a/system/fakechroot/fakechroot-2.20.1-glibc-2.33.patch b/system/fakechroot/fakechroot-2.20.1-glibc-2.33.patch
new file mode 100644
index 0000000000..31c2dd7843
--- /dev/null
+++ b/system/fakechroot/fakechroot-2.20.1-glibc-2.33.patch
@@ -0,0 +1,469 @@
+From 534e6d555736b97211523970d378dfb0db2608e9 Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Mon, 22 Feb 2021 21:44:07 -0800
+Subject: [PATCH 1/6] tmpnam.c: fix heap overflow
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ src/tmpnam.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tmpnam.c b/src/tmpnam.c
+index ce60817..917ee6b 100644
+--- a/src/tmpnam.c
++++ b/src/tmpnam.c
+@@ -42,7 +42,7 @@ wrapper(tmpnam, char *, (char * s))
+ 
+     expand_chroot_path(ptr);
+ 
+-    ptr2 = malloc(strlen(ptr));
++    ptr2 = malloc(strlen(ptr) + 1);
+     if (ptr2 == NULL) return NULL;
+ 
+     strcpy(ptr2, ptr);
+
+From 75d7e6fa191c11a791faff06a0de86eaa7801d05 Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Mon, 22 Feb 2021 21:46:36 -0800
+Subject: [PATCH 2/6] declare missing bufs, remove ver from lstat
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ src/lstat.c  | 8 +++++---
+ src/lstat.h  | 2 +-
+ src/mknod.c  | 2 ++
+ src/stat.c   | 2 ++
+ src/stat64.c | 2 ++
+ 5 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/src/lstat.c b/src/lstat.c
+index 3f6d819..54e3263 100644
+--- a/src/lstat.c
++++ b/src/lstat.c
+@@ -28,9 +28,11 @@
+ #include "lstat.h"
+ 
+ 
+-wrapper(lstat, int, (int ver, const char * filename, struct stat * buf))
++wrapper(lstat, int, (const char * filename, struct stat * buf))
+ {
+-    debug("lstat(%d, \"%s\", &buf)", ver, filename);
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++    debug("lstat(\"%s\", &buf)", filename);
+ 
+     if (!fakechroot_localdir(filename)) {
+         if (filename != NULL) {
+@@ -40,7 +42,7 @@ wrapper(lstat, int, (int ver, const char * filename, struct stat * buf))
+         }
+     }
+ 
+-    return lstat_rel(ver, filename, buf);
++    return lstat_rel(filename, buf);
+ }
+ 
+ 
+diff --git a/src/lstat.h b/src/lstat.h
+index 751c1ea..ee48303 100644
+--- a/src/lstat.h
++++ b/src/lstat.h
+@@ -26,7 +26,7 @@
+ 
+ #ifndef HAVE___LXSTAT
+ 
+-wrapper_proto(lstat, int, (int, const char *, struct stat *));
++wrapper_proto(lstat, int, (const char *, struct stat *));
+ 
+ int lstat_rel(const char *, struct stat *);
+ 
+diff --git a/src/mknod.c b/src/mknod.c
+index 52fd33b..2771037 100644
+--- a/src/mknod.c
++++ b/src/mknod.c
+@@ -28,6 +28,8 @@
+ 
+ wrapper(mknod, int, (const char * pathname, mode_t mode, dev_t dev))
+ {
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
+     debug("mknod(\"%s\", 0%o, %ld)", pathname, mode, dev);
+     expand_chroot_path(pathname);
+     return nextcall(mknod)(pathname, mode, dev);
+diff --git a/src/stat.c b/src/stat.c
+index 7845662..7b37793 100644
+--- a/src/stat.c
++++ b/src/stat.c
+@@ -33,6 +33,8 @@
+ 
+ wrapper(stat, int, (const char * file_name, struct stat * buf))
+ {
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
+     debug("stat(\"%s\", &buf)", file_name);
+     expand_chroot_path(file_name);
+     return nextcall(stat)(file_name, buf);
+diff --git a/src/stat64.c b/src/stat64.c
+index aac9c75..a360f66 100644
+--- a/src/stat64.c
++++ b/src/stat64.c
+@@ -34,6 +34,8 @@
+ 
+ wrapper(stat64, int, (const char * file_name, struct stat64 * buf))
+ {
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
+     debug("stat64(\"%s\", &buf)", file_name);
+     expand_chroot_path(file_name);
+     return nextcall(stat64)(file_name, buf);
+
+From 693a3597ea7fccfb62f357503ff177bd3e3d5a89 Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Mon, 22 Feb 2021 21:47:09 -0800
+Subject: [PATCH 3/6] fix glibc 2.33+ compatibility
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ configure.ac        | 20 ++++++++++++++++++++
+ src/ftw.c           |  2 +-
+ src/ftw64.c         | 14 +++++++++++---
+ src/libfakechroot.h | 15 +++++++++++++++
+ src/lstat.c         |  2 +-
+ src/lstat.h         |  2 +-
+ src/lstat64.c       |  2 +-
+ src/mknod.c         |  2 +-
+ src/mknodat.c       |  2 +-
+ src/stat.c          |  2 +-
+ src/stat64.c        |  2 +-
+ 11 files changed, 54 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8cdb32..9cc2e77 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -75,6 +75,26 @@ ACX_CHECK_C_ATTRIBUTE_VISIBILITY
+ # Checks for libraries.
+ AC_CHECK_LIB([dl], [dlsym])
+ 
++AH_TEMPLATE([NEW_GLIBC], [glibc >= 2.33])
++AC_MSG_CHECKING([for glibc 2.33+])
++  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++       #include <sys/stat.h>
++  ]], [[
++#ifdef __GLIBC__
++#if !__GLIBC_PREREQ(2,33)
++#error glibc<2.33
++#endif
++#else
++#error not glibc
++#endif
++  ]])],[
++   AC_DEFINE(NEW_GLIBC,1)
++   AC_MSG_RESULT([yes])
++  ],[
++   AC_DEFINE(NEW_GLIBC,0)
++   AC_MSG_RESULT([no])
++  ])
++
+ # Checks for header files.
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+diff --git a/src/ftw.c b/src/ftw.c
+index 92fc126..a9abc85 100644
+--- a/src/ftw.c
++++ b/src/ftw.c
+@@ -185,7 +185,7 @@ int rpl_lstat (const char *, struct stat *);
+ # define NFTW_NEW_NAME __new_nftw
+ # define INO_T ino_t
+ # define STAT stat
+-# ifdef _LIBC
++# if defined(_LIBC) && !NEW_GLIBC
+ #  define LXSTAT __lxstat
+ #  define XSTAT __xstat
+ #  define FXSTATAT __fxstatat
+diff --git a/src/ftw64.c b/src/ftw64.c
+index 7cc8cdf..cee1f2b 100644
+--- a/src/ftw64.c
++++ b/src/ftw64.c
+@@ -18,6 +18,8 @@
+    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+    02111-1307 USA.  */
+ 
++#include "config.h"
++
+ #define __FTW64_C
+ #define FTW_NAME ftw64
+ #define NFTW_NAME nftw64
+@@ -25,9 +27,15 @@
+ #define NFTW_NEW_NAME __new_nftw64
+ #define INO_T ino64_t
+ #define STAT stat64
+-#define LXSTAT __lxstat64
+-#define XSTAT __xstat64
+-#define FXSTATAT __fxstatat64
++#if NEW_GLIBC
++#  define LXSTAT(V,f,sb) lstat64 (f,sb)
++#  define XSTAT(V,f,sb) stat64 (f,sb)
++#  define FXSTATAT(V,d,f,sb,m) fstatat64 (d, f, sb, m)
++#else
++#  define LXSTAT __lxstat64
++#  define XSTAT __xstat64
++#  define FXSTATAT __fxstatat64
++#endif
+ #define FTW_FUNC_T __ftw64_func_t
+ #define NFTW_FUNC_T __nftw64_func_t
+ 
+diff --git a/src/libfakechroot.h b/src/libfakechroot.h
+index 4cf199f..64ff15f 100644
+--- a/src/libfakechroot.h
++++ b/src/libfakechroot.h
+@@ -200,6 +200,21 @@
+ # endif
+ #endif
+ 
++#ifndef _STAT_VER
++ #if defined (__aarch64__)
++  #define _STAT_VER 0
++ #elif defined (__powerpc__) && __WORDSIZE == 64
++  #define _STAT_VER 1
++ #elif defined (__riscv) && __riscv_xlen==64
++  #define _STAT_VER 0
++ #elif defined (__s390x__)
++  #define _STAT_VER 1
++ #elif defined (__x86_64__)
++  #define _STAT_VER 1
++ #else
++  #define _STAT_VER 3
++ #endif
++#endif
+ 
+ typedef void (*fakechroot_wrapperfn_t)(void);
+ 
+diff --git a/src/lstat.c b/src/lstat.c
+index 54e3263..fa38323 100644
+--- a/src/lstat.c
++++ b/src/lstat.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#ifndef HAVE___LXSTAT
++#if !defined(HAVE___LXSTAT) || NEW_GLIBC
+ 
+ #include <sys/stat.h>
+ #include <unistd.h>
+diff --git a/src/lstat.h b/src/lstat.h
+index ee48303..c46a2b9 100644
+--- a/src/lstat.h
++++ b/src/lstat.h
+@@ -24,7 +24,7 @@
+ #include <config.h>
+ #include "libfakechroot.h"
+ 
+-#ifndef HAVE___LXSTAT
++#if !defined(HAVE___LXSTAT) || NEW_GLIBC
+ 
+ wrapper_proto(lstat, int, (const char *, struct stat *));
+ 
+diff --git a/src/lstat64.c b/src/lstat64.c
+index b6212fc..a332d7c 100644
+--- a/src/lstat64.c
++++ b/src/lstat64.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#if defined(HAVE_LSTAT64) && !defined(HAVE___LXSTAT64)
++#if defined(HAVE_LSTAT64) && (!defined(HAVE___LXSTAT64) || NEW_GLIBC)
+ 
+ #define _LARGEFILE64_SOURCE
+ #define _BSD_SOURCE
+diff --git a/src/mknod.c b/src/mknod.c
+index 2771037..aeb750b 100644
+--- a/src/mknod.c
++++ b/src/mknod.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#ifndef HAVE___XMKNOD
++#if !defined(HAVE___XMKNOD) || NEW_GLIBC
+ 
+ #include <sys/stat.h>
+ #include "libfakechroot.h"
+diff --git a/src/mknodat.c b/src/mknodat.c
+index 732a22b..3239b35 100644
+--- a/src/mknodat.c
++++ b/src/mknodat.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#if defined(HAVE_MKNODAT) && !defined(HAVE___XMKNODAT)
++#if defined(HAVE_MKNODAT) && (!defined(HAVE___XMKNODAT) || NEW_GLIBC)
+ 
+ #define _ATFILE_SOURCE
+ #include <sys/stat.h>
+diff --git a/src/stat.c b/src/stat.c
+index 7b37793..5ef57ba 100644
+--- a/src/stat.c
++++ b/src/stat.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#ifndef HAVE___XSTAT
++#if !defined(HAVE___XSTAT) || NEW_GLIBC
+ 
+ #define _BSD_SOURCE
+ #define _DEFAULT_SOURCE
+diff --git a/src/stat64.c b/src/stat64.c
+index a360f66..993ce80 100644
+--- a/src/stat64.c
++++ b/src/stat64.c
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ 
+-#if defined(HAVE_STAT64) && !defined(HAVE___XSTAT64)
++#if defined(HAVE_STAT64) && (!defined(HAVE___XSTAT64) || NEW_GLIBC)
+ 
+ #define _BSD_SOURCE
+ #define _LARGEFILE64_SOURCE
+
+From e7c1f3a446e594a4d0cce5f5d499c9439ce1d5c5 Mon Sep 17 00:00:00 2001
+From: neok-m4700 <neok-m4700@users.noreply.github.com>
+Date: Wed, 24 Feb 2021 17:36:57 +0100
+Subject: [PATCH 6/6] wrap fstatat and fstatat64
+
+---
+ configure.ac    |  2 ++
+ src/Makefile.am |  2 ++
+ src/fstatat.c   | 42 ++++++++++++++++++++++++++++++++++++++++++
+ src/fstatat64.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 89 insertions(+)
+ create mode 100644 src/fstatat.c
+ create mode 100644 src/fstatat64.c
+
+diff --git a/configure.ac b/configure.ac
+index 9cc2e77..5b3053e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -218,6 +218,8 @@ AC_CHECK_FUNCS(m4_normalize([
+     freopen64
+     fstat
+     fstat64
++    fstatat
++    fstatat64
+     fts_children
+     fts_open
+     fts_read
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6066345..eb311c0 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -61,6 +61,8 @@ libfakechroot_la_SOURCES = \
+     fopen64.c \
+     freopen.c \
+     freopen64.c \
++    fstatat.c \
++    fstatat64.c \
+     fts.c \
+     fts64.c \
+     ftw.c \
+diff --git a/src/fstatat.c b/src/fstatat.c
+new file mode 100644
+index 0000000..ca7578b
+--- /dev/null
++++ b/src/fstatat.c
+@@ -0,0 +1,42 @@
++/*
++    libfakechroot -- fake chroot environment
++    Copyright (c) 2010, 2021 Piotr Roszatycki <dexter@debian.org>
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++*/
++
++
++#include <config.h>
++
++#ifdef HAVE_FSTATAT
++
++#define _ATFILE_SOURCE
++#define _POSIX_C_SOURCE 200809L
++#include <sys/stat.h>
++#include <limits.h>
++#include "libfakechroot.h"
++
++wrapper(fstatat, int, (int dirfd, const char *pathname, struct stat *buf, int flags))
++{
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++    debug("fstatat(%d, \"%s\", &buf, %d)", dirfd, pathname, flags);
++    expand_chroot_path_at(dirfd, pathname);
++    return nextcall(fstatat)(dirfd, pathname, buf, flags);
++}
++
++#else
++typedef int empty_translation_unit;
++#endif
+diff --git a/src/fstatat64.c b/src/fstatat64.c
+new file mode 100644
+index 0000000..1863372
+--- /dev/null
++++ b/src/fstatat64.c
+@@ -0,0 +1,43 @@
++/*
++    libfakechroot -- fake chroot environment
++    Copyright (c) 2010, 2021 Piotr Roszatycki <dexter@debian.org>
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++*/
++
++
++#include <config.h>
++
++#ifdef HAVE_FSTATAT64
++
++#define _ATFILE_SOURCE
++#define _POSIX_C_SOURCE 200809L
++#define _LARGEFILE64_SOURCE
++#include <sys/stat.h>
++#include <limits.h>
++#include "libfakechroot.h"
++
++wrapper(fstatat64, int, (int dirfd, const char *pathname, struct stat64 *buf, int flags))
++{
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++    debug("fstatat64(%d, \"%s\", &buf, %d)", dirfd, pathname, flags);
++    expand_chroot_path_at(dirfd, pathname);
++    return nextcall(fstatat64)(dirfd, pathname, buf, flags);
++}
++
++#else
++typedef int empty_translation_unit;
++#endif
diff --git a/system/fakechroot/fakechroot.SlackBuild b/system/fakechroot/fakechroot.SlackBuild
index 3a3772cecc..ae5854880a 100644
--- a/system/fakechroot/fakechroot.SlackBuild
+++ b/system/fakechroot/fakechroot.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fakechroot
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fakechroot
-VERSION=${VERSION:-2.19}
+VERSION=${VERSION:-2.20.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -62,12 +72,14 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+# thanks gentoo maintainers
+patch -p1 < $CWD/fakechroot-2.20.1-glibc-2.33.patch
 chown -R root:root .
 find -L . \
-  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-   -o -perm 511 \) -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -83,6 +95,8 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -97,4 +111,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fakechroot/fakechroot.info b/system/fakechroot/fakechroot.info
index cf7dd99f99..7c17827e23 100644
--- a/system/fakechroot/fakechroot.info
+++ b/system/fakechroot/fakechroot.info
@@ -1,8 +1,8 @@
 PRGNAM="fakechroot"
-VERSION="2.19"
+VERSION="2.20.1"
 HOMEPAGE="https://github.com/dex4er/fakechroot"
-DOWNLOAD="https://github.com/dex4er/fakechroot/archive/2.19/fakechroot-2.19.tar.gz"
-MD5SUM="db6378420c769232e69508bb78612c34"
+DOWNLOAD="https://github.com/dex4er/fakechroot/archive/2.20.1/fakechroot-2.20.1.tar.gz"
+MD5SUM="69612efa06636e79a56898512222b0fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/fakeroot/fakeroot.SlackBuild b/system/fakeroot/fakeroot.SlackBuild
index 4f2458b20d..f5d6816bfa 100644
--- a/system/fakeroot/fakeroot.SlackBuild
+++ b/system/fakeroot/fakeroot.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fakeroot
 
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fakeroot
-VERSION=${VERSION:-1.23}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.25.3}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -61,7 +71,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.xz
+tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -70,7 +80,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 < $CWD/hide-dlsym-error.patch
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
 
 ./bootstrap
 
@@ -111,8 +121,10 @@ cp -a AUTHORS BUGS COPYING DEBUG INSTALL README doc/README.* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fakeroot/fakeroot.info b/system/fakeroot/fakeroot.info
index f135f82b8b..4463bbacbb 100644
--- a/system/fakeroot/fakeroot.info
+++ b/system/fakeroot/fakeroot.info
@@ -1,8 +1,8 @@
 PRGNAM="fakeroot"
-VERSION="1.23"
+VERSION="1.25.3"
 HOMEPAGE="http://packages.debian.org/fakeroot"
-DOWNLOAD="http://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.23.orig.tar.xz"
-MD5SUM="b82c5e99b6365a838e73d05718083f6a"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/fakeroot_1.25.3.orig.tar.gz"
+MD5SUM="f6104ef6960c962377ef062bf222a1d2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/fakeroot/hide-dlsym-error.patch b/system/fakeroot/hide-dlsym-error.patch
deleted file mode 100644
index 2c61fab248..0000000000
--- a/system/fakeroot/hide-dlsym-error.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Hide error from dlsym()
- dlsym(), starting in glibc 2.24 actually reports errors. In our case,
- we try to get ACL functions which are not in the glibc. This causes
- failures in test suites, so hide those messages for non-debugging
- purposes for now. It also makes the build logs annoying to read.
-Author: Julian Andres Klode <juliank@ubuntu.com>
-Origin: vendor
-Bug-Debian: https://bugs.debian.org/830912
-Forwarded: no
-Last-Update: 2016-08-12
-
-Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
-
---- a/libfakeroot.c
-+++ b/libfakeroot.c
-@@ -256,10 +256,16 @@ void load_library_symbols(void){
-  /* clear dlerror() just in case dlsym() legitimately returns NULL */
-     msg = dlerror();
-     *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name);
-+
-     if ( (msg = dlerror()) != NULL){
--      fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
--/*    abort ();*/
-+#ifdef LIBFAKEROOT_DEBUGGING
-+      if (fakeroot_debug) {
-+        fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
-+/*      abort ();*/
-+      }
-+#endif
-     }
-+
-   }
- }
-
diff --git a/system/fakeroot/patches/0001-Revert-Use-fixed-width-members-in-fake_msg.patch b/system/fakeroot/patches/0001-Revert-Use-fixed-width-members-in-fake_msg.patch
new file mode 100644
index 0000000000..f300b6f707
--- /dev/null
+++ b/system/fakeroot/patches/0001-Revert-Use-fixed-width-members-in-fake_msg.patch
@@ -0,0 +1,71 @@
+From ffba4a8941a5f11748a9d305bf76691e7a2aa296 Mon Sep 17 00:00:00 2001
+From: Johannes 'josch' Schauer <josch@mister-muffin.de>
+Date: Tue, 3 Nov 2020 00:55:40 +0100
+Subject: [PATCH] Revert "Use fixed-width members in fake_msg"
+
+This reverts commit 2a53909e732b19ccbaf6d1534e932dff74fa757e.
+---
+ message.h | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/message.h b/message.h
+index 6fad1fb..9dfce94 100644
+--- a/message.h
++++ b/message.h
+@@ -48,7 +48,9 @@ typedef uint32_t fake_gid_t;
+ typedef uint32_t fake_mode_t;
+ typedef uint32_t fake_nlink_t;
+ 
++#if __SUNPRO_C
+ #pragma pack(4)
++#endif
+ struct fakestat {
+ 	fake_uid_t   uid;
+ 	fake_gid_t   gid;
+@@ -58,32 +60,42 @@ struct fakestat {
+ 	fake_mode_t  mode;
+ 	fake_nlink_t nlink;
+ } FAKEROOT_ATTR(packed);
++#if __SUNPRO_C
+ #pragma pack()
++#endif
+ 
+ #define MAX_IPC_BUFFER_SIZE 1024
+ 
++#if __SUNPRO_C
+ #pragma pack(4)
++#endif
+ struct fakexattr {
+ 	uint32_t   buffersize;
+ 	char       buf[MAX_IPC_BUFFER_SIZE];
+ 	int32_t    flags_rc; /* flags from setxattr. Return code on round trip */
+ } FAKEROOT_ATTR(packed);
++#if __SUNPRO_C
+ #pragma pack()
++#endif
+ 
++#if __SUNPRO_C
+ #pragma pack(4)
++#endif
+ struct fake_msg {
+ #ifndef FAKEROOT_FAKENET
+-	int64_t mtype; /* message type in SYSV message sending */
++	long mtype; /* message type in SYSV message sending */
+ #endif
+ 	func_id_t       id; /* the requested function */
+ #ifndef FAKEROOT_FAKENET
+ 	pid_t pid;
+-	int32_t serial;
++	int serial;
+ #endif
+ 	struct fakestat st;
+ 	struct fakexattr xattr;
+ 	uint32_t        remote;
+ } FAKEROOT_ATTR(packed);
++#if __SUNPRO_C
+ #pragma pack()
++#endif
+ 
+ #endif
+-- 
+2.27.0
diff --git a/system/fakeroot/patches/eglibc-fts-without-LFS.patch b/system/fakeroot/patches/eglibc-fts-without-LFS.patch
new file mode 100644
index 0000000000..5ba45fde3d
--- /dev/null
+++ b/system/fakeroot/patches/eglibc-fts-without-LFS.patch
@@ -0,0 +1,26 @@
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -1949,11 +1949,7 @@
+             || r->fts_info == FTS_NS || r->fts_info == FTS_NSOK))
+     r->fts_statp = NULL;  /* Otherwise fts_statp may be a random pointer */
+   if(r && r->fts_statp) {  /* Should we bother checking fts_info here? */
+-# if defined(STAT64_SUPPORT) && !defined(__APPLE__)
+-    SEND_GET_STAT64(r->fts_statp, _STAT_VER);
+-# else
+     SEND_GET_STAT(r->fts_statp, _STAT_VER);
+-# endif
+   }
+ 
+   return r;
+@@ -1972,11 +1968,7 @@
+   first=next_fts_children(ftsp, options);
+   for(r = first; r; r = r->fts_link) {
+     if(r && r->fts_statp) {  /* Should we bother checking fts_info here? */
+-# if defined(STAT64_SUPPORT) && !defined(__APPLE__)
+-      SEND_GET_STAT64(r->fts_statp, _STAT_VER);
+-# else
+       SEND_GET_STAT(r->fts_statp, _STAT_VER);
+-# endif
+     }
+   }
+ 
diff --git a/system/fakeroot/patches/fakeroot-1.25.3-glibc-2.33-fix-1.patch b/system/fakeroot/patches/fakeroot-1.25.3-glibc-2.33-fix-1.patch
new file mode 100644
index 0000000000..8b7867bce1
--- /dev/null
+++ b/system/fakeroot/patches/fakeroot-1.25.3-glibc-2.33-fix-1.patch
@@ -0,0 +1,37 @@
+From 03bc0ee07fb6e293d081ffd8af1654788b434f6a Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Thu, 11 Feb 2021 20:59:25 -0800
+Subject: [PATCH] libfakeroot.c: define _STAT_VER if not already defined
+
+Based on patch from Jan Pazdziora:
+https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SMQ3RYXEYTVZH6PLQMKNB3NM4XLPMNZO/
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ libfakeroot.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/libfakeroot.c b/libfakeroot.c
+index 3e80e38..14cdbc4 100644
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -90,6 +90,16 @@
+ #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b)
+ #endif
+ 
++#ifndef _STAT_VER
++ #if defined (__aarch64__)
++  #define _STAT_VER 0
++ #elif defined (__x86_64__)
++  #define _STAT_VER 1
++ #else
++  #define _STAT_VER 3
++ #endif
++#endif
++
+ /*
+    These INT_* (which stands for internal) macros should always be used when
+    the fakeroot library owns the storage of the stat variable.
+-- 
+GitLab
+
diff --git a/system/fakeroot/patches/fakeroot-1.25.3-glibc-2.33-fix-2.patch b/system/fakeroot/patches/fakeroot-1.25.3-glibc-2.33-fix-2.patch
new file mode 100644
index 0000000000..e0bd2e533d
--- /dev/null
+++ b/system/fakeroot/patches/fakeroot-1.25.3-glibc-2.33-fix-2.patch
@@ -0,0 +1,72 @@
+From feda578ca3608b7fc9a28a3a91293611c0ef47b7 Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Thu, 11 Feb 2021 21:00:04 -0800
+Subject: [PATCH] libfakeroot.c: add wrappers for new glibc 2.33+ symbols
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ libfakeroot.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 48 insertions(+)
+
+diff --git a/libfakeroot.c b/libfakeroot.c
+index 14cdbc4..d75c51f 100644
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -1352,6 +1352,54 @@ int renameat(int olddir_fd, const char *oldpath,
+ #endif /* HAVE_FSTATAT */
+ 
+ 
++#if defined(__GLIBC__) && __GLIBC_PREREQ(2,33)
++/* Glibc 2.33 exports symbols for these functions in the shared lib */
++  int lstat(const char *file_name, struct stat *statbuf) {
++     return WRAP_LSTAT LSTAT_ARG(_STAT_VER, file_name, statbuf);
++  }
++  int stat(const char *file_name, struct stat *st) {
++     return WRAP_STAT STAT_ARG(_STAT_VER, file_name, st);
++  }
++  int fstat(int fd, struct stat *st) {
++     return WRAP_FSTAT FSTAT_ARG(_STAT_VER, fd, st);
++  }
++
++  #ifdef HAVE_FSTATAT
++    int fstatat(int dir_fd, const char *path, struct stat *st, int flags) {
++       return WRAP_FSTATAT FSTATAT_ARG(_STAT_VER, dir_fd, path, st, flags);
++    }
++  #endif
++
++  #ifdef STAT64_SUPPORT
++    int lstat64(const char *file_name, struct stat64 *st) {
++       return WRAP_LSTAT64 LSTAT64_ARG(_STAT_VER, file_name, st);
++    }
++    int stat64(const char *file_name, struct stat64 *st) {
++       return WRAP_STAT64 STAT64_ARG(_STAT_VER, file_name, st);
++    }
++    int fstat64(int fd, struct stat64 *st) {
++       return WRAP_FSTAT64 FSTAT64_ARG(_STAT_VER, fd, st);
++    }
++
++    #ifdef HAVE_FSTATAT
++      int fstatat64(int dir_fd, const char *path, struct stat64 *st, int flags) {
++	 return WRAP_FSTATAT64 FSTATAT64_ARG(_STAT_VER, dir_fd, path, st, flags);
++      }
++    #endif
++  #endif
++
++  int mknod(const char *pathname, mode_t mode, dev_t dev) {
++     return WRAP_MKNOD MKNOD_ARG(_STAT_VER, pathname, mode, &dev);
++  }
++
++  #if defined(HAVE_FSTATAT) && defined(HAVE_MKNODAT)
++    int mknodat(int dir_fd, const char *pathname, mode_t mode, dev_t dev) {
++       return WRAP_MKNODAT MKNODAT_ARG(_STAT_VER, dir_fd, pathname, mode, &dev);
++    }
++  #endif
++#endif /* GLIBC_PREREQ */
++
++
+ #ifdef FAKEROOT_FAKENET
+ pid_t fork(void)
+ {
+-- 
+GitLab
+
diff --git a/system/fakeroot/patches/fakeroot-1.25.3-glibc-2.33-fix-3.patch b/system/fakeroot/patches/fakeroot-1.25.3-glibc-2.33-fix-3.patch
new file mode 100644
index 0000000000..1c4297094c
--- /dev/null
+++ b/system/fakeroot/patches/fakeroot-1.25.3-glibc-2.33-fix-3.patch
@@ -0,0 +1,60 @@
+From c3eebec293e35b997bb46c22fb5a4e114afb5e7f Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Sat, 13 Feb 2021 19:32:08 -0800
+Subject: [PATCH] configure.ac: fix __xmknod{,at} pointer argument
+
+Switch default to assume * and not the absence of *.
+
+On glibc 2.33+, there is no definition for these functions in header
+files, so the compile test doesn't work. But, we can default to using
+the pointer (as is the case with newer glibc), and use the header file
+on older platforms to fail the test and use no pointer.
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ configure.ac | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 73415d2..d85566f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -183,13 +183,13 @@ AC_MSG_CHECKING([for type of arg of __xmknod])
+   ]], [[
+        int __xmknod  ( int ver,
+                        const char *pathname ,
+-                       mode_t  mode ,  dev_t dev);
++                       mode_t  mode ,  dev_t *dev);
+   ]])],[
+-   AC_DEFINE(XMKNOD_FRTH_ARG,)
+-   AC_MSG_RESULT([no extra *])
+-  ],[
+    AC_DEFINE(XMKNOD_FRTH_ARG,[*])
+    AC_MSG_RESULT([needs *])
++  ],[
++   AC_DEFINE(XMKNOD_FRTH_ARG,)
++   AC_MSG_RESULT([no extra *])
+ 
+   ])
+ 
+@@ -210,13 +210,13 @@ AC_MSG_CHECKING([for type of arg of __xmknodat])
+        int __xmknodat  ( int ver,
+                          int dirfd,
+                          const char *pathname ,
+-                         mode_t  mode ,  dev_t dev);
++                         mode_t  mode ,  dev_t *dev);
+   ]])],[
+-   AC_DEFINE(XMKNODAT_FIFTH_ARG,)
+-   AC_MSG_RESULT([no extra *])
+-  ],[
+    AC_DEFINE(XMKNODAT_FIFTH_ARG,[*])
+    AC_MSG_RESULT([needs *])
++  ],[
++   AC_DEFINE(XMKNODAT_FIFTH_ARG,)
++   AC_MSG_RESULT([no extra *])
+ 
+   ])
+ 
+-- 
+GitLab
+
diff --git a/system/fakeroot/patches/fix-shell-in-fakeroot.patch b/system/fakeroot/patches/fix-shell-in-fakeroot.patch
new file mode 100644
index 0000000000..ce5d23f0c8
--- /dev/null
+++ b/system/fakeroot/patches/fix-shell-in-fakeroot.patch
@@ -0,0 +1,13 @@
+Description: Fix shell in fakeroot.in
+ Use /bin/sh instead of @SHELL@ in fakeroot.in
+Author: Juan Picca <jumapico@gmail.com>
+Last-Update: 2016-06-27
+---
+--- a/scripts/fakeroot.in
++++ b/scripts/fakeroot.in
+@@ -1,4 +1,4 @@
+-#!@SHELL@
++#!/bin/sh
+ 
+ # This script first starts faked (the daemon), and then it will run
+ # the requested program with fake root privileges.
diff --git a/system/fantasque-sans-mono/fantasque-sans-mono.SlackBuild b/system/fantasque-sans-mono/fantasque-sans-mono.SlackBuild
index 594f73842e..c3f7611e88 100644
--- a/system/fantasque-sans-mono/fantasque-sans-mono.SlackBuild
+++ b/system/fantasque-sans-mono/fantasque-sans-mono.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fantasque-sans-mono
 
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fantasque-sans-mono
 VERSION=${VERSION:-1.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,4 +79,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/far2l/README b/system/far2l/README
new file mode 100644
index 0000000000..bb40026dd2
--- /dev/null
+++ b/system/far2l/README
@@ -0,0 +1,12 @@
+Linux port of FAR v2
+
+For python plugins support, use PYTHON=yes
+
+Optional dependencies:
+wxGTK3 - GUI version, use WX=yes
+xerces-c - Syntax highlight, use COLORER=yes
+libuchardet - Detecting encoding, use UCD=yes
+libnfs - NetRocks plugin
+
+Example:
+WX=no COLORER=yes UCD=yes ./far2l.SlackBuild
diff --git a/system/far2l/doinst.sh b/system/far2l/doinst.sh
new file mode 100644
index 0000000000..aea0f894eb
--- /dev/null
+++ b/system/far2l/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/far2l/far2l.SlackBuild b/system/far2l/far2l.SlackBuild
new file mode 100644
index 0000000000..022c19ced3
--- /dev/null
+++ b/system/far2l/far2l.SlackBuild
@@ -0,0 +1,128 @@
+#!/bin/bash
+
+# Slackware build script for far2l
+
+# Copyright 2023 Dmitry Petrachkov, Smolensk, Russia Federation
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=far2l
+VERSION=${VERSION:-2.5.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-v_$VERSION
+tar xvf $CWD/$PRGNAM-v_$VERSION.tar.gz
+cd $PRGNAM-v_$VERSION
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CMAKE_WX="-DUSEWX=OFF"; [[ "${WX:-no}" == "yes" ]] && CMAKE_WX="-DUSEWX=ON"
+CMAKE_UCD="-DUSEUCD=OFF"; [[ "${UCD:-no}" == "yes" ]] && CMAKE_UCD="-DUSEUCD=ON"
+CMAKE_COLORER="-DCOLORER=OFF"; [[ "${COLORER:-no}" == "yes" ]] && CMAKE_COLORER="-DCOLORER=ON"
+CMAKE_PYTHON="-DPYTHON=OFF"; [[ "${PYTHON:-no}" == "yes" ]] && CMAKE_PYTHON="-DPYTHON=ON"
+
+# Avoid hardcoded /usr/lib path
+sed -i 's/lib\/far2l/lib'$LIBDIRSUFFIX'\/far2l/g' CMakeLists.txt
+sed -i 's/lib/lib'$LIBDIRSUFFIX'/g' utils/src/InstallPath.cpp
+
+cmake -B build -G "Ninja" \
+  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_BUILD_TYPE=Release \
+  $CMAKE_WX $CMAKE_UCD $CMAKE_COLORER $CMAKE_PYTHON
+cmake --build build
+DESTDIR=$PKG cmake --install build --strip
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Without WxWidgets, far2l always starting in terminal
+if [[ "${WX:-no}" != "yes" ]]; then
+  sed -i 's/Terminal=false/Terminal=true/g' $PKG/usr/share/applications/far2l.desktop
+fi
+
+chmod -x $PKG/usr/share/applications/far2l.desktop
+
+mv $PKG/usr/share/man $PKG/usr/man
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/far2l/far2l.info b/system/far2l/far2l.info
new file mode 100644
index 0000000000..599840b9a7
--- /dev/null
+++ b/system/far2l/far2l.info
@@ -0,0 +1,10 @@
+PRGNAM="far2l"
+VERSION="2.5.3"
+HOMEPAGE="https://github.com/elfmz/far2l"
+DOWNLOAD="https://github.com/elfmz/far2l/archive/v_2.5.3/far2l-v_2.5.3.tar.gz"
+MD5SUM="45be6e0330e91b9532b4ce943bc1bad6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dmitry Petrachkov"
+EMAIL="dmitry-petrachkov@outlook.com"
diff --git a/system/far2l/slack-desc b/system/far2l/slack-desc
new file mode 100644
index 0000000000..e62d2f0dab
--- /dev/null
+++ b/system/far2l/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+far2l: far2l (Linux port of FAR v2)
+far2l:
+far2l: Linux fork of FAR Manager v2 (http://farmanager.com/)
+far2l: BETA VERSION. Use on your own risk!
+far2l: License: GNU/GPLv2
+far2l: Homepage: https://github.com/elfmz/far2l
+far2l:
+far2l:
+far2l:
+far2l:
+far2l:
diff --git a/system/fasd/fasd.SlackBuild b/system/fasd/fasd.SlackBuild
index 6911c51121..70af224768 100644
--- a/system/fasd/fasd.SlackBuild
+++ b/system/fasd/fasd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fasd
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fasd
 VERSION=${VERSION:-1.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -87,4 +97,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fastfetch/README b/system/fastfetch/README
new file mode 100644
index 0000000000..3a5f72fc5c
--- /dev/null
+++ b/system/fastfetch/README
@@ -0,0 +1,7 @@
+fastfetch (Like neofetch, but faster)
+
+Fastfetch is a neofetch-like tool for fetching system information and 
+displaying them in a pretty way. It is written mainly in C, with 
+performance and customizability in mind.
+
+ddcutil and chafa are optional dependencies.
diff --git a/system/fastfetch/fastfetch.SlackBuild b/system/fastfetch/fastfetch.SlackBuild
new file mode 100644
index 0000000000..57f29bec06
--- /dev/null
+++ b/system/fastfetch/fastfetch.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# Slackware build script for fastfetch
+
+# Copyright 2023-2024 Samuel Young, MO, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fastfetch
+VERSION=${VERSION:-2.9.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  cmake --build .
+  DESTDIR=$PKG cmake --install .
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+rm -r $PKG/usr/share/licenses
+
+mv $PKG/usr/share/man $PKG/usr
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CHANGELOG.md DEVELOPMENT.md README.md LICENSE \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fastfetch/fastfetch.info b/system/fastfetch/fastfetch.info
new file mode 100644
index 0000000000..98a2f06064
--- /dev/null
+++ b/system/fastfetch/fastfetch.info
@@ -0,0 +1,10 @@
+PRGNAM="fastfetch"
+VERSION="2.9.0"
+HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
+DOWNLOAD="https://github.com/fastfetch-cli/fastfetch/archive/2.9.0/fastfetch-2.9.0.tar.gz"
+MD5SUM="b5e476cbd7fd82bcbc510ff1940ea502"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Samuel Young"
+EMAIL="samyoung12788@gmail.com"
diff --git a/system/fastfetch/slack-desc b/system/fastfetch/slack-desc
new file mode 100644
index 0000000000..02fbaecacb
--- /dev/null
+++ b/system/fastfetch/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+fastfetch: fastfetch (Like neofetch, but faster)
+fastfetch:
+fastfetch: Fastfetch is a neofetch-like tool for fetching system information and
+fastfetch: displaying them in a pretty way. It is written mainly in C, with
+fastfetch: performance and customizability in mind.
+fastfetch:
+fastfetch:
+fastfetch:
+fastfetch:
+fastfetch: Homepage: https://github.com/fastfetch-cli/fastfetch
+fastfetch:
diff --git a/system/fatrace/README b/system/fatrace/README
index e986031f20..edd2a3600c 100644
--- a/system/fatrace/README
+++ b/system/fatrace/README
@@ -1,10 +1,17 @@
+fatrace (file access trace)
+
 fatrace reports file access events from all running processes.
 Its main purpose is to find processes which keep waking up the disk
 unnecessarily and thus prevent some power saving.
 
-Included is a python3 script called "power-usage-report", which uses
-fatrace and powertop to build a textual report from one minute of
-measuring power usage and file accesses. This does not take any
-arguments or requires any interactivity, so is very simple to use and
+Included is a python3 script called "power-usage-report", which
+uses fatrace and powertop to build a textual report from one minute
+of measuring power usage and file accesses. This does not take any
+arguments or require any interactivity, so it's very simple to use and
 serves as a starting point for bug reports or optimizing a particular
 installation.
+
+fatrace has self-test scripts that can be run during the build. These
+are disabled by default, because they create a file outside of the
+temp directory (/etc/test.txt). If you want to run the tests, export
+RUNTESTS=yes in the environment.
diff --git a/system/fatrace/fatrace.SlackBuild b/system/fatrace/fatrace.SlackBuild
index 72e5b34cea..da5374c384 100644
--- a/system/fatrace/fatrace.SlackBuild
+++ b/system/fatrace/fatrace.SlackBuild
@@ -1,31 +1,25 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fatrace
 
-# Copyright 2018-2020 Leonardo Citrolo, Italy
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Originally written by Leonardo Citrolo.
+# Now maintained by B. Watson (urchlay@slackware.uk).
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20230509 bkw:
+# - new maintainer.
+# - relicense as WTFPL with permission from original author.
+# - update for v0.17.0.
+# - add RUNTESTS environment variable.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=fatrace
-VERSION=${VERSION:-0.15}
+VERSION=${VERSION:-0.17.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +29,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,33 +58,37 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-sed -i -e "/^CFLAGS/s/?=/+=/" -e "s%share/man/man1%man/man1%" Makefile
+sed -i -e "/^CFLAGS/s,-O2,$SLKCFLAGS," \
+       -e 's,share/man,man,' \
+       -e 's,-Werror,,' \
+       Makefile
 
-CFLAGS="$SLKCFLAGS" make
+make
+strip $PRGNAM
 make install DESTDIR=$PKG PREFIX=/usr
+gzip $PKG/usr/man/man*/*
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# This is disabled by default because it creates (and deletes) an
+# /etc/test.txt (outside of $TMP).
+if [ "${RUNTESTS:-no}" = "yes" ]; then
+  # Tests assume wrong path (our /usr/bin/head is a symlink to /bin/head)
+  sed -i 's,/usr/bin/,/bin/,' tests/fatrace
+  sh tests/run
+fi
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING NEWS \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a COPYING NEWS $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fatrace/fatrace.info b/system/fatrace/fatrace.info
index bc7e463ec8..4bc0b631af 100644
--- a/system/fatrace/fatrace.info
+++ b/system/fatrace/fatrace.info
@@ -1,10 +1,10 @@
 PRGNAM="fatrace"
-VERSION="0.15"
+VERSION="0.17.0"
 HOMEPAGE="https://launchpad.net/fatrace"
-DOWNLOAD="https://launchpad.net/fatrace/trunk/0.15/+download/fatrace-0.15.tar.xz"
-MD5SUM="d33ec7c650ab25a835540e802bfab09f"
+DOWNLOAD="https://launchpad.net/debian/+archive/primary/+sourcefiles/fatrace/0.17.0-1/fatrace_0.17.0.orig.tar.gz"
+MD5SUM="8671c90caebc668abfbc63efabeb89c6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
-MAINTAINER="Leo C."
-EMAIL="leoc@gmx.com"
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/fatrace/slack-desc b/system/fatrace/slack-desc
index 10d928650f..f9527c7825 100644
--- a/system/fatrace/slack-desc
+++ b/system/fatrace/slack-desc
@@ -12,8 +12,8 @@ fatrace: fatrace reports file access events from all running processes.
 fatrace: Its main purpose is to find processes which keep waking up the disk
 fatrace: unnecessarily and thus prevent some power saving.
 fatrace:
+fatrace: Homepage: https://launchpad.net/fatrace
 fatrace:
 fatrace:
 fatrace:
-fatrace: Homepage: https://launchpad.net/fatrace
 fatrace:
diff --git a/system/fatsort/fatsort.SlackBuild b/system/fatsort/fatsort.SlackBuild
index 430da431ec..016408d21f 100644
--- a/system/fatsort/fatsort.SlackBuild
+++ b/system/fatsort/fatsort.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fatsort
 
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - no exec permission on man page.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fatsort
-VERSION=${VERSION:-1.6.2.605}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.6.4.625}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
 case "$( uname -m )" in
@@ -35,7 +41,11 @@ case "$( uname -m )" in
 esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,19 +75,18 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
 \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
--o -perm 511 \) -exec chmod 755 {} \; -o \
+-o -perm 511 \) -exec chmod 755 {} \+ -o \
 \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
--o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 make
 make install DESTDIR=$PKG MANDIR=/usr/man/man1 SBINDIR=/usr/sbin
+chmod -x $PKG/usr/man/man*/*
+gzip -9  $PKG/usr/man/man*/*
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
 | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CHANGES.md LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -86,4 +95,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fatsort/fatsort.info b/system/fatsort/fatsort.info
index 4500153440..5418e075f3 100644
--- a/system/fatsort/fatsort.info
+++ b/system/fatsort/fatsort.info
@@ -1,8 +1,8 @@
 PRGNAM="fatsort"
-VERSION="1.6.2.605"
+VERSION="1.6.4.625"
 HOMEPAGE="https://fatsort.sourceforge.io/"
-DOWNLOAD="https://sourceforge.net/projects/fatsort/files/fatsort-1.6.2.605.tar.xz"
-MD5SUM="e3ef708dcdfff60e81db957f6ac30f5a"
+DOWNLOAD="https://sourceforge.net/projects/fatsort/files/fatsort-1.6.4.625.tar.xz"
+MD5SUM="a1976a8318db5c80ced71beb849279bb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/fbterm/README b/system/fbterm/README
index 3a82f40f73..b64999af82 100644
--- a/system/fbterm/README
+++ b/system/fbterm/README
@@ -1,15 +1,17 @@
-FbTerm is a fast terminal emulator for linux with the frame buffer device
-or a VESA video card.
+fbterm (fast framebuffer based terminal emulator for linux)
+
+FbTerm is a fast terminal emulator for linux with the frame buffer
+device or a VESA video card.
 
 fbterm supports the mouse (provided gpm is running) and is able to
-share the console with (some) other applications, such as "mplayer -vo
-fbdev2". It also uses the same fonts as X, and renders them with lovely
-antialiasing like modern X terminals. fbterm has *much* better Unicode
-support than the plain Linux framebuffer console.
+share the console with (some) other applications, such as "mplayer
+-vo fbdev2". It also uses the same fonts as X, and renders them with
+lovely antialiasing like modern X terminals. fbterm has *much* better
+Unicode support than the plain Linux framebuffer console.
 
 Also included is a handy utility called checkfb, which simply checks
-for the presence and usability of the framebuffer device, and shows its
-resolution and bit depth.
+for the presence and usability of the framebuffer device, and shows
+its resolution and bit depth.
 
 This package uses POSIX filesystem capabilities to execute with
 elevated privileges (required for keyboard shortcuts and console
diff --git a/system/fbterm/checkfb.1 b/system/fbterm/checkfb.1
new file mode 100644
index 0000000000..e15ae92416
--- /dev/null
+++ b/system/fbterm/checkfb.1
@@ -0,0 +1,85 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "CHECKFB" 1 "2021-08-26" "SBo" "SlackBuilds.org"
+.SH NAME
+checkfb \- check for the existence of a framebuffer device
+.\" RST source for checkfb(1) man page. Convert with:
+.
+.\" rst2man.py checkfb.rst > checkfb.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+checkfb <[\fIdevice\fP]>
+.SH DESCRIPTION
+.sp
+checkfb attempts to open the Linux framebuffer device read\-only. If successful,
+it reports the display resolution and bit depth.
+.sp
+By default, it opens \fB/dev/fb0\fP\&. The \fIdevice\fP option overrides this.
+.sp
+There are no options.
+.SH EXIT STATUS
+.sp
+0 (success) if the framebuffer exists and can be opened.
+.sp
+Non\-zero means failure: the device doesn\(aqt exist, the permissions
+don\(aqt allow opening it, or possibly the kernel doesn\(aqt support
+framebuffer devices at all.
+.SH EXAMPLES
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+# checkfb
+The framebuffer device (/dev/fb0) was opened successfully.
+1920x1080, 32bpp
+The framebuffer device was mapped to memory successfully.
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.SH COPYRIGHT
+.sp
+checkfb is released under the GPL (according to the comments in its source).
+.SH AUTHORS
+.sp
+checkfb was originally written by Trolltech, and was modified by
+Sébastien Ballet.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+fbset(8)
+.\" Generated by docutils manpage writer.
+.
diff --git a/system/fbterm/checkfb.rst b/system/fbterm/checkfb.rst
new file mode 100644
index 0000000000..9d307c4037
--- /dev/null
+++ b/system/fbterm/checkfb.rst
@@ -0,0 +1,73 @@
+.. RST source for checkfb(1) man page. Convert with:
+..   rst2man.py checkfb.rst > checkfb.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: SBo
+.. |date| date::
+
+
+=======
+checkfb
+=======
+
+-----------------------------------------------
+check for the existence of a framebuffer device
+-----------------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+checkfb <[*device*]>
+
+DESCRIPTION
+===========
+
+checkfb attempts to open the Linux framebuffer device read-only. If successful,
+it reports the display resolution and bit depth.
+
+By default, it opens **/dev/fb0**. The *device* option overrides this.
+
+There are no options.
+
+EXIT STATUS
+===========
+
+0 (success) if the framebuffer exists and can be opened.
+
+Non-zero means failure: the device doesn't exist, the permissions
+don't allow opening it, or possibly the kernel doesn't support
+framebuffer devices at all.
+
+EXAMPLES
+========
+
+::
+
+  # checkfb
+  The framebuffer device (/dev/fb0) was opened successfully.
+  1920x1080, 32bpp
+  The framebuffer device was mapped to memory successfully.
+
+COPYRIGHT
+=========
+
+checkfb is released under the GPL (according to the comments in its source).
+
+AUTHORS
+=======
+
+checkfb was originally written by Trolltech, and was modified by
+Sébastien Ballet.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+fbset(8)
diff --git a/system/fbterm/fbterm.SlackBuild b/system/fbterm/fbterm.SlackBuild
index ac9bd910ec..fdd19926ea 100644
--- a/system/fbterm/fbterm.SlackBuild
+++ b/system/fbterm/fbterm.SlackBuild
@@ -1,14 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fbterm
 
 # Originally written by vvoody <email removed>
-# Now maintained by B. Watson <yalhcru@gmail.com>
+# Now maintained by B. Watson <urchlay@slackware.uk>
 
 # Original vvoody version of this script had no license. Modified version
 # is licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/
 # for details.
 
+# 20210826 bkw: BUILD=2
+# - add man page for checkfb
+
 # 20170621 bkw:
 # - fix build on -current
 
@@ -22,10 +25,13 @@
 # - add checkfb.c, from Trolltech by way of Slint
 # - add capability stuff
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fbterm
 VERSION=${VERSION:-1.8}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -63,11 +73,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # without this, /usr gets spammed by 'tic', and the terminfo stuff
 # doesn't become part of the package.
@@ -104,6 +111,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 # to bundle this with fbterm, for use in Slint. it looks like a useful
 # little utility.
 gcc $SLKCFLAGS -Wl,-s -o $PKG/usr/bin/checkfb $CWD/checkfb.c
+gzip -9c < $CWD/checkfb.1 > $PKG/usr/man/man1/checkfb.1.gz
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
@@ -117,4 +125,4 @@ if [ "${SETCAP:-yes}" = "yes" ]; then
 fi
 
 cd $PKG
-/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fbterm/fbterm.info b/system/fbterm/fbterm.info
index 4b097e25de..59e6b590e2 100644
--- a/system/fbterm/fbterm.info
+++ b/system/fbterm/fbterm.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/fcron/fcron.SlackBuild b/system/fcron/fcron.SlackBuild
index 835f21f70f..f1df6e9184 100644
--- a/system/fcron/fcron.SlackBuild
+++ b/system/fcron/fcron.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fcron
 
@@ -22,15 +22,35 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fcron
-VERSION=${VERSION:-3.3.0}
+VERSION=${VERSION:-3.3.1}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 # Select fcron's default user/group
 FCRON_USER=${FCRON_USER:-fcron}
 FCRON_GROUP=${FCRON_GROUP:-fcron}
 
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+# Make sure the fcron default user and group exist
 if ! getent group $FCRON_GROUP >/dev/null;  then
   echo "Error, the group $FCRON_GROUP does not exist."
   echo "Create the group and user like this:"
@@ -45,15 +65,6 @@ if ! getent passwd $FCRON_USER >/dev/null; then
   exit 1
 fi
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -126,4 +137,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fcron/fcron.info b/system/fcron/fcron.info
index d22df41287..cb6d8084da 100644
--- a/system/fcron/fcron.info
+++ b/system/fcron/fcron.info
@@ -1,8 +1,8 @@
 PRGNAM="fcron"
-VERSION="3.3.0"
+VERSION="3.3.1"
 HOMEPAGE="http://fcron.free.fr/"
-DOWNLOAD="http://fcron.free.fr/archives/fcron-3.3.0.src.tar.gz"
-MD5SUM="d7485eeb01e71b3e40cd8f57ef4904db"
+DOWNLOAD="http://fcron.free.fr/archives/fcron-3.3.1.src.tar.gz"
+MD5SUM="2e95ceb98842393232e062e9cb1346b7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/fd/fd.SlackBuild b/system/fd/fd.SlackBuild
index e842053adb..adcc35d544 100644
--- a/system/fd/fd.SlackBuild
+++ b/system/fd/fd.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fd
 
-# Copyright 2017-2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-2022 Andrew Clemons, Wellington New Zealand
+# Copyright 2022-2023 Andrew Clemons, Tokyo, Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fd
-VERSION=${VERSION:-8.2.1}
+VERSION=${VERSION:-9.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -41,7 +45,11 @@ if [ -z "$ARCH" ]; then
   fi
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -49,15 +57,15 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
-  CARGOTARGET="--target i586-unknown-linux-gnu"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-  CARGOTARGET="--target i686-unknown-linux-gnu"
-elif [ "$ARCH" = "x86_64" ]; then
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
+elif [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "aarch64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  CARGOTARGET="--target x86_64-unknown-linux-gnu"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -75,7 +83,7 @@ cd $PRGNAM-$VERSION
 
 # build offline
 # configuration tells cargo to use the configured directory
-# for dependencies intead of downloading from crates.io
+# for dependencies instead of downloading from crates.io
 mkdir .cargo
 cat << EOF >> .cargo/config
 [source.crates-io]
@@ -130,9 +138,17 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
+CARGO_HOME=.cargo \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-cargo build --release $CARGOTARGET
+cargo build --offline --release $CARGOTARGET
 
 mkdir -p $PKG/usr/bin/
 
@@ -148,11 +164,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CONTRIBUTING.md LICENSE-APACHE LICENSE-MIT README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md CONTRIBUTING.md LICENSE-APACHE LICENSE-MIT README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fd/fd.info b/system/fd/fd.info
index bb79177da2..a7c7e9c75e 100644
--- a/system/fd/fd.info
+++ b/system/fd/fd.info
@@ -1,130 +1,218 @@
 PRGNAM="fd"
-VERSION="8.2.1"
+VERSION="9.0.0"
 HOMEPAGE="https://github.com/sharkdp/fd"
-DOWNLOAD="https://github.com/sharkdp/fd/archive/v8.2.1/fd-8.2.1.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.15.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.12.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/anyhow/anyhow-1.0.35.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bstr/bstr-0.2.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.66.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.8.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ctrlc/ctrlc-3.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/diff/diff-0.1.12.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-next/dirs-next-2.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-sys-next/dirs-sys-next-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/filetime/filetime-0.2.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fs_extra/fs_extra-1.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-cprng/fuchsia-cprng-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.15.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/globset/globset-0.4.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/humantime/humantime-2.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ignore/ignore-0.4.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/jemalloc-sys/jemalloc-sys-0.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/jemallocator/jemallocator-0.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.80.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lscolors/lscolors-0.7.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.18.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.4.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.4.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rdrand/rdrand-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.57.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.3.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.21.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.4.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tempdir/tempdir-0.3.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/term_size/term_size-0.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/users/users-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate"
-MD5SUM="be6243e578e2313578bb0cf1e713b5e9 \
-        93850f8bf39e61dcf80ce49b5e0943d7 \
-        294a49d3c53865fa7ac5d0ce2f5d5735 \
-        f44e8d1d2e61974b268852797530ea41 \
-        6f628b386c5dfe62ffa9b017d8ed7c38 \
-        142cb4b9a653e56e56311f0c883b8582 \
-        c6443ec8d007c729ba5482008d0c864d \
-        6799c26a7eacaf8e58d3e45c6c5add89 \
-        0df9d76acda993ef38665e5e254f500c \
-        b3ebb5d4433417e998d982d46334a6f4 \
-        882dbbc613a93f64c3709b0a2bd0d6dc \
+DOWNLOAD="https://github.com/sharkdp/fd/archive/v9.0.0/fd-9.0.0.tar.gz \
+          https://static.crates.io/crates/aho-corasick/aho-corasick-1.1.2.crate \
+          https://static.crates.io/crates/android-tzdata/android-tzdata-0.1.1.crate \
+          https://static.crates.io/crates/android_system_properties/android_system_properties-0.1.5.crate \
+          https://static.crates.io/crates/anstream/anstream-0.6.4.crate \
+          https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.2.crate \
+          https://static.crates.io/crates/anstyle-query/anstyle-query-1.0.0.crate \
+          https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-3.0.1.crate \
+          https://static.crates.io/crates/anstyle/anstyle-1.0.4.crate \
+          https://static.crates.io/crates/anyhow/anyhow-1.0.75.crate \
+          https://static.crates.io/crates/argmax/argmax-0.3.1.crate \
+          https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \
+          https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \
+          https://static.crates.io/crates/bitflags/bitflags-2.4.1.crate \
+          https://static.crates.io/crates/bstr/bstr-1.7.0.crate \
+          https://static.crates.io/crates/bumpalo/bumpalo-3.14.0.crate \
+          https://static.crates.io/crates/cc/cc-1.0.83.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://static.crates.io/crates/chrono/chrono-0.4.31.crate \
+          https://static.crates.io/crates/clap/clap-4.4.10.crate \
+          https://static.crates.io/crates/clap_builder/clap_builder-4.4.9.crate \
+          https://static.crates.io/crates/clap_complete/clap_complete-4.4.4.crate \
+          https://static.crates.io/crates/clap_derive/clap_derive-4.4.7.crate \
+          https://static.crates.io/crates/clap_lex/clap_lex-0.6.0.crate \
+          https://static.crates.io/crates/colorchoice/colorchoice-1.0.0.crate \
+          https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.4.crate \
+          https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.8.crate \
+          https://static.crates.io/crates/crossbeam-deque/crossbeam-deque-0.8.3.crate \
+          https://static.crates.io/crates/crossbeam-epoch/crossbeam-epoch-0.9.15.crate \
+          https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.16.crate \
+          https://static.crates.io/crates/ctrlc/ctrlc-3.4.1.crate \
+          https://static.crates.io/crates/diff/diff-0.1.13.crate \
+          https://static.crates.io/crates/errno/errno-0.3.5.crate \
+          https://static.crates.io/crates/etcetera/etcetera-0.8.0.crate \
+          https://static.crates.io/crates/faccess/faccess-0.2.4.crate \
+          https://static.crates.io/crates/fastrand/fastrand-2.0.1.crate \
+          https://static.crates.io/crates/filetime/filetime-0.2.22.crate \
+          https://static.crates.io/crates/globset/globset-0.4.14.crate \
+          https://static.crates.io/crates/heck/heck-0.4.1.crate \
+          https://static.crates.io/crates/home/home-0.5.5.crate \
+          https://static.crates.io/crates/humantime/humantime-2.1.0.crate \
+          https://static.crates.io/crates/iana-time-zone-haiku/iana-time-zone-haiku-0.1.2.crate \
+          https://static.crates.io/crates/iana-time-zone/iana-time-zone-0.1.58.crate \
+          https://static.crates.io/crates/ignore/ignore-0.4.21.crate \
+          https://static.crates.io/crates/jemalloc-sys/jemalloc-sys-0.5.4%2B5.3.0-patched.crate \
+          https://static.crates.io/crates/jemallocator/jemallocator-0.5.4.crate \
+          https://static.crates.io/crates/js-sys/js-sys-0.3.64.crate \
+          https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \
+          https://static.crates.io/crates/libc/libc-0.2.150.crate \
+          https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.10.crate \
+          https://static.crates.io/crates/log/log-0.4.20.crate \
+          https://static.crates.io/crates/lscolors/lscolors-0.16.0.crate \
+          https://static.crates.io/crates/memchr/memchr-2.6.4.crate \
+          https://static.crates.io/crates/memoffset/memoffset-0.9.0.crate \
+          https://static.crates.io/crates/nix/nix-0.24.3.crate \
+          https://static.crates.io/crates/nix/nix-0.27.1.crate \
+          https://static.crates.io/crates/normpath/normpath-1.1.1.crate \
+          https://static.crates.io/crates/nu-ansi-term/nu-ansi-term-0.49.0.crate \
+          https://static.crates.io/crates/num-traits/num-traits-0.2.17.crate \
+          https://static.crates.io/crates/once_cell/once_cell-1.18.0.crate \
+          https://static.crates.io/crates/proc-macro-error-attr/proc-macro-error-attr-1.0.4.crate \
+          https://static.crates.io/crates/proc-macro-error/proc-macro-error-1.0.4.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.69.crate \
+          https://static.crates.io/crates/quote/quote-1.0.33.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.3.5.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.4.1.crate \
+          https://static.crates.io/crates/regex-automata/regex-automata-0.4.3.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.2.crate \
+          https://static.crates.io/crates/regex/regex-1.10.2.crate \
+          https://static.crates.io/crates/rustix/rustix-0.38.21.crate \
+          https://static.crates.io/crates/same-file/same-file-1.0.6.crate \
+          https://static.crates.io/crates/scopeguard/scopeguard-1.2.0.crate \
+          https://static.crates.io/crates/serde/serde-1.0.189.crate \
+          https://static.crates.io/crates/serde_derive/serde_derive-1.0.189.crate \
+          https://static.crates.io/crates/strsim/strsim-0.10.0.crate \
+          https://static.crates.io/crates/syn/syn-1.0.109.crate \
+          https://static.crates.io/crates/syn/syn-2.0.38.crate \
+          https://static.crates.io/crates/tempfile/tempfile-3.8.1.crate \
+          https://static.crates.io/crates/terminal_size/terminal_size-0.3.0.crate \
+          https://static.crates.io/crates/test-case-core/test-case-core-3.2.1.crate \
+          https://static.crates.io/crates/test-case-macros/test-case-macros-3.2.1.crate \
+          https://static.crates.io/crates/test-case/test-case-3.3.1.crate \
+          https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.12.crate \
+          https://static.crates.io/crates/utf8parse/utf8parse-0.2.1.crate \
+          https://static.crates.io/crates/version_check/version_check-0.9.4.crate \
+          https://static.crates.io/crates/walkdir/walkdir-2.4.0.crate \
+          https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.87.crate \
+          https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.87.crate \
+          https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.87.crate \
+          https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.87.crate \
+          https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.87.crate \
+          https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi-util/winapi-util-0.1.6.crate \
+          https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi/winapi-0.3.9.crate \
+          https://static.crates.io/crates/windows-core/windows-core-0.51.1.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.48.0.crate \
+          https://static.crates.io/crates/windows-targets/windows-targets-0.48.5.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.48.5.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.48.5.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.48.5.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.5.crate"
+MD5SUM="3ee72ca77c9a6b0ad108f48338206f05 \
+        95e5f8d0b7ab37171b8d3118542ba06a \
+        e0a03581a6aea080315323651f272d65 \
+        bf23cd323c33a8c283c41bb9b79e4ce4 \
+        d18a8aaf56bfd7418a91540a0174402d \
+        316c95b1454a81db86a56d5af6734c94 \
+        d2453c99c7af98286c2dc9017a8dba6d \
+        b57fd47f132f32001e0d4bfc4621f1bf \
+        b4f71ffecd3694a82ffb62c357d997a8 \
+        39a78bec5a0ae75f210c1f67250152b0 \
+        36efe34e07a8009f1965a786fab5aecb \
+        05d77ef52e90ad161fdd41b252420467 \
+        a295edb6953237ebbdfa8e731229f9a3 \
+        ebcf604c44976809506192718f439dc1 \
+        58b04c69758e02189595f45cce636284 \
+        d8cacbb844fca8c0ca102c7576946131 \
+        9241fa90ea8b17c00010be46c9aa1ac5 \
         74634128440dbc3766bda76fdf0aaa05 \
-        bc79e0eb364df515a33755ac9a581cfd \
-        9e1f73325eeb9647ee68eeaa4bff975c \
-        ed8fbdb220a7435e83c34d46151182f0 \
-        06fc5cd841a576b0bc969fb13ba22b4c \
-        3681f813c502d911e9eea940dddd26a5 \
-        c1922365b80dcdf50342e7640eea27ce \
-        d2c45f1ab11c072f28d2087f0af9870f \
-        8dab3b3ec00dc56cffde0b0c410d47b5 \
-        11bdaeb718e5577104b0697c89cf9311 \
-        27260b46db6b9ac40318143d70a80ba3 \
-        704babd757a22f163230a36fa5474890 \
-        1b94f32581a557963eecb29761e9c0eb \
-        553b325a602b701eb7eaef228e69d0f2 \
-        3f94dd669aafea2fcd7c8c63236029c4 \
-        88b4e3e28ea8527c2b0e7124d6d5766f \
-        85dae509b4cda41fa820b3ad3b302479 \
-        9f10bcc7b3ab24a0cdbaa0addc65b88d \
+        ddca5e4cff2fcc78d99a9efe991c5cf2 \
+        b9fb1a6efa893a291dc40b8f67894047 \
+        7a5fbad4068946fdd6cf5020683d847c \
+        30e4024be60605f771fae98ebf38e441 \
+        08b9a34eadbb01ac16e36694e53eb254 \
+        8f177f61a37d63f805acb925b30a0e58 \
+        010f6d0e98cc2a2b99907a23c6cd6bbc \
+        b477cc1c7b45e2187b3cad0377b504d8 \
+        87789a9723d81ff7d65a093a085617ae \
+        fd98c74ef4f8e5abcd938173ae8e2ab5 \
+        9970b72159dfdaf0ebb3eab0edfd37a4 \
+        f0c49a1a8cb131110f9f14f440bf872c \
+        70cadc77f99579272fbcbed7a6d3f31d \
+        434e2423f372fed80f69ed8873fdd2a3 \
+        616ae19b360c12012591da557ee83f41 \
+        f8bbc5e2d829e3a4cb40da5ef6dfcd72 \
+        d5e8b85429057df45d78e55cdc382369 \
+        80e1c1b89d858c93fc5946b4a8266504 \
+        412f39c3faf2efd34b5fe184e36ccc2f \
+        423ea3c18df8759400c3d0a381738c64 \
+        b92fa50f56a1e06a7f1bf665442d4a73 \
+        11681ec4554f1f934b25eeba3f558ea7 \
+        c01022fe0357c10ca1d48b16187f81bd \
+        87b1b7cb12ef4dfe842c212b98263048 \
+        ddb0ec63d657e9d1f95a314fdff0b260 \
+        5636b9a8ee575ef87589e449726a81e1 \
+        8a1180efc4ebeaecbf8e8e094bcb2659 \
+        77b8d4657c9c6ff1050c760a3c868a30 \
+        d580c0380408c62e04e018eaaf4258af \
         fba3b040a55c01be7376d3dd5c4d4920 \
-        3845eb009d59a1e90a749e50fadfd2d3 \
-        f50d2e280b4a3491fffda43b90982544 \
-        f3373fd861a0066fa446a8ab3dabc749 \
-        fa3630e5867493e09296155763e4f4a0 \
-        d0daed97b20f4a6b23c8d4e2ac7b77a8 \
-        c36d452e37c73b1e99f40bae18cddfdb \
-        9e99a37f8c37bb953732ef46ac2b12a1 \
-        8cab41822d03dfa674870315308fa392 \
-        35ddcd36701a1a6711cc3aec85909f41 \
-        c8d655d206cbe48b84a22544d6fc6d15 \
-        3cc3a4bd5861ca93d7c0d19129334703 \
-        870008bba2e68db4988c31e511fbd9c4 \
-        13373372c7ce2e894925d846625a7987 \
-        40d1ab8fd9b6e5e376b0839a9132abe1 \
-        0538d1da369f3e3f0412aa4d735c1b61 \
+        5a8dc4bf5c57a6487a7247a635347cc9 \
+        70bd18c57397442e0abc67dfa1c99e0f \
+        8ee79b4fe4c43d9ab09f16344612a656 \
+        1e48dcc194400e8d3cb7c69a5b2056cd \
+        ab9a5f02cef3b8794d810332ebf26a03 \
+        fb6241893b457ed69fae5c1ae19920da \
+        6a307d628f32a1522f0791053b546136 \
+        81fab2fb761d130825cdba5fed59b10b \
+        8d526535233ee01e0f1402b5e8f4e8e9 \
+        8be1ace0f1c199d5cd5656f4d1cf8fcb \
+        512bcd4470f351b2049adeb39cfcdec4 \
+        2dc8aacabbc090f8025a4789d4d6d8f0 \
+        7d76a523677de261dda1b65d29a93c4e \
+        6a32bab57772c3a1146d599b65ffb0cb \
+        41bd794efd88a8bcac5ddb16ee6e208f \
+        0ddb8bccd3198892d0dd0ec7151f7cd3 \
+        782ea88d8e5b517b1c9e7d870e20e9e3 \
+        ff1d093069cfc9eb161907e17a51208b \
+        4f496143a21775fa7bd22bf329c37f37 \
+        91b60a71d44302a8b05bd398eca56c37 \
+        e90f2809a34e2bea0bd5c1120475fb36 \
+        3bd91868192fbb6c457c856a1a430a3d \
         2d8d8b377d144f5e32b4f65a69eb0b24 \
-        781d4ccf5d04c98fa02af207a9639249 \
-        918b2d65f7489e154483e3d6e54118a0 \
-        73d602cc41e3e431bf4fabd129ae1616 \
-        a8de006fe0c7e373c560dd51599287a8 \
-        a5dd75e77c7324f5c1d2d372c990d0a7 \
-        4272c279b06b88f8b0ffce7109348e27 \
-        d4c929fc9daf131daef04ee7eaa91fd4 \
-        333b4ba3f64c35b6f89b521e8d64548b \
-        8b01b016a9b6deebc1b43f296057efb5 \
-        1092a4a24e80f8856efc71af51a06114 \
-        6e23e0eee42b1ba9ec61a6db7ec2dc08 \
+        f1358be8c98b98837cbd2cf51e75f8b3 \
+        594029ccf41cf6d592619865d06b5c38 \
+        bfeacff2ad5324a6e2fda84277824a8b \
+        82d98dc87dc8503400aa095f5aa70f13 \
+        64d9f46e9ba78f68c30c486be3d8b7df \
+        799247562dd69b3b5f4d73f91095dfab \
+        f80faded72df19d43134e2b44137376a \
+        b7eae58d7a80112442643ee2ff481ef7 \
+        e7e2681eb16e207f3a89073468ad7c53 \
+        df6c5492cbd828679a5fcc1e08f16b2d \
+        5832db8037979e44555cd71f8781639e \
+        ca65153603a1a7240bbd9d2ce19f2d67 \
+        ceee1159c41351d05f4cf705490867b3 \
+        d18d362345c4fe512ef67b738b239fb8 \
+        96481ed810273371ed8b87f062a0dcda \
+        e1aaf0d487ef02def77307a74ee35606 \
+        b3139f7d066250bfaf96b99e913ee75d \
+        e41541041285d9f05d372cdac02a4bf7 \
+        4185de0682e5e5f3a9f13285218e59aa \
+        64f9f5c520b25087ba70e4194d6aea9c \
         db96b50050277bf05a3c68534bbb9586 \
-        b9e37d5fc4ad28b612b78ad37816684d \
+        306c0281447d1876e8220007b7a7e053 \
         09de9d01e7331ff3da11f58be8bef0df \
-        0498c4a11448bfc35dc7bb2caa64c753"
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        d343f3cc25259c518e594b7bcd4f144b \
+        f2797ade0e36f1e5d6be9d11b5076582 \
+        24c64817e85ef77765ed0f26c31c9b4c \
+        dae6d89034a6988042fd8be4cf5e037d \
+        de2839e16d9d7a9fd1c397da62f62b4a \
+        e0c35ffb8cfdb74a39bf799811f79304 \
+        d990172b607020701f9e84ca8e1c043c \
+        0a68848588e847ceccf504891584d00b \
+        45b469ad607b912256b7c80141fa2d17 \
+        7799baff9a5664205d9110a2624e8989"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="rust16"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
diff --git a/system/fdclone/fdclone.SlackBuild b/system/fdclone/fdclone.SlackBuild
index 5eb5e8302a..52a1c20afc 100644
--- a/system/fdclone/fdclone.SlackBuild
+++ b/system/fdclone/fdclone.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fdclone
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
@@ -11,11 +11,20 @@
 # pages as "fdclone", not "fd", because SBo already has an "fd". I
 # also don't see the point of the stub fdsh man page.
 
+# 20210826 bkw: BUILD=2
+# - include missing ToAdmin doc file
+# - convert Japanese docs to UTF-8, since nothing on Slackware autodetects
+#   ISO-2002-JP (now you can read them with e.g. less).
+# - hardcode built-in paths to less and vim (simpler code, and safer too)
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fdclone
 SRCNAM=FD
 VERSION=${VERSION:-3.01j}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -25,7 +34,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,11 +77,8 @@ patch -p1 < $CWD/30_makefilein_setting.patch
 # Set the default pager & editor to things that actually exist on
 # Slackware. The user's EDITOR and PAGER will override these, or they
 # can be set system-wide by the admin, in the config file.
-FDPAGER=${FDPAGER:-less}  ; FDPAGER=$( which $FDPAGER )
-FDEDITOR=${FDEDITOR:-vim} ; FDEDITOR=$( which $FDEDITOR )
-
-sed -i -e "s,/usr/bin/pager,$FDPAGER," \
-       -e "s,/usr/bin/editor,$FDEDITOR," \
+sed -i -e "s,/usr/bin/pager,/usr/bin/less," \
+       -e "s,/usr/bin/editor,/usr/bin/vi," \
        fd.h
 
 make config
@@ -110,13 +120,20 @@ cat $CWD/fd2rc > $PKG/etc/$PRGNAM/fd2rc
 echo "# fd2rc.siteconfig - see fd2rc for options you can use here" > \
   $PKG/etc/$PRGNAM/fd2rc.siteconfig.new
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a FAQ* HISTORY* LICENSES* README* TECHKNOW* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+
+# Convert the Japanese-language docs to UTF-8 encoding.
+for i in FAQ HISTORY LICENSES README TECHKNOW ToAdmin; do
+   iconv -f ISO-2022-JP -t UTF-8 $i > $PKGDOC/$i
+   cp -a $i.eng $PKGDOC/$i.eng
+done
+
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fdclone/fdclone.info b/system/fdclone/fdclone.info
index 7172c22de0..37fa80c64f 100644
--- a/system/fdclone/fdclone.info
+++ b/system/fdclone/fdclone.info
@@ -1,10 +1,10 @@
 PRGNAM="fdclone"
 VERSION="3.01j"
-HOMEPAGE="http://hp.vector.co.jp/authors/VA012337/soft/fd/"
-DOWNLOAD="http://hp.vector.co.jp/authors/VA012337/soft/fd/FD-3.01j.tar.gz"
+HOMEPAGE="https://hp.vector.co.jp/authors/VA012337/soft/fd/"
+DOWNLOAD="https://hp.vector.co.jp/authors/VA012337/soft/fd/FD-3.01j.tar.gz"
 MD5SUM="81f4b5a2aa50afac8c1677d34a646a7e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/fdupes/fdupes.SlackBuild b/system/fdupes/fdupes.SlackBuild
index 773d032db6..3727d84309 100644
--- a/system/fdupes/fdupes.SlackBuild
+++ b/system/fdupes/fdupes.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for duplicate file finder fdupes.
 
@@ -29,10 +29,13 @@
 # 19/06/2011 - Updated to version 1.50-PR2
 # 30/01/2019 - Updated to version 1.6.1, i486 -> i586
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fdupes
 VERSION=${VERSION:-1.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -42,7 +45,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -99,4 +109,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/felix/README b/system/felix/README
new file mode 100644
index 0000000000..fa5123e442
--- /dev/null
+++ b/system/felix/README
@@ -0,0 +1,97 @@
+Felix is a tui file manager with vim-like key mapping, written in Rust,
+fast, simple, and easy to configure & use.
+Configuration path: $XDG_CONFIG_HOME/felix
+
+Default config file will be created automatically when you launch the
+program for the first time.
+
+In config.toml, you can set:
+
+how to open files
+max length of item to be displayed (optional)
+color of directory, file, and symlink separatively
+default key to sort the item list ("Name" or "Time")
+
+Command settings
+
+For example, If you write
+
+default = "nvim"
+
+[exec]
+feh = ["jpg", "jpeg", "png", "gif", "svg"]
+zathura = ["pdf"]
+
+then, .jpg, .jpeg, .png, .gif and .svg files are opened by feh
+<file-name>, .pdf files by zathura <file-name> and others by nvim
+<file-name> .
+
+Usage:
+command / arguments
+fx         Show items in the current directory.
+fx  <directory path> Show items in the path. Both relative and
+          absolute available.
+fx  -l [path] or fx --log [path] Launch the app and create a log file.
+fx  -v or fx --version Print the current version and check update.
+fx  -h or fx --help Print help.
+
+Key manual
+Key Explanation
+
+j / Up     Go up. If the list exceeds max-row, it "scrolls" before the
+           top of the list.
+k / Down   Go down. If the list exceeds max-row, it "scrolls" before
+           the bottom of the list.
+h / Left   Go to the parent directory if exists.
+l / Right / Enter Open a file or change the directory. Commands for the
+            execution can be managed in the config file.
+o           Open a file in a new window. This enables you to use felix
+            while working with the file. If you open a file in an editor
+            that runs inside the terminal, no new window appears, and
+            after exit some error messages may appear.
+gg          Go to the top.
+G           Go to the bottom.
+z + Enter   Go to the home directory.
+z <keyword> This command requires zoxide installed. Jump to a directory
+            that matches the keyword. Internally, felix calls zoxide
+            query <keyword>, so if the keyword does not match the zoxide
+            database, this command will fail.
+dd          Delete and yank one item (will go to the trash directory).
+yy          Yank one item. If you yanked other item(s) before, it's
+            replaced by this one.
+p           Put yanked item(s) in the current directory. If the item
+            with same name exists, copied item will be renamed with the
+            suffix "_copied".
+V           Switch to the select mode, where you can move cursor to
+            select items.
+d (select mode) Delete and yank selected items, and return to the normal
+                mode.
+y (select mode) Yank selected items, and return to the normal mode.
+u           Undo put/delete/rename.
+Ctrl + r    Redo put/delete/rename.
+v           Toggle whether to show the item preview (text, image, or
+            the contents tree) on the right half of the terminal. Hi-res
+            image preview is enabled if i) your terminal supports
+            sixel, and ii) you've preinstalled libsixel. If not, images
+            are printed by blocks.
+backspace   Toggle whether to show hidden items or not. This change
+            remains after exit (stored in .session).
+t           Toggle sort order (by name <-> by modified time). This
+            change remains after exit (same as above).
+c           Switch to the rename mode (enter the new name and press
+            Enter to rename the item).
+/           Switch to the filter mode (enter the keyword and press Enter
+            to show the filtered list). Press h or Left to exit the
+            filter mode.
+:           Experimantal. Switch to the shell mode. Type command and
+            press Enter to execute it. You can use any command in the
+            displayed directory, but some commands may fail, and the
+            display may collapse during execution.
+:cd / :z    Go to the home directory.
+:z <keyword> Same as z <keyword>.
+:e          Reload the current directory. Useful when something goes
+            wrong.
+:empty      Empty the trash directory. Please think twice to use this.
+:h          Show help. (scrolls by j/k or Up/Down)
+Esc         Return to the normal mode.
+:q / ZZ     Exit.
diff --git a/system/felix/felix.SlackBuild b/system/felix/felix.SlackBuild
new file mode 100644
index 0000000000..476f74984c
--- /dev/null
+++ b/system/felix/felix.SlackBuild
@@ -0,0 +1,166 @@
+#!/bin/bash
+
+# Slackware build script for felix
+
+# Copyright 2022 Damian Perticone, Berisso, Argentina
+# thanks to andrew clemons for the very good tip!!
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=felix
+VERSION=${VERSION:-1.0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+
+  if [ "$ARCH" = "i586" ]; then
+    if rustc -Vv | grep host | grep i686 > /dev/null ; then
+      ARCH=i686
+    fi
+  fi
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+  CARGOTARGET="--target i586-unknown-linux-gnu"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+  CARGOTARGET="--target i686-unknown-linux-gnu"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  CARGOTARGET="--target x86_64-unknown-linux-gnu"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+  CARGOTARGET=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+# build offline
+# configuration tells cargo to use the configured directory
+# for dependencies intead of downloading from crates.io
+mkdir .cargo
+cat << EOF >> .cargo/config
+[source.crates-io]
+registry = 'https://github.com/rust-lang/crates.io-index'
+replace-with = 'vendored-sources'
+
+[source.vendored-sources]
+directory = '$(pwd)/vendor'
+EOF
+
+# deps and versions come from Cargo.lock
+mkdir vendor
+(
+  cd vendor
+
+  grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
+    sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
+    awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \
+    grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do
+
+    ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
+    dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
+
+    tar xvf $CWD/$dep-$ver.crate
+
+    touch $dep-$ver/.cargo-ok
+
+    # generate checksum
+    {
+      printf "{\n"
+      printf '    "files": {\n'
+
+      (
+        cd $dep-$ver
+        find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/'
+      ) | sed '$ s/,$//'
+
+      printf "    },\n"
+      printf '    "package": "'
+
+      sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
+
+      printf "}\n"
+    } > $dep-$ver/.cargo-checksum.json
+  done
+)
+
+sed -i '/strip =/d' Cargo.toml
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CARGO_HOME=.cargo \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+cargo build --release $CARGOTARGET
+
+mkdir -p $PKG/usr/bin
+
+find target -name fx -exec install -m 755 {} $PKG/usr/bin/fx \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/felix/felix.info b/system/felix/felix.info
new file mode 100644
index 0000000000..87476066cd
--- /dev/null
+++ b/system/felix/felix.info
@@ -0,0 +1,254 @@
+PRGNAM="felix"
+VERSION="1.0.1"
+HOMEPAGE="https://github.com/kyoheiu/felix"
+DOWNLOAD="https://github.com/kyoheiu/felix/archive/v1.0.1/felix-1.0.1.tar.gz \
+          https://static.crates.io/crates/adler32/adler32-1.2.0.crate \
+          https://static.crates.io/crates/adler/adler-1.0.2.crate \
+          https://static.crates.io/crates/ansi_colours/ansi_colours-1.1.1.crate \
+          https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \
+          https://static.crates.io/crates/base64/base64-0.13.0.crate \
+          https://static.crates.io/crates/bit_field/bit_field-0.10.1.crate \
+          https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \
+          https://static.crates.io/crates/bumpalo/bumpalo-3.9.1.crate \
+          https://static.crates.io/crates/bytemuck/bytemuck-1.9.1.crate \
+          https://static.crates.io/crates/byteorder/byteorder-1.4.3.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://static.crates.io/crates/chrono/chrono-0.4.19.crate \
+          https://static.crates.io/crates/color_quant/color_quant-1.1.0.crate \
+          https://static.crates.io/crates/console/console-0.15.0.crate \
+          https://static.crates.io/crates/crc32fast/crc32fast-1.3.2.crate \
+          https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.4.crate \
+          https://static.crates.io/crates/crossbeam-deque/crossbeam-deque-0.8.1.crate \
+          https://static.crates.io/crates/crossbeam-epoch/crossbeam-epoch-0.9.8.crate \
+          https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.8.crate \
+          https://static.crates.io/crates/crossterm/crossterm-0.23.2.crate \
+          https://static.crates.io/crates/crossterm_winapi/crossterm_winapi-0.9.0.crate \
+          https://static.crates.io/crates/deflate/deflate-1.0.0.crate \
+          https://static.crates.io/crates/dirs-sys/dirs-sys-0.3.7.crate \
+          https://static.crates.io/crates/dirs/dirs-4.0.0.crate \
+          https://static.crates.io/crates/either/either-1.6.1.crate \
+          https://static.crates.io/crates/encode_unicode/encode_unicode-0.3.6.crate \
+          https://static.crates.io/crates/exr/exr-1.4.2.crate \
+          https://static.crates.io/crates/fastrand/fastrand-1.7.0.crate \
+          https://static.crates.io/crates/flate2/flate2-1.0.23.crate \
+          https://static.crates.io/crates/flume/flume-0.10.12.crate \
+          https://static.crates.io/crates/futures-core/futures-core-0.3.21.crate \
+          https://static.crates.io/crates/futures-sink/futures-sink-0.3.21.crate \
+          https://static.crates.io/crates/getrandom/getrandom-0.2.6.crate \
+          https://static.crates.io/crates/gif/gif-0.11.3.crate \
+          https://static.crates.io/crates/half/half-1.8.2.crate \
+          https://static.crates.io/crates/hermit-abi/hermit-abi-0.1.19.crate \
+          https://static.crates.io/crates/image/image-0.24.2.crate \
+          https://static.crates.io/crates/inflate/inflate-0.4.5.crate \
+          https://static.crates.io/crates/instant/instant-0.1.12.crate \
+          https://static.crates.io/crates/itoa/itoa-1.0.2.crate \
+          https://static.crates.io/crates/jpeg-decoder/jpeg-decoder-0.2.6.crate \
+          https://static.crates.io/crates/js-sys/js-sys-0.3.57.crate \
+          https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \
+          https://static.crates.io/crates/lebe/lebe-0.5.1.crate \
+          https://static.crates.io/crates/libc/libc-0.2.126.crate \
+          https://static.crates.io/crates/lock_api/lock_api-0.4.7.crate \
+          https://static.crates.io/crates/log/log-0.4.17.crate \
+          https://static.crates.io/crates/memoffset/memoffset-0.6.5.crate \
+          https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.5.1.crate \
+          https://static.crates.io/crates/mio/mio-0.8.3.crate \
+          https://static.crates.io/crates/nanorand/nanorand-0.7.0.crate \
+          https://static.crates.io/crates/natord/natord-1.0.9.crate \
+          https://static.crates.io/crates/num-integer/num-integer-0.1.45.crate \
+          https://static.crates.io/crates/num-iter/num-iter-0.1.43.crate \
+          https://static.crates.io/crates/num-rational/num-rational-0.4.0.crate \
+          https://static.crates.io/crates/num-traits/num-traits-0.2.15.crate \
+          https://static.crates.io/crates/num_cpus/num_cpus-1.13.1.crate \
+          https://static.crates.io/crates/num_threads/num_threads-0.1.6.crate \
+          https://static.crates.io/crates/numtoa/numtoa-0.1.0.crate \
+          https://static.crates.io/crates/once_cell/once_cell-1.12.0.crate \
+          https://static.crates.io/crates/parking_lot/parking_lot-0.12.0.crate \
+          https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.9.3.crate \
+          https://static.crates.io/crates/pin-project-internal/pin-project-internal-1.0.10.crate \
+          https://static.crates.io/crates/pin-project/pin-project-1.0.10.crate \
+          https://static.crates.io/crates/png/png-0.17.5.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.39.crate \
+          https://static.crates.io/crates/quote/quote-1.0.18.crate \
+          https://static.crates.io/crates/rayon-core/rayon-core-1.9.3.crate \
+          https://static.crates.io/crates/rayon/rayon-1.5.3.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.2.13.crate \
+          https://static.crates.io/crates/redox_termios/redox_termios-0.1.2.crate \
+          https://static.crates.io/crates/redox_users/redox_users-0.4.3.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.26.crate \
+          https://static.crates.io/crates/regex/regex-1.5.6.crate \
+          https://static.crates.io/crates/remove_dir_all/remove_dir_all-0.5.3.crate \
+          https://static.crates.io/crates/rgb/rgb-0.8.32.crate \
+          https://static.crates.io/crates/same-file/same-file-1.0.6.crate \
+          https://static.crates.io/crates/scoped_threadpool/scoped_threadpool-0.1.9.crate \
+          https://static.crates.io/crates/scopeguard/scopeguard-1.1.0.crate \
+          https://static.crates.io/crates/serde/serde-1.0.137.crate \
+          https://static.crates.io/crates/serde_derive/serde_derive-1.0.137.crate \
+          https://static.crates.io/crates/signal-hook-mio/signal-hook-mio-0.2.3.crate \
+          https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.4.0.crate \
+          https://static.crates.io/crates/signal-hook/signal-hook-0.3.14.crate \
+          https://static.crates.io/crates/simplelog/simplelog-0.12.0.crate \
+          https://static.crates.io/crates/smallvec/smallvec-1.8.0.crate \
+          https://static.crates.io/crates/spin/spin-0.9.3.crate \
+          https://static.crates.io/crates/syn/syn-1.0.95.crate \
+          https://static.crates.io/crates/tempfile/tempfile-3.3.0.crate \
+          https://static.crates.io/crates/termcolor/termcolor-1.1.3.crate \
+          https://static.crates.io/crates/terminal_size/terminal_size-0.1.17.crate \
+          https://static.crates.io/crates/termion/termion-1.5.6.crate \
+          https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.31.crate \
+          https://static.crates.io/crates/thiserror/thiserror-1.0.31.crate \
+          https://static.crates.io/crates/threadpool/threadpool-1.8.1.crate \
+          https://static.crates.io/crates/tiff/tiff-0.7.2.crate \
+          https://static.crates.io/crates/time-macros/time-macros-0.2.4.crate \
+          https://static.crates.io/crates/time/time-0.1.44.crate \
+          https://static.crates.io/crates/time/time-0.3.9.crate \
+          https://static.crates.io/crates/toml/toml-0.5.9.crate \
+          https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.0.crate \
+          https://static.crates.io/crates/unicode-width/unicode-width-0.1.9.crate \
+          https://static.crates.io/crates/viuer/viuer-0.6.1.crate \
+          https://static.crates.io/crates/walkdir/walkdir-2.3.2.crate \
+          https://static.crates.io/crates/wasi/wasi-0.10.0+wasi-snapshot-preview1.crate \
+          https://static.crates.io/crates/wasi/wasi-0.11.0+wasi-snapshot-preview1.crate \
+          https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.80.crate \
+          https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.80.crate \
+          https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.80.crate \
+          https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.80.crate \
+          https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.80.crate \
+          https://static.crates.io/crates/weezl/weezl-0.1.6.crate \
+          https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi-util/winapi-util-0.1.5.crate \
+          https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi/winapi-0.3.9.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.36.1.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.36.1.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.36.1.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.36.1.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.36.1.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.36.1.crate"
+MD5SUM="564fba28565eebea80f8882ce9a35f8e \
+        d5898ddb1e496ff0ac50b79829311e76 \
+        669215548c64019c08c92b2c1afd3deb \
+        b7c705d140b43db89a8106c0c341ae7c \
+        05d77ef52e90ad161fdd41b252420467 \
+        80a2c27647a6acb1890a3a7de8fded72 \
+        2ff83225cc3e2df3c56e24274621515f \
+        a295edb6953237ebbdfa8e731229f9a3 \
+        79173170388e20507a241b355ef521e3 \
+        b97237f68aaea0dcce7275c08aed1072 \
+        1e704be5ddde9d6b5383ef1035309f91 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        1581b390d17f6e73a43ffc8a7b009e57 \
+        ee1260862a62c0d8824b664a1abda7b8 \
+        7496180b753f8729ac92e0a491ff94cc \
+        a9d6492a1bd21d93dbc27c32eabd0c70 \
+        576ee1b86d4c2abacb63ea19c0121d2f \
+        93c803ad55de44eedc24870f83d0279b \
+        abc30053602577b8fa8f181239f505b1 \
+        8d21be2fa5f912232d6c441e8dd78cb1 \
+        6e50eb9dbb4e044a850700133744449e \
+        22a24f05bcdf8e7e82aa83e1d1bf52b7 \
+        47680a64a0775a1c9450862d68801b1f \
+        4c21da37e71a52f26c8c5490f3ec4837 \
+        889fdcd1499ef5939caaafab5c09729e \
+        b4e2b229c362ad0dd313ff631816d5db \
+        95a243b2d7c30018a643e218b3c5d693 \
+        4d16e06fa2080b48afdc9926f258fb99 \
+        e08921c68133df2e254fe723b368bae3 \
+        f68a6d098298ffa9b317919120783339 \
+        e7866378b62d00377109dd92c134c32b \
+        8aa040d9c661f68ebb67d5b71813473b \
+        a46bd303e3155f7975b167af12435e5e \
+        8a9e0a43625da8d29c57e742c4d3d385 \
+        eaf063b6842847aeb6f366138da45be1 \
+        fea840ce07a32bdace46c59c41362f3b \
+        0b7994d1256215201bdfb810a357ffa2 \
+        5f8f4bd3647871aa16940e493f39a13e \
+        8ece65b4db64f81379cbd293e2f04d39 \
+        5f153f7135dceb02f88266121c836b4e \
+        dfd1e3e07982e8245a772e6e63e5c4bc \
+        3f7dd8d59e7f0d6f534d07438d8ee915 \
+        d49632aacbe5b25a24e411e7a037cc0d \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        fad26fa0a6e9a624f36658d219e8e20f \
+        c58d450f13e76e4a034fde8f20710266 \
+        1c1e406fe68d3223a6c58e9c1987b6ce \
+        b31bf94ffe7e0f2ada93afae1076eaeb \
+        76124c2327f642cddf19a4aa50cbcb7d \
+        2d3c4e7f37ed77be4f9f204a60e6d26a \
+        110b5ea3d4fc1e9bb304e74f7a3165ee \
+        28a4dbc0158bdb2fa806d97dd55fba2e \
+        5a9b94ba54ea1f52f2a496ba982e3282 \
+        073b4c53e303ccf2a807dfce7f5e986a \
+        44ef8a2279dadf391881a69c60d29197 \
+        0cd34d83344babdcb0aa123b5e672182 \
+        a0de6eabdeb1320350abcbd7c02df6ac \
+        c5e50e299295e662ad19c58428d6e085 \
+        ae2471729f689287aec9da43f8106a4b \
+        bbda7e9c572f651774dfdb0006b9f085 \
+        d2898eb94e8ec220fa09df7fa0ebb692 \
+        eab5fb7020e5cc0a6cfb7627c4e9b31f \
+        f3c211bc33fcf71ca981d02f9fa2813c \
+        8ff78776b6140283bd558ad74554cb16 \
+        228eb40a277a6dda01626b6e9287ee66 \
+        9436a04d4af9dc4c180a14981086f593 \
+        a081866d627a3feb598df6960be8adc8 \
+        0fa01f3988219987a04c09dae3933d94 \
+        4df2c80615b7827c19c735c047a7c82f \
+        5d8cb7121bd2954f7cbb189eacd90c08 \
+        2e69b77050ab91b1d0bb941e843a05cb \
+        c5b23985f2b07389edcda3900fc8a751 \
+        2793ed3e6807d79ff72271baec586531 \
+        c3789f11772f0c40ad7cc1f6e4b7bf2c \
+        8cfc5b8dac188c6b4b790175902df1bc \
+        0538d1da369f3e3f0412aa4d735c1b61 \
+        4b963dbde05acc47514fbea1afdd35c1 \
+        2d8d8b377d144f5e32b4f65a69eb0b24 \
+        b492e0a70603c3903a44ec5cabd3ba21 \
+        b4a0a98a54439a5a37952c8879187ee3 \
+        31553e8c2d0d2f2e7474cc48a03337d8 \
+        3d3fef13feb53a62c0f434a092f526bf \
+        cd23eb9bc45514102af9b76e333230fb \
+        21b43d5721b3a9c16059acb691f4314d \
+        8532a59ccbacb95018a128b2d7b2601a \
+        d4db0f5c1dd60e3ceffcd6f4c8e976ab \
+        6249245cf12427da0a4f37bc3d294ff4 \
+        54da1b9106402b1ed4ca311eecb9dfa1 \
+        d57d659be45ec6812179c4e3e8da7ecd \
+        f29a1bb1b5f3f29cedb36f40f720d765 \
+        40ce77bc7803d0ff8734f6a11c4e8814 \
+        d3266efa0f541bfaca6541e17c1a0457 \
+        5e7f9a17d31e264f87d3e14b85d7da3f \
+        ac76b35d8c76c7fa25c73b8863d5d055 \
+        a8ae09f39c6e68744ca70bf8db61df71 \
+        192229a7b481a4becf170d8a34528739 \
+        1b65b6a069039a7feb57d74a3d1ba4f4 \
+        1810b2a2299ed5a2434da7926161fbd4 \
+        c6c50e4feea5f4cc4e1fb3c7e88606a5 \
+        ad3f3c7bb184e63919b633dc35805cf4 \
+        b02f8aae39609bfe759838fbe0616c1a \
+        1415b48fcebe79916396ef3383ef9b3a \
+        a42cc2834b2150027d7b427558a87803 \
+        2ab1a8fa8098c333b210487575e8430a \
+        580dd7d12690c726da7d5075f3442a74 \
+        a312b55a428f827a91097d1d8497b02b \
+        e972ea58ec203bfa6c79c1207852298b \
+        eff162a9eb73d8bf43ab38431a1825f6 \
+        7c1938786f5fe1da4fb3dbe5ebbcaeeb \
+        5a95cd15fe52d43a8ef355d65417549a \
+        1a1754a2a84a7511aea0bb45eccc5fa0 \
+        2c5bacb773fb313b9b6b497cb9962aa7 \
+        d9f2e38fc1cc846aa07a4e0b43224d10 \
+        db96b50050277bf05a3c68534bbb9586 \
+        b9e37d5fc4ad28b612b78ad37816684d \
+        09de9d01e7331ff3da11f58be8bef0df \
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        b3083009944ab58cbd9c4941f4965545 \
+        776128629d743f0d6127db259a0d8844 \
+        7f60b76e78bd2a190cf3ddc2b4c4920b \
+        ce798410cba61fe713f3487cd6cafef4 \
+        f55176d04297df9dd5ccae7c748e26c7 \
+        8e285ddee403a9abe62d6fe2bfbb736a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="zoxide"
+MAINTAINER="Damian Perticone"
+EMAIL="mjolnirdam@gmail.com"
diff --git a/system/felix/slack-desc b/system/felix/slack-desc
new file mode 100644
index 0000000000..3256c88a51
--- /dev/null
+++ b/system/felix/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+felix: felix (file manager with vim-like key mapping, written in Rust)
+felix:
+felix: Felix is a tui file manager with vim-like key mapping, written in 
+felix: Rust. Fast, simple, and easy to configure & use.
+felix:
+felix:
+felix:
+felix:
+felix:
+felix: Home: https://github.com/kyoheiu/felix
+felix:
diff --git a/system/fence-agents/README b/system/fence-agents/README
index 6ae20b9e8d..76ef9c4465 100644
--- a/system/fence-agents/README
+++ b/system/fence-agents/README
@@ -1,9 +1,9 @@
 fence-agents (Cluster Fence Agents)
 
-Fence agents were developed as device "drivers" which are able to prevent
-computers from destroying data on shared storage. Their aim is to isolate
-a corrupted computer, using one of three methods: Power / Network /
-Configuration.
+Fence agents were developed as device "drivers" which are able to
+prevent computers from destroying data on shared storage. Their aim is
+to isolate a corrupted computer, using one of three methods: Power /
+Network / Configuration.
 
 You might also want to install cluster-glue, heartbeat, resource-agents,
 fence-agents.
diff --git a/system/fence-agents/fence-agents.SlackBuild b/system/fence-agents/fence-agents.SlackBuild
index 13cc51c804..8d637775da 100644
--- a/system/fence-agents/fence-agents.SlackBuild
+++ b/system/fence-agents/fence-agents.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fence-agents
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fence-agents
 VERSION=${VERSION:-4.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -100,4 +110,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fence-agents/fence-agents.info b/system/fence-agents/fence-agents.info
index 6c46e6d631..ba71403949 100644
--- a/system/fence-agents/fence-agents.info
+++ b/system/fence-agents/fence-agents.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/ClusterLabs/fence-agents/archive/v4.5.2/fence-agent
 MD5SUM="eb8c96a87c529b0c30a7524ea86433e7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pexpect ptyprocess python-requests"
+REQUIRES="pexpect"
 MAINTAINER="Pierre-Philipp Braun"
 EMAIL="pbraun@nethence.com"
diff --git a/system/fff/README b/system/fff/README
new file mode 100644
index 0000000000..5430f81568
--- /dev/null
+++ b/system/fff/README
@@ -0,0 +1,18 @@
+fff (F***ing Fast File-Manager)
+
+A simple file manager written in bash. 
+
+Features:
+*It's f***ing fast.
+*Minimal
+*Smooth scrolling (using vim keybindings)
+*Supports LS_COLORS
+*File Operations (copy, paste, cut, ranger style bulk rename, etc)
+*Instant as you type search
+*Tab completion for all commands
+*Automatic CD on exit (see README)
+*Works as a file picker in vim/neovim
+*Display images with w3m-img
+*Supports $CDPATH
+
+Optional dependencies include w3m for displaying images.
diff --git a/system/fff/fff.SlackBuild b/system/fff/fff.SlackBuild
new file mode 100644
index 0000000000..c78f7013de
--- /dev/null
+++ b/system/fff/fff.SlackBuild
@@ -0,0 +1,95 @@
+#!/bin/bash
+
+# Slackware build script for fff
+
+# Copyright 2023 Samuel Young, MO, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fff
+VERSION=${VERSION:-2.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make install DESTDIR=$PKG
+
+mv $PKG/usr/share/man $PKG/usr/man
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+rm -R $PKG/usr/share
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $TMP/$PRGNAM-$VERSION/LICENSE.md > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+cat $TMP/$PRGNAM-$VERSION/README.md > $PKG/usr/doc/$PRGNAM-$VERSION/README
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fff/fff.info b/system/fff/fff.info
new file mode 100644
index 0000000000..c0c9b56406
--- /dev/null
+++ b/system/fff/fff.info
@@ -0,0 +1,10 @@
+PRGNAM="fff"
+VERSION="2.2"
+HOMEPAGE="https://github.com/dylanaraps/fff"
+DOWNLOAD="https://github.com/dylanaraps/fff/archive/2.2/fff-2.2.tar.gz"
+MD5SUM="2d4f8641397fc2a5c5ba9d4b4b4bb36c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Samuel Young"
+EMAIL="samyoung12788@gmail.com"
diff --git a/system/fff/slack-desc b/system/fff/slack-desc
new file mode 100644
index 0000000000..f4ac047fee
--- /dev/null
+++ b/system/fff/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+fff: fff (F***ing Fast File-Manager)
+fff:
+fff: A simple file manager written in bash.
+fff:
+fff: Homepage: https://github.com/dylanaraps/fff
+fff:
+fff:
+fff:
+fff:
+fff:
+fff:
diff --git a/system/ffproxy/ffproxy.SlackBuild b/system/ffproxy/ffproxy.SlackBuild
index 47cea7caab..a116c9f329 100644
--- a/system/ffproxy/ffproxy.SlackBuild
+++ b/system/ffproxy/ffproxy.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ffproxy
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ffproxy
 VERSION=${VERSION:-1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -103,4 +113,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/file-roller-gtk2/README b/system/file-roller-gtk2/README
new file mode 100644
index 0000000000..f932fbe4aa
--- /dev/null
+++ b/system/file-roller-gtk2/README
@@ -0,0 +1,28 @@
+This is the last GTK2 version of file-roller. It will conflict with the
+latest one, so don't install both.
+
+File-roller is an archive manager for the GNOME environment. It allows
+you to:
+
+ * Create and modify archives
+ * View and search the content of an archive
+ * View a file contained in an archive
+ * Extract files from the archive
+
+File-roller supports the following formats:
+
+ * Tar (.tar) archives, including those compressed with
+   gzip (.tar.gz, .tgz), bzip (.tar.bz, .tbz), bzip2 (.tar.bz2, .tbz2),
+   compress (.tar.Z, .taz), lzop (.tar.lzo, .tzo) and lzma (.tar.lzma)
+ * Zip archives (.zip)
+ * Jar archives (.jar, .ear, .war)
+ * 7z archives (.7z)
+ * iso9660 CD images (.iso)
+ * Lha archives (.lzh)
+ * Single files compressed with gzip (.gz), bzip (.bz), bzip2 (.bz2),
+   compress (.Z), lzop (.lzo) and lzma (.lzma)
+
+File-roller doesn't perform archive operations by itself, but relies on
+standard tools for this.
+
+It integrates well in Thunar (XFCE) using Thunar-Archive-Plugin.
diff --git a/system/file-roller-gtk2/doinst.sh b/system/file-roller-gtk2/doinst.sh
new file mode 100644
index 0000000000..052b9667ff
--- /dev/null
+++ b/system/file-roller-gtk2/doinst.sh
@@ -0,0 +1,14 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
diff --git a/system/file-roller-gtk2/file-roller-gtk2.SlackBuild b/system/file-roller-gtk2/file-roller-gtk2.SlackBuild
new file mode 100644
index 0000000000..e954c3e0ba
--- /dev/null
+++ b/system/file-roller-gtk2/file-roller-gtk2.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/bash
+
+# Slackware build script for file-roller
+
+# Copyright 2023 Petar Petrov slackalaxy@gmail.com
+# Copyright 2012 Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com
+# Copyright 2010  Binh Nguyen <binhvng@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=file-roller-gtk2
+SRCNAM=file-roller
+VERSION=${VERSION:-2.32.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Remove this obsolete function or compilation will break
+patch -p1 -i $CWD/no_GPtrArray.patch
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --localedir=/usr/share/locale \
+  --disable-scrollkeeper \
+  --with-gtk=2.0 \
+  --disable-static \
+  --enable-shared \
+  --build=$ARCH-slackware-linux
+
+make V=1
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog HACKING MAINTAINERS NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/file-roller-gtk2/file-roller-gtk2.info b/system/file-roller-gtk2/file-roller-gtk2.info
new file mode 100644
index 0000000000..da5898a36f
--- /dev/null
+++ b/system/file-roller-gtk2/file-roller-gtk2.info
@@ -0,0 +1,10 @@
+PRGNAM="file-roller-gtk2"
+VERSION="2.32.2"
+HOMEPAGE="http://fileroller.sourceforge.net/"
+DOWNLOAD="https://download.gnome.org/sources/file-roller/2.32/file-roller-2.32.2.tar.bz2"
+MD5SUM="2ec596e237c2f3af1d7d3f5b9c12884f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.com"
diff --git a/system/file-roller-gtk2/no_GPtrArray.patch b/system/file-roller-gtk2/no_GPtrArray.patch
new file mode 100644
index 0000000000..d03dc96b3c
--- /dev/null
+++ b/system/file-roller-gtk2/no_GPtrArray.patch
@@ -0,0 +1,36 @@
+diff -pruN old/src/glib-utils.c new/src/glib-utils.c
+--- old/src/glib-utils.c	2011-04-26 17:29:35.000000000 +0300
++++ new/src/glib-utils.c	2021-01-14 00:29:26.236713125 +0200
+@@ -542,21 +542,6 @@ get_time_string (time_t time)
+ }
+ 
+ 
+-GPtrArray *
+-g_ptr_array_copy (GPtrArray *array)
+-{
+-	GPtrArray *new_array;
+-	
+-	if (array == NULL)
+-		return NULL;
+-		
+-	new_array = g_ptr_array_sized_new (array->len);
+-	memcpy (new_array->pdata, array->pdata, array->len * sizeof (gpointer)); 
+-	new_array->len = array->len;
+-	
+-	return new_array;
+-}
+-
+ 
+ void
+ g_ptr_array_free_full (GPtrArray *array,
+diff -pruN old/src/glib-utils.h new/src/glib-utils.h
+--- old/src/glib-utils.h	2011-04-26 17:29:35.000000000 +0300
++++ new/src/glib-utils.h	2021-01-14 00:30:57.756705920 +0200
+@@ -59,7 +59,6 @@ const char *        get_last_field
+ 						  int          last_field);
+ int                 n_fields                     (char       **str_array);
+ char *              get_time_string              (time_t       time);
+-GPtrArray *         g_ptr_array_copy             (GPtrArray   *array);
+ void                g_ptr_array_free_full        (GPtrArray   *array,
+                        				  GFunc        func,
+                        				  gpointer     user_data);
diff --git a/system/file-roller-gtk2/slack-desc b/system/file-roller-gtk2/slack-desc
new file mode 100644
index 0000000000..cde4a7826c
--- /dev/null
+++ b/system/file-roller-gtk2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+file-roller-gtk2: file-roller-gtk2 (an archive manager for GNOME)
+file-roller-gtk2:
+file-roller-gtk2: File-roller is an archive manager for the GNOME environment. It allows
+file-roller-gtk2: you to:
+file-roller-gtk2:  * Create and modify archives
+file-roller-gtk2:  * View the content of an archive
+file-roller-gtk2:  * View a file contained in an archive
+file-roller-gtk2:  * Extract files from the archive
+file-roller-gtk2:
+file-roller-gtk2: Homepage: http://fileroller.sourceforge.net/
+file-roller-gtk2:
diff --git a/system/file-roller/file-roller.SlackBuild b/system/file-roller/file-roller.SlackBuild
index 1894ba77d6..715f3b0705 100644
--- a/system/file-roller/file-roller.SlackBuild
+++ b/system/file-roller/file-roller.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for file-roller
 
@@ -25,10 +25,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=file-roller
-VERSION=${VERSION:-3.24.1}
+VERSION=${VERSION:-3.36.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,21 +82,21 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --localedir=/usr/share/locale \
-  --disable-static \
-  --build=$ARCH-slackware-linux
-
-make V=1
-make install DESTDIR=$PKG
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
 #won't work with thunar archive-plugin without renaming desktop file:
 mv $PKG/usr/share/applications/org.gnome.FileRoller.desktop $PKG/usr/share/applications/file-roller.desktop
@@ -95,7 +105,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog HACKING INSTALL MAINTAINERS NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING HACKING MAINTAINERS NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -103,4 +113,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/file-roller/file-roller.info b/system/file-roller/file-roller.info
index f2ac306e47..87df0fc1d7 100644
--- a/system/file-roller/file-roller.info
+++ b/system/file-roller/file-roller.info
@@ -1,8 +1,8 @@
 PRGNAM="file-roller"
-VERSION="3.24.1"
+VERSION="3.36.2"
 HOMEPAGE="http://ftp.gnome.org/pub/gnome/sources/file-roller"
-DOWNLOAD="http://ftp.acc.umu.se/pub/gnome/sources/file-roller/3.24/file-roller-3.24.1.tar.xz"
-MD5SUM="1e6be71792c7a8e4950297e9fdcf33e7"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.36/file-roller-3.36.2.tar.xz"
+MD5SUM="caa0103ab34d237a9760fbf5e1c72bc1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/filebeat-oss/README b/system/filebeat-oss/README
new file mode 100644
index 0000000000..e4f187df9c
--- /dev/null
+++ b/system/filebeat-oss/README
@@ -0,0 +1,28 @@
+filebeat-oss (Lightweight shipper for logs)
+
+Whether you’re collecting from security devices, cloud, containers,
+hosts, or OT, Filebeat helps you keep the simple things simple by
+offering a lightweight way to forward and centralize logs and files.
+
+Filebeat is a lightweight shipper for forwarding and centralizing
+log data. Installed as an agent on your servers, Filebeat monitors
+the log files or locations that you specify, collects log events,
+and forwards them either to Elasticsearch or Logstash for indexing.
+
+https://www.elastic.co/beats/filebeat
+https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html
+
+If you intend to use filebeat with elasticsearch:
+Add this to /etc/rc.d/rc.local:
+if [ -x /etc/rc.d/rc.filebeat ]; then
+   /etc/rc.d/rc.filebeat start
+fi
+
+Add this to /etc/rc.d/rc.local_shutdown
+if [ -x /etc/rc.d/rc.filebeat ]; then
+   /etc/rc.d/rc.filebeat stop
+fi
+
+The previous instruction is not necessary if you are going to
+use the filebeat with graylog , the graylog is what starts the
+filebeat.
diff --git a/system/filebeat-oss/doinst.sh b/system/filebeat-oss/doinst.sh
new file mode 100644
index 0000000000..8f533d9d99
--- /dev/null
+++ b/system/filebeat-oss/doinst.sh
@@ -0,0 +1,26 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    rm $NEW
+  fi
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.filebeat.new
+preserve_perms etc/filebeat/filebeat.reference.yml.new
+preserve_perms etc/filebeat/filebeat.yml.new
+preserve_perms etc/filebeat/fields.yml.new
+
diff --git a/system/filebeat-oss/filebeat-oss.SlackBuild b/system/filebeat-oss/filebeat-oss.SlackBuild
new file mode 100644
index 0000000000..81203fef10
--- /dev/null
+++ b/system/filebeat-oss/filebeat-oss.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# Slackware build script for filebeat-oss
+
+# Copyright 2023 André Geraldo Vieira <andre.geraldo@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=filebeat-oss
+VERSION=${VERSION:-8.8.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION-linux-$ARCH.tar.gz
+cd ${PRGNAM//-oss/}-$VERSION-linux-$ARCH
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/etc/{filebeat,rc.d}
+mkdir -p $PKG/usr/share/filebeat/bin
+mkdir -p $PKG/var/{lib,log}/filebeat
+
+cp filebeat.reference.yml  $PKG/etc/filebeat/filebeat.reference.yml.new
+cp filebeat.yml $PKG/etc/filebeat/filebeat.yml.new
+cp fields.yml $PKG/etc/filebeat/fields.yml.new
+cp -r modules.d $PKG/etc/filebeat
+cp $CWD/rc.filebeat $PKG/etc/rc.d/rc.filebeat.new
+cp filebeat $PKG/usr/share/filebeat/bin
+cp -r kibana module $PKG/usr/share/filebeat
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE.txt NOTICE.txt README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/filebeat-oss/filebeat-oss.info b/system/filebeat-oss/filebeat-oss.info
new file mode 100644
index 0000000000..9b24e063d8
--- /dev/null
+++ b/system/filebeat-oss/filebeat-oss.info
@@ -0,0 +1,10 @@
+PRGNAM="filebeat-oss"
+VERSION="8.8.2"
+HOMEPAGE="https://www.elastic.co/beats/filebeat"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-oss-8.8.2-linux-x86_64.tar.gz"
+MD5SUM_x86_64="7ff016091590f081bb9dd9a81e7a6ac3"
+REQUIRES=""
+MAINTAINER="André Geraldo Vieira"
+EMAIL="andre.geraldo@gmail.com"
diff --git a/system/filebeat-oss/rc.filebeat b/system/filebeat-oss/rc.filebeat
new file mode 100644
index 0000000000..f647ed51cb
--- /dev/null
+++ b/system/filebeat-oss/rc.filebeat
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+PIDOF_CMD=/sbin/pidof
+ECHO_CMD=/usr/bin/echo
+SLEEP_CMD=/usr/bin/sleep
+KILL_CMD=/bin/kill
+
+NAME=filebeat
+FILEBEAT_AGENT=${FILEBEAT_AGENT-/usr/share/filebeat/bin/${NAME}}
+FILEBEAT_AGENT_ARGS="-c /etc/filebeat/filebeat.yml --path.home /usr/share/filebeat --path.config /etc/filebeat --path.data /var/lib/filebeat --path.logs /var/log/filebeat"
+
+filebeat_start() {
+  if [ -n "$($PIDOF_CMD filebeat)" ]; then
+    $ECHO_CMD "FileBeat seems to be already running."
+    return
+  fi
+
+  $ECHO_CMD "Starting FileBeat."
+  $FILEBEAT_AGENT $FILEBEAT_AGENT_ARGS &
+}
+
+filebeat_stop() {
+  if [ -z "$($PIDOF_CMD filebeat)" ]; then
+    $ECHO_CMD "FileBeat does not seem to be running."
+    return
+  fi
+
+  $ECHO_CMD "Stopping FileBeat."
+  $KILL_CMD $($PIDOF_CMD filebeat)
+}
+
+filebeat_restart() {
+  $ECHO_CMD "Restarting FileBeat."
+  filebeat_stop
+  $SLEEP_CMD 5
+  filebeat_start
+}
+
+case "$1" in
+'start')
+  filebeat_start
+  ;;
+'stop')
+  filebeat_stop
+  ;;
+'restart')
+  filebeat_restart
+  ;;
+*)
+  echo "usage: $0 start|stop|restart"
+esac
+
diff --git a/system/filebeat-oss/slack-desc b/system/filebeat-oss/slack-desc
new file mode 100644
index 0000000000..ba06adce9b
--- /dev/null
+++ b/system/filebeat-oss/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+filebeat-oss: filebeat-oss (Lightweight shipper for logs)
+filebeat-oss:
+filebeat-oss: Whether you're collecting from security devices, cloud, containers,
+filebeat-oss: hosts, or OT, Filebeat helps you keep the simple things simple by
+filebeat-oss: offering a lightweight way to forward and centralize logs and files.
+filebeat-oss:
+filebeat-oss: Filebeat is a lightweight shipper for forwarding and centralizing
+filebeat-oss: log data. Installed as an agent on your servers, Filebeat monitors
+filebeat-oss: the log files or locations that you specify, collects log events,
+filebeat-oss: and forwards them either to Elasticsearch or Logstash for indexing.
+filebeat-oss:
diff --git a/system/filerunner/README b/system/filerunner/README
deleted file mode 100644
index 13cd824d28..0000000000
--- a/system/filerunner/README
+++ /dev/null
@@ -1,12 +0,0 @@
-filerunner (two-pane graphical file manager)
-
-FileRunner is a very configurable two-pane file manager for Unix and
-Windows systems. It is simple and efficient and has a built-in FTP/SFTP
-client.
-
-FileRunner's config files can be found in ~/.config/.fr.
-
-Note: the FileRunner executable is normally called /usr/bin/fr. I've
-renamed it to /usr/bin/filerunner, since there's already a system/fr
-package that installs a /usr/bin/fr. If system/fr is not installed,
-you'll get a /usr/bin/fr symlink to filerunner.
diff --git a/system/filerunner/doinst.sh b/system/filerunner/doinst.sh
deleted file mode 100644
index f05aaf46fc..0000000000
--- a/system/filerunner/doinst.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
-
-# If there's no fr link, take over:
-if [ ! -r usr/bin/fr ]; then
-  ( cd usr/bin ; ln -sf filerunner fr )
-fi
diff --git a/system/filerunner/filerunner.SlackBuild b/system/filerunner/filerunner.SlackBuild
deleted file mode 100644
index 365286bdc0..0000000000
--- a/system/filerunner/filerunner.SlackBuild
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for filerunner
-
-# Written by B. Watson (yalhcru@gmail.com)
-
-# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-
-# Upstream's official RPM release claims to be noarch, but it's a dirty
-# lie: it includes libinotify1.4.1.so binaries[*] for various arches. So
-# does the source, but we're not trusting binaries that were probably
-# built on Red Hat. The source for the prebuilt binaries is included,
-# so this script compiles it instead.
-
-# [*] It breaks FHS and Slackware standards by installing arch-dependent
-#     files (shared libs) in /usr/share, too. But I'm going to leave it
-#     that way.
-
-PRGNAM=filerunner
-VERSION=${VERSION:-20.05.02.17}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=fr
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-# called twice, make it a func
-fixperms() {
-  chown -R root:root .
-  find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-          \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $PRGNAM
-fixperms
-
-# DO NOT use precompiled binaries!
-rm -rf packages/inotify/*
-
-# Use tcl's idea of our architecture, since that's what fr will use
-# to locate the inotify tcl extension.
-TCLARCH="$( echo 'puts $::tcl_platform(machine)' | tclsh )"
-mkdir -p packages/inotify/$TCLARCH
-
-# Compile the library that prevents this from being a noarch package:
-cd Makefiles
-LIBNAM=tcl-inotify
-LIBVER="$( echo $LIBNAM-*.tar.gz | sed 's,.*-\([0-9.]*\)\.tar.gz,\1,' )"
-tar xvf $LIBNAM-$LIBVER.tar.gz
-fixperms
-
-cd $LIBNAM-$LIBVER
-./configure && make
-
-# Install it where fr INSTALL script expects to find it.
-install -s libinotify$LIBVER.so \
-           $TMP/$PRGNAM/packages/inotify/$TCLARCH
-
-# Now we can install the main package.
-cd -
-DESTDIR=$PKG \
-DOCS=/usr/doc/$PRGNAM-$VERSION \
-  ./INSTALL -nogui
-
-# Make this symlink so fr won't try to do it at runtime (and fail, if
-# not running as root).
-( cd $PKG/usr/share/$PRGNAM/packages/inotify
-  ln -s $TCLARCH/libinotify$LIBVER.so . )
-
-# We have a slight conflict with system/fr, so:
-mv $PKG/usr/bin/$SRCNAM $PKG/usr/bin/$PRGNAM
-sed -i "/^Exec/s|$SRCNAM|$PRGNAM|" $PKG/usr/share/applications/$PRGNAM.desktop
-
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/filerunner/filerunner.info b/system/filerunner/filerunner.info
deleted file mode 100644
index 1304749807..0000000000
--- a/system/filerunner/filerunner.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="filerunner"
-VERSION="20.05.02.17"
-HOMEPAGE="https://sourceforge.net/projects/filerunner/"
-DOWNLOAD="https://downloads.sourceforge.net/project/filerunner/release-20.05.02.17/fr-20.05.02.17.tar.gz"
-MD5SUM="a8787d750f729c8487e44e16075aa671"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/filerunner/slack-desc b/system/filerunner/slack-desc
deleted file mode 100644
index c40867c9a6..0000000000
--- a/system/filerunner/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-          |-----handy-ruler------------------------------------------------------|
-filerunner: filerunner (two-pane graphical file manager)
-filerunner:
-filerunner: FileRunner is a very configurable two-pane file manager for Unix
-filerunner: and Windows systems. It is simple and efficient and has a built-in
-filerunner: FTP/SFTP client.
-filerunner:
-filerunner:
-filerunner:
-filerunner:
-filerunner:
-filerunner:
diff --git a/system/fileschanged/fileschanged.SlackBuild b/system/fileschanged/fileschanged.SlackBuild
index 794b858388..71e963f10d 100644
--- a/system/fileschanged/fileschanged.SlackBuild
+++ b/system/fileschanged/fileschanged.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fileschanged
 
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - remove empty/useless docs (NEWS and INSTALL).
+# - stop configure script from writing outside of $TMP.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fileschanged
 VERSION=${VERSION:-0.6.9}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,16 +76,21 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Remove compiler flag -Werror from some files
 for datei in $( grep -Rl Werror * ); do
   sed -i 's@-Werror@@g' $datei
 done
 
+# 20220411 bkw: the configure script does something purely evil: it
+# creates a file in /usr/lib with a long name, to see whether long
+# filenames are supported. since it's not the 1980s, just force
+# the test result to 'yes' to avoid writing to the real /usr/lib.
 CFLAGS="$SLKCFLAGS" \
+ac_cv_sys_long_file_names=yes \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -85,13 +101,8 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
@@ -99,7 +110,7 @@ gzip -9 $PKG/usr/info/*.info*
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/$PRGNAM
+rm -rf $PKG/usr/share/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION/{NEWS,INSTALL}
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -107,4 +118,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/findcmd/findcmd.SlackBuild b/system/findcmd/findcmd.SlackBuild
index 8d2a68d964..5b53a2069c 100644
--- a/system/findcmd/findcmd.SlackBuild
+++ b/system/findcmd/findcmd.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for findcmd
 
-# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2022  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=findcmd
-VERSION=${VERSION:-0.1.1}
+VERSION=${VERSION:-0.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,17 +79,17 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/findcmd/findcmd.info b/system/findcmd/findcmd.info
index b65b702155..22f524420b 100644
--- a/system/findcmd/findcmd.info
+++ b/system/findcmd/findcmd.info
@@ -1,8 +1,8 @@
 PRGNAM="findcmd"
-VERSION="0.1.1"
+VERSION="0.1.2"
 HOMEPAGE="https://github.com/xupeng/findcmd"
-DOWNLOAD="https://pypi.python.org/packages/source/f/findcmd/findcmd-0.1.1.tar.gz"
-MD5SUM="9426667b4031b1df04775ba8a8ca56bc"
+DOWNLOAD="https://pypi.python.org/packages/source/f/findcmd/findcmd-0.1.2.tar.gz"
+MD5SUM="30d95225dbc530924dbe40ba5afb63c6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/findpkg/README b/system/findpkg/README
index 808f050b84..ec237d9f5b 100644
--- a/system/findpkg/README
+++ b/system/findpkg/README
@@ -1 +1,2 @@
-findpkg: Simple script that finds and displays installed packages in Slackware.
+findpkg: Simple script that finds and displays installed packages in
+Slackware.
diff --git a/system/findpkg/findpkg.SlackBuild b/system/findpkg/findpkg.SlackBuild
index d61b6565ae..977fd04227 100644
--- a/system/findpkg/findpkg.SlackBuild
+++ b/system/findpkg/findpkg.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for findpkg
 
@@ -22,15 +22,25 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=findpkg
 VERSION=${VERSION:-20160817}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 # It is not arch spesific.
 ARCH="noarch"
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,4 +77,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fio/README b/system/fio/README
index 9a6fac8268..0bf5fd9be1 100644
--- a/system/fio/README
+++ b/system/fio/README
@@ -11,7 +11,7 @@ To build the fio GUI, pass GUI=yes to the SlackBuild script:
 
 Example Usage:
 
-This process runs a random read and write of two 128MB files created during
-execution of fio.
+This process runs a random read and write of two 128MB files created
+during execution of fio.
 
 $ fio --name=global --rw=randread --size=128m --name=job1 --name=job2
diff --git a/system/fio/fio.SlackBuild b/system/fio/fio.SlackBuild
index 3e923213c6..83a120bd8f 100644
--- a/system/fio/fio.SlackBuild
+++ b/system/fio/fio.SlackBuild
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fio
 
+# Copyright 2023-2024  fourtysixandtwo <fourtysixandtwo@sliderr.net>
 # Copyright 2012 Binh Nguyen <binhvng@gmail.com>
 # Copyright 2015-2020 Brenton Earl <brent@exitstatusone.com>
 # All rights reserved.
@@ -12,7 +13,7 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -23,10 +24,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fio
-VERSION=${VERSION:-3.23}
+VERSION=${VERSION:-3.37}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -50,16 +58,14 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
-# Fio has a Gtk interface that is not built by default.
-# To enable it pass 'yes' to the GUI variable
-# Example:  GUI=yes sh fio.SlackBuild
-gui="" ; [ "$GUI" = "yes" ] && gui="--enable-gfio"
-
 set -e
 
 rm -rf $PKG
@@ -71,9 +77,14 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# Fio has a Gtk interface that is not built by default.
+# To enable it pass 'yes' to the GUI variable
+# Example:  GUI=yes sh fio.SlackBuild
+gui="" ; [ "$GUI" = "yes" ] && gui="--enable-gfio"
 
 ./configure \
   --prefix="/usr" \
@@ -86,11 +97,12 @@ make install DESTDIR=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+find $PKG/usr/man -type f -exec gzip -9 {} \+
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING HOWTO README REPORTING-BUGS examples/ $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING HOWTO.rst MORAL-LICENSE README.rst REPORTING-BUGS \
+      examples/ $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Add .desktop file if GUI is built
@@ -101,8 +113,8 @@ if [ "$GUI" = "yes" ]; then
 fi
 
 mkdir -p $PKG/install
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fio/fio.info b/system/fio/fio.info
index 9fec576b28..45299ffafa 100644
--- a/system/fio/fio.info
+++ b/system/fio/fio.info
@@ -1,10 +1,10 @@
 PRGNAM="fio"
-VERSION="3.23"
-HOMEPAGE="http://git.kernel.dk/cgit/fio/"
-DOWNLOAD="http://brick.kernel.dk/snaps/fio-3.23.tar.gz"
-MD5SUM="497f8bad953723a8c4c46f2a58a13b24"
+VERSION="3.37"
+HOMEPAGE="https://git.kernel.dk/cgit/fio/"
+DOWNLOAD="https://brick.kernel.dk/snaps/fio-3.37.tar.gz"
+MD5SUM="f762d75c1fb7df762a1f6a27d395f359"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Brenton Earl"
-EMAIL="brent@exitstatusone.com"
+MAINTAINER="fourtysixandtwo"
+EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/system/fio/slack-desc b/system/fio/slack-desc
index 259f5d678a..4157a27c53 100644
--- a/system/fio/slack-desc
+++ b/system/fio/slack-desc
@@ -15,5 +15,5 @@ fio: otherwise parameters given to them overriding that setting is given.
 fio: The typical use of fio is to write a job file matching the io load
 fio: one wants to simulate.
 fio:
-fio: Homepage: http://git.kernel.dk/cgit/fio/
+fio: Homepage: https://git.kernel.dk/cgit/fio/
 fio:
diff --git a/system/fira-code-fonts/fira-code-fonts.SlackBuild b/system/fira-code-fonts/fira-code-fonts.SlackBuild
index 9e67b8e0fa..a62b9ddf08 100644
--- a/system/fira-code-fonts/fira-code-fonts.SlackBuild
+++ b/system/fira-code-fonts/fira-code-fonts.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fira-code-fonts
 
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fira-code-fonts
 SRCNAM=FiraCode
 VERSION=${VERSION:-1.206}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,4 +74,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fira-fonts/fira-fonts.SlackBuild b/system/fira-fonts/fira-fonts.SlackBuild
index a41a88e79f..f5aa4ae2dd 100644
--- a/system/fira-fonts/fira-fonts.SlackBuild
+++ b/system/fira-fonts/fira-fonts.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fira-fonts
 
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fira-fonts
 VERSION=${VERSION:-4.301}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -87,4 +97,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/firejail/README b/system/firejail/README
index 0ec771c941..1064ba3e45 100644
--- a/system/firejail/README
+++ b/system/firejail/README
@@ -1,11 +1,13 @@
 firejail
 
-Firejail is a SUID security sandbox program that reduces the risk of security
-breaches by restricting the running environment of untrusted applications using
-Linux namespaces. It allows a process and all its descendants to have their own
-private view of the globally shared kernel resources, such as the network stack,
-process table, mount table.
+Firejail is a SUID security sandbox program that reduces the risk of
+security breaches by restricting the running environment of untrusted
+applications using Linux namespaces. It allows a process and all its
+descendants to have their own private view of the globally shared
+kernel resources, such as the network stack, process table, mount
+table.
 
-Firejail can sandbox any type of processes: servers, graphical applications, and
-even user login sessions. Written in C with virtually no dependencies, it should
-work on any Linux computer with a 3.x kernel version.
+Firejail can sandbox any type of processes: servers, graphical
+applications, and even user login sessions. Written in C with
+virtually no dependencies, it should work on any Linux computer with a
+3.x kernel version.
diff --git a/system/firejail/firejail.SlackBuild b/system/firejail/firejail.SlackBuild
index d4779d311d..7fe3620544 100644
--- a/system/firejail/firejail.SlackBuild
+++ b/system/firejail/firejail.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for firejail
 
 # Copyright 2015 mwgg
-# Copyright 2017-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2017-2023 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220402 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - add SlackBuild to doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=firejail
-VERSION=${VERSION:-0.9.64.4}
+VERSION=${VERSION:-0.9.72}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,9 +76,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -83,10 +93,9 @@ CXXFLAGS="$SLKCFLAGS" \
 
 sed -i "s|lib/firejail|lib${LIBDIRSUFFIX=}/firejail|" Makefile
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 sed -i "s|whitelist /usr/share/doc|#whitelist /usr/share/doc|" $PKG/etc/firejail/firefox.profile
 
@@ -94,4 +103,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/firejail/firejail.info b/system/firejail/firejail.info
index a13f37b3ae..9af92cdca1 100644
--- a/system/firejail/firejail.info
+++ b/system/firejail/firejail.info
@@ -1,8 +1,8 @@
 PRGNAM="firejail"
-VERSION="0.9.64.4"
+VERSION="0.9.72"
 HOMEPAGE="https://firejail.wordpress.com/"
-DOWNLOAD="https://sourceforge.net/projects/firejail/files/firejail/firejail-0.9.64.4.tar.xz"
-MD5SUM="e3be55266472dc8ac373c9fcfba4f9f9"
+DOWNLOAD="https://sourceforge.net/projects/firejail/files/firejail/firejail-0.9.72.tar.xz"
+MD5SUM="779d3cb3cf55123314efb59b579764b6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/firetools/firetools.SlackBuild b/system/firetools/firetools.SlackBuild
index f5c930d902..8fd9b461c1 100644
--- a/system/firetools/firetools.SlackBuild
+++ b/system/firetools/firetools.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for firetools
 
-# Copyright 2017-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2017-2023 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - add SlackBuild to doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=firetools
-VERSION=${VERSION:-0.9.64}
+VERSION=${VERSION:-0.9.72}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,9 +75,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -84,14 +94,13 @@ CXXFLAGS="$SLKCFLAGS" \
 sed -i "s|share/man|man|g" Makefile
 sed -i "s|lib/|lib${LIBDIRSUFFIX}/|g" Makefile
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/firetools/firetools.info b/system/firetools/firetools.info
index 04d18c6f79..f4ddd75fa9 100644
--- a/system/firetools/firetools.info
+++ b/system/firetools/firetools.info
@@ -1,10 +1,10 @@
 PRGNAM="firetools"
-VERSION="0.9.64"
+VERSION="0.9.72"
 HOMEPAGE="https://l3net.wordpress.com/projects/firejail/#firetools"
-DOWNLOAD="https://sourceforge.net/projects/firejail/files/firetools/firetools-0.9.64.tar.xz"
-MD5SUM="a95af117c8bd1c78a67de450a8ecb97a"
+DOWNLOAD="https://sourceforge.net/projects/firejail/files/firetools/firetools-0.9.72.tar.xz"
+MD5SUM="0505680f8b468ce5ae60827f35915ba5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="firejail qt5"
+REQUIRES="firejail"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/system/firmware-gobi-2000/README b/system/firmware-gobi-2000/README
index 89c2845a7e..fb97e17d39 100644
--- a/system/firmware-gobi-2000/README
+++ b/system/firmware-gobi-2000/README
@@ -5,10 +5,11 @@ gobi_loader adds a udev rule that will trigger loading of the
 firmware and make the modem usable.
 
 Note:
-No carrier specific card configuration may work with `CARRIER=UMTS' (default)
-or `CARRIER=6' else pass `CARRIER=<sub-directory>' to the SlackBuild matching
-your carrier or reseller/franchiser which is using the carrier.
-It's strongly encouraged to explicit select a carrier.
+
+No carrier specific card configuration may work with `CARRIER=UMTS'
+(default) or `CARRIER=6' else pass `CARRIER=<sub-directory>' to the
+SlackBuild matching your carrier or reseller/franchiser which is using
+the carrier. It's strongly encouraged to explicit select a carrier.
 
 After installation restart your system or use
 `udevadm control --reload && udevadm trigger`.
diff --git a/system/firmware-gobi-2000/firmware-gobi-2000.SlackBuild b/system/firmware-gobi-2000/firmware-gobi-2000.SlackBuild
index 596472b969..69bddad3c4 100644
--- a/system/firmware-gobi-2000/firmware-gobi-2000.SlackBuild
+++ b/system/firmware-gobi-2000/firmware-gobi-2000.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # SlackBuild script for "firmware-gobi-2000".
 
@@ -24,6 +24,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=firmware-gobi-2000
 SRCNAM=gobi_loader
 EXENAM=${EXENAM:-7xwc48ww.exe}
@@ -32,22 +34,30 @@ CARRIER=${CARRIER:-UMTS}
 VERSION=${VERSION:-0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -111,4 +121,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/firmware-gobi-2000/firmware-gobi-2000.info b/system/firmware-gobi-2000/firmware-gobi-2000.info
index 798ed6a93c..48f02eb3bb 100644
--- a/system/firmware-gobi-2000/firmware-gobi-2000.info
+++ b/system/firmware-gobi-2000/firmware-gobi-2000.info
@@ -1,7 +1,7 @@
 PRGNAM="firmware-gobi-2000"
 VERSION="0.7"
 HOMEPAGE="http://www.codon.org.uk/~mjg59/gobi_loader/"
-DOWNLOAD="http://www.codon.org.uk/~mjg59/gobi_loader/download/gobi_loader-0.7.tar.gz \
+DOWNLOAD="https://src.fedoraproject.org/repo/pkgs/gobi_loader/gobi_loader-0.7.tar.gz/c3aca13541be3b29e3700149256aadb6/gobi_loader-0.7.tar.gz \
           https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/7xwc48ww.exe"
 MD5SUM="c3aca13541be3b29e3700149256aadb6 \
         629985df8599b3815211ddcffbb6bad5"
diff --git a/system/fish/README b/system/fish/README
index 00f5c35adf..839cfbc01a 100644
--- a/system/fish/README
+++ b/system/fish/README
@@ -10,7 +10,7 @@ from the y/bsdgames package.  In a stock installation with default PATH
 ordering, /usr/bin should be checked before /usr/games, so it shouldn't
 be an issue, but we thought it was worth noting just in case.
 
-Optional packages (also found at slackbuilds.org): sphinx libedit
+sphinx is an optional dependency.
 
 NOTES:
 
diff --git a/system/fish/doinst.sh b/system/fish/doinst.sh
index 20492202c8..2eb3aa70da 100644
--- a/system/fish/doinst.sh
+++ b/system/fish/doinst.sh
@@ -15,3 +15,7 @@ config etc/fish/config.fish.new
 
 # add Fish to /etc/shells
 grep -qe '^/usr/bin/fish$' etc/shells || echo '/usr/bin/fish' >> etc/shells
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/system/fish/fish.SlackBuild b/system/fish/fish.SlackBuild
index 909ee515e2..d50cffa0f7 100644
--- a/system/fish/fish.SlackBuild
+++ b/system/fish/fish.SlackBuild
@@ -1,10 +1,12 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fish
 
 # Copyright 2020 Donald Cooley, South Haven, Indiana USA
 # Copyright 2015-2019  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # Copyright 2009 Pierre Cazenave
+# Copyright 2023-2024 Luna Jernberg
+
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +26,34 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - get rid of (empty) /usr/share/doc dir. yes, it has a file in it
+#   called .buildinfo, but this is utterly useless in a binary
+#   package (it's more-or-less a cache to keep from rebuilding the
+#   docs when they haven't changed, only useful if you're rebuilding
+#   the same source dir multiple times).
+# - get rid of empty /usr/share/fish/man/man1/ dir.
+# - add update-desktop-database to doinst.sh, since v3.4.0 adds a
+#   .desktop file.
+# - use absolute path to icon in doinst.sh.
+# - tighten up the script a bit.
+# Note to maintainer: The build will create the man pages and
+# HTML docs if Sphinx is installed, or use pre-generated ones if
+# not. Nothing wrong with this, per se, but it might lead to trouble
+# later (if Sphinx gets upgraded to a version that won't work with
+# fish's build process, e.g). Your mission, should you choose to
+# accept it, is to modify the cmake parameters (or even patch the
+# CMakeLists.txt) to make it always use the pre-generated HTML and
+# manpages (and ignore Sphinx, if found).
+#   -- B. Watson <urchlay@slackware.uk>
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fish
-VERSION=${VERSION:-3.1.2}
+VERSION=${VERSION:-3.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +63,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -62,14 +92,16 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+sed -i '/^Icon/s,=.*,=/usr/share/pixmaps/fish.png,' $PRGNAM.desktop
 
 mkdir -p build
 cd build
@@ -77,33 +109,31 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-	-DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-	-DCMAKE_INSTALL_SYSCONFDIR=/etc \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mkdir -p $PKG/usr/share/$PRGNAM
 mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/share/$PRGNAM
+rm -rf $PKG/usr/share/doc
 
 # Let's not clobber the old config
 mv $PKG/etc/fish/config.fish $PKG/etc/fish/config.fish.new
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 mkdir -p $PKG/usr/man/man1
 mv $PKG/usr/share/$PRGNAM/man/man1/* $PKG/usr/man/man1
+rm -rf $PKG/usr/share/$PRGNAM/man/
 rm -rf $PKG/usr/share/man/
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip $PKG/usr/man/man*/*
 
 # Remove manual pages that overwrites coreutils' man pages
-rm -f $PKG/usr/man/man1/{echo,false,pwd,test,true}.1.gz
+rm -f $PKG/usr/man/man1/{echo,false,pwd,test,true,printf,time}.1.gz
 
-cp CHANGELOG.md CONTRIBUTING.md COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp CHANGELOG.rst CONTRIBUTING.rst COPYING README.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -111,4 +141,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fish/fish.info b/system/fish/fish.info
index b70ec030e0..d5167d50e7 100644
--- a/system/fish/fish.info
+++ b/system/fish/fish.info
@@ -1,10 +1,10 @@
 PRGNAM="fish"
-VERSION="3.1.2"
+VERSION="3.7.1"
 HOMEPAGE="https://fishshell.com/"
-DOWNLOAD="https://github.com/fish-shell/fish-shell/releases/download/3.1.2/fish-3.1.2.tar.gz"
-MD5SUM="2e9f12a250dccb9ab0529ae6f77710a0"
+DOWNLOAD="https://github.com/fish-shell/fish-shell/releases/download/3.7.1/fish-3.7.1.tar.xz"
+MD5SUM="d32913b45d52459f40e6d434389e7bd4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="man-db"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+REQUIRES=""
+MAINTAINER="Luna Jernberg"
+EMAIL="droidbittin@gmail.com"
diff --git a/system/flSynclient/README b/system/flSynclient/README
deleted file mode 100644
index 120cbc9ee5..0000000000
--- a/system/flSynclient/README
+++ /dev/null
@@ -1,12 +0,0 @@
-flSynclient is a graphical frontend for synclient, built with
-the fltk toolkit. It is released under the GNU GPL license.
-
-Settings are stored in ~/.flSynclient, you can restore them with
-the following command:
-
-flsynclient -s
-
-You can add that to your ~/.xinitrc to make the settings apply when you
-start x.
-
-Note: Option 'SHMConfig' must be enabled in synaptics driver
diff --git a/system/flSynclient/flSynclient.SlackBuild b/system/flSynclient/flSynclient.SlackBuild
deleted file mode 100644
index 853e09c9c6..0000000000
--- a/system/flSynclient/flSynclient.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for flSynclient
-
-# Written by Steven Pledger <spledger91@yahoo.com>
-
-PRGNAM=flSynclient
-VERSION=${VERSION:-0.7}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM${VERSION}
-tar xvf $CWD/$PRGNAM${VERSION}.tgz
-cd $PRGNAM${VERSION}
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# simply setting CFLAGS variable doesn't seem to work here
-sed -i -e "s/^CFLAGS = -O2$/CFLAGS = $SLKCFLAGS/" Makefile
-
-make clean # remove old binary
-make
-
-# Makefile doesn't support DESTDIR, so do a poor man's install
-mkdir -p $PKG/usr/bin
-install -m 0755 flsynclient  $PKG/usr/bin
-
-mkdir -p $PKG/usr/share/pixmaps
-cp -a \
-  flsynclient.{xpm,png} \
-  $PKG/usr/share/pixmaps
-
-mkdir -p $PKG/usr/share/applications
-cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/flSynclient/flSynclient.desktop b/system/flSynclient/flSynclient.desktop
deleted file mode 100644
index b5b280d493..0000000000
--- a/system/flSynclient/flSynclient.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=flSynclient
-Comment=Configure your Synaptics touchpad
-Exec=flsynclient
-Icon=/usr/share/pixmaps/flsynclient.png
-Categories=Settings
diff --git a/system/flSynclient/flSynclient.info b/system/flSynclient/flSynclient.info
deleted file mode 100644
index 36de693828..0000000000
--- a/system/flSynclient/flSynclient.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="flSynclient"
-VERSION="0.7"
-HOMEPAGE="http://matteolucarelli.altervista.org/flsynclient/index_en.htm"
-DOWNLOAD="http://matteolucarelli.altervista.org/flsynclient/flSynclient0.7.tgz"
-MD5SUM="04f0edb69019d6d05a99e1d743eba425"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="fltk"
-MAINTAINER="Steven Pledger"
-EMAIL="spledger91@yahoo.com"
diff --git a/system/flSynclient/slack-desc b/system/flSynclient/slack-desc
deleted file mode 100644
index f86ba6a4d3..0000000000
--- a/system/flSynclient/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-           |-----handy-ruler------------------------------------------------------|
-flSynclient: flSynclient (graphical frontend for synclient)
-flSynclient:
-flSynclient: flSynclient is a graphical frontend for synclient, built with the
-flSynclient: fltk toolkit. It is released under the GNU GPL license.
-flSynclient:
-flSynclient: Homepage:
-flSynclient: http://matteolucarelli.altervista.org/flsynclient/index_en.htm
-flSynclient:
-flSynclient:
-flSynclient:
-flSynclient:
diff --git a/system/flashcards/flashcards.SlackBuild b/system/flashcards/flashcards.SlackBuild
index 16b56a16bb..779be8ed0e 100644
--- a/system/flashcards/flashcards.SlackBuild
+++ b/system/flashcards/flashcards.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for flashcards
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=flashcards
 VERSION=${VERSION:-2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -88,4 +98,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/flexbackup/README b/system/flexbackup/README
index 437915b26e..b6b738dee3 100644
--- a/system/flexbackup/README
+++ b/system/flexbackup/README
@@ -1,16 +1,11 @@
 Flexbackup is for you if you have a single or small number of
-machines, amanda is "too much", and tarring things up by hand isn't
-nearly enough.
+machines, Amanda is "too much", and tarring things up by hand
+isn't nearly enough.
 
-Features:
+FEATURES:
  o Easy to configure
  o Uses dump, afio, GNU tar, cpio, star, pax, or zip archivers
  o Full and numbered levels of incremental backup (acts like "dump")
  o Compression and buffering options for all backup types
- o Does remote filesystems (over rsh/ssh; no special service)
- o Package delta mode can backup files not owned by rpm, or owned+changed files.
- o Writes to tapes, on-disk archive files, or on-disk directory trees
- o Keeps a table of contents so you know what archives are on each tape
- o Nice log files
+ o Does remote filesystems over SSH
 
-After installing, read the README for information on how to use.
diff --git a/system/flexbackup/flexbackup-debian.patch b/system/flexbackup/flexbackup-debian.patch
new file mode 100644
index 0000000000..4e205efb56
--- /dev/null
+++ b/system/flexbackup/flexbackup-debian.patch
@@ -0,0 +1,290 @@
+--- flexbackup	2003-10-11 03:12:09.000000000 +1300
++++ ../flexbackup-debian	2022-03-06 14:08:05.918918275 +1300
+@@ -269,6 +269,7 @@
+     untie(%::index);
+ }
+ 
++system ('rm', '-rf', $cfg::tmpdir);
+ exit(0);
+ 
+ ######################################################################
+@@ -687,6 +688,8 @@
+ 		$filename .= ".zip";
+ 	    } elsif ($cfg::compress eq "compress") {
+ 		$filename .= ".Z";
++	    } elsif ($cfg::compress eq "lzma") {
++		$filename .= ".lzma";
+ 	    }
+ 	} elsif ($cfg::type eq "afio") {
+ 	    # tag these a little different, the archive file itself isn't a
+@@ -701,6 +704,8 @@
+ 		$filename .= "-zip";
+ 	    } elsif ($cfg::compress eq "compress") {
+ 		$filename .= "-Z";
++	    } elsif ($cfg::compress eq "lzma") {
++		$filename .= "-lzma";
+ 	    }
+ 	}
+ 
+@@ -811,6 +816,11 @@
+ 	($remove, @cmds) = &backup_filelist($label, $localdir, $title, $level, $remote);
+     }
+ 
++	if(defined($remote)) {
++		# create our temporary directory as first remote command
++		unshift(@cmds, &maybe_remote_cmd("$::path{mkdir} -p $cfg::tmpdir", $remote));
++	}
++
+     # Nuke any tmp files used in the above routines
+     if ($remove ne '') {
+ 	push(@cmds, &maybe_remote_cmd("$::path{rm} -f $remove", $remote));
+@@ -827,6 +837,11 @@
+ 	    push(@cmds, &maybe_remote_cmd("$::path{rm} -f $pkglist", $remote));
+ 	}
+     }
++	
++	if(defined($remote)) {
++		# remove temporary directory as our last remote command
++		push(@cmds, &maybe_remote_cmd("$::path{rm} -rf $cfg::tmpdir", $remote));
++	}
+ 
+     # Strip multiple spaces
+     foreach my $cmd (@cmds) {
+@@ -1035,7 +1050,7 @@
+     } else {
+ 	$prunekey = $dir;
+     }
+-    if (defined(%{$::prune{$prunekey}})) {
++    if ($::prune{$prunekey}) {
+ 	&log("| NOTE: \$prune is ignored for type=dump");
+     }
+ 
+@@ -1057,7 +1072,7 @@
+     }
+ 
+     $cmd = '';
+-    $cmd .= "dump -$level ";
++    $cmd .= "$::path{dump} -$level ";
+     $cmd .= "$::dump_blk_flag ";
+     if ($cfg::dump_use_dumpdates eq "true") {
+ 	$cmd .= "-u ";
+@@ -1117,7 +1132,7 @@
+     if (($cfg::compress !~ /^(false|hardware)$/) and ($cfg::afio_nocompress_types ne "")) {
+ 	$cmd = "$::path{printf} \"$cfg::afio_nocompress_types\" > $tmpnocompress";
+ 	push(@cmds, &maybe_remote_cmd($cmd, $remote));
+-	$no_compress = "-E $tmpnocompress";
++	$no_compress = "-E +$tmpnocompress";
+ 	$remove .= " $tmpnocompress";
+     }
+ 
+@@ -1140,7 +1155,7 @@
+     $cmd .= "$::path{afio} -o ";
+     $cmd .= "$no_compress ";
+     $cmd .= "-z ";
+-    $cmd .= "-1 m ";
++    $cmd .= "-1 mc ";
+     $cmd .= "$::afio_z_flag ";
+     $cmd .= "$::afio_verb_flag ";
+     $cmd .= "$::afio_sparse_flag ";
+@@ -1390,11 +1405,11 @@
+     $cmd .= "| ";
+ 
+     $cmd .= "$::path{tar} --create ";
++    $cmd .= "--no-recursion ";
+     $cmd .= "--null ";
+     $cmd .= "--files-from=- ";
+     $cmd .= "--ignore-failed-read ";
+     $cmd .= "--same-permissions ";
+-    $cmd .= "--no-recursion ";
+     $cmd .= "--totals ";
+     if ($cfg::label ne 'false') {
+ 	if (length($title) > $::tar_max_label) {
+@@ -2670,7 +2685,7 @@
+     }
+ 
+     # Flag old config file
+-    if (defined(@cfg::filesystems) or defined($cfg::mt_var_blksize)) {
++    if (@cfg::filesystems or defined($cfg::mt_var_blksize)) {
+ 	# so strict shuts up
+ 	my $junk = @cfg::filesystems;
+ 	$junk = $cfg::mt_var_blksize;
+@@ -2700,7 +2715,7 @@
+     # First check if things are defined in the config file
+     # Checks exist, true/false, or one of options
+     &checkvar(\$cfg::type,'type','dump afio cpio tar star pax zip ar shar lha copy rsync filelist','tar');
+-    &checkvar(\$cfg::compress,'compress','gzip bzip2 lzop compress zip false hardware','gzip');
++    &checkvar(\$cfg::compress,'compress','gzip bzip2 lzop compress zip false hardware lzma','gzip');
+     &checkvar(\$cfg::compr_level,'compr_level','exist','4');
+     &checkvar(\$cfg::verbose,'verbose','bool','true');
+     &checkvar(\$cfg::sparse,'sparse','bool','true');
+@@ -2750,8 +2765,9 @@
+     $::path{'find'} = &checkinpath('find');
+     $::path{'dd'} = &checkinpath('dd');
+     $::path{'printf'} = &checkinpath('printf');
++    $::path{'mkdir'} = &checkinpath('mkdir');
+ 
+-    push(@::remoteprogs,($::path{'touch'},$::path{'rm'},$::path{'find'},$::path{'printf'}));
++    push(@::remoteprogs,($::path{'touch'},$::path{'rm'},$::path{'find'},$::path{'printf'},$::path{'mkdir'}));
+ 
+     # Check device (or dir)
+     $::ftape = 0;
+@@ -2890,11 +2906,11 @@
+     # Traverse mountpoints?
+     &checkvar(\$cfg::traverse_fs,'traverse_fs','false local all','false');
+     if ($cfg::traverse_fs eq "local") {
+-	$::mountpoint_flag = "! -fstype nfs ! -fstype smbfs ! -fstype bind ! -fstype proc ! -fstype devpts ! -fstype devfs ! -fstype tmpfs";
++	$::late_mountpoint_flag = "! -fstype nfs ! -fstype smbfs ! -fstype bind ! -fstype proc ! -fstype devpts ! -fstype devfs ! -fstype tmpfs";
+     } elsif ($cfg::traverse_fs eq "all") {
+-	$::mountpoint_flag = "! -fstype proc ! -fstype devpts ! -fstype devfs ! -fstype tmpfs";
++	$::late_mountpoint_flag = "! -fstype proc ! -fstype devpts ! -fstype devfs ! -fstype tmpfs";
+     } else {
+-	$::mountpoint_flag = "-xdev";
++	$::early_mountpoint_flag = "-xdev";
+     }
+ 
+     # Block size
+@@ -3001,6 +3017,16 @@
+ 	    $::z = " | $::path{zip} -$cfg::compr_level - -";
+ 	    $::unz = "$::path{funzip} | ";
+ 	}
++    } elsif ($cfg::compress eq "lzma") {
++	$::path{'lzma'} = &checkinpath($cfg::compress);
++	push(@::remoteprogs, $::path{$cfg::compress});
++	if ($cfg::compr_level !~ m/^[123456789]$/) {
++	    push(@::errors,"\$compr_level must be set to 1-9");
++	} else {
++	    $::z = " | $::path{$cfg::compress} -$cfg::compr_level ";
++	}
++	$::unz = "$::path{$cfg::compress} -d | ";
++
+     } else {
+ 	$::z = "";
+ 	$::unz = "";
+@@ -3224,7 +3250,7 @@
+ 	&checkvar(\$cfg::afio_echo_block,'afio_echo_block','bool','false');
+ 	&checkvar(\$cfg::afio_compress_cache_size,'afio_compress_cache_size','exist','2');
+ 	&checkvar(\$cfg::afio_compress_threshold,'afio_compress_threshold','exist','3');
+-	&checkvar(\$cfg::afio_nocompress_types,'afio_nocompress_types','exist','mp3 MP3 Z z gz gif zip ZIP lha jpeg jpg JPG taz tgz deb rpm bz2 lzo');
++	&checkvar(\$cfg::afio_nocompress_types,'afio_nocompress_types','exist','.lzo');
+ 
+ 	$::path{'afio'} = &checkinpath('afio');
+ 	push(@::remoteprogs, $::path{'afio'});
+@@ -3252,6 +3278,10 @@
+ 		$::afio_z_flag = "-P $::path{$cfg::compress} -Q -c -Z";
+ 		$::afio_unz_flag = "-P $::path{$cfg::compress} -Q -d -Q -c -Z";
+ 
++	    } elsif ($cfg::compress eq "lzma") {
++		$::afio_z_flag = "-P $::path{$cfg::compress} -Q -$cfg::compr_level -Z";
++		$::afio_unz_flag = "-P $::path{$cfg::compress} -Q -d -Z";
++
+ 	    }
+ 	    $::unz = ""; # Reset & just use this for reading the archive file.
+ 
+@@ -3415,7 +3445,7 @@
+ 	$::path{'lha'} = &checkinpath('lha');
+ 	push(@::remoteprogs, $::path{'lha'});
+ 
+-	if ($cfg::compress =~ /^(gzip|bzip2|lzop|compress|zip)$/) {
++	if ($cfg::compress =~ /^(gzip|bzip2|lzop|compress|zip|lzma)$/) {
+ 	    warn("Using type \"lha\" with compress=$cfg::compress makes no sense");
+ 	    warn("Setting compression to false");
+ 	    $::unz = "";
+@@ -3442,6 +3472,15 @@
+ 	push(@::errors,"\$tmpdir $cfg::tmpdir is not writable");
+     }
+ 
++	$cfg::hostname = `hostname`;
++	chomp($cfg::hostname);
++
++	# Use a subdirectory of the user-specified directory as our tmpdir
++	# Also note that we make it closer to globally unique as we sometimes
++	# use this variable for remote systems, so PID isn't enough
++    $cfg::tmpdir = $cfg::tmpdir .'/flexbackup.'.$$.'.'.$cfg::hostname;
++    mkdir ($cfg::tmpdir) || die "Can't create temporary directory, $!";
++
+     # Levels
+     if (defined($::opt{'level'}) and
+ 	(defined($::opt{'incremental'}) or
+@@ -3781,7 +3820,7 @@
+ 
+     # Try and guess file types and commpression scheme
+     # might as well since we are reading from a file in this case
+-    if ($file =~ m/\.(dump|cpio|tar|star|pax|a|shar|filelist)\.(gz|bz2|lzo|Z|zip)$/) {
++    if ($file =~ m/\.(dump|cpio|tar|star|pax|a|shar|filelist)\.(gz|bz2|lzo|Z|zip|lzma)$/) {
+ 	$cfg::type = $1;
+ 	$cfg::compress = $2;
+ 	$cfg::type =~ s/^a$/ar/;
+@@ -3789,16 +3828,18 @@
+ 	$cfg::compress =~ s/bz2/bzip2/;
+ 	$cfg::compress =~ s/lzo/lzop/;
+ 	$cfg::compress =~ s/Z/compress/;
++	$cfg::compress =~ s/lzma/lzma/;
+ 	&log("| Auto-set to type=$cfg::type compress=$cfg::compress");
+ 	&optioncheck();                  # redo to set a few variables over
+ 
+-    } elsif ($file =~ m/\.afio-(gz|bz2|lzo|Z|zip)$/) {
++    } elsif ($file =~ m/\.afio-(gz|bz2|lzo|Z|zip|lzma)$/) {
+ 	$cfg::type = "afio";
+ 	$cfg::compress = $1;
+ 	$cfg::compress =~ s/gz/gzip/;
+ 	$cfg::compress =~ s/bz2/bzip2/;
+ 	$cfg::compress =~ s/lzo/lzop/;
+ 	$cfg::compress =~ s/Z/compress/;
++	$cfg::compress =~ s/lzma/lzma/;
+ 	&log("| Auto-set to type=$cfg::type compress=$cfg::compress");
+ 	&optioncheck();                  # redo to set a few variables over
+ 
+@@ -4842,7 +4883,11 @@
+ 	$prunekey = $dir;
+     }
+ 
+-    if (defined(%{$::prune{$prunekey}})) {
++    if (defined($::early_mountpoint_flag)) {
++	$cmd .= "$::early_mountpoint_flag ";
++    }
++
++    if ($::prune{$prunekey}) {
+ 	# FreeBSD needs -E (above) and no backslashes around the (|) chars
+ 	if ($::uname =~ /FreeBSD/) {
+ 	    $cmd .= '-regex "\./(';
+@@ -4861,7 +4906,9 @@
+ 	$cmd .= "-depth ";
+     }
+ 
+-    $cmd .= "$::mountpoint_flag ";
++    if (defined($::late_mountpoint_flag)) {
++	$cmd .= "$::late_mountpoint_flag ";
++    }
+     $cmd .= "! -type s ";
+ 
+     if (defined($otherarg)) {
+@@ -5236,8 +5283,8 @@
+     # Create a script which tests the buffer program
+     open(SCR,"> $tmp_script") || die;
+     print SCR "#!/bin/sh\n";
+-    print SCR "tmp_data=/tmp/bufftest\$\$.txt\n";
+-    print SCR "tmp_err=/tmp/bufftest\$\$.err\n";
++    print SCR "tmp_data=$cfg::tmpdir/buftest.$host.$$.txt\n";
++    print SCR "tmp_err=$cfg::tmpdir/buftest.$host.$$.err\n";
+     print SCR "echo testme > \$tmp_data\n";
+     print SCR "$buffer_cmd > /dev/null 2> \$tmp_err < \$tmp_data\n";
+     print SCR "res=\$?\n";
+@@ -5255,7 +5302,8 @@
+ 	$pipecmd = "sh $tmp_script ";
+     } else {
+ 	print $::msg "| Checking '$cfg::buffer' on host $host... ";
+-	$pipecmd =  "cat $tmp_script | ($::remoteshell $host 'cat > $tmp_script; sh $tmp_script; rm -f $tmp_script')";
++	$pipecmd =  "cat $tmp_script | ($::remoteshell $host 'mkdir -p $cfg::tmpdir;
++ 		     cat - > $tmp_script; sh $tmp_script; rm -rf $cfg::tmpdir')";
+     }
+ 
+     if (!defined($::debug)) {
+@@ -5287,6 +5335,8 @@
+ 	close (PIPE);
+ 
+     } else {
++	print $::msg "\n(debug) 'buffer' test script:\n($tmp_script)\n\n"
++	      . `cat $tmp_script`;
+ 	print $::msg "\n(debug) $pipecmd\n";
+     }
+ 
diff --git a/system/flexbackup/flexbackup.SlackBuild b/system/flexbackup/flexbackup.SlackBuild
index 2609144e8a..9ef081cac6 100644
--- a/system/flexbackup/flexbackup.SlackBuild
+++ b/system/flexbackup/flexbackup.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for flexbackup
 #
-# Copyright 2013 klaatu at member.fsf.org
+# Copyright 2013-22 klaatu at member.fsf.org
 #
 # GNU All-Permissive License
 # Copying and distribution of this file, with or without modification,
@@ -9,14 +9,24 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=flexbackup
 VERSION=${VERSION:-1.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -41,6 +51,10 @@ find -L . \
 #sed -i "s%/share/man%/man%" $TMP/$PRGNAM-$VERSION/Makefile
 #make install
 
+# patch to account for ancient version of tar
+# https://packages.debian.org/bullseye/all/flexbackup/download
+patch -p0 < $CWD/flexbackup-debian.patch
+
 # mkdir $PKG/etc $PKG/usr/bin/ $PKG/usr/man/man{1,5}
 install -m 0644 flexbackup.conf -D $PKG/etc/flexbackup.conf.new
 install -m 0755 flexbackup -D $PKG/usr/bin/flexbackup
@@ -62,4 +76,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fnt/README b/system/fnt/README
new file mode 100644
index 0000000000..9f101e0b7a
--- /dev/null
+++ b/system/fnt/README
@@ -0,0 +1,27 @@
+fnt is the APT for fonts in UNIX like operating systems
+
+It downloads fonts from Debian-Sid and Google fonts,
+these fonts are prefixed with font- and google- respectively.
+
+It can be run as normal user.
+
+Note: It includes font metapackges in its search list
+do not install that.
+
+Usage:
+
+To run first update the font index
+
+$ fnt update
+
+To install:
+
+$ fnt install agave
+
+To uninstall a font
+
+$ fnt remove agave
+
+To get a list of fonts that are available  and save it to a file do
+
+fnt search > fontlist
diff --git a/system/fnt/fnt.SlackBuild b/system/fnt/fnt.SlackBuild
new file mode 100644
index 0000000000..8e7f07ae68
--- /dev/null
+++ b/system/fnt/fnt.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+# Slackware build script for fnt
+
+# Copyright 2022-2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fnt
+VERSION=${VERSION:-1.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+patch --verbose --unified  <  $CWD/makefile.patch
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fnt/fnt.info b/system/fnt/fnt.info
new file mode 100644
index 0000000000..95b799b80c
--- /dev/null
+++ b/system/fnt/fnt.info
@@ -0,0 +1,10 @@
+PRGNAM="fnt"
+VERSION="1.5"
+HOMEPAGE="https://github.com/alexmyczko/fnt"
+DOWNLOAD="https://github.com/alexmyczko/fnt/archive/1.5/fnt-1.5.tar.gz"
+MD5SUM="e2d25c7845bc2617f618a0701f7ceabe"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="chafa lcdf-typetools"
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fnt/makefile.patch b/system/fnt/makefile.patch
new file mode 100644
index 0000000000..cbfac98aeb
--- /dev/null
+++ b/system/fnt/makefile.patch
@@ -0,0 +1,11 @@
+--- makefile	2023-08-22 18:06:03.000000000 +0530
++++ makefile1	2024-02-05 18:00:30.130997385 +0530
+@@ -1,6 +1,6 @@
+ BINDIR=/usr/bin
+-MANDIR=/usr/share/man
+-ZCOMPDIR=/usr/local/share/zsh/site-functions
++MANDIR=/usr/man
++ZCOMPDIR=/usr/share/zsh/site-functions
+ VERSION=1.3
+ 
+ all:
diff --git a/system/fnt/slack-desc b/system/fnt/slack-desc
new file mode 100644
index 0000000000..c5e3570271
--- /dev/null
+++ b/system/fnt/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+fnt: fnt (Font Downloader for UNIX)
+fnt:
+fnt: A Font downloader for UNIX like systems.It downloads from
+fnt: Debian Sid and Google Fonts.
+fnt:
+fnt: Homepage: https://github.com/alexmyczko/fnt
+fnt:
+fnt:
+fnt:
+fnt:
+fnt:
diff --git a/system/font-manager/README b/system/font-manager/README
index a95e34d424..39ced4b145 100644
--- a/system/font-manager/README
+++ b/system/font-manager/README
@@ -1,8 +1,7 @@
 A simple font management application for GTK+ Desktop Environments.
 
-Optional Dependency
+Optional dependency: webkit2gtk, autodetected at build time. This is
+required if you want Google Fonts integration.
 
-For file-roller support, install file-roller and call the SlackBuild
-with FILE_ROLLER=yes, for example
-
-  FILE_ROLLER=yes ./font-manager.SlackBuild
+Optional dependency: file-roller. This is a runtime dependency, not
+required at build time.
diff --git a/system/font-manager/doinst.sh b/system/font-manager/doinst.sh
index f6a6676883..ebb9ce16ff 100644
--- a/system/font-manager/doinst.sh
+++ b/system/font-manager/doinst.sh
@@ -8,3 +8,8 @@ if [ -e usr/share/glib-2.0/schemas ]; then
   fi
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/font-manager/font-manager.SlackBuild b/system/font-manager/font-manager.SlackBuild
index 45f86c4441..aa2ee5f0b8 100644
--- a/system/font-manager/font-manager.SlackBuild
+++ b/system/font-manager/font-manager.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for font-manager
 
@@ -22,10 +22,22 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - update icon cache in doinst.sh (no script changes).
+
+# 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0,
+# by updating to v0.8.8.
+
+# 20220306 bkw: Modified by SlackBuilds.org again: add autodetection
+# for webkit2gtk dependency.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=font-manager
-VERSION=${VERSION:-0.7.3}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.8.8}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +47,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,41 +76,40 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-FILE_ROLLER=${FILE_ROLLER:-no}
-if [ "$FILE_ROLLER" = "yes" ]; then
-  FILE_ROLLER_FLAG="--with-file-roller"
-fi
+WEBKIT=false
+pkg-config --exists webkit2gtk-4.0 && WEBKIT=true
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-static \
-  $FILE_ROLLER_FLAG \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dthunar=true \
+    -Dwebkit=$WEBKIT \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
+gzip -9 $PKG/usr/man/man*/*
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md CHANGELOG $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -102,4 +117,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/font-manager/font-manager.info b/system/font-manager/font-manager.info
index 9d50a8a4fc..65904076ba 100644
--- a/system/font-manager/font-manager.info
+++ b/system/font-manager/font-manager.info
@@ -1,10 +1,10 @@
 PRGNAM="font-manager"
-VERSION="0.7.3"
+VERSION="0.8.8"
 HOMEPAGE="http://fontmanager.github.io/"
-DOWNLOAD="https://github.com/FontManager/master/releases/download/0.7.3/font-manager-0.7.3.tar.bz2"
-MD5SUM="3623327f516100f65a84a04ba1be39c9"
+DOWNLOAD="https://github.com/FontManager/font-manager/releases/download/0.8.8/font-manager-0.8.8.tar.xz"
+MD5SUM="1a898600f7153aa685694bd90c847c9c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="vala json-glib libgee yelp-tools"
+REQUIRES="yelp-tools"
 MAINTAINER="Azure Zanculmarktum"
 EMAIL="zanculmarktum@gmail.com"
diff --git a/system/fonts-arabic-extra/README b/system/fonts-arabic-extra/README
new file mode 100644
index 0000000000..c58c5eaf85
--- /dev/null
+++ b/system/fonts-arabic-extra/README
@@ -0,0 +1,60 @@
+The Arabic script is the writing system used for Arabic
+and several other languages of Asia and Africa.
+It is the second-most widely used alphabetic writing
+system in the world after the Latin script the second-most
+widely used writing system in the world by number of
+countries using it, and the third-most by number of users
+after the Latin and Chinese scripts.
+
+The Arabic script is used to write languages such as
+Persian (Farsi and Dari), Malay (Jawi), Cham (Akhar Srak),
+Uyghur, Kurdish, Punjabi (Shahmukhi),
+Sindhi, Balti, Balochi, Pashto, Lurish, Urdu, Kashmiri,
+Rohingya, Somali, Mandinka, and Mooré, among others
+
+The fonts available in this repo are
+1. Alexandria
+2. Alkalami
+3. Almarai
+4. Amiri
+5. Arabeyes
+6. Aref ruqaa
+7. Blaka
+8. Cairo
+9. Droid Kufi
+10. Droid Naskh
+11. El-Messiri
+12. Harmattan
+13. IBM Plex Sans
+14. Jomhuria
+15. Katibeh
+16. Kufam
+17. Lalezar
+18. Lateef
+19. Lemonada
+20. Mada
+21. Marhey
+22. Markazi
+23. Nafees
+24. Paktype
+25. Qahiri
+26. Rakkas
+27. Raqq
+28. Readex Pro
+29. Reem Kufi
+30. Ruwudu
+31. Scheherazada
+32. Tajawal
+33. Thabit
+34. Ubuntu Arabic
+35. Vibes
+36. Unikurd Web
+37. KACST
+38. Mirza
+
+To install woff and woff2 fonts run the slackbuild as
+WEBFONTS=YES ./fonts-arabic-extra.SlackBuild
+
+Conflicts:
+
+This package conflicts with google-fonts and droid-fonts
diff --git a/system/fonts-arabic-extra/doinst.sh b/system/fonts-arabic-extra/doinst.sh
new file mode 100644
index 0000000000..b1446e3188
--- /dev/null
+++ b/system/fonts-arabic-extra/doinst.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-arabic-extra/fonts-arabic-extra.SlackBuild b/system/fonts-arabic-extra/fonts-arabic-extra.SlackBuild
new file mode 100644
index 0000000000..f1311a455d
--- /dev/null
+++ b/system/fonts-arabic-extra/fonts-arabic-extra.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/bash
+
+# Slackware build script for fonts-arabic-extra
+
+# Copyright 2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-arabic-extra
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/{TTF,OTF}
+
+find $TMP/$PRGNAM-$VERSION/OTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+if [ "$WEBFONTS" = "YES" ]; then
+    mkdir -pv $PKG/usr/share/fonts/{WOFF,WOFF2}
+    find $TMP/$PRGNAM-$VERSION/WOFF/ -name '*.woff' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF \;
+    find $TMP/$PRGNAM-$VERSION/WOFF2/ -name '*.woff2' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF2 \;
+fi
+
+mkdir -pv $PKG/etc/fonts/conf.avail
+find . -name "*.conf" -exec cp -a {} $PKG/etc/fonts/conf.avail \;
+mkdir -pv $PKG/etc/fonts/conf.d
+( cd $PKG/etc/fonts/conf.d && ln -sf ../conf.avail/* .)
+
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $TMP/$PRGNAM-$VERSION/{License,Readme.md,URL.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -pv $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-arabic-extra/fonts-arabic-extra.info b/system/fonts-arabic-extra/fonts-arabic-extra.info
new file mode 100644
index 0000000000..302e4c381e
--- /dev/null
+++ b/system/fonts-arabic-extra/fonts-arabic-extra.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-arabic-extra"
+VERSION="1.0"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-arabic-extra"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-arabic-extra/archive/1.0/fonts-arabic-extra-1.0.tar.gz"
+MD5SUM="b8f39ed2b8ba4346777135c95014af93"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-arabic-extra/slack-desc b/system/fonts-arabic-extra/slack-desc
new file mode 100644
index 0000000000..9ed40accc5
--- /dev/null
+++ b/system/fonts-arabic-extra/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+fonts-arabic-extra: fonts-arabic-extra (Arabic Fonts)
+fonts-arabic-extra:
+fonts-arabic-extra: The Arabic script is the writing system used for Arabic
+fonts-arabic-extra: and several other languages of Asia and Africa.It is the
+fonts-arabic-extra: second most widely used alphabetic writing system next to
+fonts-arabic-extra: Latin script. The Arabic script is used to write  languages
+fonts-arabic-extra: such as Persian,Kurdish,Urdu,Sindhi,dari,Pashto,Balochi,etc
+fonts-arabic-extra:
+fonts-arabic-extra: Homepage:https://github.com/lecramyajiv/fonts-arabic-extra
+fonts-arabic-extra:
+fonts-arabic-extra:
diff --git a/system/fonts-bengali-extra/README b/system/fonts-bengali-extra/README
new file mode 100644
index 0000000000..f383097f2d
--- /dev/null
+++ b/system/fonts-bengali-extra/README
@@ -0,0 +1,10 @@
+Bengali is spoken by about 270 million people in the
+Indian state of West Bengal and in People's Republic of
+Bangladesh. This is an extra collection of Bengali fonts
+for Slackware Linux.
+
+To install the fonts in the contrib folder run the
+slackbuild as CONTRIB=YES ./fonts-bengali-extra.SlackBuild
+
+NOTE:
+This package conflicts with the google-fonts package
diff --git a/system/fonts-bengali-extra/doinst.sh b/system/fonts-bengali-extra/doinst.sh
new file mode 100644
index 0000000000..b1446e3188
--- /dev/null
+++ b/system/fonts-bengali-extra/doinst.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-bengali-extra/fonts-bengali-extra.SlackBuild b/system/fonts-bengali-extra/fonts-bengali-extra.SlackBuild
new file mode 100644
index 0000000000..c205d6bbda
--- /dev/null
+++ b/system/fonts-bengali-extra/fonts-bengali-extra.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/bash
+
+# Slackware build script for fonts-bengali-extra
+
+# Copyright 2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-bengali-extra
+VERSION=${VERSION:-1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/{TTF,OTF}
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+
+find $TMP/$PRGNAM-$VERSION/OTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+if [ "$CONTRIB" = "YES" ]; then
+  find $TMP/$PRGNAM-$VERSION/Contrib/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+  mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION/Contrib
+  cp -a $TMP/$PRGNAM-$VERSION/Contrib/License  $PKG/usr/doc/$PRGNAM-$VERSION/Contrib/
+fi
+
+mkdir -pv $PKG/etc/fonts/conf.avail
+find . -name "*.conf" -exec cp -a {} $PKG/etc/fonts/conf.avail \;
+mkdir -pv $PKG/etc/fonts/conf.d
+( cd $PKG/etc/fonts/conf.d && ln -sf ../conf.avail/* .)
+
+cp -a $TMP/$PRGNAM-$VERSION/{License,README.md,URL.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-bengali-extra/fonts-bengali-extra.info b/system/fonts-bengali-extra/fonts-bengali-extra.info
new file mode 100644
index 0000000000..69aa2d2cde
--- /dev/null
+++ b/system/fonts-bengali-extra/fonts-bengali-extra.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-bengali-extra"
+VERSION="1.1"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-bengali-extra"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-bengali-extra/archive/1.1/fonts-bengali-extra-1.1.tar.gz"
+MD5SUM="5cd8892ce6be97ab1835ddf0bf233e34"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-bengali-extra/slack-desc b/system/fonts-bengali-extra/slack-desc
new file mode 100644
index 0000000000..44662d6bc3
--- /dev/null
+++ b/system/fonts-bengali-extra/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                   |-----handy-ruler------------------------------------------------------|
+fonts-bengali-extra: fonts-bengali-extra (Bengali Fonts)
+fonts-bengali-extra:
+fonts-bengali-extra: Bengali is spoken by about 270 million people in the
+fonts-bengali-extra: Indian state of West Bengal and in People's Republic of
+fonts-bengali-extra: Bangladesh. This is an extra collection of Bengali fonts
+fonts-bengali-extra: for Slackware Linux.
+fonts-bengali-extra:
+fonts-bengali-extra:
+fonts-bengali-extra: Homepage:https://github.com/lecramyajiv/fonts-bengali-extra
+fonts-bengali-extra:
+fonts-bengali-extra:
diff --git a/system/fonts-devanagari-extra/README b/system/fonts-devanagari-extra/README
new file mode 100644
index 0000000000..37a0e2998f
--- /dev/null
+++ b/system/fonts-devanagari-extra/README
@@ -0,0 +1,18 @@
+Devanagari is a writing script used in Indian subcontinent and
+is one of the official scripts of Republic of India and Nepal.
+This script is used to write Hindi,Marathi,Nepali,Sanskrit,
+Konkani,Awadhi,Haryanvi,Chattishgharhi,Rajasthani,Maithili,
+Bhojpuri,etc. Devanagari script is the fourth most widely
+used writing system in the world being used for 120 languages.
+
+To see the list of fonts see FONTS.md in the doc folder.
+
+To install the fonts in the contrib folder run the
+slackbuild as CONTRIB=YES ./fonts-devanagari-extra.SlackBuild
+
+To install woff and woff2 fonts run the slackbuild as
+WEBFONTS=YES ./fonts-devanagari-extra.SlackBuild
+
+Conflicts:
+
+This package conflicts with google-fonts and google-droid-fonts
diff --git a/system/fonts-devanagari-extra/doinst.sh b/system/fonts-devanagari-extra/doinst.sh
new file mode 100644
index 0000000000..b1446e3188
--- /dev/null
+++ b/system/fonts-devanagari-extra/doinst.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-devanagari-extra/fonts-devanagari-extra.SlackBuild b/system/fonts-devanagari-extra/fonts-devanagari-extra.SlackBuild
new file mode 100644
index 0000000000..785180cc8e
--- /dev/null
+++ b/system/fonts-devanagari-extra/fonts-devanagari-extra.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+# Slackware build script for fonts-devanagari-extra
+
+# Copyright 2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-devanagari-extra
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/{TTF,OTF}
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+
+find $TMP/$PRGNAM-$VERSION/OTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+if [ "$WEBFONTS" = "YES" ]; then
+    mkdir -pv $PKG/usr/share/fonts/{WOFF,WOFF2}
+    find $TMP/$PRGNAM-$VERSION/WOFF/ -name '*.woff' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF \;
+    find $TMP/$PRGNAM-$VERSION/WOFF2/ -name '*.woff2' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF2 \;
+fi
+
+if [ "$CONTRIB" = "YES" ]; then
+  find $TMP/$PRGNAM-$VERSION/Contrib/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+  mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION/Contrib
+  cp -a $TMP/$PRGNAM-$VERSION/Contrib/License  $PKG/usr/doc/$PRGNAM-$VERSION/Contrib/
+fi
+
+mkdir -pv $PKG/etc/fonts/conf.avail
+find . -name "*.conf" -exec cp -a {} $PKG/etc/fonts/conf.avail \;
+mkdir -pv $PKG/etc/fonts/conf.d
+( cd $PKG/etc/fonts/conf.d && ln -sf ../conf.avail/* .)
+
+cp -a $TMP/$PRGNAM-$VERSION/{License,README.md,URL.md,FONTS.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -pv $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-devanagari-extra/fonts-devanagari-extra.info b/system/fonts-devanagari-extra/fonts-devanagari-extra.info
new file mode 100644
index 0000000000..f3788327ae
--- /dev/null
+++ b/system/fonts-devanagari-extra/fonts-devanagari-extra.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-devanagari-extra"
+VERSION="1.0"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-devanagari-extra"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-devanagari-extra/archive/1.0/fonts-devanagari-extra-1.0.tar.gz"
+MD5SUM="35a30aeaee4da57bc468c312a04fb532"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-devanagari-extra/slack-desc b/system/fonts-devanagari-extra/slack-desc
new file mode 100644
index 0000000000..65c837a459
--- /dev/null
+++ b/system/fonts-devanagari-extra/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                      |-----handy-ruler------------------------------------------------------|
+fonts-devanagari-extra: fonts-devanagari-extra (Devanagari Fonts)
+fonts-devanagari-extra:
+fonts-devanagari-extra: Devanagari is a writing script used in Indian subcontinent and
+fonts-devanagari-extra: is one of the official scripts of Republic of India and Nepal.
+fonts-devanagari-extra: This script is used to write Hindi,Marathi,Nepali,Sanskrit,
+fonts-devanagari-extra: Konkani,Awadhi,Haryanvi,Chattisgarhi,Rajasthani,Maithili,
+fonts-devanagari-extra: Bhojpuri,etc. Devanagari script is the fourth most widely
+fonts-devanagari-extra: writing system in the world being used for 120 languages.
+fonts-devanagari-extra:
+fonts-devanagari-extra: Homepage:https://github.com/lecramyajiv/fonts-devanagari-extra
+fonts-devanagari-extra:
diff --git a/system/fonts-farsi-extra/README b/system/fonts-farsi-extra/README
new file mode 100644
index 0000000000..b0e3876318
--- /dev/null
+++ b/system/fonts-farsi-extra/README
@@ -0,0 +1,49 @@
+Persian also known as Farsi is spoken in Iran and its dialect
+in Afghanistan and Tajikistan were it is known as Dari and
+Tajik respectively.There are about 130 million active
+speakers. This package contains extra farsi fonts for
+Slackware Linux.
+
+The following fonts are available
+
+1. Farsi Web
+2. Free Farsi
+3. Vazirmatn
+4. Vazircode
+5. Tanha
+6. Parastoo
+7. Gandom
+8. Nahid
+9. Samim
+10. Shabnam
+11. Nika
+12. Behdad
+13. Ganjnameh
+14. Farbod
+15. Shahab
+16. Noon
+17. MiladAzad
+18. VizhehAzad
+19. Font Iranian
+20. Pfont
+21. Pasrimatn
+22. Dehnavi92
+23. Fandogh
+24. Erfan
+25. Unixel
+26. EncryptedPersian
+27. Xorasani-nasx
+28. PakType Basic Farsi
+
+Fandogh is a fancy persian font.
+Erfan and unixel are pixel fonts.
+EncryptedPersian is an persian font with Egyptian Hieroglyphics.
+PakType is a collection of fonts arabic,urdu,Farsi and sindhi. This
+package contains only the Farsi font.
+
+To install woff and woff2 fonts run the slackbuild as
+WEBFONTS=YES ./fonts-farsi-extra.SlackBuild
+
+Conflicts:
+
+This package conflicts with google fonts package.
diff --git a/system/fonts-farsi-extra/doinst.sh b/system/fonts-farsi-extra/doinst.sh
new file mode 100644
index 0000000000..b1446e3188
--- /dev/null
+++ b/system/fonts-farsi-extra/doinst.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-farsi-extra/fonts-farsi-extra.SlackBuild b/system/fonts-farsi-extra/fonts-farsi-extra.SlackBuild
new file mode 100644
index 0000000000..c1aef9fa62
--- /dev/null
+++ b/system/fonts-farsi-extra/fonts-farsi-extra.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+# Slackware build script for fonts-farsi-extra
+
+# Copyright 2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-farsi-extra
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/{TTF,OTF}
+
+find $TMP/$PRGNAM-$VERSION/OTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+if [ "$WEBFONTS" = "YES" ]; then
+    mkdir -pv $PKG/usr/share/fonts/{WOFF,WOFF2}
+    find $TMP/$PRGNAM-$VERSION/WOFF/ -name '*.woff' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF \;
+    find $TMP/$PRGNAM-$VERSION/WOFF2/ -name '*.woff2' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF2 \;
+fi
+
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $TMP/$PRGNAM-$VERSION/{License,README.md,URL.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -pv $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-farsi-extra/fonts-farsi-extra.info b/system/fonts-farsi-extra/fonts-farsi-extra.info
new file mode 100644
index 0000000000..f29b62f8e6
--- /dev/null
+++ b/system/fonts-farsi-extra/fonts-farsi-extra.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-farsi-extra"
+VERSION="1.0"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-farsi-extra"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-farsi-extra/archive/1.0/fonts-farsi-extra-1.0.tar.gz"
+MD5SUM="a640853c4d2a799aa714567940ae132c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-farsi-extra/slack-desc b/system/fonts-farsi-extra/slack-desc
new file mode 100644
index 0000000000..2ebc1eaaa6
--- /dev/null
+++ b/system/fonts-farsi-extra/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+fonts-farsi-extra: fonts-farsi-extra (Persian Fonts)
+fonts-farsi-extra:
+fonts-farsi-extra: Persian also known as Farsi is spoken in Iran and its dialect
+fonts-farsi-extra: in Afghanistan and Tajikistan were it is known as Dari and
+fonts-farsi-extra: Tajik respectively.There are about 130 million active
+fonts-farsi-extra: speakers. This package contains extra farsi fonts for
+fonts-farsi-extra: Slackware Linux.
+fonts-farsi-extra:
+fonts-farsi-extra: Homepage:https://github.com/lecramyajiv/fonts-farsi-extra
+fonts-farsi-extra:
+fonts-farsi-extra:
diff --git a/system/fonts-gujarati-extra/README b/system/fonts-gujarati-extra/README
new file mode 100644
index 0000000000..f1d771e912
--- /dev/null
+++ b/system/fonts-gujarati-extra/README
@@ -0,0 +1,23 @@
+Gujarati is spoken in the Indian state of Gujarat and in the
+Union territory of Dadra and Nagar Haveli and also in Daman and
+Diu. It is spoken by about 62 million speakers.
+
+The fonts available are
+
+1.  Ektype/Anek
+2.  Ektype/Baloo2
+3.  Ektype/Mukta Vaani
+4.  Itfoundry/Hind-vadodara
+5.  Itfoundry/Kumar
+6.  Jonpinhorn/Shrikhand
+7.  Rosetta/Rasa
+8.  lipiraval/Mogra
+9.  Anexasajoop/Farsan
+10. Debian/Kalapi
+11. NLCI/Gir
+
+To install woff font run the slackbuild as
+WEBFONTS=YES ./fonts-gujarati-extra.SlackBuild
+
+Conflicts:
+This package conflicts with the google-fonts package.
diff --git a/system/fonts-gujarati-extra/doinst.sh b/system/fonts-gujarati-extra/doinst.sh
new file mode 100644
index 0000000000..b1446e3188
--- /dev/null
+++ b/system/fonts-gujarati-extra/doinst.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-gujarati-extra/fonts-gujarati-extra.SlackBuild b/system/fonts-gujarati-extra/fonts-gujarati-extra.SlackBuild
new file mode 100644
index 0000000000..26651be62c
--- /dev/null
+++ b/system/fonts-gujarati-extra/fonts-gujarati-extra.SlackBuild
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+# Slackware build script for fonts-gujarati-extra
+
+# Copyright 2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-gujarati-extra
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/{TTF,OTF}
+
+find $TMP/$PRGNAM-$VERSION/OTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+if [ "$WEBFONTS" = "YES" ]; then
+    mkdir -pv $PKG/usr/share/fonts/WOFF
+    find $TMP/$PRGNAM-$VERSION/WOFF/ -name '*.woff' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF \;
+fi
+
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $TMP/$PRGNAM-$VERSION/{License,README.md,URL.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -pv $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-gujarati-extra/fonts-gujarati-extra.info b/system/fonts-gujarati-extra/fonts-gujarati-extra.info
new file mode 100644
index 0000000000..645881cadf
--- /dev/null
+++ b/system/fonts-gujarati-extra/fonts-gujarati-extra.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-gujarati-extra"
+VERSION="1.0"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-gujarati-extra"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-gujarati-extra/archive/1.0/fonts-gujarati-extra-1.0.tar.gz"
+MD5SUM="273a4aea452f368c761f4b22f17be816"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-gujarati-extra/slack-desc b/system/fonts-gujarati-extra/slack-desc
new file mode 100644
index 0000000000..4a4af36379
--- /dev/null
+++ b/system/fonts-gujarati-extra/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+fonts-gujarati-extra: fonts-gujarati-extra (Gujarati Fonts)
+fonts-gujarati-extra:
+fonts-gujarati-extra: Gujarati is spoken in the Indian state of Gujarat and in the
+fonts-gujarati-extra: Union territory of Dadra and Nagar Haveli and also in Daman and
+fonts-gujarati-extra: Diu. It is spoken by about 62 million speakers.
+fonts-gujarati-extra:
+fonts-gujarati-extra:
+fonts-gujarati-extra: Homepage:https://github.com/lecramyajiv/fonts-gujarati-extra
+fonts-gujarati-extra:
+fonts-gujarati-extra:
+fonts-gujarati-extra:
diff --git a/system/fonts-gurmukhi-extra/README b/system/fonts-gurmukhi-extra/README
new file mode 100644
index 0000000000..4064a1e69b
--- /dev/null
+++ b/system/fonts-gurmukhi-extra/README
@@ -0,0 +1,23 @@
+Punjabi is spoken in the Indian and Pakistan state of
+Punjab with approximately 113 million native speakers.
+This font collection contains punjabi written in
+Gurmukhi script as written in India.
+
+The following fonts are available
+1. Anek Gurmukhi
+2. Baloo Paaji2
+3. Mukta Mahee
+4. Tiro Gurmukhi
+5. AnmolUni
+6. AnmolUniBani
+7. Open satluj Uni
+8. Sant Lipi
+9. Braah
+10. Dasa
+11. Sector
+
+To install woff and woff2 fonts run the slackbuild as
+WEBFONTS=YES ./fonts-gurmukhi-extra.SlackBuild
+
+conflicts:
+This package conflicts with google-fonts package
diff --git a/system/fonts-gurmukhi-extra/doinst.sh b/system/fonts-gurmukhi-extra/doinst.sh
new file mode 100644
index 0000000000..b1446e3188
--- /dev/null
+++ b/system/fonts-gurmukhi-extra/doinst.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-gurmukhi-extra/fonts-gurmukhi-extra.SlackBuild b/system/fonts-gurmukhi-extra/fonts-gurmukhi-extra.SlackBuild
new file mode 100644
index 0000000000..9bfe1c7baa
--- /dev/null
+++ b/system/fonts-gurmukhi-extra/fonts-gurmukhi-extra.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+# Slackware build script for fonts-gurmukhi-extra
+
+# Copyright 2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-gurmukhi-extra
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/{TTF,OTF}
+
+find $TMP/$PRGNAM-$VERSION/OTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+if [ "$WEBFONTS" = "YES" ]; then
+    mkdir -pv $PKG/usr/share/fonts/{WOFF,WOFF2}
+    find $TMP/$PRGNAM-$VERSION/WOFF/ -name '*.woff' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF \;
+    find $TMP/$PRGNAM-$VERSION/WOFF2/ -name '*.woff2' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF2 \;
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $TMP/$PRGNAM-$VERSION/{License,README.md,URL.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-gurmukhi-extra/fonts-gurmukhi-extra.info b/system/fonts-gurmukhi-extra/fonts-gurmukhi-extra.info
new file mode 100644
index 0000000000..90a20a16f0
--- /dev/null
+++ b/system/fonts-gurmukhi-extra/fonts-gurmukhi-extra.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-gurmukhi-extra"
+VERSION="1.0"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-gurmukhi-extra"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-gurmukhi-extra/archive/1.0/fonts-gurmukhi-extra-1.0.tar.gz"
+MD5SUM="d2e7803ac9d537f5c916d81091516482"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-gurmukhi-extra/slack-desc b/system/fonts-gurmukhi-extra/slack-desc
new file mode 100644
index 0000000000..7029140f0b
--- /dev/null
+++ b/system/fonts-gurmukhi-extra/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+fonts-gurmukhi-extra: fonts-gurmukhi-extra (Gurmukhi Fonts)
+fonts-gurmukhi-extra:
+fonts-gurmukhi-extra: Punjabi is spoken in the Indian and Pakistan state of
+fonts-gurmukhi-extra: Punjab with approximately 113 million native speakers.
+fonts-gurmukhi-extra: This font collection contains punjabi written in
+fonts-gurmukhi-extra: Gurmukhi script as written in India.
+fonts-gurmukhi-extra:
+fonts-gurmukhi-extra: Homepage:https://github/com/lecramyajiv/fonts-gurmukhi-extra
+fonts-gurmukhi-extra:
+fonts-gurmukhi-extra:
+fonts-gurmukhi-extra:
diff --git a/system/fonts-indic-archaic/README b/system/fonts-indic-archaic/README
new file mode 100644
index 0000000000..64d4eed6c2
--- /dev/null
+++ b/system/fonts-indic-archaic/README
@@ -0,0 +1,26 @@
+Fonts indic archaic is a collection of ancient indic
+scripts for Slackware Linux. The Scripts such as
+Brahmi,Grantha,Siddham,etc can be used to write
+Sanskrit.
+
+The indic scripts supported by this collection are
+Ahom
+Bhaisukui
+Brahmi
+Dives-Akuru
+Grantha
+Kaithi
+Kharoshthi
+Khojki
+Khudawadi
+Mahajani
+Modi
+Multani
+Nandi Nagari
+Sharada
+Siddham
+Sylheti Nagari
+Trihuta
+
+NOTE:
+This package conflicts with noto-extra-ttf
diff --git a/system/fonts-indic-archaic/doinst.sh b/system/fonts-indic-archaic/doinst.sh
new file mode 100644
index 0000000000..b1446e3188
--- /dev/null
+++ b/system/fonts-indic-archaic/doinst.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-indic-archaic/fonts-indic-archaic.SlackBuild b/system/fonts-indic-archaic/fonts-indic-archaic.SlackBuild
new file mode 100644
index 0000000000..7a8a2c1a84
--- /dev/null
+++ b/system/fonts-indic-archaic/fonts-indic-archaic.SlackBuild
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+# Slackware build script for fonts-indic-archaic
+
+# Copyright 2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-indic-archaic
+VERSION=${VERSION:-1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/{TTF,OTF}
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+
+find $TMP/$PRGNAM-$VERSION/OTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+if [ "$NONLIBRE" = "YES" ]; then
+  find $TMP/$PRGNAM-$VERSION/non-libre/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+  mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION/non-libre
+  cp -a $TMP/$PRGNAM-$VERSION/non-libre/license  $PKG/usr/doc/$PRGNAM-$VERSION/non-libre/
+fi
+
+cp -a $TMP/$PRGNAM-$VERSION/{License,README.md,URL.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-indic-archaic/fonts-indic-archaic.info b/system/fonts-indic-archaic/fonts-indic-archaic.info
new file mode 100644
index 0000000000..73aa002107
--- /dev/null
+++ b/system/fonts-indic-archaic/fonts-indic-archaic.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-indic-archaic"
+VERSION="1.1"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-indic-archaic"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-indic-archaic/archive/1.1/fonts-indic-archaic-1.1.tar.gz"
+MD5SUM="3710b73f9e9cad6c4abe464361951607"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-indic-archaic/slack-desc b/system/fonts-indic-archaic/slack-desc
new file mode 100644
index 0000000000..29ef39769a
--- /dev/null
+++ b/system/fonts-indic-archaic/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                   |-----handy-ruler------------------------------------------------------|
+fonts-indic-archaic: fonts-indic-archaic (Fonts for Archaic Indic Scripts)
+fonts-indic-archaic:
+fonts-indic-archaic: Fonts indic archaic is a collection of ancient indic
+fonts-indic-archaic: scripts for Slackware Linux.
+fonts-indic-archaic:
+fonts-indic-archaic:
+fonts-indic-archaic:
+fonts-indic-archaic: Homepage:https://github.com/lecramyajiv
+fonts-indic-archaic:
+fonts-indic-archaic:
+fonts-indic-archaic:
diff --git a/system/fonts-indic-ne/README b/system/fonts-indic-ne/README
new file mode 100644
index 0000000000..9af8b3ea0c
--- /dev/null
+++ b/system/fonts-indic-ne/README
@@ -0,0 +1,8 @@
+This is a collection of fonts for languages spoken
+in North East India for Slackware Linux.
+I've only included fonts for languages that do not
+use latin,bengali or tibetan scripts.
+
+NOTE:
+This package conflicts with the noto-extra-ttf
+package.
diff --git a/system/fonts-indic-ne/doinst.sh b/system/fonts-indic-ne/doinst.sh
new file mode 100644
index 0000000000..b1446e3188
--- /dev/null
+++ b/system/fonts-indic-ne/doinst.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-indic-ne/fonts-indic-ne.SlackBuild b/system/fonts-indic-ne/fonts-indic-ne.SlackBuild
new file mode 100644
index 0000000000..eee8d9a062
--- /dev/null
+++ b/system/fonts-indic-ne/fonts-indic-ne.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+# Slackware build script for fonts-indic-ne
+
+# Copyright 2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-indic-ne
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/{TTF,OTF}
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+
+find $TMP/$PRGNAM-$VERSION/OTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+if [ "$WEBFONTS" = "YES" ]; then
+    mkdir -pv $PKG/usr/share/fonts/{WOFF,WOFF2}
+    find $TMP/$PRGNAM-$VERSION/WOFF/ -name '*.woff' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF \;
+    find $TMP/$PRGNAM-$VERSION/WOFF2/ -name '*.woff2' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF2 \;
+fi
+
+cp -a $TMP/$PRGNAM-$VERSION/{licenses,README.md,URL.md,readme_fonts}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-indic-ne/fonts-indic-ne.info b/system/fonts-indic-ne/fonts-indic-ne.info
new file mode 100644
index 0000000000..afa6ed3c33
--- /dev/null
+++ b/system/fonts-indic-ne/fonts-indic-ne.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-indic-ne"
+VERSION="1.0"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-indic-ne"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-indic-ne/archive/1.0/fonts-indic-ne-1.0.tar.gz"
+MD5SUM="814e569e725a8b9da394cea0bb54cd2f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-indic-ne/slack-desc b/system/fonts-indic-ne/slack-desc
new file mode 100644
index 0000000000..af1e05c613
--- /dev/null
+++ b/system/fonts-indic-ne/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+fonts-indic-ne: fonts-indic-ne (Fonts for North East Indian LAnguages )
+fonts-indic-ne:
+fonts-indic-ne: This is a collection of fonts for languages spoken
+fonts-indic-ne: in North East India for Slackware Linux.
+fonts-indic-ne:
+fonts-indic-ne:
+fonts-indic-ne: Homepage:https://github.com/lecramyajiv/fonts-indic-ne
+fonts-indic-ne:
+fonts-indic-ne:
+fonts-indic-ne:
+fonts-indic-ne:
diff --git a/system/fonts-indic-other/README b/system/fonts-indic-other/README
new file mode 100644
index 0000000000..8993916557
--- /dev/null
+++ b/system/fonts-indic-other/README
@@ -0,0 +1,16 @@
+Fonts indic other is an extra collection of fonts
+for indic languages for slackware linux.
+
+The languages supported in this collection are
+1. Gondi
+2. Dogri
+3. Toto
+4. Warang citi
+5. Nag Mundari
+6. Mro
+7. Toto
+8. Sora Sompeng
+9. Ol Chiki
+10. Takri
+11. Tulu
+12. Saurashtra
diff --git a/system/fonts-indic-other/doinst.sh b/system/fonts-indic-other/doinst.sh
new file mode 100644
index 0000000000..b1446e3188
--- /dev/null
+++ b/system/fonts-indic-other/doinst.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-indic-other/fonts-indic-other.SlackBuild b/system/fonts-indic-other/fonts-indic-other.SlackBuild
new file mode 100644
index 0000000000..944e0043d1
--- /dev/null
+++ b/system/fonts-indic-other/fonts-indic-other.SlackBuild
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+# Slackware build script for fonts-indic-other
+
+# Copyright 2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-indic-other
+VERSION=${VERSION:-1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/TTF
+mkdir -pv $PKG/usr/share/fonts/OTF
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+find $TMP/$PRGNAM-$VERSION/OTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+
+cp -a $TMP/$PRGNAM-$VERSION/{License,README.md,URL.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-indic-other/fonts-indic-other.info b/system/fonts-indic-other/fonts-indic-other.info
new file mode 100644
index 0000000000..f40652664d
--- /dev/null
+++ b/system/fonts-indic-other/fonts-indic-other.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-indic-other"
+VERSION="1.1"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-indic-other"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-indic-other/archive/1.1/fonts-indic-other-1.1.tar.gz"
+MD5SUM="d56eeb07a07c475a06e4025c8c04e6e2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-indic-other/slack-desc b/system/fonts-indic-other/slack-desc
new file mode 100644
index 0000000000..72db3f8c60
--- /dev/null
+++ b/system/fonts-indic-other/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+fonts-indic-other: fonts-indic-other (Extra Fonts for Indic Languages )
+fonts-indic-other:
+fonts-indic-other: Fonts indic other is an extra collection of fonts
+fonts-indic-other: for indic languages such as tulu,gondi,olchiki,dogri,
+fonts-indic-other: warang citi,nag mundari,toto,mro,sora sompeng and
+fonts-indic-other: saurashtra for Slackware Linux
+fonts-indic-other:
+fonts-indic-other: Homepage:https://github.com/lecramyajiv/fonts-indic-other
+fonts-indic-other:
+fonts-indic-other:
+fonts-indic-other:
diff --git a/system/fonts-kannada-extra/README b/system/fonts-kannada-extra/README
new file mode 100644
index 0000000000..9e8a33997c
--- /dev/null
+++ b/system/fonts-kannada-extra/README
@@ -0,0 +1,26 @@
+Kannada is spoken in the Indian state of Karnataka by
+about 44 million people. This is an extra collection of
+Kannada fonts for Slackware Linux
+
+The fonts are from
+Debian
+Google
+NLCI
+GITHUB
+OpenSuse Linux
+
+The Homepages and download urls are in URL.md file.
+The list of the fonts included are in FONTS.md file.
+The fonts are from google can be installed using the
+program fnt which is available in SBo
+
+To install woff fonts run the slackbuild as
+WEBFONTS=YES ./fonts-kannada-extra.SlackBuild
+
+To install Google fonts run the slackbuild as
+GOOGLEFONTS=YES ./fonts-kannada-extra.SlackBuild
+
+NOTE:
+If you install google fonts that comes with
+this package it will conflict with google-fonts
+package in SBo.
diff --git a/system/fonts-kannada-extra/doinst.sh b/system/fonts-kannada-extra/doinst.sh
new file mode 100644
index 0000000000..b1446e3188
--- /dev/null
+++ b/system/fonts-kannada-extra/doinst.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-kannada-extra/fonts-kannada-extra.SlackBuild b/system/fonts-kannada-extra/fonts-kannada-extra.SlackBuild
new file mode 100644
index 0000000000..6ba5666a22
--- /dev/null
+++ b/system/fonts-kannada-extra/fonts-kannada-extra.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+# Slackware build script for fonts-kannada-extra
+
+# Copyright 2023-2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-kannada-extra
+VERSION=${VERSION:-1.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/{TTF,OTF}
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+
+find $TMP/$PRGNAM-$VERSION/OTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+if [ "$WEBFONTS" = "YES" ]; then
+    mkdir -pv $PKG/usr/share/fonts/{WOFF,WOFF2}
+    find $TMP/$PRGNAM-$VERSION/WOFF/ -name '*.woff' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF \;
+    find $TMP/$PRGNAM-$VERSION/WOFF2/ -name '*.woff2' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF2 \;
+fi
+
+if [ "$GOOGLEFONTS" = "YES" ]; then
+  find $TMP/$PRGNAM-$VERSION/Googlefonts/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+  mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION/Googlefonts
+  cp -a $TMP/$PRGNAM-$VERSION/Googlefonts/license  $PKG/usr/doc/$PRGNAM-$VERSION/Googlefonts/
+fi
+
+mkdir -pv $PKG/etc/fonts/conf.avail
+find . -name "*.conf" -exec cp -a {} $PKG/etc/fonts/conf.avail \;
+mkdir -pv $PKG/etc/fonts/conf.d
+( cd $PKG/etc/fonts/conf.d && ln -sf ../conf.avail/* .)
+
+cp -a $TMP/$PRGNAM-$VERSION/{license,FONTS.md,README.md,URL.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-kannada-extra/fonts-kannada-extra.info b/system/fonts-kannada-extra/fonts-kannada-extra.info
new file mode 100644
index 0000000000..2c7034d7c6
--- /dev/null
+++ b/system/fonts-kannada-extra/fonts-kannada-extra.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-kannada-extra"
+VERSION="1.2"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-kannada-extra"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-kannada-extra/archive/1.2/fonts-kannada-extra-1.2.tar.gz"
+MD5SUM="8630d8ba68ef905e7e656ce8dcadfebe"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-kannada-extra/slack-desc b/system/fonts-kannada-extra/slack-desc
new file mode 100644
index 0000000000..7ed497093b
--- /dev/null
+++ b/system/fonts-kannada-extra/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                   |-----handy-ruler------------------------------------------------------|
+fonts-kannada-extra: fonts-kannada-extra (Kannada Fonts)
+fonts-kannada-extra:
+fonts-kannada-extra: Kannada is spoken in the Indian state of Karnataka by
+fonts-kannada-extra: about 44 million people. This is an extra collection of
+fonts-kannada-extra: Kannada fonts for Slackware Linux
+fonts-kannada-extra:
+fonts-kannada-extra: Homepage:https://github.com/lecramyajiv/fonts-kannada-extra
+fonts-kannada-extra:
+fonts-kannada-extra:
+fonts-kannada-extra:
+fonts-kannada-extra:
diff --git a/system/fonts-malayalam-extra/README b/system/fonts-malayalam-extra/README
new file mode 100644
index 0000000000..1d57dd6e07
--- /dev/null
+++ b/system/fonts-malayalam-extra/README
@@ -0,0 +1,24 @@
+Malayalam is an Indian language spoken in the state 
+of Kerala and also in the union Territory of Lakshadweep 
+and Puducherry and is spoken by 34 million people in India.
+This is an extra collection of malayalam fonts for 
+slackware linux distro.The Fonts are from
+
+1.Swathanthra Malayalam Computing
+2.Rachana Institute of Typogaphy
+3.New Life Computer Institute
+4.Google/EkType
+
+The Homepages and download urls are in URL.md file.
+The name of the fonts included are in FONTS.md file.
+The fonts from NLCI was generated by me
+from source through FontForge.
+
+To install woff and woff2 fonts run the slackbuild as
+WEBFONTS=YES ./fonts-malayalam-extra.SlackBuild
+
+To install google fonts run the slackbuild as
+GOOGLEFONTS=YES ./fonts-malayalam-extra.SlackBuild
+
+NOTE: If you install google fonts that comes with
+this package it will conflict with google-fonts package.
diff --git a/system/fonts-malayalam-extra/doinst.sh b/system/fonts-malayalam-extra/doinst.sh
new file mode 100644
index 0000000000..5f2bf63d11
--- /dev/null
+++ b/system/fonts-malayalam-extra/doinst.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-malayalam-extra/fonts-malayalam-extra.SlackBuild b/system/fonts-malayalam-extra/fonts-malayalam-extra.SlackBuild
new file mode 100644
index 0000000000..0ac5be1924
--- /dev/null
+++ b/system/fonts-malayalam-extra/fonts-malayalam-extra.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Slackware build script for fonts-malayalam-extra
+
+# Copyright 2023 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-malayalam-extra
+VERSION=${VERSION:-1.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/{TTF,OTF}
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+
+if [ "$WEBFONTS" = "YES" ]; then
+    mkdir -pv $PKG/usr/share/fonts/{WOFF,WOFF2}
+    find $TMP/$PRGNAM-$VERSION/WOFF/ -name '*.woff' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF \;
+    find $TMP/$PRGNAM-$VERSION/WOFF2/ -name '*.woff2' -type f -exec install -D -m0644 -v {} -t  $PKG/usr/share/fonts/WOFF2 \;
+fi
+
+if [ "$GOOGLEFONTS" = "YES" ]; then
+    find $TMP/$PRGNAM-$VERSION/Googlefonts/TTF -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+    mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION/Googlefonts
+    cp -a $TMP/$PRGNAM-$VERSION/Googlefonts/license $PKG/usr/doc/$PRGNAM-$VERSION/Googlefonts
+fi
+
+find $TMP/$PRGNAM-$VERSION/OTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+mkdir -pv $PKG/etc/fonts/conf.avail
+find . -name "*.conf" -exec cp -a {} $PKG/etc/fonts/conf.avail \;
+mkdir -pv $PKG/etc/fonts/conf.d
+( cd $PKG/etc/fonts/conf.d && ln -sf ../conf.avail/* .)
+
+
+cp -a $TMP/$PRGNAM-$VERSION/{licenses,FONTS.md,README.md,URL.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-malayalam-extra/fonts-malayalam-extra.info b/system/fonts-malayalam-extra/fonts-malayalam-extra.info
new file mode 100644
index 0000000000..d6b66d4d35
--- /dev/null
+++ b/system/fonts-malayalam-extra/fonts-malayalam-extra.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-malayalam-extra"
+VERSION="1.2"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-malayalam-extra"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-malayalam-extra/archive/1.2/fonts-malayalam-extra-1.2.tar.gz"
+MD5SUM="a6107cb0dda1a730d4d08d8d3ae4f048"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-malayalam-extra/slack-desc b/system/fonts-malayalam-extra/slack-desc
new file mode 100644
index 0000000000..cdaafe13b4
--- /dev/null
+++ b/system/fonts-malayalam-extra/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                     |-----handy-ruler------------------------------------------------------|
+fonts-malayalam-extra: fonts-malayalam-extra (Malayalam Fonts)
+fonts-malayalam-extra:
+fonts-malayalam-extra: Malayalam is one of the language spoken in India by about 34
+fonts-malayalam-extra: million people.This is an extra set of fonts that is not
+fonts-malayalam-extra: available in  Slackware.
+fonts-malayalam-extra:
+fonts-malayalam-extra:
+fonts-malayalam-extra:
+fonts-malayalam-extra: Homepage:https://github.com/lecramyajiv/fonts-malayalam-extra
+fonts-malayalam-extra:
+fonts-malayalam-extra:
diff --git a/system/fonts-nastaliq/README b/system/fonts-nastaliq/README
new file mode 100644
index 0000000000..e900f66fdf
--- /dev/null
+++ b/system/fonts-nastaliq/README
@@ -0,0 +1,25 @@
+Nastaliq  also romanized as Nastaʿlīq or Nastaleeq,
+is one of the main calligraphic hands used to write the
+Perso-Arabic script and it is used for some
+Indo-Iranian languages, predominantly Classical Persian,
+Kashmiri, Punjabi (Shahmukhi) and Urdu (Hindustani).
+It is often used also for Ottoman Turkish poetry,
+but rarely for Arabic. Nastaliq developed in Iran from
+naskh beginning in the 13th century
+and remains widely used in Iran, Afghanistan, India,
+Pakistan, and other countries for written poetry and
+as a form of art.
+
+The fonts available are
+
+1. SIL/Awami Nastaliq
+2. Googlefonts/Gulzar
+3. Aliftype/Hussaini Nastaleeq
+4. Yudit/Nastaliq
+5. Mehr Nastaliq
+
+To install woff and woff2 fonts run the slackbuild as
+WEBFONTS=YES ./fonts-nastaliq.SlackBuild
+
+Conflicts:
+This package conflicts with the google-fonts.
diff --git a/system/fonts-nastaliq/doinst.sh b/system/fonts-nastaliq/doinst.sh
new file mode 100644
index 0000000000..b1446e3188
--- /dev/null
+++ b/system/fonts-nastaliq/doinst.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-nastaliq/fonts-nastaliq.SlackBuild b/system/fonts-nastaliq/fonts-nastaliq.SlackBuild
new file mode 100644
index 0000000000..5cd92a679c
--- /dev/null
+++ b/system/fonts-nastaliq/fonts-nastaliq.SlackBuild
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+# Slackware build script for fonts-nastaliq
+
+# Copyright 2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-nastaliq
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/TTF
+
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+if [ "$WEBFONTS" = "YES" ]; then
+    mkdir -pv $PKG/usr/share/fonts/{WOFF,WOFF2}
+    find $TMP/$PRGNAM-$VERSION/WOFF/ -name '*.woff' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF \;
+    find $TMP/$PRGNAM-$VERSION/WOFF2/ -name '*.woff2' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF2 \;
+fi
+
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $TMP/$PRGNAM-$VERSION/{License,README.md,URL.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -pv $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-nastaliq/fonts-nastaliq.info b/system/fonts-nastaliq/fonts-nastaliq.info
new file mode 100644
index 0000000000..68316e0ed5
--- /dev/null
+++ b/system/fonts-nastaliq/fonts-nastaliq.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-nastaliq"
+VERSION="1.0"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-nastaliq"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-nastaliq/archive/1.0/fonts-nastaliq-1.0.tar.gz"
+MD5SUM="cd4fd2cd014d012acb8aaa273daf616d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-nastaliq/slack-desc b/system/fonts-nastaliq/slack-desc
new file mode 100644
index 0000000000..b5367b6da3
--- /dev/null
+++ b/system/fonts-nastaliq/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+fonts-nastaliq: fonts-nastaliq (Nastaliq script Fonts)
+fonts-nastaliq:
+fonts-nastaliq: Nastaliq is one of the calligraphic hands to write
+fonts-nastaliq: Perso-arabic script.It is also used to Indo-Iranian
+fonts-nastaliq: languages such as Urdu,Punjabi,Kashmiri and old Persian.
+fonts-nastaliq:
+fonts-nastaliq:
+fonts-nastaliq: Homepage:https://github.com/lecramyajiv/fonts-nastaliq
+fonts-nastaliq:
+fonts-nastaliq:
+fonts-nastaliq:
diff --git a/system/fonts-oriya-extra/README b/system/fonts-oriya-extra/README
new file mode 100644
index 0000000000..9486b5bbd0
--- /dev/null
+++ b/system/fonts-oriya-extra/README
@@ -0,0 +1,6 @@
+Oriya also called Odia is spoken in the Indian state of Odisha
+and is spoken by about 35 million people. Thus us an extra
+collection of fonts for Slackware Linux.
+
+Note:
+This package conflicts with the google-fonts package
diff --git a/system/fonts-oriya-extra/doinst.sh b/system/fonts-oriya-extra/doinst.sh
new file mode 100644
index 0000000000..b1446e3188
--- /dev/null
+++ b/system/fonts-oriya-extra/doinst.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-oriya-extra/fonts-oriya-extra.SlackBuild b/system/fonts-oriya-extra/fonts-oriya-extra.SlackBuild
new file mode 100644
index 0000000000..e2fc3bc7ee
--- /dev/null
+++ b/system/fonts-oriya-extra/fonts-oriya-extra.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+# Slackware build script for fonts-oriya-extra
+
+# Copyright 2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-oriya-extra
+VERSION=${VERSION:-1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/{TTF,OTF}
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+
+find $TMP/$PRGNAM-$VERSION/OTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+if [ "$WEBFONTS" = "YES" ]; then
+    mkdir -pv $PKG/usr/share/fonts/{WOFF,WOFF2}
+    find $TMP/$PRGNAM-$VERSION/WOFF/ -name '*.woff' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF \;
+    find $TMP/$PRGNAM-$VERSION/WOFF2/ -name '*.woff2' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF2 \;
+fi
+
+cp -a $TMP/$PRGNAM-$VERSION/{License,README.md,URL.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-oriya-extra/fonts-oriya-extra.info b/system/fonts-oriya-extra/fonts-oriya-extra.info
new file mode 100644
index 0000000000..9381328d67
--- /dev/null
+++ b/system/fonts-oriya-extra/fonts-oriya-extra.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-oriya-extra"
+VERSION="1.1"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-oriya-extra"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-oriya-extra/archive/1.1/fonts-oriya-extra-1.1.tar.gz"
+MD5SUM="687d05fab2e11cf51a401f3e0db70bba"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-oriya-extra/slack-desc b/system/fonts-oriya-extra/slack-desc
new file mode 100644
index 0000000000..5331adbc60
--- /dev/null
+++ b/system/fonts-oriya-extra/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+fonts-oriya-extra: fonts-oriya-extra (Oriya Fonts)
+fonts-oriya-extra:
+fonts-oriya-extra: Oriya also called Odia is spoken in the Indian state of Odisha
+fonts-oriya-extra: and is spoken by about 35 million people. Thus us an extra
+fonts-oriya-extra: collection of fonts for Slackware Linux.
+fonts-oriya-extra:
+fonts-oriya-extra:
+fonts-oriya-extra: Homepage:https://github.com/lecramyajiv/fonts-oriya-extra
+fonts-oriya-extra:
+fonts-oriya-extra:
+fonts-oriya-extra:
diff --git a/system/fonts-sinhala-extra/README b/system/fonts-sinhala-extra/README
new file mode 100644
index 0000000000..32036c8539
--- /dev/null
+++ b/system/fonts-sinhala-extra/README
@@ -0,0 +1,20 @@
+Sinhala also known as Sinhalese is the spoken in the
+country of Sri Lanka. It is one of the official languages
+of Sri Lanka and is spoken by about 16 million people.
+
+This package contains extra Sinhala Fonts For Slackware Linux
+
+The fonts available are
+
+1. Amma
+2. Atlas-chirani
+3. Gemunu
+4. Kaputa
+5. Maname
+
+To install woff and woff2 fonts run the slackbuild as
+WEBFONTS=YES ./fonts-sinhala-extra.SlackBuild
+
+Conflicts:
+
+This package conflicts with google-fonts
diff --git a/system/fonts-sinhala-extra/doinst.sh b/system/fonts-sinhala-extra/doinst.sh
new file mode 100644
index 0000000000..b1446e3188
--- /dev/null
+++ b/system/fonts-sinhala-extra/doinst.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-sinhala-extra/fonts-sinhala-extra.SlackBuild b/system/fonts-sinhala-extra/fonts-sinhala-extra.SlackBuild
new file mode 100644
index 0000000000..ddb0675f7d
--- /dev/null
+++ b/system/fonts-sinhala-extra/fonts-sinhala-extra.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/bash
+
+# Slackware build script for fonts-sinhala-extra
+
+# Copyright 2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-sinhala-extra
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/{TTF,OTF}
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+
+find $TMP/$PRGNAM-$VERSION/OTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+if [ "$WEBFONTS" = "YES" ]; then
+    mkdir -pv $PKG/usr/share/fonts/{WOFF,WOFF2}
+    find $TMP/$PRGNAM-$VERSION/WOFF/ -name '*.woff' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF \;
+    find $TMP/$PRGNAM-$VERSION/WOFF2/ -name '*.woff2' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF2 \;
+fi
+
+cp -a $TMP/$PRGNAM-$VERSION/{License,README.md,URL.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+rm -rvf  $PKG/usr/doc/$PRGNAM-$VERSION/License/atlas-handwriting-font/.DS_Store
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -pv $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-sinhala-extra/fonts-sinhala-extra.info b/system/fonts-sinhala-extra/fonts-sinhala-extra.info
new file mode 100644
index 0000000000..43a08f83fb
--- /dev/null
+++ b/system/fonts-sinhala-extra/fonts-sinhala-extra.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-sinhala-extra"
+VERSION="1.0"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-sinhala-extra"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-sinhala-extra/archive/1.0/fonts-sinhala-extra-1.0.tar.gz"
+MD5SUM="04956d1ffef33801684a75fb003b902b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-sinhala-extra/slack-desc b/system/fonts-sinhala-extra/slack-desc
new file mode 100644
index 0000000000..a0bd83d57f
--- /dev/null
+++ b/system/fonts-sinhala-extra/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                   |-----handy-ruler------------------------------------------------------|
+fonts-sinhala-extra: fonts-sinhala-extra (Sinhala Font)
+fonts-sinhala-extra:
+fonts-sinhala-extra: Sinhala also known as Sinhalese is the spoken in the
+fonts-sinhala-extra: country of Sri Lanka. It is one of the official languages
+fonts-sinhala-extra: of Sri Lanka and is spoken by about 16 million people.
+fonts-sinhala-extra:
+fonts-sinhala-extra:
+fonts-sinhala-extra: Homepage:https://github.com/lecramyajiv/fonts-sinhala-extra
+fonts-sinhala-extra:
+fonts-sinhala-extra:
+fonts-sinhala-extra:
diff --git a/system/fonts-tamil-bharathi/README b/system/fonts-tamil-bharathi/README
new file mode 100644
index 0000000000..49ed0da704
--- /dev/null
+++ b/system/fonts-tamil-bharathi/README
@@ -0,0 +1,32 @@
+Bharathi Pusthakaalayam in collaboration with Chalkpiece foundation
+released the Bharathi Azhagu Tamil Unicode fonts totaling 808
+fonts. This is my own personal selection of 77 fonts for
+Slackware linux. The fonts are licensed under CC-BY-SA-4.0
+
+I have classified the fonts under these catagories
+doc,reading,condensed and handwritten. By default only
+the fonts under doc directory containing 25 fonts will be
+installed.These fonts are for writing documents and looks good
+especially typeset using lualatex as compared to using
+libreoffice.
+
+The fonts in reading dir are for viewing webpages it contains
+a total of 38 fonts.To install the fonts in reading dir
+run the slackbuild as
+
+READING=YES ./fonts-tamil-bharathi.SlackBuild
+
+The fonts in condensed folder are either monospace or typewritter
+style like fonts and are very condensed containing a total of 7
+fonts. To install these fonts run the slackbuild as
+
+CONDENSED=YES ./fonts-tamil-bharathi.SlackBuild
+
+The fonts in handwritten folder are in handwritten style containing
+a total of 7 fonts. To install these fonts run the slackbuild as
+
+HANDWRITTEN=YES ./fonts-tamil-bharathi.SlackBuild
+
+If you use these fonts for viewing webpages then make
+sure the font size is  atleast 20 otherwise it would be
+too small to read.
diff --git a/system/fonts-tamil-bharathi/doinst.sh b/system/fonts-tamil-bharathi/doinst.sh
new file mode 100644
index 0000000000..bfdd460697
--- /dev/null
+++ b/system/fonts-tamil-bharathi/doinst.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-tamil-bharathi/fonts-tamil-bharathi.SlackBuild b/system/fonts-tamil-bharathi/fonts-tamil-bharathi.SlackBuild
new file mode 100644
index 0000000000..30893965d1
--- /dev/null
+++ b/system/fonts-tamil-bharathi/fonts-tamil-bharathi.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/bash
+
+# Slackware build script for fonts-tamil-bharathi
+
+# Copyright 2023 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-tamil-bharathi
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/TTF
+
+find $TMP/$PRGNAM-$VERSION/doc/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+if [ "$READING" = "YES" ]; then
+find $TMP/$PRGNAM-$VERSION/reading/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+fi
+
+if [ "$CONDENSED" = "YES" ]; then
+find $TMP/$PRGNAM-$VERSION/condensed/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+fi
+
+if [ "$HANDWRITTEN" = "YES" ]; then
+find $TMP/$PRGNAM-$VERSION/handwritten/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $TMP/$PRGNAM-$VERSION/{license,URL.md,README.md} $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-tamil-bharathi/fonts-tamil-bharathi.info b/system/fonts-tamil-bharathi/fonts-tamil-bharathi.info
new file mode 100644
index 0000000000..034428b696
--- /dev/null
+++ b/system/fonts-tamil-bharathi/fonts-tamil-bharathi.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-tamil-bharathi"
+VERSION="1.0"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-tamil-bharathi"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-tamil-bharathi/archive/1.0/fonts-tamil-bharathi-1.0.tar.gz"
+MD5SUM="3dd89ceb88e13ca7c7eb965477526691"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-tamil-bharathi/slack-desc b/system/fonts-tamil-bharathi/slack-desc
new file mode 100644
index 0000000000..c1f8890fa0
--- /dev/null
+++ b/system/fonts-tamil-bharathi/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+fonts-tamil-bharathi: fonts-tamil-bharathi (Bharathi Tamil Unicode Fonts)
+fonts-tamil-bharathi:
+fonts-tamil-bharathi: Bharathi Pusthakaalayam in collaboration with Chalkpiece foundation
+fonts-tamil-bharathi: released the Bharathi Azhagu Tamil Unicode fonts totaling 808
+fonts-tamil-bharathi: fonts. This is my own personal selection of 77 fonts for
+fonts-tamil-bharathi: Slackware linux. The fonts are licensed under CC-BY-SA-4.0
+fonts-tamil-bharathi:
+fonts-tamil-bharathi: Homepage:https://github.com/lecramyajiv/fonts-tamil-bharathi
+fonts-tamil-bharathi:
+fonts-tamil-bharathi:
+fonts-tamil-bharathi:
diff --git a/system/fonts-tamil-libre/README b/system/fonts-tamil-libre/README
new file mode 100644
index 0000000000..bc175cb271
--- /dev/null
+++ b/system/fonts-tamil-libre/README
@@ -0,0 +1,34 @@
+Tamil is one of the languages spoken in India and aslo the
+official language in Sri Lanka, Singapore.It is spoken by 
+about 78 million people.This is an extra collection of open 
+source Tamil fonts for Slackware Linux.
+
+The fonts are from 
+
+1. Rachana Institute of Typography
+2. Fonts by Ila.Sundaram
+3. Google Fonts
+4. Android
+5. New Life Computer Institute
+6. TAMu and TSCu series fonts.
+7. Akruti Font From Tamil Linux
+8. Lohit Font
+
+The Homepages and download urls are in URL.md file.
+The list of the fonts included are in FONTS.md file.
+The fonts from NLCI was generated by me from source
+through Fontmake.
+
+The fonts are from google can be installed using the
+program fnt which is available in SBo.
+
+To install woff and woff2 fonts run the slackbuild as
+WEBFONTS=YES ./fonts-tamil-libre.SlackBuild
+
+To install Google fonts run the slackbuild as
+GOOGLEFONTS=YES ./fonts-tamil-libre.SlackBuild
+
+NOTE:
+If you install google fonts that comes with
+this package it will conflict with google-fonts
+package in SBo.
diff --git a/system/fonts-tamil-libre/doinst.sh b/system/fonts-tamil-libre/doinst.sh
new file mode 100644
index 0000000000..b1446e3188
--- /dev/null
+++ b/system/fonts-tamil-libre/doinst.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-tamil-libre/fonts-tamil-libre.SlackBuild b/system/fonts-tamil-libre/fonts-tamil-libre.SlackBuild
new file mode 100644
index 0000000000..d29beb97dc
--- /dev/null
+++ b/system/fonts-tamil-libre/fonts-tamil-libre.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# Slackware build script for fonts-tamil-libre
+
+# Copyright 2023-2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-tamil-libre
+VERSION=${VERSION:-1.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/{TTF,OTF}
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+
+find $TMP/$PRGNAM-$VERSION/OTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+if [ "$WEBFONTS" = "YES" ]; then
+    mkdir -pv $PKG/usr/share/fonts/{WOFF,WOFF2}
+    find $TMP/$PRGNAM-$VERSION/WOFF/ -name '*.woff' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/WOFF \;
+    find $TMP/$PRGNAM-$VERSION/WOFF2/ -name '*.woff2' -type f -exec install -D -m0644 -v {} -t  $PKG/usr/share/fonts/WOFF2 \;
+fi
+
+if [ "$GOOGLEFONTS" = "YES" ]; then
+   find $TMP/$PRGNAM-$VERSION/Googlefonts/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+   find $TMP/$PRGNAM-$VERSION/Googlefonts/OTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+   mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION/Googlefonts
+   cp -a $TMP/$PRGNAM-$VERSION/Googlefonts/license /$PKG/usr/doc/$PRGNAM-$VERSION/Googlefonts/
+fi
+
+mkdir -pv $PKG/etc/fonts/conf.avail
+find . -name "*.conf" -exec cp -a {} $PKG/etc/fonts/conf.avail \;
+mkdir -pv $PKG/etc/fonts/conf.d
+( cd $PKG/etc/fonts/conf.d && ln -sf ../conf.avail/* .)
+
+cp -a $TMP/$PRGNAM-$VERSION/{licenses,FONTS.md,README.md,URL.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-tamil-libre/fonts-tamil-libre.info b/system/fonts-tamil-libre/fonts-tamil-libre.info
new file mode 100644
index 0000000000..0b5fb729b0
--- /dev/null
+++ b/system/fonts-tamil-libre/fonts-tamil-libre.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-tamil-libre"
+VERSION="1.4"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-tamil-libre"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-tamil-libre/archive/1.4/fonts-tamil-libre-1.4.tar.gz"
+MD5SUM="e517a0d8d35e70ed55407be48f4d1885"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-tamil-libre/slack-desc b/system/fonts-tamil-libre/slack-desc
new file mode 100644
index 0000000000..74c73cee6c
--- /dev/null
+++ b/system/fonts-tamil-libre/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+fonts-tamil-libre: fonts-tamil-libre (Tamil Fonts)
+fonts-tamil-libre:
+fonts-tamil-libre: Tamil is one of the languages spoken in India and aslo the
+fonts-tamil-libre: official language in Sri Lanka, Singapore.This is an extra
+fonts-tamil-libre: collection of open source tamil fonts for Slackware Linux.
+fonts-tamil-libre:
+fonts-tamil-libre:
+fonts-tamil-libre: Homepage:https://github.com/lecramyajiv/fonts-tamil-libre
+fonts-tamil-libre:
+fonts-tamil-libre:
+fonts-tamil-libre:
diff --git a/system/fonts-tamil-tva/README b/system/fonts-tamil-tva/README
new file mode 100644
index 0000000000..198f630886
--- /dev/null
+++ b/system/fonts-tamil-tva/README
@@ -0,0 +1,2 @@
+Tamil Virtual Academy [TVA] Published TAU series Tamil fonts
+for wider use by public.
diff --git a/system/fonts-tamil-tva/doinst.sh b/system/fonts-tamil-tva/doinst.sh
new file mode 100644
index 0000000000..bfdd460697
--- /dev/null
+++ b/system/fonts-tamil-tva/doinst.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-tamil-tva/fonts-tamil-tva.SlackBuild b/system/fonts-tamil-tva/fonts-tamil-tva.SlackBuild
new file mode 100644
index 0000000000..8ba2f6e535
--- /dev/null
+++ b/system/fonts-tamil-tva/fonts-tamil-tva.SlackBuild
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# Slackware build script for fonts-tamil-tva
+
+# Copyright 2023 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-tamil-tva
+VERSION=${VERSION:-1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/TTF
+
+find $TMP/$PRGNAM-$VERSION/tau_fonts/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $TMP/$PRGNAM-$VERSION/{licenses,FONTS.md,README.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-tamil-tva/fonts-tamil-tva.info b/system/fonts-tamil-tva/fonts-tamil-tva.info
new file mode 100644
index 0000000000..b89994a00b
--- /dev/null
+++ b/system/fonts-tamil-tva/fonts-tamil-tva.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-tamil-tva"
+VERSION="1.1"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-tamil-tva"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-tamil-tva/archive/1.1/fonts-tamil-tva-1.1.tar.gz"
+MD5SUM="07ef19e775f4f653ccdcb3eed198e0ff"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-tamil-tva/slack-desc b/system/fonts-tamil-tva/slack-desc
new file mode 100644
index 0000000000..ec64ec13da
--- /dev/null
+++ b/system/fonts-tamil-tva/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+fonts-tamil-tva: fonts-tamil-tva (TVA Tamil fonts)
+fonts-tamil-tva:
+fonts-tamil-tva: Tamil Virtual Academy [TVA] Published TAU series Tamil fonts
+fonts-tamil-tva: for wider use by public.
+fonts-tamil-tva:
+fonts-tamil-tva: Homepage:https://github.com/lecramyajiv/fonts-tamil-tva
+fonts-tamil-tva:
+fonts-tamil-tva:
+fonts-tamil-tva:
+fonts-tamil-tva:
+fonts-tamil-tva:
diff --git a/system/fonts-telugu-extra/README b/system/fonts-telugu-extra/README
new file mode 100644
index 0000000000..92d58b1801
--- /dev/null
+++ b/system/fonts-telugu-extra/README
@@ -0,0 +1,25 @@
+This is an collection of Extra Telugu Fonts for Slackware
+Linux. Telugu is spoken in the Indian State of Andhra Pradesh
+and Telangana by about 96 Milliion Peoople.
+
+The Fonts are from
+
+1. Silicon Andhra/Debian
+2. Google Fonts
+3. New Life Computer Institute
+4. SIL
+5. Virtual Vinodh
+
+The Homepages and download urls are in URL.md file.
+The list of the fonts included are in FONTS.md file.
+
+The fonts from Google can be installed using the
+program fnt which is available in SBo.
+
+To install Google fonts run the slackbuild as
+GOOGLEFONTS=YES ./fonts-telugu-extra.SlackBuild
+
+NOTE:
+If you install google fonts that comes with
+this package it will conflict with google-fonts
+package in SBo.
diff --git a/system/fonts-telugu-extra/doinst.sh b/system/fonts-telugu-extra/doinst.sh
new file mode 100644
index 0000000000..b1446e3188
--- /dev/null
+++ b/system/fonts-telugu-extra/doinst.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-telugu-extra/fonts-telugu-extra.SlackBuild b/system/fonts-telugu-extra/fonts-telugu-extra.SlackBuild
new file mode 100644
index 0000000000..e212deb9ad
--- /dev/null
+++ b/system/fonts-telugu-extra/fonts-telugu-extra.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/bash
+
+# Slackware build script for fonts-telugu-extra
+
+# Copyright 2023-2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-telugu-extra
+VERSION=${VERSION:-1.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/TTF
+mkdir -pv $PKG/usr/share/fonts/OTF
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+find $TMP/$PRGNAM-$VERSION/TTF/ -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+
+if [ "$GOOGLEFONTS" = "YES" ]; then
+    find $TMP/$PRGNAM-$VERSION/Googlefont/TTF -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+    find $TMP/$PRGNAM-$VERSION/Googlefont/OTF -name '*.otf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/OTF \;
+    mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION/Googlefont
+    cp -a $TMP/$PRGNAM-$VERSION/Googlefont/license $PKG/usr/doc/$PRGNAM-$VERSION/Googlefont
+fi
+
+cp -a $TMP/$PRGNAM-$VERSION/{license,FONTS.md,README.md,URL.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-telugu-extra/fonts-telugu-extra.info b/system/fonts-telugu-extra/fonts-telugu-extra.info
new file mode 100644
index 0000000000..cd78ce6b98
--- /dev/null
+++ b/system/fonts-telugu-extra/fonts-telugu-extra.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-telugu-extra"
+VERSION="1.3"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-telugu-extra"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-telugu-extra/archive/1.3/fonts-telugu-extra-1.3.tar.gz"
+MD5SUM="e7b2f6f58fc01f2930280c17c83f0cac"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-telugu-extra/slack-desc b/system/fonts-telugu-extra/slack-desc
new file mode 100644
index 0000000000..63bfd4194c
--- /dev/null
+++ b/system/fonts-telugu-extra/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+fonts-telugu-extra: fonts-telugu-extra (Telugu Fonts)
+fonts-telugu-extra:
+fonts-telugu-extra: This is an collection of Extra Telugu Fonts for Slackware
+fonts-telugu-extra: Linux. Telugu is spoken in the Indian State of Andhra Pradesh
+fonts-telugu-extra: and Telangana by about 96 Milliion Peoople.
+fonts-telugu-extra:
+fonts-telugu-extra:
+fonts-telugu-extra: Homepage:https://github.com/lecramyajiv/fonts-telugu-extra
+fonts-telugu-extra:
+fonts-telugu-extra:
+fonts-telugu-extra:
diff --git a/system/fonts-tibetan-extra/README b/system/fonts-tibetan-extra/README
new file mode 100644
index 0000000000..306b92ae02
--- /dev/null
+++ b/system/fonts-tibetan-extra/README
@@ -0,0 +1,9 @@
+The Tibetan script is a segmental writing system (abugida)
+of Indic origin used to write certain Tibetic languages,
+including Tibetan, Dzongkha, Sikkimese, Ladakhi, Jirel and Balti.
+It has also been used for some non-Tibetic languages in
+close cultural contact with Tibet, such as Thakali and Old Turkic.
+The printed form is called uchen script while the hand-written
+cursive form used in everyday writing is called umê script.
+
+This is an extra collection of Tibetan fonts for Slackware Linux
diff --git a/system/fonts-tibetan-extra/doinst.sh b/system/fonts-tibetan-extra/doinst.sh
new file mode 100644
index 0000000000..b1446e3188
--- /dev/null
+++ b/system/fonts-tibetan-extra/doinst.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/fonts-tibetan-extra/fonts-tibetan-extra.SlackBuild b/system/fonts-tibetan-extra/fonts-tibetan-extra.SlackBuild
new file mode 100644
index 0000000000..5cf97247fc
--- /dev/null
+++ b/system/fonts-tibetan-extra/fonts-tibetan-extra.SlackBuild
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# Slackware build script for fonts-tibetan-extra
+
+# Copyright 2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fonts-tibetan-extra
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/TTF
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+
+find $TMP/$PRGNAM-$VERSION/Tibetan/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+cp -a $TMP/$PRGNAM-$VERSION/{License,README.md,URL.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fonts-tibetan-extra/fonts-tibetan-extra.info b/system/fonts-tibetan-extra/fonts-tibetan-extra.info
new file mode 100644
index 0000000000..51b5958548
--- /dev/null
+++ b/system/fonts-tibetan-extra/fonts-tibetan-extra.info
@@ -0,0 +1,10 @@
+PRGNAM="fonts-tibetan-extra"
+VERSION="1.0"
+HOMEPAGE="https://github.com/lecramyajiv/fonts-tibetan-extra"
+DOWNLOAD="https://github.com/lecramyajiv/fonts-tibetan-extra/archive/1.0/fonts-tibetan-extra-1.0.tar.gz"
+MD5SUM="023a30d149d39637701a3d0e102e5e42"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/fonts-tibetan-extra/slack-desc b/system/fonts-tibetan-extra/slack-desc
new file mode 100644
index 0000000000..4db4a72e31
--- /dev/null
+++ b/system/fonts-tibetan-extra/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                   |-----handy-ruler------------------------------------------------------|
+fonts-tibetan-extra: fonts-tibetan-extra (Tibetan Fonts)
+fonts-tibetan-extra:
+fonts-tibetan-extra: This is an extra collecton of tibetan font for Slackware
+fonts-tibetan-extra: Linux. Tibetan is used to write tibetan,sikkimese,Dzongkha,
+fonts-tibetan-extra: ladakhi,jirel and balti.
+fonts-tibetan-extra:
+fonts-tibetan-extra:
+fonts-tibetan-extra: Homepage:https://github.com/lecramyajiv/fonts-tibetan-extra
+fonts-tibetan-extra:
+fonts-tibetan-extra:
+fonts-tibetan-extra:
diff --git a/system/foo2zjs/README b/system/foo2zjs/README
new file mode 100644
index 0000000000..9e9e789cbf
--- /dev/null
+++ b/system/foo2zjs/README
@@ -0,0 +1,108 @@
+This is the slackbuild for foo2zjs
+
+This script builds all the needed software but ICM profiles
+must be downloaded for proper function.
+
+By default this download isn't enabled. If you want it you must 
+edit the SlackBuild and set ICM_DOWNLOAD=yes at line 32
+
+
+    With foo2zjs, you can print to some HP and Minolta/QMS ZjStream
+    printers, such as these:
+
+    - Konica Minolta magicolor 2430 DL    B/W and color -
+    Minolta/QMS 2300 DL            B/W and color - Minolta/QMS 2200
+    DL            B/W and color - HP LaserJet P2035            B/W -
+    HP LaserJet M1319 MFP            B/W - HP LaserJet Pro P1606dn
+    B/W - HP LaserJet Pro P1566            B/W - HP LaserJet Pro P1102
+    B/W - HP LaserJet Pro CP1025nw        B/W and color - HP LaserJet
+    1022            B/W - HP LaserJet 1020            B/W - HP
+    LaserJet 1018            B/W - HP LaserJet 1005            B/W -
+    HP LaserJet 1000            B/W
+
+    FOO2HP ------ foo2hp converts pbm (B/W) images and N-bit-per-pixel
+    cmyk images (both produced by ghostscript) to Zenographics
+    ZJ-stream format. There is some information about the ZJS format
+    at http://ddk.zeno.com.
+
+    With foo2hp, you can print to some HP ZjStream printers, such
+    as these:
+
+    - HP Color LaserJet CP1215        B/W and color - HP Color LaserJet
+    1600        B/W and color - HP Color LaserJet 2600n        B/W
+    and color
+
+    FOO2LAVA -------- foo2lava converts Ghostscript pbmraw, bitcmyk,
+    or pksmraw  output  for- mats  to  monochrome  or color LAVAFLOW
+    or OPL streams, for driving the Konica Minolta magicolor 2530
+    DL network color laser printer, the  Kon- ica Minolta magicolor
+    2480/2480 MF AIO printer, and other Zenographics- based LAVAFLOW
+    printers.
+
+    - Konica Minolta magicolor 2530 DL    B/W and color - Konica
+    Minolta magicolor 2490 MF    B/W and color - Xerox Phaser 6115MFP
+    B/W and color - Konica Minolta magicolor 2480 MF    B/W and color -
+    Konica Minolta magicolor 1690MF    B/W and color - Konica Minolta
+    magicolor 1680MF    B/W and color - Konica Minolta magicolor
+    1600W    B/W and color
+
+    FOO2OAK ------- foo2oak converts pbm (B/W) images and
+    1-bit-per-pixel cmyk images (both produced by ghostscript) to
+    Oak Technology (now Zoran) OAKT format.
+
+    With foo2oak, you can print to the HP LaserJet 1500 and possibly
+    other OAKT protocol printers, such as these:
+
+    - HP LaserJet 1500    B/W and color, but only 1-bit per pixel -
+    Kyocera KM-2035    B/W - Kyocera KM-1635    B/W
+
+    FOO2QPDL -------- foo2qpdl converts Ghostscript pbmraw, bitcmyk,
+    or pksmraw output formats to monochrome or color QPDL streams,
+    for driving the Samsung CLP-300, CLX-2160, CLP-600, CLX-3160,
+    CLP-610 and the Xerox Phaser 6110 QPDL printers.
+
+    - Samsung CLP-300    B/W and color - Samsung CLP-315    B/W and
+    color - Samsung CLP-325    B/W and color - Samsung CLP-365    B/W
+    and color - Samsung CLP-600    B/W and color - Samsung CLP-610
+    B/W and color - Samsung CLP-2160    B/W and color - Samsung
+    CLP-3160    B/W and color - Samsung CLP-3175    B/W and color -
+    Xerox Phaser 6110    B/W and color - Xerox Phaser 6110MFP    B/W
+    and color
+
+    FOO2SLX ------- foo2slx converts Ghostscript pbmraw, bitcmyk,
+    or pksmraw output formats to monochrome or color SLX streams, for
+    driving the Lexmark C500 net- work color laser printer and other
+    SLZ-based printers.  The SLX  stream is a variant of ZjStream
+    produced by Software Imaging K.K
+
+    - Lexmark C500n        B/W and color
+
+    FOO2XQX ------- foo2xqx  converts  Ghostscript  pbmraw  to
+    monochrome XQX streams, for driving the HP LaserJet M1005 MFP
+    and other XQX-based printers
+
+    - HP LaserJet M1005 MFP - HP LaserJet M1120 MFP - HP LaserJet
+    P1005 - HP LaserJet P1006 - HP LaserJet P1007 - HP LaserJet
+    P1008 - HP LaserJet P1505/P1505n - HP LaserJet P2014/P2014n -
+    HP LaserJet Pro M1212nf MFP
+
+    FOO2HIPERC ---------- foo2hiperc converts Ghostscript pbmraw,
+    bitcmyk, or pksmraw output for- mats  to monochrome or color
+    HIPERC streams, for driving the Oki C3200, C3300n, C3400n, C5100n,
+    and the C5500n HIPERC printers.
+
+    - Oki C301dn - Oki C310dn - Oki C511dn - Oki C810dn - Oki
+    C3100n/C3200n - Oki C3300n/C3400n - Oki C3530n MFP - Oki
+    C5100n/C5150n/C5200n - Oki C5500n/C5600n/C5800n
+
+    FOO2HBPL2 --------- foo2hbpl2 converts Ghostscript pbmraw, bitcmyk,
+    or pksmraw output  for‐ mats  to  monochrome  or  color HBPL
+    version 2 streams.
+
+    - Dell 1355 Multifunction Color Printer - Dell C1765 Multifunction
+    Color Printer - Epson AcuLaser CX17NF - Epson AcuLaser M1400 -
+    Fuji Xerox DocuPrint CM205 Multifunction Color Printer - Fuji
+    Xerox DocuPrint CM215 Multifunction Color Printer - Fuji Xerox
+    DocuPrint M215 - Fuji Xerox DocuPrint P205 - Xerox WorkCentre
+    3045 Multifunction Monochrome Printer - Xerox WorkCentre 6015
+    Multifunction Color Printer
diff --git a/system/foo2zjs/foo2zjs.SlackBuild b/system/foo2zjs/foo2zjs.SlackBuild
new file mode 100644
index 0000000000..3cdcd5c602
--- /dev/null
+++ b/system/foo2zjs/foo2zjs.SlackBuild
@@ -0,0 +1,133 @@
+#!/bin/bash
+
+# Slackware build script for foo2js
+
+# Copyright 2023 juanma1980 <juanma1980@disroot.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=foo2zjs
+VERSION=${VERSION:-20200610}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ICM_DOWNLOAD="no"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+tar xvf $CWD/$PRGNAM.tar.gz
+cd $PRGNAM
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS"
+make
+if [ "$ICM_DOWNLOAD" = "yes" ]; then
+	./getweb all
+fi
+make install DESTDIR=$PKG
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Manually move man dir
+mv $PKG/usr/share/man $PKG/usr/man
+rm  $PKG/usr/man/man1/foo2zjs-icc2ps.1  #empty man file
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+# Also, include the SlackBuild script in the documentation directory
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+#cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+
+# make all symbolic links relative
+# (code from https://unix.stackexchange.com/a/100955/16829)
+for link in $(find . -lname '/*'); do
+  target=$(readlink "$link")
+  link=${link#./}
+  echo "READ $link"
+  root=$(echo $link | sed -E 's|[^/](.[^/]*)|..|g'); root=${root#/}; root=${root%..}
+  echo "AS $root"
+  echo "LN $root${target#/}"
+  rm "$link"
+  echo $PWD
+  cd $(dirname link)
+  #The install creates a hard link with wrong path
+  #Dirty fix
+  target=${target/$PWD/}
+  ln -s "$root${target#/}" "$link"
+  cd $OLDPWD
+done
+rm -rf usr/share/doc
+rm -rf usr/share/man
+
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/foo2zjs/foo2zjs.info b/system/foo2zjs/foo2zjs.info
new file mode 100644
index 0000000000..cd57f25d9d
--- /dev/null
+++ b/system/foo2zjs/foo2zjs.info
@@ -0,0 +1,10 @@
+PRGNAM="foo2zjs"
+VERSION="20200610"
+HOMEPAGE="https://foo2zjs.linkevich.net/"
+DOWNLOAD="https://foo2zjs.linkevich.net/foo2zjs/foo2zjs.tar.gz"
+MD5SUM="0da085f5e8dd871a63c5c767d3230acb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="juanma1980"
+EMAIL="juanma1980@disroot.org"
diff --git a/system/foo2zjs/slack-desc b/system/foo2zjs/slack-desc
new file mode 100644
index 0000000000..830bf5e76f
--- /dev/null
+++ b/system/foo2zjs/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+foo2zjs: foo2zjs (convert B/W to ZJ format)
+foo2zjs:
+foo2zjs: foo2zjs converts pbm (B/W) images and 1-bit-per-pixel cmyk images
+foo2zjs: both produced by ghostscript) to Zenographics ZJ-stream format.
+foo2zjs:
+foo2zjs: With foo2zjs, you can print to some:
+foo2zjs:  * HP or Minolta/QMS ZjStream printers
+foo2zjs:  * Kyocera 
+foo2zjs:  * Samsung
+foo2zjs:  * OKI
+foo2zjs:  * Other (see README for supported printers and models)
diff --git a/system/foomatic-db-engine/README b/system/foomatic-db-engine/README
index e3e0147dc0..8f9c875477 100644
--- a/system/foomatic-db-engine/README
+++ b/system/foomatic-db-engine/README
@@ -1,3 +1,3 @@
-Foomatic's database engine generates PPD files from the data in Foomatic's XML
-database.  It also contains scripts to directly configure print queues and
-handle jobs.
+Foomatic's database engine generates PPD files from the data in
+Foomatic's XML database. It also contains scripts to directly
+configure print queues and handle jobs.
diff --git a/system/foomatic-db-engine/foomatic-db-engine.SlackBuild b/system/foomatic-db-engine/foomatic-db-engine.SlackBuild
index 8ad0760cf6..91e38eafca 100644
--- a/system/foomatic-db-engine/foomatic-db-engine.SlackBuild
+++ b/system/foomatic-db-engine/foomatic-db-engine.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for foomatic-db-engine
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=foomatic-db-engine
 VERSION=${VERSION:-4.0.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -96,4 +106,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/foomatic-db/README b/system/foomatic-db/README
index 25ace0a288..da917d9aac 100644
--- a/system/foomatic-db/README
+++ b/system/foomatic-db/README
@@ -1,4 +1,4 @@
-The collected knowledge about printers, drivers, and driver options in XML
-files, used by foomatic-db-engine to generate PPD files.  It also contains
-manufacturer-supplied PPD files which got released under free software
-licenses.
+The collected knowledge about printers, drivers, and driver options in
+XML files, used by foomatic-db-engine to generate PPD files. It also
+contains manufacturer-supplied PPD files which got released under free
+software licenses.
diff --git a/system/foomatic-db/foomatic-db.SlackBuild b/system/foomatic-db/foomatic-db.SlackBuild
index 700c3896a4..97d2f4630e 100644
--- a/system/foomatic-db/foomatic-db.SlackBuild
+++ b/system/foomatic-db/foomatic-db.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for foomatic-db
 
@@ -22,14 +22,25 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix doc permissions.
+# - use relative symlink.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=foomatic-db
 VERSION=${VERSION:-20170729}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -45,21 +56,24 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 ./configure \
   --prefix=/usr
 
 make install DESTDIR=$PKG
 
+# 20220411 bkw: absolute symlinks are best avoided.
+ln -sf ../../foomatic/db/source/PPD $PKG/usr/share/cups/model/foomatic-db-ppds
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog README USAGE $PKG/usr/doc/$PRGNAM-$VERSION
+install -m0644 COPYING ChangeLog README USAGE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/foremost/README b/system/foremost/README
index 9b9d12edf6..ec370bfeea 100644
--- a/system/foremost/README
+++ b/system/foremost/README
@@ -1,5 +1,5 @@
-Foremost is a Linux program to recover files based on their headers and
-footers. Foremost can work on image files, such as those generated by dd,
-Safeback, Encase, etc, or directly on a drive. The headers and footers are
-specified by a configuration file, so you can pick and choose which
-headers you want to look for.
+Foremost is a Linux program to recover files based on their headers
+and footers. Foremost can work on image files, such as those generated
+by dd, Safeback, Encase, etc, or directly on a drive. The headers and
+footers are specified by a configuration file, so you can pick and
+choose which headers you want to look for.
diff --git a/system/foremost/foremost.SlackBuild b/system/foremost/foremost.SlackBuild
index 7f34e6338c..a22dec9eab 100644
--- a/system/foremost/foremost.SlackBuild
+++ b/system/foremost/foremost.SlackBuild
@@ -1,28 +1,38 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for foremost
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 # Edited by Barry J. Grundy <bgrundy[at]linuxleo[dot]com November 2011
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=foremost
 VERSION=${VERSION:-1.5.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -46,6 +56,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p1 < $CWD/gcc10.patch
+
 # Set the $ARCH variable for the Makefile.
 sed -i "s|-O2|$SLKCFLAGS|" Makefile
 # Set location of configuration file.
@@ -80,4 +92,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/foremost/gcc10.patch b/system/foremost/gcc10.patch
new file mode 100644
index 0000000000..8506f59cf9
--- /dev/null
+++ b/system/foremost/gcc10.patch
@@ -0,0 +1,99 @@
+diff -up foremost-1.5.7/api.c.me foremost-1.5.7/api.c
+--- foremost-1.5.7/api.c.me	2020-02-06 14:15:48.218200745 +0100
++++ foremost-1.5.7/api.c	2020-02-06 14:16:42.624853860 +0100
+@@ -20,6 +20,7 @@ int				currFATblk;
+ int				highblk = 0;
+ int				block_list[OUR_BLK_SIZE / sizeof(int)];
+ extern int		errno;
++struct DIRECTORY *dirlist, *dl;
+ 
+ /*Inititialize those globals used by extract_ole*/
+ void init_ole()
+diff -up foremost-1.5.7/extract.c.me foremost-1.5.7/extract.c
+--- foremost-1.5.7/extract.c.me	2020-02-06 14:10:30.446386101 +0100
++++ foremost-1.5.7/extract.c	2020-02-06 14:15:14.736798823 +0100
+@@ -25,6 +25,7 @@ extern char *extract_name;
+ extern int	extract;
+ extern int	FATblk;
+ extern int	highblk;
++extern struct DIRECTORY *dirlist, *dl;
+ 
+ /********************************************************************************
+  *Function: extract_zip
+diff -up foremost-1.5.7/main.h.me foremost-1.5.7/main.h
+--- foremost-1.5.7/main.h.me	2020-02-06 13:48:46.923922983 +0100
++++ foremost-1.5.7/main.h	2020-02-06 13:50:08.001849830 +0100
+@@ -292,7 +292,7 @@ char *__progname;
+ /* -----------------------------------------------------------------

+    State Variable and Global Variables

+    ----------------------------------------------------------------- */

+-char wildcard;

++extern char wildcard;

+ typedef struct f_state 

+ {

+   off_t mode;

+@@ -344,7 +344,7 @@ typedef struct s_spec
+     int written; /*used for -a mode*/

+ }s_spec;

+ 

+-s_spec search_spec[50];  /*ARRAY OF BUILTIN SEARCH TYPES*/

++extern s_spec search_spec[50];  /*ARRAY OF BUILTIN SEARCH TYPES*/

+ 

+ typedef struct f_info {

+   char *file_name;

+@@ -367,7 +367,7 @@ typedef struct f_info {
+ } f_info;

+ 

+ /* Set if the user hits ctrl-c */

+-int signal_caught;

++extern int signal_caught;

+ 

+ /* -----------------------------------------------------------------

+    Function definitions

+@@ -433,7 +433,7 @@ off_t find_file_size(FILE *f);
+ char *human_readable(off_t size, char *buffer);

+ char *units(unsigned int c);

+ unsigned int chop(char *buf);

+-void print_search_specs(f_state *s);

++extern void print_search_specs(f_state *s);

+ int memwildcardcmp(const void *s1, const void *s2,size_t n,int caseSensitive);

+ int charactersMatch(char a, char b, int caseSensitive);

+ void printx(unsigned char* buf,int start, int end);

+diff -up foremost-1.5.7/ole.h.me foremost-1.5.7/ole.h
+--- foremost-1.5.7/ole.h.me	2020-02-06 14:08:16.524783353 +0100
++++ foremost-1.5.7/ole.h	2020-02-06 14:10:02.954056080 +0100
+@@ -84,8 +84,8 @@ struct DIRECTORY
+ 	int		s2;
+ 	int		d1;
+ 	int		d2;
+-}
+-*dirlist, *dl;
++};
++
+ 
+ int				get_dir_block(unsigned char *fd, int blknum, int buffersize);
+ int				get_dir_info(unsigned char *src);
+diff -up foremost-1.5.7/state.c.me foremost-1.5.7/state.c
+--- foremost-1.5.7/state.c.me	2020-02-06 14:06:44.514684887 +0100
++++ foremost-1.5.7/state.c	2020-02-06 14:08:03.329625827 +0100
+@@ -2,6 +2,9 @@
+ 
+ #include "main.h"
+ 
++s_spec search_spec[50];
++char wildcard;
++
+ int initialize_state (f_state * s, int argc, char **argv)
+ 	{
+ 	char	**argv_copy = argv;
+diff -up foremost-1.5.7/main.c.me foremost-1.5.7/main.c
+--- foremost-1.5.7/main.c.me	2020-02-06 14:20:09.918342282 +0100
++++ foremost-1.5.7/main.c	2020-02-06 14:20:42.531733786 +0100
+@@ -15,6 +15,7 @@
+  *
+  */
+ #include "main.h"
++int signal_caught;
+ 
+ #ifdef __WIN32
+ 
diff --git a/system/forkstat/README b/system/forkstat/README
index d57c858412..44d19a686e 100644
--- a/system/forkstat/README
+++ b/system/forkstat/README
@@ -1,10 +1,6 @@
-forkstat (process fork/exec/exit monitoring tool).
+forkstat - tracer of process creation/termination in the system
 
-Forkstat  monitors   process  fork(),  exec()  and  exit()  activity.
-It is useful for monitoring system behaviour and to track down r ogue
-processes that are spawning off processes and potentially abusing the
-system.
-
-Note that forkstat uses the Linux netlink connector to gather process
-activity and this may miss events if the system is overly busy.
-Netlink connector also requires root privilege.
+Forkstat is a program that logs process fork(), exec() and exit()
+activity. It is useful for monitoring system behaviour and to track down
+rogue processes that are spawning off processes and potentially abusing
+the system.
diff --git a/system/forkstat/forkstat.SlackBuild b/system/forkstat/forkstat.SlackBuild
index d071210330..ad5ef9930c 100644
--- a/system/forkstat/forkstat.SlackBuild
+++ b/system/forkstat/forkstat.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
-#
-# Slackware build script for forkstat.
-#
-# Copyright 2015-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+#!/bin/bash
+
+# Slackware build script for forkstat
+
+# Copyright 2022 xaizek <xaizek@posteo.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=forkstat
-VERSION=${VERSION:-0.02.12}
+VERSION=${VERSION:-0.03.02}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,23 +38,26 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -60,7 +66,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,26 +75,25 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-make prefix=/usr DESTDIR=$PKG
+CFLAGS="$SLKCFLAGS" make
+make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/bin
-install -Dm755 forkstat $PKG/usr/bin/forkstat
-
-mkdir -p $PKG/usr/man/man8
-install -D -m644 forkstat.8 $PKG/usr/man/man8/forkstat.8
+mv $PKG/usr/share/man $PKG/usr/man
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp COPYING $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+cp -a \
+  COPYING README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/forkstat/forkstat.info b/system/forkstat/forkstat.info
index 86b0cb5768..263bf4f873 100644
--- a/system/forkstat/forkstat.info
+++ b/system/forkstat/forkstat.info
@@ -1,10 +1,10 @@
 PRGNAM="forkstat"
-VERSION="0.02.12"
-HOMEPAGE="https://kernel.ubuntu.com/~cking/forkstat/"
-DOWNLOAD="https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-0.02.12.tar.xz"
-MD5SUM="cc4809b66dc2276a76370e2c9c325307"
+VERSION="0.03.02"
+HOMEPAGE="https://github.com/ColinIanKing/forkstat"
+DOWNLOAD="https://github.com/ColinIanKing/forkstat/archive/V0.03.02/forkstat-0.03.02.tar.gz"
+MD5SUM="5fe2303c077b263fdb085f1fa71c6b82"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
+MAINTAINER="xaizek"
+EMAIL="xaizek@posteo.net"
diff --git a/system/forkstat/slack-desc b/system/forkstat/slack-desc
index 6bffb3ba2b..03811dfae7 100644
--- a/system/forkstat/slack-desc
+++ b/system/forkstat/slack-desc
@@ -6,12 +6,12 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-forkstat: forkstat (process fork/exec/exit monitoring tool)
-forkstat:
-forkstat: Forkstat monitors process fork(), exec() and exit() activity.
-forkstat:
-forkstat: Home page: https://kernel.ubuntu.com/~cking/forkstat/
+forkstat: forkstat (tracer of process creation/termination in the system)
 forkstat:
+forkstat: Forkstat is a program that logs process fork(), exec() and exit()
+forkstat: activity. It is useful for monitoring system behaviour and to track
+forkstat: down rogue processes that are spawning off processes and potentially
+forkstat: abusing the system.
 forkstat:
 forkstat:
 forkstat:
diff --git a/system/fountain/README b/system/fountain/README
new file mode 100644
index 0000000000..5979c94d66
--- /dev/null
+++ b/system/fountain/README
@@ -0,0 +1,5 @@
+fountain (pipe standard input to multiple processes)
+
+Fountain take a single input stream and writes (pipes) it to multiple
+commands. This is similar to tee(1), except tee writes data to files;
+fountain runs commands and pipes data to them.
diff --git a/system/fountain/fountain.SlackBuild b/system/fountain/fountain.SlackBuild
new file mode 100644
index 0000000000..159656c3e8
--- /dev/null
+++ b/system/fountain/fountain.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/bash
+
+# Slackware build script for fountain
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Notes:
+
+# I can't find an actual content-bearing homepage for this. It's a
+# very useful utility, so I packaged it up with a placeholder homepage.
+
+# The support library tracefct is just built statically and linked into
+# the executable. If ever there's a need for it, it could be broken out
+# into its own SlackBuild easily enough.
+
+# No idea why the man page is installed in section "l". I never heard
+# of this before. Wikipedia lists it as "LAPACK library functions",
+# which this most certainly isn't. So I moved it to section 1.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fountain
+VERSION=${VERSION:-1.0.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+LIBNAM=tracefct
+LIBVER=${LIBVER:-1.0.10}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+tar xvf $CWD/$LIBNAM-$LIBVER.tar.gz
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+DOCDIR=/usr/doc/$PRGNAM-$VERSION
+PKGDOC=$PKG/$DOCDIR
+
+# don't see much point making this library a separate build.
+cd $LIBNAM-$LIBVER
+LIBINST="$(pwd)/inst"
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=$LIBINST \
+  --disable-shared \
+  --enable-static
+
+make
+make install-strip
+cd -
+
+PKG_CONFIG_PATH="$LIBINST/lib/pkgconfig:$PKG_CONFIG_PATH" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG docdir=$DOCDIR
+
+# who ever heard of man section "l"? horrible idea anyway (looks too
+# much like a 1 in most fonts). the "right" way to fix this would
+# be to sed docs/Makefile.am, but this project is too old for modern
+# autotools to work with, so post hoc hackery is called for. While
+# we're at it, fix some grammar and readability issues.
+mkdir -p $PKG/usr/man/man1
+mv $PKG/usr/man/manl/$PRGNAM.l $PKG/usr/man/man1/$PRGNAM.1
+rm -rf $PKG/usr/man/manl
+sed -i -e "s,\($PRGNAM \)l,\11,g" \
+       -e 's/Command (/Commands (/' \
+       -e 's/may also/will also/' \
+       -e 's/writes it to/writes (pipes) it to/' \
+       -e 's/which will be passed the/will be passed \\fBfountain\\fR'"'s standard/" \
+       -e 's/quoted from the shell/quoted to protect them from the shell/' \
+    $PKG/usr/man/man1/$PRGNAM.1
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+
+cp -a COPYING ChangeLog NEWS README $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fountain/fountain.info b/system/fountain/fountain.info
new file mode 100644
index 0000000000..decc5e8821
--- /dev/null
+++ b/system/fountain/fountain.info
@@ -0,0 +1,12 @@
+PRGNAM="fountain"
+VERSION="1.0.3"
+HOMEPAGE="https://asc.harvard.edu/cal/Downloads/Hrma/software/src/fountain/"
+DOWNLOAD="https://asc.harvard.edu/cal/Downloads/Hrma/software/src/fountain/fountain-1.0.3.tar.gz \
+         https://asc.harvard.edu/cal/Downloads/Hrma/software/src/tracefct/tracefct-1.0.10.tar.gz"
+MD5SUM="5d30969de692fa1a480ba25c73f89ae4 \
+        d6ba9f17f28b4e1a95e4c20f775bb1e4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/fountain/slack-desc b/system/fountain/slack-desc
new file mode 100644
index 0000000000..9c69e68495
--- /dev/null
+++ b/system/fountain/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+fountain: fountain (pipe standard input to multiple processes)
+fountain:
+fountain: Fountain take a single input stream and write it to multiple output
+fountain: streams. This is similar to tee(1), except tee writes data to files;
+fountain: fountain runs commands and pipes data to them.
+fountain:
+fountain:
+fountain:
+fountain:
+fountain:
+fountain:
diff --git a/system/fpm2/README b/system/fpm2/README
index 0fdff7d605..89da3e9c7d 100644
--- a/system/fpm2/README
+++ b/system/fpm2/README
@@ -1,2 +1,4 @@
-Figaro's Password Manager 2 is a program that allows you to securely store
-passwords. It is using a GTK2 interface.
+fpm2 (Figaro's Password Manager 2)
+
+Figaro's Password Manager 2 is a program that allows you to securely
+store passwords. It uses a GTK2 interface.
diff --git a/system/fpm2/fpm2.SlackBuild b/system/fpm2/fpm2.SlackBuild
index 70c8bae51f..fd97957bb6 100644
--- a/system/fpm2/fpm2.SlackBuild
+++ b/system/fpm2/fpm2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for FPM2
 
@@ -22,28 +22,37 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220211 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fpm2
 VERSION=${VERSION:-0.79}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,9 +74,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 patch -p1 < $CWD/01-preserve_column_width.patch
 patch -p1 < $CWD/02-sighandler.patch
@@ -76,26 +85,18 @@ aclocal
 automake --add-missing
 autoreconf
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/share/icons/hicolor/48x48/apps
-cat $CWD/fpm2.png > $PKG/usr/share/icons/hicolor/48x48/apps/fpm2.png
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
+cp -a AUTHORS ChangeLog COPYING NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -104,4 +105,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fpm2/slack-desc b/system/fpm2/slack-desc
index 5663bbc9b8..13267593bc 100644
--- a/system/fpm2/slack-desc
+++ b/system/fpm2/slack-desc
@@ -9,7 +9,7 @@
 fpm2: fpm2 (Figaro's Password Manager 2)
 fpm2:
 fpm2: Figaro's Password Manager 2 is a program that allows you to securely
-fpm2: store the passwords. It is using GTK2 interface.
+fpm2: store passwords. It uses a GTK2 interface.
 fpm2:
 fpm2: Homepage: https://als.regnet.cz/fpm2/
 fpm2:
diff --git a/system/fprintd/README b/system/fprintd/README
new file mode 100644
index 0000000000..1ea6e16317
--- /dev/null
+++ b/system/fprintd/README
@@ -0,0 +1,17 @@
+fprintd is a daemon that provides fingerprint scanning functionality
+over D-Bus.
+This is the software developers will want to integrate with to add
+fingerprint authentication to OSes, desktop environments and
+applications.
+It also includes small command-line utilities if your desktop
+environment does not integrate support.
+A PAM module to implement user login (pam_fprintd) is available.
+To enable it add these lines on top of /etc/pam.d/sddm:
+
+auth    sufficient    pam_unix.so try_first_pass likeauth nullok
+auth    sufficient    pam_fprintd.so
+
+And /etc/pam.d/kde:
+
+auth    sufficient    pam_unix.so try_first_pass likeauth nullok
+auth    sufficient    pam_fprintd.so
diff --git a/system/fprintd/doinst.sh b/system/fprintd/doinst.sh
new file mode 100644
index 0000000000..4b387050ff
--- /dev/null
+++ b/system/fprintd/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/fprintd.conf.new
diff --git a/system/fprintd/fprintd.SlackBuild b/system/fprintd/fprintd.SlackBuild
new file mode 100644
index 0000000000..c880e58f18
--- /dev/null
+++ b/system/fprintd/fprintd.SlackBuild
@@ -0,0 +1,132 @@
+#!/bin/bash
+
+# Slackware build script for fprintd
+
+# Copyright 2022 Fabio Bas <ctrlaltca {at} gmail [dot] com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fprintd
+VERSION=${VERSION:-1.94.2}
+SRCVERSION=v${VERSION}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$SRCVERSION
+tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
+cd $PRGNAM-$SRCVERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Patches
+if [ -d $CWD/patches ]; then
+  for file in $CWD/patches/*.patch ; do
+    if [ -f $file ]; then
+      cat $file | patch -p1 --verbose || exit 1
+    fi
+  done
+fi
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson setup .. \
+    -Dman=true \
+    -Dgtk_doc=false \
+    -Dsystemd=false \
+    -Dlibsystemd=libelogind \
+    -Dpam=true \
+    -Dpam_modules_dir=/lib${LIBDIRSUFFIX}/security \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX}  \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc
+  ninja
+  DESTDIR=$PKG ninja install
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/man
+mv $PKG/usr/share/man/man* $PKG/usr/man
+rmdir $PKG/usr/share/man
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+mv $PKG/etc/fprintd.conf $PKG/etc/fprintd.conf.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README TODO AUTHORS COPYING NEWS \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fprintd/fprintd.info b/system/fprintd/fprintd.info
new file mode 100644
index 0000000000..571462fadf
--- /dev/null
+++ b/system/fprintd/fprintd.info
@@ -0,0 +1,10 @@
+PRGNAM="fprintd"
+VERSION="1.94.2"
+HOMEPAGE="https://fprint.freedesktop.org/"
+DOWNLOAD="https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v1.94.2/fprintd-v1.94.2.tar.gz"
+MD5SUM="341566e629c70ab428d265f4dd3e00be"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libfprint"
+MAINTAINER="Fabio Bas"
+EMAIL="ctrlaltca <at> gmail {dot} com"
diff --git a/system/fprintd/patches/01-meson-Do-not-hard-require-test-dependencies.patch b/system/fprintd/patches/01-meson-Do-not-hard-require-test-dependencies.patch
new file mode 100644
index 0000000000..32f34ffab5
--- /dev/null
+++ b/system/fprintd/patches/01-meson-Do-not-hard-require-test-dependencies.patch
@@ -0,0 +1,15 @@
+Patch-Source: https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/ff0aa64e2d9e72d8b54b28cd3615ee3cfe342fdc.diff
+
+diff --git a/meson.build b/meson.build
+index b155a4ae48ae8705ea0c18b526072e73420edb77..159f0e87b3bbdbc37d574ae043fa38ee2e4207ce 100644
+--- a/meson.build
++++ b/meson.build
+@@ -153,7 +153,7 @@ python3_available_modules = []
+ 
+ foreach module, required : python3_test_modules
+     if required and run_command(python3, '-c', 'import @0@'.format(module)).returncode() != 0
+-        error('Python3 module \'' + module + '\' required by test suite not found')
++        warning('Python3 module \'' + module + '\' required by test suite not found')
+     endif
+ endforeach
+ 
diff --git a/system/fprintd/patches/02-meson-Add-option-to-use-libelogind-for-DBus.patch b/system/fprintd/patches/02-meson-Add-option-to-use-libelogind-for-DBus.patch
new file mode 100644
index 0000000000..b6a0f73a47
--- /dev/null
+++ b/system/fprintd/patches/02-meson-Add-option-to-use-libelogind-for-DBus.patch
@@ -0,0 +1,31 @@
+Patch-Source: https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/1be0810b695a88407bca084a12063b78a719345e.diff
+
+diff --git a/meson.build b/meson.build
+index 159f0e87b3bbdbc37d574ae043fa38ee2e4207ce..93f96557a2e02adc1aa24c72c82816d1c1a2462f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -92,7 +92,7 @@ gmodule_dep = dependency('gmodule-2.0', version: '>=' + glib_min_version)
+ libfprint_dep = dependency('libfprint-2', version: '>=' + libfprint_min_version)
+ polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.91')
+ dbus_dep = dependency('dbus-1', required: false)
+-libsystemd_dep = dependency('libsystemd', required: get_option('pam'))
++libsystemd_dep = dependency(get_option('libsystemd'), required: get_option('pam'))
+ pam_dep = cc.find_library('pam',
+     required: get_option('pam'),
+     has_headers: 'security/pam_modules.h',
+diff --git a/meson_options.txt b/meson_options.txt
+index 5daa9a4800a589e582fb1953c7a9c1c321d9ef88..11aa0bef08010ad350cd611a72149e5b13edbeb5 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -10,6 +10,11 @@ option('systemd',
+     description: 'Install system service files',
+     type: 'boolean',
+     value: true)
++option('libsystemd',
++    description: 'Libsystemd provider (libsystemd or libelogind)',
++    type: 'combo',
++    choices: [ 'libsystemd', 'libelogind' ],
++    value: 'libsystemd')
+ option('systemd_system_unit_dir',
+     description: 'Directory for systemd service files',
+     type: 'string')
diff --git a/system/fprintd/patches/03-meson-Permit-build-without-pam_wrapper.patch b/system/fprintd/patches/03-meson-Permit-build-without-pam_wrapper.patch
new file mode 100644
index 0000000000..32b0f2db63
--- /dev/null
+++ b/system/fprintd/patches/03-meson-Permit-build-without-pam_wrapper.patch
@@ -0,0 +1,33 @@
+Patch-Source: https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/b04d4eb3e87da2627ac16364bc03bf6c2c452b8c.diff
+
+diff --git a/meson.build b/meson.build
+index 93f96557a2e02adc1aa24c72c82816d1c1a2462f..859bcf2c7ad63ba2d74f837d00f0ec339a340658 100644
+--- a/meson.build
++++ b/meson.build
+@@ -137,7 +137,10 @@ endif
+ polkit_policy_directory = polkit_gobject_dep.get_pkgconfig_variable('policydir')
+ 
+ # Tests dependencies
+-pam_wrapper_dep = dependency('pam_wrapper', required: get_option('pam'))
++pam_wrapper_dep = dependency('pam_wrapper', required: false)
++if get_option('pam') and not pam_wrapper_dep.found()
++    warning('Dependency "pam_wrapper" required by test suite not found')
++endif
+ 
+ xmllint = find_program('xmllint', required: false)
+ python3 = find_program('python3') # No meson without it!
+diff --git a/tests/pam/meson.build b/tests/pam/meson.build
+index dc0b07165da62524e744c4516d3d7d20a39ac1f1..bb3c1d9e6b0361035a8f4240a873907f8bfd18f9 100644
+--- a/tests/pam/meson.build
++++ b/tests/pam/meson.build
+@@ -12,7 +12,9 @@ if address_sanitizer
+     preloaded_libs += 'asan'
+ endif
+ 
+-preloaded_libs += 'pam_wrapper'
++if pam_wrapper_dep.found()
++    preloaded_libs += 'pam_wrapper'
++endif
+ 
+ foreach libname: preloaded_libs
+     lib = run_command(meson.get_compiler('c'),
diff --git a/system/fprintd/slack-desc b/system/fprintd/slack-desc
new file mode 100644
index 0000000000..2f9579bca6
--- /dev/null
+++ b/system/fprintd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+fprintd: fprintd (fingerprint scanning daemon available over D-Bus)
+fprintd:
+fprintd: fprintd is a daemon that provides fingerprint scanning functionality
+fprintd: over D-Bus. This is the software developers will want to integrate
+fprintd: with to add fingerprint authentication to OSes, desktop environments
+fprintd: and applications.
+fprintd: It also includes small command-line utilities if your desktop
+fprintd: environment does not integrate support.
+fprintd: A PAM module to implement user login (pam_fprintd) is unavailable on
+fprintd: Slackware since it requires systemd.
+fprintd: URL: https://fprint.freedesktop.org/
diff --git a/system/fr/fr.SlackBuild b/system/fr/fr.SlackBuild
index 62a7988776..f5c19168e1 100644
--- a/system/fr/fr.SlackBuild
+++ b/system/fr/fr.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fr
 
-# Copyright 2014-2018  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2022  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fr
-VERSION=${VERSION:-1.38}
+VERSION=${VERSION:-3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,7 +79,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -83,4 +93,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fr/fr.info b/system/fr/fr.info
index c7af380668..b8975ff183 100644
--- a/system/fr/fr.info
+++ b/system/fr/fr.info
@@ -1,8 +1,8 @@
 PRGNAM="fr"
-VERSION="1.38"
+VERSION="3.0"
 HOMEPAGE="https://bitbucket.org/mixmastamyk/fr"
-DOWNLOAD="https://files.pythonhosted.org/packages/25/95/bca2920497975a35c1d714c861dec449ce7bee23f84a4da2810e0aea28f5/fr-1.38.tar.gz"
-MD5SUM="fb5813735231c770d2e3fee13e3536a1"
+DOWNLOAD="https://files.pythonhosted.org/packages/a0/06/252c05b905da553547cb38ccf13826a9edb73d96201c7ce90aa23b3d9a5b/fr-3.0.tar.gz"
+MD5SUM="875b3d67ffd9d0a8f825a5f6bbcc0f3b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/franny/franny.SlackBuild b/system/franny/franny.SlackBuild
index e2520299f6..737d944c11 100644
--- a/system/franny/franny.SlackBuild
+++ b/system/franny/franny.SlackBuild
@@ -1,15 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for franny
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210825 bkw: BUILD=2, make the man page names match the scripts.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=franny
 VERSION=${VERSION:-1.1.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +24,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,11 +56,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tgz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # doubleplusungood refs unfiles.
 sed -i 's,\$(PACKAGE)\.\(mo\|pot\|1\),,g' Makefile
@@ -78,8 +84,8 @@ sed -i 's,/local,,' $PKG/usr/bin/$PRGNAM-*.sh
 # plus some of my own observations.
 mkdir -p $PKG/usr/man/man1
 gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
-ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM-extract.1.gz
-ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM-insert.1.gz
+ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM-extract.sh.1.gz
+ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM-insert.sh.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a copying $PKG/usr/doc/$PRGNAM-$VERSION
@@ -89,4 +95,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/franny/franny.info b/system/franny/franny.info
index 8e77e3f7a1..c7c5dbe045 100644
--- a/system/franny/franny.info
+++ b/system/franny/franny.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/freedup/freedup.SlackBuild b/system/freedup/freedup.SlackBuild
index 54aed91d7a..5111680c1c 100644
--- a/system/freedup/freedup.SlackBuild
+++ b/system/freedup/freedup.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for freedup.
 #
@@ -22,10 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=freedup
 VERSION=${VERSION:-1.6.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ALTVER=${ALTVER:-1.6-3}
 
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -91,4 +101,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/freefont/freefont.SlackBuild b/system/freefont/freefont.SlackBuild
index accd789cd0..3fe24d7db1 100644
--- a/system/freefont/freefont.SlackBuild
+++ b/system/freefont/freefont.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for GNU FreeFont
 
@@ -25,13 +25,23 @@
 # Originally written by Dugan Chen (dugan [underscore] c [at] fastmail [dot] fm)
 # Modified by SlackBuilds.org
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=freefont
 VERSION=${VERSION:-20120503}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -70,4 +80,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/freeipmi/doinst.sh b/system/freeipmi/doinst.sh
index fe318696f2..fa0ce22fef 100644
--- a/system/freeipmi/doinst.sh
+++ b/system/freeipmi/doinst.sh
@@ -13,10 +13,3 @@ config() {
     fi
     # Otherwise, we leave the .new copy for the admin to consider...
 }
-
-# doinst.sh reads the list of files from ./install/conffiles at install time.
-# ./install/conffiles was generated at build time/
-for cf in $(cat install/conffiles)
-do
-    config $cf.new
-done
diff --git a/system/freeipmi/freeipmi.SlackBuild b/system/freeipmi/freeipmi.SlackBuild
index eb422db3c1..6e4cfe9ea0 100644
--- a/system/freeipmi/freeipmi.SlackBuild
+++ b/system/freeipmi/freeipmi.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2019, Wayne Cuddy, wcuddyATgmailDOTcom
 # All rights reserved.
@@ -24,10 +24,21 @@
 # 2019-03-30: Initial Release
 #
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - don't try to use $PKG/install/conffiles as a list of .new
+#   config files: it doesn't work, and results in a /installpkg-blah
+#   file being left on the filesystem when the package is installed.
+# - relative symlinks in /usr/sbin.
+# - no useless INSTALL in doc dir.
+# - remove static library.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=freeipmi
 VERSION=${VERSION:-1.6.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +48,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,9 +82,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -80,21 +95,18 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cd $TMP/$PRGNAM-$VERSION
+rm -f $PKG/usr/doc/$PRGNAM-$VERSION/INSTALL
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
@@ -113,11 +125,23 @@ done
 
 rmdir etc/init.d
 
+# 20220411 bkw: absolute symlinks are annoying, make relative.
+cd usr/sbin
+ln -sf ipmiconsole ipmi-console
+ln -sf ipmidetect ipmi-detect
+ln -sf ipmiping ipmi-ping
+ln -sf ipmipower ipmi-power
+ln -sf ipmi-pef-config pef-config
+ln -sf rmcpping rmcp-ping
+cd -
+
 # Don't clobber existing config files.
+# 20220411 bkw: just append the 'config' commands directly to the doinst,
+# the old install/conffiles approach didn't actually work anyway.
 for i in $(find etc -type f)
 do
     mv $i $i.new
-    echo $i
-done 1>>$PKG/install/conffiles
+    echo "config $i.new"
+done 1>>$PKG/install/doinst.sh
 
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/freeswitch/README b/system/freeswitch/README
index 1dbb294763..d3a668a044 100644
--- a/system/freeswitch/README
+++ b/system/freeswitch/README
@@ -1,20 +1,24 @@
 FreeSWITCH is a scalable open source cross-platform telephony platform
-designed to route and interconnect popular communication protocols using
-audio, video, text or any other form of media.  It was created in 2006 to
-fill the void left by proprietary commercial solutions. FreeSWITCH also
-provides a stable telephony platform on which many telephony applications
-can be developed using a wide range of free tools.
+designed to route and interconnect popular communication protocols
+using audio, video, text or any other form of media.  It was
+created in 2006 to fill the void left by proprietary commercial
+solutions. FreeSWITCH also provides a stable telephony platform on
+which many telephony applications can be developed using a wide range
+of free tools.
 
 Unlike other SlackBuilds which have a /usr installation prefix, this
-script will install FreeSWITCH to /opt/freeswitch instatead. This is done
-to simplify the build process since FreeSWITCH attemps to install itself
-into many non-standard directories in the prefix directory. Therefore,
-it is installed as a self-contained and easily-removable location in /opt.
+script will install FreeSWITCH to /opt/freeswitch instatead. This
+is done to simplify the build process since FreeSWITCH attemps to
+install itself into many non-standard directories in the prefix
+directory. Therefore, it is installed as a self-contained and
+easily-removable location in /opt.
 
-This script also expects there to be a user and group called "freeswitch",
-with uid and gid of 269 (see http://slackbuilds.org/uid_gid.txt):
+This script also expects there to be a user and group
+called "freeswitch", with uid and gid of 269 (see
+http://slackbuilds.org/uid_gid.txt):
 # groupadd -g 269 freeswitch
-# useradd -u 269 -d /opt/freeswitch -s /bin/bash -g freeswitch freeswitch
+# useradd -u 269 -d /opt/freeswitch \
+    -s /bin/bash -g freeswitch freeswitch
 
 If you execute the script without creating this user and group, it won't
 build the FreeSWITCH package.
diff --git a/system/freeswitch/freeswitch.SlackBuild b/system/freeswitch/freeswitch.SlackBuild
index c195e86329..0409049f6a 100644
--- a/system/freeswitch/freeswitch.SlackBuild
+++ b/system/freeswitch/freeswitch.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for FreeSWITCH
 
@@ -22,26 +22,39 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - i486 => i586.
+# - use getent instead of grepping passwd and group files.
+# - get rid of useless INSTALL in doc dir.
+# - install docs in /usr/doc/$PRGNAM-$VERSION (instead of symlinking).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=freeswitch
 VERSION=${VERSION:-1.2.15}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -68,10 +81,8 @@ case "$PGSQL" in
     *) PGSQL="--without-pgsql --disable-core-pgsql-support" ;;
 esac
 
-# Bail if user or group isn't valid on your system
-if ! grep ^freeswitch: /etc/passwd 2>&1 > /dev/null; then
-
-cat << EOF
+bailout() {
+  cat << EOF
 
   You must have a freeswitch user to run this script
 
@@ -79,20 +90,11 @@ cat << EOF
   # useradd -u 269 -d /opt/freeswitch -s /bin/bash -g freeswitch freeswitch
 
 EOF
+  exit 1
+}
 
-  exit
-elif ! grep ^freeswitch: /etc/group 2>&1 > /dev/null; then
-
-cat << EOF
-
-  You must have a freeswitch group to run this script
-
-  # groupadd -g 269 freeswitch
-
-EOF
-
-  exit
-fi
+getent passwd freeswitch &>/dev/null || bailout
+getent group  freeswitch &>/dev/null || bailout
 
 set -e
 
@@ -105,9 +107,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Prepare some things
 ./rebootstrap.sh
@@ -128,6 +130,7 @@ CXXFLAGS="$SLKCFLAGS -Wno-error" \
   --libdir=/opt/freeswitch/lib${LIBDIRSUFFIX} \
   --localstatedir=/var \
   $PGSQL \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
 make -j1
@@ -157,25 +160,25 @@ install -D -m0755 -oroot -groot $CWD/rc.freeswitch $PKG/etc/rc.d/rc.freeswitch.n
 mkdir -p $PKG/etc/logrotate.d
 install -m 0644 $CWD/logrotate.freeswitch $PKG/etc/logrotate.d/freeswitch.new
 
-# Put docs into opt aswell, symlink later
-mkdir -p $PKG/opt/freeswitch/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL \
-  $PKG/opt/freeswitch/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/opt/freeswitch/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# Put docs into /usr/doc (Slackware standard location)
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING ChangeLog $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 # Change ownership for some dirs
-chown -R freeswitch:freeswitch $PKG/var/log/freeswitch $PKG/var/run/freeswitch \
+chown -R freeswitch:freeswitch \
+  $PKG/var/log/freeswitch \
+  $PKG/var/run/freeswitch \
   $PKG/opt/freeswitch
 
 # Symlink some stuff back to the system
-mkdir -p $PKG/usr/{bin,doc}
-( cd $PKG/usr/doc ; ln -s /opt/freeswitch/doc/$PRGNAM-$VERSION )
-( cd $PKG/usr/bin ; ln -s /opt/freeswitch/bin/fs_cli )
+mkdir -p $PKG/usr/bin
+ln -s ../../opt/freeswitch/bin/fs_cli $PKG/usr/bin/fs_cli
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fsarchiver/fsarchiver.SlackBuild b/system/fsarchiver/fsarchiver.SlackBuild
index 29dc97533a..83e8256904 100644
--- a/system/fsarchiver/fsarchiver.SlackBuild
+++ b/system/fsarchiver/fsarchiver.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for fsarchiver
 # Home Page: http://www.fsarchiver.org/Main_Page
@@ -25,10 +25,13 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="fsarchiver"
-VERSION=${VERSION:-0.8.0}
+VERSION=${VERSION:-0.8.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -97,4 +107,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fsarchiver/fsarchiver.info b/system/fsarchiver/fsarchiver.info
index c7abb56391..39cf97e669 100644
--- a/system/fsarchiver/fsarchiver.info
+++ b/system/fsarchiver/fsarchiver.info
@@ -1,8 +1,8 @@
 PRGNAM="fsarchiver"
-VERSION="0.8.0"
+VERSION="0.8.6"
 HOMEPAGE="http://www.fsarchiver.org/"
-DOWNLOAD="https://github.com/fdupoux/fsarchiver/releases/download/0.8.0/fsarchiver-0.8.0.tar.gz"
-MD5SUM="b66bdafc7a8fce808a8e2369819261e7"
+DOWNLOAD="https://github.com/fdupoux/fsarchiver/releases/download/0.8.6/fsarchiver-0.8.6.tar.gz"
+MD5SUM="705e2ca268249d6bed10a860379eb812"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/fslint/README b/system/fslint/README
index 4cfb1c731a..6b20915457 100644
--- a/system/fslint/README
+++ b/system/fslint/README
@@ -1,6 +1,6 @@
-FSlint is a utility to find and clean various forms of lint on a filesystem.
-I.E. unwanted or problematic cruft in your files or file names.
-For example, one form of lint it finds is duplicate files.
+FSlint is a utility to find and clean various forms of lint on a
+filesystem. I.E. unwanted or problematic cruft in your files or file
+names. For example, one form of lint it finds is duplicate files.
 It has both GUI and command line modes.
 
 To access the command line tools one can cd to, or add to $PATH the
diff --git a/system/fslint/fslint.SlackBuild b/system/fslint/fslint.SlackBuild
index 9e6044db79..ea35ce7550 100644
--- a/system/fslint/fslint.SlackBuild
+++ b/system/fslint/fslint.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fslint
 
@@ -22,13 +22,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fslint
 VERSION=${VERSION:-2.46}
 ARCH=noarch	# Python
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -73,4 +83,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fsv/README b/system/fsv/README
index 7aefe83920..4d15a50ff2 100644
--- a/system/fsv/README
+++ b/system/fsv/README
@@ -1,8 +1,9 @@
 fsv (3D file system viewer, Jurassic Park style)
 
-fsv (pronounced eff-ess-vee) is a file system visualizer in cyberspace. It
-lays out files and directories in three dimensions, geometrically
-representing the file system hierarchy to allow visual overview and
-analysis. fsv can visualize a modest home directory, a workstation's
-hard drive, or any arbitrarily large collection of files, limited only
-by the host computer's memory and graphics hardware.
+fsv (pronounced eff-ess-vee) is a file system visualizer in
+cyberspace. It lays out files and directories in three dimensions,
+geometrically representing the file system hierarchy to allow visual
+overview and analysis. fsv can visualize a modest home directory,
+a workstation's hard drive, or any arbitrarily large collection
+of files, limited only by the host computer's memory and graphics
+hardware.
diff --git a/system/fsv/fsv.SlackBuild b/system/fsv/fsv.SlackBuild
index ec5a93c0a2..9384da8e2f 100644
--- a/system/fsv/fsv.SlackBuild
+++ b/system/fsv/fsv.SlackBuild
@@ -1,17 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fsv
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 # 20170302 bkw: use long-format githhub URL
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fsv
 VERSION=${VERSION:-0.9_1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -21,7 +24,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -51,11 +58,8 @@ rm -rf $PRGNAM-$PRGNAM-$SRCVER
 tar xvf $CWD/$PRGNAM-$PRGNAM-$SRCVER.tar.gz
 cd $PRGNAM-$PRGNAM-$SRCVER
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # dirty hack: avoid segfaults on exit. This works on Linux because the
 # kernel cleans up any allocated memory at process exit, but it will
@@ -71,7 +75,9 @@ sed -i \
   -e 's/netscape -no-.* > /firefox %s > /' \
   src/dialog.c
 
-autoreconf -if
+# thanks AUR!
+sed -i 's/@DATADIRNAME@/share/' po/Makefile.in.in
+./autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -109,4 +115,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fsv/fsv.info b/system/fsv/fsv.info
index 41fa215a04..4db44e51e9 100644
--- a/system/fsv/fsv.info
+++ b/system/fsv/fsv.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gtkglarea"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/fsviewer/README b/system/fsviewer/README
index 2e7cb73421..e39c783292 100644
--- a/system/fsviewer/README
+++ b/system/fsviewer/README
@@ -6,7 +6,3 @@ of NeXTStep(TM).
 
 Although fsviewer uses windowmaker's libraries, it will run under any
 X window manager or desktop environment.
-
-This build includes an optional patch that makes a minor change to the UI
-(adds a titlebar). See README.patch.txt for details. To add a titlebar to
-the initial viewer window, set TITLEBAR=yes in the script's environment.
diff --git a/system/fsviewer/README.patch.txt b/system/fsviewer/README.patch.txt
deleted file mode 100644
index 4218fb9547..0000000000
--- a/system/fsviewer/README.patch.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Original behaviour in NextStep and OpenStep file viewer was that the first
-file view window had no close button or titlebar. This tends to bug the
-hell out of modern users, so this build includes an optional patch that
-adds a title bar (with a disabled close button) to the first viewer.
-
-This is strictly a cosmetic change... except if you run windowmaker,
-it allows normal wmaker stuff (right-click menu with minimize, Move to,
-Omnipresent, etc). Without a title bar, it's awkward or impossible to
-do normal window operations, so the patch actually adds functionality.
-
-By default, the patch isn't included in the build. To include it, set
-TITLEBAR=yes in the environment, like so:
-
-# TITLEBAR=yes ./fsviewer.SlackBuild
-
-...or if you use sbopkg, set TITLEBAR=yes as a build option.
diff --git a/system/fsviewer/close_button.diff b/system/fsviewer/close_button.diff
new file mode 100644
index 0000000000..fbbb55e584
--- /dev/null
+++ b/system/fsviewer/close_button.diff
@@ -0,0 +1,52 @@
+diff --git a/src/FSFileView.c b/src/FSFileView.c
+index 51533d5..175c0ce 100644
+--- a/src/FSFileView.c
++++ b/src/FSFileView.c
+@@ -41,6 +41,8 @@
+ #define DEFAULT_COLUMN_WIDTH 150
+ #define COLUMN_PADDING 4 // only used for increment calc here, needs to go
+ 
++Atom delete_atom;
++
+ static void notificationObserver(void* self, WMNotification* notif);
+ static void FSAddFileViewShelfItem(FSFileView* fView, FileInfo* fileInfo);
+ static void handleShelfButtonActions(WMWidget* self, void* data);
+@@ -437,12 +439,14 @@ FSCreateFileView(FSViewer* fsViewer, char* path, Bool primary)
+ 
+     if ((fView->primary)) {
+         memset((void*)&attributes, 0, sizeof(MyGNUstepWMAttributes));
+-        attributes.window_style = (WMTitledWindowMask | WMMiniaturizableWindowMask | WMResizableWindowMask);
++        attributes.window_style = (WMTitledWindowMask | WMClosableWindowMask | WMMiniaturizableWindowMask | WMResizableWindowMask);
+         attributes.window_level = WMNormalWindowLevel;
+         attributes.extra_flags = GSFullKeyboardEventsFlag;
+         attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
+         MyWMSetWindowAttributes(fView->dpy, WMWidgetXID(fView->fileView),
+             &attributes);
++		  delete_atom = XInternAtom(fView->dpy, "WM_DELETE_WINDOW", 0);
++		  XSetWMProtocols(fView->dpy, WMWidgetXID(fView->fileView), &delete_atom, 1);
+     }
+ 
+     // WMAppAddWindow(FSGetFSViewerWMContext(fsViewer),
+diff --git a/src/FSViewer.c b/src/FSViewer.c
+index 9baebfa..d365a83 100644
+--- a/src/FSViewer.c
++++ b/src/FSViewer.c
+@@ -23,6 +23,8 @@
+ 
+ #define DEBUG 0
+ 
++extern Atom delete_atom;
++
+ /* Application defaults */
+ WMUserDefaults* defaultsDB;
+ WMPropList* filesDB;
+@@ -502,7 +504,8 @@ int main(int argc, char** argv)
+             focusIn = False;
+             break;
+         case ClientMessage:
+-            // printf("arrgggg!\n");
++				if(event.xclient.data.l[0] == delete_atom)
++					exit(0);
+             break;
+         }
+     }
diff --git a/system/fsviewer/fsviewer.SlackBuild b/system/fsviewer/fsviewer.SlackBuild
index 0f245f4335..d713c6e59f 100644
--- a/system/fsviewer/fsviewer.SlackBuild
+++ b/system/fsviewer/fsviewer.SlackBuild
@@ -1,15 +1,26 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fsviewer
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20240122 bkw: switch to roblillack's fork, v0.2.6+20220428_38b38a6.
+# Get rid of old patches (no longer needed), and add a new patch to
+# give the window a working close button.
+# 20230708 bkw: BUILD=3, install to the same Applications dir as
+# windowmaker's WPrefs.app (and no creating /usr/GNUstep, which was
+# never a good idea).
+# 20210825 bkw: fix build on -current, BUILD=2.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fsviewer
-VERSION=${VERSION:-0.2.6}
+VERSION=${VERSION:-0.2.6+20220428_38b38a6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +30,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -43,49 +58,46 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-app-$VERSION
-tar xvf $CWD/$PRGNAM-app-$VERSION.tar.bz2
-cd $PRGNAM-app-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# The WINGs API has changed slightly in the newer versions of WindowMaker
-patch -p1 < $CWD/wingsfix.diff
-
-# See README.patch.txt for info
-if [ "${TITLEBAR:-no}" = "yes" ]; then
-  patch -p1 < $CWD/titlebar.diff
-fi
-
-LIBS="-lWUtil -lX11 -lm -lXpm" \
-CFLAGS="$SLKCFLAGS -std=gnu89" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-# fix broken gobbledegook emitted by autoconf. Life is too short
-# to spend time fixing it 'correctly'.
-GCCMAJVER=$( gcc --version | head -1 | cut -d' ' -f3 | cut -d. -f1 )
-[ "$GCCMAJVER" -ge 5 ] && sed -i 's,-MT *\$@,-M,' */Makefile */*/Makefile
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/bin
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# 20240123 bkw: add a close button to the top-level window.
+patch -p1 < $CWD/close_button.diff
+
+# 20240122 bkw: install to /usr/lib(64), then mv the bin dir.
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr/lib$LIBDIRSUFFIX \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
+mv $PKG/usr/lib*/bin $PKG/usr/bin
+
+# 20240123 bkw: symlink to the binary, same as the package name.
+ln -s FSViewer $PKG/usr/bin/$PRGNAM
+
+# 20240123 bkw: cmake doesn't build this, it was in the old package,
+# fortunately it's easy enough to include in the new one. I have no
+# idea what it's good for...
+sed -i '/config\.h/d' defs/chdef.c
+make -C defs chdef LDFLAGS="-lWINGs -lWUtil"
 install -s -m0755 defs/chdef $PKG/usr/bin
-ln -s ../GNUstep/Apps/FSViewer.app/FSViewer $PKG/usr/bin/$PRGNAM
 
-gzip -9 $PKG/usr/man/man1/*
+mkdir -p $PKG/usr/man/man1
+for i in man/*.1x; do
+  gzip -9 < $i > $PKG/usr/man/man1/$( basename $i ).gz
+done
 
 # .desktop file comes from the Polish Linux Distro, and has been modified
 # to add the icon and to pass desktop-file-validate.
@@ -95,17 +107,17 @@ cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 # I like the look of FSViewer2.xpm better. You could use FSViewer.xpm if
 # you prefer.
 mkdir -p $PKG/usr/share/pixmaps
-ln -s ../../GNUstep/Apps/FSViewer.app/xpm/FSViewer2.xpm \
+ln -s ../../lib$LIBDIRSUFFIX/GNUstep/Apps/FSViewer.app/xpm/FSViewer2.xpm \
   $PKG/usr/share/pixmaps/$PRGNAM.xpm
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog NEWS README docs/* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING ChangeLog NEWS README* docs/* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fsviewer/fsviewer.desktop b/system/fsviewer/fsviewer.desktop
index ac9abf2cd4..2455afa9e8 100644
--- a/system/fsviewer/fsviewer.desktop
+++ b/system/fsviewer/fsviewer.desktop
@@ -3,7 +3,7 @@ Name=FSViewer
 Comment=File Viewer
 Comment[pl]=Przeglądarka plików
 Exec=/usr/bin/fsviewer
-Icon=fsviewer
+Icon=/usr/share/pixmaps/fsviewer.xpm
 Terminal=false
 Type=Application
 Categories=FileManager;System;FileTools;
diff --git a/system/fsviewer/fsviewer.info b/system/fsviewer/fsviewer.info
index 85c54c0d81..a7f9f9f0f0 100644
--- a/system/fsviewer/fsviewer.info
+++ b/system/fsviewer/fsviewer.info
@@ -1,10 +1,10 @@
 PRGNAM="fsviewer"
-VERSION="0.2.6"
-HOMEPAGE="http://web.archive.org/web/20120104193413/http://www.bayernline.de/~gscholz/linux/fsviewer/"
-DOWNLOAD="http://distfiles.gentoo.org/distfiles/fsviewer-app-0.2.6.tar.bz2"
-MD5SUM="cf55ccb04b635250a647aafee69e2026"
+VERSION="0.2.6+20220428_38b38a6"
+HOMEPAGE="https://github.com/roblillack/fsviewer"
+DOWNLOAD="https://slackware.uk/~urchlay/src/fsviewer-0.2.6+20220428_38b38a6.tar.xz"
+MD5SUM="2caf53ff2567d21ef0578b5370d909f3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/fsviewer/git2tarxz.sh b/system/fsviewer/git2tarxz.sh
new file mode 100644
index 0000000000..0e923a1264
--- /dev/null
+++ b/system/fsviewer/git2tarxz.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create
+# a tarball of. With no arg, HEAD is used.
+
+PRGNAM=fsviewer
+CLONE_URL=https://github.com/roblillack/fsviewer
+
+# Last release, that roblillack's fork was based on.
+RELVER=0.2.6
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=$RELVER+${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/system/fsviewer/titlebar.diff b/system/fsviewer/titlebar.diff
deleted file mode 100644
index 9659b08071..0000000000
--- a/system/fsviewer/titlebar.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur fsviewer-app-0.2.6/src/FSFileView.c fsviewer-app-0.2.6.patched/src/FSFileView.c
---- fsviewer-app-0.2.6/src/FSFileView.c	2007-10-14 15:06:02.000000000 -0400
-+++ fsviewer-app-0.2.6.patched/src/FSFileView.c	2013-01-21 23:55:02.000000000 -0500
-@@ -430,7 +430,7 @@
- 				   WMResizableWindowMask);
- 	attributes.window_level = WMNormalWindowLevel;
- 	attributes.extra_flags = GSFullKeyboardEventsFlag;
--	attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr |
-+	attributes.flags = (/* GSWindowStyleAttr | */ GSWindowLevelAttr |
- 			    GSExtraFlagsAttr);
- 	WMSetWindowAttributes(fView->dpy, WMWidgetXID(fView->fileView),
- 			      &attributes);
diff --git a/system/fsviewer/wingsfix.diff b/system/fsviewer/wingsfix.diff
deleted file mode 100644
index 7648ad5d21..0000000000
--- a/system/fsviewer/wingsfix.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur fsviewer-app-0.2.6/defs/chdef.c fsviewer-app-0.2.6.patched/defs/chdef.c
---- fsviewer-app-0.2.6/defs/chdef.c	2007-10-14 12:18:25.000000000 -0400
-+++ fsviewer-app-0.2.6.patched/defs/chdef.c	2013-01-21 20:12:00.000000000 -0500
-@@ -374,7 +374,7 @@
- 	SetIntegerForKey(0, "DisplayMCListPixmap");
- 	
- 	WMWritePropListToFile(filesDB,
--                wdefaultspathfordomain("FSViewer"), True);
-+                wdefaultspathfordomain("FSViewer"));
- 	result = 0;
-     }	    
-     else
-diff -Naur fsviewer-app-0.2.6/src/extnInspector.c fsviewer-app-0.2.6.patched/src/extnInspector.c
---- fsviewer-app-0.2.6/src/extnInspector.c	2006-07-23 03:24:15.000000000 -0400
-+++ fsviewer-app-0.2.6.patched/src/extnInspector.c	2013-01-21 20:09:39.000000000 -0500
-@@ -229,7 +229,7 @@
- 
-     if(numRows > 0)
- 	WMWritePropListToFile(filesDB,
--	  wdefaultspathfordomain("FSViewer"), True);
-+	  wdefaultspathfordomain("FSViewer"));
- 
-    if(extn)
- 	free(extn);
diff --git a/system/fsvs/fsvs.SlackBuild b/system/fsvs/fsvs.SlackBuild
index 5229a61500..f0a0abba1f 100644
--- a/system/fsvs/fsvs.SlackBuild
+++ b/system/fsvs/fsvs.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fsvs
 
 # Written by Joey Trungale <joey@trungale.net>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fsvs
 VERSION=${VERSION:-1.2.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -89,4 +99,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fswatch/README b/system/fswatch/README
index 9a2dc20522..b240cf9d58 100644
--- a/system/fswatch/README
+++ b/system/fswatch/README
@@ -1,13 +1,14 @@
-fswatch is a cross-platform file change monitor that receives notifications
-when the contents of the specified files or directories are modified.
+fswatch is a cross-platform file change monitor that receives
+notifications when the contents of the specified files or directories
+are modified.
 
-The fswatch.SlackBuild automatically builds the linux variant of fswatch.
+The fswatch.SlackBuild automatically builds the linux variant of
+fswatch.
 
-If you would like to compile fswatch for another OS, please check the README
-files that will be saved to /usr/doc/fswatch-${VERSION}/
+If you would like to compile fswatch for another OS, please check the
+README files that will be saved to /usr/doc/fswatch-${VERSION}/
 
-The default compiler is clang++ however, if you prefer, fswatch can also be
-compiled with g++:
+The default compiler is clang++; however, if you prefer, fswatch can
+also be compiled with g++:
 
    CXX="g++" ./fswatch.SlackBuild
-
diff --git a/system/fswatch/fswatch.SlackBuild b/system/fswatch/fswatch.SlackBuild
index fd7fd42a70..0cf56957b2 100644
--- a/system/fswatch/fswatch.SlackBuild
+++ b/system/fswatch/fswatch.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fswatch
 
@@ -22,10 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fswatch
-VERSION=${VERSION:-1.11.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.16.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -104,8 +114,10 @@ cp -a ABOUT-NLS AUTHORS AUTHORS.libfswatch CONTRIBUTING.md COPYING \
      $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fswatch/fswatch.info b/system/fswatch/fswatch.info
index 758f173a69..b282a0eb19 100644
--- a/system/fswatch/fswatch.info
+++ b/system/fswatch/fswatch.info
@@ -1,8 +1,8 @@
 PRGNAM="fswatch"
-VERSION="1.11.2"
+VERSION="1.16.0"
 HOMEPAGE="https://github.com/emcrisostomo/fswatch"
-DOWNLOAD="https://github.com/emcrisostomo/fswatch/releases/download/1.11.2/fswatch-1.11.2.tar.gz"
-MD5SUM="aacebb97d5415dc31bd113d4b330cac0"
+DOWNLOAD="https://github.com/emcrisostomo/fswatch/releases/download/1.16.0/fswatch-1.16.0.tar.gz"
+MD5SUM="c528adeded47c2bd978044245737b6cc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ft2demos/ft2demos.SlackBuild b/system/ft2demos/ft2demos.SlackBuild
index 6f4c2805c9..c1e1f09c62 100644
--- a/system/ft2demos/ft2demos.SlackBuild
+++ b/system/ft2demos/ft2demos.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ft2demos
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
@@ -16,10 +16,15 @@
 
 # Note to self: keep VERSION in sync with Pat's patches/freetype.
 
+# 20211208 bkw: updated for v2.11.1.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ft2demos
-VERSION=${VERSION:-2.6.3}
+VERSION=${VERSION:-2.11.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 LIBNAM=freetype
 
@@ -31,7 +36,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,20 +68,19 @@ rm -rf $PRGNAM-build
 mkdir -p $PRGNAM-build
 cd $PRGNAM-build
 tar xvf $CWD/$LIBNAM-$VERSION.tar.xz
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Build process wants this symlink.
-ln -s $LIBNAM-$VERSION ${LIBNAM}2
+ln -s $LIBNAM-$VERSION ${LIBNAM}
 
 ### First, build FreeType, since ft2demos needs the whole source tree.
 cd $LIBNAM-$VERSION
 
 # Apply Pat's patches
-zcat $CWD/freetype.illadvisederror.diff.gz | patch -p1
-zcat $CWD/freetype.CVE-2017-8287.diff.gz | patch -p1
+zcat $CWD/freetype.subpixel.rendering.diff.gz | patch -p1
 
 # Enable the validators needed by the ftvalid command. Part 1 of a
 # DIRTY_HACK to make ftvalid work.
@@ -139,7 +147,7 @@ strip $PKG/usr/bin/*
 # For whatever reason, the Arch and Debian packages don't install the
 # man pages.
 mkdir -p $PKG/usr/man/man1
-for i in src/*.1; do
+for i in man/*.1; do
   gzip -9c < $i > $PKG/usr/man/man1/$( basename $i).gz
 done
 
@@ -155,4 +163,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ft2demos/ft2demos.info b/system/ft2demos/ft2demos.info
index 50c3bc2ea5..bee32cef83 100644
--- a/system/ft2demos/ft2demos.info
+++ b/system/ft2demos/ft2demos.info
@@ -1,16 +1,14 @@
 PRGNAM="ft2demos"
-VERSION="2.6.3"
+VERSION="2.11.1"
 HOMEPAGE="http://www.freetype.org"
-DOWNLOAD="https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-2.6.3.tar.bz2 \
-          https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/freetype-2.6.3.tar.xz \
-          https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/freetype.CVE-2017-8287.diff.gz \
-          https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/freetype.illadvisederror.diff.gz"
-MD5SUM="f7c6102f29834a80456264fe4edd81d1 \
-        c806890db47d8ad8887253a926377e33 \
-        eea2e24cf46314d716d0668f5fdbbf08 \
-        419295091bb684f531c3ba9614fea3a0"
+DOWNLOAD="https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-2.11.1.tar.xz \
+          https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.11.1.tar.xz \
+          https://slackware.uk/~urchlay/src/freetype.subpixel.rendering.diff.gz"
+MD5SUM="9efff227779626d46c3d7334712c15a3 \
+        24e79233d607ded439ef36ff1f3ab68f \
+        2e307a3cab2ef1fc52580e817d857cd2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/fuse-archive/README b/system/fuse-archive/README
new file mode 100644
index 0000000000..66050306b7
--- /dev/null
+++ b/system/fuse-archive/README
@@ -0,0 +1,11 @@
+fuse-archive (FUSE file system for archives and compressed files)
+
+fuse-archive is a program that serves an archive or compressed file
+(e.g. foo.tar, foo.tar.gz, foo.xz or foo.zip) as a read-only FUSE file
+system.
+
+It is similar to mount-zip and fuse-zip but speaks a larger range of
+of archive or compressed file formats.
+
+It is similar to archivemount but can be much faster, although it can
+only mount read-only, not read-write.
diff --git a/system/fuse-archive/fuse-archive.SlackBuild b/system/fuse-archive/fuse-archive.SlackBuild
new file mode 100644
index 0000000000..0a00eee124
--- /dev/null
+++ b/system/fuse-archive/fuse-archive.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# Slackware build script for fuse-archive
+
+# Copyright 2022 Charadon
+# Copyright 2023 B. Watson
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# 20230828 bkw: BUILD=2
+# - take over maintenance.
+# - add a few missing docs to the doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fuse-archive
+VERSION=${VERSION:-0.1.14}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+    *) ARCH=$( uname -m ) ;;
+esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}"  ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+CXXFLAGS="$SLKCFLAGS" make
+install -s -Dm755 out/fuse-archive $PKG/usr/bin/fuse-archive
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README* AUTHORS* LICENSE* CONTR* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fuse-archive/fuse-archive.info b/system/fuse-archive/fuse-archive.info
new file mode 100644
index 0000000000..3aa3c197ea
--- /dev/null
+++ b/system/fuse-archive/fuse-archive.info
@@ -0,0 +1,10 @@
+PRGNAM="fuse-archive"
+VERSION="0.1.14"
+HOMEPAGE="https://github.com/google/fuse-archive"
+DOWNLOAD="https://github.com/google/fuse-archive/archive/v0.1.14/fuse-archive-0.1.14.tar.gz"
+MD5SUM="41f7581e71d2a14dded0618ba5b9b6c2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/fuse-archive/slack-desc b/system/fuse-archive/slack-desc
new file mode 100644
index 0000000000..7fb93a309d
--- /dev/null
+++ b/system/fuse-archive/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+fuse-archive: fuse-archive (FUSE file system for archives and compressed files)
+fuse-archive:
+fuse-archive: fuse-archive is a program that serves an archive or compressed file
+fuse-archive: (e.g. foo.tar, foo.tar.gz, foo.xz or foo.zip) as a read-only FUSE
+fuse-archive: file system.
+fuse-archive:
+fuse-archive: It is similar to mount-zip and fuse-zip but speaks a larger range of 
+fuse-archive: of archive or compressed file formats.
+fuse-archive:
+fuse-archive: It is similar to archivemount but can be much faster, although it can
+fuse-archive: only mount read-only, not read-write.
diff --git a/system/fuse-emulator-utils/fuse-emulator-utils.SlackBuild b/system/fuse-emulator-utils/fuse-emulator-utils.SlackBuild
index ccdaec36ad..cc36bd036b 100644
--- a/system/fuse-emulator-utils/fuse-emulator-utils.SlackBuild
+++ b/system/fuse-emulator-utils/fuse-emulator-utils.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fuse-emulator-utils
 
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fuse-emulator-utils
 SRCNAM=fuse-utils
 VERSION=${VERSION:-1.4.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -98,4 +108,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fuse-exfat/README b/system/fuse-exfat/README
index ee6f36eb2d..3cd8c00bd6 100644
--- a/system/fuse-exfat/README
+++ b/system/fuse-exfat/README
@@ -1,5 +1,5 @@
-This project aims to provide a full-featured exFAT file system implementation
-for GNU/Linux and other Unix-like systems as a FUSE module and a set of
-utilities.
+This project aims to provide a full-featured exFAT file system
+implementation for GNU/Linux and other Unix-like systems as a FUSE
+module and a set of utilities.
 
 This package contains the FUSE module.
diff --git a/system/fuse-exfat/doinst.sh b/system/fuse-exfat/doinst.sh
deleted file mode 100644
index 490d3515a9..0000000000
--- a/system/fuse-exfat/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# `mount -t extfs` looks in /sbin
-( cd sbin ; rm -rf mount.exfat )
-( cd sbin ; ln -sf /usr/sbin/mount.exfat mount.exfat )
diff --git a/system/fuse-exfat/fuse-exfat.SlackBuild b/system/fuse-exfat/fuse-exfat.SlackBuild
index cd6c49e797..515601a234 100644
--- a/system/fuse-exfat/fuse-exfat.SlackBuild
+++ b/system/fuse-exfat/fuse-exfat.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fuse-exfat
 
@@ -23,26 +23,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - remove doinst.sh, let makepkg generate a correct one.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fuse-exfat
 VERSION=${VERSION:-1.3.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -66,9 +76,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -82,13 +92,15 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# 20220412 bkw: replaced the doinst.sh with this. why? because the
+# doinst.sh can't create the sbin directory, and "installpkg -root
+# /blah" gave us a /mount.exfat symlink (if /blah/sbin didn't already
+# exist).
+mkdir -p $PKG/sbin
+ln -s ../usr/sbin/mount.exfat $PKG/sbin/mount.exfat
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
@@ -96,7 +108,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fuse-overlayfs/README b/system/fuse-overlayfs/README
index a9c9a2dc38..313d0993fb 100644
--- a/system/fuse-overlayfs/README
+++ b/system/fuse-overlayfs/README
@@ -8,12 +8,8 @@ upperdir and a workingdir.
 
 # Usage:
 
-```shell
 $ fuse-overlayfs -o lowerdir=lowerdir/a:lowerdir/b,upperdir=up,workdir=workdir merged
-```
 
 Specify a different UID/GID mapping:
 
-```shell
 $ fuse-overlayfs -o uidmapping=0:10:100:100:10000:2000,gidmapping=0:10:100:100:10000:2000,lowerdir=lowerdir/a:lowerdir/b,upperdir=up,workdir=workdir merged
-```
diff --git a/system/fuse-overlayfs/fuse-overlayfs.SlackBuild b/system/fuse-overlayfs/fuse-overlayfs.SlackBuild
index b87ed95f94..9a1a28d3ae 100644
--- a/system/fuse-overlayfs/fuse-overlayfs.SlackBuild
+++ b/system/fuse-overlayfs/fuse-overlayfs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fuse-overlayfs
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fuse-overlayfs
 VERSION=${VERSION:-0.6.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -101,4 +111,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fuse-overlayfs/fuse-overlayfs.info b/system/fuse-overlayfs/fuse-overlayfs.info
index 025aa493f2..f1781787b0 100644
--- a/system/fuse-overlayfs/fuse-overlayfs.info
+++ b/system/fuse-overlayfs/fuse-overlayfs.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/containers/fuse-overlayfs/archive/v0.6.5/fuse-overl
 MD5SUM="11b6906ae03fd83d32d20d7151e00470"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="fuse3"
+REQUIRES=""
 MAINTAINER="Vincent Batts"
 EMAIL="vbatts@hashbangbash.com"
diff --git a/system/fuse-zip/README b/system/fuse-zip/README
new file mode 100644
index 0000000000..da10eb06ee
--- /dev/null
+++ b/system/fuse-zip/README
@@ -0,0 +1 @@
+fuse-zip is a FUSE filesystem to mount ZIP archives with write support.
diff --git a/system/fuse-zip/fuse-zip.SlackBuild b/system/fuse-zip/fuse-zip.SlackBuild
new file mode 100644
index 0000000000..41525ffa0a
--- /dev/null
+++ b/system/fuse-zip/fuse-zip.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# Slackware build script for fuse-zip
+
+# Copyright 2022 xaizek <xaizek@posteo.net>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - get rid of /usr/share/doc.
+# - simplify build commands.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fuse-zip
+VERSION=${VERSION:-0.7.2}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+make prefix=/usr \
+     mandir=/usr/man \
+     docdir=/usr/doc/$PRGNAM-$VERSION \
+     CXXFLAGS="$SLKCFLAGS" \
+     DESTDIR=$PKG \
+     install-strip
+
+cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fuse-zip/fuse-zip.info b/system/fuse-zip/fuse-zip.info
new file mode 100644
index 0000000000..5b9df9020a
--- /dev/null
+++ b/system/fuse-zip/fuse-zip.info
@@ -0,0 +1,10 @@
+PRGNAM="fuse-zip"
+VERSION="0.7.2"
+HOMEPAGE="https://bitbucket.org/agalanin/fuse-zip"
+DOWNLOAD="https://bitbucket.org/agalanin/fuse-zip/downloads/fuse-zip-0.7.2.tar.gz"
+MD5SUM="14653007995ade06e5b96dfcbd08bf93"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="xaizek"
+EMAIL="xaizek@posteo.net"
diff --git a/system/fuse-zip/slack-desc b/system/fuse-zip/slack-desc
new file mode 100644
index 0000000000..6d125b1ab1
--- /dev/null
+++ b/system/fuse-zip/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+fuse-zip: fuse-zip (FUSE filesystem)
+fuse-zip:
+fuse-zip: FUSE filesystem to mount ZIP archives with write support
+fuse-zip:
+fuse-zip:
+fuse-zip:
+fuse-zip:
+fuse-zip:
+fuse-zip:
+fuse-zip:
+fuse-zip:
diff --git a/system/fuse3/README b/system/fuse3/README
deleted file mode 100644
index fedc4c62b9..0000000000
--- a/system/fuse3/README
+++ /dev/null
@@ -1,15 +0,0 @@
-fuse3 - Filesystem in Userspace, version 3
-
-FUSE (Filesystem in Userspace) is an interface for userspace programs to
-export a filesystem to the Linux kernel. The FUSE project consists of two
-components: the fuse kernel module (maintained in the regular kernel
-repositories) and the libfuse userspace library (maintained in this
-repository). libfuse provides the reference implementation for communicating
-with the FUSE kernel module.
-
-This ought not collide with the "fuse" package in stock slackware install.
-
-The package can optionally install extensive developer documentation. If this
-is needed, run the SlackBuild like this:
-
-FUSE3_DEVDOCS=yes ./fuse3.SlackBuild
diff --git a/system/fuse3/fuse3.SlackBuild b/system/fuse3/fuse3.SlackBuild
deleted file mode 100644
index da4fbda772..0000000000
--- a/system/fuse3/fuse3.SlackBuild
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for fuse3
-
-# Copyright 2019 Vincent Batts, Raleigh, NC, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=fuse3
-VERSION=${VERSION:-3.10.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-BASENAME=fuse
-SUFFIX=3
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-FUSE3_DEVDOCS=${FUSE3_DEVDOCS:-no}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $BASENAME-$VERSION
-tar xvf $CWD/$BASENAME-$VERSION.tar.xz
-cd $BASENAME-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-meson build \
-	-Dexamples=false \
-	-Dudevrulesdir="/etc/udev/rules.d" \
-	--prefix="/usr" \
-	--mandir="/usr/man"
-ninja -C build
-DESTDIR=$PKG ninja -C build install
-rm -rf $PKG/dev $PKG/etc/udev
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-if [ "$FUSE3_DEVDOCS" = "yes" ]; then
-  cp -a doc/ example/ $PKG/usr/doc/$PRGNAM-$VERSION
-fi
-
-cp -a \
-  README.md LICENSE LGPL2.txt GPL2.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/fuse3/fuse3.info b/system/fuse3/fuse3.info
deleted file mode 100644
index 25599ccf6a..0000000000
--- a/system/fuse3/fuse3.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fuse3"
-VERSION="3.10.1"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-DOWNLOAD="https://github.com/libfuse/libfuse/releases/download/fuse-3.10.1/fuse-3.10.1.tar.xz"
-MD5SUM="e973012119e98b048307558271b5b296"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="meson"
-MAINTAINER="Vincent Batts"
-EMAIL="vbatts@hashbangbash.com"
diff --git a/system/fuse3/slack-desc b/system/fuse3/slack-desc
deleted file mode 100644
index 6cd1dacca4..0000000000
--- a/system/fuse3/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-     |-----handy-ruler------------------------------------------------------|
-fuse3: fuse3 (Filesystem in Userspace)
-fuse3:
-fuse3: FUSE is a simple interface for userspace programs to export a virtual
-fuse3: filesystem to the Linux kernel. FUSE also aims to provide a secure
-fuse3: method for non privileged users to create and mount their own
-fuse3: filesystem implementations.
-fuse3:
-fuse3: Homepage: https://github.com/libfuse/libfuse
-fuse3:
-fuse3:
-fuse3:
diff --git a/system/fuseiso/fuseiso.SlackBuild b/system/fuseiso/fuseiso.SlackBuild
index 6ab124115c..af3eaeb6cf 100644
--- a/system/fuseiso/fuseiso.SlackBuild
+++ b/system/fuseiso/fuseiso.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for fuseiso
 #
@@ -22,10 +22,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - remove useless INSTALL and empty TODO from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fuseiso
 VERSION=${VERSION:-20070708}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,9 +69,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -75,9 +85,9 @@ make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fwupd/README b/system/fwupd/README
index 07e8586ed7..3c3572a554 100644
--- a/system/fwupd/README
+++ b/system/fwupd/README
@@ -3,8 +3,6 @@ fwupd - A simple daemon to allow session software to update firmware
 This project aims to make updating firmware on Linux automatic, safe and
 reliable.
 
-Options (all default to false):
-  ENABLE_UEFI: true|false - requires pygobject3-python3 python3-pillow
-                                     py3cairo
-
-  https://github.com/fwupd/fwupd/blob/1.2.13/meson_options.txt
+Warning: This SlackBuild requires network access when it runs, meaning
+it downloads files from the Internet with root access. You should
+decide for yourself whether or not you think this is a good idea.
diff --git a/system/fwupd/doinst.sh b/system/fwupd/doinst.sh
index 835a554895..489536e95b 100644
--- a/system/fwupd/doinst.sh
+++ b/system/fwupd/doinst.sh
@@ -8,20 +8,13 @@ config() {
   fi
 }
 
-config etc/pki/fwupd/GPG-KEY-Hughski-Limited.new
-config etc/pki/fwupd/GPG-KEY-Linux-Foundation-Firmware.new
-config etc/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service.new
-config etc/pki/fwupd/LVFS-CA.pem.new
-config etc/pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata.new
-config etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service.new
-config etc/pki/fwupd-metadata/LVFS-CA.pem.new
-config etc/fwupd/remotes.d/lvfs.conf.new
+config etc/fwupd/fwupd.conf.new
+config etc/fwupd/remotes.d/fwupd-tests.conf.new
 config etc/fwupd/remotes.d/lvfs-testing.conf.new
-config etc/fwupd/remotes.d/vendor.conf.new
+config etc/fwupd/remotes.d/lvfs.conf.new
 config etc/fwupd/remotes.d/vendor-directory.conf.new
-config etc/fwupd/remotes.d/fwupd-tests.conf.new
-config etc/fwupd/daemon.conf.new
-config etc/fwupd/redfish.conf.new
+config etc/fwupd/remotes.d/vendor.conf.new
+config etc/grub.d/35_fwupd.new
 
 if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
diff --git a/system/fwupd/fwupd.SlackBuild b/system/fwupd/fwupd.SlackBuild
index b7d8384306..7d8312a4db 100644
--- a/system/fwupd/fwupd.SlackBuild
+++ b/system/fwupd/fwupd.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fwupd
 
-# Copyright 2017-2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-2022 Andrew Clemons, Wellington New Zealand
+# Copyright 2022-2024 Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fwupd
-VERSION=${VERSION:-1.2.13}
+VERSION=${VERSION:-1.9.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,23 +39,30 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
+  uefi_capsule="enabled"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
+  uefi_capsule="enabled"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
+  uefi_capsule="enabled"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  uefi_capsule="enabled"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  uefi_capsule="disabled"
 fi
 
 set -e
@@ -69,10 +80,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-ENABLE_UEFI=${ENABLE_UEFI:-false}
-
-# altos is disabled because meson seems unable to find libelf on slack.
-# dell is disabled because libsmbios is too old
+# to use updated meson
+PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
+export PYTHONPATH=/opt/python$PYVER/site-packages/
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -82,14 +92,29 @@ meson --prefix=/usr \
   --libexecdir=/usr/libexec \
   --buildtype=release \
   --mandir=/usr/man \
-  -Dsystemd=false \
-  -Dplugin_altos=false \
-  -Dplugin_dell=false \
-  -Dplugin_uefi="$ENABLE_UEFI" \
+  -Db_lto=true \
+  -Dbuild=all \
+  -Dconsolekit=disabled \
+  -Delogind=disabled \
+  -Dfirmware-packager=true \
+  -Dgcab:docs=false \
+  -Dhsi=enabled \
+  -Dlvfs=true \
+  -Dman=true \
+  -Dpassim=disabled \
+  -Dplugin_amdgpu=disabled \
+  -Dplugin_redfish=disabled \
+  -Dplugin_uefi_capsule=$uefi_capsule \
+  -Dsupported_build=enabled \
+  -Dsystemd=disabled \
   build
 
-ninja -C build
-DESTDIR=$PKG ninja -C build install
+"${NINJA:=ninja}" -C build
+DESTDIR=$PKG $NINJA -C build install
+
+# fix permissions on rules.d
+chown polkitd:root $PKG/usr/share/polkit-1/rules.d
+chmod 0700 $PKG/usr/share/polkit-1/rules.d
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -97,33 +122,32 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-mv $PKG/etc/pki/fwupd/GPG-KEY-Hughski-Limited $PKG/etc/pki/fwupd/GPG-KEY-Hughski-Limited.new
-mv $PKG/etc/pki/fwupd/GPG-KEY-Linux-Foundation-Firmware $PKG/etc/pki/fwupd/GPG-KEY-Linux-Foundation-Firmware.new
-mv $PKG/etc/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service $PKG/etc/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service.new
-mv $PKG/etc/pki/fwupd/LVFS-CA.pem $PKG/etc/pki/fwupd/LVFS-CA.pem.new
-mv $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata.new
-mv $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service.new
-mv $PKG/etc/pki/fwupd-metadata/LVFS-CA.pem $PKG/etc/pki/fwupd-metadata/LVFS-CA.pem.new
-mv $PKG/etc/fwupd/remotes.d/lvfs.conf $PKG/etc/fwupd/remotes.d/lvfs.conf.new
+mv $PKG/usr/bin/{,fwupd-}dbxtool
+mv $PKG/usr/man/man1/{,fwupd-}dbxtool.1.gz
+
+mv $PKG/etc/fwupd/fwupd.conf $PKG/etc/fwupd/fwupd.conf.new
+mv $PKG/etc/fwupd/remotes.d/fwupd-tests.conf $PKG/etc/fwupd/remotes.d/fwupd-tests.conf.new
 mv $PKG/etc/fwupd/remotes.d/lvfs-testing.conf $PKG/etc/fwupd/remotes.d/lvfs-testing.conf.new
-mv $PKG/etc/fwupd/remotes.d/vendor.conf $PKG/etc/fwupd/remotes.d/vendor.conf.new
+mv $PKG/etc/fwupd/remotes.d/lvfs.conf $PKG/etc/fwupd/remotes.d/lvfs.conf.new
 mv $PKG/etc/fwupd/remotes.d/vendor-directory.conf $PKG/etc/fwupd/remotes.d/vendor-directory.conf.new
-mv $PKG/etc/fwupd/remotes.d/fwupd-tests.conf $PKG/etc/fwupd/remotes.d/fwupd-tests.conf.new
-mv $PKG/etc/fwupd/daemon.conf $PKG/etc/fwupd/daemon.conf.new
-mv $PKG/etc/fwupd/redfish.conf $PKG/etc/fwupd/redfish.conf.new
-
-if [ -e $PKG/etc/fwupd/uefi.conf ] ; then
-  mv $PKG/etc/fwupd/uefi.conf $PKG/etc/fwupd/uefi.conf.new
-fi
+mv $PKG/etc/fwupd/remotes.d/vendor.conf $PKG/etc/fwupd/remotes.d/vendor.conf.new
+mv $PKG/etc/grub.d/35_fwupd $PKG/etc/grub.d/35_fwupd.new
 
 rm -rf $PKG/usr/share/installed-tests
 
 mkdir -p $PKG/usr/share/dbus-1/system-services
 sed 's|@libexecdir@|/usr/libexec|' data/org.freedesktop.fwupd.service.in > $PKG/usr/share/dbus-1/system-services/org.freedesktop.fwupd.service
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc
+
+# move meson installed docs
+mv $PKG/usr/share/doc/fwupd $PKG/usr/doc/$PRGNAM-$VERSION
+(cd $PKG/usr/doc/$PRGNAM-$VERSION && unlink libfwupd && unlink libfwupdplugin)
+mv $PKG/usr/share/doc/* $PKG/usr/doc/$PRGNAM-$VERSION/
+rm -rf $PKG/usr/share/doc
+
 cp -a \
-  AUTHORS CODE_OF_CONDUCT.md COMMITMENT CONTRIBUTING.md COPYING MAINTAINERS README.md RELEASE \
+  CODE_OF_CONDUCT.md COMMITMENT CONTRIBUTING.md COPYING MAINTAINERS README.md RELEASE SECURITY.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -131,10 +155,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-if [ -e $PKG/etc/fwupd/uefi.conf.new ] ; then
-  echo "" >> $PKG/install/doinst.sh
-  echo "config etc/fwupd/uefi.conf.new" >> $PKG/install/doinst.sh
-fi
-
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fwupd/fwupd.info b/system/fwupd/fwupd.info
index 97d10dab24..582d503eed 100644
--- a/system/fwupd/fwupd.info
+++ b/system/fwupd/fwupd.info
@@ -1,10 +1,10 @@
 PRGNAM="fwupd"
-VERSION="1.2.13"
+VERSION="1.9.12"
 HOMEPAGE="https://www.fwupd.org"
-DOWNLOAD="https://github.com/fwupd/fwupd/archive/1.2.13/fwupd-1.2.13.tar.gz"
-MD5SUM="e205c79b43f343c56b340593f4d00c9f"
+DOWNLOAD="https://github.com/fwupd/fwupd/archive/1.9.12/fwupd-1.9.12.tar.gz"
+MD5SUM="37ed2352146d1caf78f9c453b1b905ac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libxmlb libgusb efivar json-glib gcab"
+REQUIRES="gcab libjcat libxmlb libgusb libsmbios pefile protobuf-c python3-toml python3-meson-opt python3-typogrify"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
diff --git a/system/fwupdate/README b/system/fwupdate/README
deleted file mode 100644
index a3515433fb..0000000000
--- a/system/fwupdate/README
+++ /dev/null
@@ -1,16 +0,0 @@
-fwupdate - Tools for using the ESRT and UpdateCapsule() to apply firmware
-updates
-
-The actual binary (fwup*.efi) is not automatically installed to your ESP.
-Copying it from /usr/libexec/fwupdate/ is left to be handled by the package
-admin.
-
-If you do not use the standard directory (/boot/efi/EFI/Slackware), you'll
-also need to adjust /usr/libexec/fwupdate/cleanup to cleanup the correct
-directory.
-
-I have not actually used this efi binary for anything yet. This package
-provides the libs needed by fwupd to update firmware, which is what I am
-using it for.
-
-The efi binary is included however for completeness.
diff --git a/system/fwupdate/doinst.sh b/system/fwupdate/doinst.sh
deleted file mode 100644
index e7c66a8cfc..0000000000
--- a/system/fwupdate/doinst.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    rm $NEW
-  fi
-}
-
-config usr/libexec/fwupdate/cleanup.new
diff --git a/system/fwupdate/fwupdate.SlackBuild b/system/fwupdate/fwupdate.SlackBuild
deleted file mode 100644
index 682bce6a05..0000000000
--- a/system/fwupdate/fwupdate.SlackBuild
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for fwupdate
-
-# Copyright 2017-2018 Andrew Clemons, Wellington New Zealand
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=fwupdate
-VERSION=${VERSION:-12}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# randomly fails with more than one thread
-make -j1 \
-  EFIDIR=Slackware \
-  libdir=/usr/lib$LIBDIRSUFFIX \
-  mandir=/usr/man \
-  datadir=/var/cache \
-  localedir=/usr/share/locale/
-
-make install \
-  DESTDIR=$PKG \
-  EFIDIR=Slackware \
-  libdir=/usr/lib$LIBDIRSUFFIX \
-  mandir=/usr/man \
-  datadir=/var/cache \
-  localedir=/usr/share/locale/
-
-mv $PKG/usr/libexec/fwupdate/cleanup $PKG/usr/libexec/fwupdate/cleanup.new
-
-rm -rf $PKG/usr/src
-
-if [ "$ARCH" = "x86_64" ]; then
-  rm -rf $PKG/usr/lib
-else
-  rm -rf $PKG/usr/lib/debug
-  rm -rf $PKG/usr/lib/systemd
-fi
-
-mv $PKG/boot/efi/EFI/Slackware/fwup* $PKG/usr/libexec/fwupdate/
-rm -rf $PKG/boot
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/fwupdate/fwupdate.info b/system/fwupdate/fwupdate.info
deleted file mode 100644
index 9ac7f3947a..0000000000
--- a/system/fwupdate/fwupdate.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fwupdate"
-VERSION="12"
-HOMEPAGE="https://github.com/rhboot/fwupdate"
-DOWNLOAD="https://github.com/rhboot/fwupdate/archive/12/fwupdate-12.tar.gz"
-MD5SUM="834e421b6aa3206358907e68fb1223c2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="efivar libsmbios"
-MAINTAINER="Andrew Clemons"
-EMAIL="andrew.clemons@gmail.com"
diff --git a/system/fwupdate/slack-desc b/system/fwupdate/slack-desc
deleted file mode 100644
index 444c3879dd..0000000000
--- a/system/fwupdate/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-        |-----handy-ruler------------------------------------------------------|
-fwupdate: fwupdate (Tools to apply firmware updates)
-fwupdate:
-fwupdate: https://github.com/rhboot/fwupdate
-fwupdate:
-fwupdate:
-fwupdate:
-fwupdate:
-fwupdate:
-fwupdate:
-fwupdate:
-fwupdate:
diff --git a/system/fxload/fxload.SlackBuild b/system/fxload/fxload.SlackBuild
index 0c78218b41..10b91889ea 100644
--- a/system/fxload/fxload.SlackBuild
+++ b/system/fxload/fxload.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fxload
 
@@ -22,26 +22,36 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fxload
 VERSION=${VERSION:-2008_10_13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -89,4 +99,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fzf/fzf.SlackBuild b/system/fzf/fzf.SlackBuild
index a74350a456..82af663b0f 100644
--- a/system/fzf/fzf.SlackBuild
+++ b/system/fzf/fzf.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for fzf
 
-# Copyright 2016-2021 Andrew Clemons, Wellington New Zealand
+# Copyright 2016-2022 Andrew Clemons, Wellington New Zealand
+# Copyright 2022-2024 Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=fzf
-VERSION=${VERSION:-0.25.1}
+VERSION=${VERSION:-0.49.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +39,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,12 +62,14 @@ sed -i '/^BUILD_FLAGS/s/$/ -mod=vendor/' Makefile
 
 mkdir -p vendor/github.com
 
-for DEPENDENCY in gdamore/tcell/1.3.0 \
-                  lucasb-eyer/go-colorful/1.0.3 \
-                  mattn/go-isatty/0.0.12 \
-                  mattn/go-runewidth/0.0.8 \
-                  mattn/go-shellwords/1.0.9 \
-                  saracen/walker/324a081bae7e580aa0bf3afe8164acb16634afca ; do
+for DEPENDENCY in gdamore/encoding/1.0.0 \
+                  gdamore/tcell/2.7.4 \
+                  lucasb-eyer/go-colorful/1.2.0 \
+                  mattn/go-isatty/0.0.20 \
+                  mattn/go-runewidth/0.0.15 \
+                  mattn/go-shellwords/1.0.12 \
+                  rivo/uniseg/0.4.7 \
+                  charlievieth/fastwalk/1.0.3 ; do
   DEPENDENCY_OWNER="$(echo "$DEPENDENCY" | cut -d/ -f1)"
   DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f2)"
   DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f3)"
@@ -71,11 +81,10 @@ for DEPENDENCY in gdamore/tcell/1.3.0 \
 done
 
 mkdir -p vendor/golang.org/x
-for DEPENDENCY in crypto/69ecbb4d6d5dab05e49161c6e77ea40a030884e1 \
-                  sys/d101bd2416d505c0448a6ce8a282482678040a89 \
-                  text/0.3.2 \
-                  sync/cd5d95a43a6e21273425c7ae415d3df9ea832eeb \
-                  xerrors/a985d3407aa71f30cf86696ee0a2f409709f22e1 ; do
+for DEPENDENCY in sync/0.5.0 \
+                  sys/0.18.0 \
+                  term/0.18.0 \
+                  text/0.14.0 ; do
   DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f1)"
   DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f2)"
 
@@ -83,6 +92,90 @@ for DEPENDENCY in crypto/69ecbb4d6d5dab05e49161c6e77ea40a030884e1 \
   mv "$DEPENDENCY_NAME-$DEPENDENCY_REV" "vendor/golang.org/x/$DEPENDENCY_NAME"
 done
 
+cat << EOF > vendor/modules.txt
+# github.com/charlievieth/fastwalk v1.0.3
+## explicit; go 1.18
+github.com/charlievieth/fastwalk
+github.com/charlievieth/fastwalk/internal/dirent
+# github.com/gdamore/encoding v1.0.0
+## explicit; go 1.9
+github.com/gdamore/encoding
+# github.com/gdamore/tcell/v2 v2.7.4
+## explicit; go 1.12
+github.com/gdamore/tcell/v2
+github.com/gdamore/tcell/v2/encoding
+github.com/gdamore/tcell/v2/terminfo
+github.com/gdamore/tcell/v2/terminfo/a/aixterm
+github.com/gdamore/tcell/v2/terminfo/a/alacritty
+github.com/gdamore/tcell/v2/terminfo/a/ansi
+github.com/gdamore/tcell/v2/terminfo/b/beterm
+github.com/gdamore/tcell/v2/terminfo/base
+github.com/gdamore/tcell/v2/terminfo/c/cygwin
+github.com/gdamore/tcell/v2/terminfo/d/dtterm
+github.com/gdamore/tcell/v2/terminfo/dynamic
+github.com/gdamore/tcell/v2/terminfo/e/emacs
+github.com/gdamore/tcell/v2/terminfo/extended
+github.com/gdamore/tcell/v2/terminfo/f/foot
+github.com/gdamore/tcell/v2/terminfo/g/gnome
+github.com/gdamore/tcell/v2/terminfo/h/hpterm
+github.com/gdamore/tcell/v2/terminfo/k/konsole
+github.com/gdamore/tcell/v2/terminfo/k/kterm
+github.com/gdamore/tcell/v2/terminfo/l/linux
+github.com/gdamore/tcell/v2/terminfo/p/pcansi
+github.com/gdamore/tcell/v2/terminfo/r/rxvt
+github.com/gdamore/tcell/v2/terminfo/s/screen
+github.com/gdamore/tcell/v2/terminfo/s/simpleterm
+github.com/gdamore/tcell/v2/terminfo/s/sun
+github.com/gdamore/tcell/v2/terminfo/t/tmux
+github.com/gdamore/tcell/v2/terminfo/v/vt100
+github.com/gdamore/tcell/v2/terminfo/v/vt102
+github.com/gdamore/tcell/v2/terminfo/v/vt220
+github.com/gdamore/tcell/v2/terminfo/v/vt320
+github.com/gdamore/tcell/v2/terminfo/v/vt400
+github.com/gdamore/tcell/v2/terminfo/v/vt420
+github.com/gdamore/tcell/v2/terminfo/v/vt52
+github.com/gdamore/tcell/v2/terminfo/w/wy50
+github.com/gdamore/tcell/v2/terminfo/w/wy60
+github.com/gdamore/tcell/v2/terminfo/w/wy99_ansi
+github.com/gdamore/tcell/v2/terminfo/x/xfce
+github.com/gdamore/tcell/v2/terminfo/x/xterm
+github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty
+# github.com/lucasb-eyer/go-colorful v1.2.0
+## explicit; go 1.12
+github.com/lucasb-eyer/go-colorful
+# github.com/mattn/go-isatty v0.0.20
+## explicit; go 1.15
+github.com/mattn/go-isatty
+# github.com/mattn/go-runewidth v0.0.15
+## explicit; go 1.9
+github.com/mattn/go-runewidth
+# github.com/mattn/go-shellwords v1.0.12
+## explicit; go 1.13
+github.com/mattn/go-shellwords
+# github.com/rivo/uniseg v0.4.7
+## explicit; go 1.18
+github.com/rivo/uniseg
+# golang.org/x/sys v0.18.0
+## explicit; go 1.18
+golang.org/x/sys/plan9
+golang.org/x/sys/unix
+golang.org/x/sys/windows
+# golang.org/x/term v0.18.0
+## explicit; go 1.18
+golang.org/x/term
+# golang.org/x/text v0.14.0
+## explicit; go 1.18
+golang.org/x/text/encoding
+golang.org/x/text/encoding/charmap
+golang.org/x/text/encoding/internal
+golang.org/x/text/encoding/internal/identifier
+golang.org/x/text/encoding/japanese
+golang.org/x/text/encoding/korean
+golang.org/x/text/encoding/simplifiedchinese
+golang.org/x/text/encoding/traditionalchinese
+golang.org/x/text/transform
+EOF
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -90,7 +183,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-FZF_VERSION="$VERSION" FZF_REVISION="$VERSION" make
+FZF_VERSION="$VERSION" FZF_REVISION="Slackware" make
 
 mkdir -p $PKG/usr/bin
 install -m 0755 target/fzf-linux_* $PKG/usr/bin/fzf
@@ -151,4 +244,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fzf/fzf.info b/system/fzf/fzf.info
index 3a9712d92f..0ab652eb52 100644
--- a/system/fzf/fzf.info
+++ b/system/fzf/fzf.info
@@ -1,30 +1,32 @@
 PRGNAM="fzf"
-VERSION="0.25.1"
+VERSION="0.49.0"
 HOMEPAGE="https://github.com/junegunn/fzf"
-DOWNLOAD="https://github.com/junegunn/fzf/archive/0.25.1/fzf-0.25.1.tar.gz \
-          https://github.com/gdamore/tcell/archive/v1.3.0/tcell-1.3.0.tar.gz \
-          https://github.com/lucasb-eyer/go-colorful/archive/v1.0.3/go-colorful-1.0.3.tar.gz \
-          https://github.com/mattn/go-isatty/archive/v0.0.12/go-isatty-0.0.12.tar.gz \
-          https://github.com/mattn/go-runewidth/archive/v0.0.8/go-runewidth-0.0.8.tar.gz \
-          https://github.com/mattn/go-shellwords/archive/v1.0.9/go-shellwords-1.0.9.tar.gz \
-          https://github.com/saracen/walker/archive/324a081bae7e580aa0bf3afe8164acb16634afca/walker-324a081bae7e580aa0bf3afe8164acb16634afca.tar.gz \
-          https://github.com/golang/crypto/archive/69ecbb4d6d5dab05e49161c6e77ea40a030884e1/crypto-69ecbb4d6d5dab05e49161c6e77ea40a030884e1.tar.gz \
-          https://github.com/golang/sys/archive/d101bd2416d505c0448a6ce8a282482678040a89/sys-d101bd2416d505c0448a6ce8a282482678040a89.tar.gz \
-          https://github.com/golang/text/archive/v0.3.2/text-0.3.2.tar.gz \
-          https://github.com/golang/sync/archive/cd5d95a43a6e21273425c7ae415d3df9ea832eeb/sync-cd5d95a43a6e21273425c7ae415d3df9ea832eeb.tar.gz \
-          https://github.com/golang/xerrors/archive/a985d3407aa71f30cf86696ee0a2f409709f22e1/xerrors-a985d3407aa71f30cf86696ee0a2f409709f22e1.tar.gz"
-MD5SUM="e756a0343eb2ae4599d3a22c8f7be400 \
-        ad4f913e9293c655c5b7cdeba02429e8 \
-        2a1b88991050673c3928342c11d404ae \
-        56a6121ba7ae8a13dad2925edd9f11b5 \
-        af51a12aa8aaf342d266d8ede5bbc919 \
-        2bc4ce5a2fb261259ea3fd9626a1c56f \
-        59d2a11dd00e6f405ebdebe0ec22e7ee \
-        8b46ea618fa02e5c8c5a836ebf9d3960 \
-        09d78ad8306fb264ebecd65e309e33ef \
-        5c3d2e3c8af2436fea967042a9623ba1 \
-        08d1d3802285a880954da8041653ad28 \
-        6396c1c7307899882c28f3938d4e6d18"
+DOWNLOAD="https://github.com/junegunn/fzf/archive/0.49.0/fzf-0.49.0.tar.gz \
+          https://github.com/charlievieth/fastwalk/archive/v1.0.3/fastwalk-1.0.3.tar.gz \
+          https://github.com/gdamore/encoding/archive/v1.0.0/encoding-1.0.0.tar.gz \
+          https://github.com/gdamore/tcell/archive/v2.7.4/tcell-2.7.4.tar.gz \
+          https://github.com/lucasb-eyer/go-colorful/archive/v1.2.0/go-colorful-1.2.0.tar.gz \
+          https://github.com/mattn/go-isatty/archive/v0.0.20/go-isatty-0.0.20.tar.gz \
+          https://github.com/mattn/go-runewidth/archive/v0.0.15/go-runewidth-0.0.15.tar.gz \
+          https://github.com/mattn/go-shellwords/archive/v1.0.12/go-shellwords-1.0.12.tar.gz \
+          https://github.com/rivo/uniseg/archive/v0.4.7/uniseg-0.4.7.tar.gz \
+          https://github.com/golang/sync/archive/v0.5.0/sync-0.5.0.tar.gz \
+          https://github.com/golang/sys/archive/v0.18.0/sys-0.18.0.tar.gz \
+          https://github.com/golang/term/archive/v0.18.0/term-0.18.0.tar.gz \
+          https://github.com/golang/text/archive/v0.14.0/text-0.14.0.tar.gz"
+MD5SUM="ae80282d8f779c58782b89eb06599306 \
+        ab5a2274c5ccac2d968e768ac2415209 \
+        fbadc383bc1ace79fa769fe2de36b87b \
+        a03c6d4612a12e949e05ea7d67624142 \
+        191fe5cfcb58e480ff4045c82a06091a \
+        0e9df2fea5b77d464d518a6c60ce8ba2 \
+        3da9ee6fafe706e99bd88ac86023f6a5 \
+        71a4ecaadfb90ffccb392799a2f00743 \
+        3751c82dd342cd5823703910b9da173d \
+        a8371f5f0569f41210ca8a3f30e445c6 \
+        e00453d8847cde61907bcbee219c44bb \
+        8f5afb0df38c6eb06f51f483e30eddba \
+        9f64144d4b1647ce4597abf657028a8d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="google-go-lang"
diff --git a/system/fzy/README b/system/fzy/README
new file mode 100644
index 0000000000..689c8cf5e5
--- /dev/null
+++ b/system/fzy/README
@@ -0,0 +1,6 @@
+fzy is a fast, simple fuzzy text selector for the terminal with an
+advanced scoring algorithm.
+
+* show better results than other fuzzy finders - see ALGORITHM.md
+* can be easily integrated with vim.
+* is written in C.
diff --git a/system/fzy/fzy.SlackBuild b/system/fzy/fzy.SlackBuild
new file mode 100644
index 0000000000..f2c2768297
--- /dev/null
+++ b/system/fzy/fzy.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/bash
+
+# Slackware build script for fzy
+
+# Copyright 2024 G. Galdini <jake@dioniso.com.br> Brazil
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=fzy
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+make
+make install \
+  PREFIX=/usr \
+  MANDIR=/usr/man \
+  DESTDIR=$PKG
+
+strip --strip-unneeded $PKG/usr/bin/$PRGNAM
+gzip -9 $PKG/usr/man/man?/*.?
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ALGORITHM.md LICENSE CHANGELOG.md README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/fzy/fzy.info b/system/fzy/fzy.info
new file mode 100644
index 0000000000..65dd92c0df
--- /dev/null
+++ b/system/fzy/fzy.info
@@ -0,0 +1,10 @@
+PRGNAM="fzy"
+VERSION="1.0"
+HOMEPAGE="https://github.com/jhawthorn/fzy"
+DOWNLOAD="https://github.com/jhawthorn/fzy/releases/download/1.0/fzy-1.0.tar.gz"
+MD5SUM="2d63086ddf03ccfb3f18f9a8af08203a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="G. Galdini"
+EMAIL="jake@dioniso.com.br"
diff --git a/system/fzy/slack-desc b/system/fzy/slack-desc
new file mode 100644
index 0000000000..fcf2a21b7c
--- /dev/null
+++ b/system/fzy/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+   |-----handy-ruler------------------------------------------------------|
+fzy: fzy (A simple, fast fuzzy finder for the terminal)
+fzy:
+fzy: fzy is a fast, simple fuzzy text selector for the terminal with an
+fzy: advanced scoring algorithm.
+fzy:
+fzy: Homepage: https://github.com/jhawthorn/fzy
+fzy:
+fzy:
+fzy:
+fzy:
+fzy:
diff --git a/system/gammu/README b/system/gammu/README
index 1cfc94bf53..fc2d139045 100644
--- a/system/gammu/README
+++ b/system/gammu/README
@@ -1,7 +1,8 @@
-Gammu is command line utility and library to work with mobile phones from
-many vendors. Support for different models differs, but basic functions
-should work with majority of them.  Program can work with contacts, messages
-(SMS, EMS and MMS), calendar, todos, filesystem, integrated radio, camera,
-etcetera.  It also supports daemon mode to send and receive SMSes.
+Gammu is command line utility and library to work with mobile phones
+from many vendors. Support for different models differs, but basic
+functions should work with majority of them. Program can work with
+contacts, messages (SMS, EMS and MMS), calendar, todos, filesystem,
+integrated radio, camera, etcetera. It also supports daemon mode to
+send and receive SMSes.
 
 gammu can optionally use postgresql.
diff --git a/system/gammu/gammu.SlackBuild b/system/gammu/gammu.SlackBuild
index 32ddf6b8be..541cb49b3b 100644
--- a/system/gammu/gammu.SlackBuild
+++ b/system/gammu/gammu.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gammu
 
-# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2021 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,21 +11,24 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gammu
-VERSION=${VERSION:-1.38.3}
+VERSION=${VERSION:-1.42.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -98,4 +108,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gammu/gammu.info b/system/gammu/gammu.info
index b18e840eed..10c0edb9b2 100644
--- a/system/gammu/gammu.info
+++ b/system/gammu/gammu.info
@@ -1,10 +1,10 @@
 PRGNAM="gammu"
-VERSION="1.38.3"
+VERSION="1.42.0"
 HOMEPAGE="https://wammu.eu/gammu/"
-DOWNLOAD="https://dl.cihar.com/gammu/releases/gammu-1.38.3.tar.xz"
-MD5SUM="c7e0f9fcfe5cdd116979a48d46b1629c"
+DOWNLOAD="https://dl.cihar.com/gammu/releases/gammu-1.42.0.tar.xz"
+MD5SUM="552e547864f2367115c165f84f341ee6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+EMAIL="pprkut@slackbuilds.org"
diff --git a/system/gcdemu/gcdemu.SlackBuild b/system/gcdemu/gcdemu.SlackBuild
index e06410655d..c03b74cb05 100644
--- a/system/gcdemu/gcdemu.SlackBuild
+++ b/system/gcdemu/gcdemu.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gcdemu
 #
 # Copyright 2013 Niels Horn, Rio de Janeiro, RJ, Brazil <niels.horn@gmail.com>
-# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2018-2022 Isaac Yu <isaacyu@protonmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gcdemu
-VERSION=${VERSION:-3.2.4}
+VERSION=${VERSION:-3.2.6}
 ARCH=noarch
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -40,7 +50,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -74,4 +84,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gcdemu/gcdemu.info b/system/gcdemu/gcdemu.info
index 1a80f15758..3a8f5ef80b 100644
--- a/system/gcdemu/gcdemu.info
+++ b/system/gcdemu/gcdemu.info
@@ -1,10 +1,10 @@
 PRGNAM="gcdemu"
-VERSION="3.2.4"
+VERSION="3.2.6"
 HOMEPAGE="https://cdemu.sourceforge.io/about/gcdemu/"
-DOWNLOAD="https://downloads.sourceforge.net/cdemu/gcdemu-3.2.4.tar.bz2"
-MD5SUM="942e8b223985a67fb8096c44fdc40df4"
+DOWNLOAD="https://downloads.sourceforge.net/cdemu/gcdemu-3.2.6.tar.xz"
+MD5SUM="7a699b83d8cc68f74c8f9f1c57ed6c00"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="cdemu-daemon pygobject3-python3"
+REQUIRES="cdemu-daemon"
 MAINTAINER="Isaac Yu"
-EMAIL="isaacyu1@isaacyu1.com"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/gcn64tools/README b/system/gcn64tools/README
new file mode 100644
index 0000000000..266d2af95c
--- /dev/null
+++ b/system/gcn64tools/README
@@ -0,0 +1,61 @@
+The third generation of Raphnet USB adapters has upgradable firmware
+and offers advanced functionalities such as a configurable polling
+frequency and N64 mempak access.
+
+Since this is outside the scope of what a typical USB game controller
+does, operating systems do not support those new functions. Development
+of additional utilities was therefore necessary.
+
+Those tools (both graphical and command-line based) are explained and
+distributed on this page.
+
+Features:
+  * Adapter version display
+  * Adapter firmware update
+  * Displays the type of controller connected
+  * Vibration test (N64 Rumble Pak and Gamecube vibration)
+  * Read/Write N64 Controller Pak ("memory paks"), memory pak editor
+  * N64 Transfer Pak support:
+      * Read ROM from ROM-Only, MBC1, MBC2, MBC3, MBC5 and POCKET
+        CAMERA gameboy cartridges.
+      * Read/Write save RAM for MBC1, MBC2, MBC3, MBC5 and POCKET
+        CAMERA gameboy cartridges.
+  * Gamecube to N64 adapter management (firmware update, version
+    display)
+
+The management tool can perform a vibration/rumble test, can update an
+adapter's firmware and perform read/write operations on N64 mempaks.
+The built-in mempak editor supports common .N64 and .MPK mempak image
+file formats. Downloading cheats from gamefaqs and using them on the
+real N64 system is therefore possible! The editor also supports
+importing and exporting individual saves (notes) in separate files.
+
+The adapter update function asks you to select the firmware .hex file
+and does a few checks to prevent mistakes (ex: Installing an
+incompatible firmware). Once the file is selected, clicking "Start
+update" is all there is to do. If everything goes well (please, do not
+disconnect anything!) after a few moments the Update successful window
+should confirm the update.
+
+The command-line tools are very useful if you appreciate simplicity
+and efficiency. They are available in the tools/ subdirectory of the
+source code.
+
+The mempak tool makes it possible to convert mempak image files (.MPK
+to/from .N64), display and manipulate the content (add/remove/export/
+import notes), etc. Note that these tools operate on files and never
+access a physical mempak. To read/write a real mempak, use gcn64ctl or
+the graphical tool.
+
+If the tool does not detect your adapter despite it being properly
+connected, the most likely cause is that your user does not have the
+required permissions to access it.
+
+Running the tool as root would work, but it is a very bad practise.
+Not recommended. Configuring udev to give your user the appropriate
+permissions is much cleaner. Rules files are provided and installed
+as part of the build script. The plugdev group is used upstream, so
+make sure the user you want to grant access to is part of this group.
+
+Firmware files are included for all supported devices, they are
+located at: /usr/share/gcn64tools/firmwares
diff --git a/system/gcn64tools/doinst.sh b/system/gcn64tools/doinst.sh
new file mode 100644
index 0000000000..9e99c5cd7f
--- /dev/null
+++ b/system/gcn64tools/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
+if [ -x /sbin/udevadm ]; then
+  /sbin/udevadm control --reload
+fi
diff --git a/system/gcn64tools/gcn64tools.SlackBuild b/system/gcn64tools/gcn64tools.SlackBuild
new file mode 100644
index 0000000000..c845aee49c
--- /dev/null
+++ b/system/gcn64tools/gcn64tools.SlackBuild
@@ -0,0 +1,133 @@
+#!/bin/bash
+
+# Slackware build script for gcn64tools
+
+# Copyright 2023 Steven Voges <Oregon, USA>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=gcn64tools
+SRCNAM=raphnet-tech_adapter_manager
+VERSION=${VERSION:-2.1.28}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+cd src
+make PLATFORM_CFLAGS="$SLKCFLAGS"
+mkdir -p $PKG/usr/bin
+make install PREFIX=$PKG/usr
+for i in 0 1 2 3 ; do
+  convert icon.ico[${i}] $i.png
+done
+install -vDm0644 0.png $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
+install -vDm0644 1.png $PKG/usr/share/icons/hicolor/31x32/apps/$PRGNAM.png
+install -vDm0644 2.png $PKG/usr/share/icons/hicolor/24x24/apps/$PRGNAM.png
+install -vDm0644 3.png $PKG/usr/share/icons/hicolor/16x16/apps/$PRGNAM.png
+cd ../firmwares
+for i in * ; do
+  cd $i
+  FILES=(*.hex)
+  NAME=${FILES[0]%-*}
+  install -vDm0644 * -t $PKG/usr/share/$PRGNAM/firmwares/$NAME
+  cd ..
+done
+cd ..
+
+cat <<EOF > $PRGNAM.desktop
+[Desktop Entry]
+Type=Application
+Name=Raphnet-Tech Adapter Manager
+Comment=Management GUI for Raphnet adapters
+Exec=gcn64ctl_gui
+Icon=$PRGNAM
+Categories=Utility;
+EOF
+install -vDm0644 $PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+
+mkdir -p $PKG/etc/udev/rules.d
+install -vDm0644 scripts/99-atmel-dfu.rules.olddebian $PKG/etc/udev/rules.d/99-atmel-dfu.rules
+install -vDm0644 scripts/99-raphnet.rules.olddebian $PKG/etc/udev/rules.d/99-raphnet.rules
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE README.md changelog.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gcn64tools/gcn64tools.info b/system/gcn64tools/gcn64tools.info
new file mode 100644
index 0000000000..eacf0fff9d
--- /dev/null
+++ b/system/gcn64tools/gcn64tools.info
@@ -0,0 +1,10 @@
+PRGNAM="gcn64tools"
+VERSION="2.1.28"
+HOMEPAGE="https://www.raphnet.net/programmation/gcn64tools/index_en.php"
+DOWNLOAD="https://www.raphnet.net/programmation/gcn64tools/raphnet-tech_adapter_manager-2.1.28.tar.gz"
+MD5SUM="e2ecba646448b0b22ca600a8fa9d8eca"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="hidapi dfu-programmer"
+MAINTAINER="Steven Voges"
+EMAIL="svoges.sbo@gmail.com"
diff --git a/system/gcn64tools/slack-desc b/system/gcn64tools/slack-desc
new file mode 100644
index 0000000000..9e1c5e8e75
--- /dev/null
+++ b/system/gcn64tools/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+gcn64tools: gcn64tools (USB adapter manager)
+gcn64tools:
+gcn64tools: Raphnet USB adapter management tools.
+gcn64tools:
+gcn64tools: Homepage: https://www.raphnet.net/programmation/gcn64tools/
+gcn64tools: index_en.php
+gcn64tools:
+gcn64tools:
+gcn64tools:
+gcn64tools:
+gcn64tools:
diff --git a/system/gconf-editor/README b/system/gconf-editor/README
index 468406b88e..7bb4ddad26 100644
--- a/system/gconf-editor/README
+++ b/system/gconf-editor/README
@@ -1 +1,2 @@
-GConf-editor is a GNOME utility for editing the GConf configuration database.
+GConf-editor is a GNOME utility for editing the GConf configuration
+database.
diff --git a/system/gconf-editor/gconf-editor.SlackBuild b/system/gconf-editor/gconf-editor.SlackBuild
index 8a760cdb3d..055bc5632f 100644
--- a/system/gconf-editor/gconf-editor.SlackBuild
+++ b/system/gconf-editor/gconf-editor.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gconf-editor
 
@@ -22,26 +22,36 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gconf-editor
 VERSION=${VERSION:-2.32.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -98,4 +108,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gdmap/README b/system/gdmap/README
index 19df70fd50..1b5f6cab64 100644
--- a/system/gdmap/README
+++ b/system/gdmap/README
@@ -1,6 +1,7 @@
-GdMap is a tool which allows to visualize disk space. To display directory
-structures cushion treemaps are used which visualize a complete folder or even
-the whole hard drive with one picture. Cushion treemaps display directories
-and files in rectangular areas. The larger a file is the larger is the
-rectangle which represents it. All files in one directory are painted within
-the rectangle of that directory. 
+GdMap is a tool which allows to visualize disk space. To display
+directory structures cushion treemaps are used which visualize a
+complete folder or even the whole hard drive with one picture. Cushion
+treemaps display directories and files in rectangular areas. The
+larger a file is the larger is the rectangle which represents it. All
+files in one directory are painted within the rectangle of that
+directory.
diff --git a/system/gdmap/gdmap.SlackBuild b/system/gdmap/gdmap.SlackBuild
index 39a5c0be45..89e723535e 100644
--- a/system/gdmap/gdmap.SlackBuild
+++ b/system/gdmap/gdmap.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2010, 2012  Binh Nguyen <binhvng@gmail.com>
 # Copyright 2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
@@ -21,10 +21,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=5:
+# - make .desktop file validate.
+# - remove useless INSTALL from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gdmap
 VERSION=${VERSION:-0.8.1}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,9 +75,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Allow deprecated gtk functions.
 sed -i s/-DGTK_DISABLE_DEPRECATED//g configure
@@ -89,16 +100,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -106,4 +114,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gdmap/gdmap.desktop b/system/gdmap/gdmap.desktop
new file mode 100644
index 0000000000..c2d268d97d
--- /dev/null
+++ b/system/gdmap/gdmap.desktop
@@ -0,0 +1,34 @@
+[Desktop Entry]
+Name=Graphical Disk Map
+Name[bg]=Графична карта на диска
+Name[de]=Plattenspeicher anzeigen
+Name[dk]=Grafisk Kortlægning af Disken
+Name[es]=Graphical Disk Map
+Name[fr]=Représentation graphique du disque
+Name[he]=מפת דיסק גרפית
+Name[hr]=Graficka disk mapa
+Name[it]=Mappa grafica dischi
+Name[nb]=Grafisk visning
+Name[no]=Grafisk visning
+Name[ru]=Графическая карта диска
+Name[sv]=Grafisk diskkarta
+Name[tr]=Grafik Disk Haritasi
+Comment=Display disk space using tree maps
+Comment[bg]=Показвай свободното пространство в дъвоиден стил
+Comment[de]=Plattenspeicher graphisch darstellen
+Comment[dk]=Vis disk plads som træ
+Comment[es]=Mostrar la utilización de disco usando Treemaps
+Comment[fr]=Afficher l'espace disque disponible à l'aide d'une structure arborescente (Treemaps).
+Comment[he]=הראה מקום בדיסק בעזרת מפות עץ
+Comment[hr]=Prikazi diskovni prostor koristeci drvo mapa
+Comment[it]=Visualizza i file su disco utilizzando gli alberi
+Comment[nb]=Vis diskbruk i trestruktur
+Comment[no]=Vis diskbruk i trestruktur
+Comment[ru]=Показать место на диске пользующеся древовидными схемами
+Comment[sv]=Visa diskutrymme med trädkartor
+Comment[tr]=Disk alanını agac haritalarini kullanarak goster
+Exec=gdmap
+Icon=/usr/share/pixmaps/gdmap_icon.png
+Terminal=false
+Type=Application
+Categories=Filesystem;Utility;GTK
diff --git a/system/geckodriver/geckodriver.SlackBuild b/system/geckodriver/geckodriver.SlackBuild
index 2736415dd6..bfb25fe743 100644
--- a/system/geckodriver/geckodriver.SlackBuild
+++ b/system/geckodriver/geckodriver.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for geckodriver
 
-# Copyright 2017 Azure Zanculmarktum <zanculmarktum@gmail.com>
+# Copyright 2017-2022 Azure Zanculmarktum <zanculmarktum@gmail.com>
+# Copyright 2022-2024 toolonely <lonely_@tutanota.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=geckodriver
-VERSION=${VERSION:-0.18.0}
+VERSION=${VERSION:-0.34.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -87,4 +98,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/geckodriver/geckodriver.info b/system/geckodriver/geckodriver.info
index b74c2d5f7c..1196bb5c5b 100644
--- a/system/geckodriver/geckodriver.info
+++ b/system/geckodriver/geckodriver.info
@@ -1,10 +1,10 @@
 PRGNAM="geckodriver"
-VERSION="0.18.0"
+VERSION="0.34.0"
 HOMEPAGE="https://github.com/mozilla/geckodriver"
-DOWNLOAD="https://github.com/mozilla/geckodriver/releases/download/v0.18.0/geckodriver-v0.18.0-linux32.tar.gz"
-MD5SUM="dc1eb4ebe0f372af48b5a9c107ebc68d"
-DOWNLOAD_x86_64="https://github.com/mozilla/geckodriver/releases/download/v0.18.0/geckodriver-v0.18.0-linux64.tar.gz"
-MD5SUM_x86_64="4ccb56fb3700005c9f9188f84152f21a"
+DOWNLOAD="https://github.com/mozilla/geckodriver/releases/download/v0.34.0/geckodriver-v0.34.0-linux32.tar.gz"
+MD5SUM="eabd3c6af04c11dd13221b975c2b8873"
+DOWNLOAD_x86_64="https://github.com/mozilla/geckodriver/releases/download/v0.34.0/geckodriver-v0.34.0-linux64.tar.gz"
+MD5SUM_x86_64="61eb5f67664c65ef673decb6a56b0043"
 REQUIRES=""
-MAINTAINER="Azure Zanculmarktum"
-EMAIL="zanculmarktum@gmail.com"
+MAINTAINER="toolonely"
+EMAIL="lonely_@tutanota.com"
diff --git a/system/gencfs/gencfs.SlackBuild b/system/gencfs/gencfs.SlackBuild
index f744714df2..4fd11fec5b 100644
--- a/system/gencfs/gencfs.SlackBuild
+++ b/system/gencfs/gencfs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gencfs
 
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=3: *actually* fix .desktop file.
+# 20220211 bkw: Modified by SlackBuilds.org: fix build on 15.0, fix .desktop file.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gencfs
 VERSION=${VERSION:-1.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,9 +75,13 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+sed -i '/Icon=/s,=.*,=/usr/share/pixmaps/gencfs.png,' src/$PRGNAM.desktop
+
+SLKCFLAGS+=" -fcommon"
 
 mkdir -p build
 cd build
@@ -77,19 +91,15 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-rm $PKG/usr/doc/$PRGNAM-$VERSION/TODO
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+rm -f $PKG/usr/doc/$PRGNAM-$VERSION/INSTALL
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/genext2fs/genext2fs.SlackBuild b/system/genext2fs/genext2fs.SlackBuild
index 3741e72e44..d4829cba7f 100644
--- a/system/genext2fs/genext2fs.SlackBuild
+++ b/system/genext2fs/genext2fs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for genext2fs
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=genext2fs
 VERSION=${VERSION:-1.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -93,4 +103,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gentoo/gentoo.SlackBuild b/system/gentoo/gentoo.SlackBuild
index 198a5cda38..3d205fc993 100644
--- a/system/gentoo/gentoo.SlackBuild
+++ b/system/gentoo/gentoo.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gentoo
 
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix icon (it's a .png, don't call it gentoo.svg).
+# - abs path to icon in .desktop file.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gentoo
 VERSION=${VERSION:-0.20.7}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,9 +76,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -81,10 +92,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+#find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  #| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG -name perllocal.pod \
   -o -name ".packlist" \
@@ -95,7 +106,7 @@ mkdir -p $PKG/usr/share/applications
 install -D -m644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/usr/share/pixmaps/
-install -D -m644 icons/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.svg
+install -D -m644 icons/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -108,4 +119,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gentoo/gentoo.desktop b/system/gentoo/gentoo.desktop
index 0f9e7a5698..cf9657d719 100644
--- a/system/gentoo/gentoo.desktop
+++ b/system/gentoo/gentoo.desktop
@@ -3,9 +3,8 @@ Name=File Manager (gentoo)
 Name[he]= getnoo
 Comment=gentoo is a free file manager for Linux
 Exec=gentoo
-Icon=gentoo
+Icon=/usr/share/pixmaps/gentoo.png
 Terminal=false
 Type=Application
 Categories=System;FileManager
 GenericName=FileManager
-
diff --git a/system/gentoo/gentoo.info b/system/gentoo/gentoo.info
index 481545b7d0..e435255fa3 100644
--- a/system/gentoo/gentoo.info
+++ b/system/gentoo/gentoo.info
@@ -1,6 +1,6 @@
 PRGNAM="gentoo"
 VERSION="0.20.7"
-HOMEPAGE="http://obsession.se/gentoo/"
+HOMEPAGE="https://sourceforge.net/projects/gentoo/"
 DOWNLOAD="http://sourceforge.net/projects/gentoo/files/gentoo/0.20.7/gentoo-0.20.7.tar.gz"
 MD5SUM="a3878a900205c57f8816b3cade3fc17c"
 DOWNLOAD_x86_64=""
diff --git a/system/gentoo/slack-desc b/system/gentoo/slack-desc
index d5b8249e94..1352658e99 100644
--- a/system/gentoo/slack-desc
+++ b/system/gentoo/slack-desc
@@ -12,7 +12,7 @@ gentoo: gentoo is a free file manager for Linux and other Unix-like computer
 gentoo: systems created by Emil Brink. It is licensed under the GNU General
 gentoo: Public License.
 gentoo:
-gentoo: Homepage: http://obsession.se/gentoo/
+gentoo: Homepage: https://sourceforge.net/projects/gentoo/
 gentoo:
 gentoo:
 gentoo:
diff --git a/system/geoclue/doinst.sh b/system/geoclue/doinst.sh
new file mode 100644
index 0000000000..6922dbb756
--- /dev/null
+++ b/system/geoclue/doinst.sh
@@ -0,0 +1,5 @@
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
+fi
diff --git a/system/geoclue/geoclue.SlackBuild b/system/geoclue/geoclue.SlackBuild
index ce119daa39..38181a662a 100644
--- a/system/geoclue/geoclue.SlackBuild
+++ b/system/geoclue/geoclue.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for geoclue
 
@@ -22,26 +22,38 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - add doinst.sh with glib-compile-schemas.
+# - i486 => i586.
+# - remove empty files from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=geoclue
 VERSION=${VERSION:-0.12.99}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -54,7 +66,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
+# 20220411 bkw: ChangeLog and NEWS are 0-byte placeholders.
+DOCS="AUTHORS COPYING README"
 
 set -e 
 
@@ -67,9 +80,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -82,23 +95,22 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-static=no \
   --enable-gtk=yes \
-  --enable-networkmanager=yes \
   --enable-skyhook=yes \
   --enable-gpsd=no \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/geoclue2/README b/system/geoclue2/README
index 64c739f895..347a22b1b2 100644
--- a/system/geoclue2/README
+++ b/system/geoclue2/README
@@ -12,3 +12,7 @@ avahi is an optional dependency, used for location sharing (by redshift,
 for example).  To enable it, use the option AVAHI=yes
 
   AVAHI=yes ./geoclue2.Slackbuild
+
+To build HTML Geoclue GTK docs, use the option GTK_DOC=yes
+
+  GTK_DOC=yes ./geoclue2.Slackbuild
diff --git a/system/geoclue2/geoclue2.SlackBuild b/system/geoclue2/geoclue2.SlackBuild
index 9c07653702..02bada7236 100644
--- a/system/geoclue2/geoclue2.SlackBuild
+++ b/system/geoclue2/geoclue2.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for geoclue2
-# Copyright 2017-2018 Aaditya Bagga <aaditya_gnulinux@zoho.com>
+# Copyright 2017-2022 Aaditya <aaditya_gnulinux@zoho.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=geoclue2
-VERSION=${VERSION:-2.4.7}
+VERSION=${VERSION:-2.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=geoclue
 
@@ -36,7 +39,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -61,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
+tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -70,25 +77,30 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-avahi_opts='--disable-nmea-source'
-[ "${AVAHI:-no}" != "no" ] && avahi_opts=''
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  $avahi_opts \
-  --enable-static=no \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+[ "${AVAHI:-no}" != "no" ] && avahi_opts=true || avahi_opts=false
+[ "${GTK_DOC:-no}" != "no" ] && doc_opts=true || doc_opts=false
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --prefix=/usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --libexecdir=/usr/libexec \
+    --sysconfdir=/etc \
+    --includedir=/usr/include \
+    --localstatedir=/var \
+    --datadir=/usr/share \
+    --mandir=/usr/man \
+    --infodir=/usr/info \
+    --buildtype=release \
+    -Dnmea-source=$avahi_opts \
+    -Dgtk-doc=$doc_opts \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
 # Preserve config file
 mv $PKG/etc/geoclue/geoclue.conf $PKG/etc/geoclue/geoclue.conf.new
@@ -96,8 +108,11 @@ mv $PKG/etc/geoclue/geoclue.conf $PKG/etc/geoclue/geoclue.conf.new
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING COPYING.LIB NEWS README docs \
+cp -a COPYING COPYING.LIB NEWS README.md HACKING.md docs \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -106,4 +121,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/geoclue2/geoclue2.info b/system/geoclue2/geoclue2.info
index 531d456371..5620918989 100644
--- a/system/geoclue2/geoclue2.info
+++ b/system/geoclue2/geoclue2.info
@@ -1,10 +1,10 @@
 PRGNAM="geoclue2"
-VERSION="2.4.7"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/GeoClue"
-DOWNLOAD="https://www.freedesktop.org/software/geoclue/releases/2.4/geoclue-2.4.7.tar.xz"
-MD5SUM="e50086e742740413669ab72d8572db05"
+VERSION="2.6.0"
+HOMEPAGE="https://gitlab.freedesktop.org/geoclue/geoclue/-/wikis/home"
+DOWNLOAD="https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/2.6.0/geoclue-2.6.0.tar.bz2"
+MD5SUM="07ed45bc145e87d7f76fa521d5412f29"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="json-glib"
-MAINTAINER="Aaditya Bagga"
+REQUIRES=""
+MAINTAINER="Aaditya"
 EMAIL="aaditya_gnulinux@zoho.com"
diff --git a/system/geoclue2/slack-desc b/system/geoclue2/slack-desc
index 3c2b9befdd..30e6fcf24e 100644
--- a/system/geoclue2/slack-desc
+++ b/system/geoclue2/slack-desc
@@ -8,11 +8,11 @@
         |-----handy-ruler------------------------------------------------------|
 geoclue2: geoclue2 (location information service)
 geoclue2:
-geoclue2: geoclue2 is a D-Bus service that provides location information.
+geoclue2: geoclue2 is a D-Bus geoinformation service.
 geoclue2:
 geoclue2: This is a rewrite of the original geoclue.
 geoclue2:
-geoclue2: Homepage: https://www.freedesktop.org/wiki/Software/GeoClue
+geoclue2: Homepage: https://gitlab.freedesktop.org/geoclue/geoclue
 geoclue2:
 geoclue2:
 geoclue2:
diff --git a/system/gigolo/README b/system/gigolo/README
index e5946e83fa..18f6495200 100644
--- a/system/gigolo/README
+++ b/system/gigolo/README
@@ -1,6 +1,6 @@
-Gigolo is a frontend to easily manage connections to remote filesystems 
-using GIO/GVfs. It allows you to quickly connect/mount remote filesystems 
-and manage bookmarks of such.
+Gigolo is a frontend to easily manage connections to remote
+filesystems using GIO/GVfs. It allows you to quickly connect/mount
+remote filesystems and manage bookmarks of such.
 
 This script installs a compatibility wrapper to /usr/bin/gnome-mount
 unless you pass something other than "yes" to GNOMEMOUNT when running
diff --git a/system/gigolo/gigolo.SlackBuild b/system/gigolo/gigolo.SlackBuild
index 6d96016d60..e996da4674 100644
--- a/system/gigolo/gigolo.SlackBuild
+++ b/system/gigolo/gigolo.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gigolo
 
 # Written by Luis Henrique <lmello.009@gmail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gigolo
 VERSION=${VERSION:-0.4.1}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -17,7 +20,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -83,4 +93,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gimp-help/gimp-help.SlackBuild b/system/gimp-help/gimp-help.SlackBuild
index 85e47c394d..c135bb22cd 100644
--- a/system/gimp-help/gimp-help.SlackBuild
+++ b/system/gimp-help/gimp-help.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for gimp-help
 
-# Copyright 2014-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2023 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Permission to use, copy, modify, and distribute this software for any purpose
@@ -19,10 +19,13 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gimp-help
-VERSION=${VERSION:-2.8.2}
+VERSION=${VERSION:-2.10.34}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -32,7 +35,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -92,4 +99,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gimp-help/gimp-help.info b/system/gimp-help/gimp-help.info
index ebd7e21200..7e9a7fc69e 100644
--- a/system/gimp-help/gimp-help.info
+++ b/system/gimp-help/gimp-help.info
@@ -1,8 +1,8 @@
 PRGNAM="gimp-help"
-VERSION="2.8.2"
+VERSION="2.10.34"
 HOMEPAGE="https://www.gimp.org/"
-DOWNLOAD="https://download.gimp.org/pub/gimp/help/gimp-help-2.8.2.tar.bz2"
-MD5SUM="a591c8974b2f4f584d0a769d52ed6c5b"
+DOWNLOAD="https://download.gimp.org/pub/gimp/help/gimp-help-2.10.34.tar.bz2"
+MD5SUM="5e393d61c802e73ffe6c550759ed0853"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/gitolite/gitolite.SlackBuild b/system/gitolite/gitolite.SlackBuild
index 80d1349e05..b51de998d6 100644
--- a/system/gitolite/gitolite.SlackBuild
+++ b/system/gitolite/gitolite.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gitolite
 
-# Copyright 2015, 2016, 2017  Mario Preksavec, Zagreb, Croatia
+# Copyright 2015, 2021  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,16 +22,26 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gitolite
-VERSION=${VERSION:-3.6.7}
+VERSION=${VERSION:-3.6.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
 GL_USER=${GL_USER:-gitolite}
 GL_GROUP=${GL_GROUP:-gitolite}
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -100,4 +110,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gitolite/gitolite.info b/system/gitolite/gitolite.info
index 03b56d380d..0342dbba40 100644
--- a/system/gitolite/gitolite.info
+++ b/system/gitolite/gitolite.info
@@ -1,8 +1,8 @@
 PRGNAM="gitolite"
-VERSION="3.6.7"
+VERSION="3.6.12"
 HOMEPAGE="http://gitolite.com/"
-DOWNLOAD="https://github.com/sitaramc/gitolite/archive/v3.6.7/gitolite-3.6.7.tar.gz"
-MD5SUM="f9148f42def61ad767840dc82b40d727"
+DOWNLOAD="https://github.com/sitaramc/gitolite/archive/v3.6.12/gitolite-3.6.12.tar.gz"
+MD5SUM="e15f83298b05c451d572a2c17865f46d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/gkrellm-volume/Makefile.diff b/system/gkrellm-volume/Makefile.diff
deleted file mode 100644
index 806ae79be3..0000000000
--- a/system/gkrellm-volume/Makefile.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Nur gkrellm-volume.orig/Makefile gkrellm-volume/Makefile
---- gkrellm-volume.orig/Makefile	2004-08-19 15:07:27.000000000 -0500
-+++ gkrellm-volume/Makefile	2009-11-30 00:48:22.746711831 -0600
-@@ -14,7 +14,7 @@
- GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
- GTK_LIB = `$(GTK_CONFIG) --libs`
- 
--FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
-+FLAGS = -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
- LIBS = $(GTK_LIB)
- LFLAGS = -shared
- 
-@@ -33,6 +33,7 @@
- 
- CC = gcc $(CFLAGS) $(FLAGS)
- 
-+MKDIR = mkdir -p
- INSTALL = install -c
- INSTALL_PROGRAM = $(INSTALL) -s
- 
-@@ -48,7 +49,8 @@
- 
- install: 
- 	(cd po && ${MAKE} install)
--	$(INSTALL_PROGRAM) volume.so $(PLUGIN_DIR)
-+	$(MKDIR) $(DESTDIR)$(PLUGIN_DIR)
-+	$(INSTALL_PROGRAM) volume.so $(DESTDIR)/$(PLUGIN_DIR)
- 
- %.c.o: %.c
- 
-diff -Nur gkrellm-volume.orig/po/Makefile gkrellm-volume/po/Makefile
---- gkrellm-volume.orig/po/Makefile	2004-08-19 15:07:27.000000000 -0500
-+++ gkrellm-volume/po/Makefile	2009-11-30 00:47:52.124675094 -0600
-@@ -14,8 +14,8 @@
- install: 
- 	$(MAKE) all
- 	for f in *.mo ; do mkdir -p \
--		$(INSTALL_PREFIX)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \
--		cp $$f $(INSTALL_PREFIX)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; done
-+		$(DESTDIR)$(INSTALL_PREFIX)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \
-+		cp $$f $(DESTDIR)$(INSTALL_PREFIX)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; done
- 
- %.mo: %.po
- 	$(MSGFMT) -f -v -o $@ $<
diff --git a/system/gkrellm-volume/README b/system/gkrellm-volume/README
deleted file mode 100644
index 9f5fdc1cc0..0000000000
--- a/system/gkrellm-volume/README
+++ /dev/null
@@ -1,5 +0,0 @@
-gkrellm-volume is a plugin for gkrellm-2 that lets you control
-your sound mixer..
-
-This plugin also supports gkrellm's plugin theming possibilities; 
-it's even included in the default gkrellm theme :).
diff --git a/system/gkrellm-volume/gkrellm-volume.SlackBuild b/system/gkrellm-volume/gkrellm-volume.SlackBuild
deleted file mode 100644
index 1114b5ae2c..0000000000
--- a/system/gkrellm-volume/gkrellm-volume.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-### gkrellm-volume.SlackBuild ###
-
-# Slackware build script for gkrellm-volume 2.1.13
-# Copyright (C) 2006 paul wisehart wise@lupulin.net
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# Modifed by the SlackBuilds.org project
-
-PRGNAM=gkrellm-volume
-VERSION=${VERSION:-2.1.13}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Patch the Makefile and po/Makefile to support DESTDIR
-patch -p1 < $CWD/Makefile.diff || exit 1
-
-make \
-  CFLAGS="$SLKCFLAGS" \
-  LOCALEDIR=/usr/share/locale \
-  PLUGIN_DIR=/usr/lib${LIBDIRSUFFIX}/gkrellm2/plugins \
-  GKRELLM_INCLUDE="-I/usr/include" \
-  enable_nls=1 \
-  enable_alsa=1
-
-make install \
-  LOCALEDIR=/usr/share/locale \
-  PLUGIN_DIR=/usr/lib${LIBDIRSUFFIX}/gkrellm2/plugins \
-  GKRELLM_INCLUDE="-I/usr/include" \
-  enable_nls=1 \
-  enable_alsa=1 \
-  DESTDIR=$PKG
-
-# Strip the .so file
-strip --strip-unneeded $PKG/usr/lib${LIBDIRSUFFIX}/gkrellm2/plugins/volume.so
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYRIGHT Changelog README THEMING $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a po/README $PKG/usr/doc/$PRGNAM-$VERSION/README.po
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/gkrellm-volume/gkrellm-volume.info b/system/gkrellm-volume/gkrellm-volume.info
deleted file mode 100644
index a635147de8..0000000000
--- a/system/gkrellm-volume/gkrellm-volume.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="gkrellm-volume"
-VERSION="2.1.13"
-HOMEPAGE="http://gkrellm.luon.net/volume.php"
-DOWNLOAD="http://gkrellm.luon.net/files/gkrellm-volume-2.1.13.tar.gz"
-MD5SUM="d9f4c36d7fdf9c9f755c99f742b573c4"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Eugene Wissner"
-EMAIL="eugen@flevum.de"
diff --git a/system/gkrellm-volume/slack-desc b/system/gkrellm-volume/slack-desc
deleted file mode 100644
index 0783292cd4..0000000000
--- a/system/gkrellm-volume/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-              |-----handy-ruler------------------------------------------------------|
-gkrellm-volume: gkrellm-volume (gkrellm-volume plugin)
-gkrellm-volume:
-gkrellm-volume: A plugin which allows you to control the sound mixer devices
-gkrellm-volume: of your choice.
-gkrellm-volume:
-gkrellm-volume: Author: Sjoerd Simons <sjoerd@luon.net>
-gkrellm-volume:
-gkrellm-volume:
-gkrellm-volume:
-gkrellm-volume:
-gkrellm-volume:
diff --git a/system/gksu/gksu.SlackBuild b/system/gksu/gksu.SlackBuild
index 5f665ac2ee..3174cddf58 100644
--- a/system/gksu/gksu.SlackBuild
+++ b/system/gksu/gksu.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for <gksu>
 
@@ -21,10 +21,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gksu
 VERSION=${VERSION:-2.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,7 +37,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -108,4 +118,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/glances/README b/system/glances/README
deleted file mode 100644
index ba7d2548f9..0000000000
--- a/system/glances/README
+++ /dev/null
@@ -1,46 +0,0 @@
-glances is a free (LGPL), cross-platform, curses-based system monitoring tool
-which aims to present a maximum of information in a minimum of space, ideally
-to fit in a classical 80x24 terminal, or larger for additional data. It can
-adapt the displayed information dynamically, depending on the terminal size.
-A client/server mode is also available and remote monitoring can be done via
-terminal or a web interface.
-
-glances is written in Python and uses the psutil library to fetch statistical
-values from key elements, like CPU, load average, memory, network, disks, file
-systems, processes, etc.
-
-OPTIONAL DEPENDENCIES
-
-* Available on SBo:
-bottle (for web server mode)
-couchdb (for CouchDB export module)
-docker (for Docker monitoring support)
-elasticsearch (for Elastic Search export module)
-hddtemp (for HDD temperature monitoring support)
-influxdb (for InfluxDB export module)
-netifaces (for IP plugin)
-py-cpuinfo (for Quicklook CPU info module)
-pymdstat (for RAID support)
-python-prometheus_client (for Prometheus export module)
-python-requests (for Ports plugin)
-python-scandir (for Folders plugin)
-statsd (for StatsD export module)
-pysnmp (for SNMP support)
-pyzmq (for ZeroMQ export module)
-
-* Not available on SBo:
-bernhard (for Riemann export module)
-cassandra-driver (for Cassandra export module)
-kafka-python (for Kafka export module)
-nvidia-ml-pyi3 (for GPU plugin)
-pika (for RabbitMQ/ActiveMQ export module)
-potsdb (for OpenTSDB export module)
-pygal (for graph export module)
-pySMART.smartx (for HDD SMART support)
-pystache (for action scripting)
-wifi (for wifi plugin)
-zeroconf (for autodiscover mode)
-
-NOTE: When launching glances from a terminal with a bright background, the
-option '--theme-white' is recommended. More options are documented in the man
-page and in the file glances.conf.
diff --git a/system/glances/doinst.sh b/system/glances/doinst.sh
deleted file mode 100644
index 4490c14238..0000000000
--- a/system/glances/doinst.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    rm $NEW
-  fi
-}
-
-config etc/glances.conf.new
diff --git a/system/glances/glances.SlackBuild b/system/glances/glances.SlackBuild
deleted file mode 100644
index 0972a94bfa..0000000000
--- a/system/glances/glances.SlackBuild
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for glances
-
-# Copyright 2013-2020 Philip Lacroix <slackph at posteo dot de>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=glances
-VERSION=${VERSION:-3.1.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$PRGNAM}
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-PRGETC=$PKG/etc
-PRGUSR=$PKG/usr
-PRGSHR=$PKG/usr/share
-PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
-
-# Move and compress man page.
-mv $PRGSHR/man $PRGUSR/
-gzip -9 $PRGUSR/man/man1/$PRGNAM.1
-
-# Safely install configuration file.
-mkdir $PRGETC
-mv $PRGSHR/doc/$PRGNAM/$PRGNAM.conf $PRGETC/$PRGNAM.conf.new
-
-# Install documentation.
-mkdir -p $PRGDOC
-mv $PRGSHR/doc/$PRGNAM/* $PRGDOC/
-cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
-rm -rf $PRGSHR
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/glances/glances.info b/system/glances/glances.info
deleted file mode 100644
index e61af1e5aa..0000000000
--- a/system/glances/glances.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="glances"
-VERSION="3.1.0"
-HOMEPAGE="https://github.com/nicolargo/glances"
-DOWNLOAD="https://github.com/nicolargo/glances/archive/v3.1.0/glances-3.1.0.tar.gz"
-MD5SUM="6b4d001854f711ee805eb60bd6831e18"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="psutil"
-MAINTAINER="Philip Lacroix"
-EMAIL="slackph at posteo dot de"
diff --git a/system/glances/slack-desc b/system/glances/slack-desc
deleted file mode 100644
index e5b111feec..0000000000
--- a/system/glances/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-glances: glances (a cross-platform, curses-based system monitoring tool)
-glances:
-glances: glances is a cross-platform, curses-based system monitoring tool
-glances: written in Python. It can adapt the displayed information depending
-glances: on the terminal size and can work in a client/server mode for remote
-glances: monitoring. It uses the psutil library to fetch statistical values
-glances: from key elements, like CPU, load average, memory, network, disks,
-glances: file systems, processes, etc.
-glances:
-glances: Homepage: https://github.com/nicolargo/glances
-glances:
diff --git a/system/glyptodon/glyptodon.SlackBuild b/system/glyptodon/glyptodon.SlackBuild
index 5f188bc7ff..541a2e43de 100644
--- a/system/glyptodon/glyptodon.SlackBuild
+++ b/system/glyptodon/glyptodon.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Glyptodon
 
@@ -8,13 +8,23 @@
 # Granted WTFPL, Version 2, as published by Sam Hocevar. See
 # http://sam.zoy.org/wtfpl/COPYING for more details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=glyptodon
 VERSION=${VERSION:-1.2b}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,4 +65,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gnome-color-manager/README b/system/gnome-color-manager/README
new file mode 100644
index 0000000000..6efa2cb6f6
--- /dev/null
+++ b/system/gnome-color-manager/README
@@ -0,0 +1,28 @@
+GNOME Color Manager is a session framework that makes it easy to 
+manage, install and generate color profiles in the GNOME desktop.
+
+This project has the following features:
+
+- Setting output gamma tables (with local brightness and adjustments) 
+  to any Xrandr output (falling back to the per-screen methods for 
+  drivers that do not yet support Xrandr 1.3).
+
+- Setting of settings at session start, and when monitors are 
+  hotplugged.
+
+- Easy install of vendor supplied ICC or ICM files, just by double 
+  clicking on the file.
+
+- Easy display calibration using an external calibration device, and 
+  scanner calibration using a inexpensive IT 8.7 target. For 
+  calibration, the ArgyllCMS package is required.
+
+- Integration X11 by setting the per-screen and per-output _ICC_PROFILE
+  atom, which makes applications such as the GIMP use a color managed 
+  output.
+
+- Easy to use DBus interface for applications to query what ICC 
+  profiles should be used for a specific device or device type. This is
+  session activated and is only started when it is needed, and quits 
+  after a small period of idleness.
+
diff --git a/system/roxterm/doinst.sh b/system/gnome-color-manager/doinst.sh
index 4a25de5e6f..4a25de5e6f 100644
--- a/system/roxterm/doinst.sh
+++ b/system/gnome-color-manager/doinst.sh
diff --git a/system/gnome-color-manager/gnome-color-manager.SlackBuild b/system/gnome-color-manager/gnome-color-manager.SlackBuild
new file mode 100644
index 0000000000..48878edab3
--- /dev/null
+++ b/system/gnome-color-manager/gnome-color-manager.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/bash
+
+# Slackware build script for gnome-color-manager
+
+# Copyright 2023, Bob Funk, Winnipeg Canada
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=gnome-color-manager
+VERSION=${VERSION:-3.36.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COMMITMENT COPYING MAINTAINERS README RELEASE \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gnome-color-manager/gnome-color-manager.info b/system/gnome-color-manager/gnome-color-manager.info
new file mode 100644
index 0000000000..1fe87df1a6
--- /dev/null
+++ b/system/gnome-color-manager/gnome-color-manager.info
@@ -0,0 +1,10 @@
+PRGNAM="gnome-color-manager"
+VERSION="3.36.0"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-color-manager"
+DOWNLOAD="https://download.gnome.org/sources/gnome-color-manager/3.36/gnome-color-manager-3.36.0.tar.xz"
+MD5SUM="c5360705a68e88455b1801200e9aaa2e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="colord"
+MAINTAINER="Bob Funk"
+EMAIL="bobfunk11@gmail.com"
diff --git a/system/gnome-color-manager/slack-desc b/system/gnome-color-manager/slack-desc
new file mode 100644
index 0000000000..281711fb4b
--- /dev/null
+++ b/system/gnome-color-manager/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                   |-----handy-ruler------------------------------------------------------|
+gnome-color-manager: gnome-color-manager (GNOME Color Profile Manager)
+gnome-color-manager:
+gnome-color-manager: GNOME Color Manager is a session framework that makes it easy to 
+gnome-color-manager: manage, install and generate color profiles in the GNOME desktop.
+gnome-color-manager:
+gnome-color-manager:
+gnome-color-manager:
+gnome-color-manager:
+gnome-color-manager:
+gnome-color-manager: https://gitlab.gnome.org/GNOME/gnome-color-manager
+gnome-color-manager:
diff --git a/system/gnome-commander/README b/system/gnome-commander/README
index 31bcc609f6..e0ce213ede 100644
--- a/system/gnome-commander/README
+++ b/system/gnome-commander/README
@@ -1,4 +1,6 @@
-GNOME Commander is a "two-pane" graphical file manager for the GNOME desktop 
-environment. GNOME Commander aims to fulfill the demands of more advanced 
-users who like to focus on file management, their work through special 
-applications, and running smart commands.
+gnome-commander (nc-like file manager for gnome)
+
+GNOME Commander is a "two-pane" graphical file manager for the GNOME
+desktop environment. GNOME Commander aims to fulfill the demands of
+more advanced users who like to focus on file management, their work
+through special applications, and running smart commands.
diff --git a/system/gnome-commander/doinst.sh b/system/gnome-commander/doinst.sh
index 6fa145a19f..0254ea06d8 100644
--- a/system/gnome-commander/doinst.sh
+++ b/system/gnome-commander/doinst.sh
@@ -2,6 +2,12 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
 if [ -e usr/share/glib-2.0/schemas ]; then
   if [ -x /usr/bin/glib-compile-schemas ]; then
     /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
diff --git a/system/gnome-commander/gnome-commander.SlackBuild b/system/gnome-commander/gnome-commander.SlackBuild
index dcf67e63fc..209758e956 100644
--- a/system/gnome-commander/gnome-commander.SlackBuild
+++ b/system/gnome-commander/gnome-commander.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for gnome-commander
 #
@@ -22,26 +22,41 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix icon sizes.
+# - relative symlinks in /usr/share/help.
+# 20220211 bkw: Modified by SlackBuilds.org
+# - updated for latest release, 1.14.0, since the old version wouldn't
+#   build on 15.0.
+# - new-style icons.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gnome-commander
-VERSION=${VERSION:-1.4.3}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.14.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,9 +80,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -82,16 +97,26 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
+
+for px in 16 32 48 64 128; do
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  convert -geometry $size pixmaps/gnome-commander.svg $dir/$PRGNAM.png
+done
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# 20220411 bkw: convert absolute symlinks to relative. ugh.
+for i in $( find $PKG/usr/share/help/?? -type l -lname /usr/share/help/C/\* ); do
+  rm -f $i
+  ln -s ../../../C/$PRGNAM/figures/$( basename $i ) $i
+done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS BUGS COPYING ChangeLog INSTALL README README.commits TODO \
+cp -a AUTHORS BUGS COPYING ChangeLog README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -100,4 +125,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gnome-commander/gnome-commander.info b/system/gnome-commander/gnome-commander.info
index f88d57d652..514647050e 100644
--- a/system/gnome-commander/gnome-commander.info
+++ b/system/gnome-commander/gnome-commander.info
@@ -1,8 +1,8 @@
 PRGNAM="gnome-commander"
-VERSION="1.4.3"
+VERSION="1.14.0"
 HOMEPAGE="https://gcmd.github.io/"
-DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.4/gnome-commander-1.4.3.tar.xz"
-MD5SUM="19672fef5fc72276fbfd3a5b4bc47941"
+DOWNLOAD="https://download.gnome.org/sources/gnome-commander/1.14/gnome-commander-1.14.0.tar.xz"
+MD5SUM="4c74efb40b28ab7e9d189c807c04ca32"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libgnomeui rarian libunique"
diff --git a/system/gnome-commander/slack-desc b/system/gnome-commander/slack-desc
index 746cc3620a..535cecdf8c 100644
--- a/system/gnome-commander/slack-desc
+++ b/system/gnome-commander/slack-desc
@@ -6,10 +6,10 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                |-----handy-ruler------------------------------------------------------|
-gnome-commander: gnome-commander (NC-like file manager for gnome)
+gnome-commander: gnome-commander (nc-like file manager for gnome)
 gnome-commander:
 gnome-commander: GNOME Commander is a "two-pane" graphical file manager for the
-gnome-commander: GNOME desktop environment.  GNOME Commander aims to fulfill the
+gnome-commander: GNOME desktop environment. GNOME Commander aims to fulfill the
 gnome-commander: demands of more advanced users who like to focus on file management,
 gnome-commander: their work through special applications, and running smart commands.
 gnome-commander:
diff --git a/system/gnome-disk-utility/README b/system/gnome-disk-utility/README
index e424cfb0dd..bc513f0b8c 100644
--- a/system/gnome-disk-utility/README
+++ b/system/gnome-disk-utility/README
@@ -1,5 +1,10 @@
-gnome-disk-utility provides libraries and applications for dealing
-with storage devices.
+gnome-disk-utility provides libraries and applications for dealing with
+storage devices, including GNOME Disks, gnome-disk-image-mounter and 
+gsd-disk-utility-notify.
 
-This is pretty much locked at version 3.6.1 unless you want to go
-down the rabbithole of GNOME3 on your system.
+Optional Dependency:
+- gnome-settings-daemon
+
+Note: The SlackBuild will automatically detect if gnome-settings-daemon
+is installed and enable building the plugin, otherwise it will be 
+disabled.
diff --git a/system/gnome-disk-utility/doinst.sh b/system/gnome-disk-utility/doinst.sh
index e924bab47c..401d987795 100644
--- a/system/gnome-disk-utility/doinst.sh
+++ b/system/gnome-disk-utility/doinst.sh
@@ -13,4 +13,3 @@ if [ -e usr/share/glib-2.0/schemas ]; then
     /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
   fi
 fi
-
diff --git a/system/gnome-disk-utility/gnome-disk-utility.SlackBuild b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild
index 749e3b038c..9cd4575abf 100644
--- a/system/gnome-disk-utility/gnome-disk-utility.SlackBuild
+++ b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gnome-disk-utility
 
-# Copyright 2015  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2022 Bob Funk Winnipeg, Canada
+# Copyright 2015,2021  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,28 +23,32 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gnome-disk-utility
-VERSION=${VERSION:-3.6.1}
+VERSION=${VERSION:-42.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i586" ]; then
+if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
@@ -63,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -72,21 +77,34 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux \
-  --disable-schemas-compile \
-  --disable-libsystemd-login
-
-make
-make install DESTDIR=$PKG
+# Detect if gnome-settings-daemon is installed and disable building 
+# the plugin if its not installed:
+if ( pkg-config --exists gnome-settings-daemon); then
+  GSD_PLUGIN=true
+  echo "gnome-settings-daemon found, enabling plugin."
+else
+  GSD_PLUGIN=false
+  echo "gnome-settings-daemon not found, disabling plugin."
+fi
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true \
+    -Dlogind=libelogind \
+    -Dgsd_plugin=$GSD_PLUGIN
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -95,7 +113,9 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING HACKING NEWS README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -103,4 +123,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gnome-disk-utility/gnome-disk-utility.info b/system/gnome-disk-utility/gnome-disk-utility.info
index cbed34abc3..09fa88460d 100644
--- a/system/gnome-disk-utility/gnome-disk-utility.info
+++ b/system/gnome-disk-utility/gnome-disk-utility.info
@@ -1,10 +1,10 @@
 PRGNAM="gnome-disk-utility"
-VERSION="3.6.1"
-HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility/"
-DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gnome-disk-utility/3.6/gnome-disk-utility-3.6.1.tar.xz"
-MD5SUM="ff6e0a50a3a6aa9a8d9aa8b19d304485"
+VERSION="42.0"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-disk-utility"
+DOWNLOAD="https://download.gnome.org/sources/gnome-disk-utility/42/gnome-disk-utility-42.0.tar.xz"
+MD5SUM="5c03e03bbe1042d58790d64a9cbc4e7d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libpwquality"
-MAINTAINER="Robby Workman"
-EMAIL="rworkman@slackbuilds.org"
+REQUIRES="libhandy"
+MAINTAINER="Bob Funk"
+EMAIL="bobfunk11@gmail.com"
diff --git a/system/gnome-disk-utility/slack-desc b/system/gnome-disk-utility/slack-desc
index 327f5ab536..1d984ca4b0 100644
--- a/system/gnome-disk-utility/slack-desc
+++ b/system/gnome-disk-utility/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                   |-----handy-ruler------------------------------------------------------|
-gnome-disk-utility: gnome-disk-utility (libs and apps for storage device handling)
-gnome-disk-utility:
-gnome-disk-utility: gnome-disk-utility provides libraries and applications for dealing
-gnome-disk-utility: with storage devices.
+gnome-disk-utility: gnome-disk-utility (GNOME Disks)
 gnome-disk-utility:
+gnome-disk-utility: GNOME Disks, gnome-disk-image-mounter and gsd-disk-utility-notify are
+gnome-disk-utility: libraries and applications for dealing with storage devices. 
 gnome-disk-utility:
 gnome-disk-utility:
 gnome-disk-utility:
 gnome-disk-utility:
 gnome-disk-utility:
+gnome-disk-utility: https://gitlab.gnome.org/GNOME/gnome-disk-utility
 gnome-disk-utility:
diff --git a/system/gnome-online-accounts/README b/system/gnome-online-accounts/README
new file mode 100644
index 0000000000..a0210017f8
--- /dev/null
+++ b/system/gnome-online-accounts/README
@@ -0,0 +1,10 @@
+GNOME Online Accounts is a single sign-on framework for GNOME. It aims 
+to provide a way for users to setup online accounts to be used by the 
+core system and core applications only. Calendar entries show up in 
+GNOME Shell, e-mail in Evolution, online storages are exposed as 
+GVolumes, and so on. 
+
+Below variables are avaiable for configuration:
+    GTKDOC=yes        : Build gtkdoc files
+    INTROSPECTION=no  : Disable introspection for this build
+    VALA=no           : Don't build Vala bindings
diff --git a/system/gnome-online-accounts/doinst.sh b/system/gnome-online-accounts/doinst.sh
new file mode 100644
index 0000000000..bd3e310279
--- /dev/null
+++ b/system/gnome-online-accounts/doinst.sh
@@ -0,0 +1,12 @@
+
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/gnome-online-accounts/gnome-online-accounts.SlackBuild b/system/gnome-online-accounts/gnome-online-accounts.SlackBuild
new file mode 100644
index 0000000000..4f9707a920
--- /dev/null
+++ b/system/gnome-online-accounts/gnome-online-accounts.SlackBuild
@@ -0,0 +1,134 @@
+#!/bin/bash
+
+# Slackware build script for gnome-online-accounts
+
+# Copyright 2020 Ozan Türkyılmaz
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=gnome-online-accounts
+VERSION=${VERSION:-3.44.0}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+GTKDOC=${GTKDOC:-no}
+INTROSPECTION=${INTROSPECTION:-yes}
+VALA=${VALA:-yes}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --enable-backend \
+  --enable-lastfm \
+  --enable-inspector \
+  --enable-kerberos \
+  --enable-media-server \
+  --enable-exchange \
+  --enable-windows-live \
+  --enable-facebook \
+  --enable-owncloud \
+  --enable-imap-smtp \
+  --enable-google \
+  --enable-foursquare \
+  --enable-flickr \
+  --enable-fedora \
+  --localstatedir=/var \
+  --enable-gtk-doc="$GTKDOC" \
+  --enable-gtk-doc-html="$GTKDOC" \
+  --enable-introspection="$INTROSPECTION" \
+  --enable-vala="$VALA" \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --disable-schemas-compile \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  ABOUT-NLS NEWS COPYING README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gnome-online-accounts/gnome-online-accounts.info b/system/gnome-online-accounts/gnome-online-accounts.info
new file mode 100644
index 0000000000..50182df85b
--- /dev/null
+++ b/system/gnome-online-accounts/gnome-online-accounts.info
@@ -0,0 +1,10 @@
+PRGNAM="gnome-online-accounts"
+VERSION="3.44.0"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
+DOWNLOAD="https://download.gnome.org/sources/gnome-online-accounts/3.44/gnome-online-accounts-3.44.0.tar.xz"
+MD5SUM="ae928c27456d3a3f911d964c28d10754"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="rest-legacy webkit2gtk"
+MAINTAINER="Ozan Türkyılmaz"
+EMAIL="ozan.turkyilmaz@gmail.com"
diff --git a/system/gnome-online-accounts/slack-desc b/system/gnome-online-accounts/slack-desc
new file mode 100644
index 0000000000..0736ac00fa
--- /dev/null
+++ b/system/gnome-online-accounts/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+                     |-----handy-ruler------------------------------------------------------|
+gnome-online-accounts: gnome-online-accounts (framework used to access GNOME online accounts)
+gnome-online-accounts:
+gnome-online-accounts: GNOME Online Accounts is a framework used for GNOME applications to
+gnome-online-accounts: access the user's online accounts.
+gnome-online-accounts:
+gnome-online-accounts: https://wiki.gnome.org/Projects/GnomeOnlineAccounts
+gnome-online-accounts:
+gnome-online-accounts:
+gnome-online-accounts:
+gnome-online-accounts:
+gnome-online-accounts:
diff --git a/system/gnome-pkgtool/README b/system/gnome-pkgtool/README
new file mode 100644
index 0000000000..2dd2173d95
--- /dev/null
+++ b/system/gnome-pkgtool/README
@@ -0,0 +1,19 @@
+This is a GTK+ front-end to the Slackware package management tools
+(pkgtool). With gnome-pkgtool you can do the following actions to your
+Slackware Linux installation:
+
+- Install .t?z packages
+- Uninstall installed packages
+- Re-install/upgrade installed packages
+- Inspect packages content
+
+For its function, gnome-pkgtool relies on installpkg and removepkg
+tools for installing and uninstalling packages.
+
+Upon start, gnome-pkgtool goes though /var/lib/pkgtools/packages/, so it
+may take some time to appear.
+
+NOTE!
+This program is from 2004. It seems to work fine, but keep it in mind.
+The option to build packages is deprecated (requires checkinstall), so
+it is patched out.
diff --git a/system/gnome-pkgtool/build_disable.patch b/system/gnome-pkgtool/build_disable.patch
new file mode 100644
index 0000000000..5332979c4b
--- /dev/null
+++ b/system/gnome-pkgtool/build_disable.patch
@@ -0,0 +1,71 @@
+diff -pruN old/src/main_window.c new/src/main_window.c
+--- old/src/main_window.c	2004-07-23 02:10:24.000000000 +0300
++++ new/src/main_window.c	2023-04-27 11:02:28.366906925 +0300
+@@ -21,7 +21,6 @@
+ #include "packages.h"
+ #include "details_window.h"
+ #include "progress_window.h"
+-#include "build_window.h"
+ #include "pkglist.h"
+ #include "gpt.h"
+ 
+@@ -37,8 +36,6 @@ static gboolean on_menu_close_cb (GtkWid
+                                   GptMainWindow *mw);
+ static gboolean on_menu_about_cb (GtkWidget     *widget,
+                                   GptMainWindow *mw);
+-static gboolean on_menu_build_cb (GtkWidget     *widget,
+-                                  GptMainWindow *mw);
+ static gboolean on_menu_install_cb (GtkWidget           *widget,
+                                     GptMainWindow       *mw);
+ static gboolean on_menu_refresh_cb (GtkWidget           *widget,
+@@ -128,13 +125,11 @@ gpt_main_window_set_property (GObject
+         if (g_value_get_boolean (val))
+           {
+             gtk_widget_set_sensitive (mw->priv->menu_install, FALSE);
+-            gtk_widget_set_sensitive (mw->priv->menu_build, FALSE);
+             gtk_widget_set_sensitive (mw->priv->btn_uninstall, FALSE);
+           }
+         else
+           {
+             gtk_widget_set_sensitive (mw->priv->menu_install, TRUE);
+-            gtk_widget_set_sensitive (mw->priv->menu_build, TRUE);
+             gtk_widget_set_sensitive (mw->priv->btn_uninstall, TRUE);
+           }
+         break;
+@@ -180,11 +175,6 @@ gpt_main_window_init (GptMainWindow *mw)
+         (gpointer) on_menu_install_cb, (gpointer) mw, NULL,
+         GNOME_APP_PIXMAP_STOCK, "gtk-add",
+         0, (GdkModifierType) 0, NULL },
+-      { GNOME_APP_UI_ITEM, "_Build From Source...",
+-	"Build package from source tarball",
+-	(gpointer) on_menu_build_cb, (gpointer) mw, NULL,
+-	GNOME_APP_PIXMAP_STOCK, "gtk-convert",
+-	0, (GdkModifierType) 0, NULL },
+       GNOMEUIINFO_SEPARATOR,
+       GNOMEUIINFO_MENU_CLOSE_ITEM (on_menu_close_cb, NULL),
+       GNOMEUIINFO_END
+@@ -233,7 +223,6 @@ gpt_main_window_init (GptMainWindow *mw)
+ 	
+   /* remember pointers to some menu items */
+   mw->priv->menu_install = menu_file_uiinfo[0].widget;
+-  mw->priv->menu_build = menu_file_uiinfo[1].widget;
+ 
+   /* paned */
+   align = gtk_alignment_new (0.5, 0.7, 1, 1);
+@@ -398,16 +387,6 @@ gpt_main_window_init (GptMainWindow *mw)
+ }
+ 
+ static gboolean
+-on_menu_build_cb (GtkWidget *widget, GptMainWindow *mw)
+-{
+-  GtkWidget *bw = gpt_build_window_new ();
+-  gtk_window_set_transient_for(GTK_WINDOW (bw), GTK_WINDOW (mw));
+-  gtk_window_set_destroy_with_parent (GTK_WINDOW (bw), TRUE);
+-  gtk_widget_show(bw);
+-  return TRUE;
+-}
+-
+-static gboolean
+ on_menu_about_cb (GtkWidget *widget, GptMainWindow *mw)
+ {
+   GtkWidget *dlg;
diff --git a/system/gnome-pkgtool/doinst.sh b/system/gnome-pkgtool/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/system/gnome-pkgtool/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/gnome-pkgtool/gnome-pkgtool.SlackBuild b/system/gnome-pkgtool/gnome-pkgtool.SlackBuild
new file mode 100644
index 0000000000..ed9b127fff
--- /dev/null
+++ b/system/gnome-pkgtool/gnome-pkgtool.SlackBuild
@@ -0,0 +1,124 @@
+#!/bin/bash
+
+# Slackware build script for gnome-pkgtool
+
+# Copyright 2023 Petar Petrov slackalaxy@gmail.com
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=gnome-pkgtool
+VERSION=${VERSION:-0.5.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# We don't want custom icons, because they are not scaled and some
+# appear huge. We also disable the functions to build a package, since
+# it's deprecated.
+patch -p1 -i $CWD/no_custom_icons.patch
+patch -p1 -i $CWD/build_disable.patch
+
+# Let's have icons that are a bit more modern
+cp -a $CWD/pixmaps/*.png pixmaps
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Remove this and use our desktop file instead
+rm -rf $PKG/usr/share/gnome
+mkdir -p $PKG/usr/share/applications
+cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications
+
+# This is 47x48 pixels and sbopkglint complains...
+convert $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png -resize 48x48! \
+  $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
+
+# Rename the doc dir and include some more documentation
+mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ABOUT-NLS TODO $PKG/usr/doc/$PRGNAM-$VERSION
+rm $PKG/usr/doc/$PRGNAM-$VERSION/INSTALL
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gnome-pkgtool/gnome-pkgtool.desktop b/system/gnome-pkgtool/gnome-pkgtool.desktop
new file mode 100644
index 0000000000..b25616d004
--- /dev/null
+++ b/system/gnome-pkgtool/gnome-pkgtool.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=GNOME pkgtool
+Comment=Slackware Linux package management tool
+Exec=gnome-pkgtool
+Icon=gnome-pkgtool
+StartupNotify=false
+Type=Application
+Categories=System
diff --git a/system/gnome-pkgtool/gnome-pkgtool.info b/system/gnome-pkgtool/gnome-pkgtool.info
new file mode 100644
index 0000000000..99ea3264e8
--- /dev/null
+++ b/system/gnome-pkgtool/gnome-pkgtool.info
@@ -0,0 +1,10 @@
+PRGNAM="gnome-pkgtool"
+VERSION="0.5.2"
+HOMEPAGE="http://gnome-pkgtool.sourceforge.net/"
+DOWNLOAD="http://sourceforge.net/projects/gnome-pkgtool/files/gnome-pkgtool/0.5.2/gnome-pkgtool-0.5.2.tar.gz"
+MD5SUM="e2e1ae9428f9fa8b1d308c55eb878bff"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libgnomeui vte2"
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.com"
diff --git a/system/gnome-pkgtool/no_custom_icons.patch b/system/gnome-pkgtool/no_custom_icons.patch
new file mode 100644
index 0000000000..34d363739a
--- /dev/null
+++ b/system/gnome-pkgtool/no_custom_icons.patch
@@ -0,0 +1,52 @@
+diff -pruN old/src/packages.c new/src/packages.c
+--- old/src/packages.c	2004-07-22 22:20:17.000000000 +0300
++++ new/src/packages.c	2021-05-16 19:12:35.881205853 +0300
+@@ -743,47 +743,7 @@ get_pixbuf_from_desktop (PkgEntry *entry
+ 	
+   str = g_malloc (256);
+   gboolean go = TRUE;
+-  while (((str = fgets (str, 255, desktop)) != NULL) && go)
+-    {
+-      if (fnmatch ("Icon=*", str, 0) == 0)
+-        {
+-          f = &str[5];
+-          if (index (f, '/'))
+-            {
+-              if ((p = index (f, '\n')))
+-                  *p = '\0';
+-              if (entry->pixbuf != NULL)
+-                  g_free (entry->pixbuf);
+-                  entry->pixbuf = gdk_pixbuf_new_from_file (f, NULL);
+-
+-              if(entry->pixbuf)
+-                {
+-                  go = FALSE;
+-                }
+-            }
+-          else
+-            {
+-              if ((p = index (f, '\n')))
+-                  *p = '\0';
+-              p = index (f, '.');
+-
+-              if(p && (strcmp (".png", p) == 0))
+-                  *p = '\0';
+-              else if(p && (strcmp (".gif", p) == 0))
+-                  *p = '\0';
+-              else if(p && (strcmp (".xpm", p) == 0))
+-                  *p = '\0';
+-              if (entry->pixbuf != NULL)
+-                  g_free (entry->pixbuf);
+-              
+-              entry->pixbuf =
+-                  gtk_icon_theme_load_icon (gtk_icon_theme_get_default(),
+-                                            f, 48, 0, NULL);
+-              go = FALSE;
+-            }
+-        }
+-    }
+-    
++   
+   g_free (str);
+   fclose (desktop);
+     
diff --git a/system/gnome-pkgtool/pixmaps/default-package.png b/system/gnome-pkgtool/pixmaps/default-package.png
new file mode 100644
index 0000000000..704d962d42
--- /dev/null
+++ b/system/gnome-pkgtool/pixmaps/default-package.png
diff --git a/system/gnome-pkgtool/pixmaps/gnome-package.png b/system/gnome-pkgtool/pixmaps/gnome-package.png
new file mode 100644
index 0000000000..59bba10250
--- /dev/null
+++ b/system/gnome-pkgtool/pixmaps/gnome-package.png
diff --git a/system/gnome-pkgtool/pixmaps/gtk-package.png b/system/gnome-pkgtool/pixmaps/gtk-package.png
new file mode 100644
index 0000000000..d35178859b
--- /dev/null
+++ b/system/gnome-pkgtool/pixmaps/gtk-package.png
diff --git a/system/gnome-pkgtool/pixmaps/kde-package.png b/system/gnome-pkgtool/pixmaps/kde-package.png
new file mode 100644
index 0000000000..5d3599224f
--- /dev/null
+++ b/system/gnome-pkgtool/pixmaps/kde-package.png
diff --git a/system/gnome-pkgtool/pixmaps/kernel-package.png b/system/gnome-pkgtool/pixmaps/kernel-package.png
new file mode 100644
index 0000000000..e3f93dd478
--- /dev/null
+++ b/system/gnome-pkgtool/pixmaps/kernel-package.png
diff --git a/system/gnome-pkgtool/pixmaps/lib-package.png b/system/gnome-pkgtool/pixmaps/lib-package.png
new file mode 100644
index 0000000000..24d4b392f4
--- /dev/null
+++ b/system/gnome-pkgtool/pixmaps/lib-package.png
diff --git a/system/gnome-pkgtool/slack-desc b/system/gnome-pkgtool/slack-desc
new file mode 100644
index 0000000000..05885efa15
--- /dev/null
+++ b/system/gnome-pkgtool/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+gnome-pkgtool: gnome-pkgtool (A GTK+ front-end to pkgtool)
+gnome-pkgtool:
+gnome-pkgtool: With gnome-pkgtool you can do the following: 
+gnome-pkgtool: 1) Install .T?Z packages
+gnome-pkgtool: 2) Uninstall installed packages
+gnome-pkgtool: 3) Re-install/upgrade installed packages
+gnome-pkgtool: 4) Inspect packages content
+gnome-pkgtool:
+gnome-pkgtool:
+gnome-pkgtool:
+gnome-pkgtool:
diff --git a/system/gnome-terminal/README b/system/gnome-terminal/README
index ff0e0b5659..bb0ccbd191 100644
--- a/system/gnome-terminal/README
+++ b/system/gnome-terminal/README
@@ -1,29 +1,11 @@
-========================================================================
+GNOME Terminal is a terminal emulation application that you can use to
+perform the following actions:
 
-This is the GNOME terminal emulator application.  gnome-terminal is    
-only the shell (menubar, prefs dialog); the terminal emulation ("stuff 
-in the middle") comes from the VTE widget.
+Access a UNIX shell in the GNOME environment.
 
-How it works:
+Run any application that is designed to run on VT102, VT220, and xterm
+terminals.
 
-Profiles - 
-  all settings are stored in profiles. prefs dialog edits the current
-  profile
-
-Session - 
-  just the number of open windows/tabs and their profile is stored
-  per-session
- 
-Command line options - 
-  do not overlap things that are preferences
-  
-========================================================================
-
-POST INSTALL RUN:
-
-bash# killall gconfd-2
-
-The terminal doesn't launch until that is done.
-Have no idea why, if you do please let me know =D
-
-========================================================================
+GNOME Terminal accepts all of the escape sequences that the VT102 and
+VT220 terminals use for functions such as positioning the cursor and 
+clearing the screen.
diff --git a/system/gnome-terminal/doinst.sh b/system/gnome-terminal/doinst.sh
index 7099757b97..401d987795 100644
--- a/system/gnome-terminal/doinst.sh
+++ b/system/gnome-terminal/doinst.sh
@@ -13,7 +13,3 @@ if [ -e usr/share/glib-2.0/schemas ]; then
     /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
   fi
 fi
-
-if [ -x usr/bin/rarian-sk-update ]; then
-  usr/bin/rarian-sk-update 1> /dev/null 2> /dev/null
-fi
diff --git a/system/gnome-terminal/gnome-terminal.SlackBuild b/system/gnome-terminal/gnome-terminal.SlackBuild
index 9cefa9852b..ee9ec628c3 100644
--- a/system/gnome-terminal/gnome-terminal.SlackBuild
+++ b/system/gnome-terminal/gnome-terminal.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gnome-terminal
 
-# Copyright 2015 Thorn-Inurcide USA
+# Copyright 2022 Bob Funk Winnipeg, Canada
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gnome-terminal
-VERSION=${VERSION:-2.32.1}
+VERSION=${VERSION:-3.43.90}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,7 +67,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,27 +76,35 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-static \
-  --disable-scrollkeeper \
-  --disable-maintainer-mode \
-  --build=$ARCH-slackware-linux \
-
-make
-make install DESTDIR=$PKG
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+mv $PKG/usr/share/man $PKG/usr/man
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog* COPYING HACKING NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING COPYING.GFDL ChangeLog README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -97,4 +112,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gnome-terminal/gnome-terminal.info b/system/gnome-terminal/gnome-terminal.info
index e9dce86924..65ad079301 100644
--- a/system/gnome-terminal/gnome-terminal.info
+++ b/system/gnome-terminal/gnome-terminal.info
@@ -1,10 +1,10 @@
 PRGNAM="gnome-terminal"
-VERSION="2.32.1"
-HOMEPAGE="https://www.gnome.org"
-DOWNLOAD="https://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.32/gnome-terminal-2.32.1.tar.gz"
-MD5SUM="cb7843b97a78a3bbaac9381f78bb8569"
+VERSION="3.43.90"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-terminal"
+DOWNLOAD="https://download.gnome.org/sources/gnome-terminal/3.43/gnome-terminal-3.43.90.tar.xz"
+MD5SUM="8b5ba5c64e3f2e33d82b96f914b8e5a3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libgnome rarian"
-MAINTAINER="Thorn Inurcide"
-EMAIL="thorn-inurcide@hotmail.com"
+REQUIRES="gnome-shell nautilus"
+MAINTAINER="Bob Funk"
+EMAIL="bobfunk11@gmail.com"
diff --git a/system/gnome-terminal/slack-desc b/system/gnome-terminal/slack-desc
index 8693da8224..389c8853d0 100644
--- a/system/gnome-terminal/slack-desc
+++ b/system/gnome-terminal/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
               |-----handy-ruler------------------------------------------------------|
-gnome-terminal: gnome-terminal (GNOME terminal)
+gnome-terminal: gnome-terminal (GNOME Terminal Emulator)
 gnome-terminal:
-gnome-terminal: This is the GNOME terminal
+gnome-terminal: Terminal is a terminal emulator application for accessing a 
+gnome-terminal: UNIX shell environment which can be used to run programs 
+gnome-terminal: available on your system. 
 gnome-terminal:
 gnome-terminal:
 gnome-terminal:
 gnome-terminal:
+gnome-terminal: https://gitlab.gnome.org/GNOME/gnome-terminal
 gnome-terminal:
-gnome-terminal:
-gnome-terminal:
-gnome-terminal: Home: gnome.org
diff --git a/system/gnome-vfs/gnome-vfs.SlackBuild b/system/gnome-vfs/gnome-vfs.SlackBuild
index 2a2e087339..c30e90ed9b 100644
--- a/system/gnome-vfs/gnome-vfs.SlackBuild
+++ b/system/gnome-vfs/gnome-vfs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for gnome-vfs
 #
@@ -22,26 +22,36 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gnome-vfs
 VERSION=${VERSION:-2.24.4}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,6 +79,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p0 < $CWD/openssl-1.1.patch
+
 # Fix for the newer glib
 sed -i "/-DG_DISABLE_DEPRECATED/d" */Makefile.*
 
@@ -90,9 +102,11 @@ cp -a AUTHORS COPYING* ChangeLog HACKING INSTALL MAINTAINERS NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gnome-vfs/openssl-1.1.patch b/system/gnome-vfs/openssl-1.1.patch
new file mode 100644
index 0000000000..14207f28d1
--- /dev/null
+++ b/system/gnome-vfs/openssl-1.1.patch
@@ -0,0 +1,26 @@
+$NetBSD: patch-libgnomevfs_gnome-vfs-ssl.c,v 1.1 2018/02/16 13:18:26 wiz Exp $
+
+struct SSL is opaque in openssl-1.1; and the SSL_free() man page
+says that one should not free members of it manually (in both
+the openssl-1.0 and openssl-1.1 man pages).
+
+--- libgnomevfs/gnome-vfs-ssl.c.orig	2010-02-09 12:16:14.000000000 +0000
++++ libgnomevfs/gnome-vfs-ssl.c
+@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
+ 			}
+ 		}
+ 
+-                if (ssl->private->ssl->ctx)
+-                        SSL_CTX_free (ssl->private->ssl->ctx);
+-
+                 SSL_free (ssl->private->ssl);
+ 		g_free (ssl->private);
+ 		g_free (ssl);
+@@ -705,7 +702,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl,
+ 		}
+ 	}
+ 	
+-	SSL_CTX_free (ssl->private->ssl->ctx);
+ 	SSL_free (ssl->private->ssl);
+ 	close (ssl->private->sockfd);
+ 	if (ssl->private->timeout)
diff --git a/system/gnomint/doinst.sh b/system/gnomint/doinst.sh
index bae04666ba..6d1bccdc33 100644
--- a/system/gnomint/doinst.sh
+++ b/system/gnomint/doinst.sh
@@ -6,9 +6,8 @@ if [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
 
-if [ -x usr/bin/gconftool-2 ]; then
-  ( cd $PKG/etc/gconf/schemas
-  GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
-  usr/bin/gconftool-2 --makefile-install-rule \
-  etc/gconf/schemas/gnomint.schemas >/dev/null 2>&1 )
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
 fi
diff --git a/system/gnomint/gnomint.SlackBuild b/system/gnomint/gnomint.SlackBuild
index 9f043f0c90..02610a69b2 100644
--- a/system/gnomint/gnomint.SlackBuild
+++ b/system/gnomint/gnomint.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gnomint
 
-# Copyright 2012-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2012-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,18 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220211 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - fix build on 15.0.
+# - validate .desktop file.
+# - don't install useless files in doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gnomint
 VERSION=${VERSION:-1.3.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,7 +66,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="AUTHORS BUGS COPYING ChangeLog INSTALL MAINTAINERS NEWS README TODO"
+# 20220211 bkw: BUGS is a 0-byte placeholder, INSTALL is generic
+# "how to run ./configure", don't include in package.
+DOCS="AUTHORS COPYING ChangeLog MAINTAINERS NEWS README TODO"
 
 set -e 
 
@@ -67,13 +81,22 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# Apply debian patches
+for i in $CWD/patches/* ; do patch -p1 -i $i ; done
 
-cp Makefile.in m4/
+# 20220211 bkw: not only is G_STATIC_MUTEX_INIT deprecated, it causes
+# the build to fail. according to the glib2 docs, it's not needed anyway:
+# "It is not necessary to initialize a mutex that has been statically
+# allocated", from https://docs.gtk.org/glib/method.Mutex.init.html.
+sed -i 's, *= *G_STATIC_MUTEX_INIT,,' \
+  src/csr_creation.c \
+  src/ca_creation.c
 
-sed -i 's|CFLAGS="-Wall -Werror "|CFLAGS="${CFLAGS:--Wall -Werror}"|' configure.ac configure
+autoreconf -fi
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -87,10 +110,12 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# 20220211 bkw: desktop-file-validate nitpicking.
+sed -i -e '/^Categories/s,Application,GTK,' \
+       -e '/^Icon/s,=.*,=/usr/share/pixmaps/gnomint.png,' \
+  $PKG/usr/share/applications/gnomint.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
@@ -101,4 +126,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gnomint/gnomint.info b/system/gnomint/gnomint.info
index e3e2df444b..6989cb51ae 100644
--- a/system/gnomint/gnomint.info
+++ b/system/gnomint/gnomint.info
@@ -1,7 +1,7 @@
 PRGNAM="gnomint"
 VERSION="1.3.0"
 HOMEPAGE="https://sourceforge.net/projects/gnomint/"
-DOWNLOAD="https://downloads.sf.net/gnomint/gnomint-1.3.0.tar.gz"
+DOWNLOAD="https://sourceforge.net/projects/gnomint/files/1.3.0/gnomint-1.3.0.tar.gz"
 MD5SUM="32d6fa9be8c47325fa5b337a99c7e006"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/gnomint/patches/01-ldd.patch b/system/gnomint/patches/01-ldd.patch
deleted file mode 100644
index 0f92419fb0..0000000000
--- a/system/gnomint/patches/01-ldd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Daniel Baumann <daniel@debian.org>
-Description: Explicitly linking against libgcrypt.
-
-diff -Naurp gnomint.orig/src/Makefile.in gnomint/src/Makefile.in
---- gnomint.orig/src/Makefile.in	2011-05-17 19:57:50.013883380 +0200
-+++ gnomint/src/Makefile.in	2011-05-17 19:57:37.209981808 +0200
-@@ -347,6 +347,7 @@ gnomint_cli_SOURCES = \
- 
- gnomint_cli_LDADD = \
- 	$(GNOMINTCLI_LIBS) \
-+	$(LIBGCRYPT_LIBS) \
- 	$(LIBGNUTLS_LIBS) \
- 	$(SQLITE_LIBS) \
- 	$(READLINE_LIBS) \
diff --git a/system/gnomint/patches/01_cflags.patch b/system/gnomint/patches/01_cflags.patch
new file mode 100644
index 0000000000..abf31b6357
--- /dev/null
+++ b/system/gnomint/patches/01_cflags.patch
@@ -0,0 +1,15 @@
+Author: Daniel Baumann <daniel@debian.org>
+Description:
+ Don't hardcode CFLAGS and respect the environment (Closes: #634395).
+
+--- gnomint-1.3.0.orig/configure.ac
++++ gnomint-1.3.0/configure.ac
+@@ -182,7 +182,7 @@
+ 
+ dnl
+ if test "x$GCC" = "xyes"; then
+-	CFLAGS="-Wall -Werror "
++	CFLAGS="${CFLAGS:--Wall}"
+ 	if test "x$use_debug" = "xYes"; then
+    	   CFLAGS="$CFLAGS -g -O0"
+ 	fi
diff --git a/system/gnomint/patches/02-cflags.patch b/system/gnomint/patches/02-cflags.patch
deleted file mode 100644
index 59e4f71943..0000000000
--- a/system/gnomint/patches/02-cflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Daniel Baumann <daniel@debian.org>
-Description:
- Don't hardcode CFLAGS and respect the environemnt (Closes: #634395).
-
-diff -Naurp gnomint.orig/configure gnomint/configure
---- gnomint.orig/configure	2011-09-08 07:58:09.324752523 +0000
-+++ gnomint/configure	2011-09-08 07:59:20.113103539 +0000
-@@ -14338,7 +14338,7 @@ fi
- 
- 
- if test "x$GCC" = "xyes"; then
--	CFLAGS="-Wall -Werror"
-+	CFLAGS="${CFLAGS:--Wall -Werror}"
- 	if test "x$use_debug" = "xYes"; then
-    	   CFLAGS="$CFLAGS -g -O0"
- 	fi
-diff -Naurp gnomint.orig/configure.in gnomint/configure.in
---- gnomint.orig/configure.in	2011-09-08 07:58:09.328752536 +0000
-+++ gnomint/configure.in	2011-09-08 07:59:20.113103539 +0000
-@@ -181,7 +181,7 @@ dnl
- 
- dnl
- if test "x$GCC" = "xyes"; then
--	CFLAGS="-Wall -Werror"
-+	CFLAGS="${CFLAGS:--Wall -Werror}"
- 	if test "x$use_debug" = "xYes"; then
-    	   CFLAGS="$CFLAGS -g -O0"
- 	fi
diff --git a/system/gnomint/patches/02_682432.patch b/system/gnomint/patches/02_682432.patch
new file mode 100644
index 0000000000..96905965a9
--- /dev/null
+++ b/system/gnomint/patches/02_682432.patch
@@ -0,0 +1,16 @@
+Description: Fix double free in tls_creation_data_free.
+Author: Sebastian Ramacher <s.ramacher@gmx.at>
+Bug-Debian: http://bugs.debian.org/682432
+Last-Update: 2012-08-04
+
+--- gnomint-1.3.0.orig/src/tls.c
++++ gnomint-1.3.0/src/tls.c
+@@ -1665,8 +1665,6 @@
+ 		g_free (cd->emailAddress);
+ 	if (cd->password)
+ 		g_free (cd->password);
+-        if (cd->crl_distribution_point)
+-                g_free (cd->crl_distribution_point);
+         if (cd->parent_ca_id_str)
+                 g_free (cd->parent_ca_id_str);
+ 	if (cd->crl_distribution_point)
diff --git a/system/gnomint/patches/03_fix-autoreconf.patch b/system/gnomint/patches/03_fix-autoreconf.patch
new file mode 100644
index 0000000000..ee3a247889
--- /dev/null
+++ b/system/gnomint/patches/03_fix-autoreconf.patch
@@ -0,0 +1,16 @@
+Description: Fix autoreconf failure.
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2018-09-01
+---
+
+--- gnomint-1.3.0.orig/configure.ac
++++ gnomint-1.3.0/configure.ac
+@@ -198,7 +198,6 @@
+ AC_OUTPUT([
+ Makefile
+ src/Makefile
+-m4/Makefile
+ gui/Makefile
+ po/Makefile.in
+ mime/Makefile
diff --git a/system/gnomint/patches/04_gsettings-port.patch b/system/gnomint/patches/04_gsettings-port.patch
new file mode 100644
index 0000000000..5594012cd5
--- /dev/null
+++ b/system/gnomint/patches/04_gsettings-port.patch
@@ -0,0 +1,383 @@
+Description: Port to GSettings.
+Bug-Debian: https://bugs.debian.org/885817
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2019-10-15
+---
+
+--- gnomint-1.3.0.orig/configure.ac
++++ gnomint-1.3.0/configure.ac
+@@ -61,7 +61,6 @@
+ GNUTLS_ADVANCED_FEATURES_MINIMUM_VERSION=2.7.4
+ SQLITE_REQUIRED=3.0
+ GLIB_REQUIRED=2.6.0
+-GCONF_REQUIRED=2.0
+ GTK_REQUIRED=2.12.0
+ ISO_CODES_REQUIRED=0.35
+ 
+@@ -84,7 +83,6 @@
+ PKG_CHECK_MODULES(GNOMINT, 
+ 	glib-2.0 >= $GLIB_REQUIRED \
+ 	gthread-2.0 >= $GLIB_REQUIRED \
+-	gconf-2.0 >= $GCONF_REQUIRED \
+ 	gtk+-2.0 >= $GTK_REQUIRED \
+ 	gdk-pixbuf-2.0 \
+ 	gnutls >= $GNUTLS_REQUIRED \
+@@ -111,8 +109,7 @@
+ AC_SUBST(READLINE_LIBS)
+ 
+ PKG_CHECK_MODULES(GNOMINTCLI, 
+-	glib-2.0 >= $GLIB_REQUIRED \
+-	gconf-2.0 >= $GCONF_REQUIRED \
++	gio-2.0 >= $GLIB_REQUIRED \
+ 	gnutls >= $GNUTLS_REQUIRED \
+ )
+ AC_SUBST(GNOMINTCLI_CFLAGS)
+@@ -150,17 +147,7 @@
+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+ AC_SUBST(GLIB_GENMARSHAL)
+ 
+-dnl The following conditional is set in AM_GCONF_SOURCE_2.
+-dnl Because we may skip its execution, we have to set a default here.
+-m4_pattern_allow([^AM_GCONF_SOURCE_2$])
+-AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
+-GCONFTOOL=""
+-AC_CHECK_PROG(GCONFTOOL, gconftool-2, gconftool-2)
+-if test x"$GCONFTOOL" = x; then
+-	AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+-fi
+-AM_GCONF_SOURCE_2
+-
++GLIB_GSETTINGS
+ 
+ dnl
+ dnl Check if src should be build with the debug mode
+--- gnomint-1.3.0.orig/gconf/Makefile.am
++++ gnomint-1.3.0/gconf/Makefile.am
+@@ -1,21 +1,5 @@
+-schemasdir = @GCONF_SCHEMA_FILE_DIR@
+-schemas_in_files = gnomint.schemas.in
+-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
++gsettings_SCHEMAS = net.sf.gnomint.gschema.xml
+ 
+-@INTLTOOL_SCHEMAS_RULE@
++@GSETTINGS_RULES@
+ 
+-EXTRA_DIST = $(schemas_in_files)
+-
+-CLEANFILES = $(schemas_DATA)
+-
+-if GCONF_SCHEMAS_INSTALL
+-# don't do this if we are building in eg. rpm
+-install-data-local: $(schemas_DATA)
+-	if test -z "$(DESTDIR)" ; then \
+-		for p in $(schemas_DATA) ; do \
+-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
+-		done \
+-	fi
+-else
+-install-data-local:
+-endif
++EXTRA_DIST = $(gsettings_SCHEMAS)
+--- gnomint-1.3.0.orig/src/preferences-gui.h
++++ gnomint-1.3.0/src/preferences-gui.h
+@@ -20,6 +20,8 @@
+ #ifndef _PREFERENCES_H_
+ #define _PREFERENCES_H_
+ 
++#include <gio/gio.h>
++
+ typedef void (* PreferencesGuiChangeCallback) (gboolean, gboolean);
+ 
+ void preferences_gui_set_csr_visible_callback (PreferencesGuiChangeCallback callback);
+@@ -43,10 +45,8 @@
+ void preferences_deinit (void);
+ 
+ 
+-#include <gconf/gconf-client.h>
+-void preferences_changed_callback(GConfClient* client,
+-                                  guint cnxn_id,
+-                                  GConfEntry *entry,
++void preferences_changed_callback(GSettings* settings,
++                                  gchar *key,
+                                   gpointer user_data);
+ 
+ 
+--- gnomint-1.3.0.orig/src/preferences-gui.c
++++ gnomint-1.3.0/src/preferences-gui.c
+@@ -18,7 +18,6 @@
+ //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ #include <string.h>
+-#include <gconf/gconf-client.h>
+ 
+ 
+ #include "preferences-gui.h"
+@@ -26,7 +25,7 @@
+ #include <glib/gi18n.h>
+ 
+ 
+-static GConfClient * preferences_client;
++static GSettings * preferences;
+ 
+ PreferencesGuiChangeCallback csr_visible_callback = NULL;
+ PreferencesGuiChangeCallback revoked_visible_callback = NULL;
+@@ -42,18 +41,19 @@
+ }
+ 
+ 
+-void preferences_changed_callback(GConfClient* client,
+-                                  guint cnxn_id,
+-                                  GConfEntry *entry,
++void preferences_changed_callback(GSettings* settings,
++                                  gchar *key,
+                                   gpointer user_data)
+ {
+ 
+-        gboolean value = gconf_value_get_bool (gconf_entry_get_value(entry));
+-        if (! strcmp (gconf_entry_get_key(entry), "/apps/gnomint/crq_visible") && csr_visible_callback)
+-                csr_visible_callback (value, TRUE);
+-
+-        if (! strcmp (gconf_entry_get_key(entry), "/apps/gnomint/revoked_visible") && revoked_visible_callback)
+-                revoked_visible_callback (value, TRUE);
++        if (! strcmp (key, "crq-visible") && csr_visible_callback)
++                csr_visible_callback (g_settings_get_boolean (settings, key),
++                                      TRUE);
++
++        if (! strcmp (key, "revoked-visible") && revoked_visible_callback)
++                revoked_visible_callback (g_settings_get_boolean
++                                          (settings, key),
++                                          TRUE);
+ 
+ }
+ 
+@@ -61,72 +61,62 @@
+ 
+ void preferences_init (int argc, char ** argv)
+ {
+-        gconf_init(argc, argv, NULL);
+-        
+-        preferences_client = gconf_client_get_default();
+-
+-        gconf_client_add_dir(preferences_client,
+-                             "/apps/gnomint",
+-                             GCONF_CLIENT_PRELOAD_NONE,
+-                             NULL);
+-
+-        gconf_client_notify_add (preferences_client, "/apps/gnomint/revoked_visible",
+-                                 preferences_changed_callback,
+-                                 NULL, NULL, NULL);
+-
+-        gconf_client_notify_add (preferences_client, "/apps/gnomint/crq_visible",
+-                                 preferences_changed_callback,
+-                                 NULL, NULL, NULL);
+-
++        preferences = g_settings_new ("net.sf.gnomint");
+ 
++        g_signal_connect (preferences, "changed",
++                          G_CALLBACK (preferences_changed_callback), NULL);
+ }
+ 
+ 
+ gchar * preferences_get_size ()
+ {
+-        return gconf_client_get_string (preferences_client, "/apps/gnomint/size", NULL);
++        return g_settings_get_string (preferences, "size");
+ }
+ 
+ void preferences_set_size (const gchar *new_value)
+ {
+-        gconf_client_set_string (preferences_client, "/apps/gnomint/size", new_value, NULL);
++        g_settings_set_string (preferences, "size", new_value);
++        /* Make sure the backend manages to write the setting,
++           otherwise the program exits too quickly and a garbage value
++           gets written, leading to a crash on next startup.  */
++        g_settings_sync ();
+ }
+ 
+ 
+ gboolean preferences_get_revoked_visible ()
+ {
+-        return gconf_client_get_bool (preferences_client, "/apps/gnomint/revoked_visible", NULL);
++        return g_settings_get_boolean (preferences, "revoked-visible");
+ }
+ 
+ void preferences_set_revoked_visible (gboolean new_value)
+ {
+-        gconf_client_set_bool (preferences_client, "/apps/gnomint/revoked_visible", new_value, NULL);
++        g_settings_set_boolean (preferences, "revoked-visible", new_value);
+ }
+ 
+ gboolean preferences_get_crq_visible ()
+ {
+-        return gconf_client_get_bool (preferences_client, "/apps/gnomint/crq_visible", NULL);
++        return g_settings_get_boolean (preferences, "crq-visible");
+ }
+ 
+ void preferences_set_crq_visible (gboolean new_value)
+ {
+-        gconf_client_set_bool (preferences_client, "/apps/gnomint/crq_visible", new_value, NULL);
++        g_settings_set_boolean (preferences, "crq-visible", new_value);
+ }
+ 
+ gboolean preferences_get_gnome_keyring_export ()
+ {
+-        return gconf_client_get_bool (preferences_client, "/apps/gnomint/gnome_keyring_export", NULL);
++        return g_settings_get_boolean (preferences, "gnome-keyring-export");
+ }
+ 
+ void preferences_set_gnome_keyring_export (gboolean new_value)
+ {
+-        gconf_client_set_bool (preferences_client, "/apps/gnomint/gnome_keyring_export", new_value, NULL);
++        g_settings_set_boolean (preferences, "gnome-keyring-export", new_value);
+ }
+ 
+ 
+ void preferences_deinit ()
+ {
+-        g_object_unref (preferences_client);
+-        preferences_client = NULL;
++        g_object_unref (preferences);
++        preferences = NULL;
+ }
+ 
+--- gnomint-1.3.0.orig/src/preferences.c
++++ gnomint-1.3.0/src/preferences.c
+@@ -18,36 +18,35 @@
+ //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ #include <libintl.h>
+-#include <gconf/gconf-client.h>
++#include <gio/gio.h>
+ 
+ #include <glib/gi18n.h>
+ 
+ #include "preferences.h"
+ 
+ 
+-static GConfEngine * preferences_engine;
++static GSettings * preferences;
+ 
+ void preferences_init (int argc, char **argv)
+ {
+-        gconf_init (argc, argv, NULL);
+-        preferences_engine = gconf_engine_get_default ();
++        preferences = g_settings_new ("net.sf.gnomint");
+ }
+ 
+ 
+ gboolean preferences_get_gnome_keyring_export ()
+ {
+-        return gconf_engine_get_bool (preferences_engine, "/apps/gnomint/gnome_keyring_export", NULL);
++        return g_settings_get_boolean (preferences, "gnome-keyring-export");
+ }
+ 
+ void preferences_set_gnome_keyring_export (gboolean new_value)
+ {
+-        gconf_engine_set_bool (preferences_engine, "/apps/gnomint/gnome_keyring_export", new_value, NULL);
++        g_settings_set_boolean (preferences, "gnome-keyring-export", new_value);
+ }
+ 
+ 
+ void preferences_deinit ()
+ {
+-        gconf_engine_unref (preferences_engine);
+-        preferences_engine = NULL;
++        g_object_unref (preferences);
++        preferences = NULL;
+ }
+ 
+--- gnomint-1.3.0.orig/gconf/gnomint.schemas.in
++++ /dev/null
+@@ -1,58 +0,0 @@
+-<gconfschemafile>
+-  <schemalist>
+-    <schema>
+-      <key>/schemas/apps/gnomint/size</key>
+-      <applyto>/apps/gnomint/size</applyto>
+-      <owner>gnomint</owner>
+-      <type>string</type>
+-      <default>(500,400)</default>
+-      <locale name="C">
+-        <short>Window size</short> <long>The (width,length) size
+-        gnoMint should take when started. This cannot be smaller than
+-        (320,200).
+-        </long>
+-      </locale>
+-    </schema>
+- 
+-    <schema>
+-      <key>/schemas/apps/gnomint/revoked_visible</key>
+-      <applyto>/apps/gnomint/revoked_visible</applyto>
+-      <owner>gnomint</owner>
+-      <type>bool</type>
+-      <default>0</default>
+-      <locale name="C">
+-        <short>Revoked certificates visibility</short>
+-        <long>Whether the revoked certificates should be visible.
+-        </long>
+-      </locale>
+-    </schema>
+-
+-    <schema>
+-      <key>/schemas/apps/gnomint/crq_visible</key>
+-      <applyto>/apps/gnomint/crq_visible</applyto>
+-      <owner>gnomint</owner>
+-      <type>bool</type>
+-      <default>1</default>
+-      <locale name="C">
+-        <short>Certificate requests visibility</short>
+-        <long>Whether the certificate requests should be visible.
+-        </long>
+-      </locale>
+-    </schema>
+-
+-    <schema>
+-      <key>/schemas/apps/gnomint/gnome_keyring_export</key>
+-      <applyto>/apps/gnomint/gnome_keyring_export</applyto>
+-      <owner>gnomint</owner>
+-      <type>bool</type>
+-      <default>1</default>
+-      <locale name="C">
+-        <short>Automatic exporting of certificates for gnome-keyring</short>
+-        <long>Whether the created or imported certificates are
+-        automatically exported to gnome-keyring certificate-store.
+-        </long>
+-      </locale>
+-    </schema>
+-
+-  </schemalist>
+-</gconfschemafile>
+--- /dev/null
++++ gnomint-1.3.0/gconf/net.sf.gnomint.gschema.xml
+@@ -0,0 +1,30 @@
++<schemalist gettext-domain="gnomint">
++  <schema id="net.sf.gnomint" path="/net/sf/gnomint/">
++    <key name="size" type="s">
++      <default>'(500,400)'</default>
++      <summary>Window size</summary>
++      <description>The (width,length) size gnoMint should take when
++      started. This cannot be smaller than (320,200).</description>
++    </key>
++    <key name="revoked-visible" type="b">
++      <default>false</default>
++      <summary>Revoked certificates visibility</summary>
++      <description>Whether the revoked certificates should be
++      visible.</description>
++    </key>
++    <key name="crq-visible" type="b">
++      <default>true</default>
++      <summary>Certificate requests visibility</summary>
++      <description>Whether the certificate requests should be
++      visible.</description>
++    </key>
++    <key name="gnome-keyring-export" type="b">
++      <default>true</default>
++      <summary>Automatic exporting of certificates for
++      gnome-keyring</summary>
++      <description>Whether the created or imported certificates are
++      automatically exported to gnome-keyring
++      certificate-store.</description>
++    </key>
++  </schema>
++</schemalist>
diff --git a/system/gnomint/patches/05_export-private-key-crash.patch b/system/gnomint/patches/05_export-private-key-crash.patch
new file mode 100644
index 0000000000..e0a3fd2bcb
--- /dev/null
+++ b/system/gnomint/patches/05_export-private-key-crash.patch
@@ -0,0 +1,83 @@
+Description: Fix crash when exporting the private key.
+ In ca_on_extractprivatekey1_activate, when calling
+ gtk_tree_model_get, GLib attempts to assign a guint64 value to a
+ variable declared gint (CA_MODEL_COLUMN_ID is defined as type
+ G_TYPE_UINT64 in the tree store).  This corrupts the stack and also
+ invalidates the iter.
+ .
+ While investigating this, I noticed that the program happily leaks
+ GtkTreeIter's.  Every time the user selects a certificate from the
+ tree view, the callback ca_treeview_selection_change invokes
+ __ca_selection_type which makes a copy of the iter with
+ gtk_tree_iter_copy.  If the user chooses some action from the popup
+ menu, the toolbar or the main menu, __ca_selection_type is called
+ once again in the widget's callback function, copying another iter.
+ AFAICT these are never freed for the lifetime of the program.
+ .
+ This is not addressed by the patch as it would require some changes,
+ but it could be a source of trouble and something to watch out if
+ bugs like this pop up.  According to the GTK+ API documentation,
+ gtk_tree_iter_copy is not supposed to be used by applications;
+ GtkTreeIter structs should be copied by value.
+Bug-Debian: https://bugs.debian.org/855200
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2018-09-02
+---
+
+--- gnomint-1.3.0.orig/src/ca.c
++++ gnomint-1.3.0/src/ca.c
+@@ -922,7 +922,7 @@
+ 	GObject *widget = NULL;
+ 	gchar * filename = NULL;
+ 	GtkDialog * dialog = NULL;
+-	gint id;
++	guint64 id;
+ 	gchar * strerror = NULL;
+ 
+ 	widget = gtk_builder_get_object (main_window_gtkb, "main_window1");
+@@ -973,7 +973,7 @@
+ 	GObject *widget = NULL;
+ 	gchar * filename = NULL;
+ 	GtkDialog * dialog = NULL;
+-	gint id;
++	guint64 id;
+         gchar * error_msg = NULL;
+ 
+ 	widget = gtk_builder_get_object (main_window_gtkb, "main_window1");
+@@ -1022,7 +1022,7 @@
+ 	GObject *widget = NULL;
+ 	gchar * filename = NULL;
+ 	GtkDialog * dialog = NULL;
+-	gint id;
++	guint64 id;
+ 
+         gchar *error_msg = NULL;
+ 
+@@ -1181,7 +1181,7 @@
+ 	GtkTreeIter *iter;	
+ 	gint type;
+ 	gchar *filename = NULL;
+-	gint id;
++	guint64 id;
+ 
+ 	type = __ca_selection_type (GTK_TREE_VIEW(gtk_builder_get_object (main_window_gtkb, "ca_treeview")), &iter);
+ 
+@@ -1212,7 +1212,7 @@
+ 	GtkTreeIter *iter;	
+ 	gint type = __ca_selection_type (GTK_TREE_VIEW(gtk_builder_get_object (main_window_gtkb, "ca_treeview")), &iter);
+ 	gint response = 0;
+-	gint id = 0;
++	guint64 id = 0;
+ 
+ 	if (type == CA_FILE_ELEMENT_TYPE_CSR)
+ 		return;
+@@ -1267,7 +1267,7 @@
+ 	GtkTreeIter *iter;	
+ 	gint type = __ca_selection_type (GTK_TREE_VIEW(gtk_builder_get_object (main_window_gtkb, "ca_treeview")), &iter);
+ 	gint response = 0;
+-	gint id = 0;
++	guint64 id = 0;
+ 
+ 	if (type != CA_FILE_ELEMENT_TYPE_CSR)
+ 		return;
diff --git a/system/gnomint/patches/06_desktop-file.patch b/system/gnomint/patches/06_desktop-file.patch
new file mode 100644
index 0000000000..a6b73b084a
--- /dev/null
+++ b/system/gnomint/patches/06_desktop-file.patch
@@ -0,0 +1,22 @@
+Description: Add code to Exec key, remove Encoding key, add Keywords key.
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2018-09-01
+---
+
+--- gnomint-1.3.0.orig/gui/gnomint.desktop.in
++++ gnomint-1.3.0/gui/gnomint.desktop.in
+@@ -2,11 +2,11 @@
+ _Name=gnoMint X.509 CA Manager
+ GenericName=gnoMint X.509 CA Manager
+ _Comment=Manage X.509 certificates and CAs, easily and graphically
+-Exec=gnomint
++_Keywords=certificate;x.509;encryption;
++Exec=gnomint %f
+ Terminal=false
+ Type=Application
+ Icon=gnomint
+ Categories=GNOME;Application;System;Security
+ MimeType=application/x-gnomint;
+ StartupNotify=true
+-Encoding=UTF-8
diff --git a/system/gnomint/patches/07_spelling-errors.patch b/system/gnomint/patches/07_spelling-errors.patch
new file mode 100644
index 0000000000..f0045bd61b
--- /dev/null
+++ b/system/gnomint/patches/07_spelling-errors.patch
@@ -0,0 +1,39 @@
+Description: Fix some spelling errors.
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2019-10-12
+---
+
+--- gnomint-1.3.0.orig/src/ca.c
++++ gnomint-1.3.0/src/ca.c
+@@ -978,7 +978,7 @@
+ 
+ 	widget = gtk_builder_get_object (main_window_gtkb, "main_window1");
+ 	
+-	dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export uncrypted private key"),
++	dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export unencrypted private key"),
+ 							  GTK_WINDOW(widget),
+ 							  GTK_FILE_CHOOSER_ACTION_SAVE,
+ 							  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+--- gnomint-1.3.0.orig/src/country_table.c
++++ gnomint-1.3.0/src/country_table.c
+@@ -520,7 +520,7 @@
+ 	country_table[i++].code = "VU";
+ 	country_table[i].name = D_("Venezuela");
+ 	country_table[i++].code = "VE";
+-	country_table[i].name = D_("Viet Nam");
++	country_table[i].name = D_("Vietnam");
+ 	country_table[i++].code = "VN";
+ 	country_table[i].name = D_("Virgin Islands, British");
+ 	country_table[i++].code = "VG";
+--- gnomint-1.3.0.orig/src/import.c
++++ gnomint-1.3.0/src/import.c
+@@ -82,7 +82,7 @@
+ 	printf (_("The whole selected file, or some of its elements, seems to\n"
+ 		  "be cyphered using a password or passphrase. For importing\n"
+ 		  "the file into gnoMint database, you must provide an \n"
+-		  "appropiate password.\n"));
++		  "appropriate password.\n"));
+ 
+ 	prompt = g_strdup_printf (_("Please introduce password for `%s'"), crypted_part_description);
+ 	password = dialog_ask_for_password (prompt);
diff --git a/system/gnomint/patches/08_gtk3-port.patch b/system/gnomint/patches/08_gtk3-port.patch
new file mode 100644
index 0000000000..62638dd1df
--- /dev/null
+++ b/system/gnomint/patches/08_gtk3-port.patch
@@ -0,0 +1,7655 @@
+Description: Port to GTK 3.
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2019-10-15
+---
+
+--- gnomint-1.3.0.orig/configure.ac
++++ gnomint-1.3.0/configure.ac
+@@ -60,8 +60,8 @@
+ GNUTLS_REQUIRED=2.0
+ GNUTLS_ADVANCED_FEATURES_MINIMUM_VERSION=2.7.4
+ SQLITE_REQUIRED=3.0
+-GLIB_REQUIRED=2.6.0
+-GTK_REQUIRED=2.12.0
++GLIB_REQUIRED=2.41.1
++GTK_REQUIRED=3.21.5
+ ISO_CODES_REQUIRED=0.35
+ 
+ 
+@@ -83,7 +83,7 @@
+ PKG_CHECK_MODULES(GNOMINT, 
+ 	glib-2.0 >= $GLIB_REQUIRED \
+ 	gthread-2.0 >= $GLIB_REQUIRED \
+-	gtk+-2.0 >= $GTK_REQUIRED \
++	gtk+-3.0 >= $GTK_REQUIRED \
+ 	gdk-pixbuf-2.0 \
+ 	gnutls >= $GNUTLS_REQUIRED \
+ )
+--- gnomint-1.3.0.orig/src/ca.c
++++ gnomint-1.3.0/src/ca.c
+@@ -821,15 +821,15 @@
+ 		dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export certificate"),
+ 								  GTK_WINDOW(widget),
+ 								  GTK_FILE_CHOOSER_ACTION_SAVE,
+-								  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-								  GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++								  _("_Cancel"), GTK_RESPONSE_CANCEL,
++								  _("_Save"), GTK_RESPONSE_ACCEPT,
+ 								  NULL));
+ 	else
+ 		dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export certificate signing request"),
+ 								  GTK_WINDOW(widget),
+ 								  GTK_FILE_CHOOSER_ACTION_SAVE,
+-								  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-								  GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++								  _("_Cancel"), GTK_RESPONSE_CANCEL,
++								  _("_Save"), GTK_RESPONSE_ACCEPT,
+ 								  NULL));
+ 		
+ 	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -930,8 +930,8 @@
+ 	dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export crypted private key"),
+ 							  GTK_WINDOW(widget),
+ 							  GTK_FILE_CHOOSER_ACTION_SAVE,
+-							  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-							  GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++							  _("_Cancel"), GTK_RESPONSE_CANCEL,
++							  _("_Save"), GTK_RESPONSE_ACCEPT,
+ 							  NULL));
+ 		
+ 	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -981,8 +981,8 @@
+ 	dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export unencrypted private key"),
+ 							  GTK_WINDOW(widget),
+ 							  GTK_FILE_CHOOSER_ACTION_SAVE,
+-							  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-							  GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++							  _("_Cancel"), GTK_RESPONSE_CANCEL,
++							  _("_Save"), GTK_RESPONSE_ACCEPT,
+ 							  NULL));
+         
+ 	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -1032,8 +1032,8 @@
+ 			       (_("Export whole certificate in PKCS#12 package"),
+ 				GTK_WINDOW(widget),
+ 				GTK_FILE_CHOOSER_ACTION_SAVE,
+-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-				GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++				_("_Cancel"), GTK_RESPONSE_CANCEL,
++				_("_Save"), GTK_RESPONSE_ACCEPT,
+ 				NULL));
+ 	
+ 	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -1422,8 +1422,8 @@
+ 		widget = gtk_builder_get_object (cert_popup_menu_gtkb, "revoke_menuitem");
+ 		gtk_widget_set_sensitive (GTK_WIDGET(widget), (! is_revoked));
+ 
+-		gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 
+-				event_button->button, event_button->time);
++		gtk_menu_popup_at_pointer (GTK_MENU(menu),
++		                           (GdkEvent *)event_button);
+ 		return FALSE;
+ 	case CA_FILE_ELEMENT_TYPE_CSR:
+ 		menu = gtk_builder_get_object (csr_popup_menu_gtkb,
+@@ -1436,8 +1436,8 @@
+ 		widget = gtk_builder_get_object (csr_popup_menu_gtkb, "extract_pkey_menuitem3");
+ 		gtk_widget_set_sensitive (GTK_WIDGET(widget), pk_indb);
+ 		
+-		gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 
+-				event_button->button, event_button->time);
++		gtk_menu_popup_at_pointer (GTK_MENU(menu),
++		                           (GdkEvent *)event_button);
+ 		return FALSE;
+ 	default:
+ 	case -1:
+@@ -1446,13 +1446,6 @@
+ 
+ }
+ 
+-void ca_treeview_popup_timeout_program (GdkEventButton *event)
+-{
+-	g_timeout_add (1, ca_treeview_popup_timeout_program_cb, event); 
+-
+-}
+-					
+-
+ G_MODULE_EXPORT gboolean ca_treeview_popup_handler (GtkTreeView *tree_view,
+ 				    GdkEvent *event, gpointer user_data)
+ {
+@@ -1464,7 +1457,7 @@
+ 
+ 		event_button = (GdkEventButton *) event;
+ 		if (event_button->button == 3) {
+-			ca_treeview_popup_timeout_program (event_button);
++			ca_treeview_popup_timeout_program_cb (event_button);
+ 		}
+ 	}
+ 	
+@@ -1775,8 +1768,8 @@
+ 	dialog2 = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Save Diffie-Hellman parameters"),
+ 							  GTK_WINDOW(widget),
+ 							  GTK_FILE_CHOOSER_ACTION_SAVE,
+-							  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-							  GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++							  _("_Cancel"), GTK_RESPONSE_CANCEL,
++							  _("_Save"), GTK_RESPONSE_ACCEPT,
+ 							  NULL));
+ 	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog2), TRUE);
+ 	
+@@ -1871,8 +1864,8 @@
+                 dialog = gtk_file_chooser_dialog_new (_("Select PEM file to import"),
+                                                       GTK_WINDOW(main_window_widget),
+                                                       GTK_FILE_CHOOSER_ACTION_OPEN,
+-                                                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-                                                      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++                                                      _("_Cancel"), GTK_RESPONSE_CANCEL,
++                                                      _("_Open"), GTK_RESPONSE_ACCEPT,
+                                                       NULL);
+                 
+                 if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+@@ -1905,8 +1898,8 @@
+                 dialog = gtk_file_chooser_dialog_new (_("Select directory to import"),
+                                                       GTK_WINDOW(main_window_widget),
+                                                       GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+-                                                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-                                                      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++                                                      _("_Cancel"), GTK_RESPONSE_CANCEL,
++                                                      _("_Open"), GTK_RESPONSE_ACCEPT,
+                                                       NULL);
+                 
+                 if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+--- gnomint-1.3.0.orig/src/certificate_properties.c
++++ gnomint-1.3.0/src/certificate_properties.c
+@@ -242,7 +242,7 @@
+ 		for (i = g_list_length(cert->uses) - 1; i >= 0; i--) {
+ 			GtkLabel *label = NULL;
+ 			label = GTK_LABEL(gtk_label_new ((gchar *) g_list_nth_data (cert->uses, i)));
+-			gtk_misc_set_alignment (GTK_MISC(label), 0.0, 0.5);
++			gtk_label_set_xalign (label, 0.0);
+ 			gtk_box_pack_end (GTK_BOX(widget), GTK_WIDGET(label), 0, 0, 0);
+ 		}
+ 		gtk_widget_show_all (GTK_WIDGET(widget));
+--- gnomint-1.3.0.orig/src/creation_process_window.c
++++ gnomint-1.3.0/src/creation_process_window.c
+@@ -66,7 +66,7 @@
+ 	GtkWidget *dialog = NULL;
+ 	
+ 	g_thread_join (creation_process_window_thread);
+-	gtk_timeout_remove (timer);	       
++	g_source_remove (timer);
+ 	timer = 0;
+ 	
+ 	widget = gtk_builder_get_object (creation_process_window_gtkb, "creation_process_window");
+@@ -116,7 +116,7 @@
+ 		creation_process_window_ca_finish ();
+ 	} else if (status < 0) {
+ 		error_message = (gchar *) g_thread_join (creation_process_window_thread);
+-		gtk_timeout_remove (timer);	       
++		g_source_remove (timer);
+ 		timer = 0;
+ 		if (error_message) {
+ 			creation_process_window_error_dialog (error_message);
+@@ -165,7 +165,7 @@
+ 	GtkWidget *dialog, *widget;
+ 
+ 	if (timer) {
+-		gtk_timeout_remove (timer);	       
++		g_source_remove (timer);
+ 		timer = 0;
+ 	}
+    
+@@ -196,7 +196,7 @@
+ 	GtkWidget *widget = NULL, *dialog = NULL;
+ 	
+ 	g_thread_join (creation_process_window_thread);
+-	gtk_timeout_remove (timer);	       
++	g_source_remove (timer);
+ 	timer = 0;
+ 	
+ 	widget = GTK_WIDGET(gtk_builder_get_object (creation_process_window_gtkb, "creation_process_window"));
+@@ -242,7 +242,7 @@
+ 		creation_process_window_csr_finish ();
+ 	} else if (status < 0) {
+ 		error_message = (gchar *) g_thread_join (creation_process_window_thread);
+-		gtk_timeout_remove (timer);	       
++		g_source_remove (timer);
+ 		timer = 0;
+ 		if (error_message) {
+ 			creation_process_window_error_dialog (error_message);
+--- gnomint-1.3.0.orig/src/crl.c
++++ gnomint-1.3.0/src/crl.c
+@@ -213,7 +213,7 @@
+ G_MODULE_EXPORT void crl_cancel_clicked_cb (GtkButton *button, gpointer userdata)
+ {
+ 	GtkWidget * window = GTK_WIDGET(gtk_builder_get_object (crl_window_gtkb, "new_crl_dialog"));
+-        gtk_object_destroy(GTK_OBJECT(window));	
++        gtk_widget_destroy(window);
+ 
+ }
+ 
+@@ -241,8 +241,8 @@
+ 	dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export Certificate Revocation List"),
+ 							  GTK_WINDOW(widget),
+ 							  GTK_FILE_CHOOSER_ACTION_SAVE,
+-							  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-							  GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
++							  _("_Cancel"), GTK_RESPONSE_CANCEL,
++							  _("_Save"), GTK_RESPONSE_ACCEPT,
+ 							  NULL));
+ 		
+ 	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+@@ -274,7 +274,7 @@
+ 	gtk_widget_destroy (GTK_WIDGET(dialog));
+ 
+         dialog = GTK_DIALOG(gtk_builder_get_object (crl_window_gtkb, "new_crl_dialog"));
+-        gtk_object_destroy(GTK_OBJECT(dialog));	
++        gtk_widget_destroy(GTK_WIDGET(dialog));
+ 			
+ }
+ 
+--- gnomint-1.3.0.orig/src/main.c
++++ gnomint-1.3.0/src/main.c
+@@ -291,8 +291,8 @@
+ 	dialog = gtk_file_chooser_dialog_new (_("Create new CA database"),
+ 					      GTK_WINDOW(widget),
+ 					      GTK_FILE_CHOOSER_ACTION_SAVE,
+-					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-					      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++					      _("_Cancel"), GTK_RESPONSE_CANCEL,
++					      _("_Open"), GTK_RESPONSE_ACCEPT,
+ 					      NULL);
+ 	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+ 
+@@ -363,8 +363,8 @@
+ 	dialog = gtk_file_chooser_dialog_new (_("Open CA database"),
+ 					      GTK_WINDOW(widget),
+ 					      GTK_FILE_CHOOSER_ACTION_OPEN,
+-					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-					      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++					      _("_Cancel"), GTK_RESPONSE_CANCEL,
++					      _("_Open"), GTK_RESPONSE_ACCEPT,
+ 					      NULL);
+ 	
+ 	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+@@ -451,8 +451,8 @@
+ 	dialog = gtk_file_chooser_dialog_new (_("Save CA database as..."),
+ 					      GTK_WINDOW(widget),
+ 					      GTK_FILE_CHOOSER_ACTION_SAVE,
+-					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-					      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
++					      _("_Cancel"), GTK_RESPONSE_CANCEL,
++					      _("_Open"), GTK_RESPONSE_ACCEPT,
+ 					      NULL);
+ 	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+ 	
+@@ -490,14 +490,19 @@
+ {
+ 	
+ 	GtkWidget *widget;
+-	gchar *authors[2];
++	GdkPixbuf *logo;
++	gchar **authors;
++	gchar *file;
+ 	
+ 	widget = GTK_WIDGET(gtk_builder_get_object (main_window_gtkb, "main_window"));
+ 
+-	authors[0] = PACKAGE_AUTHORS;
+-	authors[1] = NULL;
++	authors = g_strsplit (PACKAGE_AUTHORS, "\n", -1);
++	file = g_build_filename (PACKAGE_DATA_DIR, "gnomint",
++	                         "gnomint.png", NULL);
++	logo = gdk_pixbuf_new_from_file (file, NULL);
+ 	
+ 	gtk_show_about_dialog (GTK_WINDOW(widget), 
++			       "logo", logo,
+ 			       "version", PACKAGE_VERSION, 
+ 			       "copyright", PACKAGE_COPYRIGHT,
+ 			       "comments", _("gnoMint is a program for creating and managing Certification Authorities, and their certificates"),
+@@ -507,4 +512,7 @@
+ 			       "authors", authors, 
+ 			       "translator_credits", _("translator-credits"),
+ 			       NULL); 
++	g_object_unref (logo);
++	g_strfreev (authors);
++	g_free (file);
+ }
+--- gnomint-1.3.0.orig/src/new_ca_window.c
++++ gnomint-1.3.0/src/new_ca_window.c
+@@ -129,7 +129,7 @@
+ 	
+ 	GtkWindow *window = GTK_WINDOW(gtk_builder_get_object (new_ca_window_gtkb, "new_ca_window"));
+ 
+-	gtk_object_destroy(GTK_OBJECT(window));
++	gtk_widget_destroy(GTK_WIDGET(window));
+ 	
+ }
+ 
+@@ -299,7 +299,7 @@
+         }
+ 
+ 	window = GTK_WINDOW(gtk_builder_get_object (new_ca_window_gtkb, "new_ca_window"));
+-	gtk_object_destroy(GTK_OBJECT(window));
++	gtk_widget_destroy(GTK_WIDGET(window));
+ 
+ 	creation_process_window_ca_display (ca_creation_data);
+ 	
+--- gnomint-1.3.0.orig/src/new_cert.c
++++ gnomint-1.3.0/src/new_cert.c
+@@ -456,7 +456,7 @@
+ 			       gpointer user_data) 
+ {
+ 	GtkWidget * window = GTK_WIDGET(gtk_builder_get_object (new_cert_window_gtkb, "new_cert_window"));
+-        gtk_object_destroy(GTK_OBJECT(window));	
++        gtk_widget_destroy(window);
+ 	
+ }
+ 
+@@ -743,7 +743,7 @@
+ 	}
+ 
+ 	widget = G_OBJECT(gtk_builder_get_object (new_cert_window_gtkb, "new_cert_window"));
+-        gtk_object_destroy(GTK_OBJECT(widget));	
++        gtk_widget_destroy(GTK_WIDGET(widget));
+ 
+ 	dialog_refresh_list();
+ 
+--- gnomint-1.3.0.orig/src/new_req_window.c
++++ gnomint-1.3.0/src/new_req_window.c
+@@ -410,7 +410,7 @@
+ 	
+ 	GtkWindow *window = GTK_WINDOW(gtk_builder_get_object (new_req_window_gtkb, "new_req_window"));
+ 
+-	gtk_object_destroy(GTK_OBJECT(window));
++	gtk_widget_destroy(GTK_WIDGET(window));
+ 	
+ }
+ 
+@@ -498,7 +498,7 @@
+         }
+ 
+ 	window = GTK_WINDOW(gtk_builder_get_object (new_req_window_gtkb, "new_req_window"));
+-	gtk_object_destroy(GTK_OBJECT(window));
++	gtk_widget_destroy(GTK_WIDGET(window));
+ 
+ 	creation_process_window_csr_display (csr_creation_data);	
+ 
+--- gnomint-1.3.0.orig/gui/certificate_popup_menu.ui
++++ gnomint-1.3.0/gui/certificate_popup_menu.ui
+@@ -1,45 +1,50 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkMenu" id="certificate_popup_menu">
+     <property name="visible">True</property>
++    <property name="can_focus">False</property>
+     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+     <child>
+       <object class="GtkImageMenuItem" id="cert_properties_menuitem">
+         <property name="label">gtk-properties</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="has_tooltip">True</property>
+         <property name="tooltip_markup">Shows the certificate properties window</property>
+         <property name="tooltip_text" translatable="yes">Shows the certificate properties window</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">True</property>
+-        <signal name="activate" handler="on_properties1_activate"/>
++        <signal name="activate" handler="on_properties1_activate" swapped="no"/>
+       </object>
+     </child>
+     <child>
+       <object class="GtkSeparatorMenuItem" id="sep_menuitem5">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+       </object>
+     </child>
+     <child>
+       <object class="GtkImageMenuItem" id="cert_export_menuitem">
+         <property name="label" translatable="yes">E_xport</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="has_tooltip">True</property>
+         <property name="tooltip_markup">Exports the certificate so it can be imported by any other application</property>
+         <property name="tooltip_text" translatable="yes">Exports the certificate so it can be imported by any other application</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">False</property>
+-        <signal name="activate" handler="ca_on_export1_activate"/>
++        <signal name="activate" handler="ca_on_export1_activate" swapped="no"/>
+       </object>
+     </child>
+     <child>
+       <object class="GtkImageMenuItem" id="extract_pkey_menuitem">
+         <property name="label" translatable="yes">Extrac_t private key</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="has_tooltip">True</property>
+         <property name="tooltip_markup">Extracts the private key of the selected 
+@@ -52,25 +57,27 @@
+ each time the certificate will be used</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">False</property>
+-        <signal name="activate" handler="ca_on_extractprivatekey1_activate"/>
++        <signal name="activate" handler="ca_on_extractprivatekey1_activate" swapped="no"/>
+       </object>
+     </child>
+     <child>
+       <object class="GtkSeparatorMenuItem" id="sep_menuitem6">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+       </object>
+     </child>
+     <child>
+       <object class="GtkImageMenuItem" id="revoke_menuitem">
+         <property name="label" translatable="yes">Revo_ke</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="has_tooltip">True</property>
+         <property name="tooltip_markup">Revokes the selected certificate</property>
+         <property name="tooltip_text" translatable="yes">Revokes the selected certificate</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">False</property>
+-        <signal name="activate" handler="ca_on_revoke_activate"/>
++        <signal name="activate" handler="ca_on_revoke_activate" swapped="no"/>
+       </object>
+     </child>
+   </object>
+--- gnomint-1.3.0.orig/gui/certificate_properties_dialog.ui
++++ gnomint-1.3.0/gui/certificate_properties_dialog.ui
+@@ -1,547 +1,549 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
+-  <object class="GtkAdjustment" id="AdjustmentHoursBetweenCRLUpdates">
+-    <property name="value">24</property>
+-    <property name="lower">1</property>
+-    <property name="upper">8760</property>
+-    <property name="step_increment">24</property>
+-    <property name="page_increment">168</property>
+-  </object>
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkAdjustment" id="AdjustmentCertMonthsBeforeExpiration">
+-    <property name="value">60</property>
+     <property name="lower">1</property>
+     <property name="upper">600</property>
++    <property name="value">60</property>
+     <property name="step_increment">1</property>
+     <property name="page_increment">12</property>
+   </object>
++  <object class="GtkAdjustment" id="AdjustmentHoursBetweenCRLUpdates">
++    <property name="lower">1</property>
++    <property name="upper">8760</property>
++    <property name="value">24</property>
++    <property name="step_increment">24</property>
++    <property name="page_increment">168</property>
++  </object>
+   <object class="GtkWindow" id="certificate_properties_dialog">
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">Certificate properties - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="window_position">center</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+     <child>
+-      <object class="GtkVBox" id="vbox4">
++      <placeholder/>
++    </child>
++    <child>
++      <object class="GtkBox" id="vbox4">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
+         <child>
+           <object class="GtkNotebook" id="notebook2">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="border_width">5</property>
+             <child>
+-              <object class="GtkVBox" id="vbox6">
++              <object class="GtkBox" id="vbox6">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">5</property>
++                <property name="orientation">vertical</property>
+                 <child>
+-                  <object class="GtkVBox" id="vboxCertCapabilities">
++                  <object class="GtkBox" id="vboxCertCapabilities">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="border_width">5</property>
++                    <property name="orientation">vertical</property>
+                     <property name="spacing">5</property>
+                     <child>
+                       <object class="GtkLabel" id="label1">
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;This certificate has been verified for the following uses:&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">0</property>
+                       </object>
+                       <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">True</property>
+                         <property name="position">0</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkHSeparator" id="certPropSeparator"/>
++                  <object class="GtkSeparator" id="certPropSeparator">
++                    <property name="can_focus">False</property>
++                  </object>
+                   <packing>
+                     <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkTable" id="table6">
++                  <object class="GtkGrid" id="table6">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="border_width">5</property>
+-                    <property name="n_rows">17</property>
+-                    <property name="n_columns">2</property>
+                     <property name="column_spacing">10</property>
+                     <child>
+                       <object class="GtkLabel" id="md5Label">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">MD5FINGERPRINT</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">MD5FINGERPRINT</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">14</property>
+-                        <property name="bottom_attach">15</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="sha1Label">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SHA1FINGERPRINT</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SHA1FINGERPRINT</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">13</property>
+-                        <property name="bottom_attach">14</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label22">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes"> </property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes"> </property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">12</property>
+-                        <property name="bottom_attach">13</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certExpirationDateLabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">CertExpirationDate</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">CertExpirationDate</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">11</property>
+-                        <property name="bottom_attach">12</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certActivationDateLabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">CertActivationDate</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">CertActivationDate</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">10</property>
+-                        <property name="bottom_attach">11</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label29">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes"> </property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes"> </property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">9</property>
+-                        <property name="bottom_attach">10</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certIssuerOULabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">CAOU</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">CAOU</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">8</property>
+-                        <property name="bottom_attach">9</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certIssuerOLabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">CAO</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">CAO</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">7</property>
+-                        <property name="bottom_attach">8</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certIssuerCNLabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">CACN</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">CACN</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">6</property>
+-                        <property name="bottom_attach">7</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label33">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes"> </property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes"> </property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">5</property>
+-                        <property name="bottom_attach">6</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certSNLabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">CertSN</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">CertSN</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">4</property>
+-                        <property name="bottom_attach">5</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certSubjectOULabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SubjectOU</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SubjectOU</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">3</property>
+-                        <property name="bottom_attach">4</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certSubjectOLabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SubjectO</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SubjectO</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">2</property>
+-                        <property name="bottom_attach">3</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certSubjectCNLabel">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SubjectCN</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SubjectCN</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">1</property>
+-                        <property name="bottom_attach">2</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label38">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes"> </property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes"> </property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
++                        <property name="top_attach">0</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label39">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">MD5 fingerprint</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">MD5 fingerprint</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">14</property>
+-                        <property name="bottom_attach">15</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label40">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SHA1 fingerprint</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SHA1 fingerprint</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">13</property>
+-                        <property name="bottom_attach">14</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label41">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">1</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Fingerprints&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">1</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">12</property>
+-                        <property name="bottom_attach">13</property>
+-                        <property name="x_options">GTK_FILL</property>
+-                        <property name="y_padding">7</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label42">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Expires on</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Expires on</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">11</property>
+-                        <property name="bottom_attach">12</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label43">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Activated on</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Activated on</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">10</property>
+-                        <property name="bottom_attach">11</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label44">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">1</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Validity&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">1</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">9</property>
+-                        <property name="bottom_attach">10</property>
+-                        <property name="x_options">GTK_FILL</property>
+-                        <property name="y_padding">7</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label45">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Organizational Unit (OU)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Organizational Unit (OU)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">8</property>
+-                        <property name="bottom_attach">9</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label73">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Organization (O)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Organization (O)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">7</property>
+-                        <property name="bottom_attach">8</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label74">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Common Name (CN)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Common Name (CN)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">6</property>
+-                        <property name="bottom_attach">7</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label75">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">1</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Emmited by&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">1</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">5</property>
+-                        <property name="bottom_attach">6</property>
+-                        <property name="x_options">GTK_FILL</property>
+-                        <property name="y_padding">7</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label76">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Serial number</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Serial number</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">4</property>
+-                        <property name="bottom_attach">5</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label77">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Organizational Unit (OU)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Organizational Unit (OU)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">3</property>
+-                        <property name="bottom_attach">4</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label78">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Organization (O)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Organization (O)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">2</property>
+-                        <property name="bottom_attach">3</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label79">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Common Name (CN)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Common Name (CN)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">1</property>
+-                        <property name="bottom_attach">2</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label80">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">1</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Certificate subject&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">1</property>
+                       </object>
+                       <packing>
+-                        <property name="x_options">GTK_FILL</property>
+-                        <property name="y_padding">7</property>
++                        <property name="left_attach">0</property>
++                        <property name="top_attach">0</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="sha256Label">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">SHA256FINGERPRINT</property>
+                         <property name="wrap">True</property>
+                         <property name="wrap_mode">char</property>
+                         <property name="width_chars">60</property>
++                        <property name="max_width_chars">60</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">0</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">15</property>
+-                        <property name="bottom_attach">16</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label4">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SHA256 fingerprint</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SHA256 fingerprint</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">15</property>
+-                        <property name="bottom_attach">16</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="sha512Label">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">SHA512FINGERPRINT</property>
+                         <property name="wrap">True</property>
+                         <property name="wrap_mode">char</property>
+                         <property name="width_chars">60</property>
++                        <property name="max_width_chars">60</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">0</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">16</property>
+-                        <property name="bottom_attach">17</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label5">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SHA512 fingerprint</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SHA512 fingerprint</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">16</property>
+-                        <property name="bottom_attach">17</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+-		    
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">2</property>
+                   </packing>
+                 </child>
+@@ -550,59 +552,68 @@
+             <child type="tab">
+               <object class="GtkLabel" id="label81">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">General</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+-                <property name="label" translatable="yes">General</property>
+               </object>
+               <packing>
+                 <property name="tab_fill">False</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkVBox" id="vbox13">
++              <object class="GtkBox" id="vbox13">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">10</property>
++                <property name="orientation">vertical</property>
+                 <property name="spacing">5</property>
+                 <child>
+                   <object class="GtkLabel" id="label82">
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;b&gt;Certificate hierarchy&lt;/b&gt;</property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkScrolledWindow" id="scrolledwindow1">
+                     <property name="can_focus">True</property>
+-                    <property name="hscrollbar_policy">automatic</property>
+-                    <property name="vscrollbar_policy">automatic</property>
+                     <property name="shadow_type">in</property>
+                     <child>
+                       <object class="GtkTreeView" id="treeview3">
+                         <property name="can_focus">True</property>
+                         <property name="headers_visible">False</property>
++                        <child internal-child="selection">
++                          <object class="GtkTreeSelection"/>
++                        </child>
+                       </object>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="expand">False</property>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label83">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;b&gt;Certificate fields&lt;/b&gt;</property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">2</property>
+                   </packing>
+                 </child>
+@@ -610,18 +621,21 @@
+                   <object class="GtkScrolledWindow" id="scrolledwindow4">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="hscrollbar_policy">automatic</property>
+-                    <property name="vscrollbar_policy">automatic</property>
+                     <property name="shadow_type">in</property>
+                     <child>
+                       <object class="GtkTreeView" id="certTreeView">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="headers_visible">False</property>
++                        <child internal-child="selection">
++                          <object class="GtkTreeSelection"/>
++                        </child>
+                       </object>
+                     </child>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">3</property>
+                   </packing>
+                 </child>
+@@ -633,9 +647,10 @@
+             <child type="tab">
+               <object class="GtkLabel" id="label85">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">Details</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+-                <property name="label" translatable="yes">Details</property>
+               </object>
+               <packing>
+                 <property name="position">1</property>
+@@ -643,22 +658,30 @@
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkVBox" id="vbox19">
++              <object class="GtkBox" id="vbox19">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="orientation">vertical</property>
+                 <child>
+                   <object class="GtkLabel" id="label35">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
+-                    <property name="xpad">5</property>
++                    <property name="can_focus">False</property>
++                    <property name="margin_start">5</property>
++                    <property name="margin_end">5</property>
+                     <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;
+-It is recommended that all the certificates generated by a CA share the same properties.
+-If you want to generate certificates with different properties, you should create a hierarchy of CAs, each one with its own policy for certificate generation.&lt;/i&gt;
++It is recommended that all the certificates generated by a CA
++share the same properties.
++If you want to generate certificates with different properties, you
++should create a hierarchy of CAs, each one with its own policy for
++certificate generation.&lt;/i&gt;
+ &lt;/small&gt;
+-Please, define the maximum set of properties for the certificates that this CA will be able to generate:
++Please, define the maximum set of properties for the
++certificates that this CA will be able to generate:
+ </property>
+                     <property name="use_markup">True</property>
+                     <property name="wrap">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -667,18 +690,23 @@
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkHBox" id="hbox6">
++                  <object class="GtkBox" id="hbox6">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="border_width">8</property>
+                     <child>
+                       <object class="GtkLabel" id="label36">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Maximum number of months before
++expiration of the new generated certificates:</property>
++                        <property name="wrap">True</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Maximum number of months before expiration of the new generated certificates:</property>
+-                        <property name="wrap">True</property>
+                       </object>
+                       <packing>
++                        <property name="expand">True</property>
++                        <property name="fill">True</property>
+                         <property name="position">0</property>
+                       </packing>
+                     </child>
+@@ -686,13 +714,15 @@
+                       <object class="GtkSpinButton" id="months_before_expiration_spinbutton2">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+-                        <property name="invisible_char">&#x2022;</property>
++                        <property name="invisible_char">•</property>
+                         <property name="adjustment">AdjustmentCertMonthsBeforeExpiration</property>
+                         <property name="climb_rate">1</property>
+                         <property name="numeric">True</property>
+-                        <signal name="value_changed" handler="ca_policy_expiration_spin_button_change"/>
++                        <signal name="value-changed" handler="ca_policy_expiration_spin_button_change" swapped="no"/>
+                       </object>
+                       <packing>
++                        <property name="expand">True</property>
++                        <property name="fill">True</property>
+                         <property name="position">1</property>
+                       </packing>
+                     </child>
+@@ -709,20 +739,26 @@
+                     <property name="can_focus">True</property>
+                     <property name="border_width">4</property>
+                     <child>
+-                      <object class="GtkVBox" id="vbox1">
++                      <object class="GtkBox" id="vbox1">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="orientation">vertical</property>
+                         <child>
+-                          <object class="GtkHBox" id="hbox7">
++                          <object class="GtkBox" id="hbox7">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <property name="border_width">8</property>
+                             <child>
+                               <object class="GtkLabel" id="label24">
+                                 <property name="visible">True</property>
+-                                <property name="xalign">0</property>
++                                <property name="can_focus">False</property>
+                                 <property name="label" translatable="yes">Hours between CRL updates:</property>
+                                 <property name="wrap">True</property>
++                                <property name="xalign">0</property>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">0</property>
+                               </packing>
+                             </child>
+@@ -730,32 +766,41 @@
+                               <object class="GtkSpinButton" id="hours_between_crl_updates_spinbutton">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">True</property>
+-                                <property name="invisible_char">&#x2022;</property>
++                                <property name="invisible_char">•</property>
+                                 <property name="adjustment">AdjustmentHoursBetweenCRLUpdates</property>
+                                 <property name="climb_rate">1</property>
+                                 <property name="numeric">True</property>
+-                                <signal name="value_changed" handler="ca_policy_crl_update_spin_button_change"/>
++                                <signal name="value-changed" handler="ca_policy_crl_update_spin_button_change" swapped="no"/>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
+                           <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
+                             <property name="position">0</property>
+                           </packing>
+                         </child>
+                         <child>
+-                          <object class="GtkVBox" id="vbox2">
++                          <object class="GtkBox" id="vbox2">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <property name="border_width">9</property>
++                            <property name="orientation">vertical</property>
+                             <child>
+                               <object class="GtkLabel" id="label3">
+                                 <property name="visible">True</property>
+-                                <property name="xalign">0</property>
++                                <property name="can_focus">False</property>
+                                 <property name="label" translatable="yes">CRL distribution URL:</property>
++                                <property name="xalign">0</property>
+                               </object>
+                               <packing>
++                                <property name="expand">True</property>
++                                <property name="fill">True</property>
+                                 <property name="position">0</property>
+                               </packing>
+                             </child>
+@@ -763,8 +808,8 @@
+                               <object class="GtkEntry" id="crl_distribution_point_entry">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">True</property>
+-                                <property name="invisible_char">&#x2022;</property>
+-                                <signal name="changed" handler="ca_policy_crl_distribution_point_change"/>
++                                <property name="invisible_char">•</property>
++                                <signal name="changed" handler="ca_policy_crl_distribution_point_change" swapped="no"/>
+                               </object>
+                               <packing>
+                                 <property name="expand">False</property>
+@@ -774,6 +819,8 @@
+                             </child>
+                           </object>
+                           <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
+                             <property name="position">1</property>
+                           </packing>
+                         </child>
+@@ -782,6 +829,7 @@
+                     <child type="label">
+                       <object class="GtkLabel" id="label2">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;CRL Properties&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
+                       </object>
+@@ -799,11 +847,10 @@
+                     <property name="can_focus">True</property>
+                     <property name="border_width">4</property>
+                     <child>
+-                      <object class="GtkTable" id="table7">
++                      <object class="GtkGrid" id="table7">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="border_width">10</property>
+-                        <property name="n_rows">5</property>
+-                        <property name="n_columns">2</property>
+                         <child>
+                           <object class="GtkCheckButton" id="country_inherited_check">
+                             <property name="label" translatable="yes">Country</property>
+@@ -812,8 +859,12 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
++                          <packing>
++                            <property name="left_attach">0</property>
++                            <property name="top_attach">0</property>
++                          </packing>
+                         </child>
+                         <child>
+                           <object class="GtkCheckButton" id="state_inherited_check">
+@@ -823,16 +874,17 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">1</property>
+-                            <property name="bottom_attach">2</property>
+                           </packing>
+                         </child>
+                         <child>
+-                          <object class="GtkHBox" id="hbox4">
++                          <object class="GtkBox" id="hbox4">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <child>
+                               <object class="GtkRadioButton" id="country_same_radiobutton">
+                                 <property name="label" translatable="yes">must be the same</property>
+@@ -842,9 +894,11 @@
+                                 <property name="receives_default">False</property>
+                                 <property name="draw_indicator">True</property>
+                                 <property name="group">country_differ_radiobutton</property>
+-                                <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                                <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">0</property>
+                               </packing>
+                             </child>
+@@ -859,18 +913,21 @@
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
++                            <property name="top_attach">0</property>
+                           </packing>
+                         </child>
+                         <child>
+-                          <object class="GtkHBox" id="hbox8">
++                          <object class="GtkBox" id="hbox8">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <child>
+                               <object class="GtkRadioButton" id="state_same_radiobutton">
+                                 <property name="label" translatable="yes">must be the same</property>
+@@ -880,9 +937,11 @@
+                                 <property name="receives_default">False</property>
+                                 <property name="draw_indicator">True</property>
+                                 <property name="group">state_differ_radiobutton</property>
+-                                <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                                <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">0</property>
+                               </packing>
+                             </child>
+@@ -897,15 +956,15 @@
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">1</property>
+-                            <property name="bottom_attach">2</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -916,11 +975,11 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">2</property>
+-                            <property name="bottom_attach">3</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -931,11 +990,11 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">3</property>
+-                            <property name="bottom_attach">4</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -946,16 +1005,17 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">4</property>
+-                            <property name="bottom_attach">5</property>
+                           </packing>
+                         </child>
+                         <child>
+-                          <object class="GtkHBox" id="hbox24">
++                          <object class="GtkBox" id="hbox24">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <child>
+                               <object class="GtkRadioButton" id="city_same_radiobutton">
+                                 <property name="label" translatable="yes">must be the same</property>
+@@ -965,9 +1025,11 @@
+                                 <property name="receives_default">False</property>
+                                 <property name="draw_indicator">True</property>
+                                 <property name="group">city_differ_radiobutton</property>
+-                                <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                                <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">0</property>
+                               </packing>
+                             </child>
+@@ -982,20 +1044,21 @@
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">2</property>
+-                            <property name="bottom_attach">3</property>
+                           </packing>
+                         </child>
+                         <child>
+-                          <object class="GtkHBox" id="hbox25">
++                          <object class="GtkBox" id="hbox25">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <child>
+                               <object class="GtkRadioButton" id="organization_same_radiobutton">
+                                 <property name="label" translatable="yes">must be the same</property>
+@@ -1005,9 +1068,11 @@
+                                 <property name="receives_default">False</property>
+                                 <property name="draw_indicator">True</property>
+                                 <property name="group">organization_differ_radiobutton</property>
+-                                <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                                <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">0</property>
+                               </packing>
+                             </child>
+@@ -1022,20 +1087,21 @@
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">3</property>
+-                            <property name="bottom_attach">4</property>
+                           </packing>
+                         </child>
+                         <child>
+-                          <object class="GtkHBox" id="hbox27">
++                          <object class="GtkBox" id="hbox27">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <child>
+                               <object class="GtkRadioButton" id="ou_same_radiobutton">
+                                 <property name="label" translatable="yes">must be the same</property>
+@@ -1045,9 +1111,11 @@
+                                 <property name="receives_default">False</property>
+                                 <property name="draw_indicator">True</property>
+                                 <property name="group">ou_differ_radiobutton</property>
+-                                <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                                <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">0</property>
+                               </packing>
+                             </child>
+@@ -1062,15 +1130,15 @@
+                                 <property name="draw_indicator">True</property>
+                               </object>
+                               <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
+                                 <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">4</property>
+-                            <property name="bottom_attach">5</property>
+                           </packing>
+                         </child>
+                       </object>
+@@ -1078,10 +1146,11 @@
+                     <child type="label">
+                       <object class="GtkLabel" id="label30">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Inherited fields from CA subject&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">0</property>
+                       </object>
+                     </child>
+                   </object>
+@@ -1097,11 +1166,10 @@
+                     <property name="can_focus">True</property>
+                     <property name="border_width">4</property>
+                     <child>
+-                      <object class="GtkTable" id="table12">
++                      <object class="GtkGrid" id="table12">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="border_width">10</property>
+-                        <property name="n_rows">4</property>
+-                        <property name="n_columns">2</property>
+                         <child>
+                           <object class="GtkCheckButton" id="ca_check2">
+                             <property name="label" translatable="yes">Certification Authority</property>
+@@ -1110,8 +1178,12 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
++                          <packing>
++                            <property name="left_attach">0</property>
++                            <property name="top_attach">0</property>
++                          </packing>
+                         </child>
+                         <child>
+                           <object class="GtkCheckButton" id="non_repudiation_check2">
+@@ -1121,11 +1193,11 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
++                            <property name="top_attach">0</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1137,13 +1209,11 @@
+                             <property name="use_underline">True</property>
+                             <property name="active">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">1</property>
+-                            <property name="bottom_attach">2</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1155,13 +1225,11 @@
+                             <property name="use_underline">True</property>
+                             <property name="active">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">2</property>
+-                            <property name="bottom_attach">3</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1173,11 +1241,11 @@
+                             <property name="use_underline">True</property>
+                             <property name="active">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">3</property>
+-                            <property name="bottom_attach">4</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1189,11 +1257,11 @@
+                             <property name="use_underline">True</property>
+                             <property name="active">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">2</property>
+-                            <property name="bottom_attach">3</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1204,22 +1272,21 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">1</property>
+-                            <property name="bottom_attach">2</property>
+                           </packing>
+                         </child>
+                         <child>
+                           <object class="GtkLabel" id="label111">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">3</property>
+-                            <property name="bottom_attach">4</property>
+                           </packing>
+                         </child>
+                       </object>
+@@ -1227,10 +1294,11 @@
+                     <child type="label">
+                       <object class="GtkLabel" id="label86">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Uses of new generated certificates&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">0</property>
+                       </object>
+                     </child>
+                   </object>
+@@ -1246,11 +1314,10 @@
+                     <property name="can_focus">True</property>
+                     <property name="border_width">4</property>
+                     <child>
+-                      <object class="GtkTable" id="table15">
++                      <object class="GtkGrid" id="table15">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="border_width">10</property>
+-                        <property name="n_rows">4</property>
+-                        <property name="n_columns">2</property>
+                         <child>
+                           <object class="GtkCheckButton" id="email_protection_check2">
+                             <property name="label" translatable="yes">Email protection</property>
+@@ -1260,13 +1327,11 @@
+                             <property name="use_underline">True</property>
+                             <property name="active">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">1</property>
+-                            <property name="bottom_attach">2</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1277,11 +1342,11 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
++                            <property name="top_attach">0</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1293,11 +1358,11 @@
+                             <property name="use_underline">True</property>
+                             <property name="active">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">1</property>
+-                            <property name="bottom_attach">2</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1309,8 +1374,12 @@
+                             <property name="use_underline">True</property>
+                             <property name="active">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
++                          <packing>
++                            <property name="left_attach">0</property>
++                            <property name="top_attach">0</property>
++                          </packing>
+                         </child>
+                         <child>
+                           <object class="GtkCheckButton" id="time_stamping_check2">
+@@ -1320,11 +1389,11 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">2</property>
+-                            <property name="bottom_attach">3</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1335,11 +1404,11 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
++                            <property name="left_attach">0</property>
+                             <property name="top_attach">3</property>
+-                            <property name="bottom_attach">4</property>
+                           </packing>
+                         </child>
+                         <child>
+@@ -1350,26 +1419,23 @@
+                             <property name="receives_default">False</property>
+                             <property name="use_underline">True</property>
+                             <property name="draw_indicator">True</property>
+-                            <signal name="toggled" handler="ca_policy_toggle_button_toggled"/>
++                            <signal name="toggled" handler="ca_policy_toggle_button_toggled" swapped="no"/>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">2</property>
+-                            <property name="bottom_attach">3</property>
+                           </packing>
+                         </child>
+                         <child>
+                           <object class="GtkLabel" id="label100">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <property name="xalign">0</property>
+                             <property name="yalign">0</property>
+                           </object>
+                           <packing>
+                             <property name="left_attach">1</property>
+-                            <property name="right_attach">2</property>
+                             <property name="top_attach">3</property>
+-                            <property name="bottom_attach">4</property>
+                           </packing>
+                         </child>
+                       </object>
+@@ -1377,14 +1443,17 @@
+                     <child type="label">
+                       <object class="GtkLabel" id="label102">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;Purposes of new generated certificates&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">0</property>
+                       </object>
+                     </child>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">5</property>
+                   </packing>
+                 </child>
+@@ -1396,9 +1465,10 @@
+             <child type="tab">
+               <object class="GtkLabel" id="label23">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">CA Policy</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+-                <property name="label" translatable="yes">CA Policy</property>
+               </object>
+               <packing>
+                 <property name="position">2</property>
+@@ -1407,12 +1477,15 @@
+             </child>
+           </object>
+           <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="position">0</property>
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkHButtonBox" id="hbuttonbox2">
++          <object class="GtkButtonBox" id="hbuttonbox2">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="border_width">10</property>
+             <property name="layout_style">end</property>
+             <child>
+@@ -1422,7 +1495,7 @@
+                 <property name="can_focus">True</property>
+                 <property name="receives_default">True</property>
+                 <property name="use_stock">True</property>
+-                <signal name="clicked" handler="certificate_properties_close_clicked"/>
++                <signal name="clicked" handler="certificate_properties_close_clicked" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -1433,6 +1506,7 @@
+           </object>
+           <packing>
+             <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="pack_type">end</property>
+             <property name="position">1</property>
+           </packing>
+--- gnomint-1.3.0.orig/gui/change_password_dialog.ui
++++ gnomint-1.3.0/gui/change_password_dialog.ui
+@@ -1,32 +1,81 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="change_password_dialog">
++    <property name="can_focus">False</property>
+     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">Database password protection - gnoMint</property>
+     <property name="window_position">center-on-parent</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox14">
++      <object class="GtkBox" id="dialog-vbox14">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="orientation">vertical</property>
+         <property name="spacing">2</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area14">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="ca_changepwd_cancel_button">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="ca_changepwd_commit_button">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+-          <object class="GtkTable" id="table20">
++          <object class="GtkGrid" id="table20">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="border_width">20</property>
+-            <property name="n_rows">4</property>
+-            <property name="n_columns">2</property>
+-            <property name="column_spacing">10</property>
+             <property name="row_spacing">10</property>
++            <property name="column_spacing">10</property>
++            <property name="column_homogeneous">True</property>
+             <child>
+-              <object class="GtkHBox" id="hbox26">
++              <object class="GtkBox" id="hbox26">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="homogeneous">True</property>
+                 <child>
+                   <object class="GtkRadioButton" id="ca_changepwd_pwd_protect_yes_radiobutton">
+@@ -37,7 +86,7 @@
+                     <property name="use_underline">True</property>
+                     <property name="active">True</property>
+                     <property name="draw_indicator">True</property>
+-                    <signal name="toggled" handler="ca_changepwd_pwd_protect_radiobutton_toggled"/>
++                    <signal name="toggled" handler="ca_changepwd_pwd_protect_radiobutton_toggled" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -64,39 +113,22 @@
+               </object>
+               <packing>
+                 <property name="left_attach">1</property>
+-                <property name="right_attach">2</property>
+-                <property name="x_options">GTK_FILL</property>
+-                <property name="y_options"></property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkLabel" id="label109">
+-                <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
+-                <property name="label" translatable="yes">Protect CA database private 
+-keys with password:</property>
+-                <property name="wrap">True</property>
+-              </object>
+-              <packing>
+-                <property name="x_options">GTK_FILL</property>
+-                <property name="y_options"></property>
++                <property name="top_attach">0</property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkLabel" id="ca_changepwd_label3">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">Enter new password again 
+ for confirmation:</property>
+                 <property name="wrap">True</property>
+                 <property name="wrap_mode">word-char</property>
++                <property name="xalign">0</property>
+               </object>
+               <packing>
++                <property name="left_attach">0</property>
+                 <property name="top_attach">3</property>
+-                <property name="bottom_attach">4</property>
+-                <property name="x_options">GTK_FILL</property>
+-                <property name="y_options"></property>
+               </packing>
+             </child>
+             <child>
+@@ -105,14 +137,12 @@
+                 <property name="can_focus">True</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                 <property name="visibility">False</property>
+-                <property name="invisible_char">&#x2022;</property>
+-                <signal name="changed" handler="ca_changepwd_newpwd_entry_changed"/>
++                <property name="invisible_char">•</property>
++                <signal name="changed" handler="ca_changepwd_newpwd_entry_changed" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="left_attach">1</property>
+-                <property name="right_attach">2</property>
+                 <property name="top_attach">3</property>
+-                <property name="bottom_attach">4</property>
+               </packing>
+             </child>
+             <child>
+@@ -121,46 +151,41 @@
+                 <property name="can_focus">True</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                 <property name="visibility">False</property>
+-                <property name="invisible_char">&#x2022;</property>
+-                <signal name="changed" handler="ca_changepwd_newpwd_entry_changed"/>
++                <property name="invisible_char">•</property>
++                <signal name="changed" handler="ca_changepwd_newpwd_entry_changed" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="left_attach">1</property>
+-                <property name="right_attach">2</property>
+                 <property name="top_attach">2</property>
+-                <property name="bottom_attach">3</property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkLabel" id="ca_changepwd_label2">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">Please, enter new 
+ password:</property>
+                 <property name="wrap">True</property>
++                <property name="xalign">0</property>
+               </object>
+               <packing>
++                <property name="left_attach">0</property>
+                 <property name="top_attach">2</property>
+-                <property name="bottom_attach">3</property>
+-                <property name="x_options">GTK_FILL</property>
+-                <property name="y_options"></property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkLabel" id="ca_changepwd_label1">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">Please, enter current
+ password:</property>
+                 <property name="wrap">True</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
++                <property name="left_attach">0</property>
+                 <property name="top_attach">1</property>
+-                <property name="bottom_attach">2</property>
+-                <property name="x_options">GTK_FILL</property>
+-                <property name="y_options"></property>
+-                <property name="y_padding">15</property>
+               </packing>
+             </child>
+             <child>
+@@ -169,61 +194,34 @@
+                 <property name="can_focus">True</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                 <property name="visibility">False</property>
+-                <property name="invisible_char">&#x2022;</property>
+-                <signal name="changed" handler="ca_changepwd_newpwd_entry_changed"/>
++                <property name="invisible_char">•</property>
++                <signal name="changed" handler="ca_changepwd_newpwd_entry_changed" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="left_attach">1</property>
+-                <property name="right_attach">2</property>
+                 <property name="top_attach">1</property>
+-                <property name="bottom_attach">2</property>
+               </packing>
+             </child>
+-          </object>
+-          <packing>
+-            <property name="position">1</property>
+-          </packing>
+-        </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area14">
+-            <property name="visible">True</property>
+-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-            <property name="layout_style">end</property>
+             <child>
+-              <object class="GtkButton" id="ca_changepwd_cancel_button">
+-                <property name="label" translatable="yes">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="ca_changepwd_commit_button">
+-                <property name="label" translatable="yes">gtk-ok</property>
++              <object class="GtkLabel" id="label109">
+                 <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <property name="use_stock">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">Protect CA database private
++keys with password:</property>
++                <property name="wrap">True</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">1</property>
++                <property name="left_attach">0</property>
++                <property name="top_attach">0</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
++            <property name="fill">True</property>
++            <property name="position">1</property>
+           </packing>
+         </child>
+       </object>
+--- gnomint-1.3.0.orig/gui/creation_process_window.ui
++++ gnomint-1.3.0/gui/creation_process_window.ui
+@@ -1,40 +1,50 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkWindow" id="creation_process_window">
+     <property name="visible">True</property>
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">Creating new CA - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="window_position">center</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+     <child>
+-      <object class="GtkHBox" id="hbox5">
++      <placeholder/>
++    </child>
++    <child>
++      <object class="GtkBox" id="hbox5">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <child>
+           <object class="GtkLabel" id="label25">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes"> </property>
+             <property name="xalign">0</property>
+             <property name="yalign">0</property>
+-            <property name="label" translatable="yes"> </property>
+           </object>
+           <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="position">0</property>
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkVBox" id="vbox5">
++          <object class="GtkBox" id="vbox5">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="border_width">9</property>
+             <property name="orientation">vertical</property>
+             <property name="homogeneous">True</property>
+             <child>
+               <object class="GtkLabel" id="titleLabel">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">Creating CA Root Certificate</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+-                <property name="label" translatable="yes">Creating CA Root Certificate</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -45,6 +55,7 @@
+             <child>
+               <object class="GtkLabel" id="status_message_label">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+               </object>
+@@ -57,7 +68,7 @@
+             <child>
+               <object class="GtkProgressBar" id="creation_process_window_progressbar">
+                 <property name="visible">True</property>
+-                <property name="activity_mode">True</property>
++                <property name="can_focus">False</property>
+                 <property name="pulse_step">0</property>
+               </object>
+               <packing>
+@@ -73,7 +84,7 @@
+                 <property name="can_focus">True</property>
+                 <property name="receives_default">True</property>
+                 <property name="use_stock">True</property>
+-                <signal name="clicked" handler="on_cancel_creation_process_clicked"/>
++                <signal name="clicked" handler="on_cancel_creation_process_clicked" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -84,17 +95,21 @@
+           </object>
+           <packing>
+             <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="position">1</property>
+           </packing>
+         </child>
+         <child>
+           <object class="GtkLabel" id="label26">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes"> </property>
+             <property name="xalign">0</property>
+             <property name="yalign">0</property>
+-            <property name="label" translatable="yes"> </property>
+           </object>
+           <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="position">2</property>
+           </packing>
+         </child>
+--- gnomint-1.3.0.orig/gui/csr_popup_menu.ui
++++ gnomint-1.3.0/gui/csr_popup_menu.ui
+@@ -1,45 +1,50 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkMenu" id="csr_popup_menu">
+     <property name="visible">True</property>
++    <property name="can_focus">False</property>
+     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+     <child>
+       <object class="GtkImageMenuItem" id="csr_properties_menuitem">
+         <property name="label">gtk-properties</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="has_tooltip">True</property>
+         <property name="tooltip_markup">Shows the CSR properties window</property>
+         <property name="tooltip_text" translatable="yes">Shows the CSR properties window</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">True</property>
+-        <signal name="activate" handler="on_properties1_activate"/>
++        <signal name="activate" handler="on_properties1_activate" swapped="no"/>
+       </object>
+     </child>
+     <child>
+       <object class="GtkSeparatorMenuItem" id="sep_menuitem7">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+       </object>
+     </child>
+     <child>
+       <object class="GtkImageMenuItem" id="csr_export_menuitem">
+         <property name="label" translatable="yes">E_xport</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="has_tooltip">True</property>
+         <property name="tooltip_markup">Exports the CSR so it can be imported by any other application</property>
+         <property name="tooltip_text" translatable="yes">Exports the CSR so it can be imported by any other application</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">False</property>
+-        <signal name="activate" handler="ca_on_export1_activate"/>
++        <signal name="activate" handler="ca_on_export1_activate" swapped="no"/>
+       </object>
+     </child>
+     <child>
+       <object class="GtkImageMenuItem" id="extract_pkey_menuitem3">
+         <property name="label" translatable="yes">Extrac_t private key</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="has_tooltip">True</property>
+         <property name="tooltip_markup">Extracts the private key of the selected 
+@@ -52,32 +57,35 @@
+ each time the CSR will be used</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">False</property>
+-        <signal name="activate" handler="ca_on_extractprivatekey1_activate"/>
++        <signal name="activate" handler="ca_on_extractprivatekey1_activate" swapped="no"/>
+       </object>
+     </child>
+     <child>
+       <object class="GtkSeparatorMenuItem" id="sep_menuitem8">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+       </object>
+     </child>
+     <child>
+       <object class="GtkImageMenuItem" id="sign_csr_menuitem">
+         <property name="label" translatable="yes">_Sign</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">False</property>
+-        <signal name="activate" handler="ca_on_sign1_activate"/>
++        <signal name="activate" handler="ca_on_sign1_activate" swapped="no"/>
+       </object>
+     </child>
+     <child>
+       <object class="GtkImageMenuItem" id="csr_delete_menuitem">
+         <property name="label">gtk-delete</property>
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="use_underline">True</property>
+         <property name="use_stock">True</property>
+-        <signal name="activate" handler="ca_on_delete2_activate"/>
++        <signal name="activate" handler="ca_on_delete2_activate" swapped="no"/>
+       </object>
+     </child>
+   </object>
+--- gnomint-1.3.0.orig/gui/csr_properties_dialog.ui
++++ gnomint-1.3.0/gui/csr_properties_dialog.ui
+@@ -1,8 +1,9 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkWindow" id="csr_properties_dialog">
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">CSR properties - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="window_position">center</property>
+@@ -10,170 +11,183 @@
+     <property name="type_hint">dialog</property>
+     <property name="urgency_hint">True</property>
+     <child>
+-      <object class="GtkVBox" id="vbox21">
++      <placeholder/>
++    </child>
++    <child>
++      <object class="GtkBox" id="vbox21">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
+         <child>
+           <object class="GtkNotebook" id="notebook4">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="border_width">5</property>
+             <property name="show_tabs">False</property>
+             <property name="show_border">False</property>
+             <child>
+-              <object class="GtkVBox" id="vbox22">
++              <object class="GtkBox" id="vbox22">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">5</property>
+                 <property name="orientation">vertical</property>
+                 <child>
+-                  <object class="GtkVBox" id="vboxCertCapabilities2">
++                  <object class="GtkBox" id="vboxCertCapabilities2">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="border_width">5</property>
+                     <property name="orientation">vertical</property>
+                     <property name="spacing">5</property>
+                     <child>
+                       <object class="GtkLabel" id="privatekey_in_db_label">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">&lt;b&gt;This Certificate Signing Request has its corresponding private key saved in the internal database.&lt;/b&gt;</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">&lt;b&gt;This Certificate Signing Request has its
++corresponding private key saved in the internal database.&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
+                         <property name="wrap">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">0</property>
+                       </object>
+                       <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">True</property>
+                         <property name="position">0</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkHSeparator" id="certPropSeparator2">
++                  <object class="GtkSeparator" id="certPropSeparator2">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkTable" id="table8">
++                  <object class="GtkGrid" id="table8">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="border_width">5</property>
+-                    <property name="n_rows">4</property>
+-                    <property name="n_columns">2</property>
+                     <property name="column_spacing">10</property>
+                     <child>
+                       <object class="GtkLabel" id="certSubjectOULabel1">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SubjectOU</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SubjectOU</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">3</property>
+-                        <property name="bottom_attach">4</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certSubjectOLabel1">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SubjectO</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SubjectO</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">2</property>
+-                        <property name="bottom_attach">3</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="certSubjectCNLabel1">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">SubjectCN</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">SubjectCN</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">1</property>
+-                        <property name="bottom_attach">2</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label131">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes"> </property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes"> </property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
++                        <property name="top_attach">0</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label119">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Organizational Unit (OU)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Organizational Unit (OU)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">3</property>
+-                        <property name="bottom_attach">4</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label118">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Organization (O)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Organization (O)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">2</property>
+-                        <property name="bottom_attach">3</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label117">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="label" translatable="yes">Common Name (CN)</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+-                        <property name="label" translatable="yes">Common Name (CN)</property>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">1</property>
+-                        <property name="bottom_attach">2</property>
+-                        <property name="x_options">GTK_FILL</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label116">
+                         <property name="visible">True</property>
+-                        <property name="xalign">0</property>
+-                        <property name="yalign">1</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">&lt;b&gt;CSR subject&lt;/b&gt;</property>
+                         <property name="use_markup">True</property>
++                        <property name="xalign">0</property>
++                        <property name="yalign">1</property>
+                       </object>
+                       <packing>
+-                        <property name="x_options">GTK_FILL</property>
+-                        <property name="y_padding">7</property>
++                        <property name="left_attach">0</property>
++                        <property name="top_attach">0</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">2</property>
+                   </packing>
+                 </child>
+@@ -185,9 +199,10 @@
+             <child type="tab">
+               <object class="GtkLabel" id="label135">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">General</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+-                <property name="label" translatable="yes">General</property>
+               </object>
+               <packing>
+                 <property name="tab_fill">False</property>
+@@ -199,9 +214,10 @@
+             <child type="tab">
+               <object class="GtkLabel" id="label139">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">Details</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+-                <property name="label" translatable="yes">Details</property>
+               </object>
+               <packing>
+                 <property name="position">1</property>
+@@ -210,12 +226,15 @@
+             </child>
+           </object>
+           <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="position">0</property>
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkHButtonBox" id="hbuttonbox5">
++          <object class="GtkButtonBox" id="hbuttonbox5">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="border_width">10</property>
+             <property name="layout_style">end</property>
+             <child>
+@@ -225,7 +244,7 @@
+                 <property name="can_focus">True</property>
+                 <property name="receives_default">True</property>
+                 <property name="use_stock">True</property>
+-                <signal name="clicked" handler="csr_properties_close_clicked"/>
++                <signal name="clicked" handler="csr_properties_close_clicked" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -235,6 +254,8 @@
+             </child>
+           </object>
+           <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="pack_type">end</property>
+             <property name="position">1</property>
+           </packing>
+--- gnomint-1.3.0.orig/gui/dh_parameters_dialog.ui
++++ gnomint-1.3.0/gui/dh_parameters_dialog.ui
+@@ -1,68 +1,124 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkAdjustment" id="AdjustmentDHPrimeSizeSpinButton">
+     <property name="lower">1024</property>
+     <property name="upper">10240</property>
+-    <property name="step-increment">1024</property>
+-    <property name="page-increment">1024</property>
+-    <property name="page-size">0</property>
+     <property name="value">1024</property>
++    <property name="step_increment">1024</property>
++    <property name="page_increment">1024</property>
+   </object>
+   <object class="GtkDialog" id="dh_parameters_dialog">
++    <property name="can_focus">False</property>
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">New Diffie-Hellman parameters - gnoMint</property>
+     <property name="window_position">center-on-parent</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox18">
++      <object class="GtkBox" id="dialog-vbox18">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
+         <property name="spacing">2</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area18">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button19">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="button18">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+-          <object class="GtkVBox" id="vbox9">
++          <object class="GtkBox" id="vbox9">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="orientation">vertical</property>
+             <property name="spacing">12</property>
+             <child>
+               <object class="GtkLabel" id="label47">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="label" translatable="yes">You are about to create and export a set of Diffie&#xB7;Hellman parameters into a PKCS#3 structure file.</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">You are about to create and export a set of
++Diffie·Hellman parameters into a PKCS#3 structure file.</property>
+                 <property name="use_markup">True</property>
+                 <property name="wrap">True</property>
++                <property name="xalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkLabel" id="label48">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="xpad">8</property>
+-                <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;PKCS#3 files containing Diffie&#xB7;Hellman parameters are used by some cryptographic 
++                <property name="can_focus">False</property>
++                <property name="margin_start">8</property>
++                <property name="margin_end">8</property>
++                <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;PKCS#3 files containing Diffie·Hellman parameters are used by some cryptographic
+ applications for a secure interchange of their keys over insecure channels.&lt;/i&gt;&lt;/small&gt;</property>
+                 <property name="use_markup">True</property>
+                 <property name="wrap">True</property>
+                 <property name="max_width_chars">80</property>
++                <property name="xalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkLabel" id="label49">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">Please, enter the prime size, in bits:</property>
+                 <property name="use_markup">True</property>
+                 <property name="wrap">True</property>
++                <property name="xalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+@@ -70,58 +126,23 @@
+               <object class="GtkSpinButton" id="dh_prime_size_spinbutton">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+-                <property name="invisible_char">&#x2022;</property>
++                <property name="invisible_char">•</property>
+                 <property name="adjustment">AdjustmentDHPrimeSizeSpinButton</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">3</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="padding">10</property>
+             <property name="position">1</property>
+           </packing>
+         </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area18">
+-            <property name="visible">True</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="button19">
+-                <property name="label" translatable="yes">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="button18">
+-                <property name="label" translatable="yes">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
+-          </packing>
+-        </child>
+       </object>
+     </child>
+     <action-widgets>
+--- gnomint-1.3.0.orig/gui/get_db_password_dialog.ui
++++ gnomint-1.3.0/gui/get_db_password_dialog.ui
+@@ -1,28 +1,73 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="get_db_password_dialog">
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">Enter password - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox13">
++      <object class="GtkBox" id="dialog-vbox13">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area13">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button11">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="cadb_password_dialog_ok_button">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+-          <object class="GtkVBox" id="vbox24">
++          <object class="GtkBox" id="vbox24">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+             <property name="border_width">20</property>
+             <property name="orientation">vertical</property>
+             <child>
+               <object class="GtkLabel" id="get_passwd_msg_label">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">This action requires using one or more private keys saved in the CA database.
+ 
+ Please insert the database password.</property>
+@@ -30,6 +75,8 @@
+                 <property name="justify">fill</property>
+                 <property name="wrap">True</property>
+                 <property name="width_chars">40</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -38,28 +85,35 @@
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHBox" id="pwd_hbox">
++              <object class="GtkBox" id="pwd_hbox">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                 <child>
+                   <object class="GtkImage" id="image16">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                     <property name="icon_name">dialog-password</property>
+-                    <property name="icon-size">6</property>
++                    <property name="icon_size">6</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="password_message2">
+                     <property name="visible">True</property>
+-                    <property name="xalign">1</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">Password:</property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">1</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
+@@ -69,15 +123,19 @@
+                     <property name="can_focus">True</property>
+                     <property name="can_default">True</property>
+                     <property name="visibility">False</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                     <property name="activates_default">True</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">2</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+@@ -86,10 +144,9 @@
+                 <property name="label" translatable="yes">Remember this password during this gnoMint session</property>
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
++                <property name="focus_on_click">False</property>
+                 <property name="receives_default">False</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <property name="focus_on_click">False</property>
+-                <property name="xalign">0</property>
+                 <property name="draw_indicator">True</property>
+               </object>
+               <packing>
+@@ -100,46 +157,9 @@
+             </child>
+           </object>
+           <packing>
+-            <property name="position">1</property>
+-          </packing>
+-        </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area13">
+-            <property name="visible">True</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="button11">
+-                <property name="label">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="cadb_password_dialog_ok_button">
+-                <property name="label">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
++            <property name="fill">True</property>
++            <property name="position">1</property>
+           </packing>
+         </child>
+       </object>
+--- gnomint-1.3.0.orig/gui/get_password_dialog.ui
++++ gnomint-1.3.0/gui/get_password_dialog.ui
+@@ -1,53 +1,100 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="get_password_dialog">
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">Enter password - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox12">
++      <object class="GtkBox" id="dialog-vbox12">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area12">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button10">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="password_dialog_ok_button">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="sensitive">False</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+-          <object class="GtkVBox" id="vbox17">
++          <object class="GtkBox" id="vbox17">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="border_width">11</property>
+             <property name="orientation">vertical</property>
+             <child>
+               <object class="GtkLabel" id="info_message">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">Please, enter password</property>
+                 <property name="use_markup">True</property>
+                 <property name="wrap">True</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkTable" id="table3">
++              <object class="GtkGrid" id="table3">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">30</property>
+-                <property name="n_rows">2</property>
+-                <property name="n_columns">2</property>
+                 <child>
+                   <object class="GtkEntry" id="confirm_entry">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="visibility">False</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+                   </packing>
+                 </child>
+                 <child>
+@@ -55,85 +102,55 @@
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="visibility">False</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                     <property name="activates_default">True</property>
+-                    <signal name="changed" handler="dialog_password_entry_changed_cb"/>
++                    <signal name="changed" handler="dialog_password_entry_changed_cb" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="confirm_message">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">Password (confirm):</property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="password_message">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">Password:</property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
++                  <packing>
++                    <property name="left_attach">0</property>
++                    <property name="top_attach">0</property>
++                  </packing>
+                 </child>
+               </object>
+               <packing>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="position">1</property>
+-          </packing>
+-        </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area12">
+-            <property name="visible">True</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="button10">
+-                <property name="label">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+                 <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="password_dialog_ok_button">
+-                <property name="label">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="sensitive">False</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
++            <property name="fill">True</property>
++            <property name="position">1</property>
+           </packing>
+         </child>
+       </object>
+--- gnomint-1.3.0.orig/gui/get_pkey_dialog.ui
++++ gnomint-1.3.0/gui/get_pkey_dialog.ui
+@@ -1,8 +1,9 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="get_pkey_dialog">
++    <property name="can_focus">False</property>
+     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">Choose private key file. gnoMint</property>
+@@ -10,32 +11,84 @@
+     <property name="window_position">center-on-parent</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox20">
++      <object class="GtkBox" id="dialog-vbox20">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+         <property name="orientation">vertical</property>
+         <property name="spacing">2</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area20">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button15">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="button7">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="padding">4</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+-          <object class="GtkVBox" id="vbox18">
++          <object class="GtkBox" id="vbox18">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+             <property name="orientation">vertical</property>
+             <property name="spacing">20</property>
+             <child>
+               <object class="GtkLabel" id="label28">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
+                 <property name="label" translatable="yes">&lt;big&gt;Choose private key file&lt;/big&gt;
+ 
+-For doing the selected operation, you must provide the file where resides the private key corresponding to the certificate:</property>
++For doing the selected operation, you must provide the
++file where resides the private key corresponding to the
++certificate:</property>
+                 <property name="use_markup">True</property>
+                 <property name="wrap">True</property>
+                 <property name="wrap_mode">word-char</property>
+                 <property name="width_chars">40</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -46,24 +99,28 @@
+             <child>
+               <object class="GtkLabel" id="cert_dn_label">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                 <property name="label" translatable="yes">Certificate DN</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkLabel" id="label31">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
+                 <property name="label" translatable="yes">Please, choose the file:</property>
+                 <property name="use_markup">True</property>
+                 <property name="wrap">True</property>
+                 <property name="wrap_mode">word-char</property>
+                 <property name="width_chars">40</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -74,8 +131,9 @@
+             <child>
+               <object class="GtkFileChooserButton" id="pkey_filechooser">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <signal name="selection_changed" handler="pkey_manage_filechooser_file_set_cb"/>
++                <signal name="selection-changed" handler="pkey_manage_filechooser_file_set_cb" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -101,53 +159,12 @@
+             </child>
+           </object>
+           <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="padding">10</property>
+             <property name="position">1</property>
+           </packing>
+         </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area20">
+-            <property name="visible">True</property>
+-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="button15">
+-                <property name="label" translatable="yes">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="button7">
+-                <property name="label" translatable="yes">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="expand">False</property>
+-            <property name="padding">4</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
+-          </packing>
+-        </child>
+       </object>
+     </child>
+     <action-widgets>
+--- gnomint-1.3.0.orig/gui/import_file_or_directory_dialog.ui
++++ gnomint-1.3.0/gui/import_file_or_directory_dialog.ui
+@@ -1,40 +1,91 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="import_file_or_directory_dialog">
++    <property name="can_focus">False</property>
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">Import selection - gnoMint</property>
+     <property name="window_position">center-on-parent</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox15">
++      <object class="GtkBox" id="dialog-vbox15">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
+         <property name="spacing">2</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area15">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button24">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="button23">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+-          <object class="GtkVBox" id="vbox10">
++          <object class="GtkBox" id="vbox10">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="border_width">8</property>
+             <property name="orientation">vertical</property>
+             <property name="spacing">8</property>
+             <child>
+               <object class="GtkLabel" id="label53">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">Please, choose the more suitable option for
++what you want to import:</property>
++                <property name="wrap">True</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+-                <property name="label" translatable="yes">Please, choose the more suitable option for what you want to import:</property>
+-                <property name="wrap">True</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkVBox" id="vbox11">
++              <object class="GtkBox" id="vbox11">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="orientation">vertical</property>
+                 <child>
+                   <object class="GtkRadioButton" id="importfile_radiobutton">
+@@ -47,21 +98,31 @@
+                     <property name="draw_indicator">True</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label54">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
+-                    <property name="xpad">24</property>
+-                    <property name="ypad">9</property>
+-                    <property name="label" translatable="yes">&lt;i&gt;Import a single file, encoded in DER or PEM format, containing certificates, private keys (encrypted or plain), signing requests (CSRs), revocation lists (CRLs) or PKCS#12 packages.&lt;/i&gt;</property>
++                    <property name="can_focus">False</property>
++                    <property name="margin_start">24</property>
++                    <property name="margin_end">24</property>
++                    <property name="margin_top">9</property>
++                    <property name="margin_bottom">9</property>
++                    <property name="label" translatable="yes">&lt;i&gt;Import a single file, encoded in DER or PEM format, containing
++certificates, private keys (encrypted or plain), signing
++requests (CSRs), revocation lists (CRLs) or PKCS#12
++packages.&lt;/i&gt;</property>
+                     <property name="use_markup">True</property>
+                     <property name="wrap">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
+@@ -76,73 +137,45 @@
+                     <property name="group">importfile_radiobutton</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">2</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label55">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
+-                    <property name="xpad">24</property>
+-                    <property name="ypad">9</property>
++                    <property name="can_focus">False</property>
++                    <property name="margin_start">24</property>
++                    <property name="margin_end">24</property>
++                    <property name="margin_top">9</property>
++                    <property name="margin_bottom">9</property>
+                     <property name="label" translatable="yes">&lt;i&gt;Import a directory containing the structure of
+ a whole CA made with OpenSSL .&lt;/i&gt;</property>
+                     <property name="use_markup">True</property>
+                     <property name="justify">fill</property>
+                     <property name="wrap">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">3</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="position">1</property>
+-          </packing>
+-        </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area15">
+-            <property name="visible">True</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="button24">
+-                <property name="label" translatable="yes">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="button23">
+-                <property name="label" translatable="yes">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+                 <property name="expand">False</property>
+-                <property name="fill">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
++            <property name="fill">True</property>
++            <property name="position">1</property>
+           </packing>
+         </child>
+       </object>
+--- gnomint-1.3.0.orig/gui/import_password_dialog.ui
++++ gnomint-1.3.0/gui/import_password_dialog.ui
+@@ -1,35 +1,84 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="import_password_dialog">
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">Enter password - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox16">
++      <object class="GtkBox" id="dialog-vbox16">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area16">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button21">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="import_password_dialog_ok_button1">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+-          <object class="GtkVBox" id="vbox8">
++          <object class="GtkBox" id="vbox8">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+             <property name="border_width">20</property>
+             <property name="orientation">vertical</property>
+             <child>
+               <object class="GtkLabel" id="get_passwd_msg_label1">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
+-                <property name="label" translatable="yes">The whole selected file, or some of its elements, seems to be cyphered using a password or passphrase.
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">The whole selected file, or some of its elements, seems to
++be cyphered using a password or passphrase.
+ 
+-For importing the file into gnoMint database, you must provide an appropiate password.</property>
++For importing the file into gnoMint database, you must
++provide an appropiate password.</property>
+                 <property name="use_markup">True</property>
+                 <property name="justify">fill</property>
+                 <property name="wrap">True</property>
+                 <property name="width_chars">40</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -40,54 +89,69 @@
+             <child>
+               <object class="GtkLabel" id="label52">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="ypad">8</property>
++                <property name="can_focus">False</property>
++                <property name="margin_top">8</property>
++                <property name="margin_bottom">8</property>
+                 <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;The part that is being imported has the description:&lt;/i&gt;&lt;/small&gt;</property>
+                 <property name="use_markup">True</property>
+                 <property name="use_underline">True</property>
+                 <property name="justify">right</property>
++                <property name="xalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkLabel" id="import_crypted_part_description">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="xpad">15</property>
++                <property name="can_focus">False</property>
++                <property name="margin_left">15</property>
++                <property name="margin_right">15</property>
+                 <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;#Description#&lt;/i&gt;&lt;/small&gt;</property>
+                 <property name="use_markup">True</property>
+                 <property name="use_underline">True</property>
+                 <property name="justify">right</property>
++                <property name="xalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHBox" id="pwd_hbox1">
++              <object class="GtkBox" id="pwd_hbox1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                 <child>
+                   <object class="GtkImage" id="image17">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                     <property name="icon_name">dialog-password</property>
+-                    <property name="icon-size">6</property>
++                    <property name="icon_size">6</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="password_message1">
+                     <property name="visible">True</property>
+-                    <property name="xalign">1</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">Password:</property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">1</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
+@@ -97,60 +161,27 @@
+                     <property name="can_focus">True</property>
+                     <property name="can_default">True</property>
+                     <property name="visibility">False</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                     <property name="activates_default">True</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">2</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
+-                <property name="position">3</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="position">1</property>
+-          </packing>
+-        </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area16">
+-            <property name="visible">True</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="button21">
+-                <property name="label">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="import_password_dialog_ok_button1">
+-                <property name="label">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+                 <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">1</property>
++                <property name="fill">True</property>
++                <property name="position">3</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
++            <property name="fill">True</property>
++            <property name="position">1</property>
+           </packing>
+         </child>
+       </object>
+--- gnomint-1.3.0.orig/gui/main_window.ui
++++ gnomint-1.3.0/gui/main_window.ui
+@@ -1,51 +1,82 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
++  <object class="GtkImage" id="addcaimg">
++    <property name="visible">True</property>
++    <property name="can_focus">False</property>
++    <property name="pixbuf">addca.png</property>
++  </object>
++  <object class="GtkImage" id="addcsrimg">
++    <property name="visible">True</property>
++    <property name="can_focus">False</property>
++    <property name="pixbuf">addcsr.png</property>
++  </object>
++  <object class="GtkImage" id="extractpkeyimg">
++    <property name="visible">True</property>
++    <property name="can_focus">False</property>
++    <property name="pixbuf">extractpkey.png</property>
++  </object>
++  <object class="GtkImage" id="signimg">
++    <property name="visible">True</property>
++    <property name="can_focus">False</property>
++    <property name="pixbuf">sign.png</property>
++  </object>
+   <object class="GtkWindow" id="main_window1">
+     <property name="visible">True</property>
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">gnoMint</property>
+     <property name="role">gnoMint_main</property>
+     <property name="window_position">center</property>
+     <property name="default_width">400</property>
+     <property name="default_height">300</property>
+     <property name="icon">gnomint.png</property>
+-    <signal name="delete_event" handler="on_main_window1_delete"/>
++    <signal name="delete-event" handler="on_main_window1_delete" swapped="no"/>
++    <child>
++      <placeholder/>
++    </child>
+     <child>
+-      <object class="GtkVBox" id="vbox1">
++      <object class="GtkBox" id="vbox1">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
+         <child>
+           <object class="GtkMenuBar" id="menubar1">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <child>
+               <object class="GtkMenuItem" id="file1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">_Certificates</property>
+                 <property name="use_underline">True</property>
+                 <child type="submenu">
+                   <object class="GtkMenu" id="file1_menu1">
++                    <property name="can_focus">False</property>
+                     <child>
+                       <object class="GtkImageMenuItem" id="new1">
+                         <property name="label" translatable="yes">_New certificate database</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">False</property>
+-                        <signal name="activate" handler="on_new1_activate"/>
++                        <signal name="activate" handler="on_new1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkImageMenuItem" id="open1">
+                         <property name="label" translatable="yes">_Open certificate database</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">False</property>
+-                        <signal name="activate" handler="on_open1_activate"/>
++                        <signal name="activate" handler="on_open1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkMenuItem" id="openrecentsmenuitem">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">Open _recents</property>
+                         <property name="use_underline">True</property>
+                       </object>
+@@ -54,41 +85,47 @@
+                       <object class="GtkImageMenuItem" id="save_as1">
+                         <property name="label" translatable="yes">_Save certificate database as...</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">False</property>
+-                        <signal name="activate" handler="on_save_as1_activate"/>
++                        <signal name="activate" handler="on_save_as1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkSeparatorMenuItem" id="separator1">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkImageMenuItem" id="gtk-add">
+                         <property name="label">gtk-add</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">True</property>
+                         <child type="submenu">
+                           <object class="GtkMenu" id="menu3">
+                             <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <child>
+                               <object class="GtkImageMenuItem" id="new2">
+                                 <property name="label" translatable="yes">_Add self-signed CA</property>
+                                 <property name="visible">True</property>
++                                <property name="can_focus">False</property>
+                                 <property name="use_underline">True</property>
+                                 <property name="use_stock">False</property>
+-                                <signal name="activate" handler="on_add_self_signed_ca_activate"/>
++                                <signal name="activate" handler="on_add_self_signed_ca_activate" swapped="no"/>
+                               </object>
+                             </child>
+                             <child>
+                               <object class="GtkImageMenuItem" id="new_certificate1">
+                                 <property name="label" translatable="yes">Add _Certificate Request</property>
+                                 <property name="visible">True</property>
++                                <property name="can_focus">False</property>
+                                 <property name="use_underline">True</property>
+                                 <property name="use_stock">False</property>
+-                                <signal name="activate" handler="on_add_csr_activate"/>
++                                <signal name="activate" handler="on_add_csr_activate" swapped="no"/>
+                               </object>
+                             </child>
+                           </object>
+@@ -100,12 +137,13 @@
+                         <property name="label" translatable="yes">Extrac_t private key</property>
+                         <property name="visible">True</property>
+                         <property name="sensitive">False</property>
++                        <property name="can_focus">False</property>
+                         <property name="has_tooltip">True</property>
+                         <property name="tooltip_markup">Extract the saved private key to an external file or device</property>
+                         <property name="tooltip_text" translatable="yes">Extract the saved private key to an external file or device</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">False</property>
+-                        <signal name="activate" handler="ca_on_extractprivatekey1_activate"/>
++                        <signal name="activate" handler="ca_on_extractprivatekey1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+@@ -113,9 +151,10 @@
+                         <property name="label" translatable="yes">Revo_ke</property>
+                         <property name="visible">True</property>
+                         <property name="sensitive">False</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">False</property>
+-                        <signal name="activate" handler="ca_on_revoke_activate"/>
++                        <signal name="activate" handler="ca_on_revoke_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+@@ -123,9 +162,10 @@
+                         <property name="label" translatable="yes">_Sign</property>
+                         <property name="visible">True</property>
+                         <property name="sensitive">False</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">False</property>
+-                        <signal name="activate" handler="ca_on_sign1_activate"/>
++                        <signal name="activate" handler="ca_on_sign1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+@@ -133,91 +173,103 @@
+                         <property name="label">gtk-delete</property>
+                         <property name="visible">True</property>
+                         <property name="sensitive">False</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">True</property>
+-                        <signal name="activate" handler="ca_on_delete2_activate"/>
++                        <signal name="activate" handler="ca_on_delete2_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkSeparatorMenuItem" id="separatormenuitem4">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkMenuItem" id="generate_crl_menuitem">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                         <property name="has_tooltip">True</property>
+                         <property name="tooltip_markup">Generate the current Certificate Revocation List</property>
+                         <property name="tooltip_text" translatable="yes">Generate the current Certificate Revocation List</property>
+                         <property name="label" translatable="yes">Generate _CRL</property>
+                         <property name="use_underline">True</property>
+-                        <signal name="activate" handler="ca_generate_crl"/>
++                        <signal name="activate" handler="ca_generate_crl" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkSeparatorMenuItem" id="separator3">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkMenuItem" id="generate_dh_menuitem">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">Generate D_H parameters...</property>
+                         <property name="use_underline">True</property>
+-                        <signal name="activate" handler="ca_generate_dh_param_show"/>
++                        <signal name="activate" handler="ca_generate_dh_param_show" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkSeparatorMenuItem" id="separator4">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkMenuItem" id="change_pwd_menuitem">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                         <property name="label" translatable="yes">Change database pass_word</property>
+                         <property name="use_underline">True</property>
+-                        <signal name="activate" handler="ca_on_change_pwd_menuitem_activate"/>
++                        <signal name="activate" handler="ca_on_change_pwd_menuitem_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkSeparatorMenuItem" id="separator5">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkImageMenuItem" id="import1">
+                         <property name="label" translatable="yes">_Import</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">False</property>
+-                        <signal name="activate" handler="on_import1_activate"/>
++                        <signal name="activate" handler="on_import1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkMenuItem" id="export1">
+                         <property name="visible">True</property>
+                         <property name="sensitive">False</property>
++                        <property name="can_focus">False</property>
+                         <property name="label" translatable="yes">E_xport</property>
+                         <property name="use_underline">True</property>
+-                        <signal name="activate" handler="ca_on_export1_activate"/>
++                        <signal name="activate" handler="ca_on_export1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkSeparatorMenuItem" id="separatormenuitem2">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkImageMenuItem" id="quit1">
+                         <property name="label">gtk-quit</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">True</property>
+-                        <signal name="activate" handler="on_quit1_activate"/>
++                        <signal name="activate" handler="on_quit1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                   </object>
+@@ -227,31 +279,36 @@
+             <child>
+               <object class="GtkMenuItem" id="edit1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">_Edit</property>
+                 <property name="use_underline">True</property>
+                 <child type="submenu">
+                   <object class="GtkMenu" id="edit1_menu1">
++                    <property name="can_focus">False</property>
+                     <child>
+                       <object class="GtkImageMenuItem" id="properties1">
+                         <property name="label">gtk-properties</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">True</property>
+-                        <signal name="activate" handler="on_properties1_activate"/>
++                        <signal name="activate" handler="on_properties1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkSeparatorMenuItem" id="separator2">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkImageMenuItem" id="preferences1">
+                         <property name="label">gtk-preferences</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">True</property>
+-                        <signal name="activate" handler="on_preferences1_activate"/>
++                        <signal name="activate" handler="on_preferences1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                   </object>
+@@ -261,31 +318,35 @@
+             <child>
+               <object class="GtkMenuItem" id="menuitem1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                 <property name="label" translatable="yes">_View</property>
+                 <property name="use_underline">True</property>
+                 <child type="submenu">
+                   <object class="GtkMenu" id="menu1">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                     <child>
+                       <object class="GtkCheckMenuItem" id="csr_view_menuitem">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                         <property name="label" translatable="yes">Certificate _Signing Requests</property>
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+-                        <signal name="toggled" handler="ca_csr_view_toggled"/>
++                        <signal name="toggled" handler="ca_csr_view_toggled" swapped="no"/>
+                       </object>
+                     </child>
+                     <child>
+                       <object class="GtkCheckMenuItem" id="revoked_view_menuitem">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                         <property name="label" translatable="yes">_Revoked Certificates</property>
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+-                        <signal name="toggled" handler="ca_rcrt_view_toggled"/>
++                        <signal name="toggled" handler="ca_rcrt_view_toggled" swapped="no"/>
+                       </object>
+                     </child>
+                   </object>
+@@ -295,17 +356,20 @@
+             <child>
+               <object class="GtkMenuItem" id="help1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">_Help</property>
+                 <property name="use_underline">True</property>
+                 <child type="submenu">
+                   <object class="GtkMenu" id="help1_menu1">
++                    <property name="can_focus">False</property>
+                     <child>
+                       <object class="GtkImageMenuItem" id="about1">
+                         <property name="label">gtk-about</property>
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_stock">True</property>
+-                        <signal name="activate" handler="on_about1_activate"/>
++                        <signal name="activate" handler="on_about1_activate" swapped="no"/>
+                       </object>
+                     </child>
+                   </object>
+@@ -322,14 +386,16 @@
+         <child>
+           <object class="GtkToolbar" id="toolbar1">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <child>
+               <object class="GtkToolButton" id="toolbutton1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="has_tooltip">True</property>
+                 <property name="tooltip_markup">Create a new database</property>
+                 <property name="tooltip_text" translatable="yes">Create a new database</property>
+                 <property name="stock_id">gtk-new</property>
+-                <signal name="clicked" handler="on_new1_activate"/>
++                <signal name="clicked" handler="on_new1_activate" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -339,11 +405,12 @@
+             <child>
+               <object class="GtkToolButton" id="toolbutton2">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="has_tooltip">True</property>
+                 <property name="tooltip_markup">Open an existing database</property>
+                 <property name="tooltip_text" translatable="yes">Open an existing database</property>
+                 <property name="stock_id">gtk-open</property>
+-                <signal name="clicked" handler="on_open1_activate"/>
++                <signal name="clicked" handler="on_open1_activate" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -353,6 +420,7 @@
+             <child>
+               <object class="GtkSeparatorToolItem" id="toolbutton4">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -362,12 +430,13 @@
+             <child>
+               <object class="GtkToolButton" id="addca_toolbutton">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="has_tooltip">True</property>
+                 <property name="tooltip_markup">Add an autosigned CA</property>
+                 <property name="tooltip_text" translatable="yes">Add an autosigned CA</property>
+                 <property name="label" translatable="yes">Add autosigned CA certificate</property>
+                 <property name="icon_widget">addcaimg</property>
+-                <signal name="clicked" handler="on_add_self_signed_ca_activate"/>
++                <signal name="clicked" handler="on_add_self_signed_ca_activate" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -377,12 +446,13 @@
+             <child>
+               <object class="GtkToolButton" id="addcsr_toolbutton">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="has_tooltip">True</property>
+                 <property name="tooltip_markup">Add a new Certificate Signing Request</property>
+                 <property name="tooltip_text" translatable="yes">Add a new Certificate Signing Request</property>
+                 <property name="label" translatable="yes">Add CSR</property>
+                 <property name="icon_widget">addcsrimg</property>
+-                <signal name="clicked" handler="on_add_csr_activate"/>
++                <signal name="clicked" handler="on_add_csr_activate" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -392,6 +462,7 @@
+             <child>
+               <object class="GtkSeparatorToolItem" id="toolbutton6">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -402,12 +473,13 @@
+               <object class="GtkToolButton" id="extractpkey_toolbutton">
+                 <property name="visible">True</property>
+                 <property name="sensitive">False</property>
++                <property name="can_focus">False</property>
+                 <property name="has_tooltip">True</property>
+                 <property name="tooltip_markup">Extract the private key of the selected item into a external file</property>
+                 <property name="tooltip_text" translatable="yes">Extract the private key of the selected item into a external file</property>
+                 <property name="label" translatable="yes">Extract Private Key</property>
+                 <property name="icon_widget">extractpkeyimg</property>
+-                <signal name="clicked" handler="ca_on_extractprivatekey1_activate"/>
++                <signal name="clicked" handler="ca_on_extractprivatekey1_activate" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -418,12 +490,13 @@
+               <object class="GtkToolButton" id="revoke_toolbutton">
+                 <property name="visible">True</property>
+                 <property name="sensitive">False</property>
++                <property name="can_focus">False</property>
+                 <property name="has_tooltip">True</property>
+                 <property name="tooltip_markup">Revoke the selected certificate</property>
+                 <property name="tooltip_text" translatable="yes">Revoke the selected certificate</property>
+                 <property name="label" translatable="yes">Revoke</property>
+                 <property name="stock_id">gtk-cancel</property>
+-                <signal name="clicked" handler="ca_on_revoke_activate"/>
++                <signal name="clicked" handler="ca_on_revoke_activate" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -434,12 +507,13 @@
+               <object class="GtkToolButton" id="sign_toolbutton">
+                 <property name="visible">True</property>
+                 <property name="sensitive">False</property>
++                <property name="can_focus">False</property>
+                 <property name="has_tooltip">True</property>
+                 <property name="tooltip_markup">Sign the selected Certificate Signing Request</property>
+                 <property name="tooltip_text" translatable="yes">Sign the selected Certificate Signing Request</property>
+                 <property name="label" translatable="yes">Sign</property>
+                 <property name="icon_widget">signimg</property>
+-                <signal name="clicked" handler="ca_on_sign1_activate"/>
++                <signal name="clicked" handler="ca_on_sign1_activate" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -450,11 +524,12 @@
+               <object class="GtkToolButton" id="delete_toolbutton">
+                 <property name="visible">True</property>
+                 <property name="sensitive">False</property>
++                <property name="can_focus">False</property>
+                 <property name="has_tooltip">True</property>
+                 <property name="tooltip_markup">Delete the selected Certificate Signing Request</property>
+                 <property name="tooltip_text" translatable="yes">Delete the selected Certificate Signing Request</property>
+                 <property name="stock_id">gtk-delete</property>
+-                <signal name="clicked" handler="ca_on_delete2_activate"/>
++                <signal name="clicked" handler="ca_on_delete2_activate" swapped="no"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -472,41 +547,28 @@
+           <object class="GtkScrolledWindow" id="scrolledwindow6">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+-            <property name="hscrollbar_policy">automatic</property>
+-            <property name="vscrollbar_policy">automatic</property>
+             <property name="shadow_type">in</property>
+             <child>
+               <object class="GtkTreeView" id="ca_treeview">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="rules_hint">True</property>
+-                <signal name="button_press_event" handler="ca_treeview_popup_handler"/>
+-                <signal name="cursor_changed" handler="ca_treeview_selection_change"/>
+-                <signal name="row_activated" handler="ca_treeview_row_activated"/>
++                <signal name="button-press-event" handler="ca_treeview_popup_handler" swapped="no"/>
++                <signal name="cursor-changed" handler="ca_treeview_selection_change" swapped="no"/>
++                <signal name="row-activated" handler="ca_treeview_row_activated" swapped="no"/>
++                <child internal-child="selection">
++                  <object class="GtkTreeSelection"/>
++                </child>
+               </object>
+             </child>
+           </object>
+           <packing>
++            <property name="expand">True</property>
++            <property name="fill">True</property>
+             <property name="position">2</property>
+           </packing>
+         </child>
+       </object>
+     </child>
+   </object>
+-  <object class="GtkImage" id="addcaimg">
+-    <property name="visible">True</property>
+-    <property name="pixbuf">addca.png</property>
+-  </object>
+-  <object class="GtkImage" id="addcsrimg">
+-    <property name="visible">True</property>
+-    <property name="pixbuf">addcsr.png</property>
+-  </object>
+-  <object class="GtkImage" id="signimg">
+-    <property name="visible">True</property>
+-    <property name="pixbuf">sign.png</property>
+-  </object>
+-  <object class="GtkImage" id="extractpkeyimg">
+-    <property name="visible">True</property>
+-    <property name="pixbuf">extractpkey.png</property>
+-  </object>
+ </interface>
+--- gnomint-1.3.0.orig/gui/new_ca_window.ui
++++ gnomint-1.3.0/gui/new_ca_window.ui
+@@ -1,49 +1,58 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <!-- interface-requires gtk+ 2.12 -->
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkAdjustment" id="adjustmentCAKeyLength">
+-    <property name="value">2048</property>
+     <property name="lower">1024</property>
+     <property name="upper">5120</property>
++    <property name="value">2048</property>
+     <property name="step_increment">1024</property>
+     <property name="page_increment">1024</property>
+   </object>
+   <object class="GtkAdjustment" id="adjustmentMonthsBeforeExpiration">
+-    <property name="value">240</property>
+     <property name="lower">1</property>
+     <property name="upper">600</property>
++    <property name="value">240</property>
+     <property name="step_increment">1</property>
+     <property name="page_increment">12</property>
+   </object>
+   <object class="GtkWindow" id="new_ca_window">
+     <property name="visible">True</property>
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">New CA - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="window_position">center</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+     <child>
++      <placeholder/>
++    </child>
++    <child>
+       <object class="GtkNotebook" id="new_ca_notebook">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="border_width">8</property>
+         <property name="show_tabs">False</property>
+         <property name="show_border">False</property>
+         <child>
+-          <object class="GtkVBox" id="vbox2">
++          <object class="GtkBox" id="vbox2">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="orientation">vertical</property>
+             <property name="spacing">6</property>
+             <child>
+-              <object class="GtkHBox" id="hbox1">
++              <object class="GtkBox" id="hbox1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <child>
+                   <object class="GtkLabel" id="label11">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;big&gt;CA Subject Properties&lt;/big&gt;
+ </property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -54,9 +63,10 @@
+                 <child>
+                   <object class="GtkLabel" id="label12">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes"> </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes"> </property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -72,186 +82,168 @@
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkTable" id="table1">
++              <object class="GtkGrid" id="table1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">6</property>
+-                <property name="n_rows">6</property>
+-                <property name="n_columns">2</property>
+                 <property name="row_spacing">6</property>
+                 <child>
+                   <object class="GtkLabel" id="label9">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Organization:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Organization:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">3</property>
+-                    <property name="bottom_attach">4</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label10">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Organization Unit:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Organization Unit:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">4</property>
+-                    <property name="bottom_attach">5</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label6">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">Country:</property>
+                     <property name="max_width_chars">0</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="left_attach">0</property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label7">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">State or Province name: </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">State or Province name: </property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label8">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">City: </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">City: </property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">2</property>
+-                    <property name="bottom_attach">3</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="st_entry">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="city_entry">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">2</property>
+-                    <property name="bottom_attach">3</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="o_entry">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">3</property>
+-                    <property name="bottom_attach">4</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="ou_entry">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">4</property>
+-                    <property name="bottom_attach">5</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label20">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">CA Root Certificate 
+ Common Name (CN):</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">5</property>
+-                    <property name="bottom_attach">6</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="cn_entry">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
+-                    <signal name="changed" handler="on_cn_entry_changed"/>
++                    <property name="invisible_char">•</property>
++                    <signal name="changed" handler="on_cn_entry_changed" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">5</property>
+-                    <property name="bottom_attach">6</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkComboBox" id="country_combobox">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox1">
++              <object class="GtkButtonBox" id="hbuttonbox1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -277,7 +269,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_ca_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_ca_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -294,7 +286,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_ca_next1_clicked"/>
++                    <signal name="clicked" handler="on_new_ca_next1_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -317,28 +309,33 @@
+         <child type="tab">
+           <object class="GtkLabel" id="label3">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">CA properties</property>
+             <property name="xalign">0</property>
+             <property name="yalign">0</property>
+-            <property name="label" translatable="yes">CA properties</property>
+           </object>
+           <packing>
+             <property name="tab_fill">False</property>
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkVBox" id="vbox20">
++          <object class="GtkBox" id="vbox20">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="orientation">vertical</property>
+             <child>
+-              <object class="GtkHBox" id="hbox21">
++              <object class="GtkBox" id="hbox21">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <child>
+                   <object class="GtkLabel" id="label37">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;big&gt;CA Root certificate properties&lt;/big&gt;
+ </property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -349,9 +346,10 @@
+                 <child>
+                   <object class="GtkLabel" id="label103">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes"> </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes"> </property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -362,16 +360,16 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkTable" id="table2">
++              <object class="GtkGrid" id="table2">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">6</property>
+-                <property name="n_rows">3</property>
+-                <property name="n_columns">2</property>
+-                <property name="homogeneous">True</property>
++                <property name="column_homogeneous">True</property>
+                 <child>
+                   <object class="GtkSpinButton" id="months_before_expiration_spinbutton">
+                     <property name="visible">True</property>
+@@ -384,24 +382,20 @@
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">2</property>
+-                    <property name="bottom_attach">3</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label27">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Months before root certificate expiration:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Months before root certificate expiration:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">2</property>
+-                    <property name="bottom_attach">3</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+@@ -416,15 +410,13 @@
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkHBox" id="hbox3">
++                  <object class="GtkBox" id="hbox3">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="homogeneous">True</property>
+                     <child>
+                       <object class="GtkRadioButton" id="rsa_radiobutton">
+@@ -435,7 +427,7 @@
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_ca_privkey_type_toggle"/>
++                        <signal name="toggled" handler="on_new_ca_privkey_type_toggle" swapped="no"/>
+                       </object>
+                       <packing>
+                         <property name="expand">False</property>
+@@ -462,45 +454,46 @@
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label21">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Private key bit length:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Private key bit length:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label17">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Private key type:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Private key type:</property>
+                   </object>
+                   <packing>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="left_attach">0</property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox12">
++              <object class="GtkButtonBox" id="hbuttonbox12">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -526,7 +519,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_ca_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_ca_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -542,7 +535,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_ca_previous2_clicked"/>
++                    <signal name="clicked" handler="on_new_ca_previous2_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -558,7 +551,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_ca_next2_clicked"/>
++                    <signal name="clicked" handler="on_new_ca_next2_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -569,20 +562,23 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="position">1</property>
++            <property name="tab_fill">False</property>
+           </packing>
+         </child>
+         <child type="tab">
+           <object class="GtkLabel" id="label4">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">Root certificate prop</property>
+             <property name="xalign">0</property>
+             <property name="yalign">0</property>
+-            <property name="label" translatable="yes">Root certificate prop</property>
+           </object>
+           <packing>
+             <property name="position">1</property>
+@@ -590,19 +586,23 @@
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkVBox" id="vbox3">
++          <object class="GtkBox" id="vbox3">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="orientation">vertical</property>
+             <child>
+-              <object class="GtkHBox" id="hbox2">
++              <object class="GtkBox" id="hbox2">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <child>
+                   <object class="GtkLabel" id="label13">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;big&gt;CA properties&lt;/big&gt;
+ </property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -613,9 +613,10 @@
+                 <child>
+                   <object class="GtkLabel" id="label14">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes"> </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes"> </property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -626,17 +627,21 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkVBox" id="vbox1">
++              <object class="GtkBox" id="vbox1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="orientation">vertical</property>
+                 <child>
+                   <object class="GtkLabel" id="label1">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">CRL Distribution Point:</property>
++                    <property name="xalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -647,8 +652,7 @@
+                 <child>
+                   <object class="GtkLabel" id="label2">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;small&gt;Please, in this field enter an URL where the CRL for this CA will be available. 
+ You can leave it blank. In this case, no CRL Distribution Point will be set in the CA 
+ Certificate, and you will be able to set it as a new CA property. 
+@@ -657,6 +661,8 @@
+                     <property name="use_markup">True</property>
+                     <property name="wrap">True</property>
+                     <property name="max_width_chars">60</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -668,7 +674,7 @@
+                   <object class="GtkEntry" id="crl_distribution_point_entry">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -678,12 +684,15 @@
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox4">
++              <object class="GtkButtonBox" id="hbuttonbox4">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -709,7 +718,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_ca_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_ca_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -725,7 +734,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_ca_previous3_clicked"/>
++                    <signal name="clicked" handler="on_new_ca_previous3_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -741,7 +750,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_ca_commit_clicked"/>
++                    <signal name="clicked" handler="on_new_ca_commit_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -752,17 +761,20 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="position">2</property>
++            <property name="tab_fill">False</property>
+           </packing>
+         </child>
+         <child type="tab">
+           <object class="GtkLabel" id="label18">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+             <property name="label" translatable="yes">Password protect</property>
+           </object>
+--- gnomint-1.3.0.orig/gui/new_cert_window.ui
++++ gnomint-1.3.0/gui/new_cert_window.ui
+@@ -1,41 +1,47 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkAdjustment" id="AdjustmentMonthsBeforeExpirationSpinButton1">
+     <property name="lower">1</property>
+     <property name="upper">600</property>
+-    <property name="step-increment">1</property>
+-    <property name="page-increment">12</property>
+-    <property name="page-size">0</property>
+     <property name="value">1</property>
++    <property name="step_increment">1</property>
++    <property name="page_increment">12</property>
+   </object>
+   <object class="GtkWindow" id="new_cert_window">
+     <property name="visible">True</property>
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">New Certificate - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="window_position">center</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+     <child>
++      <placeholder/>
++    </child>
++    <child>
+       <object class="GtkNotebook" id="new_cert_notebook">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="border_width">8</property>
+         <property name="show_tabs">False</property>
+         <property name="show_border">False</property>
+         <child>
+-          <object class="GtkVBox" id="vbox25">
++          <object class="GtkBox" id="vbox25">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="orientation">vertical</property>
+             <property name="spacing">6</property>
+             <child>
+               <object class="GtkLabel" id="label136">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">&lt;big&gt;New Certificate Properties&lt;/big&gt;
+ </property>
+                 <property name="use_markup">True</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -46,197 +52,196 @@
+             <child>
+               <object class="GtkLabel" id="label137">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
+-                <property name="label" translatable="yes">You are about to sign a Certificate Signing Request, and this way, creating a new certificate. Please check the certificate properties.</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">You are about to sign a Certificate Signing Request,
++and this way, creating a new certificate. Please
++check the certificate properties.</property>
+                 <property name="justify">fill</property>
+                 <property name="wrap">True</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkTable" id="table13">
++              <object class="GtkGrid" id="table13">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">16</property>
+-                <property name="n_rows">6</property>
+-                <property name="n_columns">2</property>
+-                <property name="column_spacing">10</property>
+                 <property name="row_spacing">6</property>
++                <property name="column_spacing">10</property>
+                 <child>
+                   <object class="GtkLabel" id="cn_label">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">label</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">label</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">5</property>
+-                    <property name="bottom_attach">6</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="ou_label">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">label</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">label</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">4</property>
+-                    <property name="bottom_attach">5</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="o_label">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">label</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">label</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">3</property>
+-                    <property name="bottom_attach">4</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="l_label">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">label</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">label</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">2</property>
+-                    <property name="bottom_attach">3</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="st_label">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">label</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">label</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="c_label">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">label</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">label</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label144">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Organization:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Organization:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">3</property>
+-                    <property name="bottom_attach">4</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label143">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Organization Unit:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Organization Unit:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">4</property>
+-                    <property name="bottom_attach">5</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label142">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Country:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Country:</property>
+                   </object>
+                   <packing>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="left_attach">0</property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label141">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">State or Province name: </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">State or Province name: </property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label140">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">City: </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">City: </property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">2</property>
+-                    <property name="bottom_attach">3</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label138">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">New certificate 
+ Common Name (CN):</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">5</property>
+-                    <property name="bottom_attach">6</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox14">
++              <object class="GtkButtonBox" id="hbuttonbox14">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -262,7 +267,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_cert_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_cert_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -278,7 +283,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_cert_next1_clicked"/>
++                    <signal name="clicked" handler="on_new_cert_next1_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -301,27 +306,30 @@
+         <child type="tab">
+           <object class="GtkLabel" id="label145">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">CA properties</property>
+             <property name="xalign">0</property>
+             <property name="yalign">0</property>
+-            <property name="label" translatable="yes">CA properties</property>
+           </object>
+           <packing>
+             <property name="tab_fill">False</property>
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkVBox" id="vbox23">
++          <object class="GtkBox" id="vbox23">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="orientation">vertical</property>
+             <property name="spacing">6</property>
+             <child>
+               <object class="GtkLabel" id="label34">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">&lt;big&gt;New Certificate Properties&lt;/big&gt;
+ </property>
+                 <property name="use_markup">True</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -332,13 +340,18 @@
+             <child>
+               <object class="GtkLabel" id="label84">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
+-                <property name="label" translatable="yes">You are about to sign a Certificate Signing Request. Please, choose the Certification Authority you are going to use for signing it.</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">You are about to sign a Certificate Signing Request.
++Please, choose the Certification Authority you are
++going to use for signing it.</property>
+                 <property name="justify">fill</property>
+                 <property name="wrap">True</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+@@ -346,25 +359,29 @@
+               <object class="GtkScrolledWindow" id="scrolledwindow5">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+-                <property name="hscrollbar_policy">automatic</property>
+-                <property name="vscrollbar_policy">automatic</property>
+                 <property name="shadow_type">in</property>
+                 <child>
+                   <object class="GtkTreeView" id="signing_ca_treeview">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="headers_visible">False</property>
+-                    <signal name="cursor_changed" handler="new_cert_signing_ca_treeview_cursor_changed"/>
++                    <signal name="cursor-changed" handler="new_cert_signing_ca_treeview_cursor_changed" swapped="no"/>
++                    <child internal-child="selection">
++                      <object class="GtkTreeSelection"/>
++                    </child>
+                   </object>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox3">
++              <object class="GtkButtonBox" id="hbuttonbox3">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -390,7 +407,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_cert_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_cert_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -406,7 +423,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_cert_previous2_clicked"/>
++                    <signal name="clicked" handler="on_new_cert_previous2_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -423,7 +440,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_cert_next2_clicked"/>
++                    <signal name="clicked" handler="on_new_cert_next2_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -446,9 +463,10 @@
+         <child type="tab">
+           <object class="GtkLabel" id="label151">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">Choose CA for signing the CSR</property>
+             <property name="xalign">0</property>
+             <property name="yalign">0</property>
+-            <property name="label" translatable="yes">Choose CA for signing the CSR</property>
+           </object>
+           <packing>
+             <property name="position">2</property>
+@@ -456,17 +474,19 @@
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkVBox" id="vbox26">
++          <object class="GtkBox" id="vbox26">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="orientation">vertical</property>
+             <child>
+               <object class="GtkLabel" id="label146">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="yalign">0</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">&lt;big&gt;New Certificate Properties&lt;/big&gt;
+ </property>
+                 <property name="use_markup">True</property>
++                <property name="xalign">0</property>
++                <property name="yalign">0</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+@@ -475,17 +495,21 @@
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHBox" id="hbox20">
++              <object class="GtkBox" id="hbox20">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">8</property>
+                 <child>
+                   <object class="GtkLabel" id="label147">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Months before certificate expiration:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Months before certificate expiration:</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+@@ -493,19 +517,21 @@
+                   <object class="GtkSpinButton" id="months_before_expiration_spinbutton1">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                     <property name="adjustment">AdjustmentMonthsBeforeExpirationSpinButton1</property>
+                     <property name="climb_rate">1</property>
+                     <property name="numeric">True</property>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+-                <property name="fill">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+@@ -515,11 +541,10 @@
+                 <property name="can_focus">True</property>
+                 <property name="border_width">4</property>
+                 <child>
+-                  <object class="GtkTable" id="table16">
++                  <object class="GtkGrid" id="table16">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="border_width">10</property>
+-                    <property name="n_rows">4</property>
+-                    <property name="n_columns">2</property>
+                     <child>
+                       <object class="GtkCheckButton" id="data_encipherment_check">
+                         <property name="label" translatable="yes">Data encipherment</property>
+@@ -529,13 +554,11 @@
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">2</property>
+-                        <property name="bottom_attach">3</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -547,13 +570,11 @@
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">1</property>
+-                        <property name="bottom_attach">2</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -565,11 +586,11 @@
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
++                        <property name="top_attach">0</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -580,8 +601,12 @@
+                         <property name="receives_default">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
++                      <packing>
++                        <property name="left_attach">0</property>
++                        <property name="top_attach">0</property>
++                      </packing>
+                     </child>
+                     <child>
+                       <object class="GtkCheckButton" id="key_agreement_check">
+@@ -592,11 +617,11 @@
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">3</property>
+-                        <property name="bottom_attach">4</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -607,11 +632,11 @@
+                         <property name="receives_default">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">2</property>
+-                        <property name="bottom_attach">3</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -622,22 +647,21 @@
+                         <property name="receives_default">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">1</property>
+-                        <property name="bottom_attach">2</property>
+                       </packing>
+                     </child>
+                     <child>
+                       <object class="GtkLabel" id="label110">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">3</property>
+-                        <property name="bottom_attach">4</property>
+                       </packing>
+                     </child>
+                   </object>
+@@ -645,16 +669,17 @@
+                 <child type="label">
+                   <object class="GtkLabel" id="label150">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;b&gt;Certificate uses&lt;/b&gt;</property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                 </child>
+               </object>
+               <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+@@ -664,22 +689,20 @@
+                 <property name="can_focus">True</property>
+                 <property name="border_width">4</property>
+                 <child>
+-                  <object class="GtkTable" id="table14">
++                  <object class="GtkGrid" id="table14">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="border_width">10</property>
+-                    <property name="n_rows">4</property>
+-                    <property name="n_columns">2</property>
+                     <child>
+                       <object class="GtkLabel" id="label161">
+                         <property name="visible">True</property>
++                        <property name="can_focus">False</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0</property>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">3</property>
+-                        <property name="bottom_attach">4</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -690,13 +713,11 @@
+                         <property name="receives_default">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">2</property>
+-                        <property name="bottom_attach">3</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -707,11 +728,11 @@
+                         <property name="receives_default">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">3</property>
+-                        <property name="bottom_attach">4</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -722,11 +743,11 @@
+                         <property name="receives_default">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">2</property>
+-                        <property name="bottom_attach">3</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -738,8 +759,12 @@
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
++                      <packing>
++                        <property name="left_attach">0</property>
++                        <property name="top_attach">0</property>
++                      </packing>
+                     </child>
+                     <child>
+                       <object class="GtkCheckButton" id="webclient_check">
+@@ -750,11 +775,11 @@
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
++                        <property name="left_attach">0</property>
+                         <property name="top_attach">1</property>
+-                        <property name="bottom_attach">2</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -765,11 +790,11 @@
+                         <property name="receives_default">False</property>
+                         <property name="use_underline">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
++                        <property name="top_attach">0</property>
+                       </packing>
+                     </child>
+                     <child>
+@@ -781,13 +806,11 @@
+                         <property name="use_underline">True</property>
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+-                        <signal name="toggled" handler="on_new_cert_property_toggled"/>
++                        <signal name="toggled" handler="on_new_cert_property_toggled" swapped="no"/>
+                       </object>
+                       <packing>
+                         <property name="left_attach">1</property>
+-                        <property name="right_attach">2</property>
+                         <property name="top_attach">1</property>
+-                        <property name="bottom_attach">2</property>
+                       </packing>
+                     </child>
+                   </object>
+@@ -795,30 +818,36 @@
+                 <child type="label">
+                   <object class="GtkLabel" id="label148">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;b&gt;Certificate purposes&lt;/b&gt;</property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">3</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHSeparator" id="hseparator1">
++              <object class="GtkSeparator" id="hseparator1">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="padding">10</property>
+                 <property name="position">4</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox15">
++              <object class="GtkButtonBox" id="hbuttonbox15">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -844,7 +873,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_cert_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_cert_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -860,7 +889,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_cert_previous3_clicked"/>
++                    <signal name="clicked" handler="on_new_cert_previous3_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -876,7 +905,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_cert_commit_clicked"/>
++                    <signal name="clicked" handler="on_new_cert_commit_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -887,6 +916,7 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">False</property>
+                 <property name="position">5</property>
+               </packing>
+             </child>
+@@ -898,6 +928,7 @@
+         <child type="tab">
+           <object class="GtkLabel" id="label32">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="label" translatable="yes">Certificate properties</property>
+           </object>
+           <packing>
+--- gnomint-1.3.0.orig/gui/new_crl_dialog.ui
++++ gnomint-1.3.0/gui/new_crl_dialog.ui
+@@ -1,26 +1,75 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="new_crl_dialog">
++    <property name="can_focus">False</property>
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">New CRL - gnoMint</property>
+     <property name="window_position">center-on-parent</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox21">
++      <object class="GtkBox" id="dialog-vbox21">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
+         <property name="spacing">11</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area21">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button22">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++                <signal name="clicked" handler="crl_cancel_clicked_cb" swapped="no"/>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="crl_ok_button">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="sensitive">False</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++                <signal name="clicked" handler="crl_ok_clicked_cb" swapped="no"/>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+           <object class="GtkLabel" id="label50">
+             <property name="visible">True</property>
+-            <property name="xalign">0</property>
+-            <property name="yalign">0</property>
++            <property name="can_focus">False</property>
+             <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;New Certificate Revocation List&lt;/b&gt;&lt;/big&gt;</property>
+             <property name="use_markup">True</property>
++            <property name="xalign">0</property>
++            <property name="yalign">0</property>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+@@ -31,9 +80,10 @@
+         <child>
+           <object class="GtkLabel" id="label51">
+             <property name="visible">True</property>
+-            <property name="xalign">0</property>
++            <property name="can_focus">False</property>
+             <property name="label" translatable="yes">Please, select the CA for which a Certificate 
+ Revocation List is going to be created:</property>
++            <property name="xalign">0</property>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+@@ -45,64 +95,25 @@
+           <object class="GtkScrolledWindow" id="scrolledwindow2">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+-            <property name="hscrollbar_policy">automatic</property>
+-            <property name="vscrollbar_policy">automatic</property>
+             <property name="shadow_type">in</property>
+             <child>
+               <object class="GtkTreeView" id="crl_ca_treeview">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="headers_visible">False</property>
+-                <signal name="cursor_changed" handler="crl_treeview_cursor_changed_cb"/>
++                <signal name="cursor-changed" handler="crl_treeview_cursor_changed_cb" swapped="no"/>
++                <child internal-child="selection">
++                  <object class="GtkTreeSelection"/>
++                </child>
+               </object>
+             </child>
+           </object>
+           <packing>
++            <property name="expand">True</property>
++            <property name="fill">True</property>
+             <property name="position">3</property>
+           </packing>
+         </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area21">
+-            <property name="visible">True</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="button22">
+-                <property name="label" translatable="yes">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-                <signal name="clicked" handler="crl_cancel_clicked_cb"/>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="crl_ok_button">
+-                <property name="label" translatable="yes">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="sensitive">False</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-                <signal name="clicked" handler="crl_ok_clicked_cb"/>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
+-          </packing>
+-        </child>
+       </object>
+     </child>
+     <action-widgets>
+--- gnomint-1.3.0.orig/gui/new_req_window.ui
++++ gnomint-1.3.0/gui/new_req_window.ui
+@@ -1,41 +1,50 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkAdjustment" id="AdjustmentKeyLengthSpinButton1">
+-    <property name="value">2048</property>
+     <property name="lower">1024</property>
+     <property name="upper">5120</property>
++    <property name="value">2048</property>
+     <property name="step_increment">1024</property>
+   </object>
+   <object class="GtkWindow" id="new_req_window">
+     <property name="visible">True</property>
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">New certificate request - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="window_position">center</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+     <child>
++      <placeholder/>
++    </child>
++    <child>
+       <object class="GtkNotebook" id="new_req_notebook">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="border_width">8</property>
+         <property name="show_tabs">False</property>
+         <property name="show_border">False</property>
+         <child>
+-          <object class="GtkVBox" id="vbox27">
++          <object class="GtkBox" id="vbox27">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="orientation">vertical</property>
+             <property name="spacing">7</property>
+             <child>
+-              <object class="GtkHBox" id="hbox22">
++              <object class="GtkBox" id="hbox22">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <child>
+                   <object class="GtkLabel" id="label105">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;big&gt;Certificate Request Properties&lt;/big&gt;
+ </property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -46,9 +55,10 @@
+                 <child>
+                   <object class="GtkLabel" id="label106">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes"> </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes"> </property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -59,18 +69,26 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+               <object class="GtkLabel" id="label108">
+                 <property name="visible">True</property>
+-                <property name="xalign">0</property>
+-                <property name="label" translatable="yes">&lt;small&gt;The subject of the new certificate request can inherit information from one of the existing Certification Authorities. This is a must if the policy of the CA you are going to use is defined to force some fields of a certificate subject to be the same as the ones in the CA cert subject.&lt;/small&gt;</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">&lt;small&gt;The subject of the new certificate request can inherit information
++from one of the existing Certification Authorities. This is a must if the
++policy of the CA you are going to use is defined to force some fields
++of a certificate subject to be the same as the ones in the CA cert
++subject.&lt;/small&gt;</property>
+                 <property name="use_markup">True</property>
+                 <property name="wrap">True</property>
++                <property name="xalign">0</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+@@ -84,6 +102,8 @@
+                 <property name="draw_indicator">True</property>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+@@ -95,9 +115,11 @@
+                 <property name="receives_default">False</property>
+                 <property name="draw_indicator">True</property>
+                 <property name="group">dont_inherit_radiobutton</property>
+-                <signal name="toggled" handler="new_req_inherit_fields_toggled"/>
++                <signal name="toggled" handler="new_req_inherit_fields_toggled" swapped="no"/>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">3</property>
+               </packing>
+             </child>
+@@ -105,8 +127,6 @@
+               <object class="GtkScrolledWindow" id="scrolledwindow7">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+-                <property name="hscrollbar_policy">automatic</property>
+-                <property name="vscrollbar_policy">automatic</property>
+                 <property name="shadow_type">in</property>
+                 <child>
+                   <object class="GtkTreeView" id="new_req_ca_treeview">
+@@ -114,16 +134,22 @@
+                     <property name="can_focus">True</property>
+                     <property name="headers_visible">False</property>
+                     <property name="enable_tree_lines">True</property>
++                    <child internal-child="selection">
++                      <object class="GtkTreeSelection"/>
++                    </child>
+                   </object>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">4</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox13">
++              <object class="GtkButtonBox" id="hbuttonbox13">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -149,7 +175,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_req_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_req_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -165,7 +191,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_req_next1_clicked"/>
++                    <signal name="clicked" handler="on_new_req_next1_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -176,6 +202,7 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">5</property>
+               </packing>
+             </child>
+@@ -184,29 +211,34 @@
+         <child type="tab">
+           <object class="GtkLabel" id="label95">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">CA properties</property>
+             <property name="xalign">0</property>
+             <property name="yalign">0</property>
+-            <property name="label" translatable="yes">CA properties</property>
+           </object>
+           <packing>
+             <property name="tab_fill">False</property>
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkVBox" id="vbox15">
++          <object class="GtkBox" id="vbox15">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="orientation">vertical</property>
+             <property name="spacing">6</property>
+             <child>
+-              <object class="GtkHBox" id="hbox17">
++              <object class="GtkBox" id="hbox17">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <child>
+                   <object class="GtkLabel" id="label87">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;big&gt;Certificate Request Properties&lt;/big&gt;
+ </property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -217,9 +249,10 @@
+                 <child>
+                   <object class="GtkLabel" id="label88">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes"> </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes"> </property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -235,185 +268,167 @@
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkTable" id="table9">
++              <object class="GtkGrid" id="table9">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">6</property>
+-                <property name="n_rows">6</property>
+-                <property name="n_columns">2</property>
+                 <property name="row_spacing">6</property>
+                 <child>
+                   <object class="GtkComboBox" id="country_combobox1">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="cn_entry1">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
+-                    <signal name="changed" handler="on_new_req_cn_entry_changed"/>
++                    <property name="invisible_char">•</property>
++                    <signal name="changed" handler="on_new_req_cn_entry_changed" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">5</property>
+-                    <property name="bottom_attach">6</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label94">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">Certificate 
+ Common Name (CN):</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">5</property>
+-                    <property name="bottom_attach">6</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="ou_entry1">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">4</property>
+-                    <property name="bottom_attach">5</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="o_entry1">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">3</property>
+-                    <property name="bottom_attach">4</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="city_entry1">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">2</property>
+-                    <property name="bottom_attach">3</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkEntry" id="st_entry1">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label93">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">City: </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">City: </property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">2</property>
+-                    <property name="bottom_attach">3</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label92">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">State or Province name: </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">State or Province name: </property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label91">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Country:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Country:</property>
+                   </object>
+                   <packing>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="left_attach">0</property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label90">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Organization Unit:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Organization Unit:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">4</property>
+-                    <property name="bottom_attach">5</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label89">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Organization:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Organization:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">3</property>
+-                    <property name="bottom_attach">4</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox10">
++              <object class="GtkButtonBox" id="hbuttonbox10">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -439,7 +454,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_req_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_req_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -455,7 +470,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_req_previous2_clicked"/>
++                    <signal name="clicked" handler="on_new_req_previous2_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -472,7 +487,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_req_next2_clicked"/>
++                    <signal name="clicked" handler="on_new_req_next2_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -495,9 +510,10 @@
+         <child type="tab">
+           <object class="GtkLabel" id="label101">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">Root certificate prop</property>
+             <property name="xalign">0</property>
+             <property name="yalign">0</property>
+-            <property name="label" translatable="yes">Root certificate prop</property>
+           </object>
+           <packing>
+             <property name="position">1</property>
+@@ -505,19 +521,23 @@
+           </packing>
+         </child>
+         <child>
+-          <object class="GtkVBox" id="vbox16">
++          <object class="GtkBox" id="vbox16">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="orientation">vertical</property>
+             <child>
+-              <object class="GtkHBox" id="hbox18">
++              <object class="GtkBox" id="hbox18">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <child>
+                   <object class="GtkLabel" id="label96">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
++                    <property name="can_focus">False</property>
+                     <property name="label" translatable="yes">&lt;big&gt;Certificate Request Properties&lt;/big&gt;
+ </property>
+                     <property name="use_markup">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -528,9 +548,10 @@
+                 <child>
+                   <object class="GtkLabel" id="label97">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes"> </property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes"> </property>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -541,23 +562,23 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkTable" id="table10">
++              <object class="GtkGrid" id="table10">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="border_width">6</property>
+-                <property name="n_rows">2</property>
+-                <property name="n_columns">2</property>
+-                <property name="homogeneous">True</property>
++                <property name="column_homogeneous">True</property>
+                 <child>
+                   <object class="GtkSpinButton" id="keylength_spinbutton1">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="editable">False</property>
+                     <property name="max_length">5</property>
+-                    <property name="invisible_char">&#x2022;</property>
++                    <property name="invisible_char">•</property>
+                     <property name="adjustment">AdjustmentKeyLengthSpinButton1</property>
+                     <property name="climb_rate">1024</property>
+                     <property name="snap_to_ticks">True</property>
+@@ -566,15 +587,13 @@
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkHBox" id="hbox19">
++                  <object class="GtkBox" id="hbox19">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
+                     <property name="homogeneous">True</property>
+                     <child>
+                       <object class="GtkRadioButton" id="rsa_radiobutton1">
+@@ -586,7 +605,7 @@
+                         <property name="active">True</property>
+                         <property name="draw_indicator">True</property>
+                         <property name="group">dsa_radiobutton1</property>
+-                        <signal name="toggled" handler="on_new_req_privkey_type_toggle"/>
++                        <signal name="toggled" handler="on_new_req_privkey_type_toggle" swapped="no"/>
+                       </object>
+                       <packing>
+                         <property name="expand">False</property>
+@@ -613,45 +632,46 @@
+                   </object>
+                   <packing>
+                     <property name="left_attach">1</property>
+-                    <property name="right_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label99">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Private key bit length:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Private key bit length:</property>
+                   </object>
+                   <packing>
++                    <property name="left_attach">0</property>
+                     <property name="top_attach">1</property>
+-                    <property name="bottom_attach">2</property>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label98">
+                     <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="label" translatable="yes">Private key type:</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0</property>
+-                    <property name="label" translatable="yes">Private key type:</property>
+                   </object>
+                   <packing>
+-                    <property name="x_options">GTK_FILL</property>
+-                    <property name="y_options"></property>
++                    <property name="left_attach">0</property>
++                    <property name="top_attach">0</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkHButtonBox" id="hbuttonbox11">
++              <object class="GtkButtonBox" id="hbuttonbox11">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="spacing">12</property>
+                 <property name="layout_style">end</property>
+                 <child>
+@@ -677,7 +697,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_req_cancel_clicked"/>
++                    <signal name="clicked" handler="on_new_req_cancel_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -693,7 +713,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_req_previous3_clicked"/>
++                    <signal name="clicked" handler="on_new_req_previous3_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -709,7 +729,7 @@
+                     <property name="can_default">True</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_stock">True</property>
+-                    <signal name="clicked" handler="on_new_req_commit_clicked"/>
++                    <signal name="clicked" handler="on_new_req_commit_clicked" swapped="no"/>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+@@ -720,6 +740,7 @@
+               </object>
+               <packing>
+                 <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">2</property>
+               </packing>
+             </child>
+@@ -731,6 +752,7 @@
+         <child type="tab">
+           <object class="GtkLabel" id="label104">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="label" translatable="yes">page 3</property>
+           </object>
+           <packing>
+--- gnomint-1.3.0.orig/gui/preferences_dialog.ui
++++ gnomint-1.3.0/gui/preferences_dialog.ui
+@@ -1,8 +1,9 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="preferences_dialog">
++    <property name="can_focus">False</property>
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">General Preferences - gnoMint</property>
+     <property name="resizable">False</property>
+@@ -10,19 +11,51 @@
+     <property name="window_position">center-on-parent</property>
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox19">
++      <object class="GtkBox" id="dialog-vbox19">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
+         <property name="spacing">2</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area19">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="preferences_ok_button">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++                <signal name="clicked" handler="preferences_window_ok_button_clicked_cb" swapped="no"/>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+           <object class="GtkNotebook" id="notebook1">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <child>
+-              <object class="GtkVBox" id="vbox7">
++              <object class="GtkBox" id="vbox7">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="orientation">vertical</property>
+                 <child>
+                   <object class="GtkCheckButton" id="gnomekeyring_export_check">
+@@ -33,9 +66,11 @@
+                     <property name="receives_default">False</property>
+                     <property name="use_underline">True</property>
+                     <property name="draw_indicator">True</property>
+-                    <signal name="toggled" handler="preferences_window_gnomekeyring_export_toggled"/>
++                    <signal name="toggled" handler="preferences_window_gnomekeyring_export_toggled" swapped="no"/>
+                   </object>
+                   <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+@@ -44,6 +79,7 @@
+             <child type="tab">
+               <object class="GtkLabel" id="label46">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="label" translatable="yes">Export options</property>
+               </object>
+               <packing>
+@@ -52,36 +88,12 @@
+             </child>
+           </object>
+           <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
+             <property name="padding">6</property>
+             <property name="position">1</property>
+           </packing>
+         </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area19">
+-            <property name="visible">True</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="preferences_ok_button">
+-                <property name="label" translatable="yes">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-                <signal name="clicked" handler="preferences_window_ok_button_clicked_cb"/>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
+-          </packing>
+-        </child>
+       </object>
+     </child>
+     <action-widgets>
+--- gnomint-1.3.0.orig/src/ca.h
++++ gnomint-1.3.0/src/ca.h
+@@ -47,7 +47,6 @@
+ gboolean ca_rcrt_view_toggled (GtkCheckMenuItem *button, gpointer user_data);
+ void ca_generate_crl (GtkCheckMenuItem *button, gpointer user_data);
+ gboolean ca_treeview_popup_timeout_program_cb (gpointer data);
+-void ca_treeview_popup_timeout_program (GdkEventButton *event);
+ gboolean ca_treeview_popup_handler (GtkTreeView *tree_view,
+ 				    GdkEvent *event, gpointer user_data);
+ void ca_on_change_pwd_menuitem_activate (GtkMenuItem *menuitem, gpointer user_data);
+--- gnomint-1.3.0.orig/gui/export_certificate_dialog.ui
++++ gnomint-1.3.0/gui/export_certificate_dialog.ui
+@@ -1,8 +1,9 @@
+-<?xml version="1.0"?>
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Generated with glade 3.22.1 -->
+ <interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <!-- interface-naming-policy project-wide -->
++  <requires lib="gtk+" version="3.20"/>
+   <object class="GtkDialog" id="export_certificate_dialog">
++    <property name="can_focus">False</property>
+     <property name="title" translatable="yes">Export certificate - gnoMint</property>
+     <property name="modal">True</property>
+     <property name="window_position">center</property>
+@@ -10,32 +11,82 @@
+     <property name="icon">gnomint.png</property>
+     <property name="type_hint">dialog</property>
+     <property name="urgency_hint">True</property>
+-    <property name="has_separator">False</property>
++    <child>
++      <placeholder/>
++    </child>
+     <child internal-child="vbox">
+-      <object class="GtkVBox" id="dialog-vbox11">
++      <object class="GtkBox" id="dialog-vbox11">
+         <property name="visible">True</property>
++        <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area11">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="button1">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="button4">
++                <property name="label">gtk-ok</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
+         <child>
+-          <object class="GtkVBox" id="vbox12">
++          <object class="GtkBox" id="vbox12">
+             <property name="visible">True</property>
++            <property name="can_focus">False</property>
+             <property name="border_width">8</property>
+             <property name="orientation">vertical</property>
+             <property name="spacing">8</property>
+             <child>
+               <object class="GtkLabel" id="label2">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="label" translatable="yes">Please, choose which part of the
++saved certificate you want to export:</property>
++                <property name="wrap">True</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0</property>
+-                <property name="label" translatable="yes">Please, choose which part of the saved certificate you want to export:</property>
+-                <property name="wrap">True</property>
+               </object>
+               <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">0</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkVBox" id="vbox14">
++              <object class="GtkBox" id="vbox14">
+                 <property name="visible">True</property>
++                <property name="can_focus">False</property>
+                 <property name="orientation">vertical</property>
+                 <child>
+                   <object class="GtkRadioButton" id="publicpart_radiobutton1">
+@@ -48,22 +99,29 @@
+                     <property name="draw_indicator">True</property>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label5">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
+-                    <property name="xpad">24</property>
+-                    <property name="ypad">9</property>
++                    <property name="can_focus">False</property>
++                    <property name="margin_left">24</property>
++                    <property name="margin_right">24</property>
++                    <property name="margin_top">9</property>
++                    <property name="margin_bottom">9</property>
+                     <property name="label" translatable="yes">&lt;i&gt;Export only the certificate to a public file, in PEM format.&lt;/i&gt;</property>
+                     <property name="use_markup">True</property>
+                     <property name="justify">fill</property>
+                     <property name="wrap">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
+@@ -79,22 +137,31 @@
+                     <property name="group">publicpart_radiobutton1</property>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">2</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label15">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
+-                    <property name="xpad">24</property>
+-                    <property name="ypad">9</property>
+-                    <property name="label" translatable="yes">&lt;i&gt;Export the saved private key to a PKCS#8 password-protected file. This file should only be accessed by the subject of the certificate.&lt;/i&gt;</property>
++                    <property name="can_focus">False</property>
++                    <property name="margin_left">24</property>
++                    <property name="margin_right">24</property>
++                    <property name="margin_top">9</property>
++                    <property name="margin_bottom">9</property>
++                    <property name="label" translatable="yes">&lt;i&gt;Export the saved private key to a PKCS#8 password-
++protected file. This file should only be accessed by the
++subject of the certificate.&lt;/i&gt;</property>
+                     <property name="use_markup">True</property>
+                     <property name="justify">fill</property>
+                     <property name="wrap">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">3</property>
+                   </packing>
+                 </child>
+@@ -109,22 +176,31 @@
+                     <property name="group">publicpart_radiobutton1</property>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">4</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label16">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
+-                    <property name="xpad">24</property>
+-                    <property name="ypad">9</property>
+-                    <property name="label" translatable="yes">&lt;i&gt;Export the saved private key to a PEM file. This option should only be used for exporting certificates that will be used in unattended servers.&lt;/i&gt;</property>
++                    <property name="can_focus">False</property>
++                    <property name="margin_left">24</property>
++                    <property name="margin_right">24</property>
++                    <property name="margin_top">9</property>
++                    <property name="margin_bottom">9</property>
++                    <property name="label" translatable="yes">&lt;i&gt;Export the saved private key to a PEM file. This option
++should only be used for exporting certificates that will be
++used in unattended servers.&lt;/i&gt;</property>
+                     <property name="use_markup">True</property>
+                     <property name="justify">fill</property>
+                     <property name="wrap">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">5</property>
+                   </packing>
+                 </child>
+@@ -139,72 +215,46 @@
+                     <property name="group">publicpart_radiobutton1</property>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">6</property>
+                   </packing>
+                 </child>
+                 <child>
+                   <object class="GtkLabel" id="label19">
+                     <property name="visible">True</property>
+-                    <property name="xalign">0</property>
+-                    <property name="yalign">0</property>
+-                    <property name="xpad">24</property>
+-                    <property name="ypad">9</property>
+-                    <property name="label" translatable="yes">&lt;i&gt;Export both (private and public) parts to a password-protected PKCS#12 file. This kind of file can be imported by other common programs, such as web or mail clients.&lt;/i&gt;</property>
++                    <property name="can_focus">False</property>
++                    <property name="margin_left">24</property>
++                    <property name="margin_right">24</property>
++                    <property name="margin_top">9</property>
++                    <property name="margin_bottom">9</property>
++                    <property name="label" translatable="yes">&lt;i&gt;Export both (private and public) parts to a password-
++protected PKCS#12 file. This kind of file can be imported
++by other common programs, such as web or mail clients.&lt;/i&gt;</property>
+                     <property name="use_markup">True</property>
+                     <property name="justify">fill</property>
+                     <property name="wrap">True</property>
++                    <property name="xalign">0</property>
++                    <property name="yalign">0</property>
+                   </object>
+                   <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
+                     <property name="position">7</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="position">1</property>
+-          </packing>
+-        </child>
+-        <child internal-child="action_area">
+-          <object class="GtkHButtonBox" id="dialog-action_area11">
+-            <property name="visible">True</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="button1">
+-                <property name="label">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="button4">
+-                <property name="label">gtk-ok</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+           </object>
+           <packing>
+             <property name="expand">False</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
++            <property name="fill">True</property>
++            <property name="position">1</property>
+           </packing>
+         </child>
+       </object>
diff --git a/system/gnomint/patches/09_gcc-10.patch b/system/gnomint/patches/09_gcc-10.patch
new file mode 100644
index 0000000000..0e9779335c
--- /dev/null
+++ b/system/gnomint/patches/09_gcc-10.patch
@@ -0,0 +1,33 @@
+Description: Fix FTBFS with GCC 10.
+Author: Yavor Doganov <yavor@gnu.org>
+Bug-Debian: https://bugs.debian.org/957287
+Forwarded: gnomint-devel@lists.sourceforge.net
+Last-Update: 2020-06-23
+---
+
+--- gnomint-1.3.0.orig/src/ca_file.h
++++ gnomint-1.3.0/src/ca_file.h
+@@ -69,6 +69,7 @@
+ 
+ GList * ca_file_get_revoked_certs (guint64 ca_id, gchar **error);
+ 
++typedef
+ enum {CA_FILE_CA_COLUMN_ID=0,
+       CA_FILE_CA_COLUMN_SERIAL=1,
+       CA_FILE_CA_COLUMN_SUBJECT=2,
+@@ -78,6 +79,7 @@
+       CA_FILE_CA_COLUMN_NUMBER=6}
+         CaFileCAColumns;
+ 
++typedef
+ enum {CA_FILE_CERT_COLUMN_ID=0,
+       CA_FILE_CERT_COLUMN_IS_CA=1,
+       CA_FILE_CERT_COLUMN_SERIAL=2,
+@@ -93,6 +95,7 @@
+       CA_FILE_CERT_COLUMN_NUMBER=12}
+         CaFileCertColumns;
+ 
++typedef
+ enum {CA_FILE_CSR_COLUMN_ID=0,
+       CA_FILE_CSR_COLUMN_SUBJECT=1,
+       CA_FILE_CSR_COLUMN_PRIVATE_KEY_IN_DB=2,
diff --git a/system/gnomint/patches/gnutls3.patch b/system/gnomint/patches/gnutls3.patch
deleted file mode 100644
index 8ee3371884..0000000000
--- a/system/gnomint/patches/gnutls3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -aur a/src/import.c b/src/import.c
---- a/src/import.c	2010-05-31 23:01:37.000000000 +0200
-+++ b/src/import.c	2012-06-27 17:50:06.993671796 +0200
-@@ -695,7 +695,7 @@
- 
-                 // After having all the parts unencrypted, we import all certificates first.
-                 for (i=0; i<n_bags; i++) {
--                        gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-+                        gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-                         guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
-                         
-                         for (i=0; i < num_elements_in_bag; i++) {
-@@ -722,7 +722,7 @@
-                 
-                 // Then, we import all PKCS8 private keys.
-                 for (i=0; i<n_bags; i++) {
--                        gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-+                        gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-                         guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
-                         
-                         for (i=0; i < num_elements_in_bag; i++) {
-@@ -796,7 +796,7 @@
-                 // Then we import the CRLs
- 
-                 for (i=0; i<n_bags; i++) {
--                        gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-+                        gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
-                         guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
-                         
-                         for (i=0; i < num_elements_in_bag; i++) {
-Nur in b/src: import.c~.
diff --git a/system/gnu-unifont/README b/system/gnu-unifont/README
index 1e7e3058f1..436b337ab7 100644
--- a/system/gnu-unifont/README
+++ b/system/gnu-unifont/README
@@ -4,19 +4,22 @@ Unicode Basic Multilinguial Plane(BMP). The BMP is the first Unicode
 for most of the world's modern scripts.
 
 By default, the package will include precompiled versions of the font in
-TTF (TrueType), PCF (X Window bitmap) and PSF (console) formats. This can be
-changed using FONTFORMATS environment variable, which should be set to
-comma-separated list of font formats to include in the package.
+OTF (OpenType), TTF (TrueType), PCF (X Window bitmap), PSF (console) and
+OTB (OpenType Bitmap) formats. This can be changed using FONTFORMATS
+environment variable, which should be set to comma-separated list of
+font formats to be included in the package.
 
 Available formats are:
 
+otf = OpenType
 ttf = TrueType
 pcf = X Window bitmap
 psf = Console fonts
-otb = OpenType Bitmap fonts, compatible with recent versions of Pango which
-      don't support PCF fonts. Fonts in this format are generated by
-      converting precompiled PCF fonts using fonttosfnt tool.
+otb = OpenType Bitmap fonts, compatible with recent versions of Pango
+      which don't support BDF/PCF fonts. Fonts in this format are
+      generated by converting precompiled BDF/PCF fonts using fonttosfnt
+      tool.
 
-For example, setting FONTFORMATS=pcf,psf will include only PCF and PSF fonts.
-If FONTFORMATS variable is not set the default value "ttf,pcf,psf" is
-assumed.
+For example, setting FONTFORMATS=pcf,psf will include only PCF and PSF
+fonts in the package. If FONTFORMATS variable is not set then the
+default value "otf,ttf,pcf,psf,otb" is assumed.
diff --git a/system/gnu-unifont/doinst.sh b/system/gnu-unifont/doinst.sh
index 2822cf238c..47ed4e784f 100644
--- a/system/gnu-unifont/doinst.sh
+++ b/system/gnu-unifont/doinst.sh
@@ -1,6 +1,7 @@
 # Update the X font indexes:
 if [ -x /usr/bin/mkfontdir ]; then
   ( cd /usr/share/fonts/misc ; mkfontscale . ; mkfontdir . )
+  ( cd /usr/share/fonts/OTF ; mkfontscale . ; mkfontdir . )
   ( cd /usr/share/fonts/TTF ; mkfontscale . ; mkfontdir . )
 fi
 
diff --git a/system/gnu-unifont/gnu-unifont.SlackBuild b/system/gnu-unifont/gnu-unifont.SlackBuild
index 85ea602913..d9bb3ace3d 100644
--- a/system/gnu-unifont/gnu-unifont.SlackBuild
+++ b/system/gnu-unifont/gnu-unifont.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gnu-unifont
 
 # Copyright 2010 crocket (crockabiscuit@gmail.com)
 # Copyright 2013-2015 LukenShiro, Italy
-# Copyright 2019-2020 Tomasz Bywalec
+# Copyright 2019-2022 Tomasz Bywalec
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,21 +24,31 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gnu-unifont
-VERSION=${VERSION:-13.0.06}
+VERSION=${VERSION:-15.0.01}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 SRCNAM=unifont
 DOCFILES="ChangeLog COPYING INSTALL NEWS README"
-FONTFORMATS=${FONTFORMATS:-ttf,pcf,psf}
+FONTFORMATS=${FONTFORMATS:-otf,ttf,pcf,psf,otb}
 
 contains()
 {
@@ -71,6 +81,13 @@ if contains "$FONTFORMATS" "pcf"; then
     FONTSCOPIED=1
 fi
 
+if contains "$FONTFORMATS" "otf"; then
+    mkdir -p $PKG/usr/share/fonts/OTF
+    cp -a *.otf $PKG/usr/share/fonts/OTF
+
+    FONTSCOPIED=1
+fi
+
 if contains "$FONTFORMATS" "ttf"; then
     mkdir -p $PKG/usr/share/fonts/TTF
     cp -a *.ttf $PKG/usr/share/fonts/TTF
@@ -87,10 +104,30 @@ fi
 
 if contains "$FONTFORMATS" "otb"; then
     mkdir -p $PKG/usr/share/fonts/misc
-    for pcf_file in *.pcf.gz; do
-        echo "Converting '$pcf_file' to OTB format."
-        otb_file=$(echo "$pcf_file" | sed 's/\.pcf\.gz$/.otb/g')
-        fonttosfnt -o "$PKG/usr/share/fonts/misc/$otb_file" "$pcf_file"
+
+    # Find BDF and PCF fonts and convert them to OTB format.
+    # If a font exists in both formats then convert the file in BDF format,
+    # as this is the preferred input format for the 'fonttosfnt' tool.
+
+    echo *.bdf.gz | tr ' ' '\n' | sort | sed 's/\.bdf\.gz$//g' > bdf-fonts
+    echo *.pcf.gz | tr ' ' '\n' | sort | sed 's/\.pcf\.gz$//g' > pcf-fonts
+
+    comm -2 bdf-fonts pcf-fonts | tr -d '\t' | \
+    while read font_name; do
+        input_font_file="${font_name}.bdf.gz"
+        echo "Converting '$input_font_file' to OTB format."
+
+        zcat "$input_font_file" | \
+        fonttosfnt -o "$PKG/usr/share/fonts/misc/${font_name}.otb"
+    done
+
+    comm -13 bdf-fonts pcf-fonts | \
+    while read font_name; do
+        input_font_file="${font_name}.pcf.gz"
+        echo "Converting '$input_font_file' to OTB format."
+
+        fonttosfnt -o "$PKG/usr/share/fonts/misc/${font_name}.otb" \
+                   "$input_font_file"
     done
 
     FONTSCOPIED=1
@@ -117,4 +154,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gnu-unifont/gnu-unifont.info b/system/gnu-unifont/gnu-unifont.info
index fbcf5b0e78..9e040ecd4c 100644
--- a/system/gnu-unifont/gnu-unifont.info
+++ b/system/gnu-unifont/gnu-unifont.info
@@ -1,8 +1,8 @@
 PRGNAM="gnu-unifont"
-VERSION="13.0.06"
-HOMEPAGE="http://unifoundry.com/unifont/index.html"
-DOWNLOAD="https://ftpmirror.gnu.org/unifont/unifont-13.0.06/unifont-13.0.06.tar.gz"
-MD5SUM="60971929464ceb99bbcca55b9ad7c796"
+VERSION="15.0.01"
+HOMEPAGE="https://unifoundry.com/unifont/index.html"
+DOWNLOAD="https://ftpmirror.gnu.org/unifont/unifont-15.0.01/unifont-15.0.01.tar.gz"
+MD5SUM="d6366a8fd03e815c2f18d36ff1a5cca7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/gnu-unifont/slack-desc b/system/gnu-unifont/slack-desc
index 259c4b902e..cc5cdddce4 100644
--- a/system/gnu-unifont/slack-desc
+++ b/system/gnu-unifont/slack-desc
@@ -13,7 +13,7 @@ gnu-unifont: Unicode Basic Multilinguial Plane (BMP). The BMP is the first
 gnu-unifont: Unicode "plane" of 65,536(16bit) code points, and includes character
 gnu-unifont: encoding for most of the world's modern scripts.
 gnu-unifont:
-gnu-unifont: Homepage: http://unifoundry.com/unifont/index.html
+gnu-unifont: Homepage: https://unifoundry.com/unifont/index.html
 gnu-unifont:
 gnu-unifont:
 gnu-unifont:
diff --git a/system/gnupg-pkcs11-scd/README b/system/gnupg-pkcs11-scd/README
new file mode 100644
index 0000000000..560d863d12
--- /dev/null
+++ b/system/gnupg-pkcs11-scd/README
@@ -0,0 +1,2 @@
+gnupg-pkcs11 is a project to implement a BSD-licensed smart-card
+daemon to enable the use of PKCS#11 tokens with GnuPG.
diff --git a/system/gnupg-pkcs11-scd/gnupg-pkcs11-scd.SlackBuild b/system/gnupg-pkcs11-scd/gnupg-pkcs11-scd.SlackBuild
new file mode 100644
index 0000000000..c2f69592a4
--- /dev/null
+++ b/system/gnupg-pkcs11-scd/gnupg-pkcs11-scd.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/bash
+
+# Slackware build script for gnupg-pkcs11-scd
+
+# Copyright 2024 pyllyukko
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=gnupg-pkcs11-scd
+VERSION=${VERSION:-0.10.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+autoreconf -vi
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog README THANKS \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE}
diff --git a/system/gnupg-pkcs11-scd/gnupg-pkcs11-scd.info b/system/gnupg-pkcs11-scd/gnupg-pkcs11-scd.info
new file mode 100644
index 0000000000..d7f56cecf5
--- /dev/null
+++ b/system/gnupg-pkcs11-scd/gnupg-pkcs11-scd.info
@@ -0,0 +1,10 @@
+PRGNAM="gnupg-pkcs11-scd"
+VERSION="0.10.0"
+HOMEPAGE="https://gnupg-pkcs11.sourceforge.net/"
+DOWNLOAD="https://github.com/alonbl/gnupg-pkcs11-scd/releases/download/gnupg-pkcs11-scd-0.10.0/gnupg-pkcs11-scd-0.10.0.tar.bz2"
+MD5SUM="20a8082bb73b54aff4540ad4d4094989"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pkcs11-helper"
+MAINTAINER="pyllyukko"
+EMAIL="pyllyukko@maimed.org"
diff --git a/system/gnupg-pkcs11-scd/slack-desc b/system/gnupg-pkcs11-scd/slack-desc
new file mode 100644
index 0000000000..102342f610
--- /dev/null
+++ b/system/gnupg-pkcs11-scd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+gnupg-pkcs11-scd: gnupg-pkcs11-scd (PKCS#11 smart-card daemon for GnuPG)
+gnupg-pkcs11-scd:
+gnupg-pkcs11-scd: gnupg-pkcs11 is a project to implement a BSD-licensed smart-card
+gnupg-pkcs11-scd: daemon to enable the use of PKCS#11 tokens with GnuPG.
+gnupg-pkcs11-scd:
+gnupg-pkcs11-scd: gnupg-pkcs11 is a (hopefully) drop-in replacement for the smart-card
+gnupg-pkcs11-scd: daemon (scd) shipped with GnuPG.
+gnupg-pkcs11-scd:
+gnupg-pkcs11-scd:
+gnupg-pkcs11-scd: Homepage: http://gnupg-pkcs11.sourceforge.net/index.html
+gnupg-pkcs11-scd:
diff --git a/system/go-mtree/README b/system/go-mtree/README
index 0b22f417b0..1c03d145a3 100644
--- a/system/go-mtree/README
+++ b/system/go-mtree/README
@@ -6,3 +6,7 @@ Tar archives can be used to generate an mtree manifest, and
 then validate the files present on a filesystem, or vice versa.
 
 See /usr/doc/go-mtree-*/README.md for examples.
+
+Warning: This SlackBuild requires network access when it runs, meaning
+it downloads files from the Internet with root access. You should
+decide for yourself whether or not you think this is a good idea.
diff --git a/system/go-mtree/go-mtree.SlackBuild b/system/go-mtree/go-mtree.SlackBuild
index 290f06a490..86ee2edca1 100644
--- a/system/go-mtree/go-mtree.SlackBuild
+++ b/system/go-mtree/go-mtree.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for go-mtree
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=go-mtree
-VERSION=${VERSION:-0.4.4}
+VERSION=${VERSION:-0.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 DOMAIN=github.com
 ORG=vbatts
@@ -38,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -90,4 +100,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/go-mtree/go-mtree.info b/system/go-mtree/go-mtree.info
index a972ff138d..ac87fdb169 100644
--- a/system/go-mtree/go-mtree.info
+++ b/system/go-mtree/go-mtree.info
@@ -1,8 +1,8 @@
 PRGNAM="go-mtree"
-VERSION="0.4.4"
+VERSION="0.5.0"
 HOMEPAGE="https://github.com/vbatts/go-mtree"
-DOWNLOAD="https://github.com/vbatts/go-mtree/archive/v0.4.4/go-mtree-0.4.4.tar.gz"
-MD5SUM="94afa436fa274b479ad3986927dd1596"
+DOWNLOAD="https://github.com/vbatts/go-mtree/archive/v0.5.0/go-mtree-0.5.0.tar.gz"
+MD5SUM="b57dbfa496c663d7363ad773527c9d61"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="google-go-lang"
diff --git a/system/goaccess/goaccess.SlackBuild b/system/goaccess/goaccess.SlackBuild
index 2e83305eba..a246f8b1ef 100644
--- a/system/goaccess/goaccess.SlackBuild
+++ b/system/goaccess/goaccess.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for goaccess
 
@@ -22,10 +22,17 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix doc permissions.
+# - remove useless INSTALL from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=goaccess
-VERSION=${VERSION:-1.3}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.4.6}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -68,9 +79,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -90,19 +101,14 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 install -D -m644 config/goaccess.conf $PKG/etc/goaccess.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+install -m0644 \
+  AUTHORS COPYING ChangeLog NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -111,4 +117,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/goaccess/goaccess.info b/system/goaccess/goaccess.info
index c655ce38ef..5d73c413e5 100644
--- a/system/goaccess/goaccess.info
+++ b/system/goaccess/goaccess.info
@@ -1,10 +1,10 @@
 PRGNAM="goaccess"
-VERSION="1.3"
+VERSION="1.4.6"
 HOMEPAGE="http://goaccess.prosoftcorp.com"
-DOWNLOAD="http://tar.goaccess.io/goaccess-1.3.tar.gz"
-MD5SUM="5209c5d4e9e04b5b3e7f13134c5e146c"
+DOWNLOAD="http://tar.goaccess.io/goaccess-1.4.6.tar.gz"
+MD5SUM="51c5ee93c46bcdceed84bc08eff90338"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dave Woodfall"
+MAINTAINER="D Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/system/gohu-font/README b/system/gohu-font/README
index 16e7215fc7..75762861b2 100644
--- a/system/gohu-font/README
+++ b/system/gohu-font/README
@@ -9,8 +9,9 @@ xterm) to see the fonts. Then try e.g. "xterm -fn gohu14".
 
 Optional dependency: bdf2psf.
 
-To include console fonts for framebuffer use, install misc/bdf2psf before
-running this SlackBuild script. The console fonts will be installed as
-/usr/share/kbd/consolefonts/gohufont-*, and can be displayed via the
-setfont command. To use as system default, edit /etc/rc.d/rc.font and
-change the setfont line there. Don't forget to make rc.font executable.
+To include console fonts for framebuffer use, install misc/bdf2psf
+before running this SlackBuild script. The console fonts will be
+installed as /usr/share/kbd/consolefonts/gohufont-*, and can be
+displayed via the setfont command. To use as system default, edit
+/etc/rc.d/rc.font and change the setfont line there. Don't forget to
+make rc.font executable.
diff --git a/system/gohu-font/doinst.sh b/system/gohu-font/doinst.sh
index aa7f16b279..c014f1310f 100644
--- a/system/gohu-font/doinst.sh
+++ b/system/gohu-font/doinst.sh
@@ -1,6 +1,6 @@
 if [ -x /usr/bin/mkfontdir ]; then
   ( cd usr/share/fonts/misc
-    if ! grep -q ^gohu fonts.alias 2>/dev/null; then
+    if ! grep -q '^gohu1[14]\(bold\|\) ' fonts.alias 2>/dev/null; then
       echo 'gohu11 -gohu-gohufont-medium-r-normal--11-80-100-100-c-60-iso10646-1' >> fonts.alias
       echo 'gohu11bold -gohu-gohufont-bold-r-normal--11-80-100-100-c-60-iso10646-1' >> fonts.alias
       echo 'gohu14 -gohu-gohufont-medium-r-normal--14-100-100-100-c-80-iso10646-1' >> fonts.alias
@@ -10,6 +10,9 @@ if [ -x /usr/bin/mkfontdir ]; then
     mkfontdir .
   )
 fi
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
 if [ -x usr/bin/fc-cache ]; then
   usr/bin/fc-cache -f
 fi
diff --git a/system/gohu-font/douninst.sh b/system/gohu-font/douninst.sh
new file mode 100644
index 0000000000..241d35f86f
--- /dev/null
+++ b/system/gohu-font/douninst.sh
@@ -0,0 +1,14 @@
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd usr/share/fonts/misc
+    grep -v '^gohu1[14]\(bold\|\) ' fonts.alias > fonts.alias.new
+    mv fonts.alias.new fonts.alias
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x usr/bin/fc-cache ]; then
+  usr/bin/fc-cache -f
+fi
diff --git a/system/gohu-font/gohu-font.SlackBuild b/system/gohu-font/gohu-font.SlackBuild
index b1d3e4a99b..8566a1e66f 100644
--- a/system/gohu-font/gohu-font.SlackBuild
+++ b/system/gohu-font/gohu-font.SlackBuild
@@ -1,22 +1,31 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gohu-font
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 # 20170328 bkw: anyone looking to convert BDF fonts for use with the
 # console might be interested in this.
 
+# 20230307 bkw: BUILD=2, add douninst.sh
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gohu-font
 VERSION=${VERSION:-2.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -32,11 +41,8 @@ rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # bdftopcf is in a full install of core Slackware.
 mkdir -p $PKG/usr/share/fonts/misc
@@ -92,6 +98,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 sed "s,@FONTTYPES@,$FONTTYPES," $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/douninst.sh > $PKG/install/douninst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gohu-font/gohu-font.info b/system/gohu-font/gohu-font.info
index b538554c5e..17c09d5058 100644
--- a/system/gohu-font/gohu-font.info
+++ b/system/gohu-font/gohu-font.info
@@ -1,10 +1,10 @@
 PRGNAM="gohu-font"
 VERSION="2.1"
-HOMEPAGE="http://font.gohu.org/"
+HOMEPAGE="https://font.gohu.org/"
 DOWNLOAD="https://github.com/hchargois/gohufont/archive/2.1/gohufont-2.1.tar.gz"
 MD5SUM="f8ade949bbbdcdd14cbdce14348337a4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/google-chrome-the-latest/README b/system/google-chrome-the-latest/README
new file mode 100644
index 0000000000..257e152cda
--- /dev/null
+++ b/system/google-chrome-the-latest/README
@@ -0,0 +1,48 @@
+Maintaining an updated Chrome Browser on Slackware is now made
+easier with this small program, "google-chrome-the-latest".
+It is a simple python script that checks what is the latest
+version available and updates it on your Slackware box.
+
+It identifies a new version by parsing the web-page at
+https://www.whatismybrowser.com/guides/the-latest-version/chrome
+and comparing with the chrome version number currently installed.
+Chrome is then downloaded directly from Google site, converted to
+txz using the standard rpm2txz command, and upgraded.
+
+You can run this script manually or automatically with the
+provided cron.hourly script. The cron script will attempt to
+identify which user to notify, otherwise you can edit it and set
+the variable USERNAME=’your username’
+
+In order to avoid excessive hits on whatismybrowser.com actual
+checks are limited to "once a day", but you can bypass this with the
+arguments "install", "upgrade" or "update". These all mean then
+same and imply a download from Google and perform an install or
+an upgrade, if one is required of course.
+Normally it is asked if you want to install the new version, but
+providing the argument "silent" will just update with no
+human intervention.
+The argument "gui" will download the Chrome RPM allowing you to
+manually upgrade the browser.
+
+Note: This program runs in the background.  To collect your input,
+dialogs appear and disappear. Don't be alarmed and wait for the
+program to end.
+
+Workflows:
+
+1. Every day the program checks if a new browser is available
+   and notifies you through a pop-up window. This is default behavior.
+
+2. You can start the program manually using the icon available
+   in the desktop menu to trigger the download, check and
+   install/upgrade the browse if required.
+
+3. From the command line, if you don't have yet Chrome installed
+   you can do so by simply by running:
+   /opt/google-chrome-the-latest/google-chrome-the-latest.py install
+
+4. From the command line, you can force a Chrome download and
+   upgrade if required, without any pop-up window, with:
+   /opt/google-chrome-the-latest/google-chrome-the-latest.py \
+     silent upgrade
diff --git a/system/google-chrome-the-latest/doinst.sh b/system/google-chrome-the-latest/doinst.sh
new file mode 100644
index 0000000000..9b51b160f6
--- /dev/null
+++ b/system/google-chrome-the-latest/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/gnome/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/gnome >/dev/null 2>&1
+  fi
+fi
diff --git a/system/google-chrome-the-latest/google-chrome-the-latest.SlackBuild b/system/google-chrome-the-latest/google-chrome-the-latest.SlackBuild
new file mode 100644
index 0000000000..17a67b15fd
--- /dev/null
+++ b/system/google-chrome-the-latest/google-chrome-the-latest.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/bash
+
+# Slackware build script for google-chrome-the-latest
+
+# Copyright 2024 Antonio Leal, Porto Salvo, Oeiras, Portugal
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=google-chrome-the-latest
+VERSION=${VERSION:-3.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+rm -rf $PKG/opt/google-chrome-the-latest
+mkdir -p $PKG/opt/google-chrome-the-latest
+cp google-chrome-the-latest.py $PKG/opt/google-chrome-the-latest
+chmod +x $PKG/opt/google-chrome-the-latest/google-chrome-the-latest.py
+cp *.glade $PKG/opt/google-chrome-the-latest
+cp google-chrome-the-latest.png $PKG/opt/google-chrome-the-latest
+cp google-chrome-the-latest.desktop $PKG/opt/google-chrome-the-latest
+
+rm -rf $PKG/etc/cron.hourly $PKG/usr/share/pixmaps $PKG/usr/share/applications
+mkdir -p $PKG/etc/cron.hourly $PKG/usr/share/pixmaps $PKG/usr/share/applications
+cp google-chrome-the-latest-cron.sh $PKG/etc/cron.hourly
+chmod +x $PKG/etc/cron.hourly/google-chrome-the-latest-cron.sh
+cp google-chrome-the-latest.png $PKG/usr/share/pixmaps
+cp google-chrome-the-latest.desktop $PKG/usr/share/applications
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp README $PKG/usr/doc/$PRGNAM-$VERSION
+cp LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/google-chrome-the-latest/google-chrome-the-latest.info b/system/google-chrome-the-latest/google-chrome-the-latest.info
new file mode 100644
index 0000000000..4c104065d4
--- /dev/null
+++ b/system/google-chrome-the-latest/google-chrome-the-latest.info
@@ -0,0 +1,10 @@
+PRGNAM="google-chrome-the-latest"
+VERSION="3.2"
+HOMEPAGE="https://github.com/antonioleal/google-chrome-the-latest"
+DOWNLOAD="https://github.com/antonioleal/google-chrome-the-latest/archive/3.2/google-chrome-the-latest-3.2.tar.gz"
+MD5SUM="5deb4ceef373db6a6dac3e639d490d17"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="gksu"
+MAINTAINER="Antonio Leal"
+EMAIL="antonioleal@yahoo.com"
diff --git a/system/google-chrome-the-latest/slack-desc b/system/google-chrome-the-latest/slack-desc
new file mode 100644
index 0000000000..24124e9e1f
--- /dev/null
+++ b/system/google-chrome-the-latest/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                        |-----handy-ruler------------------------------------------------------|
+google-chrome-the-latest: google-chrome-the-latest (Google Chrome Updater Script)
+google-chrome-the-latest:
+google-chrome-the-latest: Maintaining an updated Chrome Browser on Slackware is now made
+google-chrome-the-latest: easier with this small program, "google-chrome-the-latest", a simple
+google-chrome-the-latest: python script that will install and keep checking afterwards what is
+google-chrome-the-latest: the latest version available so your Slackware box is kept safer.
+google-chrome-the-latest:
+google-chrome-the-latest:
+google-chrome-the-latest:
+google-chrome-the-latest:
+google-chrome-the-latest:
diff --git a/system/google-droid-fonts/google-droid-fonts.SlackBuild b/system/google-droid-fonts/google-droid-fonts.SlackBuild
index 753b13c0c2..96c0f8ce6d 100644
--- a/system/google-droid-fonts/google-droid-fonts.SlackBuild
+++ b/system/google-droid-fonts/google-droid-fonts.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for google-droid-fonts
 
@@ -24,15 +24,25 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=google-droid-fonts
 VERSION=${VERSION:-20141010}
 SRCVERSION=5.x
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,4 +79,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/google-fonts/README b/system/google-fonts/README
index b0c0f2f398..18a4b9dbbe 100644
--- a/system/google-fonts/README
+++ b/system/google-fonts/README
@@ -11,7 +11,6 @@ This is a 350Mb download.
 This SlackBuild conflicts with other SlackBuilds that package
 individual fonts, including
   google-droid-fonts
-  noto-fonts
   numix-pack
   ttf-coda
   ttf-crosscorefonts
diff --git a/system/google-fonts/google-fonts.SlackBuild b/system/google-fonts/google-fonts.SlackBuild
index 7686323efa..cfe4a847b7 100644
--- a/system/google-fonts/google-fonts.SlackBuild
+++ b/system/google-fonts/google-fonts.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for google-fonts
 
@@ -22,17 +22,27 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=google-fonts
 VERSION=${VERSION:-20170830}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=fonts
 COMMIT=${COMMIT:-8382674661d70b35dcfec78c7d4b705685ed6a4f}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,4 +74,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/google-fonts/google-fonts.info b/system/google-fonts/google-fonts.info
index 570c93ee66..0565d1bf91 100644
--- a/system/google-fonts/google-fonts.info
+++ b/system/google-fonts/google-fonts.info
@@ -2,7 +2,7 @@ PRGNAM="google-fonts"
 VERSION="20170830"
 HOMEPAGE="https://fonts.google.com"
 DOWNLOAD="https://github.com/google/fonts/archive/8382674/fonts-8382674661d70b35dcfec78c7d4b705685ed6a4f.tar.gz"
-MD5SUM="d921dea66507f1c5136f740004456e85"
+MD5SUM="6abae7f130ef6ac49cfb8d77958d9804"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/gpart/README b/system/gpart/README
index 3cdde88307..77bb753aca 100644
--- a/system/gpart/README
+++ b/system/gpart/README
@@ -1,10 +1,11 @@
-Gpart is a small tool which tries to guess what partitions are on a PC type,
-MBR-partitioned hard disk in case the primary partition table was damaged.
+Gpart is a small tool which tries to guess what partitions are on a
+PC type, MBR-partitioned hard disk in case the primary partition table
+was damaged.
 
-Gpart works by scanning through the device (or file) given on the command
-line on a sector basis. Each guessing module is asked if it thinks a
-filesystem it knows about could start at a given sector. Several
-filesystem guessing modules are built in.
+Gpart works by scanning through the device (or file) given on
+the command line on a sector basis. Each guessing module is asked
+if it thinks a filesystem it knows about could start at a given
+sector. Several filesystem guessing modules are built in.
 
 Supported (guessable) filesystem or partition types:
 DOS/Windows FAT, Linux ext2 and swap, OS/2 HPFS, Windows NTFS,
diff --git a/system/gpart/gpart.SlackBuild b/system/gpart/gpart.SlackBuild
index e544ccea0b..1dddc0a251 100644
--- a/system/gpart/gpart.SlackBuild
+++ b/system/gpart/gpart.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gpart
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gpart
 VERSION=${VERSION:-0.3}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -106,4 +116,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gphotofs/README b/system/gphotofs/README
index 53fcc49f4e..1b605884d6 100644
--- a/system/gphotofs/README
+++ b/system/gphotofs/README
@@ -1,5 +1,7 @@
-gphotofs is a FUSE filesystem module to mount your camera as a filesystem
-on Linux. This allow using your camera with any tool able to read from
-a mounted filesystem.
+gphotofs (FUSE filesystem for cameras)
+
+gphotofs is a FUSE filesystem module to mount your camera as a
+filesystem on Linux. This allow using your camera with any tool able
+to read from a mounted filesystem.
 
 gphotofs was written by Philip Langdale.
diff --git a/system/gphotofs/gphotofs.SlackBuild b/system/gphotofs/gphotofs.SlackBuild
index 380ba65e9f..c9179edc21 100644
--- a/system/gphotofs/gphotofs.SlackBuild
+++ b/system/gphotofs/gphotofs.SlackBuild
@@ -1,15 +1,21 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gphotofs
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20221227 bkw: BUILD=2, fix permissions on README.fstab (don't use cp-a
+# to copy files from $CWD, they might be owned by anybody).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gphotofs
 VERSION=${VERSION:-0.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +25,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,11 +57,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -71,14 +78,14 @@ make install-strip DESTDIR=$PKG
 mkdir -p $PKG/usr/man/man1
 gzip -9c $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog NEWS README $CWD/README.fstab \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING ChangeLog NEWS README $PKGDOC
+cat $CWD/README.fstab > $PKGDOC/README.fstab
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gphotofs/gphotofs.info b/system/gphotofs/gphotofs.info
index 59846e68f5..be15e3fa24 100644
--- a/system/gphotofs/gphotofs.info
+++ b/system/gphotofs/gphotofs.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/gpustat/README b/system/gpustat/README
new file mode 100644
index 0000000000..a3b0ccf4f5
--- /dev/null
+++ b/system/gpustat/README
@@ -0,0 +1,18 @@
+gpustat
+
+Just less than nvidia-smi?
+
+gpustat uses NVIDIA's official python bindings for NVML library
+(pynvml). As of now gpustat requires nvidia-ml-py >= 11.450.129, which
+is compatible with NVIDIA driver versions R450.00 or higher. Please
+upgrade the NVIDIA driver if gpustat fails to display process
+information.
+
+The GPU ID (index) shown by gpustat (and nvidia-smi) is PCI BUS ID,
+while CUDA uses a different ordering (assigns the fastest GPU with the
+lowest ID) by default. Therefore, in order to ensure CUDA and gpustat
+use same GPU index, configure the CUDA_DEVICE_ORDER environment variable
+to PCI_BUS_ID .
+
+This is a very simple program, you might want to add its output to
+some status bar, such as byoby, i3-bar, or xfce4-generic-monitor.
diff --git a/system/gpustat/gpustat.SlackBuild b/system/gpustat/gpustat.SlackBuild
new file mode 100644
index 0000000000..f0ebd7a7ab
--- /dev/null
+++ b/system/gpustat/gpustat.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# Slackware build script for gpustat
+
+# Copyright 2023, Lockywolf
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=gpustat
+VERSION=${VERSION:-1.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
+
+python3 setup.py install --root=$PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CHANGELOG.md  LICENSE  README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gpustat/gpustat.info b/system/gpustat/gpustat.info
new file mode 100644
index 0000000000..6c90296a96
--- /dev/null
+++ b/system/gpustat/gpustat.info
@@ -0,0 +1,10 @@
+PRGNAM="gpustat"
+VERSION="1.1.1"
+HOMEPAGE="https://github.com/wookayin/gpustat"
+DOWNLOAD="https://files.pythonhosted.org/packages/79/c4/46d005aec3bf911cb030467d91e062a5386ff4a03e51874424cacc0f60c1/gpustat-1.1.1.tar.gz"
+MD5SUM="63ce9a815d1d252c231f32eecd2929fd"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3-nvidia-ml-py python3-psutil python3-blessed"
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.gpustat_2023-11-30@lockywolf.net"
diff --git a/system/gpustat/slack-desc b/system/gpustat/slack-desc
new file mode 100644
index 0000000000..b0b8176a93
--- /dev/null
+++ b/system/gpustat/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+gpustat: gpustat (utility for querying and monitoring GPU status)
+gpustat:
+gpustat: A simple command-line utility for querying and monitoring GPU status.
+gpustat: This works with NVIDIA Graphics Devices only, no AMD support as of
+gpustat: now.
+gpustat:
+gpustat:
+gpustat:
+gpustat:
+gpustat:
+gpustat:
diff --git a/system/graphite-web/README b/system/graphite-web/README
deleted file mode 100644
index 4117158296..0000000000
--- a/system/graphite-web/README
+++ /dev/null
@@ -1,3 +0,0 @@
-graphite-web (Enterprise Scalable Realtime Graphing)
-
-Django-based web application that renders graphs and dashboards.
diff --git a/system/graphite-web/doinst.sh b/system/graphite-web/doinst.sh
deleted file mode 100644
index 1d7bac2725..0000000000
--- a/system/graphite-web/doinst.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/httpd/extra/graphite-web.conf.new
-config etc/logrotate.d/graphite-web.new
-
-find etc/graphite -type f -name '*.new' \
-  | while read new ; do config $new ; done
diff --git a/system/graphite-web/graphite-web.SlackBuild b/system/graphite-web/graphite-web.SlackBuild
deleted file mode 100644
index 37a3c759e2..0000000000
--- a/system/graphite-web/graphite-web.SlackBuild
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for graphite-web
-
-# Copyright 2015  Mario Preksavec, Zagreb, Croatia
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=graphite-web
-VERSION=${VERSION:-0.9.15}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-else
-  LIBDIRSUFFIX=""
-fi
-
-PYTHON_BRANCH=$(python -V 2>&1 | cut -d" " -f2 | cut -d. -f1,2)
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# We don't have a RedHat system
-patch -p1 <$CWD/patches/setup.cfg.diff
-
-# Change path to wsgi
-patch -p1 <$CWD/patches/graphite.wsgi.example.diff
-
-# Patches thanks to Debian folks!
-patch -p1 <$CWD/patches/local_settings.patch
-patch -p1 <$CWD/patches/settings_debian.patch
-patch -p1 <$CWD/patches/remove_internal_logrotate.patch
-
-# Installer script needs some fixing
-patch -p1 <$CWD/patches/setup.py.diff
-
-python setup.py install --root=$PKG --prefix=/usr
-
-# Need some dirs
-mkdir -p $PKG/etc/{httpd/extra,logrotate.d} $PKG/usr/{bin,share/$PRGNAM} \
-  $PKG/var/log/graphite
-chown graphite:graphite $PKG/var/log/graphite
-
-# Add apache config
-cat $CWD/$PRGNAM.conf > $PKG/etc/httpd/extra/$PRGNAM.conf.new
-
-# Scripts and crontab mostly from Debian
-install -m0755 -oroot -groot -t $PKG/usr/bin $CWD/scripts/graphite-manage \
-  $CWD/scripts/graphite-build-search-index
-install -D -m0755 -oroot -groot $CWD/$PRGNAM.cron \
-  $PKG/etc/cron.hourly/graphite-build-search-index
-cat $CWD/$PRGNAM.logrotate > $PKG/etc/logrotate.d/$PRGNAM.new
-
-# Move wsgi script
-mv $PKG/usr/conf/graphite.wsgi.example $PKG/usr/share/$PRGNAM/graphite.wsgi
-
-# Configuration goes into /etc/graphite
-mv $PKG/usr/conf $PKG/etc/graphite
-for i in $PKG/etc/graphite/*.example ; do mv $i ${i/.example/.new} ; done
-cat webapp/graphite/local_settings.py.example \
-  > $PKG/etc/graphite/local_settings.py.new
-
-# Move webapp dir
-mv $PKG/usr/webapp $PKG/usr/share/$PRGNAM/static
-
-# Python stuff
-mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/python$PYTHON_BRANCH
-mv $PKG/opt/graphite/webapp \
-  $PKG/usr/lib$LIBDIRSUFFIX/python$PYTHON_BRANCH/site-packages
-
-# Cruft removal
-rm -rf $PKG/opt
-
-# Manpages also from Debian
-mkdir -p $PKG/usr/man/man1
-cp $CWD/man1/*.1 $PKG/usr/man/man1
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/graphite-web/graphite-web.conf b/system/graphite-web/graphite-web.conf
deleted file mode 100644
index 983db9ce83..0000000000
--- a/system/graphite-web/graphite-web.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# This line needs to be in your server's config.
-#Include /etc/httpd/extra/mod_wsgi.conf
-
-WSGISocketPrefix /var/run/wsgi
-
-<VirtualHost *:80>
-
-    ServerName graphite
-    ServerAlias graphite.*
-
-    WSGIDaemonProcess graphite processes=5 threads=5 display-name='%{GROUP}' inactivity-timeout=120 user=graphite group=graphite
-    WSGIProcessGroup graphite
-    WSGIApplicationGroup %{GLOBAL}
-    WSGIImportScript /usr/share/graphite-web/graphite.wsgi process-group=graphite application-group=%{GLOBAL}
-    WSGIScriptAlias / /usr/share/graphite-web/graphite.wsgi
-
-    <Directory /usr/share/graphite-web/>
-        Order deny,allow
-        Allow from all
-        Require all granted
-    </Directory>
-
-    Alias /content/ /usr/share/graphite-web/static/content/
-    <Location /content/>
-        SetHandler None
-    </Location>
-
-    ErrorLog /var/log/httpd/graphite_error_log
-    CustomLog /var/log/httpd/graphite_access_log common
-
-</VirtualHost>
diff --git a/system/graphite-web/graphite-web.cron b/system/graphite-web/graphite-web.cron
deleted file mode 100644
index 856466af08..0000000000
--- a/system/graphite-web/graphite-web.cron
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ -x /usr/bin/graphite-build-search-index ]; then
-	/usr/bin/graphite-build-search-index
-fi
diff --git a/system/graphite-web/graphite-web.info b/system/graphite-web/graphite-web.info
deleted file mode 100644
index 3d45767604..0000000000
--- a/system/graphite-web/graphite-web.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="graphite-web"
-VERSION="0.9.15"
-HOMEPAGE="https://github.com/graphite-project/"
-DOWNLOAD="https://github.com/graphite-project/graphite-web/archive/0.9.15/graphite-web-0.9.15.tar.gz"
-MD5SUM="f81c50b8b57672fc15a1cfe7bbae1c52"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="graphite-carbon"
-MAINTAINER="Mario Preksavec"
-EMAIL="mario at slackware dot hr"
diff --git a/system/graphite-web/graphite-web.logrotate b/system/graphite-web/graphite-web.logrotate
deleted file mode 100644
index fad29bef4c..0000000000
--- a/system/graphite-web/graphite-web.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/graphite/*.log {
-	weekly
-	missingok
-	rotate 4
-	compress
-	notifempty
-	create 644 graphite graphite
-}
diff --git a/system/graphite-web/man1/graphite-build-search-index.1 b/system/graphite-web/man1/graphite-build-search-index.1
deleted file mode 100644
index d5ae9f6606..0000000000
--- a/system/graphite-web/man1/graphite-build-search-index.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "GRAPHITE\-BUILD\-SEARCH\-INDEX" "1" "December 2012" "" ""
-.
-.SH "NAME"
-\fBgraphite\-build\-search\-index\fR \- create search index for Graphite Webapp
-.
-.SH "SYNOPSIS"
-graphite\-build\-search\-index
-.
-.SH "DESCRIPTION"
-This script creates the search index of Whisper files for the Graphite Webapp\. It will run as hourly cronjob\. You don\'t need to run this command manual except you want to force generating the search index\.
-.
-.SH "AUTHOR"
-Jonas Genannt
-.
-.P
-This manual page was written by Jonas Genannt \fIjonas\.genannt@capi2name\.de\fR for the Debian Project\.
diff --git a/system/graphite-web/man1/graphite-manage.1 b/system/graphite-web/man1/graphite-manage.1
deleted file mode 100644
index 8a8de8eb5f..0000000000
--- a/system/graphite-web/man1/graphite-manage.1
+++ /dev/null
@@ -1,35 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "GRAPHITE\-MANAGE" "1" "December 2012" "" ""
-.
-.SH "NAME"
-\fBgraphite\-manage\fR \- manage\.py wrapper for the Graphite Webapp
-.
-.SH "SYNOPSIS"
-graphite\-manage
-.
-.SH "DESCRIPTION"
-graphite\-manage is an wrapper script to access Django manage\.py for the Graphite Webapp\.
-.
-.P
-See \fBgraphite\-manage \-\-help\fR for complete help\.
-.
-.P
-To create an new sqlite database and an superuser do:
-.
-.IP "\(bu" 4
-graphite\-manage syncdb
-.
-.IP "\(bu" 4
-chown graphite:graphite /var/lib/graphite/graphite\.db
-.
-.IP "" 0
-.
-.SH "AUTHOR"
-Jonas Genannt
-.
-.P
-This manual page was written by Jonas Genannt \fIjonas\.genannt@capi2name\.de\fR for the Debian Project\.
-.br
-Modified by Mario Preksavec \fImario@slackware\.hr\fR for Slackware
diff --git a/system/graphite-web/patches/graphite.wsgi.example.diff b/system/graphite-web/patches/graphite.wsgi.example.diff
deleted file mode 100644
index 2584cb7e7c..0000000000
--- a/system/graphite-web/patches/graphite.wsgi.example.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- graphite-web-0.9.15/conf/graphite.wsgi.example.orig	2015-11-27 19:37:16.000000000 +0100
-+++ graphite-web-0.9.15/conf/graphite.wsgi.example	2015-12-03 23:59:30.205576427 +0100
-@@ -1,6 +1,6 @@
- import os
- import sys
--sys.path.append('/opt/graphite/webapp')
-+sys.path.append('/usr/share/graphite-web/static')
- 
- try:
-     from importlib import import_module
diff --git a/system/graphite-web/patches/local_settings.patch b/system/graphite-web/patches/local_settings.patch
deleted file mode 100644
index f5f647f5bf..0000000000
--- a/system/graphite-web/patches/local_settings.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Description: Other defaults for Debian
-Author: Jonas Genannt <jonas.genannt@capi2name.de>
-Forwarded: not-needed
-
-diff --git a/webapp/graphite/local_settings.py.example b/webapp/graphite/local_settings.py.example
-index 73a0c57..c40b1e0 100644
---- a/webapp/graphite/local_settings.py.example
-+++ b/webapp/graphite/local_settings.py.example
-@@ -26,9 +26,10 @@
- #DOCUMENTATION_URL = "http://graphite.readthedocs.org/"
- 
- # Logging
--#LOG_RENDERING_PERFORMANCE = True
--#LOG_CACHE_PERFORMANCE = True
--#LOG_METRIC_ACCESS = True
-+# True see: https://answers.launchpad.net/graphite/+question/159731
-+LOG_RENDERING_PERFORMANCE = True
-+LOG_CACHE_PERFORMANCE = True
-+LOG_METRIC_ACCESS = True
- 
- # Enable full debug page display on exceptions (Internal Server Error pages)
- #DEBUG = True
-@@ -54,14 +55,14 @@
- #####################################
- # Change only GRAPHITE_ROOT if your install is merely shifted from /opt/graphite
- # to somewhere else
--#GRAPHITE_ROOT = '/opt/graphite'
-+GRAPHITE_ROOT = '/usr/share/graphite-web'
- 
- # Most installs done outside of a separate tree such as /opt/graphite will only
- # need to change these three settings. Note that the default settings for each
- # of these is relative to GRAPHITE_ROOT
--#CONF_DIR = '/opt/graphite/conf'
--#STORAGE_DIR = '/opt/graphite/storage'
--#CONTENT_DIR = '/opt/graphite/webapp/content'
-+CONF_DIR = '/etc/graphite'
-+STORAGE_DIR = '/var/lib/graphite/whisper'
-+CONTENT_DIR = '/usr/share/graphite-web/static'
- 
- # To further or fully customize the paths, modify the following. Note that the
- # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
-@@ -72,11 +73,11 @@
- 
- ## Data directories
- # NOTE: If any directory is unreadable in DATA_DIRS it will break metric browsing
--#WHISPER_DIR = '/opt/graphite/storage/whisper'
-+WHISPER_DIR = '/var/lib/graphite/whisper'
- #RRD_DIR = '/opt/graphite/storage/rrd'
- #DATA_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
--#LOG_DIR = '/opt/graphite/storage/log/webapp'
--#INDEX_FILE = '/opt/graphite/storage/index'  # Search index file
-+LOG_DIR = '/var/log/graphite'
-+INDEX_FILE = '/var/lib/graphite/search_index'  # Search index file
- 
- 
- #####################################
-@@ -147,17 +148,17 @@
- # The default is 'django.db.backends.sqlite3' with file 'graphite.db'
- # located in STORAGE_DIR
- #
--#DATABASES = {
--#    'default': {
--#        'NAME': '/opt/graphite/storage/graphite.db',
--#        'ENGINE': 'django.db.backends.sqlite3',
--#        'USER': '',
--#        'PASSWORD': '',
--#        'HOST': '',
--#        'PORT': ''
--#    }
--#}
--#
-+DATABASES = {
-+    'default': {
-+        'NAME': '/var/lib/graphite/graphite.db',
-+        'ENGINE': 'django.db.backends.sqlite3',
-+        'USER': '',
-+        'PASSWORD': '',
-+        'HOST': '',
-+        'PORT': ''
-+    }
-+}
-+
- 
- 
- #########################
diff --git a/system/graphite-web/patches/remove_internal_logrotate.patch b/system/graphite-web/patches/remove_internal_logrotate.patch
deleted file mode 100644
index a78c56f11e..0000000000
--- a/system/graphite-web/patches/remove_internal_logrotate.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: disable internal logroate
-Author: Jonas Genannt <jonas.genannt@capi2name.de>
-Forwarded: not-needed
-
-diff --git a/webapp/graphite/logger.py b/webapp/graphite/logger.py
-index afa43f4..44456ac 100644
---- a/webapp/graphite/logger.py
-+++ b/webapp/graphite/logger.py
-@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
- limitations under the License."""
- 
- import os, logging
--from logging.handlers import TimedRotatingFileHandler as Rotater
-+from logging import FileHandler as LogFileHandler
- from django.conf import settings
- 
- logging.addLevelName(30,"rendering")
-@@ -37,22 +37,22 @@ class GraphiteLogger:
-     self.metricAccessLogger = logging.getLogger("metric_access")
-     #Setup formatter & handlers
-     self.formatter = logging.Formatter("%(asctime)s :: %(message)s","%a %b %d %H:%M:%S %Y")
--    self.infoHandler = Rotater(self.infoLogFile,when="midnight",backupCount=1)
-+    self.infoHandler = LogFileHandler(self.infoLogFile)
-     self.infoHandler.setFormatter(self.formatter)
-     self.infoLogger.addHandler(self.infoHandler)
--    self.exceptionHandler = Rotater(self.exceptionLogFile,when="midnight",backupCount=1)
-+    self.exceptionHandler = LogFileHandler(self.exceptionLogFile)
-     self.exceptionHandler.setFormatter(self.formatter)
-     self.exceptionLogger.addHandler(self.exceptionHandler)
-     if settings.LOG_CACHE_PERFORMANCE:
--      self.cacheHandler = Rotater(self.cacheLogFile,when="midnight",backupCount=1)
-+      self.cacheHandler = LogFileHandler(self.cacheLogFile)
-       self.cacheHandler.setFormatter(self.formatter)
-       self.cacheLogger.addHandler(self.cacheHandler)
-     if settings.LOG_RENDERING_PERFORMANCE:
--      self.renderingHandler = Rotater(self.renderingLogFile,when="midnight",backupCount=1)
-+      self.renderingHandler = LogFileHandler(self.renderingLogFile)
-       self.renderingHandler.setFormatter(self.formatter)
-       self.renderingLogger.addHandler(self.renderingHandler)
-     if settings.LOG_METRIC_ACCESS:
--      self.metricAccessHandler = Rotater(self.metricAccessLogFile,when="midnight",backupCount=10)
-+      self.metricAccessHandler = LogFileHandler(self.metricAccessLogFile)
-       self.metricAccessHandler.setFormatter(self.formatter)
-       self.metricAccessLogger.addHandler(self.metricAccessHandler)
- 
diff --git a/system/graphite-web/patches/settings_debian.patch b/system/graphite-web/patches/settings_debian.patch
deleted file mode 100644
index ab66647263..0000000000
--- a/system/graphite-web/patches/settings_debian.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Add etc/graphite to sys.path to load config from /etc/graphite
-Author: Jonas Genannt <jonas.genannt@capi2name.de>
-Forwarded: not-needed
-
---- a/webapp/graphite/settings.py
-+++ b/webapp/graphite/settings.py
-@@ -20,6 +20,9 @@
- from os.path import abspath, dirname, join
- from warnings import warn
- 
-+# Debian add etc/graphite into path
-+sys.path.append('/etc/graphite')
-+
- try:
-   import rrdtool
- except ImportError:
-@@ -128,7 +131,7 @@
- 
- ## Load our local_settings
- try:
--  from graphite.local_settings import *
-+  from local_settings import *
- except ImportError:
-   print >> sys.stderr, "Could not import graphite.local_settings, using defaults!"
- 
diff --git a/system/graphite-web/patches/setup.cfg.diff b/system/graphite-web/patches/setup.cfg.diff
deleted file mode 100644
index cf244799f1..0000000000
--- a/system/graphite-web/patches/setup.cfg.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- graphite-web-0.9.15/setup.cfg.orig	2015-11-27 19:37:16.000000000 +0100
-+++ graphite-web-0.9.15/setup.cfg	2015-12-04 00:24:12.045817187 +0100
-@@ -1,16 +0,0 @@
--[bdist_rpm]
--requires = Django => 1.1.4
--           django-tagging
--           carbon
--           whisper
--           mod_wsgi
--           pycairo
--           pycairo-devel
--           python-simplejson
--           python-sqlite2
--           python-hashlib
--
--post-install = distro/redhat/misc/postinstall
--
--provides = graphite
--obsoletes = graphite <= 0.9.9
diff --git a/system/graphite-web/patches/setup.py.diff b/system/graphite-web/patches/setup.py.diff
deleted file mode 100644
index 64c9540e85..0000000000
--- a/system/graphite-web/patches/setup.py.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- graphite-web-0.9.15/setup.py.orig	2015-11-27 19:37:16.000000000 +0100
-+++ graphite-web-0.9.15/setup.py	2015-12-04 02:50:48.311066851 +0100
-@@ -85,9 +85,8 @@
-         'graphite.thirdparty.pytz',
-       ],
-       package_data={'graphite' :
--        ['templates/*', 'local_settings.py.example']},
--      scripts=glob('bin/*'),
--      data_files=webapp_content.items() + storage_dirs + conf_files + examples,
-+        ['templates/*']},
-+      data_files=webapp_content.items() + conf_files,
-       **setup_kwargs
-     )
- finally:
diff --git a/system/graphite-web/scripts/graphite-build-search-index b/system/graphite-web/scripts/graphite-build-search-index
deleted file mode 100644
index 9a86ab1924..0000000000
--- a/system/graphite-web/scripts/graphite-build-search-index
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-# Jonas Genannt <jonas.genannt@capi2name.de>, 2012 for the Debian Project
-# Modified by Mario Preksavec <mario@slackware.hr>, 2015 for Slackware
-
-set -e
-
-INDEX_FILE_TMP=$(mktemp)
-
-INDEX_FILE="/var/lib/graphite/search_index"
-WHISPER_DIR="/var/lib/graphite/whisper"
-
-
-cd ${WHISPER_DIR} && find -L . -name '*.wsp' | sed \
-	-e 's@\.wsp$@@' \
-	-e 's@^\./@@' \
-	-e 's@/@.@g' > ${INDEX_FILE_TMP}
-
-chmod 0644 ${INDEX_FILE_TMP}
-chown graphite:graphite ${INDEX_FILE_TMP}
-
-mv -f ${INDEX_FILE_TMP} ${INDEX_FILE}
diff --git a/system/graphite-web/scripts/graphite-manage b/system/graphite-web/scripts/graphite-manage
deleted file mode 100644
index d38bd5e4ae..0000000000
--- a/system/graphite-web/scripts/graphite-manage
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-django-admin.py --settings=graphite.settings
diff --git a/system/graphite-web/slack-desc b/system/graphite-web/slack-desc
deleted file mode 100644
index 33daa3ec8c..0000000000
--- a/system/graphite-web/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-            |-----handy-ruler------------------------------------------------------|
-graphite-web: graphite-web (Enterprise Scalable Realtime Graphing)
-graphite-web:
-graphite-web: Django-based web application that renders graphs and dashboards.
-graphite-web:
-graphite-web: https://github.com/graphite-project/
-graphite-web:
-graphite-web:
-graphite-web:
-graphite-web:
-graphite-web:
-graphite-web:
diff --git a/system/graphterm/graphterm.SlackBuild b/system/graphterm/graphterm.SlackBuild
index 8fa362da24..71a130f9b9 100644
--- a/system/graphterm/graphterm.SlackBuild
+++ b/system/graphterm/graphterm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for graphterm
 
@@ -23,10 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=graphterm
 VERSION=${VERSION:-0.57.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -84,4 +94,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/graveman/graveman.SlackBuild b/system/graveman/graveman.SlackBuild
index fd184cc5a9..f40ffff0f5 100644
--- a/system/graveman/graveman.SlackBuild
+++ b/system/graveman/graveman.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Graveman
 
@@ -25,10 +25,13 @@
 # Slackbuild maintainer switched to Keith Richie disturbed1976@gmail.com
 # Added patch to support newer Sox versions.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=graveman
 VERSION=${VERSION:-0.3.12.5}
 BUILD=${BUILD:-6}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 # this is the developer's source version
 SRCVER=$( echo $VERSION | cut -d. -f1-3 )-$( echo $VERSION | cut -d. -f4 )
@@ -43,7 +46,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -113,4 +123,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/graylog-sidecar/README b/system/graylog-sidecar/README
new file mode 100644
index 0000000000..b755f54bd3
--- /dev/null
+++ b/system/graylog-sidecar/README
@@ -0,0 +1,20 @@
+graylog-sidecar (is a lightweight configuration management system)
+
+Graylog Sidecar is a lightweight configuration management system for 
+different log collectors, also called Backends. The Graylog node(s)
+acts as a centralized hub containing the configurations of log
+collectors. On supported message-producing devices/hosts, Sidecar
+can run as a service (Windows host) or daemon (Linux host).
+
+https://go2docs.graylog.org/5-0/getting_in_log_data/graylog_sidecar.html
+
+Add this to /etc/rc.d/rc.local:
+if [ -x /etc/rc.d/rc.graylog-sidecar ]; then
+   /etc/rc.d/rc.graylog-sidecar start
+fi
+
+Add this to /etc/rc.d/rc.local_shutdown
+if [ -x /etc/rc.d/rc.graylog-sidecar ]; then
+   /etc/rc.d/rc.graylog-sidecar stop
+fi
+ 
diff --git a/system/graylog-sidecar/doinst.sh b/system/graylog-sidecar/doinst.sh
new file mode 100644
index 0000000000..da8202339a
--- /dev/null
+++ b/system/graylog-sidecar/doinst.sh
@@ -0,0 +1,24 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    rm $NEW
+  fi
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.graylog-sidecar.new
+preserve_perms etc/graylog/sidecar/sidecar.yml.new
+
diff --git a/system/graylog-sidecar/graylog-sidecar.SlackBuild b/system/graylog-sidecar/graylog-sidecar.SlackBuild
new file mode 100644
index 0000000000..804974f908
--- /dev/null
+++ b/system/graylog-sidecar/graylog-sidecar.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/bash
+
+# Slackware build script for graylog-sidecar
+
+# Copyright 2023 André Geraldo Vieira <andre.geraldo@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=graylog-sidecar
+SRCNAM=collector-sidecar
+VERSION=${VERSION:-1.4.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make
+
+mkdir -p $PKG/etc/{graylog/sidecar/,rc.d}
+mkdir -p $PKG/usr/bin
+mkdir -p $PKG/var/{lib/graylog-sidecar/generated,log/graylog-sidecar,run/graylog-sidecar}
+
+cp sidecar-example.yml $PKG/etc/graylog/sidecar/sidecar.yml.new
+cp $CWD/rc.graylog-sidecar  $PKG/etc/rc.d/rc.graylog-sidecar.new
+cp graylog-sidecar $PKG/usr/bin
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md CODE_OF_CONDUCT.md LICENSE \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/graylog-sidecar/graylog-sidecar.info b/system/graylog-sidecar/graylog-sidecar.info
new file mode 100644
index 0000000000..2816c5d27b
--- /dev/null
+++ b/system/graylog-sidecar/graylog-sidecar.info
@@ -0,0 +1,10 @@
+PRGNAM="graylog-sidecar"
+VERSION="1.4.0"
+HOMEPAGE="https://go2docs.graylog.org/5-0/getting_in_log_data/graylog_sidecar.html"
+DOWNLOAD="https://github.com/Graylog2/collector-sidecar/archive/refs/tags/1.4.0/collector-sidecar-1.4.0.tar.gz"
+MD5SUM="a1f862c650f369ea9af68e64316fa6d1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="André Geraldo Vieira"
+EMAIL="andre.geraldo@gmail.com"
diff --git a/system/graylog-sidecar/rc.graylog-sidecar b/system/graylog-sidecar/rc.graylog-sidecar
new file mode 100644
index 0000000000..956e22f73c
--- /dev/null
+++ b/system/graylog-sidecar/rc.graylog-sidecar
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+PIDOF_CMD=/sbin/pidof
+ECHO_CMD=/usr/bin/echo
+SLEEP_CMD=/usr/bin/sleep
+KILL_CMD=/bin/kill
+
+NAME=graylog-sidecar
+GRAYLOG_CMD=${GRAYLOG_CMD-/usr/bin/${NAME}}
+
+graylog_sidecar_start() {
+  if [ -n "$($PIDOF_CMD graylog-sidecar)" ]; then
+    $ECHO_CMD "Graylog Sidecar seems to be already running."
+    return
+  fi
+
+  $ECHO_CMD "Starting Graylog Sidecar."
+  $GRAYLOG_CMD & 
+}
+
+graylog_sidecar_stop() {
+  if [ -z "$($PIDOF_CMD graylog-sidecar)" ]; then
+    $ECHO_CMD "Graylog Sidecar does not seem to be running."
+    return
+  fi
+
+  $ECHO_CMD "Stopping Graylog Sidecar."
+  $KILL_CMD $($PIDOF_CMD graylog-sidecar)
+}
+
+graylog_sidecar_restart() {
+  $ECHO_CMD "Restarting Graylog Sidecar."
+  graylog_sidecar_stop
+  $SLEEP_CMD 5
+  graylog_sidecar_start
+}
+
+case "$1" in
+'start')
+  graylog_sidecar_start
+  ;;
+'stop')
+  graylog_sidecar_stop
+  ;;
+'restart')
+  graylog_sidecar_restart
+  ;;
+*)
+  echo "usage: $0 start|stop|restart"
+esac
diff --git a/system/graylog-sidecar/slack-desc b/system/graylog-sidecar/slack-desc
new file mode 100644
index 0000000000..69fcd3c286
--- /dev/null
+++ b/system/graylog-sidecar/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+graylog-sidecar: graylog-sidecar (lightweight configuration management system)
+graylog-sidecar:
+graylog-sidecar: Graylog Sidecar is a lightweight configuration management system for 
+graylog-sidecar: different log collectors, also called Backends. The Graylog node(s)
+graylog-sidecar: acts as a centralized hub containing the configurations of log
+graylog-sidecar: collectors. On supported message-producing devices/hosts, Sidecar
+graylog-sidecar: can run as a service (Windows host) or daemon (Linux host).
+graylog-sidecar:
+graylog-sidecar: https://go2docs.graylog.org/5-0/getting_in_log_data/graylog_sidecar
+graylog-sidecar: .html
+graylog-sidecar:
diff --git a/system/greetd/README b/system/greetd/README
new file mode 100644
index 0000000000..b79afac01c
--- /dev/null
+++ b/system/greetd/README
@@ -0,0 +1,29 @@
+greetd (A login manager daemon)
+
+greetd is a minimal and flexible login manager daemon that makes no
+assumptions about what you want to launch.
+
+Prior to installation you must create a user/group for 'greetd' on
+your system:
+
+'groupadd -g 381 greeter'
+'useradd -d /var/lib/greeter -u 381 -g greeter -G video -s /bin/false \
+greeter'
+
+To start 'greetd' at boot, ensure you've set runlevel 4 and copy the
+included '/etc/rc.d/rc.4.greetd' to '/etc/rc.d/rc.4.local' (or add the
+contents to your existing file) and reboot.
+
+The default greeter is 'agreety' which is included. This is a text-based
+greeter login that resembles a console login. You can change greetd to
+load any program upon boot by editing the '/etc/greetd/config.toml'
+file. In order to save any changes during an upgrade, it is recommended
+to copy the file to '/etc/greetd/greetd.conf' to save your personalized
+settings.
+
+*NOTE* You will see an error about "unable to set working directory",
+which appears to happen on all non-systemd distros, but doesn't
+effect overall use.
+
+There are many additional greeters for greetd, which have yet to be
+submitted to SBo, if you have a favorite, please upload a SlackBuild!
diff --git a/system/greetd/greetd.SlackBuild b/system/greetd/greetd.SlackBuild
new file mode 100644
index 0000000000..6930e89311
--- /dev/null
+++ b/system/greetd/greetd.SlackBuild
@@ -0,0 +1,215 @@
+#!/bin/bash
+#
+# Slackware build script for greetd
+#
+# Copyright 2023-2024 Jay Lanagan (j@lngn.net), Detroit, MI, USA.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=greetd
+PRGUID=greeter
+PRGGID=greeter
+VERSION=${VERSION:-0.9.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+bailout() {
+  printf "This requires a \"greeter\" user and group.\n"
+  printf "groupadd -g 381 greeter\n"
+  printf "useradd -d /var/lib/greeter -u 381 -g greeter -G video -s /bin/false greeter"
+  exit 1
+}
+
+if ! getent group $PRGGID 2>/dev/null 1>/dev/null ; then
+  bailout
+elif ! getent passwd $PRGUID 2>/dev/null 1>/dev/null ; then
+  bailout
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$VERSION.tar.?z || tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+cd $PRGNAM-$VERSION
+
+# build offline
+# configuration tells cargo to use the configured directory
+# for dependencies instead of downloading from crates.io
+# borrowed from alacritty slackbuild
+mkdir .cargo
+cat << EOF >> .cargo/config
+[source.crates-io]
+registry = 'https://github.com/rust-lang/crates.io-index'
+replace-with = 'vendored-sources'
+
+[source.vendored-sources]
+directory = '$(pwd)/vendor'
+EOF
+
+# deps and versions come from Cargo.lock
+mkdir vendor
+(
+  cd vendor
+
+  grep -h -A 4 "\[\[package\]\]" \
+      $(find "../" -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
+      sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
+      awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4, $5 }' | \
+      sed 's/"//g;s/name=//;s/ version=/=/' | \
+      grep " source=" | \
+      sed 's/ dependencies=.*$//' | \
+      sed 's/ source=[^ ]*//' | \
+      sed 's/ checksum=/=/' | \
+      sort -u | \
+      while read -r dep ; do
+
+    cksum="$(printf "%s\n" "$dep" | cut -d= -f3)"
+    ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
+    dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
+
+    tar xvf $CWD/$dep-$ver.crate
+
+    touch $dep-$ver/.cargo-ok
+
+    # generate checksum
+    {
+      printf "{\n"
+      printf '    "files": {\n'
+
+      (
+        cd $dep-$ver
+        find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/'
+      ) | sed '$ s/,$//'
+
+      printf "    },\n"
+      printf '    "package": "%s"'  "$cksum"
+
+      printf "}\n"
+    } > $dep-$ver/.cargo-checksum.json
+  done
+)
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Set /bin/bash rather than /bin/sh as default shell
+sed -i -e 's,vt = 1,vt = 7,g' config.toml
+sed -i -e 's,bin/sh,bin/bash,g' config.toml
+
+# Adding extra parms to default config to ensure our envir is good
+cat <<EOT >> config.toml
+
+[system]
+source_profile = "true"
+runfile = "/var/run/greetd.run"
+EOT
+
+## to do online rust build uncomment these two lines
+#CARGO_HOME=.cargo cargo fetch --locked --target "$ARCH-unknown-linux-gnu"
+#CARGO_HOME=.cargo cargo build --frozen --release --all-features
+
+## and comment the line below this
+CARGO_HOME=.cargo cargo build --offline --frozen --release --all-features
+make -C man all
+
+install -Dm0755 -t "$PKG/usr/bin/" "target/release/agreety"
+install -Dm0755 -t "$PKG/usr/bin/" "target/release/fakegreet"
+install -Dm0755 -t "$PKG/usr/bin/" "target/release/$PRGNAM"
+install -Dm0644 -t "$PKG/etc/$PRGNAM/" config.toml
+install -Dm0644 "$CWD/$PRGNAM.pam" "$PKG/etc/pam.d/$PRGNAM"
+make -C man DESTDIR="$PKG" MANDIR=/usr/man PREFIX=/usr install
+
+cd $TMP/$PRGNAM-$VERSION
+
+find $PKG | xargs file | egrep "ELF.*executable" | cut -f 1 -d : \
+          | xargs strip --strip-unneeded 2> /dev/null
+
+# move this file to 'rc.4.local' for Slackware to boot directly
+# to greetd from init level 4 startup
+mkdir -p $PKG/etc/rc.d
+cat $CWD/rc.4.$PRGNAM > $PKG/etc/rc.d/rc.4.$PRGNAM
+chmod 0644 $PKG/etc/rc.d/rc.4.$PRGNAM
+
+# create this in pkg to ensure it exists with proper perms
+mkdir -p $PKG/var/lib/$PRGNAM
+chown -R $PRGUID:$PRGGID $PKG/var/lib/$PRGNAM
+
+gzip -9 $PKG/usr/man/man?/*
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md \
+      $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/greetd/greetd.info b/system/greetd/greetd.info
new file mode 100644
index 0000000000..d666978424
--- /dev/null
+++ b/system/greetd/greetd.info
@@ -0,0 +1,104 @@
+PRGNAM="greetd"
+VERSION="0.9.0"
+HOMEPAGE="https://git.sr.ht/~kennylevinsen/greetd"
+DOWNLOAD="https://static.crates.io/crates/async-trait/async-trait-0.1.60.crate \
+          https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \
+          https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \
+          https://static.crates.io/crates/bytes/bytes-1.3.0.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://static.crates.io/crates/enquote/enquote-1.1.0.crate \
+          https://static.crates.io/crates/getopts/getopts-0.2.21.crate \
+          https://static.crates.io/crates/itoa/itoa-1.0.5.crate \
+          https://static.crates.io/crates/libc/libc-0.2.139.crate \
+          https://static.crates.io/crates/log/log-0.4.17.crate \
+          https://static.crates.io/crates/memchr/memchr-2.5.0.crate \
+          https://static.crates.io/crates/memoffset/memoffset-0.7.1.crate \
+          https://static.crates.io/crates/mio/mio-0.8.5.crate \
+          https://static.crates.io/crates/nix/nix-0.26.1.crate \
+          https://static.crates.io/crates/pam-sys/pam-sys-0.5.6.crate \
+          https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.9.crate \
+          https://static.crates.io/crates/pin-utils/pin-utils-0.1.0.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.49.crate \
+          https://static.crates.io/crates/quote/quote-1.0.23.crate \
+          https://static.crates.io/crates/rpassword/rpassword-5.0.1.crate \
+          https://static.crates.io/crates/ryu/ryu-1.0.12.crate \
+          https://static.crates.io/crates/serde/serde-1.0.152.crate \
+          https://static.crates.io/crates/serde_derive/serde_derive-1.0.152.crate \
+          https://static.crates.io/crates/serde_json/serde_json-1.0.91.crate \
+          https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.4.0.crate \
+          https://static.crates.io/crates/socket2/socket2-0.4.7.crate \
+          https://static.crates.io/crates/static_assertions/static_assertions-1.1.0.crate \
+          https://static.crates.io/crates/syn/syn-1.0.107.crate \
+          https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.38.crate \
+          https://static.crates.io/crates/thiserror/thiserror-1.0.38.crate \
+          https://static.crates.io/crates/tokio-macros/tokio-macros-1.8.2.crate \
+          https://static.crates.io/crates/tokio/tokio-1.24.0.crate \
+          https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.6.crate \
+          https://static.crates.io/crates/unicode-width/unicode-width-0.1.10.crate \
+          https://static.crates.io/crates/users/users-0.11.0.crate \
+          https://static.crates.io/crates/wasi/wasi-0.11.0+wasi-snapshot-preview1.crate \
+          https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi/winapi-0.3.9.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.42.0.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.42.0.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.42.0.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.42.0.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.42.0.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.42.0.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.42.0.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.42.0.crate \
+          https://github.com/kennylevinsen/greetd/archive/0.9.0/greetd-0.9.0.tar.gz"
+MD5SUM="fdfbe819b079678795b1ee1e1c61b9cb \
+        05d77ef52e90ad161fdd41b252420467 \
+        a295edb6953237ebbdfa8e731229f9a3 \
+        4dfac92ee6bdeb44117342cb203dd36c \
+        74634128440dbc3766bda76fdf0aaa05 \
+        14be1ab75b7fa1711d7c81313f15ea4d \
+        c3ec5977ecc0f6244ef3be87f5325e72 \
+        f2ffcbe94a83f2437ffe47d7dbf4ad04 \
+        2f4991ee29e75b732dbfbbe637506066 \
+        b31bf94ffe7e0f2ada93afae1076eaeb \
+        94b8bf179385ff071bdc33b58bf047c0 \
+        48e7cc866f45af55ea3f627e29a2cd98 \
+        a8a1c536701e539cdce215fd7f55de9f \
+        5574bd0280c1d59555909f6b598ced79 \
+        1a61e05436ba382ed378ec9cf100fea2 \
+        ce6dde2ea2691fdd97632fb8c9b3e042 \
+        07c75fec267864bcbb800ca7709ceae2 \
+        e6bfe297f458a83f516e46e9b0ba07b4 \
+        41defdffa40e7cbcc7e17a933c5660ab \
+        1e585d25db7b5bb009b060befc74e9fe \
+        4ca29f2ce41fb9f282c527c1d8ae5cc4 \
+        2d82330c9f218f42ccc9e44c2d18ff8f \
+        3338953ce1388e5ff5fef5aac76ab1f5 \
+        4da6e91a5a30bc8163694b0809798d0e \
+        21b43d5721b3a9c16059acb691f4314d \
+        362eebacce3b2c9204fdef6d1c04d757 \
+        c9defe80406280bcfce4ecf31c0200b3 \
+        8efa8e23cddda0540efe4ba8ff60840b \
+        44e45d4d9b0904fd06d6f46107eda592 \
+        3d2277774414ad0f59584e7021b9be06 \
+        d6f24a12196b2e717d4fd869f3410e7f \
+        6cdee292cf5bfd88a1608ebe48e3cab7 \
+        e522898b2cb1fd23af2695324b3a5c78 \
+        7d6d4fc9fad200d6e295f6930e97e022 \
+        d4c929fc9daf131daef04ee7eaa91fd4 \
+        e972ea58ec203bfa6c79c1207852298b \
+        db96b50050277bf05a3c68534bbb9586 \
+        09de9d01e7331ff3da11f58be8bef0df \
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        110789f2dd21a2ea820ebed976b4b1c2 \
+        86854324255f07e8f64cc11ef8be3b3c \
+        510f0324dbaea90d9d3ca2eea5e71a04 \
+        38cf2b9fa16048f19e0d3b2d73479e50 \
+        c373eadcbc79dfc0b580d12851add17d \
+        f41cbc66ecf1f5006d0f0a7df2726c73 \
+        b04135c0705b10e9866585e1d75e68a3 \
+        404688aa3e82019927df8a16c7d258d1 \
+        af714594386b3e648f20d6d923d2357d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="gtk-layer-shell rust16 scdoc"
+MAINTAINER="Jay Lanagan"
+EMAIL="j@lngn.net"
diff --git a/system/greetd/greetd.pam b/system/greetd/greetd.pam
new file mode 100644
index 0000000000..743b5ccc6d
--- /dev/null
+++ b/system/greetd/greetd.pam
@@ -0,0 +1,9 @@
+#%PAM-1.0
+
+auth       required     pam_securetty.so
+auth       requisite    pam_nologin.so
+auth       include      system-auth
+account    include      system-auth
+session    include      system-auth
+-session   optional     pam_elogind.so
+
diff --git a/system/greetd/rc.4.greetd b/system/greetd/rc.4.greetd
new file mode 100644
index 0000000000..4633cc781c
--- /dev/null
+++ b/system/greetd/rc.4.greetd
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# /etc/rc.d/rc.4.greetd
+# Rename this script /etc/rc.d/rc.4.local
+# and make it executable and it will be used instead:
+
+if [ -x /usr/bin/greetd ]; then
+  exec /usr/bin/greetd
+fi
+
+# EOF
diff --git a/system/greetd/slack-desc b/system/greetd/slack-desc
new file mode 100644
index 0000000000..44e4c15c16
--- /dev/null
+++ b/system/greetd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+greetd: greetd (A login manager daemon)
+greetd:
+greetd: greetd is a minimal and flexible login manager daemon that makes no
+greetd: assumptions about what you want to launch.
+greetd:
+greetd: Homepage: https://git.sr.ht/~kennylevinsen/greetd
+greetd:
+greetd:
+greetd:
+greetd:
+greetd:
diff --git a/system/grub4dos/grub4dos.SlackBuild b/system/grub4dos/grub4dos.SlackBuild
index 8e110636a7..cfd913ecfc 100644
--- a/system/grub4dos/grub4dos.SlackBuild
+++ b/system/grub4dos/grub4dos.SlackBuild
@@ -1,21 +1,30 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for grub4dos
 
 # Written by Steven Pledger <spledger91@yahoo.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=grub4dos
 VERSION=${VERSION:-0.4.5b_2011_02_20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 TARVERSION=$(echo $VERSION | tr '_' '-')
 SRCVERSION=$(echo $VERSION | cut -f1 -d_ )
 
-# Now using the precompiled binary since Grub4dos doesn't build on other archs anyway
-ARCH="i386"
+# Now using the precompiled binary since Grub4dos doesn't build on other archs anyway.
+# 20230528 bkw: no more i386 or i486, Slackware hasn't supported them in ages. This
+# is just cosmetic, anyway.
+ARCH="i586"
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -30,15 +39,14 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$SRCVERSION
 # Guess they're using 7-zip archives now.
-#unzip $CWD/$PRGNAM-$TARVERSION.zip
-7z x $CWD/$PRGNAM-$TARVERSION.7z
+bsdtar xvf $CWD/$PRGNAM-$TARVERSION.7z
 cd $PRGNAM-$SRCVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} +
 
 # bootlace.com is a hybrid DOS/Linux executable for installing grub4dos to MBR/PBR
 mkdir -p $PKG/usr/sbin
@@ -71,4 +79,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/grub4dos/grub4dos.info b/system/grub4dos/grub4dos.info
index fdc043c9c0..5683a2c846 100644
--- a/system/grub4dos/grub4dos.info
+++ b/system/grub4dos/grub4dos.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://storage.googleapis.com/google-code-archive-downloads/v2/code.g
 MD5SUM="525f86bd58cfb4608f50c22f4e58042b"
 DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64=""
-REQUIRES="p7zip"
+REQUIRES=""
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/system/grub_legacy/grub_legacy.SlackBuild b/system/grub_legacy/grub_legacy.SlackBuild
index 3a26f6b152..2e5a8b1d57 100644
--- a/system/grub_legacy/grub_legacy.SlackBuild
+++ b/system/grub_legacy/grub_legacy.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for grub_legacy
 
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=grub_legacy
 VERSION=${VERSION:-0.97}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -78,4 +88,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/grub_legacy/grub_legacy.info b/system/grub_legacy/grub_legacy.info
index 25c88d3ae5..689d1128dc 100644
--- a/system/grub_legacy/grub_legacy.info
+++ b/system/grub_legacy/grub_legacy.info
@@ -1,9 +1,9 @@
 PRGNAM="grub_legacy"
 VERSION="0.97"
 HOMEPAGE="https://www.gnu.org/software/grub/grub-legacy.html"
-DOWNLOAD="http://mirror.centos.org/centos/6/os/i386/Packages/grub-0.97-99.el6.i686.rpm"
+DOWNLOAD="https://slackware.uk/~urchlay/src/grub-0.97-99.el6.i686.rpm"
 MD5SUM="ae1ce873fa589e2d07fb59560ad6f4c8"
-DOWNLOAD_x86_64="http://mirror.centos.org/centos/6/os/x86_64/Packages/grub-0.97-99.el6.x86_64.rpm"
+DOWNLOAD_x86_64="https://slackware.uk/~urchlay/src/grub-0.97-99.el6.x86_64.rpm"
 MD5SUM_x86_64="3228e8139b60800d1ce3d6c84ed4baa2"
 REQUIRES="%README%"
 MAINTAINER="Jan F. Chadima"
diff --git a/system/gslapt/README b/system/gslapt/README
new file mode 100644
index 0000000000..181fb8d896
--- /dev/null
+++ b/system/gslapt/README
@@ -0,0 +1,2 @@
+Gslapt is a GUI frontend based on GTK for slapt-get to manage
+packages in slackware.
diff --git a/system/gslapt/changelog b/system/gslapt/changelog
new file mode 100644
index 0000000000..43ea877595
--- /dev/null
+++ b/system/gslapt/changelog
@@ -0,0 +1,6 @@
+Changelog for gslapt SlackBuild Script
+--------------------------------------------------------------------
+
+24/05/2023:
+
+Submitted to slackbuilds.org
diff --git a/system/gslapt/doinst.sh b/system/gslapt/doinst.sh
new file mode 100644
index 0000000000..e03e341290
--- /dev/null
+++ b/system/gslapt/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x usr/bin/update-desktop-database ]; then
+usr/bin/update-desktop-database &>/dev/null
+fi
diff --git a/system/gslapt/gslapt-kde.desktop b/system/gslapt/gslapt-kde.desktop
new file mode 100644
index 0000000000..b2b488602b
--- /dev/null
+++ b/system/gslapt/gslapt-kde.desktop
@@ -0,0 +1,98 @@
+[Desktop Entry]
+Exec=/usr/bin/pkexec /usr/sbin/gslapt
+Name[bg]=Мениджър на пакети Gslapt
+Name[ca]=Gestor de paquets Gslapt
+Name[cs]=Správce balíčků Gslapt
+Name[de]=Gslapt-Paketverwaltung
+Name[el]=Διαχειριστής Πακέτων Gslapt
+Name[es]=Administrador de Paquetes Gslapt
+Name[es_AR]=Administrador de Paquetes Gslapt
+Name[fr]=Gestionnaire de paquets Gslapt
+Name[gl_ES]=Gslapt Package Manager
+Name[he]=מנהל חבילות Gslapt
+Name[hi_IN]=GSlapt पैकेज प्रबंधक
+Name[hu]=Gslapt csomagkezelő
+Name[id]=Gslapt Package Manager
+Name[it]=Gestore pacchetti Gslapt
+Name[ja]=Gslapt パッケージマネージャー
+Name[nl]=Gslapt pakketbeheer
+Name[no]=Gslapt Pakkeadministrasjon
+Name[pl]=Gslapt Menedżer Pakietów
+Name[pt]=Gestor de pacotes Gslapt
+Name[pt_BR]=Gerenciador de Pacotes Gslapt
+Name[pt_PT]=Gestor de pacotes Gslapt
+Name[ru]=Менеджер пакетов Gslapt
+Name[sk]=Gslapt Package Manager
+Name[sl]=Upravitelj paketov Gslapt
+Name[sv]=Gslapt Pakethanterare
+Name[tr]=Gslapt Package Manager
+Name[uk]=Менеджер пакункiв Gslapt
+Name[vi]=Gslapt Package Manager
+Name[zh_CN]=Gslapt Package Manager
+Name=Gslapt Package Manager
+GenericName[bg]=Gslapt
+GenericName[ca]=Gslapt
+GenericName[cs]=Gslapt
+GenericName[de]=Gslapt
+GenericName[el]=Gslapt
+GenericName[es]=Gslapt
+GenericName[es_AR]=Gslapt
+GenericName[fr]=Gslapt
+GenericName[gl_ES]=Gslapt
+GenericName[he]=Gslapt
+GenericName[hi_IN]=Gslapt
+GenericName[hu]=Gslapt
+GenericName[id]=Gslapt
+GenericName[it]=Gslapt
+GenericName[ja]=Gslapt
+GenericName[nl]=Gslapt
+GenericName[no]=Gslapt
+GenericName[pl]=Gslapt
+GenericName[pt]=Gslapt
+GenericName[pt_BR]=Gslapt
+GenericName[pt_PT]=Gslapt
+GenericName[ru]=Gslapt
+GenericName[sk]=Gslapt
+GenericName[sl]=Gslapt
+GenericName[sv]=Gslapt
+GenericName[tr]=Gslapt
+GenericName[uk]=Gslapt
+GenericName[vi]=Gslapt
+GenericName[zh_CN]=Gslapt
+GenericName=Gslapt
+Comment[bg]=Инсталиране, премахване и обновяване на софтуерни пакети
+Comment[ca]=Instal·leu, actualitzeu i elimineu paquets de programari
+Comment[cs]=Instaluje, odebírá a upgraduje softwarové balíčky
+Comment[de]=Software-Pakete installieren, entfernen und aktualisieren
+Comment[el]=Εγκαταστήστε, απεγκαταστήστε και αναβαθμίστε πακέτα λογισμικού
+Comment[es]=Instalar, eliminar y actualizar los paquetes de software
+Comment[es_AR]=Instalar, eliminar y actualizar los paquetes de software
+Comment[fr]=Installer, désinstaller et mettre à jour des paquets logiciels
+Comment[gl_ES]=Install, remove and upgrade software packages
+Comment[he]=התקנה, הסרה ושדרוג של חבילות תוכנה
+Comment[hi_IN]=सॉफ्टवेयर पैकेज इंस्टॉल करें, हटाएँ व अपग्रेड करें
+Comment[hu]=Programok telepítése, eltávolítása, frissítése
+Comment[id]=Install, remove and upgrade software packages
+Comment[it]=Installa, rimuove ed aggiorna i pacchetti software
+Comment[ja]=ソフトウェアパッケージのインストール・削除・更新
+Comment[nl]=Softwarepakketten installeren, verwijderen of bijwerken
+Comment[no]=Installer, fjern eller oppgrader programvare pakker
+Comment[pl]=Instalacja, usuwanie i aktualizacja pakietów z oprogramowaniem
+Comment[pt]=Instalar, remover e atualizar pacotes
+Comment[pt_BR]=Instalar, remover e atualizar pacotes
+Comment[pt_PT]=Instalar, remover e atualizar pacotes
+Comment[ru]=Установка, обновление и удаление пакетов
+Comment[sk]=Install, remove and upgrade software packages
+Comment[sl]=Install, remove and upgrade software packages
+Comment[sv]=Installera, ta bort och uppgradera programpaket
+Comment[tr]=Install, remove and upgrade software packages
+Comment[uk]=Установка, вилучення і оновлення програмних пакунків
+Comment[vi]=Install, remove and upgrade software packages
+Comment[zh_CN]=Install, remove and upgrade software packages
+Comment=Install, remove and upgrade software packages
+Icon=/usr/share/pixmaps/gslapt.png
+Terminal=false
+Categories=PackageManager;Settings
+StartupNotify=true
+Type=Application
+OnlyShowIn=KDE
diff --git a/system/gslapt/gslapt.SlackBuild b/system/gslapt/gslapt.SlackBuild
new file mode 100644
index 0000000000..cfebbaba41
--- /dev/null
+++ b/system/gslapt/gslapt.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+# Slackware build script for gslapt
+
+# Copyright 2023 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=gslapt
+VERSION=${VERSION:-0.5.10}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+aarch64*) ARCH=aarch64 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-march=i586 -mtune=i686 -pipe -O2 -fPIC"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-march=i686 -mtune=i686 -pipe -O2 -fPIC"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-march=x86-64 -mtune=generic -pipe -O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" meson setup build --prefix=/usr --sysconfdir=/etc --mandir=/usr/man
+meson compile -C build
+DESTDIR=$PKG meson install -C build
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv -v $PKG/usr/share/doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rvf $PKG/usr/share/doc 
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+rm -rvf $PKG/usr/share/applications/gslapt-kde.desktop
+rm -rvf $PKG/usr/share/applications/gslapt.desktop
+
+install -m0644 $CWD/gslapt-kde.desktop -t $PKG/usr/share/applications
+install -m0644 $CWD/gslapt.desktop -t $PKG/usr/share/applications
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gslapt/gslapt.desktop b/system/gslapt/gslapt.desktop
new file mode 100644
index 0000000000..a18631eaaf
--- /dev/null
+++ b/system/gslapt/gslapt.desktop
@@ -0,0 +1,98 @@
+[Desktop Entry]
+Exec=/usr/bin/pkexec /usr/sbin/gslapt
+Name[bg]=Мениджър на пакети Gslapt
+Name[ca]=Gestor de paquets Gslapt
+Name[cs]=Správce balíčků Gslapt
+Name[de]=Gslapt-Paketverwaltung
+Name[el]=Διαχειριστής Πακέτων Gslapt
+Name[es]=Administrador de Paquetes Gslapt
+Name[es_AR]=Administrador de Paquetes Gslapt
+Name[fr]=Gestionnaire de paquets Gslapt
+Name[gl_ES]=Gslapt Package Manager
+Name[he]=מנהל חבילות Gslapt
+Name[hi_IN]=GSlapt पैकेज प्रबंधक
+Name[hu]=Gslapt csomagkezelő
+Name[id]=Gslapt Package Manager
+Name[it]=Gestore pacchetti Gslapt
+Name[ja]=Gslapt パッケージマネージャー
+Name[nl]=Gslapt pakketbeheer
+Name[no]=Gslapt Pakkeadministrasjon
+Name[pl]=Gslapt Menedżer Pakietów
+Name[pt]=Gestor de pacotes Gslapt
+Name[pt_BR]=Gerenciador de Pacotes Gslapt
+Name[pt_PT]=Gestor de pacotes Gslapt
+Name[ru]=Менеджер пакетов Gslapt
+Name[sk]=Gslapt Package Manager
+Name[sl]=Upravitelj paketov Gslapt
+Name[sv]=Gslapt Pakethanterare
+Name[tr]=Gslapt Package Manager
+Name[uk]=Менеджер пакункiв Gslapt
+Name[vi]=Gslapt Package Manager
+Name[zh_CN]=Gslapt Package Manager
+Name=Gslapt Package Manager
+GenericName[bg]=Gslapt
+GenericName[ca]=Gslapt
+GenericName[cs]=Gslapt
+GenericName[de]=Gslapt
+GenericName[el]=Gslapt
+GenericName[es]=Gslapt
+GenericName[es_AR]=Gslapt
+GenericName[fr]=Gslapt
+GenericName[gl_ES]=Gslapt
+GenericName[he]=Gslapt
+GenericName[hi_IN]=Gslapt
+GenericName[hu]=Gslapt
+GenericName[id]=Gslapt
+GenericName[it]=Gslapt
+GenericName[ja]=Gslapt
+GenericName[nl]=Gslapt
+GenericName[no]=Gslapt
+GenericName[pl]=Gslapt
+GenericName[pt]=Gslapt
+GenericName[pt_BR]=Gslapt
+GenericName[pt_PT]=Gslapt
+GenericName[ru]=Gslapt
+GenericName[sk]=Gslapt
+GenericName[sl]=Gslapt
+GenericName[sv]=Gslapt
+GenericName[tr]=Gslapt
+GenericName[uk]=Gslapt
+GenericName[vi]=Gslapt
+GenericName[zh_CN]=Gslapt
+GenericName=Gslapt
+Comment[bg]=Инсталиране, премахване и обновяване на софтуерни пакети
+Comment[ca]=Instal·leu, actualitzeu i elimineu paquets de programari
+Comment[cs]=Instaluje, odebírá a upgraduje softwarové balíčky
+Comment[de]=Software-Pakete installieren, entfernen und aktualisieren
+Comment[el]=Εγκαταστήστε, απεγκαταστήστε και αναβαθμίστε πακέτα λογισμικού
+Comment[es]=Instalar, eliminar y actualizar los paquetes de software
+Comment[es_AR]=Instalar, eliminar y actualizar los paquetes de software
+Comment[fr]=Installer, désinstaller et mettre à jour des paquets logiciels
+Comment[gl_ES]=Install, remove and upgrade software packages
+Comment[he]=התקנה, הסרה ושדרוג של חבילות תוכנה
+Comment[hi_IN]=सॉफ्टवेयर पैकेज इंस्टॉल करें, हटाएँ व अपग्रेड करें
+Comment[hu]=Programok telepítése, eltávolítása, frissítése
+Comment[id]=Install, remove and upgrade software packages
+Comment[it]=Installa, rimuove ed aggiorna i pacchetti software
+Comment[ja]=ソフトウェアパッケージのインストール・削除・更新
+Comment[nl]=Softwarepakketten installeren, verwijderen of bijwerken
+Comment[no]=Installer, fjern eller oppgrader programvare pakker
+Comment[pl]=Instalacja, usuwanie i aktualizacja pakietów z oprogramowaniem
+Comment[pt]=Instalar, remover e atualizar pacotes
+Comment[pt_BR]=Instalar, remover e atualizar pacotes
+Comment[pt_PT]=Instalar, remover e atualizar pacotes
+Comment[ru]=Установка, обновление и удаление пакетов
+Comment[sk]=Install, remove and upgrade software packages
+Comment[sl]=Install, remove and upgrade software packages
+Comment[sv]=Installera, ta bort och uppgradera programpaket
+Comment[tr]=Install, remove and upgrade software packages
+Comment[uk]=Установка, вилучення і оновлення програмних пакунків
+Comment[vi]=Install, remove and upgrade software packages
+Comment[zh_CN]=Install, remove and upgrade software packages
+Comment=Install, remove and upgrade software packages
+Icon=/usr/share/pixmaps/gslapt.png
+Terminal=false
+Categories=PackageManager;Settings
+StartupNotify=true
+Type=Application
+NotShowIn=KDE
diff --git a/system/gslapt/gslapt.info b/system/gslapt/gslapt.info
new file mode 100644
index 0000000000..e52d923da6
--- /dev/null
+++ b/system/gslapt/gslapt.info
@@ -0,0 +1,10 @@
+PRGNAM="gslapt"
+VERSION="0.5.10"
+HOMEPAGE="https://software.jaos.org"
+DOWNLOAD="https://github.com/jaos/gslapt/archive/0.5.10/gslapt-0.5.10.tar.gz"
+MD5SUM="cd84d93b351e2ed963fe2e4a31b52711"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="slapt-get"
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/gslapt/slack-desc b/system/gslapt/slack-desc
new file mode 100644
index 0000000000..15bf9962a1
--- /dev/null
+++ b/system/gslapt/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+gslapt: gslapt (GUI Frontend to slapt-get)
+gslapt:
+gslapt: Gslapt is a GUI frontend based on GTK for slapt-get to manage
+gslapt: packages in slackware.
+gslapt:
+gslapt:
+gslapt: Homepage:https://software.jaos.org
+gslapt:
+gslapt:
+gslapt:
+gslapt:
diff --git a/system/gsmartcontrol/gsmartcontrol.SlackBuild b/system/gsmartcontrol/gsmartcontrol.SlackBuild
index 0c73c3ccca..c97f83726e 100644
--- a/system/gsmartcontrol/gsmartcontrol.SlackBuild
+++ b/system/gsmartcontrol/gsmartcontrol.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for GSmartControl
 #
-# Copyright 2009-2017  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009-2022  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gsmartcontrol
-VERSION=${VERSION:-1.0.1}
+VERSION=${VERSION:-1.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -90,4 +100,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gsmartcontrol/gsmartcontrol.info b/system/gsmartcontrol/gsmartcontrol.info
index 64c0ee8bdf..dde5fdaf1a 100644
--- a/system/gsmartcontrol/gsmartcontrol.info
+++ b/system/gsmartcontrol/gsmartcontrol.info
@@ -1,8 +1,8 @@
 PRGNAM="gsmartcontrol"
-VERSION="1.0.1"
+VERSION="1.1.4"
 HOMEPAGE="https://sourceforge.net/projects/gsmartcontrol/"
-DOWNLOAD="https://sourceforge.net/projects/gsmartcontrol/files/1.0.1/gsmartcontrol-1.0.1.tar.bz2"
-MD5SUM="b19f95e0a598500d53ef03212d769c45"
+DOWNLOAD="https://sourceforge.net/projects/gsmartcontrol/files/1.1.4/gsmartcontrol-1.1.4.tar.bz2"
+MD5SUM="8345b195e51339884634006cc4b15a5e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/gsplus/README b/system/gsplus/README
new file mode 100644
index 0000000000..70fca067c7
--- /dev/null
+++ b/system/gsplus/README
@@ -0,0 +1 @@
+Modern cross-platform Apple IIgs emulator and tools based on KEGS
diff --git a/system/gsplus/doinst.sh b/system/gsplus/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/system/gsplus/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/gsplus/gsplus.SlackBuild b/system/gsplus/gsplus.SlackBuild
new file mode 100644
index 0000000000..be9414db73
--- /dev/null
+++ b/system/gsplus/gsplus.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/bash
+
+# Slackware build script for gsplus
+
+# Copyright 2023 Steven Voges <Oregon, USA>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=gsplus
+VERSION=${VERSION:-20190816_4805720}
+SRCVER=${SRCVER:-480572054518112647c8fae5d7ea7046a6d6ecfb}
+ATBRIDGE=${ATBRIDGE:-OFF}
+NET=${NET:-OFF}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_ATBRIDGE=$ATBRIDGE \
+    -DWITH_RAWNET=$NET \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+cd ..
+
+install -vDm0755 $TMP/$PRGNAM-$SRCVER/build/bin/GSplus $PKG/usr/bin/${PRGNAM}
+install -vDm0644 $CWD/${PRGNAM}.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+for name in ROM1 ROM3; do
+  install -vDm0644 $CWD/ROM1 $PKG/usr/share/$PRGNAM/${name}
+done
+for i in 16 32 64 128 256 512 1024; do
+  install -vDm0644 $TMP/$PRGNAM-$SRCVER/assets/gsp_icon_${i}.png \
+    $PKG/usr/share/icons/hicolor/${i}x${i}/apps/${PRGNAM}.png
+done
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYRIGHT.txt LICENSE.txt README.md doc/gsplusmanual.pdf \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gsplus/gsplus.desktop b/system/gsplus/gsplus.desktop
new file mode 100644
index 0000000000..ae9e0e196a
--- /dev/null
+++ b/system/gsplus/gsplus.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=gsplus
+Comment=Modern cross-platform Apple IIgs emulator
+Exec=gsplus %f
+Icon=gsplus
+Path=/$HOME/.local/share/gsplus
+Terminal=false
+Categories=System;
+MimeType=application/x-gsplus;
+Keywords=apple,simulator;
\ No newline at end of file
diff --git a/system/gsplus/gsplus.info b/system/gsplus/gsplus.info
new file mode 100644
index 0000000000..7c8d9784d4
--- /dev/null
+++ b/system/gsplus/gsplus.info
@@ -0,0 +1,14 @@
+PRGNAM="gsplus"
+VERSION="20190816_4805720"
+HOMEPAGE="https://apple2.gs/plus"
+DOWNLOAD="https://github.com/digarok/gsplus/archive/480572054518112647c8fae5d7ea7046a6d6ecfb/gsplus-480572054518112647c8fae5d7ea7046a6d6ecfb.tar.gz \
+          https://apple2.gs/downloads/ROM1 \
+          https://apple2.gs/downloads/ROM3"
+MD5SUM="e74b0c287cfb34f0e7b1702c0db3d0ee \
+        20a0334c447cb069a040ae5be1d938df \
+        ba89edf2729a28a17cd9e0f7a0ac9a39"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Steven Voges"
+EMAIL="svoges.sbo@gmail.com"
diff --git a/system/gsplus/slack-desc b/system/gsplus/slack-desc
new file mode 100644
index 0000000000..54cd791e46
--- /dev/null
+++ b/system/gsplus/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+gsplus: gsplus (Apple IIgs emulator)
+gsplus:
+gsplus: Modern cross-platform Apple IIgs emulator and tools based on KEGS
+gsplus:
+gsplus: Homepage: https://apple2.gs/plus
+gsplus:
+gsplus:
+gsplus:
+gsplus:
+gsplus:
+gsplus:
diff --git a/system/gtk-vnc/README b/system/gtk-vnc/README
index d50eb7a259..fdf3c302dd 100644
--- a/system/gtk-vnc/README
+++ b/system/gtk-vnc/README
@@ -3,9 +3,4 @@ coroutines allowing it to be completely asynchronous while
 remaining single threaded. It provides a core C library, and
 bindings for Python (PyGTK)
 
-This script builds both the gtk+2 and gtk+3 versions of the
-library.  To avoid building the gtk+3 version, pass "GTK3=no"
-when launching the SlackBuild.  For example:
-    GTK3=no ./gtk-vnc.SlackBuild
-
 Optional dependency: perl-Text-CSV
diff --git a/system/gtk-vnc/gtk-vnc.SlackBuild b/system/gtk-vnc/gtk-vnc.SlackBuild
index 4f9f183cc9..003888f36c 100644
--- a/system/gtk-vnc/gtk-vnc.SlackBuild
+++ b/system/gtk-vnc/gtk-vnc.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gtk-vnc
 
 # Copyright 2014 Will Brokenbourgh U.S.A.
-# Copyright 2014-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gtk-vnc
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-1.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -83,8 +93,8 @@ meson \
   --libdir lib${LIBDIRSUFFIX} \
   --mandir /usr/man \
   build
-
-DESTDIR=$PKG ninja -C build all install
+meson compile -C build
+DESTDIR="$PKG" meson install -C build
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -100,4 +110,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gtk-vnc/gtk-vnc.info b/system/gtk-vnc/gtk-vnc.info
index 07318cad36..69a9a3c182 100644
--- a/system/gtk-vnc/gtk-vnc.info
+++ b/system/gtk-vnc/gtk-vnc.info
@@ -1,10 +1,10 @@
 PRGNAM="gtk-vnc"
-VERSION="1.0.0"
+VERSION="1.3.1"
 HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
-DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gtk-vnc/1.0/gtk-vnc-1.0.0.tar.xz"
-MD5SUM="ff2e531525f6200be613643b9ee87fbf"
+DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gtk-vnc/1.3/gtk-vnc-1.3.1.tar.xz"
+MD5SUM="27f0dc7f33cbfdaa6c9eb7cf169f4866"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="vala meson"
+REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/system/gtklp/gtklp.SlackBuild b/system/gtklp/gtklp.SlackBuild
index 09a4d851e6..ea9223214f 100644
--- a/system/gtklp/gtklp.SlackBuild
+++ b/system/gtklp/gtklp.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for gtklp
 
 # Written by Luis Henrique <lmello.009@gmail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gtklp
-VERSION=${VERSION:-1.3.1}
+VERSION=${VERSION:-1.3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -47,7 +57,7 @@ find -L . \
 
 autoreconf -vif
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -88,4 +98,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/gtklp/gtklp.info b/system/gtklp/gtklp.info
index 1cedbdaa7c..0799e966fb 100644
--- a/system/gtklp/gtklp.info
+++ b/system/gtklp/gtklp.info
@@ -1,8 +1,8 @@
 PRGNAM="gtklp"
-VERSION="1.3.1"
+VERSION="1.3.4"
 HOMEPAGE="https://gtklp.sirtobi.com/"
-DOWNLOAD="https://downloads.sourceforge.net/gtklp/gtklp-1.3.1.src.tar.gz"
-MD5SUM="4b77d070aafeab45d134a4f9a12883bb"
+DOWNLOAD="https://downloads.sourceforge.net/gtklp/gtklp-1.3.4.src.tar.gz"
+MD5SUM="bd451cbf70011c94e7c2efda57a0498c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/guake/guake-3.7.0-fix-paths.patch b/system/guake/guake-3.7.0-fix-paths.patch
deleted file mode 100644
index 0cd91ef062..0000000000
--- a/system/guake/guake-3.7.0-fix-paths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- guake/paths.py.orig	2020-02-10 16:10:10.000000000 -0500
-+++ guake/paths.py	2020-06-08 20:32:03.423403158 -0400
-@@ -55,8 +55,8 @@
- 
- 
- def get_default_locale_dir():
--    d = os.path.join(get_data_files_dir(), "po")
--    log.debug("Using guake image directory: %s", d)
-+    d = '/usr/share/locale'
-+    log.debug("Using guake locale directory: %s", d)
-     return d
- 
- 
-@@ -73,7 +73,7 @@
- 
- 
- def get_default_schema_dir():
--    d = get_default_data_dir()
-+    d = '/usr/share/glib-2.0/schemas'
-     log.debug("Using guake scheme directory: %s", d)
-     return d
- 
diff --git a/system/guake/guake-3.8.5-fix-paths.patch b/system/guake/guake-3.8.5-fix-paths.patch
new file mode 100644
index 0000000000..02284ad683
--- /dev/null
+++ b/system/guake/guake-3.8.5-fix-paths.patch
@@ -0,0 +1,47 @@
+--- guake/paths.py.orig	2022-02-06 15:09:08.000000000 -0500
++++ guake/paths.py	2022-02-06 20:42:24.476974008 -0500
+@@ -47,37 +47,37 @@
+ 
+ 
+ def get_default_data_dir():
+-    d = os.path.join(get_data_files_dir(), "data")
++    d = '/usr/share/guake/data'
+     log.debug("Using guake data directory: %s", d)
+     return d
+ 
+ 
+ def get_default_locale_dir():
+-    d = os.path.join(get_data_files_dir(), "po")
+-    log.debug("Using guake image directory: %s", d)
++    d = '/usr/share/locale'
++    log.debug("Using guake locale directory: %s", d)
+     return d
+ 
+ 
+ def get_default_image_dir():
+-    d = os.path.join(get_default_data_dir(), 'pixmaps')
++    d = '/usr/share/guake/pixmaps'
+     log.debug("Using guake image directory: %s", d)
+     return d
+ 
+ 
+ def get_default_glade_dir():
+-    d = get_default_data_dir()
++    d = '/usr/share/guake'
+     log.debug("Using guake glade directory: %s", d)
+     return d
+ 
+ 
+ def get_default_schema_dir():
+-    d = get_default_data_dir()
++    d = '/usr/share/glib-2.0/schemas'
+     log.debug("Using guake scheme directory: %s", d)
+     return d
+ 
+ 
+ def get_default_theme_dir():
+-    d = os.path.join(get_default_data_dir(), 'theme')
++    d = '/usr/share/guake/theme'
+     log.debug("Using guake theme directory: %s", d)
+     return d
+ 
diff --git a/system/guake/guake.SlackBuild b/system/guake/guake.SlackBuild
index 3e9db65f3c..c56c04d225 100644
--- a/system/guake/guake.SlackBuild
+++ b/system/guake/guake.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for guake
 
 # Copyright 2017-2018 Donald Cooley South Haven, IN USA
-# Copyright (C) 2020 Logan Rathbone <poprocks@gmail.com> Province of Ontario, Canada
+# Copyright (C) 2020-2023 Logan Rathbone <poprocks@gmail.com> Province of Ontario, Canada
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=guake
-VERSION=${VERSION:-3.7.0}
+VERSION=${VERSION:-3.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -57,7 +67,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # fix some of the broken paths
-patch -p0 < $CWD/guake-3.7.0-fix-paths.patch
+patch -p0 < $CWD/guake-3.8.5-fix-paths.patch
 
 make generate-desktop generate-mo compile-glib-schemas-dev
 make DESTDIR="$PKG" PREFIX='/usr' install-schemas install-locale
@@ -77,4 +87,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/guake/guake.info b/system/guake/guake.info
index 4bc7673e19..f37b89e088 100644
--- a/system/guake/guake.info
+++ b/system/guake/guake.info
@@ -1,10 +1,10 @@
 PRGNAM="guake"
-VERSION="3.7.0"
+VERSION="3.10"
 HOMEPAGE="http://guake.org"
-DOWNLOAD="https://files.pythonhosted.org/packages/f1/20/32c2c8fe2ec4d5c38dbdd2b2ee60a382a529d0409c7a9960b2453e50d0d7/guake-3.7.0.tar.gz"
-MD5SUM="7934c9c214e25cbc706cd9a8e806becd"
+DOWNLOAD="https://files.pythonhosted.org/packages/31/f7/34364994983bd3923fe97c2070a6cb719e30b2319bcbcdc46dd48463256b/guake-3.10.tar.gz"
+MD5SUM="bc1ac2c9e01457950efecd00588d9127"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libwnck3 vte3 python3 py3cairo dbus-python3 pygobject3-python3 pbr"
+REQUIRES=""
 MAINTAINER="Logan Rathbone"
 EMAIL="poprocks@gmail.com"
diff --git a/system/guefi/README b/system/guefi/README
new file mode 100644
index 0000000000..b25ae55a0d
--- /dev/null
+++ b/system/guefi/README
@@ -0,0 +1,6 @@
+GUEFI is a Python/GTK+3 application that acts as a frontend for
+efibootmgr. It provides an easy to use interface for managing
+UEFI boot options.
+
+Be advised to launch this as user using gksu or ktsuss or you might
+encounter a segfault.
diff --git a/system/guefi/guefi.SlackBuild b/system/guefi/guefi.SlackBuild
new file mode 100644
index 0000000000..5f48e037a2
--- /dev/null
+++ b/system/guefi/guefi.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+# Slackware build script for guefi
+
+# Copyright 2017-2022 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=guefi
+VERSION=${VERSION:-0.2.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+DOCS="AUTHORS COPYING README.md"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make prefix=/usr
+
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/guefi/guefi.info b/system/guefi/guefi.info
new file mode 100644
index 0000000000..75baef0033
--- /dev/null
+++ b/system/guefi/guefi.info
@@ -0,0 +1,10 @@
+PRGNAM="guefi"
+VERSION="0.2.0"
+HOMEPAGE="https://github.com/gapan/guefi"
+DOWNLOAD="https://github.com/gapan/guefi/archive/0.2.0/guefi-0.2.0.tar.gz"
+MD5SUM="1b2f9e58e9938c0d300f3359c61dae6c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/guefi/slack-desc b/system/guefi/slack-desc
new file mode 100644
index 0000000000..e0df51a295
--- /dev/null
+++ b/system/guefi/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+guefi: guefi (GTK+3 frontend for efibootmgr)
+guefi:
+guefi: GUEFI is a Python/GTK+3 application that acts as a frontend for
+guefi: efibootmgr. It provides an easy to use interface for managing
+guefi: UEFI boot options.
+guefi:
+guefi: homepage: https://github.com/gapan/guefi
+guefi:
+guefi:
+guefi:
+guefi:
diff --git a/system/guix/README b/system/guix/README
deleted file mode 100644
index ee6406b70d..0000000000
--- a/system/guix/README
+++ /dev/null
@@ -1,53 +0,0 @@
-GNU Guix provides state-of-the-art package management features such as
-transactional upgrades and roll-backs, reproducible build environments,
-unprivileged package management, and per-user profiles. It uses low-level
-mechanisms from the Nix package manager, but packages are defined as
-native Guile modules, using extensions to the Scheme language -- which
-makes it nicely hackable.
-
-Guix may be run in single or multi-user mode (which requires the
-guix-daemon). To have the guix daemon start and stop with your host,
-add to /etc/rc.d/rc.local:
-
-if [ -x /etc/rc.d/rc.guix ]; then
-   /etc/rc.d/rc.guix start
-fi
-
-and to /etc/rc.d/rc.local_shutdown (creating it if needed):
-
-if [ -x /etc/rc.d/rc.guix ]; then
-   /etc/rc.d/rc.guix stop
-fi
-
-The daemon requires users for building the guix packages, which should
-be added under the 'guixbuild' group.
-
-groupadd -g 316 guixbuild
-for i in `seq -w 1 10`; do
-          useradd -G guixbuild \
-          -d /var/empty -s `which nologin` \
-          -c "Guix build user $i" -u 316 -g 316 \
-          guixbuilder$i;
-done
-
-Restricting access to the daemon to only users in the guixbuild group
-is acheived by setting file permissions for the daemon's socket's folder.
-
-chgrp guixbuild /var/guix/daemon-socket
-chmod ug=rwx,o= /var/guix/daemon-socket
-
-Correct permissions must also be set for /var/guix/profiles to give
-users access.
-
-By default guix will compile in /tmp, this can be changed by exporting
-$TMPDIR. Guix will also by default store its packages in /gnu/store, to
-save space in the root partition /gnu can be mounted on another partition.
-
-Guix can either be built with the nix-daemon instead of the default
-guix-daemon or along side nix sharing the same store, both require nix
-as an optional dependency. To build with the nix-daemon use NIX="yes"
-and to share the store with nix use SHARE="yes".
-
-guile-json is an optional dependency and will allow you to use the 'guix
-import pypi' command. It is of interest primarily for developers and
-not for casual users.
diff --git a/system/guix/config/rc.guix b/system/guix/config/rc.guix
deleted file mode 100644
index b07ebce7aa..0000000000
--- a/system/guix/config/rc.guix
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-
-# Short-Description:  A purely functional package manager.
-# Description:
-# GNU Guix provides state-of-the-art package management features such as
-# transactional upgrades and roll-backs, reproducible build environments,
-# unprivileged package management, and per-user profiles. It uses low-level
-# mechanisms from the Nix package manager, but packages are defined as native 
-# Guile modules, using extensions to the Scheme language—which makes it nicely
-# hackable.
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
-
-BASE=guix-daemon
-
-UNSHARE=/usr/bin/unshare
-GUIX=/usr/bin/$BASE
-GUIX_PIDFILE=/var/run/$BASE.pid
-GUIX_LOG=/var/log/guix.log
-GUIX_OPTS=--build-users-group=guixbuild
-
-if [ -f /etc/default/$BASE ]; then
-  . /etc/default/$BASE
-fi
-
-# Check guix is present
-if [ ! -x $GUIX ]; then
-  echo "$GUIX not present or not executable"
-  exit 1
-fi
-
-guix_start() {
-  echo "starting $BASE ..."
-  if [ -x ${GUIX} ]; then
-    # If there is an old PID file (no guix-daemon running), clean it up:
-    if [ -r ${GUIX_PIDFILE} ]; then
-      if ! ps axc | grep guix-daemon 1> /dev/null 2> /dev/null ; then
-        echo "Cleaning up old ${GUIX_PIDFILE}."
-        rm -f ${GUIX_PIDFILE}
-      fi
-    fi
-    nohup "${UNSHARE}" -m -- "${GUIX}" "${GUIX_OPTS}" >> ${GUIX_LOG} 2>&1 &
-    echo $! > ${GUIX_PIDFILE}
-  fi
-}
-
-guix_stop() {
-  echo "stopping $BASE ..."
-  # If there is no PID file, ignore this request...
-  if [ -r ${GUIX_PIDFILE} ]; then
-    kill $(cat ${GUIX_PIDFILE})
-  fi
-  rm -f ${GUIX_PIDFILE}
-}
-
-guix_restart() {
-  guix_stop
-  guix_start
-}
-
-case "$1" in
-'start')
-  guix_start
-  ;;
-'stop')
-  guix_stop
-  ;;
-'restart')
-  guix_restart
-  ;;
-'status')
-  if [ -f ${GUIX_PIDFILE} ] && ps -o cmd $(cat ${GUIX_PIDFILE}) | grep -q $BASE ; then
-    echo "status of $BASE: running"
-  else
-    echo "status of $BASE: stopped"
-  fi
-  ;;
-*)
-  echo "usage $0 start|stop|restart|status"
-esac
-
-exit 0
diff --git a/system/guix/doinst.sh b/system/guix/doinst.sh
deleted file mode 100644
index 3e203807ec..0000000000
--- a/system/guix/doinst.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-preserve_perms etc/rc.d/rc.guix.new
diff --git a/system/guix/guile-json.patch.gz b/system/guix/guile-json.patch.gz
deleted file mode 100644
index d31240a1bc..0000000000
--- a/system/guix/guile-json.patch.gz
+++ /dev/null
diff --git a/system/guix/guix.SlackBuild b/system/guix/guix.SlackBuild
deleted file mode 100644
index 2a39c47655..0000000000
--- a/system/guix/guix.SlackBuild
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Guix
-
-# Copyright 2015-2016 Hunter Sezen California, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=guix
-VERSION=${VERSION:-0.12.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-for bin in armhf i686 mips64el x86_64; do
-  case "$bin" in
-    armhf ) GVERS=2.0.11 ;;
-    * ) GVERS=2.0.9 ;;
-  esac
-  if [ -f $CWD/guile_${bin}_linux-${GVERS}.tar.xz ]; then
-    cp $CWD/guile_${bin}_linux-${GVERS}.tar.xz \
-      gnu/packages/bootstrap/${bin}-linux/guile-${GVERS}.tar.xz
-  fi
-done
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# To share the store with nix
-SHARE=${SHARE:-no}
-if [ "${SHARE:-yes}" = "yes" ]; then
-  share="--with-store-dir=/nix/store"
-  var="--localstatedir=/nix/var"
-else
-  var="--localstatedir=/var"
-fi
-
-# To use the nix-daemon instead of the guix-daemon
-NIX=${NIX:-no}
-if [ "${NIX:-yes}" = "yes" ]; then
-  nix="--disable-daemon"
-else
-  nix=""
-fi
-
-# import: crate: Do not build when guile-json is not available.
-# http://git.savannah.gnu.org/cgit/guix.git/commit/?id=6023041346c79f7ac4105bba2552a82019fae840
-zcat $CWD/guile-json.patch.gz | patch -p1
-autoreconf -fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --infodir=/usr/info \
-  --mandir=/usr/man \
-  --disable-rpath \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux \
-  $nix \
-  $share \
-  $var
-
-make
-make install DESTDIR=$PKG
-
-install -D --mode 0755 $CWD/config/rc.guix $PKG/etc/rc.d/rc.guix.new
-mkdir -p $PKG/gnu
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*.info*
-
-for i in systemd upstart; do rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/$i; done
-
-DOCS="ABOUT-NLS AUTHORS CODE-OF-CONDUCT COPYING HACKING INSTALL NEWS README \
-      ROADMAP THANKS TODO"
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/guix/guix.info b/system/guix/guix.info
deleted file mode 100644
index e1ea369eb0..0000000000
--- a/system/guix/guix.info
+++ /dev/null
@@ -1,18 +0,0 @@
-PRGNAM="guix"
-VERSION="0.12.0"
-HOMEPAGE="https://www.gnu.org/software/guix/"
-DOWNLOAD="ftp://alpha.gnu.org/gnu/guix/guix-0.12.0.tar.gz \
-          https://notabug.org/orbea/guix-binaries/raw/e915d41ec737a3491ff3d9609c02289da464c7c2/guile_armhf_linux-2.0.11.tar.xz \
-          https://notabug.org/orbea/guix-binaries/raw/e915d41ec737a3491ff3d9609c02289da464c7c2/guile_i686_linux-2.0.9.tar.xz \
-          https://notabug.org/orbea/guix-binaries/raw/e915d41ec737a3491ff3d9609c02289da464c7c2/guile_mips64el_linux-2.0.9.tar.xz \
-          https://notabug.org/orbea/guix-binaries/raw/e915d41ec737a3491ff3d9609c02289da464c7c2/guile_x86_64_linux-2.0.9.tar.xz"
-MD5SUM="f5be9eabf634b1f4762297664698d7aa \
-        5a4d79dc017156a0199fc95cb53bb71c \
-        5ef7d4bb6c7d952008476a9a7d5f6e5c \
-        b5154d1da8efc1c078fc05aa7d462c02 \
-        cb87c5fc787c0f8a92dc7ba2607f93f8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere.com"
diff --git a/system/guix/slack-desc b/system/guix/slack-desc
deleted file mode 100644
index 89630c273e..0000000000
--- a/system/guix/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-    |-----handy-ruler------------------------------------------------------|
-guix: guix (a purely functional package manager)
-guix:
-guix: GNU Guix provides state-of-the-art package management features such
-guix: as transactional upgrades and roll-backs, reproducible build
-guix: environments, unprivileged package management, and per-user profiles.
-guix: It uses low-level mechanisms from the Nix package manager, but
-guix: packages are defined as native Guile modules, using extensions to the
-guix: Scheme language -- which makes it nicely hackable.
-guix:
-guix: Homepage: https://www.gnu.org/software/guix/
-guix:
diff --git a/system/hack-font-ttf/README b/system/hack-font-ttf/README
deleted file mode 100644
index a5baafc081..0000000000
--- a/system/hack-font-ttf/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Hack -  A typeface in the Bitstream Vera lineage
-
-Hack has deep roots in the libre, open source typeface community and
-includes the contributions of the Bitstream Vera & DejaVu projects.
-
-The face has been re-designed with an expanded glyph set, modifications
-of the original glyph shapes, and meticulous attention to metrics.
diff --git a/system/hack-font-ttf/doinst.sh b/system/hack-font-ttf/doinst.sh
deleted file mode 100644
index bdb050188d..0000000000
--- a/system/hack-font-ttf/doinst.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Update the X font indexes:
-if [ -x /usr/bin/mkfontdir -o -x /usr/X11R6/bin/mkfontdir ]; then
-  ( cd /usr/share/fonts/TTF
-    mkfontscale .
-    mkfontdir .
-  )
-fi
-if [ -x /usr/bin/fc-cache ]; then
-  /usr/bin/fc-cache -f
-fi
diff --git a/system/hack-font-ttf/hack-font-ttf.SlackBuild b/system/hack-font-ttf/hack-font-ttf.SlackBuild
deleted file mode 100644
index 807a20902e..0000000000
--- a/system/hack-font-ttf/hack-font-ttf.SlackBuild
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for hack-font-ttf
-
-# Copyright 2018 rfmae <rfmae.git@mailbox.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=hack-font-ttf
-VERSION=${VERSION:-3.003}
-ARCH=noarch
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=Hack-v$VERSION-ttf.tar.xz
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM -C $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p $PKG/usr/share/fonts/TTF/
-cp -a *.ttf $PKG/usr/share/fonts/TTF/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/hack-font-ttf/hack-font-ttf.info b/system/hack-font-ttf/hack-font-ttf.info
deleted file mode 100644
index c377fc0f73..0000000000
--- a/system/hack-font-ttf/hack-font-ttf.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="hack-font-ttf"
-VERSION="3.003"
-HOMEPAGE="https://sourcefoundry.org/hack/"
-DOWNLOAD="https://github.com/source-foundry/Hack/releases/download/v3.003/Hack-v3.003-ttf.tar.xz"
-MD5SUM="cf274d8c32045a350e6d6a116fe463d7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="rfmae"
-EMAIL="rfmae.git@mailbox.org"
diff --git a/system/hack-font-ttf/slack-desc b/system/hack-font-ttf/slack-desc
deleted file mode 100644
index 416a81c711..0000000000
--- a/system/hack-font-ttf/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-             |-----handy-ruler------------------------------------------------------|
-hack-font-ttf: hack-font-ttf (font)
-hack-font-ttf:
-hack-font-ttf: A typeface in the Bitstream Vera lineage
-hack-font-ttf: Hack has deep roots in the libre, open source typeface community and
-hack-font-ttf: includes the contributions of the Bitstream Vera & DejaVu projects.
-hack-font-ttf:
-hack-font-ttf: The face has been re-designed with an expanded glyph set,
-hack-font-ttf: modifications of the original glyph shapes, and meticulous attention
-hack-font-ttf: to metrics.
-hack-font-ttf:
-hack-font-ttf: http://sourcefoundry.org/hack/
diff --git a/system/hal-flash/hal-flash.SlackBuild b/system/hal-flash/hal-flash.SlackBuild
index a93b051b78..4aa8fa3e84 100644
--- a/system/hal-flash/hal-flash.SlackBuild
+++ b/system/hal-flash/hal-flash.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hal-flash.
 
@@ -22,26 +22,36 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hal-flash
 VERSION=${VERSION:-0.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -98,8 +108,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hal-flash/hal-flash.info b/system/hal-flash/hal-flash.info
index 60d1882fea..89cb966297 100644
--- a/system/hal-flash/hal-flash.info
+++ b/system/hal-flash/hal-flash.info
@@ -1,7 +1,7 @@
 PRGNAM="hal-flash"
 VERSION="0.1"
 HOMEPAGE="https://github.com/cshorler/hal-flash"
-DOWNLOAD="https://github.com/cshorler/hal-flash/archive/v0.1.tar.gz"
+DOWNLOAD="https://github.com/cshorler/hal-flash/archive/v0.1/hal-flash-0.1.tar.gz"
 MD5SUM="0b44c2521c2a58fca5fed817e565c0d7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/hardinfo/hardinfo.SlackBuild b/system/hardinfo/hardinfo.SlackBuild
index 6296223cd7..bce97da754 100644
--- a/system/hardinfo/hardinfo.SlackBuild
+++ b/system/hardinfo/hardinfo.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for libffi
 
@@ -21,26 +21,36 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hardinfo
 VERSION=${VERSION:-0.5.1}
 BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -99,4 +109,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hashID/hashID.SlackBuild b/system/hashID/hashID.SlackBuild
index 68a60358b7..46cede1e9b 100644
--- a/system/hashID/hashID.SlackBuild
+++ b/system/hashID/hashID.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hashID
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hashID
 VERSION=${VERSION:-3.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -88,4 +98,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hashID/hashID.info b/system/hashID/hashID.info
index b72f150432..353c38fa0f 100644
--- a/system/hashID/hashID.info
+++ b/system/hashID/hashID.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/psypanda/hashID/archive/v3.1.4/hashID-3.1.4.tar.gz"
 MD5SUM="afc2329679c9d3564b8f2663e7917637"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
+REQUIRES=""
 MAINTAINER="Andre Fernando"
 EMAIL="ando344@gmail.com"
diff --git a/system/hashcat/README b/system/hashcat/README
index 030ea13c73..3e32498d6f 100644
--- a/system/hashcat/README
+++ b/system/hashcat/README
@@ -1,5 +1,7 @@
-hashcat is the world's fastest and most advanced password recovery 
-utility, supporting five unique modes of attack for over 160 
-highly-optimized hashing algorithms. hashcat currently supports CPU's, 
-GPU's other hardware-accelerators on Linux, Windows and OSX, and has 
+hashcat (advanced password recovery)
+
+hashcat is the world's fastest and most advanced password recovery
+utility, supporting five unique modes of attack for over 160
+highly-optimized hashing algorithms. hashcat currently supports CPUs,
+GPUs, other hardware-accelerators on Linux, Windows and OSX, and has
 facilities to help enable distributed password cracking.
diff --git a/system/hashcat/hashcat.SlackBuild b/system/hashcat/hashcat.SlackBuild
index 6bc177144f..5e41302610 100644
--- a/system/hashcat/hashcat.SlackBuild
+++ b/system/hashcat/hashcat.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hashcat
 
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220211 bkw: Modified by SlackBuilds.org: updated for v6.2.4. The
+# old version wouldn't build on 15.0, and it was getting a bit long
+# in the tooth anyway.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hashcat
-VERSION=${VERSION:-3.5.0}
+VERSION=${VERSION:-6.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,28 +76,34 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20220211 bkw: build stripped.
+SLKCFLAGS+=" -Wl,-s"
 
-for i in $(ls $CWD/patches); do
-  patch -p0 < $CWD/patches/$i
-done
+# 20220211 bkw: lots of make arguments, deduplicate.
+runmake() {
+  make "$@" \
+    CC="gcc $SLKCFLAGS" \
+    CXX="g++ $SLKCFLAGS" \
+    PREFIX=/usr \
+    LIBRARY_FOLDER=/usr/lib$LIBDIRSUFFIX \
+    DOCUMENT_FOLDER=/usr/doc/$PRGNAM-$VERSION \
+    DESTDIR=$PKG
+}
 
-sed -i "s|/lib|/lib${LIBDIRSUFFIX}|" src/Makefile
-sed -i "s|share/doc/hashcat|doc/$PRGNAM-$VERSION|" src/Makefile
-make
-make install DESTDIR=$PKG
+runmake
+runmake install
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+chmod -x $PKGDOC/*.sh $PKGDOC/extra/tab_completion/install
+cp -a README.md $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.md  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hashcat/hashcat.info b/system/hashcat/hashcat.info
index 2dd1270653..f1cd6ea160 100644
--- a/system/hashcat/hashcat.info
+++ b/system/hashcat/hashcat.info
@@ -1,10 +1,10 @@
 PRGNAM="hashcat"
-VERSION="3.5.0"
+VERSION="6.2.4"
 HOMEPAGE="https://hashcat.net/hashcat/"
-DOWNLOAD="https://github.com/hashcat/hashcat/archive/v3.5.0/hashcat-3.5.0.tar.gz"
-MD5SUM="4cb174751d2ca9da5eec5a5e97d10d38"
+DOWNLOAD="https://github.com/hashcat/hashcat/archive/v6.2.4/hashcat-6.2.4.tar.gz"
+MD5SUM="afa750eba597503f502d410a5a7a0c9f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="opencl-headers"
+REQUIRES=""
 MAINTAINER="Andre Fernando"
 EMAIL="ando344@gmail.com"
diff --git a/system/hashcat/slack-desc b/system/hashcat/slack-desc
index d937799af9..6fa5c2d5d6 100644
--- a/system/hashcat/slack-desc
+++ b/system/hashcat/slack-desc
@@ -10,10 +10,10 @@ hashcat: hashcat (advanced password recovery)
 hashcat:
 hashcat: hashcat is the world's fastest and most advanced password recovery
 hashcat: utility, supporting five unique modes of attack for over 160
-hashcat: highly-optimized hashing algorithms. hashcat currently supports
-hashcat: CPU's, GPU's other hardware-accelerators on Linux, Windows and OSX,
-hashcat: and has facilities to help enable distributed password cracking.
+hashcat: highly-optimized hashing algorithms. hashcat currently supports CPUs,
+hashcat: GPUs, other hardware-accelerators on Linux, Windows and OSX, and has
+hashcat: facilities to help enable distributed password cracking.
+hashcat:
 hashcat:
-hashcat: Homepage: https://hashcat.net/hashcat/
 hashcat:
 hashcat:
diff --git a/system/haveged/README b/system/haveged/README
deleted file mode 100644
index 187b3bdda9..0000000000
--- a/system/haveged/README
+++ /dev/null
@@ -1,27 +0,0 @@
-haveged (a simple entropy-gathering daemon)
-
-The haveged project is an attempt to provide an easy-to-use, unpredictable
-random number generator based upon an adaptation of the HAVEGE algorithm.
-Haveged was created to remedy low-entropy conditions in the Linux random
-device that can occur under some workloads, especially on headless servers.
-
-The HAVEGE algorithm is based upon the indirect effects of unrelated hardware
-events on the instruction timing of a calculation that is sensitive to
-processor features such as branch predictors and instruction/data access
-mechanisms.
-Samples from a high-resolution timer are input into the algorithm to
-produce a stream of random data in a collection buffer. The contents of this
-buffer can be fed into the random device or accessed directly through the
-file system. File system access is a useful alternative to those situations
-where use of the random device is either inappropriate or not available.
-
-Add the following snippet to your /etc/rc.d/rc.M to start up haveged at boot:
-
-# Starting HAVEGED entropy daemon
-if [ -x /etc/rc.d/rc.haveged ]; then
-  /etc/rc.d/rc.haveged start
-fi
-
-You can see how many bits of entropy are available to the system by reading
-the /proc/sys/kernel/random/entropy_avail file, and check the size of your
-entropy pool at /proc/sys/kernel/random/poolsize.
diff --git a/system/haveged/doinst.sh b/system/haveged/doinst.sh
deleted file mode 100644
index b9e90c8608..0000000000
--- a/system/haveged/doinst.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-config() {
-  for infile in $1; do
-    NEW="$infile"
-    OLD="$(dirname $NEW)/$(basename $NEW .new)"
-    # If there's no config file by that name, mv it over:
-    if [ ! -r $OLD ]; then
-      mv $NEW $OLD
-    elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-      # toss the redundant copy
-      rm $NEW
-    fi
-    # Otherwise, we leave the .new copy for the admin to consider...
-  done
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-preserve_perms etc/rc.d/rc.haveged.new
-
diff --git a/system/haveged/haveged.SlackBuild b/system/haveged/haveged.SlackBuild
deleted file mode 100644
index 0d5e97f692..0000000000
--- a/system/haveged/haveged.SlackBuild
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for haveged
-
-# Copyright 2018 Erik Falor, Logan, Utah, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by Nikos Giotis 20170903, Athens, GR
-#   Use static building
-#   Changed install target to /sbin, /lib[64]
-#   Added check for existing installation due to problems when rebuilding
-#     produces binary that segfaults if any previous installation is there
-
-PRGNAM=haveged
-VERSION=${VERSION:-1.9.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-# Try to detect any previous installations and bail out if true
-if [ -f "/usr/lib$LIBDIRSUFFIX/libhavege.so" -o \
-     -f "/usr/lib$LIBDIRSUFFIX/libhavege.a" -o \
-     -f "/lib$LIBDIRSUFFIX/libhavege.so" -o \
-     -f "/lib$LIBDIRSUFFIX/libhavege.a" ]; then
-  echo 'Detected libhaveged!' >&2
-  echo 'Please remove libhaveged before building a new one.' >&2
-  exit 1
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Static build for easier inclusion in initrd
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="-static" \
-./configure \
-  --prefix=/usr \
-  --sbindir=/sbin \
-  --libdir=/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-rm -rf $PKG/etc/init.d
-install -D -m0755 -oroot -groot $CWD/rc.haveged $PKG/etc/rc.d/rc.haveged.new
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/haveged/haveged.info b/system/haveged/haveged.info
deleted file mode 100644
index ea62f1b72e..0000000000
--- a/system/haveged/haveged.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="haveged"
-VERSION="1.9.2"
-HOMEPAGE="http://www.issihosts.com/haveged/index.html"
-DOWNLOAD="http://www.issihosts.com/haveged/haveged-1.9.2.tar.gz"
-MD5SUM="fb1d8b3dcbb9d06b30eccd8aa500fd31"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Erik Falor"
-EMAIL="ewfalor@gmail.com"
diff --git a/system/haveged/rc.haveged b/system/haveged/rc.haveged
deleted file mode 100644
index 404d9ca800..0000000000
--- a/system/haveged/rc.haveged
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-# Start/stop/restart haveged.
-
-PIDFILE=/var/run/haveged.pid
-HAVEGED_OPTS="-w 1024 -v 1 -p $PIDFILE"
-
-# Start haveged:
-haveged_start() {
-  if [ -f $PIDFILE ]; then
-    echo "HAVEGE daemon is already running as PID $(cat  $PIDFILE) " >&2
-    exit 3
-  elif [ -x /sbin/haveged ]; then
-    echo "Starting HAVEGE daemon:  /sbin/haveged"
-    /sbin/haveged $HAVEGED_OPTS
-  fi
-}
-
-# Stop haveged:
-haveged_stop() {
-  if [ -r /var/run/haveged.pid ]; then
-    kill $(cat /var/run/haveged.pid)
-  else
-    killall haveged
-  fi
-}
-
-# Restart haveged:
-haveged_restart() {
-  haveged_stop
-  sleep 1
-  haveged_start
-}
-
-case "$1" in
-'start')
-  haveged_start
-  ;;
-'stop')
-  haveged_stop
-  ;;
-'restart')
-  haveged_restart
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-  exit 2
-esac
diff --git a/system/haveged/slack-desc b/system/haveged/slack-desc
deleted file mode 100644
index 55d8f9ed50..0000000000
--- a/system/haveged/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-haveged: haveged (A simple entropy daemon)
-haveged:
-haveged: The haveged project is an attempt to provide an easy-to-use,
-haveged: unpredictable random number generator based upon an adaptation of the
-haveged: HAVEGE algorithm.  Haveged was created to remedy low-entropy
-haveged: conditions in the Linux random device that can occur under some
-haveged: workloads, especially on headless servers.
-haveged:
-haveged:
-haveged:
-haveged:
diff --git a/system/hdapsd/hdapsd.SlackBuild b/system/hdapsd/hdapsd.SlackBuild
index 475836da9f..d47df0fd5b 100644
--- a/system/hdapsd/hdapsd.SlackBuild
+++ b/system/hdapsd/hdapsd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hdapsd
 
@@ -27,26 +27,37 @@
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 # Updated by Antonio Hernández Blas <hba.nihilismus@gmail.com> for hdapsd-20090401
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - don't install /etc/hdapsd.conf (only the .new one).
+# - i486 => i586.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hdapsd
 VERSION=${VERSION:-20141203}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -70,9 +81,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -86,15 +97,12 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 # Install a sample config file and init script
 mkdir -p $PKG/etc/rc.d
+rm -f $PKG/etc/hdapsd.conf # 20220411 bkw: derp!
 cat $CWD/hdapsd.conf > $PKG/etc/hdapsd.conf.new
 cat $CWD/rc.hdapsd > $PKG/etc/rc.d/rc.hdapsd.new
 chmod 0755 $PKG/etc/rc.d/rc.hdapsd.new
@@ -111,4 +119,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hddtemp/README.Slackware b/system/hddtemp/README.Slackware
index 7a68e8d36f..5e774248e4 100644
--- a/system/hddtemp/README.Slackware
+++ b/system/hddtemp/README.Slackware
@@ -20,7 +20,7 @@ Finally, to start hddtemp automatically at boot, make /etc/rc.d/rc.hddtemp
 executable and add the following to your /etc/rc.d/rc.local:
 
 if [ -x /etc/rc.d/rc.hddtemp ]; then
-  . /etc/rc.d/rc.hddtemp start
+  /etc/rc.d/rc.hddtemp start
 fi
 
 Once the hddtemp daemon is running you can use hddtemp-aware tools such as
diff --git a/system/hddtemp/hddtemp.SlackBuild b/system/hddtemp/hddtemp.SlackBuild
index bb6a139ca3..836e889351 100644
--- a/system/hddtemp/hddtemp.SlackBuild
+++ b/system/hddtemp/hddtemp.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hddtemp
 
@@ -24,10 +24,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220318 bkw: Modified by SlackBuilds.org:
+# - fix 32-bit build.
+# - do not install useless INSTALL in doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hddtemp
 VERSION=${VERSION:-0.3beta15}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCVERSION="0.3-beta15"
 
@@ -39,7 +46,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,12 +80,17 @@ cd $PRGNAM-$SRCVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 patch -p1 < $CWD/hddtemp.patch
 
+# 20220318 bkw: 'struct ucontext' was removed from glibc, use
+# 'ucontext_t' instead: https://sourceware.org/glibc/wiki/Release/2.26
+# Curiously, this only broke the build on 32-bit Slackware...
+sed -i 's,struct *ucontext,ucontext_t,g' src/backtrace.c
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -87,19 +103,14 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 install -D -m 644 $CWD/hddtemp.db $PKG/etc/hddtemp/hddtemp.db.new
 install -D -m 644 $CWD/rc.hddtemp.new $PKG/etc/rc.d/rc.hddtemp.new
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS ChangeLog GPL-2 INSTALL README TODO COPYING LICENSE contribs/ \
+cp -a ABOUT-NLS ChangeLog GPL-2 README TODO COPYING LICENSE contribs/ \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -108,4 +119,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/heartbeat/README b/system/heartbeat/README
index 742f8f2af6..ebc0562eb9 100644
--- a/system/heartbeat/README
+++ b/system/heartbeat/README
@@ -1,9 +1,9 @@
 Linux-HA heartbeat
 
-Heartbeat is a daemon that provides cluster infrastructure (communication and
-membership) services to its clients. This allows clients to know about the
-presence (or disappearance!) of peer processes on other machines and to easily
-exchange messages with them.
+Heartbeat is a daemon that provides cluster infrastructure
+(communication and membership) services to its clients. This allows
+clients to know about the presence (or disappearance!) of peer
+processes on other machines and to easily exchange messages with them.
 
 Heartbeat still comes with an integrated primitive resource
 manager, which basically is just a shell script.  This is also
diff --git a/system/heartbeat/doinst.sh b/system/heartbeat/doinst.sh
index bdba1fdb05..252197f2cf 100644
--- a/system/heartbeat/doinst.sh
+++ b/system/heartbeat/doinst.sh
@@ -24,4 +24,4 @@ preserve_perms() {
 config etc/ha.d/authkeys.new
 config etc/ha.d/ha.cf.new
 config etc/ha.d/haresources.new
-preserve_perms etc/init.d/heartbeat.new
+preserve_perms etc/rc.d/init.d/heartbeat.new
diff --git a/system/heartbeat/heartbeat.SlackBuild b/system/heartbeat/heartbeat.SlackBuild
index 1d481aeec7..df6aa1bcfc 100644
--- a/system/heartbeat/heartbeat.SlackBuild
+++ b/system/heartbeat/heartbeat.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for heartbeat
 
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=3: fix doinst.sh.
+# 20220209 bkw: Modified by SlackBuilds.org to fix the build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=heartbeat
 VERSION=${VERSION:-20200423}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,9 +75,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 ./bootstrap
 
@@ -81,6 +91,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-dependency-tracking \
+  --disable-fatal-warnings \
   --build=$ARCH-slackware-linux \
   --disable-rpath
 
@@ -113,9 +124,11 @@ cp -a \
 unset doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hebe/README b/system/hebe/README
deleted file mode 100644
index 7e9486cbb6..0000000000
--- a/system/hebe/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Hebe is a KDE front-end GUI for the Hercules z/Arch emulator. It was designed
-to have a modern look; there are no dials! Hebe provides two consoles, one for
-Hercules and one for the SCP (system control program), AKA, the operating
-system. Input is automatically routed to the correct receiver. You can start
-as many instances of Hercules as your hardware can support.
diff --git a/system/hebe/hebe.SlackBuild b/system/hebe/hebe.SlackBuild
deleted file mode 100644
index f5e663c31e..0000000000
--- a/system/hebe/hebe.SlackBuild
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for hebe
-# KDE gui for Hercules
-
-# Written by Niels Horn <niels.horn@gmail.com>
-# Revision date: 2010/11/21
-
-PRGNAM=hebe
-VERSION=${VERSION:-0.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DHTML_INSTALL_DIR=/usr/doc/$PRGNAM-$VERSION/html \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
-cd ..
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Remove executable bit from documents
-chmod -x INSTALL README
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ChangeLog INSTALL README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/hebe/hebe.info b/system/hebe/hebe.info
deleted file mode 100644
index 1ce77fbeaf..0000000000
--- a/system/hebe/hebe.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="hebe"
-VERSION="0.4"
-HOMEPAGE="http://freecode.com/projects/hebe"
-DOWNLOAD="http://downloads.sourceforge.net/project/salix-sbo/13.37/hebe/hebe-0.4.tar.bz2"
-MD5SUM="0ff4b72def6e30540fb52860d4ff3e93"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="hercules"
-MAINTAINER="Niels Horn"
-EMAIL="niels.horn@gmail.com"
diff --git a/system/hebe/slack-desc b/system/hebe/slack-desc
deleted file mode 100644
index b944ec887e..0000000000
--- a/system/hebe/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-    |-----handy-ruler------------------------------------------------------|
-hebe: hebe (KDE gui for Hercules)
-hebe:
-hebe: Hebe is a KDE front-end GUI for the Hercules z/Arch emulator. It was
-hebe: designed to have a modern look; there are no dials! Hebe provides two
-hebe: consoles, one for Hercules and one for the SCP (system control
-hebe: program), AKA, the operating system. Input is automatically routed to
-hebe: the correct receiver. You can start as many instances of Hercules as
-hebe: your hardware can support.
-hebe:
-hebe: Homepage: http://freecode.com/projects/hebe
-hebe:
diff --git a/system/heirloom-doctools/heirloom-doctools.SlackBuild b/system/heirloom-doctools/heirloom-doctools.SlackBuild
index e3247f65f3..a98a42592d 100644
--- a/system/heirloom-doctools/heirloom-doctools.SlackBuild
+++ b/system/heirloom-doctools/heirloom-doctools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for heirloom-doctools
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=heirloom-doctools
-VERSION=${VERSION:-160308}
+VERSION=${VERSION:-191015}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,7 +70,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-${VERSION}.tar.gz
+tar xvf $CWD/$PRGNAM-${VERSION}.tar.bz2
 cd $PRGNAM-$VERSION
 
 chown -R root:root .
@@ -72,8 +82,22 @@ find -L . \
 
 patch < $CWD/patches/mk.config.patch-$VERSION
 
-make
-make install ROOT=$PKG
+# with new bison this doesn't work anymore so we need berkeley yacc
+# also with newer gcc we need -fcommon as tryglf is defined multiple
+# times.
+SLKCFLAGS="$SLKCFLAGS -fcommon"
+
+YACC=/usr/bin/byacc \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure
+
+# we still need to build with -j1
+YACC=/usr/bin/byacc \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make -j1
+make -j1 install ROOT=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -98,4 +122,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/heirloom-doctools/heirloom-doctools.info b/system/heirloom-doctools/heirloom-doctools.info
index 58f132757d..135de49a91 100644
--- a/system/heirloom-doctools/heirloom-doctools.info
+++ b/system/heirloom-doctools/heirloom-doctools.info
@@ -1,10 +1,10 @@
 PRGNAM="heirloom-doctools"
-VERSION="160308"
+VERSION="191015"
 HOMEPAGE="http://n-t-roff.github.io/heirloom/doctools.html"
-DOWNLOAD="https://github.com/n-t-roff/heirloom-doctools/archive/160308/heirloom-doctools-160308.tar.gz"
-MD5SUM="f9759a099fca6b3021da33b94b1f37a9"
+DOWNLOAD="https://github.com/n-t-roff/heirloom-doctools/releases/download/191015/heirloom-doctools-191015.tar.bz2"
+MD5SUM="fd32287f39d4e8ceae4783527742ea52"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="byacc"
 MAINTAINER="Ruben Schuller"
 EMAIL="sb@rbn.im"
diff --git a/system/heirloom-doctools/patches/mk.config.patch-160308 b/system/heirloom-doctools/patches/mk.config.patch-191015
index 493eef5be7..493eef5be7 100644
--- a/system/heirloom-doctools/patches/mk.config.patch-160308
+++ b/system/heirloom-doctools/patches/mk.config.patch-191015
diff --git a/system/heirloom-ed/heirloom-ed.SlackBuild b/system/heirloom-ed/heirloom-ed.SlackBuild
index ee536cb3d9..d70c048e53 100644
--- a/system/heirloom-ed/heirloom-ed.SlackBuild
+++ b/system/heirloom-ed/heirloom-ed.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for heirloom-ed
 # $Id: heirloom-ed.SlackBuild,v 1.4 2018/10/02 19:09:22 pomf Exp pomf $
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=heirloom-ed
 VERSION=${VERSION:-070715}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 _PRGNAM=heirloom
 
 if [ -z "$ARCH" ]; then
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -111,4 +121,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/heirloom-pax/heirloom-pax.SlackBuild b/system/heirloom-pax/heirloom-pax.SlackBuild
index 14f8e221d6..30ac082e2a 100644
--- a/system/heirloom-pax/heirloom-pax.SlackBuild
+++ b/system/heirloom-pax/heirloom-pax.SlackBuild
@@ -1,29 +1,38 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for heirloom-pax
 
 # Written by ruario <sbo@ruari.com>
 
+# 20220211 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=heirloom-pax
 VERSION=${VERSION:-070715}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -47,9 +56,13 @@ cd heirloom-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
+
+# 20220211 bkw: 15.0 needs this:
+sed -i 's,mkdev\.h,sysmacros.h,' cpio/cpio.c
+SLKCFLAGS+=" -fcommon"
 
 # Patch the paths in the man page to use /usr/lib/heirloom/bin, rather
 # than /usr/5bin (where the upstream maintainer suggests). This is
@@ -100,4 +113,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/heirloom-sh/heirloom-sh-glibc-2.34.patch b/system/heirloom-sh/heirloom-sh-glibc-2.34.patch
new file mode 100644
index 0000000000..35cb565526
--- /dev/null
+++ b/system/heirloom-sh/heirloom-sh-glibc-2.34.patch
@@ -0,0 +1,18 @@
+--- a/fault.c
++++ b/fault.c
+@@ -43,6 +43,15 @@
+ #include	<errno.h>
+ #include	<string.h>
+ 
++#if __GLIBC__ >= 2
++# undef SIGSTKSZ
++# if defined __ia64__
++#  define SIGSTKSZ 262144
++# else
++#  define SIGSTKSZ 65536
++# endif
++#endif
++
+ static	void (*psig0_func)() = SIG_ERR;	/* previous signal handler for signal 0 */
+ static	char sigsegv_stack[SIGSTKSZ];
+ 
diff --git a/system/heirloom-sh/heirloom-sh.SlackBuild b/system/heirloom-sh/heirloom-sh.SlackBuild
index a644d415e7..ce9edf218e 100644
--- a/system/heirloom-sh/heirloom-sh.SlackBuild
+++ b/system/heirloom-sh/heirloom-sh.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for heirloom-sh
 # Written by slakmagik <slakmagik@gmail.com>
 # Released under the WTFPL
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=heirloom-sh
 VERSION=${VERSION:-050706}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -51,6 +61,8 @@ find -L . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
   -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p1 < $CWD/heirloom-sh-glibc-2.34.patch
+
 # configure is the worst way to build a package except for all the others
 # 1. make static changes to the makefile with a patch
 patch -p1 < $CWD/makefile.patch
@@ -75,4 +87,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/helvum/README b/system/helvum/README
new file mode 100644
index 0000000000..0be1b3aaa1
--- /dev/null
+++ b/system/helvum/README
@@ -0,0 +1,2 @@
+Helvum is a GTK-based patchbay for pipewire, inspired by the JACK
+tool [catia].
diff --git a/system/helvum/doinst.sh b/system/helvum/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/system/helvum/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/helvum/helvum.SlackBuild b/system/helvum/helvum.SlackBuild
new file mode 100644
index 0000000000..693a3a80a3
--- /dev/null
+++ b/system/helvum/helvum.SlackBuild
@@ -0,0 +1,170 @@
+#!/bin/bash
+
+# Slackware build script for helvum
+
+# Copyright 2023 Lockywolf
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=helvum
+VERSION=${VERSION:-0.4.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+sed -i "2acargo_options += [ '--offline' ]" src/meson.build
+sed -i "2acargo_options += [ '--verbose' ]" src/meson.build
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+  meson \
+    --prefix=/usr \
+    --mandir=man \
+    --datadir=share \
+    --libdir=lib${LIBDIRSUFFIX} \
+  build
+
+(
+  mkdir .cargo
+  cat << EOF >> .cargo/config
+[source.crates-io]
+registry = 'https://github.com/rust-lang/crates.io-index'
+replace-with = 'vendored-sources'
+
+[source.vendored-sources]
+directory = '$(pwd)/vendor'
+EOF
+  # deps and versions come from Cargo.lock
+  mkdir vendor
+  (
+    cd vendor
+
+    grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
+      sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
+      awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \
+      grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do
+
+      ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
+      dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
+
+      tar xvf $CWD/$dep-$ver.crate
+
+      touch $dep-$ver/.cargo-ok
+
+      # generate checksum
+      {
+        printf "{\n"
+        printf '    "files": {\n'
+
+        (
+          cd $dep-$ver
+          find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/'
+        ) | sed '$ s/,$//'
+
+        printf "    },\n"
+        printf '    "package": "'
+
+        sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
+
+        printf "}\n"
+      } > $dep-$ver/.cargo-checksum.json
+    done
+  )
+  cd build
+  ln -s ../.cargo
+  ln -s ../vendor
+)
+
+  ninja -C build
+  DESTDIR=$PKG ninja -C build install
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/helvum/helvum.info b/system/helvum/helvum.info
new file mode 100644
index 0000000000..7ca4bedf77
--- /dev/null
+++ b/system/helvum/helvum.info
@@ -0,0 +1,244 @@
+PRGNAM="helvum"
+VERSION="0.4.0"
+HOMEPAGE="https://gitlab.freedesktop.org/pipewire/helvum/"
+DOWNLOAD="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/0.4.0/helvum-0.4.0.tar.gz \
+https://static.crates.io/crates/anyhow/anyhow-1.0.69.crate \
+https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \
+https://static.crates.io/crates/bindgen/bindgen-0.64.0.crate \
+https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \
+https://static.crates.io/crates/cairo-rs/cairo-rs-0.17.0.crate \
+https://static.crates.io/crates/cairo-sys-rs/cairo-sys-rs-0.17.0.crate \
+https://static.crates.io/crates/cc/cc-1.0.79.crate \
+https://static.crates.io/crates/cexpr/cexpr-0.6.0.crate \
+https://static.crates.io/crates/cfg-expr/cfg-expr-0.11.0.crate \
+https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+https://static.crates.io/crates/clang-sys/clang-sys-1.4.0.crate \
+https://static.crates.io/crates/cookie-factory/cookie-factory-0.3.2.crate \
+https://static.crates.io/crates/errno-dragonfly/errno-dragonfly-0.1.2.crate \
+https://static.crates.io/crates/errno/errno-0.3.0.crate \
+https://static.crates.io/crates/field-offset/field-offset-0.3.4.crate \
+https://static.crates.io/crates/futures-channel/futures-channel-0.3.26.crate \
+https://static.crates.io/crates/futures-core/futures-core-0.3.26.crate \
+https://static.crates.io/crates/futures-executor/futures-executor-0.3.26.crate \
+https://static.crates.io/crates/futures-io/futures-io-0.3.26.crate \
+https://static.crates.io/crates/futures-macro/futures-macro-0.3.26.crate \
+https://static.crates.io/crates/futures-task/futures-task-0.3.26.crate \
+https://static.crates.io/crates/futures-util/futures-util-0.3.26.crate \
+https://static.crates.io/crates/gdk-pixbuf-sys/gdk-pixbuf-sys-0.17.0.crate \
+https://static.crates.io/crates/gdk-pixbuf/gdk-pixbuf-0.17.0.crate \
+https://static.crates.io/crates/gdk4-sys/gdk4-sys-0.6.0.crate \
+https://static.crates.io/crates/gdk4/gdk4-0.6.0.crate \
+https://static.crates.io/crates/gio-sys/gio-sys-0.17.0.crate \
+https://static.crates.io/crates/gio/gio-0.17.0.crate \
+https://static.crates.io/crates/glib-macros/glib-macros-0.17.0.crate \
+https://static.crates.io/crates/glib-sys/glib-sys-0.17.0.crate \
+https://static.crates.io/crates/glib/glib-0.17.0.crate \
+https://static.crates.io/crates/glob/glob-0.3.1.crate \
+https://static.crates.io/crates/gobject-sys/gobject-sys-0.17.0.crate \
+https://static.crates.io/crates/graphene-rs/graphene-rs-0.17.0.crate \
+https://static.crates.io/crates/graphene-sys/graphene-sys-0.17.0.crate \
+https://static.crates.io/crates/gsk4-sys/gsk4-sys-0.6.0.crate \
+https://static.crates.io/crates/gsk4/gsk4-0.6.0.crate \
+https://static.crates.io/crates/gtk4-macros/gtk4-macros-0.6.0.crate \
+https://static.crates.io/crates/gtk4-sys/gtk4-sys-0.6.0.crate \
+https://static.crates.io/crates/gtk4/gtk4-0.6.0.crate \
+https://static.crates.io/crates/hashbrown/hashbrown-0.12.3.crate \
+https://static.crates.io/crates/heck/heck-0.4.1.crate \
+https://static.crates.io/crates/indexmap/indexmap-1.9.2.crate \
+https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \
+https://static.crates.io/crates/lazycell/lazycell-1.3.0.crate \
+https://static.crates.io/crates/libc/libc-0.2.139.crate \
+https://static.crates.io/crates/libspa-sys/libspa-sys-0.6.0.crate \
+https://static.crates.io/crates/libspa/libspa-0.6.0.crate \
+https://static.crates.io/crates/log/log-0.4.17.crate \
+https://static.crates.io/crates/memchr/memchr-2.5.0.crate \
+https://static.crates.io/crates/memoffset/memoffset-0.6.5.crate \
+https://static.crates.io/crates/memoffset/memoffset-0.7.1.crate \
+https://static.crates.io/crates/minimal-lexical/minimal-lexical-0.2.1.crate \
+https://static.crates.io/crates/nix/nix-0.26.2.crate \
+https://static.crates.io/crates/nom8/nom8-0.2.0.crate \
+https://static.crates.io/crates/nom/nom-7.1.3.crate \
+https://static.crates.io/crates/once_cell/once_cell-1.17.0.crate \
+https://static.crates.io/crates/pango-sys/pango-sys-0.17.0.crate \
+https://static.crates.io/crates/pango/pango-0.17.0.crate \
+https://static.crates.io/crates/peeking_take_while/peeking_take_while-0.1.2.crate \
+https://static.crates.io/crates/pest/pest-2.5.5.crate \
+https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.9.crate \
+https://static.crates.io/crates/pin-utils/pin-utils-0.1.0.crate \
+https://static.crates.io/crates/pipewire-sys/pipewire-sys-0.6.0.crate \
+https://static.crates.io/crates/pipewire/pipewire-0.6.0.crate \
+https://static.crates.io/crates/pkg-config/pkg-config-0.3.26.crate \
+https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-1.3.0.crate \
+https://static.crates.io/crates/proc-macro-error-attr/proc-macro-error-attr-1.0.4.crate \
+https://static.crates.io/crates/proc-macro-error/proc-macro-error-1.0.4.crate \
+https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.51.crate \
+https://static.crates.io/crates/quote/quote-1.0.23.crate \
+https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.28.crate \
+https://static.crates.io/crates/regex/regex-1.7.1.crate \
+https://static.crates.io/crates/rustc-hash/rustc-hash-1.1.0.crate \
+https://static.crates.io/crates/rustc_version/rustc_version-0.3.3.crate \
+https://static.crates.io/crates/semver-parser/semver-parser-0.10.2.crate \
+https://static.crates.io/crates/semver/semver-0.11.0.crate \
+https://static.crates.io/crates/serde/serde-1.0.152.crate \
+https://static.crates.io/crates/shlex/shlex-1.1.0.crate \
+https://static.crates.io/crates/slab/slab-0.4.7.crate \
+https://static.crates.io/crates/smallvec/smallvec-1.10.0.crate \
+https://static.crates.io/crates/static_assertions/static_assertions-1.1.0.crate \
+https://static.crates.io/crates/syn/syn-1.0.107.crate \
+https://static.crates.io/crates/system-deps/system-deps-6.0.3.crate \
+https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.38.crate \
+https://static.crates.io/crates/thiserror/thiserror-1.0.38.crate \
+https://static.crates.io/crates/toml/toml-0.5.11.crate \
+https://static.crates.io/crates/toml_datetime/toml_datetime-0.5.1.crate \
+https://static.crates.io/crates/toml_edit/toml_edit-0.18.1.crate \
+https://static.crates.io/crates/ucd-trie/ucd-trie-0.1.5.crate \
+https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.6.crate \
+https://static.crates.io/crates/version-compare/version-compare-0.1.1.crate \
+https://static.crates.io/crates/version_check/version_check-0.9.4.crate \
+https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+https://static.crates.io/crates/winapi/winapi-0.3.9.crate \
+https://static.crates.io/crates/windows-sys/windows-sys-0.45.0.crate \
+https://static.crates.io/crates/windows-targets/windows-targets-0.42.1.crate \
+https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.42.1.crate \
+https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.42.1.crate \
+https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.42.1.crate \
+https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.42.1.crate \
+https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.42.1.crate \
+https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.42.1.crate \
+https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.42.1.crate \
+https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \
+https://static.crates.io/crates/hashbrown/hashbrown-0.12.3.crate \
+https://static.crates.io/crates/indexmap/indexmap-1.9.2.crate \
+https://static.crates.io/crates/itoa/itoa-1.0.5.crate \
+https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.50.crate \
+https://static.crates.io/crates/quote/quote-1.0.23.crate \
+https://static.crates.io/crates/ryu/ryu-1.0.12.crate \
+https://static.crates.io/crates/serde/serde-1.0.152.crate \
+https://static.crates.io/crates/serde_derive/serde_derive-1.0.152.crate \
+https://static.crates.io/crates/serde_json/serde_json-1.0.91.crate \
+https://static.crates.io/crates/syn/syn-1.0.107.crate \
+https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.6.crate"
+MD5SUM="55eefd768bf7790d0b8adce257647550 \
+ee4e2682a0fe87a36210b97aea8b9634 \
+05d77ef52e90ad161fdd41b252420467 \
+24e971eeb92885a125addf04b5661de4 \
+a295edb6953237ebbdfa8e731229f9a3 \
+899ea6bce8f704ca9d5e90878179e3a8 \
+20bceb66cef4cc995d004267009e6a49 \
+7d83f411bb22318c65fec8bbee937ece \
+10b68ba1e7093d889e9198dcd0ea2a3e \
+ea38f5bb1eaab6580d9ac0d41b230ed1 \
+74634128440dbc3766bda76fdf0aaa05 \
+7c28deaed5c3327645cffe40430aecf0 \
+dbee0eb3f89998861d4b3e83783c95d4 \
+fc65414dcac661c46f2cfad7722304f9 \
+de1bb7e293f523c2b891ecafcd57fad9 \
+52f1c0adc1d0fb68e8608b8c4faa3c71 \
+33c6a65a07354886102e917783ba4e13 \
+5329468d3efc2b43dd628f8bdb4397e5 \
+50217439ab76fc1ee930bf4df3804799 \
+af48680d31f067c33ef15f9a2a91c713 \
+d641a02cecdf39645bef945598d49b35 \
+53030efc4eb919791407c0b49790ffc3 \
+49ccc67d2ee6e8506790f4bb551340bc \
+0d0c5c91c20090babcfe008a5c59a490 \
+e567b304bfe4a274f7e974bd4c63ec3c \
+0cec39953242b532648f356dba65d0a0 \
+bd1291c8e5cb564d5418e874814c774e \
+069aa7ed2552b2623af2a8e282baffb0 \
+8290950f13be0f28845795158c343ce7 \
+c3cc5ed6f0e73bd1817a65d17d2369ea \
+0c938328d6424744c46943938ed6a4ee \
+ba642593ad7dd27d62c939c4d94100f6 \
+2d6d28ec311884da69bcaf320ada8ad5 \
+276a77a39cba360dfb2f45df2d71be9a \
+d1cdb1ad0784ca3d05264948d0e0b24a \
+e4abcad3267eb3d01687e21d46992235 \
+dc1e00a2654c3b921658d01e1c617539 \
+acf918834a1556abdbcda627816f3ff3 \
+b9f1f29a4012cc3c7bce83511f40c5b5 \
+f4e9294066cbc6503b6e0ef703a6b565 \
+b7557b3029e7caa9727b06ebd861391d \
+1b41b97d982520b7364a87a39e2a1ed8 \
+b92fa50f56a1e06a7f1bf665442d4a73 \
+7e70355483fc2559770b4db2ff32bcde \
+fba3b040a55c01be7376d3dd5c4d4920 \
+23cc9e52c52465f5b225e62ab7cc3457 \
+2f4991ee29e75b732dbfbbe637506066 \
+cc4ae3a0093fb6340c96a1689127772e \
+5cbece7829424c52711a02f29af06fc1 \
+b31bf94ffe7e0f2ada93afae1076eaeb \
+94b8bf179385ff071bdc33b58bf047c0 \
+76124c2327f642cddf19a4aa50cbcb7d \
+48e7cc866f45af55ea3f627e29a2cd98 \
+8b708bc4b33c5e1683467444c9ed41b0 \
+580f8f88379ff0678e8336a781dda55d \
+8e44066df6dc8663faaab84eddabf721 \
+f17aecb8887cf0ecd823623160aed7db \
+dc9b023a3d3833fa5a853d950b54d944 \
+6475ac2c917c96d375eb56f1761eea0a \
+18d9fbe67f19564599ed55389e357232 \
+7e264bc8f23a45ad680668cb5e57d9fd \
+655de4844e5024d64d6c45296ec1ba42 \
+ce6dde2ea2691fdd97632fb8c9b3e042 \
+07c75fec267864bcbb800ca7709ceae2 \
+463b216008ff8592582a551860879ad6 \
+dcda252a73e42cb8fccb60e7e35b847a \
+57a5575d623bcbc7ba5c033c9f87744f \
+517af3607e2042ad806635bec4b1780e \
+7d76a523677de261dda1b65d29a93c4e \
+6a32bab57772c3a1146d599b65ffb0cb \
+cd9614d4d4afcfe5e26c118a42120d40 \
+41defdffa40e7cbcc7e17a933c5660ab \
+39cfd27d1728af99cbae763b4f81acd3 \
+267efbd05da2900424b1fa6e841d1280 \
+7b1261ea730a9314bc9bcdf4a379bf98 \
+93aeba00993f0ed8c474864e455cf584 \
+42408be0352a76b14f1e77a6b8858a77 \
+d2cc4e584ed64165fc56d2c9081eb3ee \
+2d82330c9f218f42ccc9e44c2d18ff8f \
+0bfb08b9dd5df72ba5ed7d74dd5fe6eb \
+9b7ebf6b588afaad70bf48a742973a30 \
+a8014a7c865aa54f305e8cda3ef02019 \
+c9defe80406280bcfce4ecf31c0200b3 \
+8efa8e23cddda0540efe4ba8ff60840b \
+f05de931658b166a05c5520720fdba07 \
+44e45d4d9b0904fd06d6f46107eda592 \
+3d2277774414ad0f59584e7021b9be06 \
+b21820f2664242498beba7783b32bef4 \
+7a55379fb7eaef176e373798441e7836 \
+bc4ac3f5c142859e5dfeb45a31866eeb \
+11ad59bd731103e90d688afc5f35271b \
+e522898b2cb1fd23af2695324b3a5c78 \
+d4e6a3f2d7286408592d08defd7de156 \
+d18d362345c4fe512ef67b738b239fb8 \
+db96b50050277bf05a3c68534bbb9586 \
+09de9d01e7331ff3da11f58be8bef0df \
+0498c4a11448bfc35dc7bb2caa64c753 \
+b58284cb8ce52b8de07e09f4f8fb9653 \
+25cf36fbb4f7adb02f3d9fa24ccaef4f \
+5ac131337793334dce7adbf1116671b3 \
+8f5702706600f24bf7332043c15aa566 \
+dd86cb477e0b0b1411a5c92cba244b42 \
+0f6b457ea783c088dff026ce39ce72ca \
+23d20707b55228cb9b4328a26ddca724 \
+62e05b432403f316d86f7af8af0839e3 \
+8893d419a205b225e4010d7d02a15c6a \
+05d77ef52e90ad161fdd41b252420467 \
+1b41b97d982520b7364a87a39e2a1ed8 \
+7e70355483fc2559770b4db2ff32bcde \
+f2ffcbe94a83f2437ffe47d7dbf4ad04 \
+8bdfbb49abd69676d191a0033ab1c8b7 \
+41defdffa40e7cbcc7e17a933c5660ab \
+4ca29f2ce41fb9f282c527c1d8ae5cc4 \
+2d82330c9f218f42ccc9e44c2d18ff8f \
+3338953ce1388e5ff5fef5aac76ab1f5 \
+4da6e91a5a30bc8163694b0809798d0e \
+8efa8e23cddda0540efe4ba8ff60840b \
+e522898b2cb1fd23af2695324b3a5c78"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="rust16"
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.helvum_2023-09-23@lockywolf.net"
diff --git a/system/helvum/slack-desc b/system/helvum/slack-desc
new file mode 100644
index 0000000000..c266992923
--- /dev/null
+++ b/system/helvum/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+helvum: helvum (GTK-based patchbay for pipewire)
+helvum:
+helvum: Helvum is a GTK-based patchbay for pipewire, inspired by the JACK
+helvum: tool [catia].
+helvum:
+helvum:
+helvum:
+helvum:
+helvum:
+helvum:
+helvum:
diff --git a/system/hercules/hercules.SlackBuild b/system/hercules/hercules.SlackBuild
index 4212548092..d276e607d6 100644
--- a/system/hercules/hercules.SlackBuild
+++ b/system/hercules/hercules.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Hercules:
 # the System/370, ESA/390 and z/Architecture  emulator
@@ -6,26 +6,36 @@
 # Written by Niels Horn - niels.horn@gmail.com
 # revision date 2010/03/10
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hercules
-VERSION=${VERSION:-3.07}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.13}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
   ARCHQUADLET=""
 elif [ "$ARCH" = "i686" ]; then
@@ -90,7 +100,7 @@ cat $CWD/hercules.png > $PKG/usr/share/pixmaps/hercules.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
 cp -a \
-  ABOUT-NLS CHANGES COPYRIGHT INSTALL README.* RELEASE.NOTES \
+  COPYRIGHT INSTALL README.* RELEASE.NOTES \
     $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -101,9 +111,11 @@ mv $PKG/usr/share/hercules/*.{html,css} $PKG/usr/doc/$PRGNAM-$VERSION/html/
 mv $PKG/usr/share/hercules/images $PKG/usr/doc/$PRGNAM-$VERSION/html/
 mv $PKG/usr/share/hercules/include $PKG/usr/doc/$PRGNAM-$VERSION/html/
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hercules/hercules.info b/system/hercules/hercules.info
index 717ea6ba93..8f14fd8273 100644
--- a/system/hercules/hercules.info
+++ b/system/hercules/hercules.info
@@ -1,8 +1,8 @@
 PRGNAM="hercules"
-VERSION="3.07"
-HOMEPAGE="http://www.hercules-390.org/"
-DOWNLOAD="http://www.ibiblio.org/jmaynard/herc307/hercules-3.07.tar.gz"
-MD5SUM="a12aa1645b0695b25b7fc0c9a3ccab3a"
+VERSION="3.13"
+HOMEPAGE="http://www.hercules-390.eu/"
+DOWNLOAD="http://downloads.hercules-390.eu/hercules-3.13.tar.gz"
+MD5SUM="3e5df336b4e787cbb78f3489e71971fb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/herculesstudio/README b/system/herculesstudio/README
index 07c371fb8e..db67dd5bf9 100644
--- a/system/herculesstudio/README
+++ b/system/herculesstudio/README
@@ -1 +1,5 @@
-Hercules Studio is a GUI front-end for Linux to the Hercules Emulator.
+herculesstudio (Hercules GUI for Linux)
+
+Hercules Studio is a GUI front-end to the Hercules Emulator. As such,
+it requires the actual emulator to be installed and operational in
+order for Hercules Studio to be functional.
diff --git a/system/herculesstudio/doinst.sh b/system/herculesstudio/doinst.sh
index 4e8ba7071d..3e5691a052 100644
--- a/system/herculesstudio/doinst.sh
+++ b/system/herculesstudio/doinst.sh
@@ -2,3 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/herculesstudio/herculesstudio.SlackBuild b/system/herculesstudio/herculesstudio.SlackBuild
index 4d078e6705..dbed3a8a96 100644
--- a/system/herculesstudio/herculesstudio.SlackBuild
+++ b/system/herculesstudio/herculesstudio.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for herculesstudio
 # a GUI for the Hercules Emulator
@@ -23,30 +23,40 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# revision date 2013/03/25
+# 20220211 bkw: Modified by SlackBuilds.org, BUILD=2.
+# - fix build on 15.0: add qt4 as a dep now that we have it.
+# - new-style icons.
+# - i486 => i586.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=herculesstudio
 VERSION=${VERSION:-1.4.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 PRGUNTARRED=HerculesStudio
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -70,11 +80,12 @@ cd $PRGUNTARRED
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
-qmake
+# 20220211 bkw: this is all we needed to make it use qt4 instead of qt5.
+qmake-qt4
 
 # Accept our CXXFLAGS
 sed -i "/^CXXFLAGS/s/=/+=/" Makefile.Release
@@ -83,19 +94,26 @@ sed -i "/^CXXFLAGS/s/=/+=/" Makefile.Release
 CXXFLAGS="$SLKCFLAGS" \
   make CXX=g++
 make install INSTALL_ROOT=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Copy icon & desktop file to package
-mkdir -p $PKG/usr/share/{applications,pixmaps}
+strip $PKG/usr/bin/$PRGUNTARRED
+
+# 20220211 bkw: new-style icons, extracted from hercstudio.icns in source.
+for i in $CWD/icons/*.png; do
+  px="$( basename $i | cut -d. -f1 )"
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  cat $i > $dir/$PRGNAM.png
+done
+
+# 20220211 bkw: old-style icon, just a symlink.
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING INSTALL INSTALL-BIN \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -103,4 +121,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/herculesstudio/herculesstudio.info b/system/herculesstudio/herculesstudio.info
index 5ef87cdb22..4eaf57b7f9 100644
--- a/system/herculesstudio/herculesstudio.info
+++ b/system/herculesstudio/herculesstudio.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://ftp.mirrorservice.org/sites/download.salixos.org/i486/extra-14
 MD5SUM="58d6643a97ce80df44bf655a5ac23c6c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="hercules"
+REQUIRES="hercules qt4"
 MAINTAINER="Niels Horn"
 EMAIL="niels.horn@gmail.com"
diff --git a/system/herculesstudio/herculesstudio.png b/system/herculesstudio/herculesstudio.png
deleted file mode 100644
index feae70b4c4..0000000000
--- a/system/herculesstudio/herculesstudio.png
+++ /dev/null
diff --git a/system/herculesstudio/icons/128.png b/system/herculesstudio/icons/128.png
new file mode 100644
index 0000000000..6d704e7584
--- /dev/null
+++ b/system/herculesstudio/icons/128.png
diff --git a/system/herculesstudio/icons/16.png b/system/herculesstudio/icons/16.png
new file mode 100644
index 0000000000..6155b61ab3
--- /dev/null
+++ b/system/herculesstudio/icons/16.png
diff --git a/system/herculesstudio/icons/256.png b/system/herculesstudio/icons/256.png
new file mode 100644
index 0000000000..c63d3eda3d
--- /dev/null
+++ b/system/herculesstudio/icons/256.png
diff --git a/system/herculesstudio/icons/32.png b/system/herculesstudio/icons/32.png
new file mode 100644
index 0000000000..ce3dc9f102
--- /dev/null
+++ b/system/herculesstudio/icons/32.png
diff --git a/system/herculesstudio/icons/48.png b/system/herculesstudio/icons/48.png
new file mode 100644
index 0000000000..5be0cbeee4
--- /dev/null
+++ b/system/herculesstudio/icons/48.png
diff --git a/system/herculesstudio/slack-desc b/system/herculesstudio/slack-desc
index 740342c04e..4539b78c3d 100644
--- a/system/herculesstudio/slack-desc
+++ b/system/herculesstudio/slack-desc
@@ -8,11 +8,11 @@
               |-----handy-ruler------------------------------------------------------|
 herculesstudio: herculesstudio (Hercules GUI for Linux)
 herculesstudio:
-herculesstudio: Hercules Studio is a GUI front-end to the Hercules Emulator.
-herculesstudio: As such, it requires the actual emulator to be installed and
-herculesstudio: operational in order for Hercules Studio to be functional.
+herculesstudio: Hercules Studio is a GUI front-end to the Hercules Emulator. As such,
+herculesstudio: it requires the actual emulator to be installed and operational in
+herculesstudio: order for Hercules Studio to be functional.
+herculesstudio:
 herculesstudio:
-herculesstudio: Homepage: http://www.mvsdasd.org/herculesstudio/
 herculesstudio:
 herculesstudio:
 herculesstudio:
diff --git a/system/hexcompare/README b/system/hexcompare/README
new file mode 100644
index 0000000000..6d2c82d94c
--- /dev/null
+++ b/system/hexcompare/README
@@ -0,0 +1 @@
+hexcompare is a console-mode visual binary diff.
diff --git a/system/hexcompare/hexcompare.SlackBuild b/system/hexcompare/hexcompare.SlackBuild
new file mode 100644
index 0000000000..ee5472220c
--- /dev/null
+++ b/system/hexcompare/hexcompare.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# Slackware build script for hexcompare
+
+# Copyright 2022 xaizek <xaizek@posteo.net>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=hexcompare
+VERSION=${VERSION:-1.0.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make CFLAGS="$SLKCFLAGS"
+
+install -D hexcompare "$PKG/usr/bin/hexcompare"
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hexcompare/hexcompare.info b/system/hexcompare/hexcompare.info
new file mode 100644
index 0000000000..b74071ecb7
--- /dev/null
+++ b/system/hexcompare/hexcompare.info
@@ -0,0 +1,10 @@
+PRGNAM="hexcompare"
+VERSION="1.0.4"
+HOMEPAGE="https://sourceforge.net/projects/hexcompare/"
+DOWNLOAD="https://downloads.sourceforge.net/hexcompare/hexcompare-1.0.4.tar.gz"
+MD5SUM="0d0ba5b424c343edf636cc3513336131"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="xaizek"
+EMAIL="xaizek@posteo.net"
diff --git a/system/hexcompare/slack-desc b/system/hexcompare/slack-desc
new file mode 100644
index 0000000000..f12a9436ca
--- /dev/null
+++ b/system/hexcompare/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+hexcompare: hexcompare (console-mode visual binary diff)
+hexcompare:
+hexcompare: hexcompare is a curses-based utility to compare and identify
+hexcompare: differences between two binary files. These differences are then
+hexcompare: represented visually with an interactive block diagram.
+hexcompare:
+hexcompare:
+hexcompare:
+hexcompare:
+hexcompare:
+hexcompare:
diff --git a/system/hexec/hexec.SlackBuild b/system/hexec/hexec.SlackBuild
index eebdeeefcd..b0e0e68066 100644
--- a/system/hexec/hexec.SlackBuild
+++ b/system/hexec/hexec.SlackBuild
@@ -1,15 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hexec
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hexec
 VERSION=${VERSION:-0.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +22,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -63,10 +70,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --enable-shared \
   --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
+rm -f $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/*.la
 gzip $PKG/usr/man/man?/*.?
 
 # NEWS and README are 0-byte placeholders. GNU thinks it can force
@@ -79,4 +89,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hexec/hexec.info b/system/hexec/hexec.info
index 38aa37ca5f..bc891f8457 100644
--- a/system/hexec/hexec.info
+++ b/system/hexec/hexec.info
@@ -1,10 +1,10 @@
 PRGNAM="hexec"
 VERSION="0.2.1"
 HOMEPAGE="https://packages.debian.org/sid/hexec"
-DOWNLOAD="http://deb.debian.org/debian/pool/main/h/hexec/hexec_0.2.1.orig.tar.gz"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/h/hexec/hexec_0.2.1.orig.tar.gz"
 MD5SUM="ceec7e57107efecf10d943137b0f5180"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/hfsprogs/hfsprogs.SlackBuild b/system/hfsprogs/hfsprogs.SlackBuild
index fc537084c3..7c8046149c 100644
--- a/system/hfsprogs/hfsprogs.SlackBuild
+++ b/system/hfsprogs/hfsprogs.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hfsprogs
 
@@ -22,11 +22,18 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230802 bkw: Modified by SlackBuilds.org: fix github filename mess.
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2: strip binaries.
+# 20220211 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hfsprogs
 SRCNAM=diskdev_cmds
 VERSION=${VERSION:-332.25}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,29 +71,34 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+
+# 20230802 bkw: yes, we really do need $SRCNAM-$SRCNAM...
+rm -rf $SRCNAM-$SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # patches mostly from Debian
 for patch in $CWD/patches/*.patch; do
   patch -p1 < $patch
 done
 
+# 20220211 bkw: this header no longer exists.
+sed -i '/#include.*sys\/sysctl\.h/d' */*.c
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 make -f Makefile.lnx
 
 # Copy executable files
 install -m 755 -d $PKG/sbin
-install -m 755 newfs_hfs.tproj/newfs_hfs $PKG/sbin/mkfs.hfsplus
-install -m 755 fsck_hfs.tproj/fsck_hfs $PKG/sbin/fsck.hfsplus
+install -s -m 755 newfs_hfs.tproj/newfs_hfs $PKG/sbin/mkfs.hfsplus
+install -s -m 755 fsck_hfs.tproj/fsck_hfs $PKG/sbin/fsck.hfsplus
 
 # Copy shared data
 install -m 755 -d $PKG/usr/share/$PRGNAM
@@ -103,4 +119,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hfsprogs/hfsprogs.info b/system/hfsprogs/hfsprogs.info
index d947ad64c7..3c3ee5efbc 100644
--- a/system/hfsprogs/hfsprogs.info
+++ b/system/hfsprogs/hfsprogs.info
@@ -1,8 +1,8 @@
 PRGNAM="hfsprogs"
 VERSION="332.25"
 HOMEPAGE="https://opensource.apple.com"
-DOWNLOAD="https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-332.25.tar.gz"
-MD5SUM="261c3de5ec0dcf5244e3f60d79c1d6f1"
+DOWNLOAD="https://github.com/apple-oss-distributions/diskdev_cmds/archive/diskdev_cmds-332.25/diskdev_cmds-diskdev_cmds-332.25.tar.gz"
+MD5SUM="610080ff02859685c268e1d0ad49f223"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libbsd"
diff --git a/system/aqemu/doinst.sh b/system/hime/doinst.sh
index 5fb28930db..5fb28930db 100644
--- a/system/aqemu/doinst.sh
+++ b/system/hime/doinst.sh
diff --git a/system/hime/hime.SlackBuild b/system/hime/hime.SlackBuild
index 4c9f20417c..b09b128b0f 100644
--- a/system/hime/hime.SlackBuild
+++ b/system/hime/hime.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hime
 
@@ -22,46 +22,72 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220211 bkw: Modified by SlackBuilds.org: BUILD=2
+# - fix 15.0 build.
+# - i486 => i586.
+# - add missing SLKCFLAGS stanza.
+# - use correct github download URL.
+# - thou shalt not write to $CWD!
+# - add missing docs (README, AUTHORS, etc).
+# - cat the SlackBuild to the doc dir.
+# - fix the icon in the .desktop file.
+# - add doinst.sh (update-desktop-database).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hime
 VERSION=${VERSION:-0.9.10}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
-
-SRCNAM="$(echo $PRGNAM | cut -d- -f2-)"
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-
-if [ -e $CWD/v$VERSION.tar.gz ]; then
-  mv $CWD/v$VERSION.tar.gz $CWD/$SRCNAM-$VERSION.tar.gz
-fi
-
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
+SLKCFLAGS+=" -fcommon"
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -70,23 +96,37 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 make
 make install DESTDIR=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find $PKG -type f -a -print0 | \
+  xargs -0 file -m /etc/file/magic/elf | \
+  grep -e "executable" -e "shared object" | \
+  grep ELF | \
+  cut -f 1 -d : | \
+  xargs strip --strip-unneeded 2> /dev/null || true
 
-rm -rf $PKG/usr/share/doc
 mv $PKG/usr/share/man $PKG/usr/man
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip -9 $PKG/usr/man/man*/*
+rm -rf $PKG/usr/share/doc
+
+# 20220211 bkw: icon isn't in a theme in /usr/share/icons so it needs
+# the full path in the .desktop.
+sed -i '/^Icon=/s,=,=/usr/share/pixmaps/hime.png,' \
+  $PKG/usr/share/applications/hime-setup.desktop
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS ChangeLog README *.txt $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install $PKG/etc/profile.d
-cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/hime.sh > $PKG/etc/profile.d/hime.sh
 cat $CWD/hime.csh > $PKG/etc/profile.d/hime.csh
 
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hime/hime.info b/system/hime/hime.info
index c72cbe33df..f7ff335472 100644
--- a/system/hime/hime.info
+++ b/system/hime/hime.info
@@ -1,7 +1,7 @@
 PRGNAM="hime"
 VERSION="0.9.10"
 HOMEPAGE="http://hime-ime.github.io/"
-DOWNLOAD="https://github.com/hime-ime/hime/archive/v0.9.10.tar.gz"
+DOWNLOAD="https://github.com/hime-ime/hime/archive/v0.9.10/hime-0.9.10.tar.gz"
 MD5SUM="132b9d764ca50e3affa41b8e0bc93720"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/hivex/README b/system/hivex/README
new file mode 100644
index 0000000000..d3811a0262
--- /dev/null
+++ b/system/hivex/README
@@ -0,0 +1,8 @@
+libhivex is a self-contained library for
+reading and writing Windows Registry "hive" binary files.
+
+Unlike many other tools in this area,
+it doesn't use the textual .REG format for output, because parsing
+that is as much trouble as parsing the original binary format. Instead
+it makes the file available through a C API, or there is a
+separate program to export the hive as XML.
diff --git a/system/hivex/changelog b/system/hivex/changelog
new file mode 100644
index 0000000000..8e624d1205
--- /dev/null
+++ b/system/hivex/changelog
@@ -0,0 +1,10 @@
+Changelog for hivex SlackBuild Script
+--------------------------------------------------------------------
+
+27/08/2022:
+
+Added to slackbuilds.org
+
+16/05/2023:
+
+Updated to version 1.3.23
diff --git a/system/hivex/hivex.SlackBuild b/system/hivex/hivex.SlackBuild
new file mode 100644
index 0000000000..46dabea8cf
--- /dev/null
+++ b/system/hivex/hivex.SlackBuild
@@ -0,0 +1,127 @@
+#!/bin/bash
+
+# Slackware build script for hive
+
+# Copyright 2022-2023 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=hivex
+VERSION=${VERSION:-1.3.23}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-march=i586 -mtune=i686 -pipe -O2 -fPIC"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-march=i686 -mtune=i686 -pipe -O2 -fPIC"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-march=x86-64 -mtune=generic -pipe -O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --bindir=/usr/bin \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --disable-rpath \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mv -v $PKG/usr/share/man/man3/*  $PKG/usr/man/man3/
+rm -rvf $PKG/usr/share/man
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod \
+  -o -name ".packlist" \
+  -o -name "*.bs" \
+  | xargs rm -f
+
+
+mkdir -pv  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE FUZZING README.md SECURITY  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hivex/hivex.info b/system/hivex/hivex.info
new file mode 100644
index 0000000000..c5435613a2
--- /dev/null
+++ b/system/hivex/hivex.info
@@ -0,0 +1,10 @@
+PRGNAM="hivex"
+VERSION="1.3.23"
+HOMEPAGE="https://libguestfs.org"
+DOWNLOAD="https://download.libguestfs.org/hivex/hivex-1.3.23.tar.gz"
+MD5SUM="7553678cffda323c7aa327f53ea8146e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="ocaml-findlib ocamlbuild perl-IO-stringy perl-Test-Simple"
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/hivex/slack-desc b/system/hivex/slack-desc
new file mode 100644
index 0000000000..17eb8830b5
--- /dev/null
+++ b/system/hivex/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+hivex: hivex (Windows Registry Extractor System)
+hivex:
+hivex: Hivex is a tool for reading windows registry
+hivex: Hive binary files. It uses C API or exports
+hivex: it to a XML file.
+hivex:
+hivex:
+hivex: Homepage:https://libguestfs.org
+hivex:
+hivex:
+hivex:
diff --git a/system/hntool/hntool.SlackBuild b/system/hntool/hntool.SlackBuild
index 0e33805434..5b770791d8 100644
--- a/system/hntool/hntool.SlackBuild
+++ b/system/hntool/hntool.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for HnTool
 # Written by Diogo Leal <diogo@diogoleal.com>
 # Maintained by Binh Nguyen <binhvng@gmail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hntool
 VERSION=${VERSION:-0.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -72,4 +82,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hp-wmi-sensors/README b/system/hp-wmi-sensors/README
new file mode 100644
index 0000000000..09ab7fb221
--- /dev/null
+++ b/system/hp-wmi-sensors/README
@@ -0,0 +1,36 @@
+hp-wmi-sensors (hwmon sensors driver for HP business-class PCs)
+
+Hewlett-Packard (and some HP Compaq) business-class computers report
+hardware monitoring information via Windows Management Instrumentation
+(WMI). This driver exposes that information to the Linux hwmon
+subsystem, allowing userspace utilities like sensors to gather numeric
+sensor readings.
+
+In particular, it's required on some systems (e.g. the SlackBuild
+author's HP Z2 Mini G3) for fan speeds to be visible in 'sensors'.
+
+Slackware-specific notes:
+
+The driver is a kernel module. By default, it's built for the
+currently running kernel, but you can build it for any kernel version
+if you have that kernel's modules and source installed. Set the KERNEL
+environment variable to the version you want to build for.
+
+After installation, you can load the driver immediately, with:
+
+  /sbin/modprobe hp-wmi-sensors
+
+To load the module on every boot, add the above command to
+/etc/rc.d/rc.modules.local
+
+Note that there's already an hp-wmi module in Slackware's
+kernel-modules package. Loading hp-wmi-sensors will add new sensors,
+if there any supported by the driver. Look at the output of the
+'sensors' command before and after loading the module, to see if it
+found anything supported.
+
+Note to Slackware-current users: this build was developed and
+tested on Slackware 15.0 (latest stable) with the 5.15.x series of
+kernels. It may or may not work on -current. If it doesn't, I don't
+want you to contact me about it *unless* you send me a patch that
+fixes it.
diff --git a/system/hp-wmi-sensors/doinst.sh b/system/hp-wmi-sensors/doinst.sh
new file mode 100644
index 0000000000..b17f2a6739
--- /dev/null
+++ b/system/hp-wmi-sensors/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x sbin/depmod ]; then
+  chroot . /sbin/depmod -a 1> /dev/null 2> /dev/null
+fi
diff --git a/system/hp-wmi-sensors/git2tarxz.sh b/system/hp-wmi-sensors/git2tarxz.sh
new file mode 100644
index 0000000000..9c655890f1
--- /dev/null
+++ b/system/hp-wmi-sensors/git2tarxz.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version number.
+
+# Takes one optional argument, which is the commit or tag to create a
+# tarball of. With no arg, HEAD is used.
+
+# Version number example: 20200227_ad7ec17
+
+# Notes:
+
+# Do not use this if you're packaging a release.
+
+# This script doesn't need to be run as root. It does need to be able
+# to write to the current directory it's run from.
+
+# Running this script twice for the same commit will NOT give identical
+# tarballs, even if the contents are identical. This is because tar
+# includes the current time in a newly-created tarball (plus there may
+# be other git-related reasons).
+
+# Once you've generated a tarball, you'll still need a place to host it.
+# Ask on the mailing list, if you don't have your own web server to
+# play with.
+
+## Config:
+# final tarball and slackbuild PRGNAM:
+PRGNAM=hp-wmi-sensors
+
+# For github projects, you can use this unmodified:
+CLONE_URL=https://github.com/kangtastic/hp-wmi-sensors
+
+## End of config.
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=${DATE}_${GIT_SHA}
+
+# Makefile needs .git to create the version string.
+#rm -rf .git
+#find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=\"$VERSION\""
+echo "MD5SUM=\"$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )\""
diff --git a/system/hp-wmi-sensors/hp-wmi-sensors.SlackBuild b/system/hp-wmi-sensors/hp-wmi-sensors.SlackBuild
new file mode 100644
index 0000000000..ec6007a797
--- /dev/null
+++ b/system/hp-wmi-sensors/hp-wmi-sensors.SlackBuild
@@ -0,0 +1,70 @@
+#!/bin/bash
+
+# Slackware build script for hp-wmi-sensors
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=hp-wmi-sensors
+VERSION=${VERSION:-20240121_e9f92c1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+KERNEL=${KERNEL:-$(uname -r)}
+PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# LIBDIRSUFFIX not needed (modules always go in /lib), and the kernel
+# build system provides its own set of CFLAGS.
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# don't depmod during the build (do it in the doinst.sh).
+sed -i '/depmod/d' Makefile
+
+# don't want ARCH passed to the kernel Makefile, it gets confused if
+# it's set to i586.
+env -u ARCH make TARGET="$KERNEL"
+make install KERNEL_MODULES=$PKG/lib/modules/$KERNEL
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$PKGVER
+mkdir -p $PKGDOC
+cp -a LICENSE README.rst $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hp-wmi-sensors/hp-wmi-sensors.info b/system/hp-wmi-sensors/hp-wmi-sensors.info
new file mode 100644
index 0000000000..6f3b291d78
--- /dev/null
+++ b/system/hp-wmi-sensors/hp-wmi-sensors.info
@@ -0,0 +1,10 @@
+PRGNAM="hp-wmi-sensors"
+VERSION="20240121_e9f92c1"
+HOMEPAGE="https://github.com/kangtastic/hp-wmi-sensors"
+DOWNLOAD="https://slackware.uk/~urchlay/src/hp-wmi-sensors-20240121_e9f92c1.tar.xz"
+MD5SUM="2f80a35ce5e2666e467ba46924792dbe"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/hp-wmi-sensors/slack-desc b/system/hp-wmi-sensors/slack-desc
new file mode 100644
index 0000000000..1eaaa3c4c0
--- /dev/null
+++ b/system/hp-wmi-sensors/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+hp-wmi-sensors: hp-wmi-sensors (hwmon sensors driver for HP business-class PCs)
+hp-wmi-sensors:
+hp-wmi-sensors: Hewlett-Packard (and some HP Compaq) business-class computers report
+hp-wmi-sensors: hardware monitoring information via Windows Management Instrumentation
+hp-wmi-sensors: (WMI). This driver exposes that information to the Linux hwmon
+hp-wmi-sensors: subsystem, allowing userspace utilities like sensors to gather numeric
+hp-wmi-sensors: sensor readings.
+hp-wmi-sensors:
+hp-wmi-sensors: In particular, it's required on some systems (e.g. the SlackBuild
+hp-wmi-sensors: author's HP Z2 Mini G3) for fan speeds to be visible in 'sensors'.
+hp-wmi-sensors:
diff --git a/system/hplip-plugin/hplip-plugin.SlackBuild b/system/hplip-plugin/hplip-plugin.SlackBuild
index 29b6224aa4..208cd91f24 100644
--- a/system/hplip-plugin/hplip-plugin.SlackBuild
+++ b/system/hplip-plugin/hplip-plugin.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hplip-plugin
 
 # Copyright 2016 Dhaby Xiloj <slack.dhabyx@gmail.com> Guatemala
+# Copyright 2023 Yth | Pont-en-Royans, France | yth@ythogtha.org
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hplip-plugin
-VERSION=${VERSION:-3.16.5}
+VERSION=${VERSION:-3.20.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 PKGNAM=hplip-${VERSION}-plugin.run
 
@@ -37,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -107,4 +118,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hplip-plugin/hplip-plugin.info b/system/hplip-plugin/hplip-plugin.info
index 42c58a31da..1bf265453f 100644
--- a/system/hplip-plugin/hplip-plugin.info
+++ b/system/hplip-plugin/hplip-plugin.info
@@ -1,10 +1,10 @@
 PRGNAM="hplip-plugin"
-VERSION="3.16.5"
+VERSION="3.20.5"
 HOMEPAGE="http://hplipopensource.com/node/309"
-DOWNLOAD="http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-3.16.5-plugin.run"
-MD5SUM="7179cb3a8f23cabb52aa69a927e973fc"
+DOWNLOAD="http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-3.20.5-plugin.run"
+MD5SUM="931f125a72aa79f9de8b2c0ad46017c3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="DhabyX"
-EMAIL="slack.dhabyx@gmail.com"
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/system/hstr/README b/system/hstr/README
index 47b9dea02d..e1fde90436 100644
--- a/system/hstr/README
+++ b/system/hstr/README
@@ -1,6 +1,6 @@
-Bash and Zsh shell history suggest box - easily view, navigate, search and
-manage your command history.
+Bash and Zsh shell history suggest box - easily view, navigate, search
+and manage your command history.
 
-It is a command line utility which brings improved command completion from
-the history.  It aims to make completion easier to use and more efficient
-than Ctrl-r.
+It is a command line utility which brings improved command completion
+from the history. It aims to make completion easier to use and more
+efficient than Ctrl-r.
diff --git a/system/hstr/hstr.SlackBuild b/system/hstr/hstr.SlackBuild
index 828c0f0156..81d240be61 100644
--- a/system/hstr/hstr.SlackBuild
+++ b/system/hstr/hstr.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hstr
 
-# Copyright 2014-2019 Zhu Qun-Ying
+# Copyright 2014-2023 Zhu Qun-Ying
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hstr
-VERSION=${VERSION:-2.2}
+VERSION=${VERSION:-3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -102,4 +112,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hstr/hstr.info b/system/hstr/hstr.info
index bf5af7b04b..50a29716b6 100644
--- a/system/hstr/hstr.info
+++ b/system/hstr/hstr.info
@@ -1,8 +1,8 @@
 PRGNAM="hstr"
-VERSION="2.2"
+VERSION="3.1"
 HOMEPAGE="https://github.com/dvorka/hstr"
-DOWNLOAD="https://github.com/dvorka/hstr/archive/2.2/hstr-2.2.tar.gz"
-MD5SUM="941138a88005e3e17a9f81c82fa2906d"
+DOWNLOAD="https://github.com/dvorka/hstr/archive/3.1/hstr-3.1.tar.gz"
+MD5SUM="5d647f3b2fc4615b14eaeaaf5b27e4f2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/hungrycat/README b/system/hungrycat/README
index 15b01421d4..cd8462cc1a 100644
--- a/system/hungrycat/README
+++ b/system/hungrycat/README
@@ -1,7 +1,7 @@
 hungrycat ('cat' and 'rm' in a single tool)
 
-hungrycat is a tool that prints contents of a file on the standard output,
-while simultaneously freeing disk space occupied by the file. It can be
-useful if you need to process a large file, but you don't have enough
-space to store the output file and you wouldn't need the input file
-afterwards.
+hungrycat is a tool that prints contents of a file on the standard
+output, while simultaneously freeing disk space occupied by the
+file. It can be useful if you need to process a large file, but you
+don't have enough space to store the output file and you wouldn't need
+the input file afterwards.
diff --git a/system/hungrycat/hungrycat.SlackBuild b/system/hungrycat/hungrycat.SlackBuild
index 85dd2590b5..4fc02dfa89 100644
--- a/system/hungrycat/hungrycat.SlackBuild
+++ b/system/hungrycat/hungrycat.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hungrycat
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
@@ -10,10 +10,13 @@
 # 20170827 bkw: update for v0.4, drop docutils dep now that upstream
 # ships a prebuilt man page.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hungrycat
 VERSION=${VERSION:-0.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -23,7 +26,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -51,11 +58,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -81,4 +85,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hungrycat/hungrycat.info b/system/hungrycat/hungrycat.info
index 399ea385d5..4fef501b6b 100644
--- a/system/hungrycat/hungrycat.info
+++ b/system/hungrycat/hungrycat.info
@@ -1,10 +1,10 @@
 PRGNAM="hungrycat"
 VERSION="0.4.1"
-HOMEPAGE="http://jwilk.net/software/hungrycat"
+HOMEPAGE="https://jwilk.net/software/hungrycat"
 DOWNLOAD="https://github.com/jwilk/hungrycat/releases/download/0.4.1/hungrycat-0.4.1.tar.gz"
 MD5SUM="20c7ce9fc38a1734cc713025479fc61d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/hw-probe/README b/system/hw-probe/README
new file mode 100644
index 0000000000..bf1e622827
--- /dev/null
+++ b/system/hw-probe/README
@@ -0,0 +1,6 @@
+A project to anonymously collect hardware details of Linux/BSD
+powered computers over the world and help people to
+collaboratively debug hardware problems.
+
+This script repackages the Debian package provided by Linux
+Hardware Project.
diff --git a/system/hw-probe/hw-probe.SlackBuild b/system/hw-probe/hw-probe.SlackBuild
new file mode 100644
index 0000000000..e5b562c257
--- /dev/null
+++ b/system/hw-probe/hw-probe.SlackBuild
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# Slackware build script for hw-probe
+
+# Copyright 2024  Dimitar Nikov, Alfreton, United Kingdom
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=hw-probe
+VERSION=${VERSION:-1.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH="noarch"
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz $PRGNAM-$VERSION/$PRGNAM.pl
+cd $PRGNAM-$VERSION
+
+mkdir -p $PKG/usr/bin
+chmod 0755 $PRGNAM.pl
+mv $PRGNAM.pl $PKG/usr/bin/$PRGNAM
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/usr/man/man1
+help2man -n $PRGNAM -s 1 $PKG/usr/bin/${PRGNAM} -o $PKG/usr/man/man1/${PRGNAM}.1
+gzip -9 $PKG/usr/man/man1/${PRGNAM}.1
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hw-probe/hw-probe.info b/system/hw-probe/hw-probe.info
new file mode 100644
index 0000000000..bd52bc134d
--- /dev/null
+++ b/system/hw-probe/hw-probe.info
@@ -0,0 +1,10 @@
+PRGNAM="hw-probe"
+VERSION="1.6"
+HOMEPAGE="https://github.com/linuxhw/hw-probe"
+DOWNLOAD="https://github.com/linuxhw/hw-probe/archive/1.6/hw-probe-1.6.tar.gz"
+MD5SUM="0d35a322c1c619bc23b3c247b2c8772e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="acpica hwinfo perl-Digest-SHA libwww-perl lsb-release cpuid i2c-tools memtester vdpauinfo"
+MAINTAINER="Dimitar Nikov"
+EMAIL="dimitar at nikov dot net"
diff --git a/system/hw-probe/slack-desc b/system/hw-probe/slack-desc
new file mode 100644
index 0000000000..765f1507bc
--- /dev/null
+++ b/system/hw-probe/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+hw-probe: hw-probe (hardware probe tool)
+hw-probe:
+hw-probe: hw-probe - a tool to probe for hardware, check operability and find 
+hw-probe: drivers with the help of Linux hardware database available at:
+hw-probe: https://linux-hardware.org
+hw-probe:
+hw-probe: Homepage: https://github.com/linuxhw/hw-probe
+hw-probe:
+hw-probe:
+hw-probe:
+hw-probe:
diff --git a/system/hwinfo/README b/system/hwinfo/README
index 12fb91b79b..46779ac2dc 100644
--- a/system/hwinfo/README
+++ b/system/hwinfo/README
@@ -1,5 +1,6 @@
-hwinfo is a simple program that lists results from the hardware detection
-library.
+hwinfo is a simple program that lists results from the hardware
+detection library.
 
-On compilation a binary called "check_hd" is run.  This can take quite
-some time to complete and may look like the compilation process is stuck.
+On compilation a binary called "check_hd" is run. This can take quite
+some time to complete and may look like the compilation process is
+stuck.
diff --git a/system/hwinfo/hwinfo.SlackBuild b/system/hwinfo/hwinfo.SlackBuild
index 7a37308f60..2cef042efe 100644
--- a/system/hwinfo/hwinfo.SlackBuild
+++ b/system/hwinfo/hwinfo.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hwinfo
 
-# Copyright 2009-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2009-2021 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,21 +11,24 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=hwinfo
-VERSION=${VERSION:-21.67}
+VERSION=${VERSION:-21.78}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,9 +72,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # disable regeneration of changelog and VERSION
 chmod -x ./git2log
@@ -77,10 +84,10 @@ sed -i "s/?= -O2/?= $SLKCFLAGS/" Makefile.common
 
 echo $VERSION > VERSION
 
-make \
+make -j1 \
   LIBDIR=/usr/lib$LIBDIRSUFFIX
 
-make install \
+make -j1 install \
   LIBDIR=/usr/lib$LIBDIRSUFFIX \
   DESTDIR=$PKG
 
@@ -105,4 +112,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hwinfo/hwinfo.info b/system/hwinfo/hwinfo.info
index 99120953c1..bd2c4aef37 100644
--- a/system/hwinfo/hwinfo.info
+++ b/system/hwinfo/hwinfo.info
@@ -1,10 +1,10 @@
 PRGNAM="hwinfo"
-VERSION="21.67"
+VERSION="21.78"
 HOMEPAGE="https://github.com/openSUSE/hwinfo"
-DOWNLOAD="https://github.com/openSUSE/hwinfo/archive/21.67/hwinfo-21.67.tar.gz"
-MD5SUM="afe2085d9b2da9af02d445bd5f5ae965"
+DOWNLOAD="https://github.com/openSUSE/hwinfo/archive/21.78/hwinfo-21.78.tar.gz"
+MD5SUM="fa798dccf9501ef9dcb5ba2eaf99fb44"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libx86emu"
 MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+EMAIL="pprkut@slackbuilds.org"
diff --git a/system/hwloc/README b/system/hwloc/README
index c70e4d8a9e..7e3226d2f1 100644
--- a/system/hwloc/README
+++ b/system/hwloc/README
@@ -20,3 +20,7 @@ cudatoolkit:
   interfaces. For instance, it may return the list of processors near
   NVIDIA GPUs. Note that if I/O device discovery is enabled, GPUs may
   also appear as PCI objects in the topology. 
+
+openmpi:
+  If this is installed at build time, the package will include the
+  netloc_mpi_find_hosts and netloc_rank_order utilities.
diff --git a/system/hwloc/hwloc.SlackBuild b/system/hwloc/hwloc.SlackBuild
index b211bc01cf..679fdf641c 100644
--- a/system/hwloc/hwloc.SlackBuild
+++ b/system/hwloc/hwloc.SlackBuild
@@ -1,29 +1,42 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hwloc
 
 # Written by Wainamoinen <wainamoinen@gmail.com>
 
+# 20230812 bkw: Modified by SlackBuilds.org:
+# - fix conflict with mpich.
+# - mention openmp as optional dep in README.
+
+# 20220211 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hwloc
-VERSION=${VERSION:-2.2.0}
+VERSION=${VERSION:-2.9.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -47,10 +60,19 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20230812 bkw: openmpi is an optional dep. configure checks for mpi.h
+# to decide whether it's present... but mpich also installs an mpi.h,
+# and hwloc's build will fail if it tries to use mpich. workaround:
+# stop configure from finding mpi.h if mpich is installed.
+if pkg-config --exists mpich; then
+  sed -i 's,mpi\.h,MPICH_DISABLED-mpi.h,' configure
+fi
 
+SLKCFLAGS+=" -fcommon"
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -65,10 +87,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-netloc
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
+rm -f $PKG/usr/lib*/*.la
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -83,4 +103,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hwloc/hwloc.info b/system/hwloc/hwloc.info
index 59ce0ab8e4..91b651f8eb 100644
--- a/system/hwloc/hwloc.info
+++ b/system/hwloc/hwloc.info
@@ -1,8 +1,8 @@
 PRGNAM="hwloc"
-VERSION="2.2.0"
+VERSION="2.9.3"
 HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
-DOWNLOAD="https://download.open-mpi.org/release/hwloc/v2.2/hwloc-2.2.0.tar.bz2"
-MD5SUM="5247ba4c1c63623c9285425552df5d92"
+DOWNLOAD="https://download.open-mpi.org/release/hwloc/v2.9/hwloc-2.9.3.tar.bz2"
+MD5SUM="d3eb9cc49b66d607fcc81ab68aeb6156"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/hyperfine/README b/system/hyperfine/README
new file mode 100644
index 0000000000..35ace2ab71
--- /dev/null
+++ b/system/hyperfine/README
@@ -0,0 +1,10 @@
+hyperfine (command-line benchmarking tool)
+
+hyperfine is a sophisticated command-line benchmarking tool that
+supports a variety of features, including statistical analysis,
+arbitrary shell commands, formatted output and more.
+
+Several python scripts for plotting and performing statistical analysis
+on json output are installed to /usr/share/hyperfine. See
+README-scripts.md in the doc directory for the runtime dependencies.
+
diff --git a/system/hyperfine/hyperfine.SlackBuild b/system/hyperfine/hyperfine.SlackBuild
new file mode 100644
index 0000000000..463b1b0e7a
--- /dev/null
+++ b/system/hyperfine/hyperfine.SlackBuild
@@ -0,0 +1,182 @@
+#!/bin/bash
+
+# Slackware build script for hyperfine
+
+# Copyright 2022-2023 K. Eugene Carlson  Tsukuba, Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=hyperfine
+VERSION=${VERSION:-1.18.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+
+  if [ "$ARCH" = "i586" ]; then
+    if rustc -Vv | grep host | grep i686 > /dev/null ; then
+      ARCH=i686
+    fi
+  fi
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  CARGOTARGET="--target i586-unknown-linux-gnu"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  CARGOTARGET="--target i686-unknown-linux-gnu"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  CARGOTARGET="--target x86_64-unknown-linux-gnu"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  CARGOTARGET=""
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+# build offline
+# configuration tells cargo to use the configured directory
+# for dependencies instead of downloading from crates.io
+mkdir .cargo
+cat << EOF >> .cargo/config
+[source.crates-io]
+registry = 'https://github.com/rust-lang/crates.io-index'
+replace-with = 'vendored-sources'
+
+[source.vendored-sources]
+directory = '$(pwd)/vendor'
+EOF
+
+# deps and versions come from Cargo.lock
+mkdir vendor
+(
+  cd vendor
+
+  grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
+    sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
+    awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \
+    grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do
+
+    ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
+    dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
+
+    tar xvf $CWD/$dep-$ver.crate
+
+    touch $dep-$ver/.cargo-ok
+
+    # generate checksum
+    {
+      printf "{\n"
+      printf '    "files": {\n'
+
+      (
+        cd $dep-$ver
+        find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/'
+      ) | sed '$ s/,$//'
+
+      printf "    },\n"
+      printf '    "package": "'
+
+      sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
+
+      printf "}\n"
+    } > $dep-$ver/.cargo-checksum.json
+  done
+)
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
+CARGO_HOME=.cargo \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+cargo build --release $CARGOTARGET
+
+mkdir -p $PKG/usr/bin
+find target -name $PRGNAM -exec install -m 755 {} $PKG/usr/bin \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE-* README.md CITATION.cff $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/{execution-order.png,execution-order.svg,histogram.png} \
+      $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a scripts/README.md $PKG/usr/doc/$PRGNAM-$VERSION/README-scripts.md
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# python scripts for working with json output; see README-scripts.md in
+# the doc directory after installation for runtime dependencies.
+mkdir -p $PKG/usr/share/$PRGNAM
+install -m 755 scripts/*.py $PKG/usr/share/$PRGNAM
+sed -i 's|/usr/bin/env python|/usr/bin/python3|' $PKG/usr/share/$PRGNAM/*
+
+mkdir -p $PKG/usr/man/man1
+install -m 644 doc/$PRGNAM.1 $PKG/usr/man/man1
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/hyperfine/hyperfine.info b/system/hyperfine/hyperfine.info
new file mode 100644
index 0000000000..76c7108718
--- /dev/null
+++ b/system/hyperfine/hyperfine.info
@@ -0,0 +1,326 @@
+PRGNAM="hyperfine"
+VERSION="1.18.0"
+HOMEPAGE="https://github.com/sharkdp/hyperfine"
+DOWNLOAD="https://github.com/sharkdp/hyperfine/archive/refs/tags/v1.18.0/hyperfine-1.18.0.tar.gz \
+          https://static.crates.io/crates/ahash/ahash-0.7.6.crate \
+          https://static.crates.io/crates/ahash/ahash-0.8.3.crate \
+          https://static.crates.io/crates/aho-corasick/aho-corasick-1.1.1.crate \
+          https://static.crates.io/crates/anstream/anstream-0.6.4.crate \
+          https://static.crates.io/crates/anstyle/anstyle-1.0.4.crate \
+          https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.2.crate \
+          https://static.crates.io/crates/anstyle-query/anstyle-query-1.0.0.crate \
+          https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-3.0.1.crate \
+          https://static.crates.io/crates/anyhow/anyhow-1.0.75.crate \
+          https://static.crates.io/crates/approx/approx-0.5.1.crate \
+          https://static.crates.io/crates/arrayvec/arrayvec-0.7.4.crate \
+          https://static.crates.io/crates/assert_cmd/assert_cmd-2.0.12.crate \
+          https://static.crates.io/crates/atty/atty-0.2.14.crate \
+          https://static.crates.io/crates/autocfg/autocfg-0.1.8.crate \
+          https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \
+          https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \
+          https://static.crates.io/crates/bitflags/bitflags-2.4.0.crate \
+          https://static.crates.io/crates/bitvec/bitvec-1.0.1.crate \
+          https://static.crates.io/crates/borsh/borsh-0.10.3.crate \
+          https://static.crates.io/crates/borsh-derive/borsh-derive-0.10.3.crate \
+          https://static.crates.io/crates/borsh-derive-internal/borsh-derive-internal-0.10.3.crate \
+          https://static.crates.io/crates/borsh-schema-derive-internal/borsh-schema-derive-internal-0.10.3.crate \
+          https://static.crates.io/crates/bstr/bstr-1.6.2.crate \
+          https://static.crates.io/crates/bytecheck/bytecheck-0.6.11.crate \
+          https://static.crates.io/crates/bytecheck_derive/bytecheck_derive-0.6.11.crate \
+          https://static.crates.io/crates/bytes/bytes-1.5.0.crate \
+          https://static.crates.io/crates/cc/cc-1.0.83.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://static.crates.io/crates/clap/clap-4.4.6.crate \
+          https://static.crates.io/crates/clap_builder/clap_builder-4.4.6.crate \
+          https://static.crates.io/crates/clap_complete/clap_complete-4.4.3.crate \
+          https://static.crates.io/crates/clap_lex/clap_lex-0.5.1.crate \
+          https://static.crates.io/crates/cloudabi/cloudabi-0.0.3.crate \
+          https://static.crates.io/crates/colorchoice/colorchoice-1.0.0.crate \
+          https://static.crates.io/crates/colored/colored-2.0.4.crate \
+          https://static.crates.io/crates/console/console-0.15.7.crate \
+          https://static.crates.io/crates/csv/csv-1.3.0.crate \
+          https://static.crates.io/crates/csv-core/csv-core-0.1.11.crate \
+          https://static.crates.io/crates/difflib/difflib-0.4.0.crate \
+          https://static.crates.io/crates/doc-comment/doc-comment-0.3.3.crate \
+          https://static.crates.io/crates/either/either-1.9.0.crate \
+          https://static.crates.io/crates/encode_unicode/encode_unicode-0.3.6.crate \
+          https://static.crates.io/crates/errno/errno-0.3.4.crate \
+          https://static.crates.io/crates/errno-dragonfly/errno-dragonfly-0.1.2.crate \
+          https://static.crates.io/crates/fastrand/fastrand-2.0.1.crate \
+          https://static.crates.io/crates/float-cmp/float-cmp-0.9.0.crate \
+          https://static.crates.io/crates/fuchsia-cprng/fuchsia-cprng-0.1.1.crate \
+          https://static.crates.io/crates/funty/funty-2.0.0.crate \
+          https://static.crates.io/crates/getrandom/getrandom-0.2.10.crate \
+          https://static.crates.io/crates/hashbrown/hashbrown-0.12.3.crate \
+          https://static.crates.io/crates/hashbrown/hashbrown-0.13.2.crate \
+          https://static.crates.io/crates/hermit-abi/hermit-abi-0.1.19.crate \
+          https://static.crates.io/crates/hermit-abi/hermit-abi-0.3.3.crate \
+          https://static.crates.io/crates/indicatif/indicatif-0.17.4.crate \
+          https://static.crates.io/crates/instant/instant-0.1.12.crate \
+          https://static.crates.io/crates/is-terminal/is-terminal-0.4.9.crate \
+          https://static.crates.io/crates/itertools/itertools-0.11.0.crate \
+          https://static.crates.io/crates/itoa/itoa-1.0.9.crate \
+          https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \
+          https://static.crates.io/crates/libc/libc-0.2.148.crate \
+          https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.8.crate \
+          https://static.crates.io/crates/memchr/memchr-2.6.4.crate \
+          https://static.crates.io/crates/memoffset/memoffset-0.7.1.crate \
+          https://static.crates.io/crates/nix/nix-0.26.4.crate \
+          https://static.crates.io/crates/normalize-line-endings/normalize-line-endings-0.3.0.crate \
+          https://static.crates.io/crates/num/num-0.2.1.crate \
+          https://static.crates.io/crates/num-bigint/num-bigint-0.2.6.crate \
+          https://static.crates.io/crates/num-complex/num-complex-0.2.4.crate \
+          https://static.crates.io/crates/num-integer/num-integer-0.1.45.crate \
+          https://static.crates.io/crates/num-iter/num-iter-0.1.43.crate \
+          https://static.crates.io/crates/num-rational/num-rational-0.2.4.crate \
+          https://static.crates.io/crates/num-traits/num-traits-0.2.16.crate \
+          https://static.crates.io/crates/number_prefix/number_prefix-0.4.0.crate \
+          https://static.crates.io/crates/once_cell/once_cell-1.18.0.crate \
+          https://static.crates.io/crates/pin-utils/pin-utils-0.1.0.crate \
+          https://static.crates.io/crates/portable-atomic/portable-atomic-1.4.3.crate \
+          https://static.crates.io/crates/ppv-lite86/ppv-lite86-0.2.17.crate \
+          https://static.crates.io/crates/predicates/predicates-3.0.4.crate \
+          https://static.crates.io/crates/predicates-core/predicates-core-1.0.6.crate \
+          https://static.crates.io/crates/predicates-tree/predicates-tree-1.0.9.crate \
+          https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-0.1.5.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.67.crate \
+          https://static.crates.io/crates/ptr_meta/ptr_meta-0.1.4.crate \
+          https://static.crates.io/crates/ptr_meta_derive/ptr_meta_derive-0.1.4.crate \
+          https://static.crates.io/crates/quote/quote-1.0.33.crate \
+          https://static.crates.io/crates/radium/radium-0.7.0.crate \
+          https://static.crates.io/crates/rand/rand-0.6.5.crate \
+          https://static.crates.io/crates/rand/rand-0.8.5.crate \
+          https://static.crates.io/crates/rand_chacha/rand_chacha-0.1.1.crate \
+          https://static.crates.io/crates/rand_chacha/rand_chacha-0.3.1.crate \
+          https://static.crates.io/crates/rand_core/rand_core-0.3.1.crate \
+          https://static.crates.io/crates/rand_core/rand_core-0.4.2.crate \
+          https://static.crates.io/crates/rand_core/rand_core-0.6.4.crate \
+          https://static.crates.io/crates/rand_hc/rand_hc-0.1.0.crate \
+          https://static.crates.io/crates/rand_isaac/rand_isaac-0.1.1.crate \
+          https://static.crates.io/crates/rand_jitter/rand_jitter-0.1.4.crate \
+          https://static.crates.io/crates/rand_os/rand_os-0.1.3.crate \
+          https://static.crates.io/crates/rand_pcg/rand_pcg-0.1.2.crate \
+          https://static.crates.io/crates/rand_xorshift/rand_xorshift-0.1.1.crate \
+          https://static.crates.io/crates/rdrand/rdrand-0.4.0.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.3.5.crate \
+          https://static.crates.io/crates/regex/regex-1.9.6.crate \
+          https://static.crates.io/crates/regex-automata/regex-automata-0.3.9.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.7.5.crate \
+          https://static.crates.io/crates/rend/rend-0.4.1.crate \
+          https://static.crates.io/crates/rkyv/rkyv-0.7.42.crate \
+          https://static.crates.io/crates/rkyv_derive/rkyv_derive-0.7.42.crate \
+          https://static.crates.io/crates/rust_decimal/rust_decimal-1.32.0.crate \
+          https://static.crates.io/crates/rustix/rustix-0.38.17.crate \
+          https://static.crates.io/crates/ryu/ryu-1.0.15.crate \
+          https://static.crates.io/crates/seahash/seahash-4.1.0.crate \
+          https://static.crates.io/crates/serde/serde-1.0.188.crate \
+          https://static.crates.io/crates/serde_derive/serde_derive-1.0.188.crate \
+          https://static.crates.io/crates/serde_json/serde_json-1.0.107.crate \
+          https://static.crates.io/crates/shell-words/shell-words-1.1.0.crate \
+          https://static.crates.io/crates/simdutf8/simdutf8-0.1.4.crate \
+          https://static.crates.io/crates/statistical/statistical-1.0.0.crate \
+          https://static.crates.io/crates/strsim/strsim-0.10.0.crate \
+          https://static.crates.io/crates/syn/syn-1.0.109.crate \
+          https://static.crates.io/crates/syn/syn-2.0.37.crate \
+          https://static.crates.io/crates/tap/tap-1.0.1.crate \
+          https://static.crates.io/crates/tempfile/tempfile-3.8.0.crate \
+          https://static.crates.io/crates/terminal_size/terminal_size-0.3.0.crate \
+          https://static.crates.io/crates/termtree/termtree-0.4.1.crate \
+          https://static.crates.io/crates/thiserror/thiserror-1.0.49.crate \
+          https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.49.crate \
+          https://static.crates.io/crates/tinyvec/tinyvec-1.6.0.crate \
+          https://static.crates.io/crates/tinyvec_macros/tinyvec_macros-0.1.1.crate \
+          https://static.crates.io/crates/toml/toml-0.5.11.crate \
+          https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.12.crate \
+          https://static.crates.io/crates/unicode-width/unicode-width-0.1.11.crate \
+          https://static.crates.io/crates/utf8parse/utf8parse-0.2.1.crate \
+          https://static.crates.io/crates/uuid/uuid-1.4.1.crate \
+          https://static.crates.io/crates/version_check/version_check-0.9.4.crate \
+          https://static.crates.io/crates/wait-timeout/wait-timeout-0.2.0.crate \
+          https://static.crates.io/crates/wasi/wasi-0.11.0+wasi-snapshot-preview1.crate \
+          https://static.crates.io/crates/winapi/winapi-0.3.9.crate \
+          https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.45.0.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.48.0.crate \
+          https://static.crates.io/crates/windows-targets/windows-targets-0.42.2.crate \
+          https://static.crates.io/crates/windows-targets/windows-targets-0.48.5.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.42.2.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.48.5.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.42.2.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.48.5.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.42.2.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.48.5.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.42.2.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.42.2.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.42.2.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.42.2.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.5.crate \
+          https://static.crates.io/crates/wyz/wyz-0.5.1.crate"
+MD5SUM="581b488eb77648afae055026e8e7b98a \
+        7d2520c6776b66559165d0a666e995ff \
+        25bbf8d0145ba2670ba039c768bb4f44 \
+        245579618dd635377c5987690a7e2153 \
+        d18a8aaf56bfd7418a91540a0174402d \
+        b4f71ffecd3694a82ffb62c357d997a8 \
+        316c95b1454a81db86a56d5af6734c94 \
+        d2453c99c7af98286c2dc9017a8dba6d \
+        b57fd47f132f32001e0d4bfc4621f1bf \
+        39a78bec5a0ae75f210c1f67250152b0 \
+        9071f5790b873b983105cc5b2917caff \
+        504b5d258d68bdb980c997b93f0c6e6e \
+        74e97e374c0c05d2dffc9568b7e135b8 \
+        142cb4b9a653e56e56311f0c883b8582 \
+        9563ddbf0d01fb162d94707f57ad9f40 \
+        05d77ef52e90ad161fdd41b252420467 \
+        a295edb6953237ebbdfa8e731229f9a3 \
+        b6a33f8009be15391bb7ca1a3c1f5bc4 \
+        771aa8bb6e0811a97971fceecabb3245 \
+        a6b0dc0295364e416cb03d9c25027335 \
+        ba89049b35d731f9a13ecf1baf1d0946 \
+        ec3ee66edc760acee9c96c7a31f47da9 \
+        f826dc47439bd3438b53dbcb8aacf049 \
+        c78576fda0bf050aa32a48bf652f2f0b \
+        ba444785b3772c818677c4ccd42ee16f \
+        4a30bb499d535a719fca7f7775ff29d6 \
+        51ed49380bb7d086c005208e805983b2 \
+        9241fa90ea8b17c00010be46c9aa1ac5 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        166b8dd7c4ba1de91b063bf2735db503 \
+        50dd5ede0492efbc82a851a70f5a134f \
+        e44725dcccde0357c0f6575b6318e6d8 \
+        f93412d10071ace7eea8167d499d05cd \
+        1c8b50f8528dd37df7d984e0e4b61bd5 \
+        010f6d0e98cc2a2b99907a23c6cd6bbc \
+        16b1345bc7db4c8b16394a617de8d7f3 \
+        53eecae550b37e10f2f127cfbf892465 \
+        73172b0f30760db4394e2055ed807f4e \
+        78268e46c45706dae81c672ce95a1043 \
+        bebc8338ae113a87a04564c97c1e3f0c \
+        dd1e49c76e9d5853e673a3b41ba02917 \
+        3c3ab76bd9ed94de350152f1af4c61e8 \
+        95a243b2d7c30018a643e218b3c5d693 \
+        54c0bc0d44393c1251b0f1fc2a531d80 \
+        fc65414dcac661c46f2cfad7722304f9 \
+        80e1c1b89d858c93fc5946b4a8266504 \
+        94f11861c538d1a2fd56c86d140e4358 \
+        27260b46db6b9ac40318143d70a80ba3 \
+        6c162f039387980e6b6c4fecf8be744d \
+        f204ba6fc9394724826f177433fe9a98 \
+        1b41b97d982520b7364a87a39e2a1ed8 \
+        d88bf8eec9baf123a8a829615b06fd0d \
+        0b7994d1256215201bdfb810a357ffa2 \
+        b5fc3a27c94dc7bab487e15228c82d58 \
+        f5fffabd6b122a6e4f86d350c54cff6a \
+        5f153f7135dceb02f88266121c836b4e \
+        ad61af236140412c359cdfb6dc6ef39e \
+        d629ca093dfd23b5e9b4262c5f801928 \
+        c6e20d23948f86627f5d4668e7ca43e3 \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        2f5389af7005007e4e4edd69c0d8fde1 \
+        8b8117d295952495cd9be9c105cb6344 \
+        ab9a5f02cef3b8794d810332ebf26a03 \
+        48e7cc866f45af55ea3f627e29a2cd98 \
+        44ab2701d152b855941648698cd7a99e \
+        f9ddf92ded75c1df47b2dd1379a482fd \
+        d69aa359a9e7dd2d67a7b7712e30a19e \
+        6b1db46a36bc0dc590270d2c952d30c4 \
+        25a9c25700c416af66082afbd9187bb7 \
+        073b4c53e303ccf2a807dfce7f5e986a \
+        44ef8a2279dadf391881a69c60d29197 \
+        99e024622d98dc28a8a5f37afccaf20a \
+        256ede6773f2f67e26e92f36c04eb4f7 \
+        4bbea6a7f7b7715c2e4eb553cf62913c \
+        2dc8aacabbc090f8025a4789d4d6d8f0 \
+        07c75fec267864bcbb800ca7709ceae2 \
+        f41effa507bfa5e0a4810685e3e7808b \
+        5c69337d37e58a380e00eac9ce0373bb \
+        21574d08e3527cc2d944698767770300 \
+        be08d75820c528ad6143e9e42efccee0 \
+        175aaa67c5c9a4c8de2b944d51d0753d \
+        5ecf56203dda9419751b532d99c3601d \
+        80235d435deb3e8c2f28a8e666cae1a2 \
+        7b5f916e5a872e69f4adb563bdb67b77 \
+        639c3431a2f0d289889dd4cf8f1f1222 \
+        0ddb8bccd3198892d0dd0ec7151f7cd3 \
+        c3d0791d7f9cb5103c004856e165fe0b \
+        793627c8c18012ad77cb3e81fa4c2195 \
+        ee7a5f842c39bc47c474196e83b0df5f \
+        3ab5a79607a4d260bf61cd99dc82ab05 \
+        e30085994bbeb4b7f4895d48216d5476 \
+        8cab41822d03dfa674870315308fa392 \
+        35ddcd36701a1a6711cc3aec85909f41 \
+        a1626b8f4d165b1b60d960862eba4cf0 \
+        28b1e6d15e1ba8cf3a2e953ce7fcd3de \
+        74b15f1928431937f14ed91fdc12b542 \
+        2255d3d9a603e177985602a7df1c5bbc \
+        5acfdc8656212bce8df1bcc43db34c3d \
+        f9e08a49715c401602243230b28d86f0 \
+        7826deb76941fc36c2391951bd65ba47 \
+        c8d655d206cbe48b84a22544d6fc6d15 \
+        782ea88d8e5b517b1c9e7d870e20e9e3 \
+        3e75d2d1763462ebb4ab5b74c39d9a7d \
+        ba3dddcdbc50d3917c33010f6d78e8da \
+        5ad40eb548ec91179c2e5bafd26f1d30 \
+        1c9a7182c62a3f9ea6f81420f3766f6b \
+        f4eb7a5cf89ce319665b265af8727c35 \
+        c091be6034fcaaa6eea3602086f00ec3 \
+        c70e27e33ab7a7c12d8a2731bce5ffcc \
+        4ff266abc32423e36367c5ff9e7ae8d4 \
+        254042a2a29ae1d79b96a283c8cc251f \
+        8046df86e976ce7ef8954e916f0e7f74 \
+        a0da7824f0a52f7712017aa48669cb32 \
+        8498aebd7ad22c00c2de49ac9c885112 \
+        0cdf23902dbcad8c20973170e10b612f \
+        ce622fdb8d18cd1c13ed8fadc5400c10 \
+        74001a70c31a649cd14282d0521a5f39 \
+        9e17ac21a5b34c8d2acc0600ea3e8f66 \
+        82d98dc87dc8503400aa095f5aa70f13 \
+        64d9f46e9ba78f68c30c486be3d8b7df \
+        344753a95db4f193f068b3cf4b75d83b \
+        fdd7cefe256b6bcbbc2ba2344e773496 \
+        ce7327ca8031864d638b1e21fd44c4dd \
+        b7eae58d7a80112442643ee2ff481ef7 \
+        b1372e62f53f0ad8d19a2be135c10c9d \
+        fe293b2c051a108a25477c0637b151c8 \
+        2ab5bc29c5a16fd836e9c99a70ca6663 \
+        5f0470696baaa4e5953bddbf196998f9 \
+        c678a7da0ee4b850ebde0474144a0415 \
+        b21820f2664242498beba7783b32bef4 \
+        ca65153603a1a7240bbd9d2ce19f2d67 \
+        908ec8a89821b72f3a35726bab24461f \
+        ceee1159c41351d05f4cf705490867b3 \
+        d665ec79a495f8922097aef0ffb50c81 \
+        d18d362345c4fe512ef67b738b239fb8 \
+        6708629acf3d2ecb7404e43255d2df85 \
+        e972ea58ec203bfa6c79c1207852298b \
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        db96b50050277bf05a3c68534bbb9586 \
+        09de9d01e7331ff3da11f58be8bef0df \
+        b58284cb8ce52b8de07e09f4f8fb9653 \
+        f2797ade0e36f1e5d6be9d11b5076582 \
+        a369d510325342310c7ab159bd181dae \
+        24c64817e85ef77765ed0f26c31c9b4c \
+        7968284877e481b58df1569b68b5dc26 \
+        dae6d89034a6988042fd8be4cf5e037d \
+        34d06a94727c506c11e4710160e90f32 \
+        de2839e16d9d7a9fd1c397da62f62b4a \
+        017691b927b405669e1139b054a35f4a \
+        e0c35ffb8cfdb74a39bf799811f79304 \
+        f56c70fbae23f08fb0912284333f7851 \
+        d990172b607020701f9e84ca8e1c043c \
+        d20c2b0f45a62cc15c503ea610706a8f \
+        0a68848588e847ceccf504891584d00b \
+        ec7e437088dc741e6a0653e553abca4e \
+        45b469ad607b912256b7c80141fa2d17 \
+        8cec8a187df7a7b971009a7693f60140 \
+        7799baff9a5664205d9110a2624e8989 \
+        589309abba88dd6e8099a95640457f7d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="rust16"
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/hyperfine/slack-desc b/system/hyperfine/slack-desc
new file mode 100644
index 0000000000..7e2c3323d7
--- /dev/null
+++ b/system/hyperfine/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+hyperfine: hyperfine (command-line benchmarking tool)
+hyperfine:
+hyperfine: hyperfine is a command-line benchmarking tool that supports
+hyperfine: statistical analysis, warmup runs, formatted output and more.
+hyperfine:
+hyperfine:
+hyperfine:
+hyperfine:
+hyperfine:
+hyperfine: Author: David Peter
+hyperfine: Homepage: https://github.com/sharkdp/hyperfine
diff --git a/system/i2c-tools/i2c-tools.SlackBuild b/system/i2c-tools/i2c-tools.SlackBuild
index 05ae7ad50f..c87434b2cc 100644
--- a/system/i2c-tools/i2c-tools.SlackBuild
+++ b/system/i2c-tools/i2c-tools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for i2c-tools
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=i2c-tools
 VERSION=${VERSION:-4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -103,4 +113,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/i8kutils/README b/system/i8kutils/README
index 4c0af641f3..82346433d2 100644
--- a/system/i8kutils/README
+++ b/system/i8kutils/README
@@ -1,2 +1,25 @@
-This package contains user-space programs for controlling the fans on Dell
-laptops. Make sure the i8k module is loaded before using i8kutils.
+i8kutils package contains user-space programs for controlling the fans
+on some Dell laptops.
+
+Note: i8kutils is entirely built upon the dell-smm-hwmon kernel module.
+
+These data contains the states and the system temperature along with
+others infos. The fields returned in a query to the system are
+summarized below.
+
+    * BIOS version
+
+    * Dell service tag (later known as 'serial number')
+
+    * CPU temperature
+
+    * fan status
+
+    * fan rotation speed (only on some models)
+
+    * ac power status
+
+    * volume buttons status (not the multimedia buttons)
+
+The data are collected from the dell-smm-hwmon kernel module that is
+included in recent kernels.
diff --git a/system/i8kutils/doinst.sh b/system/i8kutils/doinst.sh
deleted file mode 100644
index 44345888da..0000000000
--- a/system/i8kutils/doinst.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-config etc/i8kmon.conf.new
diff --git a/system/i8kutils/fix_Makefile.patch b/system/i8kutils/fix_Makefile.patch
deleted file mode 100644
index 38fc8d9e29..0000000000
--- a/system/i8kutils/fix_Makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur i8kutils/Makefile i8kutils_new/Makefile
---- i8kutils/Makefile	2014-12-09 16:40:11.000000000 +0100
-+++ i8kutils_new/Makefile	2015-01-31 13:15:21.031912744 +0100
-@@ -14,16 +14,19 @@
- # General Public License for more details.
- 
- ccflags-y = -Wall
-+CC = gcc 
- 
- all: i8kctl probe_i8k_calls_time
- 
--i8kctl: i8kctl.c i8kctl.o
--	gcc -Wall i8kctl.c -o i8kctl
-+i8kctl: i8kctl.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -Wall i8kctl.c -o i8kctl
- 
--probe_i8k_calls_time: probe_i8k_calls_time.c
--	gcc -Wall -c -g -DLIB i8kctl.c
--	gcc -Wall -c -g -DLIB probe_i8k_calls_time.c
--	gcc -o probe_i8k_calls_time i8kctl.o probe_i8k_calls_time.o
-+i8kctl_DLIB.o: i8kctl.c
-+	$(CC) $(CFLAGS) -Wall -c -g -DLIB i8kctl.c -o i8kctl_DLIB.o
-+
-+probe_i8k_calls_time: i8kctl_DLIB.o probe_i8k_calls_time.c
-+	$(CC) $(CFLAGS) -Wall -c -g -DLIB probe_i8k_calls_time.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -Wall -o probe_i8k_calls_time i8kctl_DLIB.o probe_i8k_calls_time.o
- 
- i8k:
- 	make -C /lib/modules/$(shell uname -r)/build M=$(PWD) modules
diff --git a/system/i8kutils/fix_i8kmon_toggle_fan.patch b/system/i8kutils/fix_i8kmon_toggle_fan.patch
deleted file mode 100644
index 146bf7e4f2..0000000000
--- a/system/i8kutils/fix_i8kmon_toggle_fan.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur i8kutils/i8kmon new/i8kmon
---- i8kutils/i8kmon	2015-05-21 11:33:21.596018503 +0200
-+++ new/i8kmon	2015-05-21 11:35:11.958867344 +0200
-@@ -430,6 +430,7 @@
- 
- proc toggle_fan {fan {speed {}}} {
-     global status
-+    global config
- 
-     if {$speed != {}} {
- 	set status($fan) $speed
diff --git a/system/i8kutils/i8kutils.SlackBuild b/system/i8kutils/i8kutils.SlackBuild
index d3c83313ba..ef4e46c12c 100644
--- a/system/i8kutils/i8kutils.SlackBuild
+++ b/system/i8kutils/i8kutils.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
-# Slackware build script for i8kutils
+# Slackware build script for i3kutils
 
-# Copyright 2015 Fabio Sangiovanni <sjh+sbo@sanjioh.org>
+# Copyright 2023, Lockywolf
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=i8kutils
-VERSION=${VERSION:-1.42}
+VERSION=${VERSION:-20210330_c993fb1d}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+COMMIT=c993fb1da1bba5c2cd2860c1aa6c3916b4de77e4
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -59,53 +69,44 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/${PRGNAM}_${VERSION}.tar.xz
-cd $PRGNAM
+
+rm -rf $PRGNAM-$COMMIT
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
+cd $PRGNAM-$COMMIT
+
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Take care of creating required directory tree into $PKG, since Makefile doesn't
-mkdir -p $PKG/{etc,usr/{bin,man/man1}}
+make
+mkdir -p $PKG/usr/sbin
+cp i8kctl $PKG/usr/sbin/
 
-# Two fixes from Arch Linux (the first one is needed to make CFLAGS work)
-patch -p1 < $CWD/fix_Makefile.patch
-patch -p1 < $CWD/fix_i8kmon_toggle_fan.patch
+gzip i8kctl.1
+gzip i8kmon.1
+mkdir -p $PKG/usr/man/man1
+cp i8kctl.1.gz i8kmon.1.gz $PKG/usr/man/man1/
 
-make CFLAGS="$SLKCFLAGS -std=gnu89"
-
-cp -a \
-  i8kctl i8kfan i8kmon probe_i8k_calls_time \
-  $PKG/usr/bin
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Use sample config, without overwriting
-cp -a i8kmon.conf $PKG/etc/i8kmon.conf.new
-
-# Copy man pages
-cp -a i8kctl.1 i8kmon.1 $PKG/usr/man/man1
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING README.i8kutils TODO \
+   README.i8kutils \
+   COPYING \
+   dell-smm-hwmon.conf \
+   i8kmon.conf \
+   smm-test \
+   redhat \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Decomment the following line if you want extra documentation to be included
-#cp -a debian redhat $PKG/usr/doc/$PRGNAM-$VERSION
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/i8kutils/i8kutils.info b/system/i8kutils/i8kutils.info
index de2f14884c..17fc02224e 100644
--- a/system/i8kutils/i8kutils.info
+++ b/system/i8kutils/i8kutils.info
@@ -1,10 +1,10 @@
 PRGNAM="i8kutils"
-VERSION="1.42"
-HOMEPAGE="https://launchpad.net/i8kutils"
-DOWNLOAD="https://launchpad.net/i8kutils/trunk/1.42/+download/i8kutils_1.42.tar.xz"
-MD5SUM="7470b2908b39a41e3f26b8b3398e189d"
+VERSION="20210330_c993fb1d"
+HOMEPAGE="https://github.com/vitorafsr/i8kutils/"
+DOWNLOAD="https://github.com/vitorafsr/i8kutils/archive/c993fb1da1bba5c2cd2860c1aa6c3916b4de77e4/i8kutils-c993fb1da1bba5c2cd2860c1aa6c3916b4de77e4.tar.gz"
+MD5SUM="d1d2d0e646ac54a01b49f97ea73d00f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="acpi"
-MAINTAINER="Fabio Sangiovanni"
-EMAIL="sjh+sbo@sanjioh.org"
+REQUIRES=""
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.i8kutils_2023-05-15@lockywolf.net"
diff --git a/system/i8kutils/rc.i8kmon b/system/i8kutils/rc.i8kmon
deleted file mode 100644
index 18640a1371..0000000000
--- a/system/i8kutils/rc.i8kmon
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-# Start/stop/restart i8kmon.
-
-I8KMON_PARAMS="--auto --daemon"
-
-# Start i8kmon
-i8kmon_start() {
-  if [ -x /usr/bin/i8kmon -a -f /proc/i8k ]; then
-    echo "Starting i8kmon daemon: /usr/bin/i8kmon $I8KMON_PARAMS &"
-    /usr/bin/i8kmon $I8KMON_PARAMS &
-  fi
-}
-
-# Stop i8kmon
-i8kmon_stop() {
-  echo "Stopping i8kmon daemon"
-  pkill -f "tclsh /usr/bin/i8kmon $I8KMON_PARAMS"
-}
-
-# Check status
-i8kmon_status() {
-  pgrep -f "tclsh /usr/bin/i8kmon $I8KMON_PARAMS" > /dev/null
-  local I8KMON_STATUS=$?
-  if [ $I8KMON_STATUS -ne 0 ]; then
-    return 1
-  fi
-}
-
-# Restart i8kmon
-i8kmon_restart() {
-  $0 stop
-  sleep 1
-  $0 start
-}
-
-case "$1" in
-'start')
-  if ( ! i8kmon_status ); then
-    i8kmon_start
-  else
-    echo "i8kmon is already running"
-  fi
-  ;;
-
-'stop')
-  if ( i8kmon_status ); then
-    i8kmon_stop
-  else
-    echo "i8kmon is already stopped"
-  fi
-  ;;
-
-'status')
-  if ( i8kmon_status ); then
-    echo "i8kmon is currently running"
-  else
-    echo "i8kmon is NOT running"
-  fi
-  ;;
-
-'restart')
-  i8kmon_restart
-  ;;
-
-*)
-  echo "Usage: $0 start|stop|status|restart"
-  ;;
-esac
diff --git a/system/i8kutils/slack-desc b/system/i8kutils/slack-desc
index db9ee18a3c..fa49b0e26e 100644
--- a/system/i8kutils/slack-desc
+++ b/system/i8kutils/slack-desc
@@ -6,13 +6,13 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-i8kutils: i8kutils (utilities for Dell laptops)
-i8kutils:
-i8kutils: This package contains user-space programs for controlling the fans on
-i8kutils: Dell laptops.
-i8kutils: Homepage: https://launchpad.net/i8kutils
+i8kutils: i8kutils (utility set to control fans on Dell)
 i8kutils:
+i8kutils: i8kutils is a set of utilities used to control fan speed and some
+i8kutils: other parameters on Dell laptops.
 i8kutils:
+i8kutils: You might first need to turn off BIOS control by
+i8kutils: dell_bios_fan_control.
 i8kutils:
 i8kutils:
 i8kutils:
diff --git a/system/ibam/ibam.SlackBuild b/system/ibam/ibam.SlackBuild
index 9a46bde6c4..527e6e970c 100644
--- a/system/ibam/ibam.SlackBuild
+++ b/system/ibam/ibam.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ibam
 
@@ -21,26 +21,36 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ibam
 VERSION=${VERSION:-0.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -97,4 +107,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ibus-typing-booster/README b/system/ibus-typing-booster/README
new file mode 100644
index 0000000000..fde71cbe68
--- /dev/null
+++ b/system/ibus-typing-booster/README
@@ -0,0 +1,4 @@
+ibus-typing-booster
+
+ibus-typing-booster is a completion input method for faster typing 
+
diff --git a/system/ibus-typing-booster/doinst.sh b/system/ibus-typing-booster/doinst.sh
new file mode 100644
index 0000000000..dd06849d42
--- /dev/null
+++ b/system/ibus-typing-booster/doinst.sh
@@ -0,0 +1,15 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x usr/bin/gtk-update-icon-cache ]; then
+    chroot . /usr/bin/gtk-update-icon-cache /usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
+fi
diff --git a/system/ibus-typing-booster/ibus-typing-booster.SlackBuild b/system/ibus-typing-booster/ibus-typing-booster.SlackBuild
new file mode 100644
index 0000000000..d38220cca0
--- /dev/null
+++ b/system/ibus-typing-booster/ibus-typing-booster.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+# Copyright 2023 marav, FR
+#                Caterino Tommaso, T.O.P., US
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ibus-typing-booster
+VERSION=${VERSION:-2.22.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z || exit 1
+cd $PRGNAM-$VERSION
+chown -R root:root .
+
+# Fix interpreter
+sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in
+
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sbindir=/sbin \
+  --libexecdir=/usr/lib${LIBDIRSUFFIX}/ibus \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux || exit 1
+
+make
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* \
+    $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ibus-typing-booster/ibus-typing-booster.info b/system/ibus-typing-booster/ibus-typing-booster.info
new file mode 100644
index 0000000000..3ae6fd6f8c
--- /dev/null
+++ b/system/ibus-typing-booster/ibus-typing-booster.info
@@ -0,0 +1,10 @@
+PRGNAM="ibus-typing-booster"
+VERSION="2.22.1"
+HOMEPAGE="https://github.com/mike-fabian/ibus-typing-booster"
+DOWNLOAD="https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.22.1/ibus-typing-booster-2.22.1.tar.gz"
+MD5SUM="2c186e24d18b4908978b06f48e5c53dc"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pyenchant"
+MAINTAINER="Caterino Tommaso, T.O.P."
+EMAIL="marav8@free.fr"
diff --git a/system/ibus-typing-booster/slack-desc b/system/ibus-typing-booster/slack-desc
new file mode 100644
index 0000000000..2d20f1cbfe
--- /dev/null
+++ b/system/ibus-typing-booster/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+                   |-----handy-ruler------------------------------------------------------|
+ibus-typing-booster: ibus-typing-booster (completion input method)
+ibus-typing-booster:
+ibus-typing-booster: ibus-typing-booster is a completion input method for faster typing
+ibus-typing-booster:
+ibus-typing-booster:
+ibus-typing-booster:
+ibus-typing-booster:
+ibus-typing-booster:
+ibus-typing-booster: Homepage: https://github.com/mike-fabian/ibus-typing-booster
+ibus-typing-booster:
+ibus-typing-booster:
diff --git a/system/icinga-web/README b/system/icinga-web/README
deleted file mode 100644
index d6605861c9..0000000000
--- a/system/icinga-web/README
+++ /dev/null
@@ -1,3 +0,0 @@
-icinga-web (Network resource monitoring system Web UI)
-
-This is a new, versatile, web frontend to use with Icinga.
diff --git a/system/icinga-web/doinst.sh b/system/icinga-web/doinst.sh
deleted file mode 100644
index 54934b61ec..0000000000
--- a/system/icinga-web/doinst.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/httpd/extra/icinga-web.conf.new
-
-find etc/icinga-web -type f -name '*.new' \
-  | while read new ; do config $new ; done
diff --git a/system/icinga-web/icinga-web.SlackBuild b/system/icinga-web/icinga-web.SlackBuild
deleted file mode 100644
index 132fa58e5b..0000000000
--- a/system/icinga-web/icinga-web.SlackBuild
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for icinga-web
-
-# Copyright 2015  Mario Preksavec, Zagreb, Croatia
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=icinga-web
-VERSION=${VERSION:-1.12.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-./configure \
-  --prefix=/usr/share/$PRGNAM \
-  --datadir=/usr/share/$PRGNAM \
-  --datarootdir=/usr/share/$PRGNAM \
-  --sysconfdir=/etc/$PRGNAM \
-  --with-conf-dir=/etc/$PRGNAM \
-  --with-web-user=apache \
-  --with-web-group=apache \
-  --with-api-cmd-file=/var/run/icinga2/cmd/icinga2.cmd \
-  --with-log-dir=/var/log/$PRGNAM \
-  --with-cache-dir=/var/cache/$PRGNAM \
-  --with-reporting-tmp-dir=/var/cache/$PRGNAM/tmp \
-  --with-icinga-bin=/usr/sbin/icinga2 \
-  --with-icinga-cfg=/etc/icinga2/icinga2.conf \
-  --with-icinga-objects-dir=/etc/icinga2/objects \
-  --with-clearcache-path=/usr/bin \
-  --with-web-apache-path=/etc/httpd/extra \
-  --with-bin-user=root \
-  --with-bin-group=root \
-  --build=$ARCH-slackware-linux
-
-make install install-apache-config DESTDIR=$PKG
-
-# Append .new to configs
-for i in $PKG/etc/$PRGNAM/*.xml ; do mv $i $i.new ; done
-mv $PKG/etc/httpd/extra/$PRGNAM.conf $PKG/etc/httpd/extra/$PRGNAM.conf.new
-
-# Tune up clearcache
-mv $PKG/usr/bin/clearcache.sh $PKG/usr/bin/${PRGNAM}-clearcache
-
-# Erase cruft left behind
-rm -rf $PKG/usr/share/$PRGNAM/bin
-
-# Move & symlink tmp dir
-mv $PKG/usr/share/$PRGNAM/app/data/tmp $PKG/var/cache/$PRGNAM/tmp
-ln -s /var/cache/$PRGNAM/tmp $PKG/usr/share/$PRGNAM/app/data/tmp
-
-# Place the pnp templates for -module-pnp
-cp -a contrib/PNP_Integration/templateExtensions/* \
-  $PKG/usr/share/$PRGNAM/app/modules/Cronks/data/xml/extensions/
-
-# Apache needs permissions
-chown -R apache:apache $PKG/var/{cache,log}/$PRGNAM
-
-mkdir -p $PKG/usr/doc
-mv $PKG/usr/share/$PRGNAM/doc $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/$PRGNAM/etc/schema $PKG/usr/doc/$PRGNAM-$VERSION
-sed -e "s#%%USER%%#icinga#;s#%%PATH%%#/usr/share/$PRGNAM#" etc/scheduler/icingaCron \
-  > $PKG/usr/doc/$PRGNAM-$VERSION/icingaCron.example
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/icinga-web/icinga-web.info b/system/icinga-web/icinga-web.info
deleted file mode 100644
index 5fcef585bf..0000000000
--- a/system/icinga-web/icinga-web.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="icinga-web"
-VERSION="1.12.0"
-HOMEPAGE="https://www.icinga.org/"
-DOWNLOAD="https://github.com/Icinga/icinga-web/releases/download/v1.12.0/icinga-web-1.12.0.tar.gz"
-MD5SUM="7c8f1cfccce1d9f80757308c8583dab7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Mario Preksavec"
-EMAIL="mario at slackware dot hr"
diff --git a/system/icinga-web/slack-desc b/system/icinga-web/slack-desc
deleted file mode 100644
index 645f32847e..0000000000
--- a/system/icinga-web/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-          |-----handy-ruler------------------------------------------------------|
-icinga-web: icinga-web (Network resource monitoring system Web UI)
-icinga-web:
-icinga-web: This is a new, versatile, web frontend to use with Icinga.
-icinga-web:
-icinga-web: Homepage: http://www.icinga.org/
-icinga-web:
-icinga-web:
-icinga-web:
-icinga-web:
-icinga-web:
-icinga-web:
diff --git a/system/icingaweb2/README b/system/icingaweb2/README
index 3573cbf3fb..b14db80084 100644
--- a/system/icingaweb2/README
+++ b/system/icingaweb2/README
@@ -1,6 +1,8 @@
 icingaweb2 (Network resource monitoring system Web UI)
 
-Icinga Web 2 is the next generation open source monitoring web interface,
-framework and command-line interface developed by the Icinga Project,
-supporting Icinga 2, Icinga Core and any other monitoring backend compatible
-with the Livestatus Protocol.
+Icinga Web 2 is the next generation open source monitoring web
+interface, framework and command-line interface developed by the
+Icinga Project, supporting Icinga 2, Icinga Core and any other
+monitoring backend compatible with the Livestatus Protocol.
+
+Optional dependency for exports to PDF: php-imagick
diff --git a/system/icingaweb2/doinst.sh b/system/icingaweb2/doinst.sh
index 0478b817bf..5c6c131feb 100644
--- a/system/icingaweb2/doinst.sh
+++ b/system/icingaweb2/doinst.sh
@@ -13,5 +13,9 @@ config() {
 
 config etc/httpd/extra/icingaweb2.conf.new
 
+[ ! -f etc/icingaweb2/setup.token ] \
+  && icingacli setup token create \
+  && chown apache:apache etc/icingaweb2/setup.token
+
 find etc/icingaweb2 -type f -name '*.new' \
   | while read new ; do config $new ; done
diff --git a/system/icingaweb2/icingaweb2.SlackBuild b/system/icingaweb2/icingaweb2.SlackBuild
index 5ec8c94539..6d0338d7ce 100644
--- a/system/icingaweb2/icingaweb2.SlackBuild
+++ b/system/icingaweb2/icingaweb2.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for icingaweb2
 
-# Copyright 2015  Mario Preksavec, Zagreb, Croatia
+# Copyright 2015, 2022  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,27 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=icingaweb2
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+IPLVER=${IPLVER:-0.8.1}
+IPTVER=${IPTVER:-0.10.0}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -56,16 +69,24 @@ find -L . \
 
 # Manual install
 mkdir -p $PKG/usr/{bin,lib${LIBDIRSUFFIX}/php,share/$PRGNAM/library} \
-  $PKG/etc/{$PRGNAM/modules,httpd/extra} $PKG/var/log/$PRGNAM
+  $PKG/etc/{$PRGNAM/modules,httpd/extra} $PKG/var/{lib,log}/$PRGNAM \
+  $PKG/usr/share/bash-completion/completions
 cp -a application modules public $PKG/usr/share/$PRGNAM
 cp -a library/Icinga $PKG/usr/lib${LIBDIRSUFFIX}/php
 cp -a library/vendor $PKG/usr/share/$PRGNAM/library
-cp -a etc/bash_completion.d $PKG/etc
+cp -a etc/bash_completion.d/* $PKG/usr/share/bash-completion/completions/
 cp -a packages/files/apache/$PRGNAM.conf $PKG/etc/httpd/extra/$PRGNAM.conf
 cp -a packages/files/config/modules/setup $PKG/etc/$PRGNAM/modules
 cp -a packages/files/public/index.php $PKG/usr/share/$PRGNAM/public
 cp -a packages/files/bin/icingacli $PKG/usr/bin
 
+# Required modules
+mkdir -p $PKG/usr/share/icinga-php/{ipl,vendor}
+tar xf $CWD/icinga-php-library-${IPLVER}.tar.gz --strip-components 1 \
+  -C $PKG/usr/share/icinga-php/ipl
+tar xf $CWD/icinga-php-thirdparty-${IPTVER}.tar.gz --strip-components 1 \
+  -C $PKG/usr/share/icinga-php/vendor
+
 # Change default paths
 sed -i "s#usr/share/doc/$PRGNAM/schema#usr/doc/$PRGNAM-$VERSION/schema#" \
   $PKG/etc/$PRGNAM/modules/setup/config.ini
@@ -75,11 +96,8 @@ sed -i "s#usr/share/php#usr/lib${LIBDIRSUFFIX}/php#" $PKG/usr/bin/icingacli \
 # Append .new to configs
 find $PKG/etc/httpd/extra $PKG/etc/$PRGNAM -type f -exec mv {} {}.new \;
 
-# Generate setup token
-head -c 12 /dev/urandom | base64 | tee $PKG/etc/$PRGNAM/setup.token
-
 # Apache needs permissions
-chown -R apache:apache $PKG/etc/$PRGNAM $PKG/var/log/$PRGNAM
+chown -R apache:apache $PKG/etc/$PRGNAM $PKG/var/{lib,log}/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a doc/* etc/schema $PKG/usr/doc/$PRGNAM-$VERSION
@@ -90,4 +108,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/icingaweb2/icingaweb2.info b/system/icingaweb2/icingaweb2.info
index 742df1e223..b998398c3e 100644
--- a/system/icingaweb2/icingaweb2.info
+++ b/system/icingaweb2/icingaweb2.info
@@ -1,8 +1,12 @@
 PRGNAM="icingaweb2"
-VERSION="2.1.0"
-HOMEPAGE="https://www.icinga.org/"
-DOWNLOAD="https://github.com/Icinga/icingaweb2/archive/v2.1.0.tar.gz"
-MD5SUM="8b2e8ad789b5cf31f5fac38a7513a301"
+VERSION="2.10.1"
+HOMEPAGE="https://www.icinga.com/"
+DOWNLOAD="https://github.com/Icinga/icingaweb2/archive/v2.10.1/icingaweb2-2.10.1.tar.gz \
+          https://github.com/Icinga/icinga-php-library/archive/v0.8.1/icinga-php-library-0.8.1.tar.gz \
+          https://github.com/Icinga/icinga-php-thirdparty/archive/v0.10.0/icinga-php-thirdparty-0.10.0.tar.gz"
+MD5SUM="87456d800ab39c1be6d8f682e3e06fbe \
+        6bb88cac67ac578189f3f1a5e0a7ccbb \
+        08a47aa73b02d52541bd5365f99aa60e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/icingaweb2/slack-desc b/system/icingaweb2/slack-desc
index f5a0a1a1e0..b28356992f 100644
--- a/system/icingaweb2/slack-desc
+++ b/system/icingaweb2/slack-desc
@@ -13,7 +13,7 @@ icingaweb2: interface, framework and command-line interface developed by the
 icingaweb2: Icinga Project, supporting Icinga 2, Icinga Core and any other
 icingaweb2: monitoring backend compatible with the Livestatus Protocol.
 icingaweb2:
-icingaweb2: Homepage: http://www.icinga.org/
+icingaweb2: Homepage: https://www.icinga.com/
 icingaweb2:
 icingaweb2:
 icingaweb2:
diff --git a/system/idle3-tools/README b/system/idle3-tools/README
index c7b720f8b8..c0d560d4e5 100644
--- a/system/idle3-tools/README
+++ b/system/idle3-tools/README
@@ -1,20 +1,22 @@
-Idle3-tools provides a linux/unix utility that can disable, get and set the
-value of the infamous idle3 timer found on recent Western Digital Hard Disk
-Drives.
+Idle3-tools provides a linux/unix utility that can disable, get and
+set the value of the infamous idle3 timer found on recent Western
+Digital Hard Disk Drives.
 
 It can be used as an alternative to the official wdidle3.exe proprietary
 utility, without the need to reboot in a DOS environement.
 
-A power off/on cycle of the drive will still be mandatory for new settings
-to be taken into account.
+A power off/on cycle of the drive will still be mandatory for new
+settings to be taken into account.
 
-Modern Western Digital "Green" Drives include the Intellipark feature that
-stops the disk when not in use.  Unfortunately, the default timer setting is
-not perfect on linux/unix systems, including many NAS, and leads to a dramatic
-increase of the Load Cycle Count value (SMART attribute #193).
+Modern Western Digital "Green" Drives include the Intellipark feature
+that stops the disk when not in use. Unfortunately, the default timer
+setting is not perfect on linux/unix systems, including many NAS,
+and leads to a dramatic increase of the Load Cycle Count value (SMART
+attribute #193).
 
 Idle3-tools is an independant project, unrelated in any way to 
 Western Digital Corp.
 
-WARNING : THIS SOFTWARE IS EXPERIMENTAL AND NOT WELL TESTED. IT ACCESSES LOW
-LEVEL INFORMATION OF YOUR HARDDRIVE. USE AT YOUR OWN RISK.
+WARNING: THIS SOFTWARE IS EXPERIMENTAL AND NOT WELL TESTED. IT
+ACCESSES LOW LEVEL INFORMATION OF YOUR HARDDRIVE. USE AT YOUR OWN
+RISK.
diff --git a/system/idle3-tools/idle3-tools.SlackBuild b/system/idle3-tools/idle3-tools.SlackBuild
index 336455e06c..c46660c382 100644
--- a/system/idle3-tools/idle3-tools.SlackBuild
+++ b/system/idle3-tools/idle3-tools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for idle3-tools - This linux/unix utility can
 # be used to remove or set the infamous idle3 timer found on recent
@@ -32,26 +32,36 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=idle3-tools
 VERSION=${VERSION:-0.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -97,4 +107,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ifuse/ifuse.SlackBuild b/system/ifuse/ifuse.SlackBuild
index 03aecf9f2d..e34bacdd5f 100644
--- a/system/ifuse/ifuse.SlackBuild
+++ b/system/ifuse/ifuse.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ifuse
 
@@ -26,10 +26,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ifuse
 VERSION=${VERSION:-1.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -39,7 +42,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -103,4 +113,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ima-evm-utils/README b/system/ima-evm-utils/README
new file mode 100644
index 0000000000..ec9deccf9b
--- /dev/null
+++ b/system/ima-evm-utils/README
@@ -0,0 +1,12 @@
+Linux kernel integrity subsystem is comprised of a number of different
+components including the Integrity Measurement Architecture (IMA),
+Extended Verification Module (EVM), IMA-appraisal extension, digital
+signature verification extension and audit measurement log support.
+
+The evmctl utility is used for producing and verifying digital
+signatures, which are used by the Linux kernel integrity subsystem. It
+is also used for importing keys into the kernel keyring.
+
+Linux integrity subsystem allows to use IMA and EVM signatures. EVM
+signature protects file metadata, such as file attributes and extended
+attributes. IMA signature protects file content.
diff --git a/system/ima-evm-utils/ima-evm-utils.SlackBuild b/system/ima-evm-utils/ima-evm-utils.SlackBuild
new file mode 100644
index 0000000000..570580b6e4
--- /dev/null
+++ b/system/ima-evm-utils/ima-evm-utils.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+# Slackware build script for Linux IMA EVM Utilities
+
+# Copyright 2022 Ebben Aries <slackbuilds@dscp.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ima-evm-utils
+VERSION=${VERSION:-1.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./autogen.sh
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-shared=yes \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+rm -f $PKG/usr/lib*/*.la
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ima-evm-utils/ima-evm-utils.info b/system/ima-evm-utils/ima-evm-utils.info
new file mode 100644
index 0000000000..f380112656
--- /dev/null
+++ b/system/ima-evm-utils/ima-evm-utils.info
@@ -0,0 +1,10 @@
+PRGNAM="ima-evm-utils"
+VERSION="1.4"
+HOMEPAGE="http://sourceforge.net/p/linux-ima/ima-evm-utils"
+DOWNLOAD="https://cfhcable.dl.sourceforge.net/project/linux-ima/ima-evm-utils/ima-evm-utils-1.4.tar.gz"
+MD5SUM="d1cb73c10857b5526ee1f37769c5458a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Ebben Aries"
+EMAIL="slackbuilds@dscp.org"
diff --git a/system/ima-evm-utils/slack-desc b/system/ima-evm-utils/slack-desc
new file mode 100644
index 0000000000..3d52dc2308
--- /dev/null
+++ b/system/ima-evm-utils/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+ima-evm-utils: ima-evm-utils (Linux IMA Extended Verification Module Utilities)
+ima-evm-utils:
+ima-evm-utils: Linux kernel integrity subsystem is comprised of a number of
+ima-evm-utils: different components including the Integrity Measurement Architecture
+ima-evm-utils: (IMA), Extended Verification Module (EVM), IMA-appraisal extension,
+ima-evm-utils: digital signature verification extension and audit measurement log
+ima-evm-utils: support.
+ima-evm-utils:
+ima-evm-utils: Homepage: https://sourceforge.net/p/linux-ima/wiki/Home/
+ima-evm-utils:
+ima-evm-utils:
diff --git a/system/image-analyzer/image-analyzer.SlackBuild b/system/image-analyzer/image-analyzer.SlackBuild
index 80ca5eed06..236eeb0b47 100644
--- a/system/image-analyzer/image-analyzer.SlackBuild
+++ b/system/image-analyzer/image-analyzer.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for image-analyzer
 # Application to display tree structure of disc images
 
 # Copyright 2010-2013 Niels Horn, Rio de Janeiro, RJ, Brazil <niels.horn@gmail.com>
-# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2018-2024 Isaac Yu <isaacyu@protonmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=image-analyzer
-VERSION=${VERSION:-3.2.4}
+VERSION=${VERSION:-3.2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,7 +71,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -100,4 +107,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/image-analyzer/image-analyzer.info b/system/image-analyzer/image-analyzer.info
index 4c8c475f3d..143681f991 100644
--- a/system/image-analyzer/image-analyzer.info
+++ b/system/image-analyzer/image-analyzer.info
@@ -1,10 +1,10 @@
 PRGNAM="image-analyzer"
-VERSION="3.2.4"
-HOMEPAGE="https://cdemu.sourceforge.net/about/analyzer/"
-DOWNLOAD="https://downloads.sourceforge.net/cdemu/image-analyzer-3.2.4.tar.bz2"
-MD5SUM="ae7cb81e5909805bf96ce9dfa3ad1328"
+VERSION="3.2.6"
+HOMEPAGE="https://cdemu.sourceforge.io/about/analyzer/"
+DOWNLOAD="https://downloads.sourceforge.net/cdemu/image-analyzer-3.2.6.tar.xz"
+MD5SUM="6579397c0c143173bf57d010eba77257"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libmirage pygobject3-python3 cairocffi python3-matplotlib"
+REQUIRES="libmirage python3-cairocffi python3-matplotlib"
 MAINTAINER="Isaac Yu"
-EMAIL="isaacyu1@isaacyu1.com"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/imwheel/README b/system/imwheel/README
index 4798081f73..47ded69bc3 100644
--- a/system/imwheel/README
+++ b/system/imwheel/README
@@ -1,17 +1,16 @@
-IMWheel is a universal mouse wheel and mouse stick translator for X Windows
-using either a special version of gpm and its /dev/gpmwheel FIFO or the
-support for a ZAxis on the mouse built into X.  Utilizing the input from gpm
-or X Windows, imwheel translates mouse wheel and mouse stick actions into
-keyboard events using the XTest extension to X.  Use xdpyinfo for information
-on the supported extensions in your X server.
+IMWheel is a universal mouse wheel and mouse stick translator for X
+Windows using either a special version of gpm and its /dev/gpmwheel FIFO
+or the support for a ZAxis on the mouse built into X.  Utilizing the
+input from gpm or X Windows, imwheel translates mouse wheel and mouse
+stick actions into keyboard events using the XTest extension to X.  Use
+xdpyinfo for information on the supported extensions in your X server.
 
-This build script has a patch that disables the configurator appearing when
-you mouse up and down on the root window.  I did this because it stopped the
-ability for workspace changing in fluxbox and other WMs, and it would also
-pop up at the most annoying times ;)  However, the configurator window can
-still be found with the "-c" switch.
+This build script has a patch that disables the configurator appearing
+when you mouse up and down on the root window.  I did this because it
+stopped the ability for workspace changing in fluxbox and other WMs, and
+it would also pop up at the most annoying times ;)  However, the
+configurator window can still be found with the "-c" switch.
 
-If you do NOT wish to apply this patch, run the script with PATCH=no in the
-environment:
+If you do NOT wish to apply this patch, run the script with PATCH=no:
 
 PATCH=no ./imwheel.SlackBuild
diff --git a/system/imwheel/imwheel.SlackBuild b/system/imwheel/imwheel.SlackBuild
index 5a0bb83416..82dd077e2f 100644
--- a/system/imwheel/imwheel.SlackBuild
+++ b/system/imwheel/imwheel.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for imwheel
 
@@ -22,10 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=imwheel
 VERSION=${VERSION:-1.0.0pre12}
 BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -102,4 +112,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/imwheel/imwheel.info b/system/imwheel/imwheel.info
index bad400108c..76f3d8bae9 100644
--- a/system/imwheel/imwheel.info
+++ b/system/imwheel/imwheel.info
@@ -6,5 +6,5 @@ MD5SUM="21d81db739ae95d96f9b650f7b826a14"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
+MAINTAINER="D Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/system/incron/incron.SlackBuild b/system/incron/incron.SlackBuild
index c1227dbf4e..efab451c5e 100644
--- a/system/incron/incron.SlackBuild
+++ b/system/incron/incron.SlackBuild
@@ -1,15 +1,19 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for incrond
 
 # Written by Asaf Ohaion asaf@lingnu.com
 # Modified by Willy Sudiarto Raharjo <willysr@slackware-id.org>
-# Modified 2017 by Marek Srejma <sam_web@yahoo.de>
+# Modified 2017 by Marek Šrejma <marek@modweb.de>, Germany
+# Modified 2022 by B. Watson <urchlay@slackware.uk>, to fix Slack 15.0 build.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=incron
 VERSION=${VERSION:-0.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +23,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -49,26 +57,28 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 sed -i 's|/share/|/|g' Makefile
 
-make PREFIX=/usr
-make install DESTDIR=$PKG PREFIX=/usr MANPATH=/usr/man
+make \
+  PREFIX=/usr \
+  MANPATH=/usr/man \
+  OPTIMIZE="$SLKCFLAGS -std=gnu++11" \
+  DEBUG="-Wl,-s" \
+  DESTDIR=$PKG \
+  all \
+  install
+
+gzip -9 $PKG/usr/man/man*/*
 
 # Install init script:
 mkdir -p $PKG/etc/rc.d
 cp $CWD/rc.incrond $PKG/etc/rc.d/rc.incrond.new
 chmod 644 $PKG/etc/rc.d/rc.incrond.new
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CHANGELOG COPYING README LICENSE-* VERSION $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -78,4 +88,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/incron/incron.info b/system/incron/incron.info
index b5496da4d7..7df0db6285 100644
--- a/system/incron/incron.info
+++ b/system/incron/incron.info
@@ -6,5 +6,5 @@ MD5SUM="76e072903edd1ae5a923c528669faccd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Marek Srejma"
-EMAIL="sam_web@yahoo.de"
+MAINTAINER="Marek Šrejma"
+EMAIL="marek@modweb.de"
diff --git a/system/influxdb/README b/system/influxdb/README
index 9200de4e15..cac6bb0a31 100644
--- a/system/influxdb/README
+++ b/system/influxdb/README
@@ -1,17 +1,18 @@
 influxdb (An Open-Source Time Series Database)
 
-InfluxDB is an open source time series database with no external dependencies.
-It's useful for recording metrics, events, and performing analytics.
-
-It supports high write loads, large data set storage, and conserves space thru
-downsampling, automatically expiring and deleting unwanted data as well as
-backup and restore. InfluxDB also makes it easy to analyze data by providing an
-easy-to-use SQL-like query language.
+InfluxDB is an open source time series database with no external
+dependencies. It's useful for recording metrics, events, and
+performing analytics.
 
+It supports high write loads, large data set storage, and conserves
+space thru downsampling, automatically expiring and deleting unwanted
+data as well as backup and restore. InfluxDB also makes it easy to
+analyze data by providing an easy-to-use SQL-like query language.
 
 Groupname and Username
 
-You must have the "influxdb" group and user to run this script, for example:
+You must have the "influxdb" group and user to run this script, for
+example:
 
   groupadd -g 348 influxdb
   useradd -u 348 -s /bin/false -d /var/lib/influxdb influxdb
diff --git a/system/influxdb/influxdb.SlackBuild b/system/influxdb/influxdb.SlackBuild
index 6f1b3b8942..0ba01bf2b8 100644
--- a/system/influxdb/influxdb.SlackBuild
+++ b/system/influxdb/influxdb.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for InfluxDB
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=influxdb
 VERSION=${VERSION:-1.3.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -46,7 +49,14 @@ elif ! grep -q ^${PRGNAM}: /etc/passwd; then
 	exit 1
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -112,4 +122,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/influxdb/influxdb.info b/system/influxdb/influxdb.info
index 8f7ed9b95f..9b004fe693 100644
--- a/system/influxdb/influxdb.info
+++ b/system/influxdb/influxdb.info
@@ -1,9 +1,9 @@
 PRGNAM="influxdb"
 VERSION="1.3.5"
 HOMEPAGE="https://www.influxdata.com"
-DOWNLOAD="https://dl.influxdata.com/influxdb/releases/influxdb-1.3.5_linux_i386.tar.gz"
+DOWNLOAD="https://slackware.uk/sbosrcarch/by-name/system/influxdb/influxdb-1.3.5_linux_i386.tar.gz"
 MD5SUM="2c726f09e1df3766138a0615cb57cd44"
-DOWNLOAD_x86_64="https://dl.influxdata.com/influxdb/releases/influxdb-1.3.5_linux_amd64.tar.gz"
+DOWNLOAD_x86_64="https://slackware.uk/sbosrcarch/by-name/system/influxdb/influxdb-1.3.5_linux_amd64.tar.gz"
 MD5SUM_x86_64="af2fb2629c828bd4458e3fcdb82c69fe"
 REQUIRES=""
 MAINTAINER="Giuseppe Di Terlizzi"
diff --git a/system/info2man/info2man.SlackBuild b/system/info2man/info2man.SlackBuild
index 54c56d52ca..f7d95f85e1 100644
--- a/system/info2man/info2man.SlackBuild
+++ b/system/info2man/info2man.SlackBuild
@@ -1,11 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for info2man
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210825 bkw: no changes. looked at debian's 1.1-10, but there are
+# no changes there that apply to us (only apply to debian's package
+# building tools).
+
 # 20201102 bkw: update for v1.1_9 (debian's 1.1-9)
 
 # 20140907 bkw: original site blocks downloads based on user-agent. Host
@@ -13,13 +17,20 @@
 # didn't bump the BUILD.
 # Original download link: http://www.cskk.ezoshosting.com/cs/css/info2man.tar.gz
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=info2man
 VERSION=${VERSION:-1.1_9}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -74,4 +85,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/info2man/info2man.info b/system/info2man/info2man.info
index d2349216cc..90e7576869 100644
--- a/system/info2man/info2man.info
+++ b/system/info2man/info2man.info
@@ -1,12 +1,12 @@
 PRGNAM="info2man"
 VERSION="1.1_9"
 HOMEPAGE="https://packages.debian.org/sid/info2man"
-DOWNLOAD="http://deb.debian.org/debian/pool/main/i/info2man/info2man_1.1.orig.tar.gz \
-          http://deb.debian.org/debian/pool/main/i/info2man/info2man_1.1-9.debian.tar.xz"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/i/info2man/info2man_1.1.orig.tar.gz \
+          https://deb.debian.org/debian/pool/main/i/info2man/info2man_1.1-9.debian.tar.xz"
 MD5SUM="37e9cd74683e1832a4f27ad5c7961a7b \
         0610fec52815b003df8732d3ab21f0f5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/ink/README b/system/ink/README
new file mode 100644
index 0000000000..50e4511e16
--- /dev/null
+++ b/system/ink/README
@@ -0,0 +1,3 @@
+Ink is a command line tool for checking the ink level of your printer 
+on a system which runs Linux. It makes use of libinklevel.  As such,
+you must have libinklevel installed in order to build the ink package.
diff --git a/system/ink/ink.SlackBuild b/system/ink/ink.SlackBuild
new file mode 100644
index 0000000000..9d24ba1482
--- /dev/null
+++ b/system/ink/ink.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# Slackware build script for ink
+
+# Maintained by D Woodfall (2022-) <dave@slackbuilds.org>
+#
+# Copyright 2006-2009  Robby Workman (http://rlworkman.net)
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ink
+VERSION=${VERSION:-0.5.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+gzip -9 $PKG/usr/man/man1/ink.1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ink/ink.info b/system/ink/ink.info
new file mode 100644
index 0000000000..31e972253a
--- /dev/null
+++ b/system/ink/ink.info
@@ -0,0 +1,10 @@
+PRGNAM="ink"
+VERSION="0.5.3"
+HOMEPAGE="http://ink.sourceforge.net/"
+DOWNLOAD="https://downloads.sourceforge.net/ink/ink-0.5.3.tar.gz"
+MD5SUM="7ddb245c1b0314a4348f2a43e8d37885"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libinklevel"
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/system/ink/slack-desc b/system/ink/slack-desc
new file mode 100644
index 0000000000..27c1b54d90
--- /dev/null
+++ b/system/ink/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+   |-----handy-ruler------------------------------------------------------|
+ink: ink (printer ink level monitor)
+ink:
+ink: Ink is a command line tool for checking the ink level of your printer
+ink: on a system which runs Linux. It makes use of libinklevel.
+ink:
+ink: Homepage: http://ink.sourceforge.net/
+ink:
+ink:
+ink:
+ink:
+ink:
diff --git a/system/innotop/README b/system/innotop/README
deleted file mode 100644
index 91cdb498ac..0000000000
--- a/system/innotop/README
+++ /dev/null
@@ -1,6 +0,0 @@
-MySQL and InnoDB transaction/status monitor. Like 'top' for MySQL.
-
-Displays queries, InnoDB transactions, lock waits, deadlocks, foreign key
-errors, open tables, replication status, buffer information, row
-operations, logs, I/O operations, load graph, and more.
-You can monitor many servers at once with innotop.
diff --git a/system/innotop/innotop.SlackBuild b/system/innotop/innotop.SlackBuild
deleted file mode 100644
index feebb18fe5..0000000000
--- a/system/innotop/innotop.SlackBuild
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for innotop
-
-# Copyright 2010-2013 Heinz Wiesinger, Amsterdam, The Netherlands
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=innotop
-VERSION=${VERSION:-1.9.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH="noarch"
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-perl Makefile.PL INSTALLDIRS=vendor
-make
-make test
-make install DESTDIR=$PKG
-
-#Move man-pages to appropriate place
-mv $PKG/usr/share/man $PKG/usr/
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-find $PKG -depth -type d -empty -exec rm -rf {} \;
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changelog COPYING INSTALL MANIFEST \
- $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/innotop/innotop.info b/system/innotop/innotop.info
deleted file mode 100644
index 5db755263b..0000000000
--- a/system/innotop/innotop.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="innotop"
-VERSION="1.9.1"
-HOMEPAGE="https://github.com/innotop/innotop"
-DOWNLOAD="https://distfiles.macports.org/innotop/innotop-1.9.1.tar.gz"
-MD5SUM="7979b7a074e43fe1f0d032034e234bac"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
diff --git a/system/innotop/slack-desc b/system/innotop/slack-desc
deleted file mode 100644
index 889a1b9c46..0000000000
--- a/system/innotop/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-innotop: innotop (MySQL / InnoDB monitor application)
-innotop:
-innotop: MySQL and InnoDB transaction/status monitor. Like 'top' for MySQL.
-innotop: Displays queries, InnoDB transactions, lock waits, deadlocks, foreign
-innotop: key errors, open tables, replication status, buffer information, row
-innotop: operations, logs, I/O operations, load graph, and more.
-innotop: You can monitor many servers at once with innotop.
-innotop:
-innotop: Homepage: https://github.com/innotop/innotop
-innotop:
-innotop:
diff --git a/system/inotify-info/README b/system/inotify-info/README
new file mode 100644
index 0000000000..8bdd102903
--- /dev/null
+++ b/system/inotify-info/README
@@ -0,0 +1,9 @@
+inotify-info - Linux inotify info reporting app
+
+Easily track down the number of inotify watches, instances, and which
+files are being watched.
+
+The Linux inotify system has a few issues and it can be difficult to
+debug when you for instance run out of watches. Using this app should
+hopefully aid you in tracking down how many inotify watches, instances,
+and what files are being watched.
diff --git a/system/inotify-info/inotify-info.SlackBuild b/system/inotify-info/inotify-info.SlackBuild
new file mode 100644
index 0000000000..35417bf478
--- /dev/null
+++ b/system/inotify-info/inotify-info.SlackBuild
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+# Slackware build script for inotify-info
+
+# Copyright 2023 xaizek <xaizek@posteo.net>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=inotify-info
+VERSION=${VERSION:-20230226_8add69e}
+COMMIT=${COMMIT:-8add69efcfc702322819321387bae9043d7d4b59}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$COMMIT
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
+cd $PRGNAM-$COMMIT
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# redefining unimportant flags to not patch Makefile
+make WARNINGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
+install -D -t $PKG/usr/bin _release/inotify-info
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/inotify-info/inotify-info.info b/system/inotify-info/inotify-info.info
new file mode 100644
index 0000000000..4f5ac61bf0
--- /dev/null
+++ b/system/inotify-info/inotify-info.info
@@ -0,0 +1,10 @@
+PRGNAM="inotify-info"
+VERSION="20230226_8add69e"
+HOMEPAGE="https://github.com/mikesart/inotify-info"
+DOWNLOAD="https://github.com/mikesart/inotify-info/archive/8add69e/inotify-info-8add69efcfc702322819321387bae9043d7d4b59.tar.gz"
+MD5SUM="a800f3eaaec2ef5812a3c20ccee3244c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="xaizek"
+EMAIL="xaizek@posteo.net"
diff --git a/system/inotify-info/slack-desc b/system/inotify-info/slack-desc
new file mode 100644
index 0000000000..d4a5d83cae
--- /dev/null
+++ b/system/inotify-info/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+inotify-info: inotify-info (Linux inotify info reporting app)
+inotify-info:
+inotify-info: Easily track down the number of inotify watches, instances, and which
+inotify-info: files are being watched.
+inotify-info:
+inotify-info: The Linux inotify system has a few issues and it can be difficult to
+inotify-info: debug when you for instance run out of watches. Using this app should
+inotify-info: hopefully aid you in tracking down how many inotify watches,
+inotify-info: instances, and what files are being watched.
+inotify-info:
+inotify-info:
diff --git a/system/intel-microcode/intel-microcode.SlackBuild b/system/intel-microcode/intel-microcode.SlackBuild
index b01b44546b..7a559f3cb3 100644
--- a/system/intel-microcode/intel-microcode.SlackBuild
+++ b/system/intel-microcode/intel-microcode.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for intel-microcode
 
-# Copyright 2020 Andrzej Telszewski, Szczecin
+# Copyright 2023 Andrzej Telszewski, Koszalin
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,34 +22,39 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=intel-microcode
 SRCNAM=Intel-Linux-Processor-Microcode-Data-Files-microcode
-VERSION=${VERSION:-20201110}
+VERSION=${VERSION:-20231114}
+SRCVER=$(printf "%s" "${VERSION}" | tr _ -)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -e
+set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
 
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-mv $SRCNAM-$VERSION $PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+mv $SRCNAM-$SRCVER $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
+
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod -R a-st,u+rwX,go-w+rX .
 
 mkdir -p $PKG/lib/firmware
 cp -a intel-ucode $PKG/lib/firmware
@@ -77,4 +82,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/intel-microcode/intel-microcode.info b/system/intel-microcode/intel-microcode.info
index 743a9c1074..ae14367a08 100644
--- a/system/intel-microcode/intel-microcode.info
+++ b/system/intel-microcode/intel-microcode.info
@@ -1,8 +1,8 @@
 PRGNAM="intel-microcode"
-VERSION="20201110"
+VERSION="20231114"
 HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files"
-DOWNLOAD="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20201110/Intel-Linux-Processor-Microcode-Data-Files-microcode-20201110.tar.gz"
-MD5SUM="132d927e9fc1ba01d8464ab3560e3ea6"
+DOWNLOAD="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20231114/Intel-Linux-Processor-Microcode-Data-Files-microcode-20231114.tar.gz"
+MD5SUM="1648cf08cb7176db32aff82889e5cb1d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="iucode_tool"
diff --git a/system/intelmas/README b/system/intelmas/README
index 2b3a4f8d60..1665518f10 100644
--- a/system/intelmas/README
+++ b/system/intelmas/README
@@ -1,13 +1,7 @@
-intelmas (Intel Memory And Storage Tool)
+intelmas (Intel Memory And Storage Tool) is a proprietary command-line
+tool to manage Optane SSDs and memory devices. It provides firmware
+update capability as well as reading and setting many configuration
+settings.
 
-The intelmas is a proprietary command-line tool to manage Intel SSDs and
-Optane memory devices. It provides firmware update capability as well as
-reading and setting many configuration settings.
-
-The intelmas unifies functionality of several Intel programs including
-the isdct (Intel SSD Data Center Tool), which was previously available
-on SBo. The intelmas is a drop-in replacement for the isdct.
-
-To work with SATA drives intelmas requires the sg kernel module. To have
-this module loaded on boot, please uncomment the corresponding line in
-/etc/rc.d/rc.modules.local
+Before version 2.0 intelmas supported also Intel NAND SSDs. Now these
+devices supported by sst (available on SBo).
diff --git a/system/intelmas/intelmas.SlackBuild b/system/intelmas/intelmas.SlackBuild
index ea0420f8c3..659235fe0f 100644
--- a/system/intelmas/intelmas.SlackBuild
+++ b/system/intelmas/intelmas.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for intelmas
 
-# Copyright 2020-2021, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2020-2022, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=intelmas
-VERSION=${VERSION:-1.5}
+VERSION=${VERSION:-2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -42,7 +45,11 @@ case "$ARCH" in
           exit 1 ;;
 esac
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -56,8 +63,8 @@ rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 
-unzip "$CWD/Intel*MAS_CLI_Tool_*Linux*.zip"
-rpm2cpio intelmas-${VERSION}*.$RPMARCH.rpm | cpio -imdv
+unzip "$CWD/Intel*MAS_CLI_Tool_*Linux*${VERSION}.zip"
+rpm2cpio ${PRGNAM}-${VERSION}*.$RPMARCH.rpm | cpio -imdv
 
 chown -R root:root .
 find -L . \
@@ -69,16 +76,19 @@ find -L . \
 # The library path is hard-coded, so we stick with /usr/lib
 cp -a usr $PKG
 mv $PKG/usr/bin $PKG/usr/sbin
+rm -rf $PKG/usr/lib/.build-id
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.pdf *.PDF $PKG/usr/doc/$PRGNAM-$VERSION 2>/dev/null || :
+cp -a *.pdf $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/intelmas $PKG/usr/doc/$PRGNAM-$VERSION/Licenses
+rmdir $PKG/usr/share/doc $PKG/usr/share
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/intelmas/intelmas.info b/system/intelmas/intelmas.info
index 7f17259929..effe558f24 100644
--- a/system/intelmas/intelmas.info
+++ b/system/intelmas/intelmas.info
@@ -1,8 +1,8 @@
 PRGNAM="intelmas"
-VERSION="1.5"
-HOMEPAGE="https://downloadcenter.intel.com/download/30162"
-DOWNLOAD="https://downloadmirror.intel.com/30162/eng/Intel%C2%AE_MAS_CLI_Tool_Linux.zip"
-MD5SUM="1679f9d79769aa244c162723650bc57e"
+VERSION="2.3"
+HOMEPAGE="https://www.intel.com/content/www/us/en/download/19520/"
+DOWNLOAD="https://downloadmirror.intel.com/794735/Intel_MAS_CLI_Tool_Linux_2.3.zip"
+MD5SUM="e2ba538a05a277587d745a3851a87192"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/intelmas/slack-desc b/system/intelmas/slack-desc
index a09c4a9d2c..8d6a2ebb62 100644
--- a/system/intelmas/slack-desc
+++ b/system/intelmas/slack-desc
@@ -8,12 +8,12 @@
         |-----handy-ruler------------------------------------------------------|
 intelmas: intelmas (Intel Memory And Storage Tool)
 intelmas:
-intelmas: The intelmas is a proprietary command-line tool to manage Intel SSDs
-intelmas: and Optane memory devices. It provides firmware update capability as
-intelmas: well as reading and setting many configuration settings.
+intelmas: intelmas (Intel Memory And Storage Tool) is a proprietary
+intelmas: command-line tool to manage Optane SSDs and memory devices. It
+intelmas: provides firmware update capability as well as reading and setting
+intelmas: many configuration settings.
 intelmas:
-intelmas:
-intelmas: Homepage: https://downloadcenter.intel.com/download/30162
+intelmas: Homepage: https://www.intel.com/content/www/us/en/download/19520/
 intelmas:
 intelmas:
 intelmas:
diff --git a/system/interceptty/README b/system/interceptty/README
new file mode 100644
index 0000000000..ac7c52f897
--- /dev/null
+++ b/system/interceptty/README
@@ -0,0 +1,8 @@
+interceptty is designed to sit between a serial port (or other terminal
+device, or program, or socket, or something connected to a file descri-
+ptor) and a program which is communicating with that device, recording
+everything that goes back and forth between the two. It does this by o-
+pening the real device, creating a pseudo-tty, then forwarding everyth-
+ing between the two, recording whatever it sees. It has a number of op-
+tions that let you fine-tune the devices it uses and the terminal opti-
+ons for the real device.
diff --git a/system/interceptty/interceptty.SlackBuild b/system/interceptty/interceptty.SlackBuild
new file mode 100644
index 0000000000..5fc52c7313
--- /dev/null
+++ b/system/interceptty/interceptty.SlackBuild
@@ -0,0 +1,114 @@
+#!/bin/bash
+
+# Slackware build script for <interceptty>
+
+# Copyright 2023, Michales Michaloudes (clavisound), Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=interceptty
+VERSION=${VERSION:-0.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+mv $PRGNAM $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog README.md TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/interceptty/interceptty.info b/system/interceptty/interceptty.info
new file mode 100644
index 0000000000..4d9a837cd7
--- /dev/null
+++ b/system/interceptty/interceptty.info
@@ -0,0 +1,10 @@
+PRGNAM="interceptty"
+VERSION="0.6"
+HOMEPAGE="https://github.com/geoffmeyers/interceptty"
+DOWNLOAD="http://clavisound.etraq.eu/src/interceptty-0.6.tar.xz"
+MD5SUM="e6000c46e349188e7bf26f63caf8ac51"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Michales Michaloudes"
+EMAIL="korgie@gmail.com"
diff --git a/system/interceptty/slack-desc b/system/interceptty/slack-desc
new file mode 100644
index 0000000000..55ab5e8ab7
--- /dev/null
+++ b/system/interceptty/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+interceptty: interceptty (serial, terminal, socket, file descriptor sniffer)
+interceptty:
+interceptty: interceptty is designed to sit between a serial port (or other
+interceptty: terminal device, or program, or socket, or something connected to a
+interceptty: file descriptor) and a program which is communicating with that
+interceptty: device, recording everything that goes back and forth between the two.
+interceptty: It does this by opening the real device, creating a pseudo-tty, then
+interceptty: forwarding everything between the two, recording whatever it sees.
+interceptty: It has a number of options that let you fine-tune the devices it
+interceptty: uses and the terminal options for the real device.
+interceptty:
diff --git a/system/intlfonts/README b/system/intlfonts/README
new file mode 100644
index 0000000000..235ff2f1c8
--- /dev/null
+++ b/system/intlfonts/README
@@ -0,0 +1,11 @@
+Intlfonts contains free X11 fonts in the BDF and TrueType formats.
+They notably cover a large number of characters from different writing
+systems: European, Asian, Chinese, Japanese, Korean, Ethiopic and
+others.
+
+These fonts allow multilingual PostScript printing from Emacs.
+
+Slackbuild author is not aware of any packages other than Emacs using
+these fonts.
+
+This is a GNU package.
diff --git a/system/intlfonts/doinst.sh b/system/intlfonts/doinst.sh
new file mode 100644
index 0000000000..55c6cdd9ed
--- /dev/null
+++ b/system/intlfonts/doinst.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+fc-cache
diff --git a/system/intlfonts/intlfonts.SlackBuild b/system/intlfonts/intlfonts.SlackBuild
new file mode 100644
index 0000000000..60abd74e7a
--- /dev/null
+++ b/system/intlfonts/intlfonts.SlackBuild
@@ -0,0 +1,125 @@
+#!/bin/bash
+
+# Slackware build script for intlfonts
+
+# Copyright 2023, Lockywolf
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=intlfonts
+VERSION=${VERSION:-1.4.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --with-bdf=yes \
+  --with-type1=yes \
+  --with-truetype=yes \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+mkdir -p $PKG/etc/X11/xorg.conf.d/
+cat > $PKG/etc/X11/xorg.conf.d/71-intlfonts.conf <<"EOF"
+Section "Files"
+  FontPath   "/usr/share/emacs/fonts/"
+  FontPath   "/usr/share/emacs/fonts/bdf/"
+  FontPath   "/usr/share/emacs/fonts/TrueType/"
+  FontPath   "/usr/share/emacs/fonts/Type1/"
+EndSection
+EOF
+
+mkdir -p $PKG/etc/X11/app-defaults/
+cat Emacs.ap > $PKG/etc/X11/app-defaults/Emacs.ap
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  ChangeLog README NEWS Emacs.ap \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/intlfonts/intlfonts.info b/system/intlfonts/intlfonts.info
new file mode 100644
index 0000000000..e2a935906c
--- /dev/null
+++ b/system/intlfonts/intlfonts.info
@@ -0,0 +1,10 @@
+PRGNAM="intlfonts"
+VERSION="1.4.2"
+HOMEPAGE="https://directory.fsf.org/wiki/Intlfonts"
+DOWNLOAD="https://ftp.gnu.org/gnu/intlfonts/intlfonts-1.4.2.tar.gz"
+MD5SUM="28b394febfa611a9d431ea87d37c946f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.intlfonts_2023-07-11@lockywolf.net"
diff --git a/system/intlfonts/slack-desc b/system/intlfonts/slack-desc
new file mode 100644
index 0000000000..727255e3a3
--- /dev/null
+++ b/system/intlfonts/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+intlfonts: intlfonts (International X11 fixed fonts mainly for Emacs.)
+intlfonts:
+intlfonts: Intlfonts contains free X11 fonts in the BDF and TrueType formats.
+intlfonts: They notably cover a large number of characters from different
+intlfonts: writing systems: European, Asian, Chinese, Japanese, Korean,
+intlfonts: Ethiopic and others.
+intlfonts: These fonts allow multilingual PostScript printing from Emacs.
+intlfonts: This is a GNU package.
+intlfonts:
+intlfonts:
+intlfonts:
diff --git a/system/inxi/README b/system/inxi/README
deleted file mode 100644
index acc274640e..0000000000
--- a/system/inxi/README
+++ /dev/null
@@ -1,4 +0,0 @@
-inxi (a command line system information tool)
-
-Its a newer, better system information script for irc, administration,
-and system troubleshooters.
diff --git a/system/inxi/inxi.SlackBuild b/system/inxi/inxi.SlackBuild
deleted file mode 100644
index 5bfc28111a..0000000000
--- a/system/inxi/inxi.SlackBuild
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for inxi
-
-# Copyright 2011-2012 Binh Nguyen <binhvng@gmail.com>
-# Copyright 2014-2019 Aaditya Bagga <aaditya_gnulinux@zoho.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=inxi
-VERSION=${VERSION:-3.0.37}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-_VERSION_SUFFIX=${_VERSION_SUFFIX:-1}
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION-$_VERSION_SUFFIX
-tar xvf $CWD/$PRGNAM-$VERSION-$_VERSION_SUFFIX.tar.gz || tar xvf $CWD/$VERSION-$_VERSION_SUFFIX.tar.gz
-cd $TMP/$PRGNAM-$VERSION-$_VERSION_SUFFIX
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-install -D -m 0755 inxi $PKG/usr/bin/inxi
-install -D -m 0644 inxi.1 $PKG/usr/man/man1/inxi.1
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cp inxi.changelog $PKG/usr/doc/$PRGNAM-$VERSION/
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/inxi/inxi.info b/system/inxi/inxi.info
deleted file mode 100644
index e4a15bf195..0000000000
--- a/system/inxi/inxi.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="inxi"
-VERSION="3.0.37"
-HOMEPAGE="https://github.com/smxi/inxi"
-DOWNLOAD="https://github.com/smxi/inxi/archive/3.0.37-1.tar.gz"
-MD5SUM="672437de389fecd2ce807f9a36793576"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Aaditya Bagga"
-EMAIL="aaditya_gnulinux@zoho.com"
diff --git a/system/inxi/slack-desc b/system/inxi/slack-desc
deleted file mode 100644
index 5c0b9e3895..0000000000
--- a/system/inxi/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-    |-----handy-ruler------------------------------------------------------|
-inxi: inxi (a full featured system information script)
-inxi:
-inxi: A newer, better system information script for irc,
-inxi: administration, and system troubleshooters.
-inxi:
-inxi: Homepage: https://github.com/smxi/inxi
-inxi:
-inxi:
-inxi:
-inxi:
-inxi:
diff --git a/system/ioninja/ioninja.SlackBuild b/system/ioninja/ioninja.SlackBuild
index c9db3eb44b..5ec388adb7 100644
--- a/system/ioninja/ioninja.SlackBuild
+++ b/system/ioninja/ioninja.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ioninja
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ioninja
 VERSION=${VERSION:-3.10.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 case "$( uname -m )" in
   i?86) ARCH=i586 ; BASENAME=${BASENAME:-ioninja-$VERSION-linux-x86} ;;
@@ -34,7 +37,14 @@ case "$( uname -m )" in
 esac
 
 set -e
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,4 +74,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ioping/README b/system/ioping/README
index c332250748..1602dc1e5d 100644
--- a/system/ioping/README
+++ b/system/ioping/README
@@ -1,2 +1,4 @@
-An tool to monitor I/O latency in real time.
-It shows disk latency in the same way as ping shows network latency.
+ioping (simple disk I/O latency monitoring tool)
+
+A tool to monitor I/O latency in real time. It shows disk latency in
+the same way as ping shows network latency.
diff --git a/system/ioping/README.SBo b/system/ioping/README.SBo
deleted file mode 100644
index 8ce9199b36..0000000000
--- a/system/ioping/README.SBo
+++ /dev/null
@@ -1,46 +0,0 @@
-Examples
---------
-
-Show disk I/O latency using the default values and the current directory,
-until interrupted:
-
-```
-$ ioping .
-4096 bytes from . (ext4 /dev/sda3): request=1 time=0.2 ms
-4096 bytes from . (ext4 /dev/sda3): request=2 time=0.2 ms
-4096 bytes from . (ext4 /dev/sda3): request=3 time=0.3 ms
-4096 bytes from . (ext4 /dev/sda3): request=4 time=12.7 ms
-4096 bytes from . (ext4 /dev/sda3): request=5 time=0.3 ms
-^C
---- . (ext4 /dev/sda3) ioping statistics ---
-5 requests completed in 4794.0 ms, 364 iops, 1.4 MiB/s
-min/avg/max/mdev = 0.2/2.8/12.7/5.0 ms
-```
-
-Measure disk seek rate (iops, avg)
-
-```
-$ ioping -R /dev/sda
-
---- /dev/sda (device 465.8 GiB) ioping statistics ---
-186 requests completed in 3004.6 ms, 62 iops, 0.2 MiB/s
-min/avg/max/mdev = 6.4/16.0/26.8/4.7 ms
-```
-
-Measure disk sequential speed (MiB/s)
-
-```
-$ ioping -RL /dev/sda
-
---- /dev/sda (device 465.8 GiB) ioping statistics ---
-837 requests completed in 3004.1 ms, 292 iops, 72.9 MiB/s
-min/avg/max/mdev = 2.0/3.4/28.9/2.0 ms
-```
-
-Authors
--------
-
-* Konstantin Khlebnikov <koct9i@gmail.com>
-* Kir Kolyshkin <kir@openvz.org>
-
-Licensed under GPLv3 (or later) <http://www.gnu.org/licenses/gpl-3.0.txt>
diff --git a/system/ioping/ioping-0.9-Makefile.diff b/system/ioping/ioping-0.9-Makefile.diff
deleted file mode 100644
index d1cd233bdc..0000000000
--- a/system/ioping/ioping-0.9-Makefile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	2014-10-06 02:05:35.000000000 -0400
-+++ Makefile.new	2016-06-02 13:21:26.326048007 -0400
-@@ -31,7 +31,7 @@
- all: version $(BINS)
- 
- version: $(DISTFILES)
--	test ! -d .git || git describe --tags --dirty=+ | sed 's/^v//;s/-/./g' > $@
-+	echo 0.9 > $@
- 
- clean:
- 	$(RM) -f $(OBJS) $(BINS) $(MANS_F)
diff --git a/system/ioping/ioping.SlackBuild b/system/ioping/ioping.SlackBuild
index 6990e5664b..f63d60d8bd 100644
--- a/system/ioping/ioping.SlackBuild
+++ b/system/ioping/ioping.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ioping
 
@@ -24,26 +24,36 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220211 bkw: Modified by SlackBuilds.org, updated for v1.2 as the
+# previous version wouldn't build on Slackware 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ioping
-VERSION=${VERSION:-0.9}
+VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,36 +75,23 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+chmod 644 *
 
-# We don't have a git repo so we manually set the version in the Makefile
-patch < $CWD/ioping-0.9-Makefile.diff
+sed -i "s|-g -O2|$SLKCFLAGS -Wl,-s|" Makefile
 
 make install \
-  OPTS="$SLKCFLAGS" \
   PREFIX=/usr \
+  MAN1DIR=/usr/man/man1 \
   DESTDIR=$PKG
 
-strip --strip-unneeded $PKG/usr/bin/ioping
-mkdir -p $PKG/usr/man/man1
-mv $PKG/usr/share/man/man1/ioping.1 $PKG/usr/man/man1
-gzip -9 $PKG/usr/man/man1/ioping.1
-rmdir $PKG/usr/share/man/man1
-rmdir $PKG/usr/share/man
-rmdir $PKG/usr/share
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $TMP/$PRGNAM-$VERSION/changelog > $PKG/usr/doc/$PRGNAM-$VERSION/changelog
-cat $TMP/$PRGNAM-$VERSION/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
-cat $TMP/$PRGNAM-$VERSION/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+cp -a LICENSE changelog README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ioping/ioping.info b/system/ioping/ioping.info
index bd49959504..71656304b3 100644
--- a/system/ioping/ioping.info
+++ b/system/ioping/ioping.info
@@ -1,8 +1,8 @@
 PRGNAM="ioping"
-VERSION="0.9"
+VERSION="1.2"
 HOMEPAGE="https://github.com/koct9i/ioping"
-DOWNLOAD="https://github.com/koct9i/ioping/archive/v0.9/ioping-0.9.tar.gz"
-MD5SUM="8f2a9c03c3b689ed2c62b7ff72b46022"
+DOWNLOAD="https://github.com/koct9i/ioping/archive/v1.2/ioping-1.2.tar.gz"
+MD5SUM="725a974e9be8a78c0f61e06463648e53"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ioping/slack-desc b/system/ioping/slack-desc
index a77271121c..e1d29c4576 100644
--- a/system/ioping/slack-desc
+++ b/system/ioping/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-ioping: ioping (monitor I/O latency in real time)
+ioping: ioping (simple disk I/O latency monitoring tool)
 ioping:
 ioping: A tool to monitor I/O latency in real time. It shows disk latency
 ioping: in the same way as ping shows network latency.
diff --git a/system/iotop-c/README b/system/iotop-c/README
new file mode 100644
index 0000000000..48e6108b02
--- /dev/null
+++ b/system/iotop-c/README
@@ -0,0 +1,9 @@
+iotop identifies processes that use high amount of input/output
+requests on your machine.
+It is similar to the well known top utility, but instead of showing
+you what consumes CPU the most, it lists processes by their IO usage.
+Inspired by iotop Python script from Guillaume Chazarain, rewritten
+in C by Vyacheslav Trushkin and improved by Boian Bonev so it runs
+without Python at all.
+
+Note that this conflicts with iotop (install one of the two).
diff --git a/system/iotop-c/iotop-c.SlackBuild b/system/iotop-c/iotop-c.SlackBuild
new file mode 100644
index 0000000000..1bdaf9d6c6
--- /dev/null
+++ b/system/iotop-c/iotop-c.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+# Slackware build script for iotop-c
+
+# Copyright 2022-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=iotop-c
+SRCNAM=iotop
+VERSION=${VERSION:-1.26}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+DOCS="COPYING LICENSE README.md"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+sed -i "s|share/man|man|" Makefile || exit 1
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/iotop-c/iotop-c.info b/system/iotop-c/iotop-c.info
new file mode 100644
index 0000000000..2718e527bf
--- /dev/null
+++ b/system/iotop-c/iotop-c.info
@@ -0,0 +1,10 @@
+PRGNAM="iotop-c"
+VERSION="1.26"
+HOMEPAGE="https://github.com/Tomas-M/iotop"
+DOWNLOAD="https://github.com/Tomas-M/iotop/releases/download/v1.26/iotop-1.26.tar.xz"
+MD5SUM="750ca24e382cef2b897ab5975a0af90d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/iotop-c/slack-desc b/system/iotop-c/slack-desc
new file mode 100644
index 0000000000..93383e055b
--- /dev/null
+++ b/system/iotop-c/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+iotop-c: iotop-c (input/output top)
+iotop-c:
+iotop-c: iotop identifies processes that use high amount of input/output
+iotop-c: requests on your machine.
+iotop-c: It is similar to the well known top utility, but instead of showing
+iotop-c: you what consumes CPU the most, it lists processes by their IO usage.
+iotop-c: Inspired by iotop Python script from Guillaume Chazarain, rewritten
+iotop-c: in C by Vyacheslav Trushkin and improved by Boian Bonev so it runs
+iotop-c: without Python at all.
+iotop-c:
+iotop-c: homepage: https://github.com/Tomas-M/iotop
diff --git a/system/iotop/iotop.SlackBuild b/system/iotop/iotop.SlackBuild
index e2c8327557..9b57f5a9d0 100644
--- a/system/iotop/iotop.SlackBuild
+++ b/system/iotop/iotop.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for iotop
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=iotop
 VERSION=${VERSION:-0.6}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,4 +82,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ipmitool/ipmitool-openssl-1.1.patch b/system/ipmitool/ipmitool-openssl-1.1.patch
deleted file mode 100644
index 39b311f6e9..0000000000
--- a/system/ipmitool/ipmitool-openssl-1.1.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- src/plugins/lanplus/lanplus_crypt_impl.c.orig	2020-01-05 20:05:14.536039135 +0100
-+++ src/plugins/lanplus/lanplus_crypt_impl.c	2020-01-05 20:09:48.808613128 +0100
-@@ -164,10 +164,10 @@
- 							uint8_t       * output,
- 							uint32_t        * bytes_written)
- {
--	EVP_CIPHER_CTX ctx;
--	EVP_CIPHER_CTX_init(&ctx);
--	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
--	EVP_CIPHER_CTX_set_padding(&ctx, 0);
-+	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
-+	EVP_CIPHER_CTX_init(ctx);
-+	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
-+	EVP_CIPHER_CTX_set_padding(ctx, 0);
- 	
- 
- 	*bytes_written = 0;
-@@ -191,7 +191,7 @@
- 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
- 
- 
--	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
-+	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
- 	{
- 		/* Error */
- 		*bytes_written = 0;
-@@ -201,7 +201,7 @@
- 	{
- 		uint32_t tmplen;
- 
--		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
-+		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
- 		{
- 			*bytes_written = 0;
- 			return; /* Error */
-@@ -210,7 +210,8 @@
- 		{
- 			/* Success */
- 			*bytes_written += tmplen;
--			EVP_CIPHER_CTX_cleanup(&ctx);
-+			EVP_CIPHER_CTX_cleanup(ctx);
-+			EVP_CIPHER_CTX_free(ctx);
- 		}
- 	}
- }
-@@ -239,10 +240,10 @@
- 							uint8_t       * output,
- 							uint32_t        * bytes_written)
- {
--	EVP_CIPHER_CTX ctx;
--	EVP_CIPHER_CTX_init(&ctx);
--	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
--	EVP_CIPHER_CTX_set_padding(&ctx, 0);
-+	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
-+	EVP_CIPHER_CTX_init(ctx);
-+	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
-+	EVP_CIPHER_CTX_set_padding(ctx, 0);
- 
- 
- 	if (verbose >= 5)
-@@ -266,7 +267,7 @@
- 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
- 
- 
--	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
-+	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
- 	{
- 		/* Error */
- 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
-@@ -277,7 +278,7 @@
- 	{
- 		uint32_t tmplen;
- 
--		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
-+		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
- 		{
- 			char buffer[1000];
- 			ERR_error_string(ERR_get_error(), buffer);
-@@ -290,7 +291,8 @@
- 		{
- 			/* Success */
- 			*bytes_written += tmplen;
--			EVP_CIPHER_CTX_cleanup(&ctx);
-+			EVP_CIPHER_CTX_cleanup(ctx);
-+			EVP_CIPHER_CTX_free(ctx);
- 		}
- 	}
- 
diff --git a/system/ipmitool/ipmitool.SlackBuild b/system/ipmitool/ipmitool.SlackBuild
index 40fadb21fd..44b9d6702d 100644
--- a/system/ipmitool/ipmitool.SlackBuild
+++ b/system/ipmitool/ipmitool.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
 # Copyright 2009 Eric Hameleers <alien@slackware.com>, Eindhoven, Netherlands
 
@@ -11,26 +11,36 @@
 # Modified by Mario Preksavec <mario@slackware.hr>
 # Updated by Emmanuel N. Millan
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ipmitool
 VERSION=${VERSION:-1.8.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -53,13 +63,20 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Fix compilation with openssl-1.1
-[ "`openssl version | grep 1.1`" ] && patch -p0 < $CWD/ipmitool-openssl-1.1.patch
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Apply a lot of patches (thanks, fedora!)
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
+aclocal
+libtoolize --automake --copy
+autoheader
+automake --foreign --add-missing --copy
+aclocal
+autoconf
+automake --foreign
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -75,7 +92,7 @@ CXXFLAGS="$SLKCFLAGS" \
 make DOCDIR=/usr/doc/$PRGNAM-$VERSION
 make DOCDIR=/usr/doc/$PRGNAM-$VERSION install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
@@ -88,4 +105,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ipmitool/patches/0001-CVE-2011-4339-OpenIPMI.patch b/system/ipmitool/patches/0001-CVE-2011-4339-OpenIPMI.patch
new file mode 100644
index 0000000000..437c9adaf9
--- /dev/null
+++ b/system/ipmitool/patches/0001-CVE-2011-4339-OpenIPMI.patch
@@ -0,0 +1,25 @@
+From 152efd46931a70ab4e3d81e99d312df7dcd666e6 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Tue, 10 May 2016 19:12:08 +0200
+Subject: [PATCH] CVE-2011-4339 OpenIPMI
+
+IPMI event daemon creates PID file with world writeable permissions
+---
+ lib/helper.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/lib/helper.c b/lib/helper.c
+index de91438..c3a1c80 100644
+--- a/lib/helper.c
++++ b/lib/helper.c
+@@ -829,7 +829,6 @@ ipmi_start_daemon(struct ipmi_intf *intf)
+ #endif
+ 
+ 	chdir("/");
+-	umask(0);
+ 
+ 	for (fd=0; fd<64; fd++) {
+ 		if (fd != intf->fd)
+-- 
+2.7.4
+
diff --git a/system/ipmitool/patches/0002-openssl.patch b/system/ipmitool/patches/0002-openssl.patch
new file mode 100644
index 0000000000..ff5e7051bf
--- /dev/null
+++ b/system/ipmitool/patches/0002-openssl.patch
@@ -0,0 +1,89 @@
+diff -urNp old/src/plugins/lanplus/lanplus_crypt_impl.c new/src/plugins/lanplus/lanplus_crypt_impl.c
+--- old/src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ new/src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ 
diff --git a/system/ipmitool/patches/0003-ipmitool-1.8.11-set-kg-key.patch b/system/ipmitool/patches/0003-ipmitool-1.8.11-set-kg-key.patch
new file mode 100644
index 0000000000..00a396e230
--- /dev/null
+++ b/system/ipmitool/patches/0003-ipmitool-1.8.11-set-kg-key.patch
@@ -0,0 +1,240 @@
+diff -urNp old/doc/ipmitool.1 new/doc/ipmitool.1
+--- old/doc/ipmitool.1	2017-02-06 10:20:02.254362909 +0100
++++ new/doc/ipmitool.1	2017-02-06 10:33:41.729294474 +0100
+@@ -372,6 +372,20 @@ Configure user access information on the
+ 
+ Displays the list of cipher suites supported for the given
+ application (ipmi or sol) on the given channel.
++.TP
++\fIsetkg\fP <\fIhex\fP|\fIplain\fP> <\fBkey\fP> [<\fBchannel\fR>]
++.br
++
++Sets K_g key to given value. Use \fIplain\fP to specify \fBkey\fR as simple ASCII string.
++Use \fIhex\fP to specify \fBkey\fR as sequence of hexadecimal codes of ASCII charactes.
++I.e. following two examples are equivalent:
++
++.RS
++ipmitool channel setkg plain PASSWORD
++
++ipmitool channel setkg hex 50415353574F5244
++.RE
++
+ .RE
+ .RE
+ .TP 
+diff -urNp old/include/ipmitool/helper.h new/include/ipmitool/helper.h
+--- old/include/ipmitool/helper.h	2017-02-06 10:20:02.254362909 +0100
++++ new/include/ipmitool/helper.h	2017-02-06 10:40:07.336136844 +0100
+@@ -58,6 +58,8 @@
+ # define IPMI_UID_MAX 63
+ #endif
+ 
++#define IPMI_KG_BUFFER_SIZE       21 /* key plus null byte */
++
+ struct ipmi_intf;
+ 
+ struct valstr {
+diff -urNp old/include/ipmitool/ipmi_channel.h new/include/ipmitool/ipmi_channel.h
+--- old/include/ipmitool/ipmi_channel.h	2017-02-06 10:20:02.253316684 +0100
++++ new/include/ipmitool/ipmi_channel.h	2017-02-06 10:58:15.291287621 +0100
+@@ -49,6 +49,10 @@
+ #define IPMI_GET_USER_NAME             0x46
+ #define IPMI_SET_USER_PASSWORD         0x47
+ #define IPMI_GET_CHANNEL_CIPHER_SUITES 0x54
++#define IPMI_SET_CHANNEL_SECURITY_KEYS 0x56
++
++#define IPMI_KG_KEY_ID  1
++#define IPMI_SET_CHANNEL_SECURITY_KEYS_OP_SET 1
+ 
+ /* These are for channel_info_t.session_support */
+ #define IPMI_CHANNEL_SESSION_LESS 0x00
+@@ -137,6 +141,40 @@ int _ipmi_set_channel_access(struct ipmi
+ 		struct channel_access_t channel_access, uint8_t access_option,
+ 		uint8_t privilege_option);
+ 
++struct set_channel_security_keys_req {
++#if WORDS_BIGENDIAN
++	uint8_t __reserved1			:4;
++	uint8_t channel				:4;
++	
++	uint8_t __reserved2			:6;
++	uint8_t operation			:2;
++	
++	uint8_t key_id;
++	unsigned char key_value[IPMI_KG_BUFFER_SIZE-1]; /* we don't want space for '\0' at the end */
++#else
++	uint8_t channel				:4;
++	uint8_t __reserved1			:4;
++	
++	uint8_t operation			:2;
++	uint8_t __reserved2			:6;
++	
++	uint8_t key_id;
++	unsigned char key_value[IPMI_KG_BUFFER_SIZE-1]; /* we don't want space for '\0' at the end */
++#endif
++} __attribute__ ((packed));
++
++struct set_channel_security_keys_rsp {
++#if WORDS_BIGENDIAN
++	uint8_t __reserved1			:6;
++	uint8_t lock_status			:2;
++	unsigned char key_value; /* just the first character, use &key_value to explore the rest */
++#else
++	uint8_t lock_status			:2;
++	uint8_t __reserved1			:6;
++	unsigned char key_value; /* just the first character, use &key_value to explore the rest */
++#endif
++} __attribute__ ((packed));
++
+ uint8_t ipmi_get_channel_medium(struct ipmi_intf * intf, uint8_t channel);
+ uint8_t ipmi_current_channel_medium(struct ipmi_intf * intf);
+ int ipmi_channel_main(struct ipmi_intf * intf, int argc, char ** argv);
+diff -urNp old/include/ipmitool/ipmi_intf.h new/include/ipmitool/ipmi_intf.h
+--- old/include/ipmitool/ipmi_intf.h	2017-02-06 10:20:02.254362909 +0100
++++ new/include/ipmitool/ipmi_intf.h	2017-02-06 10:40:40.264577602 +0100
+@@ -60,7 +60,6 @@ enum LANPLUS_SESSION_STATE {
+ 
+ #define IPMI_AUTHCODE_BUFFER_SIZE 20
+ #define IPMI_SIK_BUFFER_SIZE      IPMI_MAX_MD_SIZE
+-#define IPMI_KG_BUFFER_SIZE       21 /* key plus null byte */
+ 
+ struct ipmi_session_params {
+ 	char * hostname;
+diff -urNp old/lib/ipmi_channel.c new/lib/ipmi_channel.c
+--- old/lib/ipmi_channel.c	2017-02-06 10:20:02.255409134 +0100
++++ new/lib/ipmi_channel.c	2017-02-06 12:32:14.222282317 +0100
+@@ -821,6 +821,92 @@ ipmi_set_user_access(struct ipmi_intf *i
+ 	return 0;
+ }
+ 
++int 
++ipmi_set_channel_security_keys (struct ipmi_intf *intf, uint8_t channel, const char *method, const char *key)
++{
++	uint8_t kgkey[IPMI_KG_BUFFER_SIZE];
++	struct ipmi_rs *rsp;
++	struct ipmi_rq req;
++	struct set_channel_security_keys_req req_data;
++	int rc = -1;
++	
++	/* convert provided key to array of bytes */
++	if (strcmp(method, "hex") == 0) {
++		if (strlen(key) > (IPMI_KG_BUFFER_SIZE-1)*2) {
++			lprintf(LOG_ERR, "Provided key is too long, max. length is %d bytes", (IPMI_KG_BUFFER_SIZE-1));
++			printf_channel_usage();
++			return -1;
++		}
++
++		rc = ipmi_parse_hex(key, kgkey, sizeof(kgkey)-1);
++		if (rc == -1) {
++			lprintf(LOG_ERR, "Number of Kg key characters is not even");
++			return rc;
++		} else if (rc == -3) {
++			lprintf(LOG_ERR, "Kg key is not hexadecimal number");
++			return rc;
++		} else if (rc > (IPMI_KG_BUFFER_SIZE-1)) {
++			lprintf(LOG_ERR, "Kg key is too long");
++			return rc;
++		}
++		
++	} else if (strcmp(method, "plain") == 0) {
++		if (strlen(key) > IPMI_KG_BUFFER_SIZE-1) {
++			lprintf(LOG_ERR, "Provided key is too long, max. length is %d bytes", (IPMI_KG_BUFFER_SIZE -1));
++			printf_channel_usage();
++			return rc;
++		}
++		
++		strncpy(kgkey, key, IPMI_KG_BUFFER_SIZE-1);
++	} else {
++		printf_channel_usage();
++		return rc;
++	}
++	
++	/* assemble and send request to set kg key */
++	memset(&req_data, 0, sizeof(req_data));
++	req_data.channel = channel;
++	req_data.operation = IPMI_SET_CHANNEL_SECURITY_KEYS_OP_SET;
++	req_data.key_id = IPMI_KG_KEY_ID;
++	memcpy(req_data.key_value, kgkey, IPMI_KG_BUFFER_SIZE-1);
++	
++	memset(&req, 0, sizeof(req));
++	req.msg.netfn = IPMI_NETFN_APP;
++	req.msg.cmd = IPMI_SET_CHANNEL_SECURITY_KEYS;
++	req.msg.data = (uint8_t*) &req_data;
++	req.msg.data_len = sizeof(req_data);
++
++	rsp = intf->sendrecv(intf, &req);
++	if (rsp == NULL) {
++		lprintf(LOG_ERR, "Set Channel Security Keys command failed");
++		return rc;
++	}
++	if (rsp->ccode > 0) {
++		const char *error = NULL;
++		switch (rsp->ccode) {
++		case 0x80:
++			error = "Key is locked";
++			break;
++		case 0x81:
++			error = "Insufficient key bytes";
++			break;
++		case 0x82:
++			error = "Too many key bytes";
++			break;
++		case 0x83:
++			error = "Key value does not meet criteria for K_g key";
++			break;
++		default:
++			error = val2str(rsp->ccode, completion_code_vals);
++		}
++		lprintf(LOG_ERR, "Error setting security key: %X (%s)", rsp->ccode, error);
++		return rc;
++	}
++	
++	lprintf(LOG_NOTICE, "Set Channel Security Keys command succeeded");
++	return 0;
++}
++
+ int
+ ipmi_channel_main(struct ipmi_intf *intf, int argc, char **argv)
+ {
+@@ -890,6 +976,19 @@ ipmi_channel_main(struct ipmi_intf *intf
+ 		retval = ipmi_get_channel_cipher_suites(intf,
+ 							argv[1], /* ipmi | sol */
+ 							channel);
++	} else if (strncmp(argv[0], "setkg", 5) == 0) {
++		if (argc < 3 || argc > 4)
++			printf_channel_usage();
++		else {
++			uint8_t ch = 0xe;
++			char *method = argv[1];
++			char *key = argv[2];
++			if (argc == 4) {
++				ch = (uint8_t)strtol(argv[3], NULL, 0);
++			}
++				
++			retval = ipmi_set_channel_security_keys(intf, ch, method, key);
++		}
+ 	} else {
+ 		lprintf(LOG_ERR, "Invalid CHANNEL command: %s\n", argv[0]);
+ 		printf_channel_usage();
+@@ -916,6 +1015,10 @@ printf_channel_usage()
+ 	lprintf(LOG_NOTICE,
+ "");
+ 	lprintf(LOG_NOTICE,
++"                  setkg hex|plain <key> [channel]");
++	lprintf(LOG_NOTICE,
++"");
++	lprintf(LOG_NOTICE,
+ "Possible privilege levels are:");
+ 	lprintf(LOG_NOTICE,
+ "   1   Callback level");
+diff -urNp old/src/plugins/ipmi_intf.c new/src/plugins/ipmi_intf.c
+--- old/src/plugins/ipmi_intf.c	2017-02-06 10:20:02.257501584 +0100
++++ new/src/plugins/ipmi_intf.c	2017-02-06 10:42:12.585257810 +0100
+@@ -55,6 +55,7 @@
+ #include <ipmitool/ipmi.h>
+ #include <ipmitool/ipmi_sdr.h>
+ #include <ipmitool/log.h>
++#include <ipmitool/helper.h>
+ 
+ #define IPMI_DEFAULT_PAYLOAD_SIZE   25
+ 
diff --git a/system/ipmitool/patches/0004-slowswid.patch b/system/ipmitool/patches/0004-slowswid.patch
new file mode 100644
index 0000000000..c5f91b7efa
--- /dev/null
+++ b/system/ipmitool/patches/0004-slowswid.patch
@@ -0,0 +1,16 @@
+diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c
+index fa7b082..9bc5ac2 100644
+--- a/lib/ipmi_sdr.c
++++ b/lib/ipmi_sdr.c
+@@ -572,6 +572,8 @@ ipmi_sdr_get_sensor_reading_ipmb(struct ipmi_intf *intf, uint8_t sensor,
+ 	uint32_t save_addr;
+ 	uint32_t save_channel;
+ 
++	if (target == (uint8_t) 0xb1)
++		return ipmi_sdr_get_sensor_reading(intf, sensor);
+ 	if ( BRIDGE_TO_SENSOR(intf, target, channel) ) {
+ 		lprintf(LOG_DEBUG,
+ 			"Bridge to Sensor "
+-- 
+2.1.0
+
diff --git a/system/ipmitool/patches/0005-sensor-id-length.patch b/system/ipmitool/patches/0005-sensor-id-length.patch
new file mode 100644
index 0000000000..0cb8313d6c
--- /dev/null
+++ b/system/ipmitool/patches/0005-sensor-id-length.patch
@@ -0,0 +1,16 @@
+diff --git a/include/ipmitool/ipmi_sdr.h b/include/ipmitool/ipmi_sdr.h
+index ccf0cf0..47d3949 100644
+--- a/include/ipmitool/ipmi_sdr.h
++++ b/include/ipmitool/ipmi_sdr.h
+@@ -819,7 +819,7 @@ static const char *sensor_type_desc[] __attribute__ ((unused)) = {
+ 	    "Version Change", "FRU State" };
+ 
+ struct sensor_reading {
+-	char		s_id[17];		/* name of the sensor */
++	char		s_id[33];		/* name of the sensor */
+ 	struct sdr_record_full_sensor    *full;
+ 	struct sdr_record_compact_sensor *compact;
+ 	uint8_t		s_reading_valid;	/* read value valididity */
+-- 
+2.1.0
+
diff --git a/system/ipmitool/patches/0006-enable-usb.patch b/system/ipmitool/patches/0006-enable-usb.patch
new file mode 100644
index 0000000000..d3bfba5a4d
--- /dev/null
+++ b/system/ipmitool/patches/0006-enable-usb.patch
@@ -0,0 +1,21 @@
+diff -urNp old/configure.ac new/configure.ac
+--- old/configure.ac	2017-02-02 14:20:33.230784269 +0100
++++ new/configure.ac	2017-02-02 14:22:53.528510336 +0100
+@@ -63,7 +63,7 @@ xenable_intf_imb=yes
+ xenable_intf_lipmi=yes
+ xenable_intf_open=yes
+ #xenable_intf_serial=yes
+-xenable_intf_usb=no
++xenable_intf_usb=yes
+ xenable_ipmishell=yes
+ 
+ dnl set some things so we build with GNU tools on Solaris
+@@ -209,7 +209,7 @@ fi
+ dnl enable IPMI USB interface
+ AC_ARG_ENABLE([intf-usb],
+ 	[AC_HELP_STRING([--enable-intf-usb],
+-			[enable IPMI USB interface [default=auto]])],
++			[enable IPMI USB interface [default=yes]])],
+ 		[xenable_intf_usb=$enableval],
+ 		[xenable_intf_usb=$xenable_intf_usb])
+ if test "x$xenable_intf_usb" = "xstatic" || test "x$xenable_intf_usb" = "xplugin"; then
diff --git a/system/ipmitool/patches/0007-check-input.patch b/system/ipmitool/patches/0007-check-input.patch
new file mode 100644
index 0000000000..030fd2a40c
--- /dev/null
+++ b/system/ipmitool/patches/0007-check-input.patch
@@ -0,0 +1,41 @@
+diff -urNp old/doc/ipmitool.1 new/doc/ipmitool.1
+--- old/doc/ipmitool.1	2017-10-03 16:10:50.446539988 +0200
++++ new/doc/ipmitool.1	2017-10-03 16:16:37.039673239 +0200
+@@ -3170,13 +3170,14 @@ SOL configuration data for the currently
+ 
+ Enable, disable or show status of SOL payload for the user on the specified channel. 
+ .TP 
+-\fIset\fP <\fBparameter\fR> <\fBvalue\fR> [<\fBchannel\fR>]
++\fIset\fP <\fBparameter\fR> <\fBvalue\fR> [<\fBchannel\fR>] [\fBnoguard\fR]
+ .br 
+ 
+ Configure parameters for Serial Over Lan.  If no channel is given,
+ it will display SOL configuration data for the currently used
+ channel.  Configuration parameter updates are automatically guarded
+-with the updates to the set\-in\-progress parameter.
++with the updates to the set\-in\-progress parameter, unless \fInoguard\fR
++parameter is present.
+ .RS
+ .TP 
+ Valid parameters and values are:
+diff -urNp old/lib/ipmi_sol.c new/lib/ipmi_sol.c
+--- old/lib/ipmi_sol.c	2017-10-03 16:10:50.447539996 +0200
++++ new/lib/ipmi_sol.c	2017-10-03 16:18:37.079006949 +0200
+@@ -1875,7 +1875,7 @@ static void
+ print_sol_usage(void)
+ {
+ 	lprintf(LOG_NOTICE, "SOL Commands: info [<channel number>]");
+-	lprintf(LOG_NOTICE, "              set <parameter> <value> [channel]");
++	lprintf(LOG_NOTICE, "              set <parameter> <value> [channel] [noguard]");
+ 	lprintf(LOG_NOTICE, "              payload <enable|disable|status> [channel] [userid]");
+ 	lprintf(LOG_NOTICE, "              activate [<usesolkeepalive|nokeepalive>] [instance=<number>]");
+ 	lprintf(LOG_NOTICE, "              deactivate [instance=<number>]");
+@@ -1890,6 +1890,8 @@ print_sol_usage(void)
+ static void
+ print_sol_set_usage(void)
+ {
++	lprintf(LOG_NOTICE, "\nSOL set usage: \n");
++	lprintf(LOG_NOTICE, "  sol set <parameter> <value> [channel] [noguard]\n");
+ 	lprintf(LOG_NOTICE, "\nSOL set parameters and values: \n");
+   	lprintf(LOG_NOTICE, "  set-in-progress             set-complete | "
+ 		"set-in-progress | commit-write");
diff --git a/system/ipmitool/patches/0008-add-extern.patch b/system/ipmitool/patches/0008-add-extern.patch
new file mode 100644
index 0000000000..53f4ca2482
--- /dev/null
+++ b/system/ipmitool/patches/0008-add-extern.patch
@@ -0,0 +1,40 @@
+From 95f666fa10c32233ee202d8b99d05b5e13528a25 Mon Sep 17 00:00:00 2001
+From: Vaclav Dolezal <vdolezal@redhat.com>
+Date: Thu, 23 Jan 2020 11:26:32 +0100
+Subject: [PATCH] hpmfwupg: move variable definition to .c file
+
+Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com>
+---
+ include/ipmitool/ipmi_hpmfwupg.h | 2 +-
+ lib/ipmi_hpmfwupg.c              | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/include/ipmitool/ipmi_hpmfwupg.h b/include/ipmitool/ipmi_hpmfwupg.h
+index de65292..07f597b 100644
+--- a/include/ipmitool/ipmi_hpmfwupg.h
++++ b/include/ipmitool/ipmi_hpmfwupg.h
+@@ -800,7 +800,7 @@ typedef struct _VERSIONINFO {
+ 	char descString[HPMFWUPG_DESC_STRING_LENGTH + 1];
+ }VERSIONINFO, *PVERSIONINFO;
+ 
+-VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
++extern VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
+ 
+ #define TARGET_VER (0x01)
+ #define ROLLBACK_VER (0x02)
+diff --git a/lib/ipmi_hpmfwupg.c b/lib/ipmi_hpmfwupg.c
+index bbcffc0..d7cdcd6 100644
+--- a/lib/ipmi_hpmfwupg.c
++++ b/lib/ipmi_hpmfwupg.c
+@@ -58,6 +58,8 @@ ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf);
+ 
+ extern int verbose;
+ 
++VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
++
+ int HpmfwupgUpgrade(struct ipmi_intf *intf, char *imageFilename,
+ 		int activate, int, int);
+ int HpmfwupgValidateImageIntegrity(struct HpmfwupgUpgradeCtx *pFwupgCtx);
+-- 
+2.20.1
+
diff --git a/system/ipmitool/patches/0009-best-cipher.patch b/system/ipmitool/patches/0009-best-cipher.patch
new file mode 100644
index 0000000000..8f999b3295
--- /dev/null
+++ b/system/ipmitool/patches/0009-best-cipher.patch
@@ -0,0 +1,864 @@
+From f2df2aa5a010544d53589a5b048677406eb40ee8 Mon Sep 17 00:00:00 2001
+From: Vernon Mauery <vernon.mauery@intel.com>
+Date: Mon, 9 Apr 2018 12:28:57 -0700
+Subject: [PATCH] lanplus: Auto-select 'best' cipher suite available
+
+Current cipher suites could be ranked as this:
+  17 > 3 >> all the rest
+
+Cherry-picked-from: 7772254b62826b894ca629df8c597030a98f4f72
+Cherry-picked-from: f9c699c712f884c82fc1a62f1f61a8d597ac0cfd
+
+Also fetched some functions/macros for helper.h
+
+Equals to getting include/ipmitool/helper.h changes from commits:
+(oldest first)
+
+  6c00d44 mc: watchdog get: Update to match IPMI 2.0 spec
+  e8e94d8 mc: watchdog set: Refactor to reduce complexity
+  0310208 mc: Code refactor to reduce copy-paste ratio
+  249e092 general: Make byteswapping arch-independent
+  5491b12 refix 249e0929: Fix byteswapping helpers
+  bb1a4cc Refactoring. Improve code reuse ratio.
+---
+ include/ipmitool/helper.h       |  58 ++++++++
+ include/ipmitool/ipmi_channel.h |  47 +++++++
+ include/ipmitool/ipmi_intf.h    |  39 ++++-
+ lib/ipmi_channel.c              | 242 +++++++++++++++-----------------
+ lib/ipmi_main.c                 |  23 +--
+ src/plugins/ipmi_intf.c         |   5 +-
+ src/plugins/lanplus/lanplus.c   | 114 +++++++++++----
+ 7 files changed, 360 insertions(+), 168 deletions(-)
+
+diff --git a/include/ipmitool/helper.h b/include/ipmitool/helper.h
+index c53736f..6a2e5f4 100644
+--- a/include/ipmitool/helper.h
++++ b/include/ipmitool/helper.h
+@@ -38,6 +38,8 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
++#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
++
+ #ifndef TRUE
+ #define TRUE    1
+ #endif
+@@ -111,6 +113,62 @@ FILE * ipmi_open_file(const char * file, int rw);
+ void ipmi_start_daemon(struct ipmi_intf *intf);
+ uint16_t ipmi_get_oem_id(struct ipmi_intf *intf);
+ 
++#define IS_SET(v, b) ((v) & (1 << (b)))
++
++/* le16toh(), hto16le(), et. al. don't exist for Windows or Apple */
++/* For portability, let's simply define our own versions here */
++
++/* IPMI is always little-endian */
++static inline uint16_t ipmi16toh(void *ipmi16)
++{
++	uint8_t *ipmi = (uint8_t *)ipmi16;
++	uint16_t h;
++
++	h = ipmi[1] << 8; /* MSB */
++	h |= ipmi[0]; /* LSB */
++
++	return h;
++}
++
++static inline void htoipmi16(uint16_t h, uint8_t *ipmi)
++{
++	ipmi[0] = h & 0xFF; /* LSB */
++	ipmi[1] = h >> 8; /* MSB */
++}
++
++static inline uint32_t ipmi24toh(void *ipmi24)
++{
++	uint8_t *ipmi = (uint8_t *)ipmi24;
++	uint32_t h = 0;
++
++	h = ipmi[2] << 16; /* MSB */
++	h |= ipmi[1] << 8;
++	h |= ipmi[0]; /* LSB */
++
++	return h;
++}
++
++static inline uint32_t ipmi32toh(void *ipmi32)
++{
++	uint8_t *ipmi = ipmi32;
++	uint32_t h;
++
++	h = ipmi[3] << 24; /* MSB */
++	h |= ipmi[2] << 16;
++	h |= ipmi[1] << 8;
++	h |= ipmi[0]; /* LSB */
++
++	return h;
++}
++
++static inline void htoipmi32(uint32_t h, uint8_t *ipmi)
++{
++	ipmi[0] = h & 0xFF; /* LSB */
++	ipmi[1] = (h >> 8) & 0xFF;
++	ipmi[2] = (h >> 16) & 0xFF;
++	ipmi[3] = (h >> 24) & 0xFF; /* MSB */
++}
++
+ #define ipmi_open_file_read(file)	ipmi_open_file(file, 0)
+ #define ipmi_open_file_write(file)	ipmi_open_file(file, 1)
+ 
+diff --git a/include/ipmitool/ipmi_channel.h b/include/ipmitool/ipmi_channel.h
+index 3ade2d5..324c0bb 100644
+--- a/include/ipmitool/ipmi_channel.h
++++ b/include/ipmitool/ipmi_channel.h
+@@ -37,6 +37,7 @@
+ # include <config.h>
+ #endif
+ #include <ipmitool/ipmi.h>
++#include <ipmitool/ipmi_intf.h>
+ 
+ 
+ #define IPMI_GET_CHANNEL_AUTH_CAP      0x38
+@@ -81,6 +82,50 @@ struct channel_access_t {
+ 	uint8_t user_level_auth;
+ };
+ 
++/*
++ * The Cipher Suite Record Format from table 22-18 of the IPMI v2.0 spec
++ */
++enum cipher_suite_format_tag {
++	STANDARD_CIPHER_SUITE = 0xc0,
++	OEM_CIPHER_SUITE = 0xc1,
++};
++#ifdef HAVE_PRAGMA_PACK
++#pragma pack(1)
++#endif
++struct std_cipher_suite_record_t {
++	uint8_t start_of_record;
++	uint8_t cipher_suite_id;
++	uint8_t auth_alg;
++	uint8_t integrity_alg;
++	uint8_t crypt_alg;
++} ATTRIBUTE_PACKING;
++struct oem_cipher_suite_record_t {
++	uint8_t start_of_record;
++	uint8_t cipher_suite_id;
++	uint8_t iana[3];
++	uint8_t auth_alg;
++	uint8_t integrity_alg;
++	uint8_t crypt_alg;
++} ATTRIBUTE_PACKING;
++#ifdef HAVE_PRAGMA_PACK
++#pragma pack(0)
++#endif
++#define CIPHER_ALG_MASK 0x3f
++#define MAX_CIPHER_SUITE_RECORD_OFFSET 0x40
++#define MAX_CIPHER_SUITE_DATA_LEN 0x10
++#define LIST_ALGORITHMS_BY_CIPHER_SUITE 0x80
++
++/* Below is the theoretical maximum number of cipher suites that could be
++ * reported by a BMC. That is with the Get Channel Cipher Suites Command, at 16
++ * bytes at a time and 0x40 requests, it can report 1024 bytes, which is about
++ * 204 standard records or 128 OEM records. Really, we probably don't need more
++ * than about 20, which is the full set of standard records plus a few OEM
++ * records.
++ */
++#define MAX_CIPHER_SUITE_COUNT (MAX_CIPHER_SUITE_RECORD_OFFSET * \
++		MAX_CIPHER_SUITE_DATA_LEN / \
++		sizeof(struct std_cipher_suite_record_t))
++
+ /*
+  * The Get Authentication Capabilities response structure
+  * From table 22-15 of the IPMI v2.0 spec
+@@ -135,6 +180,8 @@ struct get_channel_auth_cap_rsp {
+ int _ipmi_get_channel_access(struct ipmi_intf *intf,
+ 		struct channel_access_t *channel_access,
+ 		uint8_t get_volatile_settings);
++int ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type,
++		uint8_t channel, struct cipher_suite_info *suites, size_t *count);
+ int _ipmi_get_channel_info(struct ipmi_intf *intf,
+         struct channel_info_t *channel_info);
+ int _ipmi_set_channel_access(struct ipmi_intf *intf,
+diff --git a/include/ipmitool/ipmi_intf.h b/include/ipmitool/ipmi_intf.h
+index 0b8c64b..7a07d66 100644
+--- a/include/ipmitool/ipmi_intf.h
++++ b/include/ipmitool/ipmi_intf.h
+@@ -61,13 +61,45 @@ enum LANPLUS_SESSION_STATE {
+ #define IPMI_AUTHCODE_BUFFER_SIZE 20
+ #define IPMI_SIK_BUFFER_SIZE      IPMI_MAX_MD_SIZE
+ 
++enum cipher_suite_ids {
++	IPMI_LANPLUS_CIPHER_SUITE_0 = 0,
++	IPMI_LANPLUS_CIPHER_SUITE_1 = 1,
++	IPMI_LANPLUS_CIPHER_SUITE_2 = 2,
++	IPMI_LANPLUS_CIPHER_SUITE_3 = 3,
++	IPMI_LANPLUS_CIPHER_SUITE_4 = 4,
++	IPMI_LANPLUS_CIPHER_SUITE_5 = 5,
++	IPMI_LANPLUS_CIPHER_SUITE_6 = 6,
++	IPMI_LANPLUS_CIPHER_SUITE_7 = 7,
++	IPMI_LANPLUS_CIPHER_SUITE_8 = 8,
++	IPMI_LANPLUS_CIPHER_SUITE_9 = 9,
++	IPMI_LANPLUS_CIPHER_SUITE_10 = 10,
++	IPMI_LANPLUS_CIPHER_SUITE_11 = 11,
++	IPMI_LANPLUS_CIPHER_SUITE_12 = 12,
++	IPMI_LANPLUS_CIPHER_SUITE_13 = 13,
++	IPMI_LANPLUS_CIPHER_SUITE_14 = 14,
++#ifdef HAVE_CRYPTO_SHA256
++	IPMI_LANPLUS_CIPHER_SUITE_15 = 15,
++	IPMI_LANPLUS_CIPHER_SUITE_16 = 16,
++	IPMI_LANPLUS_CIPHER_SUITE_17 = 17,
++#endif /* HAVE_CRYPTO_SHA256 */
++	IPMI_LANPLUS_CIPHER_SUITE_RESERVED = 0xff,
++};
++
++struct cipher_suite_info {
++	enum cipher_suite_ids cipher_suite_id;
++	uint8_t auth_alg;
++	uint8_t integrity_alg;
++	uint8_t crypt_alg;
++	uint32_t iana;
++};
++
+ struct ipmi_session_params {
+ 	char * hostname;
+ 	uint8_t username[17];
+ 	uint8_t authcode_set[IPMI_AUTHCODE_BUFFER_SIZE + 1];
+ 	uint8_t authtype_set;
+ 	uint8_t privlvl;
+-	uint8_t cipher_suite_id;
++	enum cipher_suite_ids cipher_suite_id;
+ 	char sol_escape_char;
+ 	int password;
+ 	int port;
+@@ -217,7 +249,10 @@ void ipmi_intf_session_set_username(struct ipmi_intf * intf, char * username);
+ void ipmi_intf_session_set_password(struct ipmi_intf * intf, char * password);
+ void ipmi_intf_session_set_privlvl(struct ipmi_intf * intf, uint8_t privlvl);
+ void ipmi_intf_session_set_lookupbit(struct ipmi_intf * intf, uint8_t lookupbit);
+-void ipmi_intf_session_set_cipher_suite_id(struct ipmi_intf * intf, uint8_t cipher_suite_id);
++#ifdef IPMI_INTF_LANPLUS
++void ipmi_intf_session_set_cipher_suite_id(struct ipmi_intf * intf,
++		enum cipher_suite_ids cipher_suite_id);
++#endif /* IPMI_INTF_LANPLUS */
+ void ipmi_intf_session_set_sol_escape_char(struct ipmi_intf * intf, char sol_escape_char);
+ void ipmi_intf_session_set_kgkey(struct ipmi_intf *intf, const uint8_t *kgkey);
+ void ipmi_intf_session_set_port(struct ipmi_intf * intf, int port);
+diff --git a/lib/ipmi_channel.c b/lib/ipmi_channel.c
+index e1fc75f..3ae3104 100644
+--- a/lib/ipmi_channel.c
++++ b/lib/ipmi_channel.c
+@@ -342,86 +342,116 @@ ipmi_get_channel_auth_cap(struct ipmi_intf *intf, uint8_t channel, uint8_t priv)
+ 	return 0;
+ }
+ 
+-static int
++static size_t
++parse_channel_cipher_suite_data(uint8_t *cipher_suite_data, size_t data_len,
++		struct cipher_suite_info* suites, size_t nr_suites)
++{
++	size_t count = 0;
++	size_t offset = 0;
++	uint32_t iana;
++	uint8_t auth_alg, integrity_alg, crypt_alg;
++	uint8_t cipher_suite_id;
++
++	memset(suites, 0, sizeof(*suites) * nr_suites);
++
++	while (offset < data_len && count < nr_suites) {
++		auth_alg      = IPMI_AUTH_RAKP_NONE;
++		integrity_alg = IPMI_INTEGRITY_NONE;
++		crypt_alg     = IPMI_CRYPT_NONE;
++		if (cipher_suite_data[offset] == STANDARD_CIPHER_SUITE) {
++			struct std_cipher_suite_record_t *record =
++				(struct std_cipher_suite_record_t*)(&cipher_suite_data[offset]);
++			/* standard type */
++			iana = 0;
++
++			/* Verify that we have at least a full record left; id + 3 algs */
++			if ((data_len - offset) < sizeof(*record)) {
++				lprintf(LOG_INFO, "Incomplete data record in cipher suite data");
++				break;
++			}
++			cipher_suite_id = record->cipher_suite_id;
++			auth_alg = CIPHER_ALG_MASK & record->auth_alg;
++			integrity_alg = CIPHER_ALG_MASK & record->integrity_alg;
++			crypt_alg = CIPHER_ALG_MASK & record->crypt_alg;
++			offset += sizeof(*record);
++		} else if (cipher_suite_data[offset] == OEM_CIPHER_SUITE) {
++			/* OEM record type */
++			struct oem_cipher_suite_record_t *record =
++				(struct oem_cipher_suite_record_t*)(&cipher_suite_data[offset]);
++			/* Verify that we have at least a full record left
++			 * id + iana + 3 algs
++			 */
++			if ((data_len - offset) < sizeof(*record)) {
++				lprintf(LOG_INFO, "Incomplete data record in cipher suite data");
++				break;
++			}
++
++			cipher_suite_id = record->cipher_suite_id;
++
++			/* Grab the IANA */
++			iana = ipmi24toh(record->iana);
++			auth_alg = CIPHER_ALG_MASK & record->auth_alg;
++			integrity_alg = CIPHER_ALG_MASK & record->integrity_alg;
++			crypt_alg = CIPHER_ALG_MASK & record->crypt_alg;
++			offset += sizeof(*record);
++		} else {
++			lprintf(LOG_INFO, "Bad start of record byte in cipher suite data (offset %d, value %x)", offset, cipher_suite_data[offset]);
++			break;
++		}
++		suites[count].cipher_suite_id = cipher_suite_id;
++		suites[count].iana = iana;
++		suites[count].auth_alg = auth_alg;
++		suites[count].integrity_alg = integrity_alg;
++		suites[count].crypt_alg = crypt_alg;
++		count++;
++	}
++	return count;
++}
++
++int
+ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type,
+-		uint8_t channel)
++		uint8_t channel, struct cipher_suite_info *suites, size_t *count)
+ {
+ 	struct ipmi_rs *rsp;
+ 	struct ipmi_rq req;
+ 
+ 	uint8_t rqdata[3];
+-	uint32_t iana;
+-	uint8_t auth_alg, integrity_alg, crypt_alg;
+-	uint8_t cipher_suite_id;
+ 	uint8_t list_index = 0;
+ 	/* 0x40 sets * 16 bytes per set */
+-	uint8_t cipher_suite_data[1024];
+-	uint16_t offset = 0;
+-	/* how much was returned, total */
+-	uint16_t cipher_suite_data_length = 0;
++	uint8_t cipher_suite_data[MAX_CIPHER_SUITE_RECORD_OFFSET *
++		MAX_CIPHER_SUITE_DATA_LEN];
++	size_t offset = 0;
++	size_t nr_suites = 0;
+ 
++	if (!suites || !count || !*count)
++		return -1;
++
++	nr_suites = *count;
++	*count = 0;
+ 	memset(cipher_suite_data, 0, sizeof(cipher_suite_data));
+-	
++
+ 	memset(&req, 0, sizeof(req));
+ 	req.msg.netfn = IPMI_NETFN_APP;
+ 	req.msg.cmd = IPMI_GET_CHANNEL_CIPHER_SUITES;
+ 	req.msg.data = rqdata;
+-	req.msg.data_len = 3;
++	req.msg.data_len = sizeof(rqdata);
+ 
+ 	rqdata[0] = channel;
+ 	rqdata[1] = ((strncmp(payload_type, "ipmi", 4) == 0)? 0: 1);
+-	/* Always ask for cipher suite format */
+-	rqdata[2] = 0x80;
+-
+-	rsp = intf->sendrecv(intf, &req);
+-	if (rsp == NULL) {
+-		lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites");
+-		return -1;
+-	}
+-	if (rsp->ccode > 0) {
+-		lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s",
+-			val2str(rsp->ccode, completion_code_vals));
+-		return -1;
+-	}
+-
+-
+-	/*
+-	 * Grab the returned channel number once.  We assume it's the same
+-	 * in future calls.
+-	 */
+-	if (rsp->data_len >= 1) {
+-		channel = rsp->data[0];
+-	}
+-
+-	while ((rsp->data_len > 1) && (rsp->data_len == 17) && (list_index < 0x3F)) {
+-		/*
+-		 * We got back cipher suite data -- store it.
+-		 * printf("copying data to offset %d\n", offset);
+-		 * printbuf(rsp->data + 1, rsp->data_len - 1, "this is the data");
+-		 */
+-		memcpy(cipher_suite_data + offset, rsp->data + 1, rsp->data_len - 1);
+-		offset += rsp->data_len - 1;
+-		
+-		/*
+-		 * Increment our list for the next call
+-		 */
+-		++list_index;
+-		rqdata[2] =  (rqdata[2] & 0x80) + list_index; 
+ 
++	do {
++		/* Always ask for cipher suite format */
++		rqdata[2] = LIST_ALGORITHMS_BY_CIPHER_SUITE | list_index;
+ 		rsp = intf->sendrecv(intf, &req);
+ 		if (rsp == NULL) {
+ 			lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites");
+ 			return -1;
+ 		}
+-		if (rsp->ccode > 0) {
++		if (rsp->ccode || rsp->data_len < 1) {
+ 			lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s",
+ 					val2str(rsp->ccode, completion_code_vals));
+ 			return -1;
+ 		}
+-	}
+-
+-	/* Copy last chunk */
+-	if(rsp->data_len > 1) {
+ 		/*
+ 		 * We got back cipher suite data -- store it.
+ 		 * printf("copying data to offset %d\n", offset);
+@@ -429,88 +459,46 @@ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type,
+ 		 */
+ 		memcpy(cipher_suite_data + offset, rsp->data + 1, rsp->data_len - 1);
+ 		offset += rsp->data_len - 1;
+-	}
+ 
+-	/* We can chomp on all our data now. */
+-	cipher_suite_data_length = offset;
+-	offset = 0;
++		/*
++		 * Increment our list for the next call
++		 */
++		++list_index;
++	} while ((rsp->data_len == (sizeof(uint8_t) + MAX_CIPHER_SUITE_DATA_LEN)) &&
++			 (list_index < MAX_CIPHER_SUITE_RECORD_OFFSET));
+ 
+-	if (! csv_output) {
+-		printf("ID   IANA    Auth Alg        Integrity Alg   Confidentiality Alg\n");
+-	}
+-	while (offset < cipher_suite_data_length) {
+-		if (cipher_suite_data[offset++] == 0xC0) {
+-			/* standard type */
+-			iana = 0;
++	*count = parse_channel_cipher_suite_data(cipher_suite_data, offset, suites,
++	                                         nr_suites);
++	return 0;
++}
+ 
+-			/* Verify that we have at least a full record left; id + 3 algs */
+-			if ((cipher_suite_data_length - offset) < 4) {
+-				lprintf(LOG_ERR, "Incomplete data record in cipher suite data");
+-				return -1;
+-			}
+-			cipher_suite_id = cipher_suite_data[offset++];
+-		} else if (cipher_suite_data[offset++] == 0xC1) {
+-			/* OEM record type */
+-			/* Verify that we have at least a full record left
+-			 * id + iana + 3 algs
+-			 */
+-			if ((cipher_suite_data_length - offset) < 4) {
+-				lprintf(LOG_ERR, "Incomplete data record in cipher suite data");
+-				return -1;
+-			}
++static int
++ipmi_print_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type,
++		uint8_t channel)
++{
++	int rc;
++	size_t i = 0;
++	struct cipher_suite_info suites[MAX_CIPHER_SUITE_COUNT];
++	size_t nr_suites = sizeof(*suites);
+ 
+-			cipher_suite_id = cipher_suite_data[offset++];
++	rc = ipmi_get_channel_cipher_suites(intf, payload_type, channel,
++			suites, &nr_suites);
+ 
+-			/* Grab the IANA */
+-			iana =
+-				cipher_suite_data[offset]            | 
+-				(cipher_suite_data[offset + 1] << 8) | 
+-				(cipher_suite_data[offset + 2] << 16);
+-			offset += 3;
+-		} else {
+-			lprintf(LOG_ERR, "Bad start of record byte in cipher suite data");
+-			return -1;
+-		}
++	if (rc < 0)
++		return rc;
+ 
+-		/*
+-		 * Grab the algorithms for this cipher suite.  I guess we can't be
+-		 * sure of what order they'll come in.  Also, I suppose we default
+-		 * to the NONE algorithm if one were absent.  This part of the spec is
+-		 * poorly written -- I have read the errata document.  For now, I'm only
+-		 * allowing one algorithm per type (auth, integrity, crypt) because I
+-		 * don't I understand how it could be otherwise.
+-		 */
+-		auth_alg      = IPMI_AUTH_RAKP_NONE;
+-		integrity_alg = IPMI_INTEGRITY_NONE;
+-		crypt_alg     = IPMI_CRYPT_NONE;
+-		
+-		while (((cipher_suite_data[offset] & 0xC0) != 0xC0) &&
+-			   ((cipher_suite_data_length - offset) > 0))
+-		{
+-			switch (cipher_suite_data[offset] & 0xC0)
+-			{
+-			case 0x00:
+-				/* Authentication algorithm specifier */
+-				auth_alg = cipher_suite_data[offset++] & 0x3F;
+-				break;
+-			case 0x40:
+-				/* Interity algorithm specifier */
+-				integrity_alg = cipher_suite_data[offset++] & 0x3F;
+-				break;
+-			case 0x80:
+-				/* Confidentiality algorithm specifier */
+-				crypt_alg = cipher_suite_data[offset++] & 0x3F;
+-				break;
+-			}
+-		}
++	if (! csv_output) {
++		printf("ID   IANA    Auth Alg        Integrity Alg   Confidentiality Alg\n");
++	}
++	for (i = 0; i < nr_suites; i++) {
+ 		/* We have everything we need to spit out a cipher suite record */
+ 		printf((csv_output? "%d,%s,%s,%s,%s\n" :
+ 			"%-4d %-7s %-15s %-15s %-15s\n"),
+-		       cipher_suite_id,
+-		       iana_string(iana),
+-		       val2str(auth_alg, ipmi_auth_algorithms),
+-		       val2str(integrity_alg, ipmi_integrity_algorithms),
+-		       val2str(crypt_alg, ipmi_encryption_algorithms));
++		       suites[i].cipher_suite_id,
++		       iana_string(suites[i].iana),
++		       val2str(suites[i].auth_alg, ipmi_auth_algorithms),
++		       val2str(suites[i].integrity_alg, ipmi_integrity_algorithms),
++		       val2str(suites[i].crypt_alg, ipmi_encryption_algorithms));
+ 	}
+ 	return 0;
+ }
+@@ -973,7 +961,7 @@ ipmi_channel_main(struct ipmi_intf *intf, int argc, char **argv)
+ 				return (-1);
+ 			}
+ 		}
+-		retval = ipmi_get_channel_cipher_suites(intf,
++		retval = ipmi_print_channel_cipher_suites(intf,
+ 							argv[1], /* ipmi | sol */
+ 							channel);
+ 	} else if (strncmp(argv[0], "setkg", 5) == 0) {
+diff --git a/lib/ipmi_main.c b/lib/ipmi_main.c
+index 811c80b..6aee102 100644
+--- a/lib/ipmi_main.c
++++ b/lib/ipmi_main.c
+@@ -323,6 +323,7 @@ ipmi_main(int argc, char ** argv,
+ 	uint8_t target_addr = 0;
+ 	uint8_t target_channel = 0;
+ 
++	uint8_t u8tmp = 0;
+ 	uint8_t transit_addr = 0;
+ 	uint8_t transit_channel = 0;
+ 	uint8_t target_lun     = 0;
+@@ -347,7 +348,10 @@ ipmi_main(int argc, char ** argv,
+ 	char * seloem   = NULL;
+ 	int port = 0;
+ 	int devnum = 0;
+-	int cipher_suite_id = 3; /* See table 22-19 of the IPMIv2 spec */
++#ifdef IPMI_INTF_LANPLUS
++	/* lookup best cipher suite available */
++	enum cipher_suite_ids cipher_suite_id = IPMI_LANPLUS_CIPHER_SUITE_RESERVED;
++#endif /* IPMI_INTF_LANPLUS */
+ 	int argflag, i, found;
+ 	int rc = -1;
+ 	int ai_family = AF_UNSPEC;
+@@ -425,19 +429,18 @@ ipmi_main(int argc, char ** argv,
+ 				goto out_free;
+ 			}
+ 			break;
++#ifdef IPMI_INTF_LANPLUS
+ 		case 'C':
+-			if (str2int(optarg, &cipher_suite_id) != 0) {
+-				lprintf(LOG_ERR, "Invalid parameter given or out of range for '-C'.");
+-				rc = -1;
+-				goto out_free;
+-			}
+-			/* add check Cipher is -gt 0 */
+-			if (cipher_suite_id < 0) {
+-				lprintf(LOG_ERR, "Cipher suite ID %i is invalid.", cipher_suite_id);
++			/* Cipher Suite ID is a byte as per IPMI specification */
++			if (str2uchar(optarg, &u8tmp) != 0) {
++				lprintf(LOG_ERR, "Invalid parameter given or out of "
++				                 "range [0-255] for '-C'.");
+ 				rc = -1;
+ 				goto out_free;
+ 			}
++			cipher_suite_id = u8tmp;
+ 			break;
++#endif /* IPMI_INTF_LANPLUS */
+ 		case 'v':
+ 			verbose++;
+ 			break;
+@@ -870,7 +873,9 @@ ipmi_main(int argc, char ** argv,
+ 
+ 	ipmi_intf_session_set_lookupbit(ipmi_main_intf, lookupbit);
+ 	ipmi_intf_session_set_sol_escape_char(ipmi_main_intf, sol_escape_char);
++#ifdef IPMI_INTF_LANPLUS
+ 	ipmi_intf_session_set_cipher_suite_id(ipmi_main_intf, cipher_suite_id);
++#endif /* IPMI_INTF_LANPLUS */
+ 
+ 	ipmi_main_intf->devnum = devnum;
+ 
+diff --git a/src/plugins/ipmi_intf.c b/src/plugins/ipmi_intf.c
+index 1d9e87b..00b0918 100644
+--- a/src/plugins/ipmi_intf.c
++++ b/src/plugins/ipmi_intf.c
+@@ -252,11 +252,14 @@ ipmi_intf_session_set_lookupbit(struct ipmi_intf * intf, uint8_t lookupbit)
+ 	intf->ssn_params.lookupbit = lookupbit;
+ }
+ 
++#ifdef IPMI_INTF_LANPLUS
+ void
+-ipmi_intf_session_set_cipher_suite_id(struct ipmi_intf * intf, uint8_t cipher_suite_id)
++ipmi_intf_session_set_cipher_suite_id(struct ipmi_intf * intf,
++		enum cipher_suite_ids cipher_suite_id)
+ {
+ 	intf->ssn_params.cipher_suite_id = cipher_suite_id;
+ }
++#endif /* IPMI_INTF_LANPLUS */
+ 
+ void
+ ipmi_intf_session_set_sol_escape_char(struct ipmi_intf * intf, char sol_escape_char)
+diff --git a/src/plugins/lanplus/lanplus.c b/src/plugins/lanplus/lanplus.c
+index a0e388c..3087348 100644
+--- a/src/plugins/lanplus/lanplus.c
++++ b/src/plugins/lanplus/lanplus.c
+@@ -164,114 +164,109 @@ extern int verbose;
+  * returns 0 on success
+  *         1 on failure
+  */
+-int lanplus_get_requested_ciphers(int       cipher_suite_id,
++int lanplus_get_requested_ciphers(enum cipher_suite_ids cipher_suite_id,
+ 								  uint8_t * auth_alg,
+ 								  uint8_t * integrity_alg,
+ 								  uint8_t * crypt_alg)
+ {
+-#ifdef HAVE_CRYPTO_SHA256
+-	if ((cipher_suite_id < 0) || (cipher_suite_id > 17)) {
+-		return 1;
+-	}
+-#else
+-	if ((cipher_suite_id < 0) || (cipher_suite_id > 14))
+-		return 1;
+-#endif /* HAVE_CRYPTO_SHA256 */
+ 		/* See table 22-19 for the source of the statement */
+ 	switch (cipher_suite_id)
+ 	{
+-	case 0:
++	case IPMI_LANPLUS_CIPHER_SUITE_0:
+ 		*auth_alg      = IPMI_AUTH_RAKP_NONE;
+ 		*integrity_alg = IPMI_INTEGRITY_NONE;
+ 		*crypt_alg     = IPMI_CRYPT_NONE;
+ 		break;
+-	case 1:
++	case IPMI_LANPLUS_CIPHER_SUITE_1:
+ 		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA1;
+ 		*integrity_alg = IPMI_INTEGRITY_NONE;
+ 		*crypt_alg     = IPMI_CRYPT_NONE;
+ 		break;
+-	case 2:
++	case IPMI_LANPLUS_CIPHER_SUITE_2:
+ 		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA1;
+ 		*integrity_alg = IPMI_INTEGRITY_HMAC_SHA1_96;
+ 		*crypt_alg     = IPMI_CRYPT_NONE;
+ 		break;
+-	case 3:
++	case IPMI_LANPLUS_CIPHER_SUITE_3:
+ 		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA1;
+ 		*integrity_alg = IPMI_INTEGRITY_HMAC_SHA1_96;
+ 		*crypt_alg     = IPMI_CRYPT_AES_CBC_128;
+ 		break;
+-	case 4:
++	case IPMI_LANPLUS_CIPHER_SUITE_4:
+ 		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA1;
+ 		*integrity_alg = IPMI_INTEGRITY_HMAC_SHA1_96;
+ 		*crypt_alg     = IPMI_CRYPT_XRC4_128;
+ 		break;
+-	case 5:
++	case IPMI_LANPLUS_CIPHER_SUITE_5:
+ 		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA1;
+ 		*integrity_alg = IPMI_INTEGRITY_HMAC_SHA1_96;
+ 		*crypt_alg     = IPMI_CRYPT_XRC4_40;
+ 		break;
+-	case 6:
++	case IPMI_LANPLUS_CIPHER_SUITE_6:
+ 		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+ 		*integrity_alg = IPMI_INTEGRITY_NONE;
+ 		*crypt_alg     = IPMI_CRYPT_NONE;
+ 		break;
+-	case 7:
++	case IPMI_LANPLUS_CIPHER_SUITE_7:
+ 		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+ 		*integrity_alg = IPMI_INTEGRITY_HMAC_MD5_128;
+ 		*crypt_alg     = IPMI_CRYPT_NONE;
+ 		break;
+-	case 8:
++	case IPMI_LANPLUS_CIPHER_SUITE_8:
+ 		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+ 		*integrity_alg = IPMI_INTEGRITY_HMAC_MD5_128;
+ 		*crypt_alg     = IPMI_CRYPT_AES_CBC_128;
+ 		break;
+-	case 9:
++	case IPMI_LANPLUS_CIPHER_SUITE_9:
+ 		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+ 		*integrity_alg = IPMI_INTEGRITY_HMAC_MD5_128;
+ 		*crypt_alg     = IPMI_CRYPT_XRC4_128;
+ 		break;
+-	case 10:
++	case IPMI_LANPLUS_CIPHER_SUITE_10:
+ 		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+ 		*integrity_alg = IPMI_INTEGRITY_HMAC_MD5_128;
+ 		*crypt_alg     = IPMI_CRYPT_XRC4_40;
+ 		break;
+-	case 11:
++	case IPMI_LANPLUS_CIPHER_SUITE_11:
+ 		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+ 		*integrity_alg = IPMI_INTEGRITY_MD5_128;
+ 		*crypt_alg     = IPMI_CRYPT_NONE;
+ 		break;
+-	case 12:
++	case IPMI_LANPLUS_CIPHER_SUITE_12:
+ 		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+ 		*integrity_alg = IPMI_INTEGRITY_MD5_128;
+ 		*crypt_alg     = IPMI_CRYPT_AES_CBC_128;
+ 		break;
+-	case 13:
++	case IPMI_LANPLUS_CIPHER_SUITE_13:
+ 		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+ 		*integrity_alg = IPMI_INTEGRITY_MD5_128;
+ 		*crypt_alg     = IPMI_CRYPT_XRC4_128;
+ 		break;
+-	case 14:
++	case IPMI_LANPLUS_CIPHER_SUITE_14:
+ 		*auth_alg      = IPMI_AUTH_RAKP_HMAC_MD5;
+ 		*integrity_alg = IPMI_INTEGRITY_MD5_128;
+ 		*crypt_alg     = IPMI_CRYPT_XRC4_40;
+ 		break;
+ #ifdef HAVE_CRYPTO_SHA256
+-	case 15:
++	case IPMI_LANPLUS_CIPHER_SUITE_15:
+ 		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA256;
+ 		*integrity_alg = IPMI_INTEGRITY_NONE;
+ 		*crypt_alg     = IPMI_CRYPT_NONE;
+ 		break;
+-	case 16:
++	case IPMI_LANPLUS_CIPHER_SUITE_16:
+ 		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA256;
+ 		*integrity_alg = IPMI_INTEGRITY_HMAC_SHA256_128;
+ 		*crypt_alg     = IPMI_CRYPT_NONE;
+ 		break;
+-	case 17:
++	case IPMI_LANPLUS_CIPHER_SUITE_17:
+ 		*auth_alg      = IPMI_AUTH_RAKP_HMAC_SHA256;
+ 		*integrity_alg = IPMI_INTEGRITY_HMAC_SHA256_128;
+ 		*crypt_alg     = IPMI_CRYPT_AES_CBC_128;
+ 		break;
+ #endif /* HAVE_CRYPTO_SHA256 */
++	case IPMI_LANPLUS_CIPHER_SUITE_RESERVED:
++	default:
++		return 1;
+ 	}
+ 
+ 	return 0;
+@@ -3441,6 +3436,57 @@ ipmi_set_session_privlvl_cmd(struct ipmi_intf * intf)
+ 	return 0;
+ }
+ 
++static uint8_t
++ipmi_find_best_cipher_suite(struct ipmi_intf *intf)
++{
++	enum cipher_suite_ids best_suite = IPMI_LANPLUS_CIPHER_SUITE_RESERVED;
++#ifdef HAVE_CRYPTO_SHA256
++	struct cipher_suite_info suites[MAX_CIPHER_SUITE_COUNT];
++	size_t nr_suites = ARRAY_SIZE(suites);
++	/* cipher suite best order is chosen with this criteria:
++	 * HMAC-MD5 and MD5 are BAD; xRC4 is bad; AES128 is required
++	 * HMAC-SHA256 > HMAC-SHA1
++	 * secure authentication > encrypted content
++	 *
++	 * With xRC4 out, all cipher suites with MD5 out, and cipher suite 3 being
++	 * required by the spec, the only better defined standard cipher suite is
++	 * 17. So if SHA256 is available, we should try to use that, otherwise,
++	 * fall back to 3.
++	 */
++	const enum cipher_suite_ids cipher_order_preferred[] = {
++		IPMI_LANPLUS_CIPHER_SUITE_17,
++		IPMI_LANPLUS_CIPHER_SUITE_3,
++	};
++	const size_t nr_preferred = ARRAY_SIZE(cipher_order_preferred);
++	size_t ipref, i;
++
++	if (ipmi_get_channel_cipher_suites(intf, "ipmi", IPMI_LAN_CHANNEL_E,
++	                                   suites, &nr_suites) < 0)
++	{
++		/* default legacy behavior - cipher suite 3 if none is requested */
++		return IPMI_LANPLUS_CIPHER_SUITE_3;
++	}
++	for (ipref = 0; ipref < nr_preferred &&
++	                IPMI_LANPLUS_CIPHER_SUITE_RESERVED == best_suite; ipref++)
++	{
++		for (i = 0; i < nr_suites; i++) {
++			if (cipher_order_preferred[ipref] == suites[i].cipher_suite_id) {
++				best_suite = cipher_order_preferred[ipref];
++				break;
++			}
++		}
++	}
++#endif /* HAVE_CRYPTO_SHA256 */
++	if (IPMI_LANPLUS_CIPHER_SUITE_RESERVED == best_suite) {
++		/* IPMI 2.0 spec requires that cipher suite 3 is implemented
++		 * so we should always be able to fall back to that if better
++		 * options are not available. */
++		best_suite = IPMI_LANPLUS_CIPHER_SUITE_3;
++	}
++	lprintf(LOG_INFO, "Using best available cipher suite %d\n", best_suite);
++	return best_suite;
++}
++
+ /**
+  * ipmi_lanplus_open
+  */
+@@ -3514,6 +3560,16 @@ ipmi_lanplus_open(struct ipmi_intf * intf)
+ 		lprintf(LOG_INFO, "This BMC does not support IPMI v2 / RMCP+");
+ 		goto fail;
+ 	}
++	/*
++	 * If no cipher suite was provided, query the channel cipher suite list and
++	 * pick the best one available
++	 */
++	if (IPMI_LANPLUS_CIPHER_SUITE_RESERVED ==
++	    intf->ssn_params.cipher_suite_id)
++	{
++		ipmi_intf_session_set_cipher_suite_id(intf,
++			ipmi_find_best_cipher_suite(intf));
++	}
+ 
+ 	/*
+ 	 * If the open/rakp1/rakp3 sequence encounters a timeout, the whole sequence
+@@ -3728,7 +3784,7 @@ static int ipmi_lanplus_setup(struct ipmi_intf * intf)
+ 
+ static void ipmi_lanp_set_max_rq_data_size(struct ipmi_intf * intf, uint16_t size)
+ {
+-	if (intf->ssn_params.cipher_suite_id == 3) {
++	if (intf->ssn_params.cipher_suite_id == IPMI_LANPLUS_CIPHER_SUITE_3) {
+ 		/*
+ 		 * encrypted payload can only be multiple of 16 bytes
+ 		 */
+@@ -3746,7 +3802,7 @@ static void ipmi_lanp_set_max_rq_data_size(struct ipmi_intf * intf, uint16_t siz
+ 
+ static void ipmi_lanp_set_max_rp_data_size(struct ipmi_intf * intf, uint16_t size)
+ {
+-	if (intf->ssn_params.cipher_suite_id == 3) {
++	if (intf->ssn_params.cipher_suite_id == IPMI_LANPLUS_CIPHER_SUITE_3) {
+ 		/*
+ 		 * encrypted payload can only be multiple of 16 bytes
+ 		 */
+-- 
+2.20.1
+
diff --git a/system/ipmitool/patches/0010-pef-missing-newline.patch b/system/ipmitool/patches/0010-pef-missing-newline.patch
new file mode 100644
index 0000000000..76503338d9
--- /dev/null
+++ b/system/ipmitool/patches/0010-pef-missing-newline.patch
@@ -0,0 +1,33 @@
+From f65ea137f0d03f883219a791a49cf8ea7e16776a Mon Sep 17 00:00:00 2001
+From: Vaclav Dolezal <vdolezal@redhat.com>
+Date: Fri, 1 Mar 2019 14:46:12 +0100
+Subject: [PATCH] Fix "ipmitool pef {status,info}" not printing final newline
+
+Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com>
+---
+ lib/ipmi_pef.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/ipmi_pef.c b/lib/ipmi_pef.c
+index bbf25f2..4be749e 100644
+--- a/lib/ipmi_pef.c
++++ b/lib/ipmi_pef.c
+@@ -1183,6 +1183,7 @@ ipmi_pef2_get_info(struct ipmi_intf *intf)
+ 		ipmi_pef_print_guid(guid_ptr);
+ 	}
+ 	ipmi_pef_print_flags(&pef_b2s_actions, P_SUPP, pcap.actions);
++	putchar('\n');
+ 	return 0;
+ }
+ 
+@@ -1242,6 +1243,7 @@ ipmi_pef2_get_status(struct ipmi_intf *intf)
+ 		return (-1);
+ 	}
+ 	ipmi_pef_print_flags(&pef_b2s_actions, P_ACTV, rsp->data[1]);
++	putchar('\n');
+ 	return 0;
+ }
+ 
+-- 
+2.20.1
+
diff --git a/system/ipmitool/patches/0011-expand-sensor-name-column.patch b/system/ipmitool/patches/0011-expand-sensor-name-column.patch
new file mode 100644
index 0000000000..85e0c92a21
--- /dev/null
+++ b/system/ipmitool/patches/0011-expand-sensor-name-column.patch
@@ -0,0 +1,57 @@
+From 57b57b27fe2c17e3030c41ee5566af36ccd33941 Mon Sep 17 00:00:00 2001
+From: Vaclav Dolezal <vdolezal@redhat.com>
+Date: Thu, 30 Jan 2020 16:18:37 +0100
+Subject: [PATCH] Expand column with name in ipmitool sdr/sensor output
+
+---
+ lib/ipmi_sdr.c    | 4 ++--
+ lib/ipmi_sensor.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c
+index fd2c02d..0f6faab 100644
+--- a/lib/ipmi_sdr.c
++++ b/lib/ipmi_sdr.c
+@@ -1619,7 +1619,7 @@ ipmi_sdr_print_sensor_fc(struct ipmi_intf *intf,
+ 		/*
+ 		 * print sensor name, reading, state
+ 		 */
+-		printf("%-16s | ", sr->s_id);
++		printf("%-24s | ", sr->s_id);
+ 
+ 		memset(sval, 0, sizeof (sval));
+ 
+@@ -1657,7 +1657,7 @@ ipmi_sdr_print_sensor_fc(struct ipmi_intf *intf,
+ 		/*
+ 		 * print sensor name, number, state, entity, reading
+ 		 */
+-		printf("%-16s | %02Xh | ",
++		printf("%-24s | %02Xh | ",
+ 		       sr->s_id, sensor->keys.sensor_num);
+ 
+ 		if (IS_THRESHOLD_SENSOR(sensor)) {
+diff --git a/lib/ipmi_sensor.c b/lib/ipmi_sensor.c
+index a0b7eb8..7328508 100644
+--- a/lib/ipmi_sensor.c
++++ b/lib/ipmi_sensor.c
+@@ -175,7 +175,7 @@ ipmi_sensor_print_fc_discrete(struct ipmi_intf *intf,
+ 			/* output format
+ 			 *   id value units status thresholds....
+ 			 */
+-			printf("%-16s ", sr->s_id);
++			printf("%-24s ", sr->s_id);
+ 			if (sr->s_reading_valid) {
+ 				if (sr->s_has_analog_value) {
+ 					/* don't show discrete component */
+@@ -276,7 +276,7 @@ ipmi_sensor_print_fc_threshold(struct ipmi_intf *intf,
+ 			/* output format
+ 			 *   id value units status thresholds....
+ 			 */
+-			printf("%-16s ", sr->s_id);
++			printf("%-24s ", sr->s_id);
+ 			if (sr->s_reading_valid) {
+ 				if (sr->s_has_analog_value)
+ 					printf("| %-10.3f | %-10s | %-6s",
+-- 
+2.20.1
+
diff --git a/system/ipmitool/patches/0012-CVE-2020-5208.patch b/system/ipmitool/patches/0012-CVE-2020-5208.patch
new file mode 100644
index 0000000000..4d5a4874f2
--- /dev/null
+++ b/system/ipmitool/patches/0012-CVE-2020-5208.patch
@@ -0,0 +1,378 @@
+From b3e74778c65ba3ffc8a9b3133c87588ee5d18a74 Mon Sep 17 00:00:00 2001
+From: Chrostoper Ertl <chertl@microsoft.com>
+Date: Thu, 28 Nov 2019 16:33:59 +0000
+Subject: [PATCH] Fixes for CVE-2020-5208
+
+see https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp
+
+This patch is combination of following commits:
+
+pick e824c23316ae50beb7f7488f2055ac65e8b341f2 fru: Fix buffer overflow vulnerabilities
+pick 840fb1cbb4fb365cb9797300e3374d4faefcdb10 fru: Fix buffer overflow in ipmi_spd_print_fru
+pick 41d7026946fafbd4d1ec0bcaca3ea30a6e8eed22 session: Fix buffer overflow in ipmi_get_session_info
+pick 9452be87181a6e83cfcc768b3ed8321763db50e4 channel: Fix buffer overflow
+pick d45572d71e70840e0d4c50bf48218492b79c1a10 lanp: Fix buffer overflows in get_lan_param_select
+pick 7ccea283dd62a05a320c1921e3d8d71a87772637 fru, sdr: Fix id_string buffer overflows
+---
+ lib/dimm_spd.c     |  9 ++++++++-
+ lib/ipmi_channel.c |  5 ++++-
+ lib/ipmi_fru.c     | 35 ++++++++++++++++++++++++++++++++---
+ lib/ipmi_lanp.c    | 14 +++++++-------
+ lib/ipmi_sdr.c     | 40 ++++++++++++++++++++++++----------------
+ lib/ipmi_session.c | 12 ++++++++----
+ 6 files changed, 83 insertions(+), 32 deletions(-)
+
+diff --git a/lib/dimm_spd.c b/lib/dimm_spd.c
+index 41e30db..68f3b4f 100644
+--- a/lib/dimm_spd.c
++++ b/lib/dimm_spd.c
+@@ -1621,7 +1621,7 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
+ 	struct ipmi_rq req;
+ 	struct fru_info fru;
+ 	uint8_t *spd_data, msg_data[4];
+-	int len, offset;
++	uint32_t len, offset;
+ 
+ 	msg_data[0] = id;
+ 
+@@ -1697,6 +1697,13 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
+ 		}
+ 
+ 		len = rsp->data[0];
++		if(rsp->data_len < 1
++		   || len > rsp->data_len - 1
++		   || len > fru.size - offset)
++		{
++			printf(" Not enough buffer size");
++			return -1;
++		}
+ 		memcpy(&spd_data[offset], rsp->data + 1, len);
+ 		offset += len;
+ 	} while (offset < fru.size);
+diff --git a/lib/ipmi_channel.c b/lib/ipmi_channel.c
+index 3ae3104..80ba522 100644
+--- a/lib/ipmi_channel.c
++++ b/lib/ipmi_channel.c
+@@ -447,7 +447,10 @@ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type,
+ 			lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites");
+ 			return -1;
+ 		}
+-		if (rsp->ccode || rsp->data_len < 1) {
++		if (rsp->ccode
++		    || rsp->data_len < 1
++		    || rsp->data_len > sizeof(uint8_t) + MAX_CIPHER_SUITE_DATA_LEN)
++		{
+ 			lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s",
+ 					val2str(rsp->ccode, completion_code_vals));
+ 			return -1;
+diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c
+index cf00eff..98bc984 100644
+--- a/lib/ipmi_fru.c
++++ b/lib/ipmi_fru.c
+@@ -615,7 +615,10 @@ int
+ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+ 			uint32_t offset, uint32_t length, uint8_t *frubuf)
+ {
+-	uint32_t off = offset, tmp, finish;
++	uint32_t off = offset;
++	uint32_t tmp;
++	uint32_t finish;
++	uint32_t size_left_in_buffer;
+ 	struct ipmi_rs * rsp;
+ 	struct ipmi_rq req;
+ 	uint8_t msg_data[4];
+@@ -628,10 +631,12 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+ 
+ 	finish = offset + length;
+ 	if (finish > fru->size) {
++		memset(frubuf + fru->size, 0, length - fru->size);
+ 		finish = fru->size;
+ 		lprintf(LOG_NOTICE, "Read FRU Area length %d too large, "
+ 			"Adjusting to %d",
+ 			offset + length, finish - offset);
++		length = finish - offset;
+ 	}
+ 
+ 	memset(&req, 0, sizeof(req));
+@@ -667,6 +672,7 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+ 		}
+ 	}
+ 
++	size_left_in_buffer = length;
+ 	do {
+ 		tmp = fru->access ? off >> 1 : off;
+ 		msg_data[0] = id;
+@@ -707,9 +713,18 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+ 		}
+ 
+ 		tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0];
++		if(rsp->data_len < 1
++		   || tmp > rsp->data_len - 1
++		   || tmp > size_left_in_buffer)
++		{
++			printf(" Not enough buffer size");
++			return -1;
++		}
++
+ 		memcpy(frubuf, rsp->data + 1, tmp);
+ 		off += tmp;
+ 		frubuf += tmp;
++		size_left_in_buffer -= tmp;
+ 		/* sometimes the size returned in the Info command
+ 		* is too large.  return 0 so higher level function
+ 		* still attempts to parse what was returned */
+@@ -742,7 +757,9 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+ 			uint32_t offset, uint32_t length, uint8_t *frubuf)
+ {
+ 	static uint32_t fru_data_rqst_size = 20;
+-	uint32_t off = offset, tmp, finish;
++	uint32_t off = offset;
++	uint32_t tmp, finish;
++	uint32_t size_left_in_buffer;
+ 	struct ipmi_rs * rsp;
+ 	struct ipmi_rq req;
+ 	uint8_t msg_data[4];
+@@ -755,10 +772,12 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+ 
+ 	finish = offset + length;
+ 	if (finish > fru->size) {
++		memset(frubuf + fru->size, 0, length - fru->size);
+ 		finish = fru->size;
+ 		lprintf(LOG_NOTICE, "Read FRU Area length %d too large, "
+ 			"Adjusting to %d",
+ 			offset + length, finish - offset);
++		length = finish - offset;
+ 	}
+ 
+ 	memset(&req, 0, sizeof(req));
+@@ -773,6 +792,8 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+ 	if (fru->access && fru_data_rqst_size > 16)
+ #endif
+ 		fru_data_rqst_size = 16;
++
++	size_left_in_buffer = length;
+ 	do {
+ 		tmp = fru->access ? off >> 1 : off;
+ 		msg_data[0] = id;
+@@ -804,8 +825,16 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
+ 		}
+ 
+ 		tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0];
++		if(rsp->data_len < 1
++		   || tmp > rsp->data_len - 1
++		   || tmp > size_left_in_buffer)
++		{
++			printf(" Not enough buffer size");
++			return -1;
++		}
+ 		memcpy((frubuf + off)-offset, rsp->data + 1, tmp);
+ 		off += tmp;
++		size_left_in_buffer -= tmp;
+ 
+ 		/* sometimes the size returned in the Info command
+ 		* is too large.  return 0 so higher level function
+@@ -3033,7 +3062,7 @@ ipmi_fru_print(struct ipmi_intf * intf, struct sdr_record_fru_locator * fru)
+ 		return 0;
+ 
+ 	memset(desc, 0, sizeof(desc));
+-	memcpy(desc, fru->id_string, fru->id_code & 0x01f);
++	memcpy(desc, fru->id_string, __min(fru->id_code & 0x01f, sizeof(desc)));
+ 	desc[fru->id_code & 0x01f] = 0;
+ 	printf("FRU Device Description : %s (ID %d)\n", desc, fru->device_id);
+ 
+diff --git a/lib/ipmi_lanp.c b/lib/ipmi_lanp.c
+index 65d881b..022c7f1 100644
+--- a/lib/ipmi_lanp.c
++++ b/lib/ipmi_lanp.c
+@@ -1809,7 +1809,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 		/* set new ipaddr */
+ 		memcpy(data+3, temp, 4);
+ 		printf("Setting LAN Alert %d IP Address to %d.%d.%d.%d\n", alert,
+@@ -1824,7 +1824,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 		/* set new macaddr */
+ 		memcpy(data+7, temp, 6);
+ 		printf("Setting LAN Alert %d MAC Address to "
+@@ -1838,7 +1838,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 
+ 		if (strncasecmp(argv[1], "def", 3) == 0 ||
+ 		    strncasecmp(argv[1], "default", 7) == 0) {
+@@ -1864,7 +1864,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 
+ 		if (strncasecmp(argv[1], "on", 2) == 0 ||
+ 		    strncasecmp(argv[1], "yes", 3) == 0) {
+@@ -1889,7 +1889,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 
+ 		if (strncasecmp(argv[1], "pet", 3) == 0) {
+ 			printf("Setting LAN Alert %d destination to PET Trap\n", alert);
+@@ -1917,7 +1917,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 
+ 		if (str2uchar(argv[1], &data[2]) != 0) {
+ 			lprintf(LOG_ERR, "Invalid time: %s", argv[1]);
+@@ -1933,7 +1933,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
+ 		if (p == NULL) {
+ 			return (-1);
+ 		}
+-		memcpy(data, p->data, p->data_len);
++		memcpy(data, p->data, __min(p->data_len, sizeof(data)));
+ 
+ 		if (str2uchar(argv[1], &data[3]) != 0) {
+ 			lprintf(LOG_ERR, "Invalid retry: %s", argv[1]);
+diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c
+index 0f6faab..9890132 100644
+--- a/lib/ipmi_sdr.c
++++ b/lib/ipmi_sdr.c
+@@ -2086,7 +2086,7 @@ ipmi_sdr_print_sensor_eventonly(struct ipmi_intf *intf,
+ 		return -1;
+ 
+ 	memset(desc, 0, sizeof (desc));
+-	snprintf(desc, (sensor->id_code & 0x1f) + 1, "%s", sensor->id_string);
++	snprintf(desc, sizeof(desc), "%.*s", (sensor->id_code & 0x1f) + 1, sensor->id_string);
+ 
+ 	if (verbose) {
+ 		printf("Sensor ID              : %s (0x%x)\n",
+@@ -2137,7 +2137,7 @@ ipmi_sdr_print_sensor_mc_locator(struct ipmi_intf *intf,
+ 		return -1;
+ 
+ 	memset(desc, 0, sizeof (desc));
+-	snprintf(desc, (mc->id_code & 0x1f) + 1, "%s", mc->id_string);
++	snprintf(desc, sizeof(desc), "%.*s", (mc->id_code & 0x1f) + 1, mc->id_string);
+ 
+ 	if (verbose == 0) {
+ 		if (csv_output)
+@@ -2230,7 +2230,7 @@ ipmi_sdr_print_sensor_generic_locator(struct ipmi_intf *intf,
+ 	char desc[17];
+ 
+ 	memset(desc, 0, sizeof (desc));
+-	snprintf(desc, (dev->id_code & 0x1f) + 1, "%s", dev->id_string);
++	snprintf(desc, sizeof(desc), "%.*s", (dev->id_code & 0x1f) + 1, dev->id_string);
+ 
+ 	if (!verbose) {
+ 		if (csv_output)
+@@ -2287,7 +2287,7 @@ ipmi_sdr_print_sensor_fru_locator(struct ipmi_intf *intf,
+ 	char desc[17];
+ 
+ 	memset(desc, 0, sizeof (desc));
+-	snprintf(desc, (fru->id_code & 0x1f) + 1, "%s", fru->id_string);
++	snprintf(desc, sizeof(desc), "%.*s", (fru->id_code & 0x1f) + 1, fru->id_string);
+ 
+ 	if (!verbose) {
+ 		if (csv_output)
+@@ -2491,35 +2491,43 @@ ipmi_sdr_print_name_from_rawentry(struct ipmi_intf *intf, uint16_t id,
+ 
+    int rc =0;
+    char desc[17];
++   const char *id_string;
++   uint8_t id_code;
+    memset(desc, ' ', sizeof (desc));
+ 
+    switch ( type) {
+       case SDR_RECORD_TYPE_FULL_SENSOR:
+       record.full = (struct sdr_record_full_sensor *) raw;
+-      snprintf(desc, (record.full->id_code & 0x1f) +1, "%s",
+-               (const char *)record.full->id_string);
++      id_code = record.full->id_code;
++      id_string = record.full->id_string;
+       break;
++
+       case SDR_RECORD_TYPE_COMPACT_SENSOR:
+       record.compact = (struct sdr_record_compact_sensor *) raw	;
+-      snprintf(desc, (record.compact->id_code & 0x1f)  +1, "%s",
+-               (const char *)record.compact->id_string);
++      id_code = record.compact->id_code;
++      id_string = record.compact->id_string;
+       break;
++
+       case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
+       record.eventonly  = (struct sdr_record_eventonly_sensor *) raw ;
+-      snprintf(desc, (record.eventonly->id_code & 0x1f)  +1, "%s",
+-               (const char *)record.eventonly->id_string);
+-      break;            
++      id_code = record.eventonly->id_code;
++      id_string = record.eventonly->id_string;
++      break;
++
+       case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
+       record.mcloc  = (struct sdr_record_mc_locator *) raw ;
+-      snprintf(desc, (record.mcloc->id_code & 0x1f)  +1, "%s",
+-               (const char *)record.mcloc->id_string);		
++      id_code = record.mcloc->id_code;
++      id_string = record.mcloc->id_string;
+       break;
++
+       default:
+       rc = -1;
+-      break;
+-   }   
++   }
++   if (!rc) {
++       snprintf(desc, sizeof(desc), "%.*s", (id_code & 0x1f) + 1, id_string);
++   }
+ 
+-      lprintf(LOG_INFO, "ID: 0x%04x , NAME: %-16s", id, desc);
++   lprintf(LOG_INFO, "ID: 0x%04x , NAME: %-16s", id, desc);
+    return rc;
+ }
+ 
+diff --git a/lib/ipmi_session.c b/lib/ipmi_session.c
+index 141f0f4..b9af1fd 100644
+--- a/lib/ipmi_session.c
++++ b/lib/ipmi_session.c
+@@ -309,8 +309,10 @@ ipmi_get_session_info(struct ipmi_intf         * intf,
+ 		}
+ 		else
+ 		{
+-			memcpy(&session_info,  rsp->data, rsp->data_len);
+-			print_session_info(&session_info, rsp->data_len);
++			memcpy(&session_info,  rsp->data,
++			       __min(rsp->data_len, sizeof(session_info)));
++			print_session_info(&session_info,
++			                   __min(rsp->data_len, sizeof(session_info)));
+ 		}
+ 		break;
+ 		
+@@ -341,8 +343,10 @@ ipmi_get_session_info(struct ipmi_intf         * intf,
+ 				break;
+ 			}
+ 
+-			memcpy(&session_info,  rsp->data, rsp->data_len);
+-			print_session_info(&session_info, rsp->data_len);
++			memcpy(&session_info,  rsp->data,
++			       __min(rsp->data_len, sizeof(session_info)));
++			print_session_info(&session_info,
++			                   __min(rsp->data_len, sizeof(session_info)));
+ 			
+ 		} while (i <= session_info.session_slot_count);
+ 		break;
+-- 
+2.20.1
+
diff --git a/system/irqbalance/README b/system/irqbalance/README
index cdf1869f3c..723c69fb17 100644
--- a/system/irqbalance/README
+++ b/system/irqbalance/README
@@ -1,9 +1,9 @@
 irqbalance is a Linux daemon that distributes interrupts over the
-processors and cores you have in your computer system.  The design goal
-of irqbalance is to find a balance between power savings and optimal
-performance.  To a large degree, the work irqbalance does is invisible
-to you; if irqbalance performs its job correctly, nobody will ever notice
-it's there or want to turn it off.
+processors and cores you have in your computer system.  The design
+goal of irqbalance is to find a balance between power savings and
+optimal performance. To a large degree, the work irqbalance does is
+invisible to you; if irqbalance performs its job correctly, nobody
+will ever notice it's there or want to turn it off.
 
 It is recommended to run irqbalance from the system boot-scripts. For
 example, add the following lines to /etc/rc.d/rc.local:
diff --git a/system/irqbalance/irqbalance.SlackBuild b/system/irqbalance/irqbalance.SlackBuild
index 5f12fdc5b9..f0f0566a88 100644
--- a/system/irqbalance/irqbalance.SlackBuild
+++ b/system/irqbalance/irqbalance.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for irqbalance
 
 # Copyright 2006 by Yalla-One <yallaone@gmail.com>
 # Copyright 2013-2015 by LukenShiro, Italy
-# Copyright 2019-2020 Logan Rathbone <poprocks@gmail.com>
+# Copyright 2019-2023 Logan Rathbone <poprocks@gmail.com>
 #
 # All rights reserved.
 #
@@ -25,20 +25,30 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=irqbalance
-VERSION=${VERSION:-1.7.0}
+VERSION=${VERSION:-1.9.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=${TMP}/package-${PRGNAM}
 OUTPUT=${OUTPUT:-/tmp}
@@ -46,8 +56,8 @@ OUTPUT=${OUTPUT:-/tmp}
 DOCFILES="AUTHORS COPYING README.md"
 SRCVER=v$VERSION
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -101,4 +111,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd ${PKG}
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/irqbalance/irqbalance.info b/system/irqbalance/irqbalance.info
index 57a0f96647..d05bb9e3a1 100644
--- a/system/irqbalance/irqbalance.info
+++ b/system/irqbalance/irqbalance.info
@@ -1,8 +1,8 @@
 PRGNAM="irqbalance"
-VERSION="1.7.0"
+VERSION="1.9.3"
 HOMEPAGE="https://github.com/Irqbalance/irqbalance"
-DOWNLOAD="https://github.com/Irqbalance/irqbalance/archive/v1.7.0/irqbalance-1.7.0.tar.gz"
-MD5SUM="621117212f6e7ed33d70a25e917e3e0d"
+DOWNLOAD="https://github.com/Irqbalance/irqbalance/archive/v1.9.3/irqbalance-1.9.3.tar.gz"
+MD5SUM="f05bdb5e2a519706ec038dbe54971e08"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/iscan-data/README b/system/iscan-data/README
new file mode 100644
index 0000000000..e26cac2c62
--- /dev/null
+++ b/system/iscan-data/README
@@ -0,0 +1,2 @@
+This package contains EPSON Image Scan! data files which are
+required for using certain EPSON all-in-one devices.
diff --git a/system/iscan-data/iscan-data.SlackBuild b/system/iscan-data/iscan-data.SlackBuild
new file mode 100644
index 0000000000..52249fc4a0
--- /dev/null
+++ b/system/iscan-data/iscan-data.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/bash
+
+# Slackware build script for iscan-data
+
+# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=iscan-data
+VERSION=${VERSION:-1.39.2}
+ADDVER=${ADDVER:-1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+DOCS="COPYING KNOWN-PROBLEMS SUPPORTED-DEVICES"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_${VERSION}-${ADDVER}.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/iscan-data/iscan-data.info b/system/iscan-data/iscan-data.info
new file mode 100644
index 0000000000..bbee19c015
--- /dev/null
+++ b/system/iscan-data/iscan-data.info
@@ -0,0 +1,10 @@
+PRGNAM="iscan-data"
+VERSION="1.39.2"
+HOMEPAGE="http://epson.net"
+DOWNLOAD="http://support.epson.net/linux/src/scanner/iscan/iscan-data_1.39.2-1.tar.gz"
+MD5SUM="fc90c84b7abb2ee6186d65cb7997aeb2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/iscan-data/slack-desc b/system/iscan-data/slack-desc
new file mode 100644
index 0000000000..d3f025101e
--- /dev/null
+++ b/system/iscan-data/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+iscan-data: iscan-data (EPSON Image Scan! data files)
+iscan-data:
+iscan-data: This package contains EPSON Image Scan! data files which are
+iscan-data: required for using certain EPSON all-in-one devices.
+iscan-data:
+iscan-data: homepage: http://epson.net
+iscan-data:
+iscan-data:
+iscan-data:
+iscan-data:
+iscan-data:
diff --git a/system/iscan/README b/system/iscan/README
new file mode 100644
index 0000000000..3ae47041b7
--- /dev/null
+++ b/system/iscan/README
@@ -0,0 +1,4 @@
+EPSON Image Scan! for Linux enables you to print to a networked
+all-in-one EPSON printer.  A SANE 'epkowa' backend is provided
+as well; scanning over the network requires the additional
+iscan-network-nt package which contains a protocol driver.
diff --git a/system/iscan/doinst.sh b/system/iscan/doinst.sh
new file mode 100644
index 0000000000..25f34e1d3a
--- /dev/null
+++ b/system/iscan/doinst.sh
@@ -0,0 +1,29 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/sane.d/epkowa.conf.new
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/system/iscan/iscan.SlackBuild b/system/iscan/iscan.SlackBuild
new file mode 100644
index 0000000000..3084af0755
--- /dev/null
+++ b/system/iscan/iscan.SlackBuild
@@ -0,0 +1,152 @@
+#!/bin/bash
+
+# Slackware build script for iscan
+
+# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Shamelessly ripped from Alien Bob's script: thank him for all the hard work!
+
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - make .desktop file validate.
+# - use relative symlink for /usr/bin.
+# - remove useless INSTALL from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=iscan
+VERSION=${VERSION:-2.30.4}
+ADDVER=${ADDVER:-2}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+# Minor library version of libpng on our system:
+PNGMINOR=$(pkg-config --modversion libpng |cut -d'.' -f2)
+if [ $PNGMINOR -gt 5 ]; then
+  PNG_LDFLAGS="-lpng16"
+elif [ $PNGMINOR -eq 4 ]; then
+  PNG_LDFLAGS="-lpng14"
+fi
+
+DOCS="COPYING NEWS README non-free/COPYING*.txt"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_${VERSION}-${ADDVER}.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# Apply ArchLinux patches:
+# Allow linking against libpng15 and newer:
+patch -p0 < $CWD/patches/iscan_png15.patch
+# Patch for ambiguous div in jpegstream.cc:
+patch -p0 < $CWD/patches/jpegstream.cc.patch
+# Fix compilation error 'unknown type name u_char' on 32bit:
+patch -p1 < $CWD/patches/iscan-2.30.3_x86-unknown-types.patch
+# Add fix for CXX ABI different than 1002:
+ln -s libesmod-x86_64.c2.so non-free/libesmod-x86_64.so
+
+LDFLAGS="-ldl $PNG_LDFLAGS" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-dependency-reduction \
+  --enable-frontend \
+  --enable-jpeg \
+  --enable-tiff \
+  --enable-png \
+  --enable-gimp \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
+
+# Install the SANE backend configuration:
+mkdir -p $PKG/etc/sane.d/dll.d
+install -m0644 backend/epkowa.conf $PKG/etc/sane.d/epkowa.conf.new
+echo "epkowa" > $PKG/etc/sane.d/dll.d/epkowa.conf
+
+# Create the forgotten desktop menu:
+sed -i -e '/^Encoding/d' -e '/^Categories/s,Application;,,' $PRGNAM.desktop
+mkdir -p $PKG/usr/share/applications
+install -m0644 $PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+
+# Make the GIMP aware of the iscan plugin:
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/gimp/2.0/plug-ins
+ln -s ../../../../bin/$PRGNAM $PKG/usr/lib$LIBDIRSUFFIX/gimp/2.0/plug-ins/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/iscan/iscan.info b/system/iscan/iscan.info
new file mode 100644
index 0000000000..a299693821
--- /dev/null
+++ b/system/iscan/iscan.info
@@ -0,0 +1,10 @@
+PRGNAM="iscan"
+VERSION="2.30.4"
+HOMEPAGE="http://epson.net"
+DOWNLOAD="http://support.epson.net/linux/src/scanner/iscan/iscan_2.30.4-2.tar.gz"
+MD5SUM="b79c73341fcd7dd930381d50952b88c8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="iscan-data"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch b/system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch
new file mode 100644
index 0000000000..9bb856ff83
--- /dev/null
+++ b/system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch
@@ -0,0 +1,12 @@
+diff -ru a/sanei/sanei_pio.c b/sanei/sanei_pio.c
+--- a/sanei/sanei_pio.c	2019-03-01 10:44:36.723260142 -0600
++++ b/sanei/sanei_pio.c	2019-03-01 10:48:47.660693036 -0600
+@@ -73,6 +73,7 @@
+ #elif HAVE_SYS_HW_H
+ # include <sys/hw.h>
+ #elif defined(__i386__)  && defined (__GNUC__)
++#include <sys/types.h>
+ 
+ static __inline__ void
+ outb (u_char value, u_long port)
+
diff --git a/system/iscan/patches/iscan_png15.patch b/system/iscan/patches/iscan_png15.patch
new file mode 100644
index 0000000000..8220ac4af3
--- /dev/null
+++ b/system/iscan/patches/iscan_png15.patch
@@ -0,0 +1,52 @@
+#
+# Thanks to Fabio Castelli, ArchLinux:
+# https://projects.archlinux.org/svntogit/community.git/tree/trunk/libpng15.patch?h=packages/iscan
+#
+--- lib/pngstream.cc	2011-12-01 02:30:53.000000000 +0100
++++ lib/pngstream.cc	2012-02-06 03:06:22.000000000 +0100
+@@ -83,7 +83,12 @@
+ #if HAVE_PNG_H
+     set_error_handler (_png, _info);
+ 
++/* when not interlacing (ie, only one pass), number of rows is image height:  _v_sz */
++#if PNG_LIBPNG_VER > 10499
++        if (!_footer && _v_sz == lib->get_current_row_number(_png))
++#else
+     if (_header && !_footer && _png->num_rows == _png->flush_rows)
++#endif
+       {
+         lib->write_end (_png, _info);
+         _footer = true;
+@@ -167,6 +172,9 @@
+     funcsym (write_row);
+     funcsym (write_flush);
+     funcsym (write_end);
++#if PNG_LIBPNG_VER > 10499
++    funcsym (get_current_row_number);
++#endif
+ 
+     if (lib->access_version_number
+         && lib->create_write_struct
+@@ -176,6 +184,9 @@
+         && lib->set_IHDR
+         && lib->set_pHYs
+         && lib->set_invert_mono
++#if PNG_LIBPNG_VER > 10499
++	&& lib->get_current_row_number
++#endif
+         && lib->write_info
+         && lib->write_row
+         && lib->write_flush
+--- lib/pngstream.hh	2011-12-01 02:30:53.000000000 +0100
++++ lib/pngstream.hh	2012-02-06 03:09:09.000000000 +0100
+@@ -108,6 +108,10 @@
+                png_structp);
+       fundecl (void, write_end,
+                png_structp, png_infop);
++#if PNG_LIBPNG_VER > 10499
++      fundecl (png_uint_32, get_current_row_number,
++               png_structp);
++#endif
+ #endif /* HAVE_PNG_H */
+     };
+     static png_lib_handle *lib;
diff --git a/system/iscan/patches/jpegstream.cc.patch b/system/iscan/patches/jpegstream.cc.patch
new file mode 100644
index 0000000000..988a25daea
--- /dev/null
+++ b/system/iscan/patches/jpegstream.cc.patch
@@ -0,0 +1,21 @@
+--- lib/jpegstream.cc.orig	2016-06-20 06:10:38.000000000 +0200
++++ lib/jpegstream.cc	2016-07-10 18:45:40.511301054 +0200
+@@ -33,7 +33,7 @@
+ 
+ #include "jpegstream.hh"
+ 
+-#include <cstdlib>
++// #include <cstdlib>
+ #include <ios>
+ 
+ namespace iscan
+@@ -82,7 +82,8 @@
+         //        only that _bits != 8.
+         for (unsigned int i = 0; i < _h_sz; ++i)
+           {
+-            div_t index = div (i, 8 * sizeof (JSAMPLE));
++            div_t index = div (static_cast<int>(i),
++                               static_cast<int>(8 * sizeof (JSAMPLE)));
+             int offset = 8 * sizeof (JSAMPLE) - 1 - index.rem;
+             _scanline[i] = ((line[index.quot] & (1 << offset))
+                             ? 0 : ~0);
diff --git a/system/iscan/slack-desc b/system/iscan/slack-desc
new file mode 100644
index 0000000000..56fcd9b5c0
--- /dev/null
+++ b/system/iscan/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+iscan: iscan (front-end for EPSON all-in-one devices)
+iscan:
+iscan: EPSON Image Scan! for Linux enables you to print to a networked
+iscan: all-in-one EPSON printer.  A SANE 'epkowa' backend is provided
+iscan: as well; scanning over the network requires the additional
+iscan: iscan-network-nt package which contains a protocol driver.
+iscan:
+iscan: homepage: http://epson.net
+iscan:
+iscan:
+iscan:
diff --git a/system/iselect/README b/system/iselect/README
new file mode 100644
index 0000000000..08c440c1f4
--- /dev/null
+++ b/system/iselect/README
@@ -0,0 +1,10 @@
+iselect (curses-based interactive selection tool)
+
+OSSP iselect is an interactive line selection tool for textual files,
+operating via a full-screen Curses-based terminal session. It can be
+used either as an user interface frontend controlled by a scripting
+backend as its wrapper or in batch mode as a pipeline filter (usually
+between grep and the final executing command).
+
+The package also includes screen-ir, a script to interactively
+reattach to one of several screen sessions.
diff --git a/system/iselect/iselect.SlackBuild b/system/iselect/iselect.SlackBuild
new file mode 100644
index 0000000000..088493b12d
--- /dev/null
+++ b/system/iselect/iselect.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# Slackware build script for iselect
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=iselect
+VERSION=${VERSION:-1.4.0_4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+TARVER=${VERSION/_*}
+DEBVER=${VERSION/*_}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_$TARVER.orig.tar.gz
+cd $PRGNAM-$TARVER
+tar xvf $CWD/${PRGNAM}_$TARVER-$DEBVER.debian.tar.xz
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# Apply all Debian's patches except one.
+sed -i '/^dont-strip-binary/d' debian/patches/series
+for i in $( cat debian/patches/series ); do
+  patch -p1 < debian/patches/$i
+done
+
+# Man pages need the version number, not "EN"
+sed -i 's,"EN",'$PRGNAM-$VERSION, $PRGNAM.1 debian/screen-ir.1
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make CFLAGS="$SLKCFLAGS -fcommon"
+# warning: DESTDIR not supported here!
+make install prefix=$PKG/usr
+gzip -9 $PKG/usr/man/man*/*
+
+# Debian includes this handy script.
+install -m0755 debian/screen-ir $PKG/usr/bin
+gzip -9c < debian/screen-ir.1 > $PKG/usr/man/man1/screen-ir.1.gz
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a COPYING ChangeLog README VERSIONS example $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/iselect/iselect.info b/system/iselect/iselect.info
new file mode 100644
index 0000000000..2adff8c56a
--- /dev/null
+++ b/system/iselect/iselect.info
@@ -0,0 +1,12 @@
+PRGNAM="iselect"
+VERSION="1.4.0_4"
+HOMEPAGE="http://www.ossp.org/pkg/tool/iselect/"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/i/iselect/iselect_1.4.0.orig.tar.gz \
+          http://deb.debian.org/debian/pool/main/i/iselect/iselect_1.4.0-4.debian.tar.xz"
+MD5SUM="d278a61fe2557f9ce8270328b5f7b3b6 \
+        0376f9db5df9494cda833dd725584549"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/iselect/slack-desc b/system/iselect/slack-desc
new file mode 100644
index 0000000000..ddfa8d6517
--- /dev/null
+++ b/system/iselect/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+iselect: iselect (curses-based interactive selection tool)
+iselect:
+iselect: OSSP iselect is an interactive line selection tool for textual files,
+iselect: operating via a full-screen Curses-based terminal session. It can be
+iselect: used either as an user interface frontend controlled by a scripting
+iselect: backend as its wrapper or in batch mode as a pipeline filter (usually
+iselect: between grep and the final executing command).
+iselect:
+iselect: The package also includes screen-ir, a script to interactively
+iselect: reattach to one of several screen sessions.
+iselect:
diff --git a/system/isextract/README b/system/isextract/README
index 81d4c5fbe3..fd926c9a20 100644
--- a/system/isextract/README
+++ b/system/isextract/README
@@ -7,4 +7,7 @@ The files isextract supports are identified by the file command as
 "InstallShield Z archive Data", and begin with a hex signature of 13 5d
 65 8c 3a 01 02.
 
-See also: unshield, for other types of InstallShield files.
+See also:
+- unshield, for other types of InstallShield files.
+- unshieldv3, for another v3 extractor.
+- cabextract, for cabinet (.cab) files.
diff --git a/system/isextract/isextract.1 b/system/isextract/isextract.1
index 318ac7fabd..3886f5742a 100644
--- a/system/isextract/isextract.1
+++ b/system/isextract/isextract.1
@@ -1,8 +1,5 @@
 .\" Man page generated from reStructuredText.
 .
-.TH ISEXTRACT 1 "2020-04-29" "20141107_5adb0af" "SlackBuilds.org"
-.SH NAME
-isextract \- Extract InstallShield v3 archives
 .
 .nr rst2man-indent-level 0
 .
@@ -30,28 +27,27 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
+.TH "ISEXTRACT" 1 "2022-01-12" "20141107_5adb0af" "SlackBuilds.org"
+.SH NAME
+isextract \- Extract InstallShield v3 archives
 .\" RST source for isextract(1) man page. Convert with:
 .
 .\" rst2man.py isextract.rst > isextract.1
 .
 .\" rst2man.py comes from the SBo development/docutils package.
 .
-.\" converting from pod:
-.
-.\" s/B<\([^>]*\)>/**\1**/g
-.
-.\" s/I<\([^>]*\)>/*\1*/g
-.
 .SH SYNOPSIS
 .sp
-isextract [\fIl|x\fP] file.z
+isextract [\fIl\fP] \fIfile.z\fP
+.sp
+isextract [\fIx\fP] \fIfile.z\fP [\fIoutput\-dir\fP]
 .SH DESCRIPTION
 .sp
-isextract is a command line tool to extract the .z InstallShield v3
+\fBisextract\fP is a command line tool to extract the .Z InstallShield v3
 packages many old windows games were distributed as.
 .sp
-The files isextract supports normally have a \fB\&.z\fP extension, and can be
-idenfified by the file command:
+The files \fBisextract\fP supports normally have a \fB\&.Z\fP extension, and can be
+idenfified by the \fBfile\fP(1) command:
 .INDENT 0.0
 .INDENT 3.5
 .sp
@@ -77,13 +73,27 @@ $ head \-c6 data.z | xxd
 .UNINDENT
 .UNINDENT
 .SH OPTIONS
+.INDENT 0.0
+.TP
+.B \fBl\fP
+List contents of archive.
+.TP
+.B \fBx\fP
+Extract archive. If an \fIoutput\-dir\fP is given, extracted files will be written
+there (the \fIoutput\-dir\fP must already exist). Without \fIoutput\-dir\fP, the current
+directory is used.
+.UNINDENT
 .sp
-\fBl\fP       List contents of archive.
+If \fBfile\fP says "compress\(aqd data" or similar, your file isn\(aqt an
+InstallShield archive; it\(aqs compressed with the old UNIX compress
+command, and can be extracted with \fBuncompress\fP(1) or \fBgzip\fP(1).
 .sp
-\fBx\fP       Extract archive to current directory.
+When extracting, \fBisextract\fP \fIDOES NOT\fP preserve the directory structure
+inside the archive. All files are written to the same directory. If you
+need the directories, use \fBunshieldv3\fP instead.
 .SH COPYRIGHT
 .sp
-See the file /usr/doc/PRGNAM\-20141107_5adb0af/LICENSE for license information.
+See the file /usr/doc/isextract\-20141107_5adb0af/LICENSE for license information.
 .SH AUTHORS
 .sp
 isextract was written by OmniBlade.
@@ -92,6 +102,6 @@ This man page written for the SlackBuilds.org project
 by B. Watson, and is licensed under the WTFPL.
 .SH SEE ALSO
 .sp
-unshield(1), cabextract(1)
+\fBunshieldv3\fP(1), \fBunshield\fP(1), \fBcabextract\fP(1)
 .\" Generated by docutils manpage writer.
 .
diff --git a/system/isextract/isextract.SlackBuild b/system/isextract/isextract.SlackBuild
index a4bc4c2c58..993309f579 100644
--- a/system/isextract/isextract.SlackBuild
+++ b/system/isextract/isextract.SlackBuild
@@ -1,15 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for isextract
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20220112 bkw: BUILD=2, update man page.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=isextract
 VERSION=${VERSION:-20141107_5adb0af}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +24,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,4 +78,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/isextract/isextract.info b/system/isextract/isextract.info
index 933dd14ac5..8a7d91490e 100644
--- a/system/isextract/isextract.info
+++ b/system/isextract/isextract.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/isextract/isextract.rst b/system/isextract/isextract.rst
index aaa4622681..83aa429a2f 100644
--- a/system/isextract/isextract.rst
+++ b/system/isextract/isextract.rst
@@ -5,10 +5,6 @@
 .. |version| replace:: 20141107_5adb0af
 .. |date| date::
 
-.. converting from pod:
-.. s/B<\([^>]*\)>/**\1**/g
-.. s/I<\([^>]*\)>/*\1*/g
-
 =========
 isextract
 =========
@@ -25,16 +21,18 @@ Extract InstallShield v3 archives
 SYNOPSIS
 ========
 
-isextract [*l|x*] file.z
+isextract [*l*] *file.z*
+
+isextract [*x*] *file.z* [*output-dir*]
 
 DESCRIPTION
 ===========
 
-isextract is a command line tool to extract the .z InstallShield v3
+**isextract** is a command line tool to extract the .Z InstallShield v3
 packages many old windows games were distributed as.
 
-The files isextract supports normally have a **.z** extension, and can be
-idenfified by the file command:
+The files **isextract** supports normally have a **.Z** extension, and can be
+idenfified by the **file**\(1) command:
 
 ::
 
@@ -51,14 +49,26 @@ idenfified by the file command:
 OPTIONS
 =======
 
-**l**       List contents of archive.
+**l**
+  List contents of archive.
+
+**x**
+  Extract archive. If an *output-dir* is given, extracted files will be written
+  there (the *output-dir* must already exist). Without *output-dir*, the current
+  directory is used.
+
+If **file** says "compress'd data" or similar, your file isn't an
+InstallShield archive; it's compressed with the old UNIX compress
+command, and can be extracted with **uncompress**\(1) or **gzip**\(1).
 
-**x**       Extract archive to current directory.
+When extracting, **isextract** *DOES NOT* preserve the directory structure
+inside the archive. All files are written to the same directory. If you
+need the directories, use **unshieldv3** instead.
 
 COPYRIGHT
 =========
 
-See the file /usr/doc/PRGNAM-|version|/LICENSE for license information.
+See the file /usr/doc/isextract-|version|/LICENSE for license information.
 
 AUTHORS
 =======
@@ -71,4 +81,4 @@ by B. Watson, and is licensed under the WTFPL.
 SEE ALSO
 ========
 
-unshield(1), cabextract(1)
+**unshieldv3**\(1), **unshield**\(1), **cabextract**\(1)
diff --git a/system/isight-firmware-tools/README b/system/isight-firmware-tools/README
index 30e2096649..d53467858b 100644
--- a/system/isight-firmware-tools/README
+++ b/system/isight-firmware-tools/README
@@ -1,5 +1,5 @@
-isight-firmware-tools (utilities to extract isight firmware from Apple driver
-                       for use with Linux kernel)
+isight-firmware-tools: utilities to extract isight firmware from Apple
+driver for use with Linux kernel
 
 This project provide tools to manipulate firmware for Built-in iSight
 found on Apple machine since iMac G5 iSight (November 2005).
diff --git a/system/isight-firmware-tools/isight-firmware-tools.SlackBuild b/system/isight-firmware-tools/isight-firmware-tools.SlackBuild
index a464313ec0..9c2cae647d 100644
--- a/system/isight-firmware-tools/isight-firmware-tools.SlackBuild
+++ b/system/isight-firmware-tools/isight-firmware-tools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for isight-firmware-tools
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=isight-firmware-tools
 VERSION=${VERSION:-1.6}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -106,4 +116,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/isomaster/README b/system/isomaster/README
index cb5c22a911..322449315a 100644
--- a/system/isomaster/README
+++ b/system/isomaster/README
@@ -1,4 +1,5 @@
-ISO Master is an open-source, easy to use, graphical CD image editor for
-Linux and BSD. Basically you can use this program to extract files from an
-ISO, add files to an ISO, and create bootable ISOs - all in a graphical
-user interface. It can open both ISO and NRG files but can only save as ISO.
+ISO Master is an open-source, easy to use, graphical CD image editor
+for Linux and BSD. Basically you can use this program to extract files
+from an ISO, add files to an ISO, and create bootable ISOs - all in a
+graphical user interface. It can open both ISO and NRG files but can
+only save as ISO.
diff --git a/system/isomaster/isomaster.SlackBuild b/system/isomaster/isomaster.SlackBuild
index 95515c3949..41a692422a 100644
--- a/system/isomaster/isomaster.SlackBuild
+++ b/system/isomaster/isomaster.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for ISO Master
 #
-# Copyright 2009-2015  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009-2022  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=isomaster
-VERSION=${VERSION:-1.3.13}
+VERSION=${VERSION:-1.3.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -90,4 +100,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/isomaster/isomaster.info b/system/isomaster/isomaster.info
index f941323f65..0467b9f7a1 100644
--- a/system/isomaster/isomaster.info
+++ b/system/isomaster/isomaster.info
@@ -1,8 +1,8 @@
 PRGNAM="isomaster"
-VERSION="1.3.13"
+VERSION="1.3.16"
 HOMEPAGE="http://littlesvr.ca/isomaster/index.php"
-DOWNLOAD="http://littlesvr.ca/isomaster/releases/isomaster-1.3.13.tar.bz2"
-MD5SUM="0fe6a1d862feb954d8f760d23829e5b4"
+DOWNLOAD="http://littlesvr.ca/isomaster/releases/isomaster-1.3.16.tar.bz2"
+MD5SUM="3c06161f1640c35363474f6efa096ff4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/isomd5sum/isomd5sum.SlackBuild b/system/isomd5sum/isomd5sum.SlackBuild
index 59667309e9..28d686af6c 100644
--- a/system/isomd5sum/isomd5sum.SlackBuild
+++ b/system/isomd5sum/isomd5sum.SlackBuild
@@ -1,22 +1,26 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for isomd5sum
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 # Modified by Willy Sudiarto Raharjo <willysr@slackware-id.org>
 # Modified again by B. Watson
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20240317 bkw: update for v1.2.4, simplify script a bit
 # 20180611 bkw: update for v1.2.3
 # 20171214 bkw: update for v1.2.2
 # 20170614 bkw: update for v1.2.1
 # 20170302 bkw: use long-format github URL
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=isomd5sum
-VERSION=${VERSION:-1.2.3}
+VERSION=${VERSION:-1.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -26,7 +30,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -53,11 +61,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 sed -i \
   -e 's,/usr/share/man,/usr/man,' \
@@ -65,38 +70,37 @@ sed -i \
   -e "s,-O3,$SLKCFLAGS", \
   Makefile
 
-# Build & install binaries, libs, and python2 support:
-make -j1 \
-  RPM_OPT_FLAGS="$SLKCFLAGS" \
-  PYTHON=python2 \
-  DESTDIR=$PKG \
-  all install
-
-# If python3 is installed, build support for it.
-# Slack's python 2.x package has a python2-config command, but SBo's
-# python 3.x doesn't have python3-config (only e.g. python3.3-config).
-# The readlink/which stuff avoids hard-coding 3.3 in this script:
-if python3 --version >/dev/null 2>&1; then
+runmake() {
+  local py="$1"
+  shift
   make -j1 \
     RPM_OPT_FLAGS="$SLKCFLAGS" \
-    PYTHON=$( readlink $( which python3 ) ) \
+    PYTHON="$py" \
     DESTDIR=$PKG \
-    clean all install-python
-fi
+    "$@"
+}
 
-# fix .pc file stupidity:
-sed -i '/^\(libdir\|includedir\)/s,=.*usr,=/usr,' $PKG/usr/share/pkgconfig/$PRGNAM.pc
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# Build & install binaries, libs, and python2 support:
+runmake python2 all install
+
+# Build & install python3 support:
+runmake python3 clean all install-python
+
+# 20240317 bkw: much quicker than the template find|xargs|strip.
+strip $PKG/usr/bin/* $PKG/usr/lib*/python*/site-packages/*.so
 
 gzip -9 $PKG/usr/man/man?/*.?
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README COPYING testpyisomd5sum.py $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# 20240317 bkw: this used to go in the doc dir, moved to bin.
+install -m0755 testpyisomd5sum.py $PKG/usr/bin
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README COPYING $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/isomd5sum/isomd5sum.info b/system/isomd5sum/isomd5sum.info
index 8d03f921d4..abf3796013 100644
--- a/system/isomd5sum/isomd5sum.info
+++ b/system/isomd5sum/isomd5sum.info
@@ -1,10 +1,10 @@
 PRGNAM="isomd5sum"
-VERSION="1.2.3"
+VERSION="1.2.4"
 HOMEPAGE="https://github.com/rhinstaller/isomd5sum/"
-DOWNLOAD="https://github.com/rhinstaller/isomd5sum/archive/1.2.3/isomd5sum-1.2.3.tar.gz"
-MD5SUM="c4e04bba46a162ff60ca6dea04ab3e21"
+DOWNLOAD="https://github.com/rhinstaller/isomd5sum/archive/1.2.4/isomd5sum-1.2.4.tar.gz"
+MD5SUM="da23e32ef09aede2f0946d312a798587"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/iucode_tool/iucode_tool.SlackBuild b/system/iucode_tool/iucode_tool.SlackBuild
index b4bfc4380d..253dcf8522 100644
--- a/system/iucode_tool/iucode_tool.SlackBuild
+++ b/system/iucode_tool/iucode_tool.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 #Slackware build script for iucode_tool
 
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=iucode_tool
 VERSION=${VERSION:-2.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -95,4 +105,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/jdiskreport/README b/system/jdiskreport/README
index 7614efd683..d3962f92b5 100644
--- a/system/jdiskreport/README
+++ b/system/jdiskreport/README
@@ -1,6 +1,6 @@
-JDiskReport enables you to understand how much space the files and directories
-consume on your disk drives, and it helps you find obsolete files and folders.
-
-The tool analyses your disk drives and collects several statistics which you 
-can view as overview charts and details tables.
+JDiskReport enables you to understand how much space the files
+and directories consume on your disk drives, and it helps you find
+obsolete files and folders.
 
+The tool analyses your disk drives and collects several statistics
+which you can view as overview charts and details tables.
diff --git a/system/jdiskreport/jdiskreport.SlackBuild b/system/jdiskreport/jdiskreport.SlackBuild
index 0acca36210..9a030e29e6 100644
--- a/system/jdiskreport/jdiskreport.SlackBuild
+++ b/system/jdiskreport/jdiskreport.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for jdiskreport
 
@@ -31,14 +31,24 @@
 # 20121211 - Corrected "$@" to "\$@" in the /usr/bin script creation
 # 20140423 - Updated for version 1.4.1
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=jdiskreport
 VERSION=${VERSION:-1.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -86,4 +96,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/jdiskreport/jdiskreport.info b/system/jdiskreport/jdiskreport.info
index 202c8dea63..074b8badbf 100644
--- a/system/jdiskreport/jdiskreport.info
+++ b/system/jdiskreport/jdiskreport.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip"
 MD5SUM="9380a6ba68bd21e0f09b58297eb5a44a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Alan Alberghini"
 EMAIL="414N@slacky.it"
diff --git a/system/jdupes/jdupes.SlackBuild b/system/jdupes/jdupes.SlackBuild
index 70c8afdc28..12f275dd31 100644
--- a/system/jdupes/jdupes.SlackBuild
+++ b/system/jdupes/jdupes.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for jdupes.
 #
 # Yth | Pont-en-Royans, France | yth@ythogtha.org
@@ -20,10 +20,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=jdupes
-VERSION=${VERSION:-1.19.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.27.3}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -33,7 +36,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,21 +57,25 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
-DOCFILES="CHANGES INSTALL LICENSE README*"
+DOCFILES="CHANGES.txt LICENSE.txt README*"
 
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM
+tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+cd $PRGNAM
+rm testdir/recursed_a/symlink_infinite_loop
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -89,4 +103,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/jdupes/jdupes.info b/system/jdupes/jdupes.info
index 88e1f2ee77..d8b9c7f394 100644
--- a/system/jdupes/jdupes.info
+++ b/system/jdupes/jdupes.info
@@ -1,10 +1,10 @@
 PRGNAM="jdupes"
-VERSION="1.19.1"
-HOMEPAGE="https://github.com/jbruchon/jdupes"
-DOWNLOAD="https://github.com/jbruchon/jdupes/archive/v1.19.1/jdupes-1.19.1.tar.gz"
-MD5SUM="36702a0a8797627790ae3e1cf1f64e23"
+VERSION="1.27.3"
+HOMEPAGE="https://codeberg.org/jbruchon/jdupes"
+DOWNLOAD="https://codeberg.org/jbruchon/jdupes/archive/v1.27.3.tar.gz"
+MD5SUM="b6eff10eb70604f77e8de98c59d2e8bb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="libjodycode"
 MAINTAINER="Yth - Arnaud"
 EMAIL="yth@ythogtha.org"
diff --git a/system/jenkins/README b/system/jenkins/README
index e900430c79..0adb276db7 100644
--- a/system/jenkins/README
+++ b/system/jenkins/README
@@ -14,3 +14,9 @@ for example:
 
   groupadd -g 251 jenkins
   useradd -g 251 -u 251 -r -s /bin/bash -d /var/lib/jenkins jenkins
+
+This LTS supports Java 11, Java 17, or Java 21. The REQUIRES has
+zulu-openjdk21, but you can use your choice of version and
+vendor.
+
+https://www.jenkins.io/doc/book/platform-information/support-policy-java/
diff --git a/system/jenkins/files/jenkins.conf b/system/jenkins/files/jenkins.conf
index 8b9688362b..fbdbcb875b 100644
--- a/system/jenkins/files/jenkins.conf
+++ b/system/jenkins/files/jenkins.conf
@@ -52,12 +52,6 @@ JENKINS_USER="jenkins"
 ## the SSL KeyManagerFactory type (eg SunX509, IbmX509). Default is SunX509
 #JENKINS_HTTPS_KEY_MANAGER="SunX509"
 
-## this along with JENKINS_HTTPS_CERTIFICATE can be used to run HTTPS with
-## OpenSSL secret key file and the corresponding certificate file
-#JENKINS_HTTPS_PRIVATE_KEY=""
-
-#JENKINS_HTTPS_CERTIFICATE=""
-
 ## Default home of jenkins stuffs
 #JENKINS_HOME=/var/lib/jenkins
 
diff --git a/system/jenkins/files/jenkinsd.sh b/system/jenkins/files/jenkinsd.sh
index 0e616bc9aa..1bed3e1f13 100644
--- a/system/jenkins/files/jenkinsd.sh
+++ b/system/jenkins/files/jenkinsd.sh
@@ -79,14 +79,6 @@ if [ "$JENKINS_HTTPS_KEY_MANAGER" != "" ] ; then
   JENKINS_HTTPS_KEY_MANAGER_ARG="--httpsKeyManagerType=$JENKINS_HTTPS_KEY_MANAGER"
 fi
 
-if [ "$JENKINS_HTTPS_PRIVATE_KEY" != "" ] ; then
-  JENKINS_HTTPS_PRIVATE_KEY="--httpsPrivateKey=$JENKINS_HTTPS_PRIVATE_KEY"
-fi
-
-if [ "$JENKINS_HTTPS_CERTIFICATE" != "" ] ; then
-  JENKINS_HTTPS_CERTIFICATE="--httpsCertificate=$JENKINS_HTTPS_CERTIFICATE"
-fi
-
 if [ "$JENKINS_LOG_FILE" != "" ] ; then
   JENKINS_LOG_FILE_ARG="--logfile=$JENKINS_LOG_FILE"
 fi
@@ -114,8 +106,6 @@ su - $JENKINS_USER -c " \
       	$JENKINS_HTTPS_KEYSTORE_ARG \
       	$JENKINS_HTTPS_KEYSTORE_PASSWORD_ARG \
       	$JENKINS_HTTPS_KEY_MANAGER_ARG \
-      	$JENKINS_HTTPS_PRIVATE_KEY \
-      	$JENKINS_HTTPS_CERTIFICATE \
       	$JENKINS_LOG_FILE_ARG \
       	$JENKINS_WEBAPPSDIR_ARG \
       	$JENKINS_WEBROOT_ARG \
diff --git a/system/jenkins/jenkins.SlackBuild b/system/jenkins/jenkins.SlackBuild
index 7e2889a366..0475d03e96 100644
--- a/system/jenkins/jenkins.SlackBuild
+++ b/system/jenkins/jenkins.SlackBuild
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for jenkins
 
 # Copyright 2019 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy
-# Copyright 2017-2021 Andrew Clemons, Wellington, New Zealand
+# Copyright 2017-2022 Andrew Clemons, Wellington, New Zealand
+# Copyright 2022-2024 Andrew Clemons, Tokyo, Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,14 +24,21 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=jenkins
-VERSION=${VERSION:-2.263.4}
+VERSION=${VERSION:-2.440.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -97,4 +105,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/jenkins/jenkins.info b/system/jenkins/jenkins.info
index d8aed5559e..7ecbae78fe 100644
--- a/system/jenkins/jenkins.info
+++ b/system/jenkins/jenkins.info
@@ -1,10 +1,10 @@
 PRGNAM="jenkins"
-VERSION="2.263.4"
+VERSION="2.440.3"
 HOMEPAGE="https://www.jenkins.io/"
-DOWNLOAD="http://mirrors.jenkins.io/war-stable/2.263.4/jenkins.war"
-MD5SUM="c6980fe4b5e503efff10d0f56f5cf427"
+DOWNLOAD="https://get.jenkins.io/war-stable/2.440.3/jenkins.war"
+MD5SUM="c381bfdfb6d30ddd6e5aedc669d14764"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk21"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
diff --git a/system/jmtpfs/README b/system/jmtpfs/README
deleted file mode 100644
index d43b1a7ac3..0000000000
--- a/system/jmtpfs/README
+++ /dev/null
@@ -1,10 +0,0 @@
-jmtpfs is a FUSE and libmtp based filesystem for accessing MTP 
-(Media Transfer Protocol) devices. It was specifically designed 
-for exchaning files between Linux (and Mac OS X) systems and 
-newer Android devices that support MTP but not USB Mass Storage.
-
-The goal is to create a well behaved filesystem, allowing tools 
-like find and rsync to work as expected. MTP file types are set 
-automatically based on file type detection using libmagic. 
-Setting the file appears to be necessary for some Android apps, 
-like  Gallery, to be able to find and use the files.
diff --git a/system/jmtpfs/jmtpfs.SlackBuild b/system/jmtpfs/jmtpfs.SlackBuild
deleted file mode 100644
index 545efff32e..0000000000
--- a/system/jmtpfs/jmtpfs.SlackBuild
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for jmtpfs
-
-# Copyright 2015 Andre Barboza, Belo Horizonte, Minas Gerais, Brazil
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=jmtpfs
-VERSION=${VERSION:-0.5}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CXXFLAGS="$SLKCFLAGS -lpthread" \
-./configure \
-  --prefix=/usr \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/jmtpfs/jmtpfs.info b/system/jmtpfs/jmtpfs.info
deleted file mode 100644
index 897c93dc9f..0000000000
--- a/system/jmtpfs/jmtpfs.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="jmtpfs"
-VERSION="0.5"
-HOMEPAGE="https://github.com/JasonFerrara/jmtpfs"
-DOWNLOAD="https://github.com/JasonFerrara/jmtpfs/archive/v0.5.tar.gz"
-MD5SUM="501e51530d3c04d63e9ac96d794bf5c5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Andre Barboza"
-EMAIL="bmg.andre@gmail.com"
diff --git a/system/jmtpfs/slack-desc b/system/jmtpfs/slack-desc
deleted file mode 100644
index 7fab708cd9..0000000000
--- a/system/jmtpfs/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-      |-----handy-ruler------------------------------------------------------|
-jmtpfs: jmtpfs (FUSE and libmtp based filesystem for accessing MTP)
-jmtpfs:
-jmtpfs: jmtpfs is a FUSE and libmtp based filesystem for accessing MTP
-jmtpfs: (Media Transfer Protocol) devices. It was specifically designed
-jmtpfs: for exchaning files between Linux (and Mac OS X) systems and
-jmtpfs: newer Android devices that support MTP but not USB Mass
-jmtpfs: Storage.
-jmtpfs:
-jmtpfs:
-jmtpfs:
-jmtpfs: https://github.com/JasonFerrara/jmtpfs
diff --git a/system/john/john.SlackBuild b/system/john/john.SlackBuild
index cfe21faaee..d2ffb238e9 100644
--- a/system/john/john.SlackBuild
+++ b/system/john/john.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for John the Ripper
 
@@ -13,25 +13,35 @@
 #               Also removed "MERGEWORDS" option, as it's harmful for cracking
 #               slow hashes.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=john
 VERSION=${VERSION:-1.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
+if [ "$ARCH" = "i586" ]; then
   if grep -q ^flags.*avx /proc/cpuinfo; then
     TARGET=linux-x86-avx
   elif grep -q ^flags.*sse2 /proc/cpuinfo; then
@@ -91,4 +101,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/joyce/joyce.SlackBuild b/system/joyce/joyce.SlackBuild
index 4b8fa156aa..172264c39c 100644
--- a/system/joyce/joyce.SlackBuild
+++ b/system/joyce/joyce.SlackBuild
@@ -1,15 +1,22 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for joyce
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20240315 bkw: update for v2.4.2
+# 20230419 bkw: update for v2.4.1
+# 20221227 bkw: update for v2.4.0, get rid of unneeded compilefix.diff
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=joyce
-VERSION=${VERSION:-2.2.13}
+VERSION=${VERSION:-2.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +26,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,11 +58,11 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=gnu++98" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -87,4 +98,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/joyce/joyce.info b/system/joyce/joyce.info
index 91472e56c7..9efae84f19 100644
--- a/system/joyce/joyce.info
+++ b/system/joyce/joyce.info
@@ -1,10 +1,10 @@
 PRGNAM="joyce"
-VERSION="2.2.13"
-HOMEPAGE="http://www.seasip.info/Unix/Joyce/"
-DOWNLOAD="http://www.seasip.info/Unix/Joyce/joyce-2.2.13.tar.gz"
-MD5SUM="c201f7b31198657aeba51a891ca2966b"
+VERSION="2.4.2"
+HOMEPAGE="https://www.seasip.info/Unix/Joyce/"
+DOWNLOAD="https://www.seasip.info/Unix/Joyce/joyce-2.4.2.tar.gz"
+MD5SUM="99bac251341dc6eee339b0feea194f80"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/jpnevulator/jpnevulator.SlackBuild b/system/jpnevulator/jpnevulator.SlackBuild
index 17620345e8..e31200a848 100644
--- a/system/jpnevulator/jpnevulator.SlackBuild
+++ b/system/jpnevulator/jpnevulator.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for jpnevulator
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=jpnevulator
 VERSION=${VERSION:-2.3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -85,4 +95,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/jq/jq.SlackBuild b/system/jq/jq.SlackBuild
index e832ccaa0e..174989f237 100644
--- a/system/jq/jq.SlackBuild
+++ b/system/jq/jq.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for jq
 
 # Copyright 2015, 2018 Gary Herreman <gary@garyrh.com>
+# Copyright 2024 Isaac Yu <isaacyu@protonmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=jq
-VERSION=${VERSION:-1.6}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.7.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +39,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,6 +77,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Fix build test failures if LANG is not C or en_US.UTF-8
+patch -p1 < $CWD/run_tests_in_C_locale.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -87,16 +98,14 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-# Put docs into proper directory.
-mv $PKG/usr/share/doc $PKG/usr
-mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-rmdir $PKG/usr/share
-
-cp -a ChangeLog KEYS NEWS docs/ $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING NEWS.md README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# Address sbopkglint gripes
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.{la,a}
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/jq/jq.info b/system/jq/jq.info
index 9ccad14300..dec92480e9 100644
--- a/system/jq/jq.info
+++ b/system/jq/jq.info
@@ -1,10 +1,10 @@
 PRGNAM="jq"
-VERSION="1.6"
-HOMEPAGE="https://stedolan.github.io/jq/"
-DOWNLOAD="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz"
-MD5SUM="e68fbd6a992e36f1ac48c99bbf825d6b"
+VERSION="1.7.1"
+HOMEPAGE="https://jqlang.github.io/jq/"
+DOWNLOAD="https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-1.7.1.tar.gz"
+MD5SUM="974a340105ecb43add8c55601525f9fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="oniguruma"
-MAINTAINER="Gary Herreman"
-EMAIL="gary@garyrh.com"
+REQUIRES=""
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/jq/run_tests_in_C_locale.patch b/system/jq/run_tests_in_C_locale.patch
new file mode 100644
index 0000000000..5d1d36b0b1
--- /dev/null
+++ b/system/jq/run_tests_in_C_locale.patch
@@ -0,0 +1,15 @@
+The following patch is taken from this pull request:
+https://github.com/jqlang/jq/pull/3039
+--- a/tests/setup
++++ b/tests/setup
+@@ -12,6 +12,10 @@
+ JQBASEDIR=$JQTESTDIR/..
+ JQ=${JQ:-$JQBASEDIR/jq}
+ 
++# Some tests have locale-dependent output; use C locale.  Fixes #3038
++LC_ALL=C
++export LC_ALL
++
+ if [ -z "${NO_VALGRIND-}" ] && which valgrind > /dev/null; then
+     VALGRIND="valgrind --error-exitcode=1 --leak-check=full \
+                        --suppressions=$JQTESTDIR/onig.supp \
diff --git a/system/jq/slack-desc b/system/jq/slack-desc
index b5de0b89fc..0919f74c3f 100644
--- a/system/jq/slack-desc
+++ b/system/jq/slack-desc
@@ -14,6 +14,6 @@ jq: jq is like sed for JSON data - you can use it to slice and filter
 jq: and map and transform structured data with the same ease that
 jq: sed, awk, grep and friends let you play with text.
 jq:
-jq: Homepage: https://stedolan.github.io/jq/
+jq: Homepage: https://jqlang.github.io/jq/
 jq:
 jq:
diff --git a/system/jsawk/jsawk.SlackBuild b/system/jsawk/jsawk.SlackBuild
index 3a139be516..5a469e25e7 100644
--- a/system/jsawk/jsawk.SlackBuild
+++ b/system/jsawk/jsawk.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for jsawk
 
@@ -23,14 +23,24 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=jsawk
 VERSION=${VERSION:-1.4}
 BUILD=${BUILD:-5}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -58,4 +68,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/jshon/jshon.SlackBuild b/system/jshon/jshon.SlackBuild
index 3201acfa57..7329192ca3 100644
--- a/system/jshon/jshon.SlackBuild
+++ b/system/jshon/jshon.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for jshon
 
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20240331 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix man page permissions (644, not 755).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=jshon
 VERSION=${VERSION:-20131105}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
 case "$( uname -m )" in
@@ -35,7 +41,11 @@ case "$( uname -m )" in
 esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,9 +75,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
 \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
--o -perm 511 \) -exec chmod 755 {} \; -o \
+-o -perm 511 \) -exec chmod 755 {} + -o \
 \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
--o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+-o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
 make
 make install DESTDIR=$PKG MANDIR=$PKG/usr/man/man1
@@ -75,8 +85,8 @@ make install DESTDIR=$PKG MANDIR=$PKG/usr/man/man1
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
 | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+chmod 644 $PKG/usr/man/man*/*
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
@@ -86,4 +96,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/jshon/jshon.info b/system/jshon/jshon.info
index fe662f4d04..9a8626687d 100644
--- a/system/jshon/jshon.info
+++ b/system/jshon/jshon.info
@@ -1,10 +1,10 @@
 PRGNAM="jshon"
 VERSION="20131105"
 HOMEPAGE="http://kmkeen.com/jshon/"
-DOWNLOAD="https://github.com/keenerd/jshon/archive/20131105.tar.gz"
+DOWNLOAD="https://github.com/keenerd/jshon/archive/20131105/jshon-20131105.tar.gz"
 MD5SUM="6e47fe9c57b5ed203008f69218da2f52"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jansson"
+REQUIRES=""
 MAINTAINER="pomfland"
 EMAIL="pomfland@tfwno.gf"
diff --git a/system/kafka/kafka.SlackBuild b/system/kafka/kafka.SlackBuild
index d87aa69e91..40dd1abdb6 100644
--- a/system/kafka/kafka.SlackBuild
+++ b/system/kafka/kafka.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Apache Kafka
 
@@ -22,11 +22,18 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - relative config symlink.
+# - i486 => i586.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=kafka
 VERSION=${VERSION:-0.11.0.0}
 SCALA_VERSION=2.12
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 KAFKA_USER=${KAFKA_USER:-kafka}
 KAFKA_UID=${KAFKA_UID:-323}
@@ -35,7 +42,7 @@ KAFKA_GID=${KAFKA_GID:-323}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -60,7 +67,11 @@ elif ! grep -q "^$KAFKA_GROUP:" /etc/group; then
   bailout
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -82,9 +93,9 @@ cd ${PRGNAM}_${SCALA_VERSION}-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/{libs,bin}
 install -m 644 libs/*.jar $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/libs
@@ -129,7 +140,7 @@ install -m 644 $CWD/kafka-env.sh $PKG/etc/$PRGNAM/kafka-env.sh.new
 )
 (
   cd $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
-  ln -s /etc/kafka config
+  ln -s ../../../etc/kafka config
 )
 chown -R $KAFKA_USER:$KAFKA_GROUP $PKG/etc/$PRGNAM
 
@@ -147,4 +158,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/kapacitor/README b/system/kapacitor/README
index 10151a24ed..b3a0c317e6 100644
--- a/system/kapacitor/README
+++ b/system/kapacitor/README
@@ -10,7 +10,9 @@ OpsGenie, Alerta, Sensu, PagerDuty, Slack, and more.
 
 Groupname and Username
 
-You must have the "kapacitor" group and user to run this script, for example:
+You must have the "kapacitor" group and user to run this script, for
+example:
 
   groupadd -g 351 kapacitor
-  useradd -u 351 -s /bin/false -d /var/lib/kapacitor -g kapacitor kapacitor
+  useradd -u 351 -s /bin/false \
+    -d /var/lib/kapacitor -g kapacitor kapacitor
diff --git a/system/kapacitor/kapacitor.SlackBuild b/system/kapacitor/kapacitor.SlackBuild
index 730e37a939..2a9d276b46 100644
--- a/system/kapacitor/kapacitor.SlackBuild
+++ b/system/kapacitor/kapacitor.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Kapacitor
 
-# Copyright 2017-2021 Ebben Aries <slackbuilds@dscp.org>
+# Copyright 2017-2024 Ebben Aries <slackbuilds@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=kapacitor
-VERSION=${VERSION:-1.5.8}
+VERSION=${VERSION:-1.7.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,17 +39,28 @@ if [ -z "$ARCH" ]; then
 fi
 
 UIDGID=351
+
+nobuild() {
+  echo "  You must have the \"$PRGNAM\" group and user to run this script."
+  echo "    # groupadd -g $UIDGID $PRGNAM"
+  echo "    # useradd -u $UIDGID -s /bin/false -d /var/lib/kapacitor -g $PRGNAM $PRGNAM"
+  exit 1
+}
+
 if ! getent group $PRGNAM; then
-	echo "  You must have the \"$PRGNAM\" group to run this script."
-	echo "    # groupadd -g $UIDGID $PRGNAM"
-	exit 1
+  nobuild
 elif ! getent passwd $PRGNAM; then
-	echo "  You must have the \"$PRGNAM\" user to run this script."
-	echo "    # useradd -u $UIDGID -s /bin/false -d /var/lib/kapacitor -g $PRGNAM $PRGNAM"
-	exit 1
+  nobuild
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -103,4 +117,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/kapacitor/kapacitor.info b/system/kapacitor/kapacitor.info
index 6b56358db1..820cd24e14 100644
--- a/system/kapacitor/kapacitor.info
+++ b/system/kapacitor/kapacitor.info
@@ -1,10 +1,10 @@
 PRGNAM="kapacitor"
-VERSION="1.5.8"
+VERSION="1.7.3"
 HOMEPAGE="https://www.influxdata.com"
-DOWNLOAD="https://dl.influxdata.com/kapacitor/releases/kapacitor-1.5.8_linux_i386.tar.gz"
-MD5SUM="06d9e8841cc7ddd4a42f6bf58923f636"
-DOWNLOAD_x86_64="https://dl.influxdata.com/kapacitor/releases/kapacitor-1.5.8_linux_amd64.tar.gz"
-MD5SUM_x86_64="1fc6105c17083488ea18d1bfe9f010e1"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://dl.influxdata.com/kapacitor/releases/kapacitor-1.7.3_linux_amd64.tar.gz"
+MD5SUM_x86_64="3760718ff184d7405783cc875ed4efb3"
 REQUIRES=""
 MAINTAINER="Ebben Aries"
 EMAIL="slackbuilds@dscp.org"
diff --git a/system/kbfs/README b/system/kbfs/README
index 9d12908351..5db48ae576 100644
--- a/system/kbfs/README
+++ b/system/kbfs/README
@@ -7,9 +7,9 @@ You will need to create a new user keybasehelper before building
 this package.
 
 groupadd -g 352 keybasehelper
-useradd -u 352 -g keybasehelper -c "keybase helper user" -s /bin/false keybasehelper
+useradd -u 352 -g keybasehelper \
+  -c "keybase helper user" -s /bin/false keybasehelper
 
 NOTE: Read README.SBo for more instructions!!
-google-go-lang and sshfs-fuse are runtime dependencies.
 
-This is still considered an ALPHA release!!
+google-go-lang is a runtime dependency.
diff --git a/system/kbfs/kbfs.SlackBuild b/system/kbfs/kbfs.SlackBuild
index 945fa19147..59cbaca0c0 100644
--- a/system/kbfs/kbfs.SlackBuild
+++ b/system/kbfs/kbfs.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for kbfs
 
-# Copyright 2017-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2017-2022 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2024 pyllyukko
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,13 +23,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=kbfs
 SRCNAM=keybase
-VERSION=${VERSION:-5.6.1_20210125164223}
-COMMITVER=f3b21527b9
+VERSION=${VERSION:-6.2.4_20240101011938}
+COMMITVER=ae7e4a1c15
 SRCVER=$(echo $VERSION | tr _ - )
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 KBFS_USER=${KBFS_USER:-keybasehelper}
 KBFS_UID=${KBFS_UID:-352}
@@ -43,6 +47,13 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+if [ "${ARCH}" = "i586" ]
+then
+  VERSION="6.0.2-20220610191041"
+  COMMITVER=a459abf326
+  SRCVER=$(echo $VERSION | tr _ - )
+fi
+
 bailout() {
   echo "  You must have a $KBFS_USER user and $KBFS_GROUP group to run this script. "
   echo "    # groupadd -g $KBFS_GID $KBFS_GROUP "
@@ -57,7 +68,11 @@ elif ! grep -q "^$KBFS_GROUP:" /etc/group; then
   bailout
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -113,4 +128,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/kbfs/kbfs.info b/system/kbfs/kbfs.info
index dfce4bbd30..dd632f7818 100644
--- a/system/kbfs/kbfs.info
+++ b/system/kbfs/kbfs.info
@@ -1,10 +1,10 @@
 PRGNAM="kbfs"
-VERSION="5.6.1_20210125164223"
-HOMEPAGE="https://github.com/keybase/kbfs"
-DOWNLOAD="https://prerelease.keybase.io/linux_binaries/deb/keybase_5.6.1-20210125164223.f3b21527b9_i386.deb"
-MD5SUM="1b22b307c41a3f914d51c2084b3de400"
-DOWNLOAD_x86_64="https://prerelease.keybase.io/linux_binaries/deb/keybase_5.6.1-20210125164223.f3b21527b9_amd64.deb"
-MD5SUM_x86_64="45e4f16d21974008e7a23341d1b27b5f"
-REQUIRES="google-go-lang sshfs-fuse"
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
+VERSION="6.2.4_20240101011938"
+HOMEPAGE="https://github.com/keybase/client"
+DOWNLOAD="https://prerelease.keybase.io/linux_binaries/deb/keybase_6.0.2-20220610191041.a459abf326_i386.deb"
+MD5SUM="933745e5f392074a4b964ef8fa8c3156"
+DOWNLOAD_x86_64="https://prerelease.keybase.io/linux_binaries/deb/keybase_6.2.4-20240101011938.ae7e4a1c15_amd64.deb"
+MD5SUM_x86_64="8aaa3183e1a2fe2805b2605a4d50e2b8"
+REQUIRES="google-go-lang"
+MAINTAINER="pyllyukko"
+EMAIL="pyllyukko@maimed.org"
diff --git a/system/kbfs/slack-desc b/system/kbfs/slack-desc
index f14b106c38..ef45ff447d 100644
--- a/system/kbfs/slack-desc
+++ b/system/kbfs/slack-desc
@@ -14,6 +14,6 @@ kbfs:
 kbfs:
 kbfs:
 kbfs:
-kbfs: Project URL: https://github.com/keybase/kbfs
+kbfs: Project URL: https://github.com/keybase/client
 kbfs:
 kbfs:
diff --git a/system/kc/README b/system/kc/README
index b88731412b..c058617b62 100644
--- a/system/kc/README
+++ b/system/kc/README
@@ -1,23 +1,22 @@
-kc is a console based password storing application using an encrypted XML 
-document as its database.
+kc is a console-based password storing application using an encrypted
+XML document as its database.
 
-Features include (but not limited to):
- * fixed string or regex based search (if compiled with pcre)
+Features include:
+ * fixed string or regex based search
+ * OpenSSH agent support for protecting the database
+ * YubiKey challenge-response support for protecting the database
  * encrypted or plain text database import/export
- * fuzzy displaying of passwords if you suspect someone might watch
-   your monitor
- * copy passwords to various clipboards
  * multiple keychains per database
- * the usual editing functions
- * compiles and works on *BSD and Linux
+ * copy passwords to various clipboards
  * editline (libedit) and readline support
- * clean and simple CLI with command and keychain completion
 
 This SlackBuild has build options to control some of its behavior:
-LIBSCRYPT:	If this variable is set, kc will be built with scrypt
-		encrypted passwords support. It needs the libscrypt library
-		for this, that is also available from SBo.
-EDITLINE:	If this variable is set, kc will use editline for its
-		command line interface. Otherwise readline will be used.
-		It needs the libedit library for this, that is also available
-		from SBo.
+LIBSCRYPT: If this variable is set, kc will be built with scrypt
+      encrypted passwords support. It needs the libscrypt library
+      for this, that is also available from SBo.
+EDITLINE: If this variable is set, kc will use editline for its
+      command line interface; otherwise, readline will be used.
+PCRE: If this variable is set, kc will use libcpre to enable
+      perl-compatible regular expressions while searching.
+      Note that POSIX regular expressions are supported without
+      the need of this.
diff --git a/system/kc/kc.SlackBuild b/system/kc/kc.SlackBuild
index cf762d80ae..f69dbaf1db 100644
--- a/system/kc/kc.SlackBuild
+++ b/system/kc/kc.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright (c) 2011-2018 LEVAI Daniel
+# Copyright (c) 2011-2024 LEVAI Daniel
 # All rights reserved.
 #
 # * Redistribution and use in source and binary forms, with or without
@@ -23,26 +23,33 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=kc
-VERSION=${VERSION:-2.4.2}
+VERSION=${VERSION:-2.5.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ];then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ];then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -58,45 +65,17 @@ fi
 set -e
 
 
-# XXX Upgrade incompatibility notice
-if [ -f /var/log/packages/kc-*_SBo ];then
-	typeset -i KC_MINOR=$( ls -1 /var/log/packages/kc-*_SBo |cut -d- -f2 |cut -d. -f2 )
-	if [ ${KC_MINOR} -lt 4 ];then
-		echo ""
-		echo "!!! Incompatibility notice !!!"
-		echo ""
-		echo "This SlackBuild has detected a version of kc older than 2.4 on your system."
-		echo "Starting with version 2.4, kc uses a newer database format."
-		echo "What this means is that starting from kc-2.4, it will not be"
-		echo "able to open older databases, and an older kc will not be able"
-		echo "to open newer databases."
-		echo "The recommended upgrade path is detailed in the kc-2.4 package's"
-		echo "Changelog file:"
-		echo "https://github.com/levaidaniel/kc/blob/2.4/Changelog"
-		echo "... but here is a shallow outline of the procedure:"
-		echo "1) Dump your database as an XML file with your old kc."
-		echo "   See the dump command's description."
-		echo "2) Upgrade kc to version 2.4 or later."
-		echo "3) Create a new empty database."
-		echo "4) Import your XML dump into your empty database."
-		echo "5) Shred your XML export."
-		echo ""
-		echo "But really, you should check the Changelog file for detailed instructions."
-		echo ""
-		echo -n "Type in UPGRADE, if you are ready to upgrade: "; read
-
-		if [ "${REPLY}" != 'UPGRADE' ];then
-			echo "Not ready to upgrade!"
-			exit 1;
-		fi
-	fi
-fi
+printf "\n\n"
+echo "Please read /usr/doc/$PRGNAM-$VERSION/Changelog.md after installation to see why you might not be able to open your database anymore."
+echo 'Press Ctrl-C within ten seconds to abort, or press enter to continue...'
+read -t 10 || true
+printf "\n\n"
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -106,6 +85,10 @@ find -L . \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 
+if [ -n "${PCRE}" ];then
+	PCRE="HAVE_PCRE=y"
+fi
+
 if [ -n "${LIBSCRYPT}" ];then
 	LIBSCRYPT="HAVE_LIBSCRYPT=y"
 fi
@@ -114,18 +97,18 @@ if [ -n "${EDITLINE}" ];then
 	EDITLINE="EDITLINE=y"
 fi
 
-CFLAGS="$SLKCFLAGS" make -f Makefile.linux HAVE_PCRE=y ${LIBSCRYPT} ${EDITLINE}
+CFLAGS="$SLKCFLAGS" make -f Makefile.linux ${PCRE} ${LIBSCRYPT} ${EDITLINE}
 make -f Makefile.linux install DESTDIR=$PKG PREFIX=/usr
 
 strip --strip-unneeded $PKG/usr/bin/kc
 gzip -9 $PKG/usr/man/man1/kc.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changelog LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a Changelog.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/kc/kc.info b/system/kc/kc.info
index be573e9711..59fbdc96be 100644
--- a/system/kc/kc.info
+++ b/system/kc/kc.info
@@ -1,8 +1,8 @@
 PRGNAM="kc"
-VERSION="2.4.2"
+VERSION="2.5.3"
 HOMEPAGE="https://github.com/levaidaniel/kc"
-DOWNLOAD="https://github.com/levaidaniel/kc/releases/download/2.4.2/kc-2.4.2.tar.bz2"
-MD5SUM="c75a1a06677f40abc319c83c80cccc4b"
+DOWNLOAD="https://github.com/levaidaniel/kc/archive/refs/tags/2.5.3/kc-2.5.3.tar.gz"
+MD5SUM="0886ffbc09c79d5d04b50edca56f2f1d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libbsd"
diff --git a/system/kc/slack-desc b/system/kc/slack-desc
index 6a39d94441..a0c1780510 100644
--- a/system/kc/slack-desc
+++ b/system/kc/slack-desc
@@ -8,7 +8,7 @@
   |-----handy-ruler------------------------------------------------------|
 kc: kc (console-based password management)
 kc:
-kc: A console based password storing application using an encrypted XML
+kc: A console-based password storing application using an encrypted XML
 kc: document as its database.
 kc:
 kc: Homepage: https://github.com/levaidaniel/kc
diff --git a/system/kcm_touchpad/README b/system/kcm_touchpad/README
deleted file mode 100644
index 8e3ad929b9..0000000000
--- a/system/kcm_touchpad/README
+++ /dev/null
@@ -1 +0,0 @@
-kcm_touchpad is a configuration control panel module for laptop touchpads. 
diff --git a/system/kcm_touchpad/kcm_touchpad.SlackBuild b/system/kcm_touchpad/kcm_touchpad.SlackBuild
deleted file mode 100644
index ad5f362825..0000000000
--- a/system/kcm_touchpad/kcm_touchpad.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-# Copyright 2010, 2012  Carlos Corbacho <carlos@strangeworlds.co.uk>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=kcm_touchpad
-
-VERSION=${VERSION:-0.3.1}
-GIT_REVISION=${GIT_VERSION:-00370b5}
-
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-
-# The package name and untar'ed directory names are completely bonkers...
-rm -rf mishaaq-$PRGNAM-$GIT_REVISION
-tar xvf $CWD/mishaaq-$PRGNAM-$PRGNAM-$VERSION-0-g$GIT_REVISION.tar.gz
-cd mishaaq-$PRGNAM-$GIT_REVISION
-
-# Make this appear under 'Input Actions' again in newer KDE releases
-sed -i s/keyboard-and-mouse/input-devices/ touchpad.desktop
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-cmake \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -L/usr/lib$LIBDIRSUFFIX" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -L/usr/lib$LIBDIRSUFFIX" \
-  -DLIB_SUFFIX=$LIBDIRSUFFIX \
-  -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-  .
-
-make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mv $PKG/usr/share/doc $PKG/usr
-mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/kcm_touchpad/kcm_touchpad.info b/system/kcm_touchpad/kcm_touchpad.info
deleted file mode 100644
index a3d2392320..0000000000
--- a/system/kcm_touchpad/kcm_touchpad.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="kcm_touchpad"
-VERSION="0.3.1"
-HOMEPAGE="https://github.com/mishaaq/kcm_touchpad"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/mishaaq-kcm_touchpad-kcm_touchpad-0.3.1-0-g00370b5.tar.gz"
-MD5SUM="f355a658d2e9267fdf4e8d8f88038bcf"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Carlos Corbacho"
-EMAIL="carlos@strangeworlds.co.uk"
diff --git a/system/kcm_touchpad/slack-desc b/system/kcm_touchpad/slack-desc
deleted file mode 100644
index 38a5ad9eb5..0000000000
--- a/system/kcm_touchpad/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-            |-----handy-ruler------------------------------------------------------|
-kcm_touchpad: kcm_touchpad (touchpad configuration)
-kcm_touchpad:
-kcm_touchpad: kcm_touchpad is a KControl module to configure "synaptics" driver
-kcm_touchpad: based touchpads under GNU/Linux.
-kcm_touchpad:
-kcm_touchpad: Home Page: http://github.com/mishaaq/kcm_touchpad
-kcm_touchpad:
-kcm_touchpad:
-kcm_touchpad:
-kcm_touchpad:
-kcm_touchpad:
diff --git a/system/kcollectd/README b/system/kcollectd/README
deleted file mode 100644
index a2021cf458..0000000000
--- a/system/kcollectd/README
+++ /dev/null
@@ -1,10 +0,0 @@
-Kcollectd (Qt4-based frontend for collectd)
-
-Kcollectd is a small applications that allows to view rrd datacollections
-that have been created by collectd.
-
-It is quite limited as it only displays one datasource at a time, but
-allows to zoom and scroll around. It also has a status-monitor mode,
-where it automatic updates every 10 seconds.
-
-https://www.forwiss.uni-passau.de/~berberic/Linux/kcollectd.html
diff --git a/system/kcollectd/doinst.sh b/system/kcollectd/doinst.sh
deleted file mode 100644
index e217a75f45..0000000000
--- a/system/kcollectd/doinst.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -x /usr/bin/update-mime-database ]; then
-  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/oxygen/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache usr/share/icons/oxygen >/dev/null 2>&1
-  fi
-fi
diff --git a/system/kcollectd/kcollectd-0.9-boost.patch b/system/kcollectd/kcollectd-0.9-boost.patch
deleted file mode 100644
index 1576c2b402..0000000000
--- a/system/kcollectd/kcollectd-0.9-boost.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- kcollectd-0.9.orig/kcollectd/kcollectd.cc
-+++ kcollectd-0.9/kcollectd/kcollectd.cc
-@@ -73,7 +73,7 @@
-       gui->show();
-     }
-   } 
--  catch(basic_filesystem_error<path> &e) {
-+  catch(const std::exception &e) {
-     KMessageBox::error(0, i18n("Failed to read collectd-structure at \'%1\'\n"
- 		"Terminating.", QString(RRD_BASEDIR)));
-     exit(1);
---- kcollectd-0.9.orig/kcollectd/gui.cc
-+++ kcollectd-0.9/kcollectd/gui.cc
-@@ -127,21 +127,21 @@
-   const directory_iterator end_itr;
-   for (directory_iterator host(rrdpath); host != end_itr; ++host ) {
-     if (is_directory(*host)) {
--      QTreeWidgetItem *hostitem = mkItem(listview, host->leaf());
-+      QTreeWidgetItem *hostitem = mkItem(listview, host->path().filename().string());
-       hostitem->setFlags(hostitem->flags() & ~Qt::ItemIsSelectable);
-       for (directory_iterator sensor(*host); sensor != end_itr; ++sensor ) {
- 	if (is_directory(*sensor)) {
--	  QTreeWidgetItem *sensoritem = mkItem(hostitem, sensor->leaf());
-+	  QTreeWidgetItem *sensoritem = mkItem(hostitem, sensor->path().filename().string());
- 	  sensoritem->setFlags(sensoritem->flags() & ~Qt::ItemIsSelectable);
- 	  for (directory_iterator rrd(*sensor); rrd != end_itr; ++rrd ) {
- 	    if (is_regular(*rrd) && extension(*rrd) == ".rrd") {
- 	      QTreeWidgetItem *rrditem = mkItem(sensoritem, basename(*rrd));
- 	      rrditem->setFlags(rrditem->flags() & ~Qt::ItemIsSelectable);
- 	      std::ostringstream info;
--	      info << host->leaf() << delimiter
--		   << sensor->leaf() << delimiter
-+	      info << host->path().filename().string() << delimiter
-+		   << sensor->path().filename().string() << delimiter
- 		   << basename(*rrd);
--	      get_datasources(rrd->string(), info.str(), rrditem);
-+	      get_datasources(rrd->path().string(), info.str(), rrditem);
- 	    }
- 	  }
- 	}
---- kcollectd-0.9.orig/doc/en/index.docbook
-+++ kcollectd-0.9/doc/en/index.docbook
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kcollectd "<application>kcollectd 0.8</application>">
-   <!ENTITY kappname "&kcollectd;">
-   <!ENTITY package "kcollectd">
---- kcollectd-0.9.orig/po/de.po
-+++ kcollectd-0.9/po/de.po
-@@ -10,6 +10,7 @@
- "PO-Revision-Date: 2009-06-16 20:41+0200\n"
- "Last-Translator: M G Berberich <berberic@fmi.uni-passau.de>\n"
- "Language-Team: German <kde-i18n-de@kde.org>\n"
-+"Language: de\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
diff --git a/system/kcollectd/kcollectd.SlackBuild b/system/kcollectd/kcollectd.SlackBuild
deleted file mode 100644
index 92fd9c5272..0000000000
--- a/system/kcollectd/kcollectd.SlackBuild
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for kcollectd
-
-# Copyright 2015-2018 Ricardo J. Barberis (ricardo.barberis@gmail.com)
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=kcollectd
-VERSION=${VERSION:-0.9}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-patch -p1 < $CWD/kcollectd-0.9-boost.patch
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
-cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/man
-cp doc/kcollectd.1 $PKG/usr/man
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/kcollectd/kcollectd.info b/system/kcollectd/kcollectd.info
deleted file mode 100644
index 22a976fab6..0000000000
--- a/system/kcollectd/kcollectd.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="kcollectd"
-VERSION="0.9"
-HOMEPAGE="https://www.forwiss.uni-passau.de/~berberic/Linux/kcollectd.html"
-DOWNLOAD="https://www.forwiss.uni-passau.de/~berberic/Linux/kcollectd/kcollectd-0.9.tar.gz"
-MD5SUM="7fef4a660207b4c65520ee77334088fb"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="rrdtool"
-MAINTAINER="Ricardo J. Barberis"
-EMAIL="ricardo.barberis@gmail.com"
diff --git a/system/kcollectd/slack-desc b/system/kcollectd/slack-desc
deleted file mode 100644
index cd807b278d..0000000000
--- a/system/kcollectd/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-         |-----handy-ruler------------------------------------------------------|
-kcollectd: kcollectd (Qt4-based frontend for collectd)
-kcollectd:
-kcollectd: Kcollectd is a small application that allows to view rrd
-kcollectd: data collections that have been created by collectd.
-kcollectd:
-kcollectd: It is quite limited as it only displays one datasource at a time, but
-kcollectd: allows to zoom and scroll around. It also has a status-monitor mode,
-kcollectd: where it automatic updates every 10 seconds.
-kcollectd:
-kcollectd: Homepage:
-kcollectd:   https://www.forwiss.uni-passau.de/~berberic/Linux/kcollectd.html
diff --git a/system/kegs/README.Slackware b/system/kegs/README.Slackware
index 03e0ebf940..7a66ba8fb8 100644
--- a/system/kegs/README.Slackware
+++ b/system/kegs/README.Slackware
@@ -1,34 +1,23 @@
 ROM Images
 ==========
 
-KEGS requires a ROM image dumped from an Apple IIgs. This will typically
-be called either "rom01" (131072 bytes) or "rom03" (262144 bytes),
-and will often be distributed in zip files called apple2g1.zip and
-apple2gs.zip (for use with MESS). This package can optionally include
-the ROM file. To do this, place the ROM image in the slackbuild
-directory before running the script. The image will be installed
-as /usr/share/kegs/rom03 (or rom01). If you do not include the ROM
-in the package, you will need to manually copy the rom03 image to
-/usr/share/kegs/rom03 before the emulator will work properly.
+KEGS requires a ROM image dumped from an Apple IIgs. This will
+typically be called either "rom01" (131072 bytes) or "rom03" (262144
+bytes), and will often be distributed in zip files called apple2g1.zip
+and apple2gs.zip (for use with MESS). This package includes the
+"rom03" file. If you want to also use the older ROM01 file, copy it to
+/usr/share/kegs after the package is installed, and select it from the
+config menu (F4) or edit the path in ~/.config.kegs.
 
 Audio
 =====
 
-kegs uses OSS for audio. To get sound working, you have 3 options:
+As of version 1.05, kegs uses PulseAudio by default. This is the default
+in the SlackBuild, so most users won't have to do anything special.
 
-1. Run kegs as "aoss xkegs", or launch it from your desktop's application
-   menu (which does the same thing).
-
-2. Enable ALSA OSS emulation:
-   # chmod +x /etc/rc.d/rc.alsa-oss
-   # /etc/rc.d/rc.alsa-oss
-
-   However, this may interfere with other applications' use of the
-   sound card.
-
-3. If you already use OSSv4 (audio/oss from slackbuilds.org), kegs
-   should be able to use it. It's not recommended to switch to OSSv4
-   just to get audio working in kegs, though.
+It's also possible to build kegs for OSS audio, or ALSA using the
+aoss "shim" layer. To do this, set 'AUDIO=oss' or 'AUDIO=alsa' in the
+script's environment.
 
 GS/OS Disk Images
 =================
diff --git a/system/kegs/allow_sound_open_fail.diff b/system/kegs/allow_sound_open_fail.diff
deleted file mode 100644
index bf9086f72d..0000000000
--- a/system/kegs/allow_sound_open_fail.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur kegs.0.91/src/sound.c kegs.0.91.patched/src/sound.c
---- kegs.0.91/src/sound.c	2004-12-06 19:42:47.000000000 -0500
-+++ kegs.0.91.patched/src/sound.c	2015-06-21 17:48:21.000000000 -0400
-@@ -363,9 +363,9 @@
- 
- 	ret = read(read_fd, &tmp, 4);
- 	if(ret != 4) {
--		printf("parent dying, could not get sample rate from child\n");
-+		printf("parent could not get audio sample rate from child, disabling sound.\n");
- 		printf("ret: %d, fd: %d errno:%d\n", ret, read_fd, errno);
--		exit(1);
-+		g_audio_enable = 0;
- 	}
- 	close(read_fd);
- 
diff --git a/system/kegs/allow_window_close.diff b/system/kegs/allow_window_close.diff
index 538022e044..b1343b2e89 100644
--- a/system/kegs/allow_window_close.diff
+++ b/system/kegs/allow_window_close.diff
@@ -1,35 +1,36 @@
-diff -Naur kegs.0.91/src/xdriver.c kegs.0.91.patched//src/xdriver.c
---- kegs.0.91/src/xdriver.c	2004-12-06 19:42:47.000000000 -0500
-+++ kegs.0.91.patched//src/xdriver.c	2011-01-27 04:28:42.000000000 -0500
-@@ -57,6 +57,7 @@
- Display *g_display = 0;
- Visual	*g_vis = 0;
- Window g_a2_win;
-+Atom g_wmdelete_atom;
- GC g_a2_winGC;
- XFontStruct *g_text_FontSt;
- Colormap g_a2_colormap = 0;
-@@ -582,6 +583,9 @@
+diff -Naur kegs.1.05/src/xdriver.c kegs.1.05.patched/src/xdriver.c
+--- kegs.1.05/src/xdriver.c	2021-01-24 18:37:34.000000000 -0500
++++ kegs.1.05.patched/src/xdriver.c	2021-02-25 17:53:28.054595900 -0500
+@@ -629,13 +629,10 @@
  		0, &my_winSizeHints, 0, &my_winClassHint);
- 	XMapRaised(g_display, g_a2_win);
+ 	XMapRaised(g_display, x_win);
+ 
+-	if(win_info_ptr != &g_mainwin_info) {
+-		// Debugger window
+ 		win_info_ptr->delete_atom = XInternAtom(g_display,
+ 						"WM_DELETE_WINDOW", False);
+ 		XSetWMProtocols(g_display, x_win, &(win_info_ptr->delete_atom),
+ 									1);
+-	}
  
-+	g_wmdelete_atom = XInternAtom(g_display, "WM_DELETE_WINDOW", True);
-+	XSetWMProtocols(g_display, g_a2_win, &g_wmdelete_atom, 1);
-+
  	XSync(g_display, False);
  
- 	g_a2_winGC = XCreateGC(g_display, g_a2_win, 0, (XGCValues *) 0);
-@@ -1086,6 +1090,13 @@
- 				(word32)ev.xcolormap.colormap,
- 				ev.xcolormap.new, ev.xcolormap.state);
- 			break;
-+		case ClientMessage:
-+			if(ev.xclient.data.l[0] == g_wmdelete_atom) {
-+				x_auto_repeat_on(1);
-+				XCloseDisplay(g_display);
-+				exit(0);
-+			}
-+			break;
- 		default:
- 			printf("X event 0x%08x is unknown!\n",
- 				ev.type);
+@@ -1092,9 +1089,15 @@
+ 		case ClientMessage:
+ 			win_info_ptr = x_find_xwin(ev.xclient.window);
+ 			if(ev.xclient.data.l[0] == win_info_ptr->delete_atom) {
+-				// This is a WM_DELETE_WINDOW event
+-				// Just unmap the window
+-				win_info_ptr->kimage_ptr->active = 0;
++				if(win_info_ptr == &g_debugwin_info) {
++					// This is a WM_DELETE_WINDOW event
++					// Just unmap the window
++					win_info_ptr->kimage_ptr->active = 0;
++				} else {
++					x_auto_repeat_on(1);
++					XCloseDisplay(g_display);
++					exit(0);
++				}
+ 			} else {
+ 				printf("unknown ClientMessage\n");
+ 			}
diff --git a/system/kegs/config.kegs.default b/system/kegs/config.kegs.default
index 782bfb8f3a..4408cee760 100644
--- a/system/kegs/config.kegs.default
+++ b/system/kegs/config.kegs.default
@@ -8,4 +8,4 @@ s6d2 =
 
 s7d1 = #NUCLEUS03
 
-g_cfg_rom_path = @ROM@
+g_cfg_rom_path = /usr/share/kegs/rom03
diff --git a/system/kegs/doinst.sh b/system/kegs/doinst.sh
index 5fb28930db..f6a957d203 100644
--- a/system/kegs/doinst.sh
+++ b/system/kegs/doinst.sh
@@ -1,3 +1,9 @@
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
diff --git a/system/kegs/kegs.png b/system/kegs/icons/128.png
index 578329931f..578329931f 100644
--- a/system/kegs/kegs.png
+++ b/system/kegs/icons/128.png
diff --git a/system/kegs/icons/16.png b/system/kegs/icons/16.png
new file mode 100644
index 0000000000..7dbbef05e5
--- /dev/null
+++ b/system/kegs/icons/16.png
diff --git a/system/kegs/icons/32.png b/system/kegs/icons/32.png
new file mode 100644
index 0000000000..15b49662ca
--- /dev/null
+++ b/system/kegs/icons/32.png
diff --git a/system/kegs/icons/48.png b/system/kegs/icons/48.png
new file mode 100644
index 0000000000..7caf94efd2
--- /dev/null
+++ b/system/kegs/icons/48.png
diff --git a/system/kegs/kegs.SlackBuild b/system/kegs/kegs.SlackBuild
index 79883b8daa..58bc24480a 100644
--- a/system/kegs/kegs.SlackBuild
+++ b/system/kegs/kegs.SlackBuild
@@ -1,14 +1,30 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for kegs
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230918 bkw: update for v1.29, binary in /usr/games, section 6 manpage.
+# 20221228 bkw: update for v1.16.
+
+# 20210825 bkw: update for v1.12.
+# - upstream got rid of to_pro and partls, so their man pages are
+#   also gone now.
+
+# 20210225 bkw: update for v1.05. lots of changes:
+# - include the ROM image in the package (add it to DOWNLOAD)
+# - allow_sound_open_fail.diff no longer required
+# - rework allow_window_close.diff for v1.05
+# - .desktop file no longer needs Terminal=true
+# - upstream now supports pulseaudio, so build with it by default. add
+#   AUDIO variable to build the old OSS sound support or ALSA via aoss
+#   instead.
+
 # 20170305 bkw:
 # - fix building under installwatch, caused by a symlink in the
-#   tarball being listed before its target Why does this choke
+#   tarball being listed before its target. Why does this choke
 #   under installwatch and not otherwise? Not bumping BUILD for this.
 
 # 20150621 bkw: bump BUILD to 2
@@ -18,10 +34,13 @@
 # - add instructions on getting OSS audio to work on modern Slack
 # - "Exec=aoss xkegs" in .desktop file
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=kegs
-VERSION=${VERSION:-0.91}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.29}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -31,7 +50,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -48,100 +71,96 @@ fi
 
 set -e
 
+AUDIO=${AUDIO:-pulse}
+VARS=$CWD/makevars/vars.$AUDIO
+
+if [ ! -e $VARS ]; then
+  echo -n "*** AUDIO=\"$AUDIO\" not supported. Use one of: " 1>&2
+  list="$( ls -1 $CWD/makevars/vars.* | cut -d. -f2 )"
+  echo $list 1>&2
+  exit 1
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM.$VERSION
-tar xvf $CWD/$PRGNAM.$VERSION.tar.gz --exclude vars
+unzip $CWD/$PRGNAM.$VERSION.zip -x '*/KEGSMAC.app/*' '*/xkegs' '*.exe'
 cd $PRGNAM.$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# device name for joysticks has changed for the 21st century.
+sed -i 's,/dev/js,/dev/input/js,' src/joystick_driver.c
 
 # xkegs refuses to close (close button greyed-out by window manager).
 # Small patch by SlackBuild author fixes this large annoyance (which is
 # extra-annoying because there's also no Quit option in the kegs menu).
 # I've sent this upstream, maybe it'll get integrated in future versions.
+# 20210225 bkw: Years later. Patch had to change for 1.05. The README
+# for kegs *actually says* you can close the main KEGS window to quit,
+# *and you can't fucking close it* without this patch. Apologies if I
+# sound a bit strident, but...
+# 20230918 bkw: patch still applies (with fuzz) & works on 1.29.
 patch -p1 < $CWD/allow_window_close.diff
 
-# Matthew Miller pointed out this patch to me. Since kegs uses OSS for
-# audio, and modern Slackware has ALSA OSS emulation disabled by default,
-# sound won't work unless xkegs is run via aoss, or OSS modules are
-# loaded. This patch allows the emulator to start with sound disabled if
-# it can't open the OSS audio device (instead of it being a fatal error).
-# I've also updated the README to explain how to get audio to work.
-patch -p1 < $CWD/allow_sound_open_fail.diff
-
 cd src
 rm -f vars
-ln -s vars_x86linux vars
-make CCOPTS="$SLKCFLAGS" x$PRGNAM to_pro partls
+cat $VARS > vars
+make SLKCFLAGS="$SLKCFLAGS" x$PRGNAM
 cd -
 
 # No install target, just stick it all where it goes.
-# The icon was converted from the Mac OSX icon with icns2png.
-# The .desktop has 'Terminal=true' because xkegs *really* wants
-# to be started from a terminal (the debugger uses stdio, and
-# is too easy to accidentally enter by center-clicking the window).
-
 mkdir -p \
-  $PKG/usr/bin \
+  $PKG/usr/games \
   $PKG/usr/libexec \
   $PKG/usr/share/pixmaps \
   $PKG/usr/share/applications \
   $PKG/usr/share/$PRGNAM \
-  $PKG/usr/man/man1
+  $PKG/usr/man/man6
 install -s -m0755 x$PRGNAM $PKG/usr/libexec/
-install -s -m0755 src/to_pro src/partls $PKG/usr/bin/
-install -m0755 $CWD/x$PRGNAM.sh $PKG/usr/bin/x$PRGNAM
-install -m0644 $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/
+install -m0755 $CWD/x$PRGNAM.sh $PKG/usr/games/x$PRGNAM
 install -m0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/
+install -m0644 $CWD/config.$PRGNAM.default $PKG/usr/share/$PRGNAM
+
+# The icons were converted from the Mac OSX icon with icns2png.
+for i in 16 32 48 128; do
+  idir=$PKG/usr/share/icons/hicolor/${i}x${i}/apps
+  mkdir -p $idir
+  cat $CWD/icons/$i.png > $idir/$PRGNAM.png
+done
+
+# old-style icon (e.g. windowmaker, fvwm2)
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+# Include the ROM image in the package. It's been available on the
+# asimov site for at least 20 years now, Apple has never complained.
+unzip -p $CWD/gsrom03.zip > $PKG/usr/share/$PRGNAM/rom03
+
+# 20210825 bkw: include the bundled disk images in the package.
+cp -a [A-Z]*.gz $PKG/usr/share/$PRGNAM/
 
 # Man pages are specific to the SlackBuild, though I've sent
 # them upstream for consideration.
-for file in $CWD/*.1; do
+for file in $CWD/man/*.6; do
   sed "s/@VERSION@/$VERSION/g" $file \
   | gzip -9c \
-  > $PKG/usr/man/man1/$( basename $file ).gz
+  > $PKG/usr/man/man6/$( basename $file ).gz
 done
 
 # Half the supplied documentation refers to it as "kegs" and
 # the other half calls it "xkegs". To avoid confusion:
-ln -s x$PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz
-ln -s x$PRGNAM $PKG/usr/bin/$PRGNAM
-
-# Handle the ROM image, if we find it. Filenames are listed in
-# reverse order of preference.
-for file in ROM01 rom01 ROM03 rom03; do
-  if [ -e "$CWD/$file" ]; then
-    ROMFILE="$CWD/$file"
-  fi
-done
-
-if [ -e "$ROMFILE" ]; then
-  ROMNAME="$( basename "$ROMFILE" )"
-  install -m0644 "$ROMFILE" $PKG/usr/share/$PRGNAM
-else
-  # We don't have a ROM, so we don't include one in the package, but we
-  # do still set the path to /usr/share/kegs/rom03 in the config file,
-  # so all the user has to do is copy the ROM there later.
-  ROMNAME=rom03
-fi
-
-sed "s,@ROM@,/usr/share/$PRGNAM/$ROMNAME," \
-  < $CWD/config.$PRGNAM.default \
-  > $PKG/usr/share/$PRGNAM/config.$PRGNAM.default
+ln -s x$PRGNAM.6.gz $PKG/usr/man/man6/$PRGNAM.6.gz
+ln -s x$PRGNAM $PKG/usr/games/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-install -m0644 *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+install -m0644 doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@AUDIO@,$AUDIO," $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/kegs/kegs.desktop b/system/kegs/kegs.desktop
index 229dc9fe7d..a95ce75dd4 100644
--- a/system/kegs/kegs.desktop
+++ b/system/kegs/kegs.desktop
@@ -3,8 +3,8 @@ Version=1.0
 Name=KEGS
 GenericName=Apple IIgs Emulator
 Type=Application
-Exec=aoss xkegs
+Exec=/usr/games/xkegs
 Icon=kegs
-Terminal=true
+Terminal=false
 StartupNotify=false
 Categories=Game;Emulator;
diff --git a/system/kegs/kegs.info b/system/kegs/kegs.info
index db8446cf08..1bf7277e30 100644
--- a/system/kegs/kegs.info
+++ b/system/kegs/kegs.info
@@ -1,10 +1,12 @@
 PRGNAM="kegs"
-VERSION="0.91"
+VERSION="1.29"
 HOMEPAGE="http://kegs.sourceforge.net/"
-DOWNLOAD="http://kegs.sourceforge.net/kegs.0.91.tar.gz"
-MD5SUM="ec3967d3276bb3d1dd601c7b8f750df5"
+DOWNLOAD="https://kegs.sourceforge.net/kegs.1.29.zip \
+          https://mirrors.apple2.org.za/ftp.apple.asimov.net/emulators/rom_images/gsrom03.zip"
+MD5SUM="f4de669e957d0c9570de07ec960e8427 \
+        029ebd31845614636f6a34a19730cd57"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/kegs/makevars/vars.alsa b/system/kegs/makevars/vars.alsa
new file mode 100644
index 0000000000..c8eb5b26aa
--- /dev/null
+++ b/system/kegs/makevars/vars.alsa
@@ -0,0 +1,7 @@
+TARGET = xkegs
+OBJECTS1 = xdriver.o
+CCOPTS = $(SLKCFLAGS)
+NAME = xkegs
+LD = $(CC)
+EXTRA_LIBS = -lXext -laoss
+EXTRA_SPECIALS =
diff --git a/system/kegs/makevars/vars.oss b/system/kegs/makevars/vars.oss
new file mode 100644
index 0000000000..e71940cd21
--- /dev/null
+++ b/system/kegs/makevars/vars.oss
@@ -0,0 +1,7 @@
+TARGET = xkegs
+OBJECTS1 = xdriver.o
+CCOPTS = $(SLKCFLAGS)
+NAME = xkegs
+LD = $(CC)
+EXTRA_LIBS = -lXext
+EXTRA_SPECIALS =
diff --git a/system/kegs/makevars/vars.pulse b/system/kegs/makevars/vars.pulse
new file mode 100644
index 0000000000..8521ec9b6f
--- /dev/null
+++ b/system/kegs/makevars/vars.pulse
@@ -0,0 +1,7 @@
+TARGET = xkegs
+OBJECTS1 = pulseaudio_driver.o xdriver.o
+CCOPTS = $(SLKCFLAGS) -DPULSE_AUDIO
+NAME = xkegs
+LD = $(CC)
+EXTRA_LIBS = -lXext -lpulse
+EXTRA_SPECIALS =
diff --git a/system/kegs/man/xkegs.6 b/system/kegs/man/xkegs.6
new file mode 100644
index 0000000000..011871d235
--- /dev/null
+++ b/system/kegs/man/xkegs.6
@@ -0,0 +1,240 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "XKEGS" 6 "2023-09-18" "1.29" "SlackBuilds.org"
+.SH NAME
+xkegs \- Apple IIgs emulator
+.\" RST source for xkegs(6) man page. Convert with:
+.
+.\" rst2man.py man/xkegs.rst > man/xkegs.6
+.
+.SH SYNOPSIS
+.sp
+\fBxkegs\fP [\-skip \fInum\fP] [\-audio [\fI0|1\fP] [\-arate \fInum\fP] [\-dhr140] [\-15] [\-16] [\-24] [\-display \fIxdisplay\fP] [\-noshm]
+.SH DESCRIPTION
+.sp
+KEGS (Kent\(aqs Emulated GS) is an Apple IIgs emulator for Mac OS X,
+Linux, and Win32. The Apple IIgs was the most powerful computer in the
+Apple II line. It first was sold in 1986. An Apple IIgs has the
+capability to run almost all Apple II, Apple IIe, and Apple IIc
+programs.
+.sp
+xkegs is the KEGS binary, compiled for Linux and X\-Window support.
+.sp
+This manual page only documents the command\-line options
+and key mappings. For the full documentation, see
+/usr/doc/kegs\-1.29/README.kegs.txt (and the other files in the
+same directory).
+.sp
+Note: There is no way to specify disk or ROM images on the command
+line. Use the configuration menu (F4) from within the emulator to select images.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-skip \fInum\fP
+KEGS will "skip" that many screen redraws between refreshes.
+\-skip 0 will do 60 frames per second, \-skip 1 will do 30 fps,
+\-skip 5 will do 10 fps.
+.TP
+.B \-audio \fI0|1\fP
+Forces audio [off/on]. By default, audio is on unless the X
+display is a remote machine or shared memory is off. This
+switch can override the default. \-audio 0 causes KEGS to not
+fork the background audio process, but Ensoniq emulation is
+still 100% accurate, just the sound is not sent to the workstation
+speaker.
+.TP
+.B \-arate \fInum\fP
+Forces audio sample rate to [num]. 44100 and 48000 are usual,
+you can try 22050 to reduce KEGS\(aqs overhead. On a reasonably
+fast machine (>250MHz or so), you shouldn\(aqt need to mess with
+this.
+.TP
+.B \fB\-dhr140\fP
+Will use the old Double\-hires color algorithm that results in
+exactly 140 colors across the screen, as opposed to the blending
+being done by default.
+.TP
+.B \-15
+KEGS will only look for a 15\-bit X\-Window display.
+.TP
+.B \-16
+KEGS will only look for a 16\-bit X\-Window display (not tested, probably
+will get red colors wrong).
+.TP
+.B \-24
+KEGS will only look for a 24\-bit X\-Window display.
+.TP
+.B \-display \fIxdisplay\fP
+Same as setting the environment variable DISPLAY. Sends X display to [xdisplay]
+.TP
+.B \fB\-noshm\fP
+KEGS will not try to used shared memory for the X graphics
+display. This will make KEGS much slower on graphics\-intensive
+tasks, by as much as a factor of 10! By default, \-noshm causes
+an effective \-skip of 3 which is 15 fps. You can override this
+default by specifying a \-skip explicitly.
+.UNINDENT
+.SH KEY BINDINGS
+.INDENT 0.0
+.TP
+.B F1
+Alias of Command
+.TP
+.B F2
+Alias of Option
+.TP
+.B F3
+Alias of ESC for OS/2 compatibility.
+.TP
+.B F4
+Configuration Panel
+.TP
+.B F6
+Toggle through the 4 speeds: Unlimited, 1MHz, 2.8MHz, 8.0MHz
+.TP
+.B Shift\-F6
+Enter KEGS debugger (can also be done by center\-clicking the
+mouse on the xkegs window).
+The debugger is X\-based, and runs in a separate window.
+.TP
+.B F7
+Toggle fast_disk_emul on/off
+.TP
+.B F8
+Toggle pointer hiding on/off.
+.TP
+.B F9
+Invert the sense of the joystick.
+.TP
+.B Shift\-F9
+Swap x and y joystick/paddle axes.
+.TP
+.B F10
+Attempt to change the a2vid_palette (only useful on 256\-color displays)
+.TP
+.B F11
+Full screen mode (only on Mac OS X).
+.TP
+.B F12
+Alias of Pause/Break which is treated as Reset
+.TP
+.B F2, Alt_R, Meta_r, Menu, Print, Mode_switch, Option
+Option key
+.TP
+.B F1, Alt_L, Meta_L, Cancel, Scroll_lock, Command
+Command key
+.TP
+.B Num_Lock
+Keypad "Clear".
+.TP
+.B F12, Pause, Break
+Reset
+.TP
+.B Home
+Alias for "=" on the keypad
+.UNINDENT
+.SH FILES
+.INDENT 0.0
+.TP
+.B ~/.config.kegs
+The KEGS configuration file. This can be directly edited if necessary,
+but normally is changed by using the configuration menu
+(F4) from within KEGS. To return to the default configuration,
+you may remove this file.
+.TP
+.B /usr/share/kegs/rom03 (or /usr/share/kegs/rom01)
+The Apple IIgs BIOS ROM image. If KEGS can\(aqt find this ROM, it
+will start up with a black display, full of white @ characters.
+Press F4 for the config menu and use the UI to select the correct
+ROM image file.
+.sp
+For reference, the ROM image details are:
+.TS
+center;
+|l|l|l|.
+_
+T{
+Filename
+T}	T{
+Size (bytes)
+T}	T{
+md5sum
+T}
+_
+T{
+rom03
+T}	T{
+262144
+T}	T{
+ba89edf2729a28a17cd9e0f7a0ac9a39
+T}
+_
+T{
+rom01
+T}	T{
+131072
+T}	T{
+20a0334c447cb069a040ae5be1d938df
+T}
+_
+.TE
+.sp
+Other versions of the IIgs ROMs may exist (this author isn\(aqt aware of
+any), but these two images are known to work.
+.TP
+.B /usr/bin/xkegs
+Wrapper script. xkegs will fail to run if it can\(aqt find its config
+file, so this script creates one in the user\(aqs home directory
+if necessary, then runs the real xkegs binary.
+.TP
+.B /usr/libexec/xkegs
+Actual xkegs binary. Shouldn\(aqt be run directly (use the wrapper
+instead).
+.TP
+.B /usr/share/kegs/config.kegs.default
+Copied to \fB~/.config.kegs\fP by the wrapper script, if \fB~/.config.kegs\fP
+doesn\(aqt already exist. Can be used to set system\-wide
+defaults (such as the path to the ROM image).
+.UNINDENT
+.SH AUTHORS
+.sp
+KEGS is by Kent Dickey <\fI\%kadickey@alumni.princeton.edu\fP>.
+.sp
+This manual page was written by B. Watson <\fI\%urchlay@slackware.uk\fP> for
+the SlackBuilds.org project, but may be used by anyone for any purpose.
+.sp
+Wrapper script also by B. Watson.
+.SH SEE ALSO
+.sp
+Full KEGS docs in /usr/doc/kegs\-1.29/
+.sp
+KEGS homepage at \fI\%http://kegs.sourceforge.net/\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/system/kegs/man/xkegs.rst b/system/kegs/man/xkegs.rst
new file mode 100644
index 0000000000..740c2c98d0
--- /dev/null
+++ b/system/kegs/man/xkegs.rst
@@ -0,0 +1,205 @@
+.. RST source for xkegs(6) man page. Convert with:
+..   rst2man.py man/xkegs.rst > man/xkegs.6
+
+.. |version| replace:: 1.29
+.. |date| date::
+
+=====
+xkegs
+=====
+
+-------------------
+Apple IIgs emulator
+-------------------
+
+:Manual section: 6
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+**xkegs** [-skip *num*] [-audio [*0|1*] [-arate *num*] [-dhr140] [-15] [-16] [-24] [-display *xdisplay*] [-noshm]
+
+DESCRIPTION
+===========
+
+KEGS (Kent's Emulated GS) is an Apple IIgs emulator for Mac OS X,
+Linux, and Win32. The Apple IIgs was the most powerful computer in the
+Apple II line. It first was sold in 1986. An Apple IIgs has the
+capability to run almost all Apple II, Apple IIe, and Apple IIc
+programs.
+
+xkegs is the KEGS binary, compiled for Linux and X-Window support.
+
+This manual page only documents the command-line options
+and key mappings. For the full documentation, see
+/usr/doc/kegs-|version|/README.kegs.txt (and the other files in the
+same directory).
+
+Note: There is no way to specify disk or ROM images on the command
+line. Use the configuration menu (F4) from within the emulator to select images.
+
+OPTIONS
+=======
+
+-skip *num*
+  KEGS will "skip" that many screen redraws between refreshes.
+  -skip 0 will do 60 frames per second, -skip 1 will do 30 fps,
+  -skip 5 will do 10 fps.
+
+-audio *0|1*
+  Forces audio [off/on]. By default, audio is on unless the X
+  display is a remote machine or shared memory is off. This
+  switch can override the default. -audio 0 causes KEGS to not
+  fork the background audio process, but Ensoniq emulation is
+  still 100% accurate, just the sound is not sent to the workstation
+  speaker.
+
+-arate *num*
+  Forces audio sample rate to [num]. 44100 and 48000 are usual,
+  you can try 22050 to reduce KEGS's overhead. On a reasonably
+  fast machine (>250MHz or so), you shouldn't need to mess with
+  this.
+
+**-dhr140**
+  Will use the old Double-hires color algorithm that results in
+  exactly 140 colors across the screen, as opposed to the blending
+  being done by default.
+
+-15
+   KEGS will only look for a 15-bit X-Window display.
+
+-16
+   KEGS will only look for a 16-bit X-Window display (not tested, probably
+   will get red colors wrong).
+
+-24
+   KEGS will only look for a 24-bit X-Window display.
+
+-display *xdisplay*
+  Same as setting the environment variable DISPLAY. Sends X display to [xdisplay]
+
+**-noshm**
+  KEGS will not try to used shared memory for the X graphics
+  display. This will make KEGS much slower on graphics-intensive
+  tasks, by as much as a factor of 10! By default, -noshm causes
+  an effective -skip of 3 which is 15 fps. You can override this
+  default by specifying a -skip explicitly.
+
+KEY BINDINGS
+============
+
+F1
+  Alias of Command
+
+F2
+  Alias of Option
+
+F3
+  Alias of ESC for OS/2 compatibility.
+
+F4
+  Configuration Panel
+
+F6
+  Toggle through the 4 speeds: Unlimited, 1MHz, 2.8MHz, 8.0MHz
+
+Shift-F6
+  Enter KEGS debugger (can also be done by center-clicking the
+  mouse on the xkegs window).
+  The debugger is X-based, and runs in a separate window.
+
+F7
+  Toggle fast_disk_emul on/off
+
+F8
+  Toggle pointer hiding on/off.
+
+F9
+  Invert the sense of the joystick.
+
+Shift-F9
+ Swap x and y joystick/paddle axes.
+
+F10
+  Attempt to change the a2vid_palette (only useful on 256-color displays)
+
+F11
+  Full screen mode (only on Mac OS X).
+
+F12
+  Alias of Pause/Break which is treated as Reset
+
+F2, Alt_R, Meta_r, Menu, Print, Mode_switch, Option
+      Option key
+
+F1, Alt_L, Meta_L, Cancel, Scroll_lock, Command
+      Command key
+
+Num_Lock
+  Keypad "Clear".
+
+F12, Pause, Break
+  Reset
+
+Home
+  Alias for "=" on the keypad
+
+FILES
+=====
+
+~/.config.kegs
+  The KEGS configuration file. This can be directly edited if necessary,
+  but normally is changed by using the configuration menu
+  (F4) from within KEGS. To return to the default configuration,
+  you may remove this file.
+
+/usr/share/kegs/rom03 (or /usr/share/kegs/rom01)
+  The Apple IIgs BIOS ROM image. If KEGS can't find this ROM, it
+  will start up with a black display, full of white @ characters.
+  Press F4 for the config menu and use the UI to select the correct
+  ROM image file.
+
+  For reference, the ROM image details are:
+
+  .. csv-table::
+    :header: "Filename", "Size (bytes)", "md5sum"
+
+    "rom03", "262144", "ba89edf2729a28a17cd9e0f7a0ac9a39"
+    "rom01", "131072", "20a0334c447cb069a040ae5be1d938df"
+
+  Other versions of the IIgs ROMs may exist (this author isn't aware of
+  any), but these two images are known to work.
+
+/usr/bin/xkegs
+  Wrapper script. xkegs will fail to run if it can't find its config
+  file, so this script creates one in the user's home directory
+  if necessary, then runs the real xkegs binary.
+
+/usr/libexec/xkegs
+  Actual xkegs binary. Shouldn't be run directly (use the wrapper
+  instead).
+
+/usr/share/kegs/config.kegs.default
+  Copied to **~/.config.kegs** by the wrapper script, if **~/.config.kegs**
+  doesn't already exist. Can be used to set system-wide
+  defaults (such as the path to the ROM image).
+
+AUTHORS
+=======
+
+KEGS is by Kent Dickey <kadickey@alumni.princeton.edu>.
+
+This manual page was written by B. Watson <urchlay@slackware.uk> for
+the SlackBuilds.org project, but may be used by anyone for any purpose.
+
+Wrapper script also by B. Watson.
+
+SEE ALSO
+========
+
+Full KEGS docs in /usr/doc/kegs-|version|/
+
+KEGS homepage at http://kegs.sourceforge.net/
diff --git a/system/kegs/partls.1 b/system/kegs/partls.1
deleted file mode 100644
index 1af148532b..0000000000
--- a/system/kegs/partls.1
+++ /dev/null
@@ -1,23 +0,0 @@
-.TH PARTLS "1" "January 2011" "SlackBuilds.org" "User Commands"
-.SH NAME
-partls \- Lists partitions on Apple\-partitioned hard drives or CD-ROMs
-.SH SYNOPSIS
-.B partls
-<\fI-l\fR>
-[\fIfile-or-device\fR]
-.SH DESCRIPTION
-partls is distributed with the KEGS emulator.
-.PP
-partls displays the partition table on an Apple\-partitioned disk or
-disk image file. Generally, these partitions will use the Apple HFS filesystem.
-.PP
-With the \fB\-l\fR option, more information is displayed.
-.SH SEE ALSO
-xkegs(1)
-.br
-to_pro(1)
-.SH AUTHORS
-KEGS and partls are by Kent Dickey <kadickey at princeton dot edu>.
-.PP
-This manual page was written by B. Watson for the SlackBuilds.org project (but
-may be used by anyone for any reason).
diff --git a/system/kegs/slack-desc b/system/kegs/slack-desc
index 5db61e7330..3ecf8b066b 100644
--- a/system/kegs/slack-desc
+++ b/system/kegs/slack-desc
@@ -13,7 +13,7 @@ kegs: Apple IIgs was the most powerful computer in the Apple II line. It
 kegs: first was sold in 1986. An Apple IIgs has the capability to run almost
 kegs: all Apple II, Apple IIe, and Apple IIc programs.
 kegs:
-kegs:
+kegs: Package built with audio system '@AUDIO@'.
 kegs:
 kegs:
 kegs:
diff --git a/system/kegs/to_pro.1 b/system/kegs/to_pro.1
deleted file mode 100644
index a58fada52d..0000000000
--- a/system/kegs/to_pro.1
+++ /dev/null
@@ -1,55 +0,0 @@
-.TH TO_PRO "1" "January 2011" "SlackBuilds.org" "User Commands"
-.SH NAME
-to_pro \- creates and copies files to Apple ProDOS disk images
-.SH SYNOPSIS
-.B to_pro
-[\fI-size\fR]
-[\fIfile\fR]
-<\fIfile\fR ...>
-.SH DESCRIPTION
-to_pro is intended for use with the KEGS emulator.
-.PP
-to_pro creates a new ProDOS disk image called POOF1 in the current
-directory, of the given size, containing the specified file(s). At
-least one file must be given (to_pro cannot create a completely blank
-image), and up to 51 file arguments are allowed.
-.PP
-The size argument is in kilobytes (1024 bytes each), and must be larger than the total size of
-all the files (no checking is done, it's up to the user). ProDOS has a limit
-of 32MB per partition, so the \-size argument should always less than
-32767.
-.PP
-Long UNIX filenames are truncated to the 15\-character
-ProDOS limit.
-.PP
-The author warns that the generated disk image files should only be used
-temporarily, to copy files from the image to another ProDOS disk image
-that was formatted within KEGS using ProDOS itself (or, the generated
-image may be formatted within KEGS to create a proper blank disk image).
-.PP
-to_pro automatically sets the ProDOS filetype of files ending in ".shk"
-to $E0.
-.SH EXAMPLES
-.TP
-to_pro \-800 wolfdemo.bxy
-Creates an 800KB disk image called POOF1, containing the file "wolfdemo.bxy"
-(which is likely an Apple IIgs archive, downloaded from an FTP or web site).
-Probably the next thing you will do be "mv POOF1 wolfdemo.dsk".
-.TP
-to_pro \-4096 wolfdemo.bxy
-Same as above, but creates a 4MB POOF1 image file instead.
-.TP
-to_pro \-32000 *.shk
-put all *.shk files in the current Unix directory into a 31.25MB
-image called POOF1.
-.SH SEE ALSO
-xkegs(1)
-.br
-partls(1)
-.PP
-More information on to_pro in /usr/doc/kegs\-@VERSION@/README.kegs.txt
-.SH AUTHORS
-KEGS and to_pro are by Kent Dickey <kadickey at princeton dot edu>.
-.PP
-This manual page was written by B. Watson for the SlackBuilds.org project (but
-may be used by anyone for any reason).
diff --git a/system/kegs/xkegs.1 b/system/kegs/xkegs.1
deleted file mode 100644
index 907a6095cd..0000000000
--- a/system/kegs/xkegs.1
+++ /dev/null
@@ -1,176 +0,0 @@
-.TH KEGS "1" "January 2011" "SlackBuilds.org" "User Commands"
-.SH NAME
-xkegs \- Apple IIgs emulator
-.SH SYNOPSIS
-.B xkegs
-[\fI-options\fR]
-.SH DESCRIPTION
-KEGS (Kent's Emulated GS)
-is an Apple IIgs emulator for Mac OS X, Linux, and Win32. The Apple
-IIgs was the most powerful computer in the Apple II line. It first was
-sold in 1986. An Apple IIgs has the capability to run almost all Apple
-II, Apple IIe, and Apple IIc programs.
-.PP
-xkegs is the KEGS binary, compiled for Linux and X\-Window support.
-.PP
-This manual page only documents the command\-line options and key mappings.
-For the full documentation, see /usr/doc/kegs\-@VERSION@/README.kegs.txt
-(and the other files in the same directory).
-.PP
-\fINote:\fR There is no way to specify disk or ROM images on the command line.
-Use the configuration menu (F4) from within the emulator to select images.
-.SH OPTIONS
-.TP
-\fB\-skip\fR \fI[num]\fR
-KEGS will "skip" that many screen redraws between refreshes.
-\-skip 0 will do 60 frames per second, \-skip 1 will do 30 fps,
-\-skip 5 will do 10 fps.
-.TP
-\fB\-audio\fR \fI[0/1]\fR
-Forces audio [off/on].  By default, audio is on unless
-the X display is a remote machine or shared memory is off.
-This switch can override the default.  \-audio 0 causes KEGS to
-not fork the background audio process, but Ensoniq emulation
-is still 100% accurate, just the sound is not sent to the
-workstation speaker.
-.TP
-\fB\-arate\fR \fI[num]\fR
-Forces audio sample rate to \fI[num]\fR.  44100 and 48000 are
-usual, you can try 22050 to reduce KEGS's overhead.  On a reasonably
-fast machine (>250MHz or so), you shouldn't need to mess with this.
-.TP
-\fB\-dhr140\fR
-Will use the old Double\-hires color algorithm that results in
-exactly 140 colors across the screen, as opposed to the blending
-being done by default.
-.TP
-\fB\-15\fR
-KEGS will only look for a 15\-bit X\-Window display.
-.TP
-\fB\-16\fR
-KEGS will only look for a 16\-bit X\-Window display (not tested, probably
- will get red colors wrong).
-.TP
-\fB\-24\fR
-KEGS will only look for a 24\-bit X\-Window display.
-.TP
-\fB\-display\fR \fI[xdisplay]\fR
-Same as setting the environment variable DISPLAY.
-Sends X display to \fI[xdisplay]\fR
-.TP
-\fB\-noshm\fR
-KEGS will not try to used shared memory for the X graphics display.
-This will make KEGS much slower on graphics\-intensive tasks,
-by as much as a factor of 10!  By default, \-noshm causes an
-effective \-skip of 3 which is 15 fps.  You can override this
-default by specifying a \-skip explicitly.
-.SH KEY BINDINGS
-.TP
-\fBF1\fR
-Alias of Command
-.TP
-\fBF2\fR
-Alias of Option
-.TP
-\fBF3\fR
-Alias of ESC for OS/2 compatibility.
-.TP
-\fBF4\fR
-Configuration Panel
-.TP
-\fBF6\fR
-Toggle through the 4 speeds:
-Unlimited, 1MHz, 2.8MHz, 8.0MHz
-.TP
-\fBShift\-F6\fR
-Enter KEGS debugger (can also be done by center\-clicking the mouse on
-the xkegs window).
-.br
-The debugger is tty\-based, and runs on the terminal
-that xkegs was started from.
-.TP
-\fBF7\fR
-Toggle fast_disk_emul on/off
-.TP
-\fBF8\fR
-Toggle pointer hiding on/off.
-.TP
-\fBF9\fR
-Invert the sense of the joystick.
-.TP
-\fBShift\-F9\fR
-Swap x and y joystick/paddle axes.
-.TP
-\fBF10\fR
-Attempt to change the a2vid_palette (only useful on 256\-color displays)
-.TP
-\fBF11\fR
-Full screen mode (only on Mac OS X).
-.TP
-\fBF12\fR
-Alias of Pause/Break which is treated as Reset
-.TP
-\fBF2\fR, \fBAlt_R\fR, \fBMeta_r\fR, \fBMenu\fR, \fBPrint\fR, \fBMode_switch\fR, \fBOption\fR
-Option key
-.TP
-\fBF1\fR, \fBAlt_L\fR, \fBMeta_L\fR, \fBCancel\fR, \fBScroll_lock\fR, \fBCommand\fR
-Command key
-.TP
-\fBNum_Lock\fR
-Keypad "Clear".
-.TP
-\fBF12\fR, \fBPause\fR, \fBBreak\fR
-Reset
-.TP
-\fBHome\fR
-Alias for "=" on the keypad
-.SH FILES
-.TP
-\fB~/.config.kegs\fR
-The KEGS configuration file. This can be directly edited if
-necessary, but normally is changed by using the configuration
-menu (F4) from within KEGS. To return to the default configuration,
-you may remove this file.
-.TP
-\fB/usr/share/kegs/rom03\fR (or \fB/usr/share/kegs/rom01\fR)
-The Apple IIgs BIOS ROM image. If KEGS can't find this ROM, it
-will start up with a black display, full of white @ characters.
-Press F4 for the config menu and use the UI to select the correct
-ROM image file.
-.PP
-For reference, the ROM image details are:
-.PP
-\fBrom03\fR: size 262144 bytes, md5sum ba89edf2729a28a17cd9e0f7a0ac9a39
-.br
-\fBrom01\fR: size 131072 bytes, md5sum 20a0334c447cb069a040ae5be1d938df
-.PP
-Other versions of the IIgs ROMs may exist (this author isn't aware of any),
-but these two images are known to work.
-.TP
-\fB/usr/bin/xkegs\fR
-Wrapper script. xkegs will fail to run if it can't find its config file,
-so this script creates one in the user's home directory if necessary,
-then runs the real xkegs binary.
-.TP
-\fB/usr/libexec/xkegs\fR
-Actual xkegs binary. Shouldn't be run directly (use the wrapper instead).
-.TP
-\fB/usr/share/kegs/config.kegs.default\fR
-Copied to \fB~/.config.kegs\fR by the wrapper script, if \fB~/.config.kegs\fR
-doesn't already exist. Can be used to set system\-wide defaults (such as the
-path to the ROM image).
-.SH SEE ALSO
-to_pro(1)
-.br
-partls(1)
-.br
-Full KEGS docs in /usr/doc/kegs\-@VERSION@/*.txt
-.br
-KEGS homepage at http://kegs.sourceforge.net/
-.SH AUTHORS
-KEGS is by Kent Dickey <kadickey at princeton dot edu>.
-.PP
-This manual page was written by B. Watson for the SlackBuilds.org project (but
-may be used by anyone for any reason).
-.PP
-Wrapper script also by B. Watson.
diff --git a/system/kegs/xkegs.sh b/system/kegs/xkegs.sh
index 55f0719b73..a947f07f76 100644
--- a/system/kegs/xkegs.sh
+++ b/system/kegs/xkegs.sh
@@ -8,8 +8,13 @@
 # read it from /usr/share/kegs/config.kegs, but it'll freeze if
 # it doesn't have write permission!
 
+# Update for v1.05: kegs will now start without ~/.config.kegs,
+# but if you do that, it'll save its config in the current dir as
+# "config.kegs" (no leading dot). So this wrapper's still necessary.
+# Added the missing "$@" so options actually get passed to kegs.
+
 if [ ! -e ~/.config.kegs ]; then
 	cat /usr/share/kegs/config.kegs.default > ~/.config.kegs
 fi
 
-exec /usr/libexec/xkegs
+exec /usr/libexec/xkegs "$@"
diff --git a/system/kexec-tools/kexec-tools.SlackBuild b/system/kexec-tools/kexec-tools.SlackBuild
index 26d151c93c..6166b0a43f 100644
--- a/system/kexec-tools/kexec-tools.SlackBuild
+++ b/system/kexec-tools/kexec-tools.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for kexec-tools
 # Written by powtrix (@gmail.com)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=kexec-tools
-VERSION=${VERSION:-2.0.20}
+VERSION=${VERSION:-2.0.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -16,7 +19,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -82,4 +92,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/kexec-tools/kexec-tools.info b/system/kexec-tools/kexec-tools.info
index f985835884..3f9b9e67f6 100644
--- a/system/kexec-tools/kexec-tools.info
+++ b/system/kexec-tools/kexec-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="kexec-tools"
-VERSION="2.0.20"
+VERSION="2.0.21"
 HOMEPAGE="http://horms.net/projects/kexec/"
-DOWNLOAD="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-2.0.20.tar.xz"
-MD5SUM="3b3ee68064648b1b9e86ad93b1c50644"
+DOWNLOAD="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-2.0.21.tar.xz"
+MD5SUM="4a0bbced84e46162d8f8e2c17a0b1466"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/keybase/README b/system/keybase/README
deleted file mode 100644
index 8db8b1459f..0000000000
--- a/system/keybase/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This package provides command-line Go-based keybase client.
-
-NOTE: Please make sure GOROOT variable point to the correct google's go
-implementation rather than gcc's go before building since it requires
-go 1.5 and higher (gcc's go is at 1.4.2)
-
-Newer version of keybase will require go 1.9.x.
diff --git a/system/keybase/keybase.SlackBuild b/system/keybase/keybase.SlackBuild
deleted file mode 100644
index e2f38806ed..0000000000
--- a/system/keybase/keybase.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for keybase
-
-# Copyright 2016-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=keybase
-SRCNAM=client
-VERSION=${VERSION:-5.6.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Thanks to ARCH
-mkdir -p go/client/.gopath/src
-cp -rf go/vendor/* go/client/.gopath/src/
-mkdir -p go/client/.gopath/src/github.com/keybase
-ln -sf "$PWD" go/client/.gopath/src/github.com/keybase/client
-export GOPATH="$PWD/go/client/.gopath"
-
-cd go/keybase
-echo -e "This will take a while to build. Please be patient.\n"
-$GOROOT/bin/go build -a -tags production -gccgoflags "$CFLAGS $LDFLAGS" github.com/keybase/client/go/keybase
-
-mkdir -p $PKG/usr/bin
-install -Dm755 keybase $PKG/usr/bin/keybase
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ../{LICENSE,*.md,copyright.*} $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/keybase/keybase.info b/system/keybase/keybase.info
deleted file mode 100644
index 367a1a72bb..0000000000
--- a/system/keybase/keybase.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="keybase"
-VERSION="5.6.1"
-HOMEPAGE="https://github.com/keybase/client"
-DOWNLOAD="https://github.com/keybase/client/archive/v5.6.1/client-5.6.1.tar.gz"
-MD5SUM="3acd34467dccfad5a7d93741aeea3724"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="google-go-lang"
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
diff --git a/system/keybase/slack-desc b/system/keybase/slack-desc
deleted file mode 100644
index 2da70b8a00..0000000000
--- a/system/keybase/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-keybase: keybase (CLI Keybase Client)
-keybase:
-keybase: This package provides command-line Go-based keybase client.
-keybase:
-keybase:
-keybase:
-keybase: Project URL: https://github.com/keybase/client
-keybase:
-keybase:
-keybase:
-keybase:
diff --git a/system/keylaunch/keylaunch.SlackBuild b/system/keylaunch/keylaunch.SlackBuild
index 137c03df16..cd1df0ff96 100644
--- a/system/keylaunch/keylaunch.SlackBuild
+++ b/system/keylaunch/keylaunch.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for KeyLaunch
 
@@ -24,27 +24,36 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=keylaunch
 VERSION=${VERSION:-1.3.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
-PKGTYPE=${PKGTYPE:-tgz}
 
-if [ "$ARCH" = "i486" ]; then
-    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+    SLKCFLAGS="-O2 -march=i586 -mtune=i686"
     LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
     SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -97,4 +106,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/kfc/kfc.SlackBuild b/system/kfc/kfc.SlackBuild
index 29eb4f508f..1c148feb56 100644
--- a/system/kfc/kfc.SlackBuild
+++ b/system/kfc/kfc.SlackBuild
@@ -1,15 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for kfc
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230711 bkw: updated for v0.1.4.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=kfc
-VERSION=${VERSION:-0.1.2}
+VERSION=${VERSION:-0.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +24,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -68,4 +77,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/kfc/kfc.info b/system/kfc/kfc.info
index 1f0fd9dec2..82f5cac759 100644
--- a/system/kfc/kfc.info
+++ b/system/kfc/kfc.info
@@ -1,10 +1,10 @@
 PRGNAM="kfc"
-VERSION="0.1.2"
+VERSION="0.1.4"
 HOMEPAGE="https://github.com/mcpcpc/kfc"
-DOWNLOAD="https://github.com/mcpcpc/kfc/archive/0.1.2/kfc-0.1.2.tar.gz"
-MD5SUM="edd5b6eb81d85f4e1f7623f623f7c083"
+DOWNLOAD="https://github.com/mcpcpc/kfc/archive/0.1.4/kfc-0.1.4.tar.gz"
+MD5SUM="ca06a06b22465b8334f5a21456cddaa3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/kio-fuse/README b/system/kio-fuse/README
new file mode 100644
index 0000000000..0768bde43e
--- /dev/null
+++ b/system/kio-fuse/README
@@ -0,0 +1,5 @@
+KIO FUSE is a FUSE (userspace filesystem framework) interface for KIO
+(KDE's network transparent access to files and data).
+
+KIO FUSE is a DBus activated service that better integrates opening
+files from the network with non-KDE apps such as Libreoffice.
diff --git a/system/kio-fuse/kio-fuse.SlackBuild b/system/kio-fuse/kio-fuse.SlackBuild
new file mode 100644
index 0000000000..6875bfd020
--- /dev/null
+++ b/system/kio-fuse/kio-fuse.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# Slackware build script for kio-fuse
+
+# Copyright 2022 Fabio Bas, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=kio-fuse
+VERSION=${VERSION:-5.0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  DESIGN README TODO LICENSES/GPL-3.0-or-later.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/kio-fuse/kio-fuse.info b/system/kio-fuse/kio-fuse.info
new file mode 100644
index 0000000000..d26e696b07
--- /dev/null
+++ b/system/kio-fuse/kio-fuse.info
@@ -0,0 +1,10 @@
+PRGNAM="kio-fuse"
+VERSION="5.0.1"
+HOMEPAGE="https://invent.kde.org/system/kio-fuse"
+DOWNLOAD="https://download.kde.org/stable/kio-fuse/5.0.1/kio-fuse-5.0.1.tar.xz"
+MD5SUM="0d3fb71409ae157b58c0737a0ca41685"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Fabio Bas"
+EMAIL="ctrlaltca <at> gmail {dot} com"
diff --git a/system/kio-fuse/slack-desc b/system/kio-fuse/slack-desc
new file mode 100644
index 0000000000..3a4dfb472d
--- /dev/null
+++ b/system/kio-fuse/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+kio-fuse: kio-fuse (FUSE interface for KIO)
+kio-fuse:
+kio-fuse: KIO FUSE is a DBus activated service that better integrates opening
+kio-fuse: files from the network with non-KDE apps such as Libreoffice.
+kio-fuse:
+kio-fuse: Homepage: https://invent.kde.org/system/kio-fuse
+kio-fuse:
+kio-fuse:
+kio-fuse:
+kio-fuse:
+kio-fuse:
diff --git a/system/kitchen-sync/0001-Restore-compatibility-with-1.0-servers.patch.gz b/system/kitchen-sync/0001-Restore-compatibility-with-1.0-servers.patch.gz
deleted file mode 100644
index 8e6849a610..0000000000
--- a/system/kitchen-sync/0001-Restore-compatibility-with-1.0-servers.patch.gz
+++ /dev/null
diff --git a/system/kitchen-sync/README b/system/kitchen-sync/README
deleted file mode 100644
index 92b7b47b14..0000000000
--- a/system/kitchen-sync/README
+++ /dev/null
@@ -1,2 +0,0 @@
-kitchen_sync - Fast unidirectional database synchronization - make or
-efficiently update a copy of a database, without slow dumping & reloading
diff --git a/system/kitchen-sync/kitchen-sync.SlackBuild b/system/kitchen-sync/kitchen-sync.SlackBuild
deleted file mode 100644
index 7d85b220aa..0000000000
--- a/system/kitchen-sync/kitchen-sync.SlackBuild
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for kitchen-sync
-
-# Copyright 2016-2020 Andrew Clemons, Wellington New Zealand
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=kitchen-sync
-SRCNAM=$(echo "$PRGNAM" | tr '-' '_')
-VERSION=${VERSION:-2.10}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-else
-  SLKCFLAGS="-O2"
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-
-zcat $CWD/0001-Restore-compatibility-with-1.0-servers.patch.gz | patch -p1
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
-cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  CHANGES.md INSTALL.md README.md TESTS.md USAGE.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/kitchen-sync/kitchen-sync.info b/system/kitchen-sync/kitchen-sync.info
deleted file mode 100644
index 0ef6843485..0000000000
--- a/system/kitchen-sync/kitchen-sync.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="kitchen-sync"
-VERSION="2.10"
-HOMEPAGE="https://github.com/willbryant/kitchen_sync"
-DOWNLOAD="https://github.com/willbryant/kitchen_sync/archive/v2.10/kitchen_sync-2.10.tar.gz"
-MD5SUM="e5c7a8a83966e41e16b2ee37c10365ac"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Andrew Clemons"
-EMAIL="andrew.clemons@gmail.com"
diff --git a/system/kitchen-sync/slack-desc b/system/kitchen-sync/slack-desc
deleted file mode 100644
index 0c26d7cd32..0000000000
--- a/system/kitchen-sync/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-            |-----handy-ruler------------------------------------------------------|
-kitchen-sync: kitchen-sync (Fast unidirectional database synchronization)
-kitchen-sync:
-kitchen-sync: Fast unidirectional synchronization - make or efficiently update a
-kitchen-sync: copy of a database, without slow dumping & reloading.
-kitchen-sync:
-kitchen-sync:
-kitchen-sync: https://github.com/willbryant/kitchen_sync
-kitchen-sync:
-kitchen-sync:
-kitchen-sync:
-kitchen-sync:
diff --git a/system/kitty-bin/README b/system/kitty-bin/README
new file mode 100644
index 0000000000..64dc5136a8
--- /dev/null
+++ b/system/kitty-bin/README
@@ -0,0 +1,21 @@
+kitty-bin (fast, featureful, GPU-based terminal emulator)
+
+kitty is a terminal emulator for X11 and Wayland [1], which offloads
+the rendering to the GPU [2] and supports modern terminal features. It
+also supports tiling multiple terminal windows without using an extra
+program like screen or tmux.
+
+This conflicts with system/kitty. Do not install kitty-bin and kitty
+on the same system.
+
+This build packages the official kitty binaries for Linux. If you'd
+rather build from source, you can install system/kitty instead, but be
+aware that kitty-bin will usually be a newer version of kitty.
+
+[1] For Wayland support, it may be necessary to add the following 
+    line to ~/.config/kitty/kitty.conf:
+    linux_display_server wayland
+
+[2] Requires hardware-accelerated OpenGL support.
+
+See README.aarch64 if you're using 64-bit ARM.
diff --git a/system/kitty-bin/README.aarch64 b/system/kitty-bin/README.aarch64
new file mode 100644
index 0000000000..337a5716a2
--- /dev/null
+++ b/system/kitty-bin/README.aarch64
@@ -0,0 +1,13 @@
+Although SBo doesn't officially support ARM, and I personally don't
+use ARM at all, it should be possible to build an aarch64 package of
+kitty-bin.
+
+The download URL is:
+
+https://github.com/kovidgoyal/kitty/releases/download/v0.29.0/kitty-0.29.0-arm64.txz
+
+The md5sum is: 9f54c50e71959de17f946340a5afb7fd
+
+The script will create a package, but I have no idea if it will
+work. If you try this, please contact me (urchlay@slackware.uk) and
+let me know if it works or not.
diff --git a/system/kitty-bin/doinst.sh b/system/kitty-bin/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/system/kitty-bin/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/kitty-bin/kitty-bin.SlackBuild b/system/kitty-bin/kitty-bin.SlackBuild
new file mode 100644
index 0000000000..18f22b814b
--- /dev/null
+++ b/system/kitty-bin/kitty-bin.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+# Slackware build script for kitty-bin
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Notes:
+
+# This exists because building kitty from source requires the latest
+# bleeding-edge google-go-lang, newer than we have in the repo, and
+# because Go is just too fast-moving a target for me. At any given
+# time, it's likely that the latest binaries will work before we're
+# able to build our own. This means kitty-bin will probably be a bit
+# newer version than the regular kitty build.
+
+# Since upstream provides a 64-bit ARM binary bundle, this script can
+# create an aarch64 package. I don't use ARM and haven't tested it.
+
+# 20230715 bkw: update for v0.29.0.
+
+# 20230630 bkw: BUILD=2
+# - fix a major boo-boo: /usr/lib was being overwritten with a symlink
+#   to lib64. this broke on multilib, badly.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=kitty-bin
+SRCNAM=kitty
+VERSION=${VERSION:-0.29.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SRCARCH=i686
+elif [ "$ARCH" = "i686" ]; then
+  SRCARCH=i686
+elif [ "$ARCH" = "x86_64" ]; then
+  SRCARCH=x86_64
+  LIBDIR=lib64
+elif [ "$ARCH" = "aarch64" ]; then
+  SRCARCH=arm64
+  LIBDIR=lib64
+else
+  echo "ARCH '$ARCH' not supported (only i586, i686, x86_64, aarch64)." 1>&1
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG/usr $OUTPUT
+cd $PKG/usr
+tar xvf $CWD/$SRCNAM-$VERSION-$SRCARCH.txz
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Use system shared libs. This works, for now, until upstream starts
+# using newer ones. Removing the rpath isn't strictly necessary for
+# 32-bit or pure 64-bit, but it's needed on multilib.
+rm -rf lib/*.so.*
+patchelf --remove-rpath bin/*
+
+if [ -n "$LIBDIR" ]; then
+  mv lib $LIBDIR
+  mkdir -p lib
+  ln -s ../$LIBDIR/kitty lib/kitty
+  ln -s ../$LIBDIR/kitty-extensions lib/kitty-extensions
+fi
+
+# TODO: find out WTF lib/cacert.pem is intended to be used for, and
+# whether or not kitty can find it at runtime. No idea currently.
+
+mv share/man man
+gzip -9 man/man*/*
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+mv share/doc/kitty/* $PKGDOC
+rm -rf share/doc
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/kitty-bin/kitty-bin.info b/system/kitty-bin/kitty-bin.info
new file mode 100644
index 0000000000..46745744df
--- /dev/null
+++ b/system/kitty-bin/kitty-bin.info
@@ -0,0 +1,10 @@
+PRGNAM="kitty-bin"
+VERSION="0.29.0"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
+DOWNLOAD="https://github.com/kovidgoyal/kitty/releases/download/v0.29.0/kitty-0.29.0-i686.txz"
+MD5SUM="acf53abcc3733f0058fb6ea476310760"
+DOWNLOAD_x86_64="https://github.com/kovidgoyal/kitty/releases/download/v0.29.0/kitty-0.29.0-x86_64.txz"
+MD5SUM_x86_64="c11ee318b8a30790eda21f30e6833f71"
+REQUIRES="librsync"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/kitty-bin/slack-desc b/system/kitty-bin/slack-desc
new file mode 100644
index 0000000000..ac33f369ec
--- /dev/null
+++ b/system/kitty-bin/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+kitty-bin: kitty-bin (fast, featureful, GPU-based terminal emulator)
+kitty-bin:
+kitty-bin: kitty is a terminal emulator for X11 and Wayland, which offloads the
+kitty-bin: rendering to the GPU and supports modern terminal features. It also
+kitty-bin: supports tiling multiple terminal windows without using an extra
+kitty-bin: program like screen or tmux.
+kitty-bin:
+kitty-bin: This is a repack of the official kitty binary.
+kitty-bin:
+kitty-bin:
+kitty-bin:
diff --git a/system/kitty/README b/system/kitty/README
index a4cb22c88e..b038ff262c 100644
--- a/system/kitty/README
+++ b/system/kitty/README
@@ -1,14 +1,12 @@
 kitty (fast, featureful, GPU-based terminal emulator)
 
-kitty is a terminal emulator for X11 and Wayland[1], which offloads
-the rendering to the GPU[2] and supports modern terminal features. It
+kitty is a terminal emulator for X11 and Wayland [1], which offloads
+the rendering to the GPU [2] and supports modern terminal features. It
 also supports tiling multiple terminal windows without using an extra
 program like screen or tmux.
 
-[1] For Wayland support, install wayland-protocols before building
-    kitty. It will be auto-detected. It may be necessary to add the
-    following line to ~/.config/kitty/kitty.conf:
-
-      linux_display_server wayland
+[1] For Wayland support, it may be necessary to add the following 
+    line to ~/.config/kitty/kitty.conf:
+    linux_display_server wayland
 
 [2] Requires hardware-accelerated OpenGL support.
diff --git a/system/kitty/kitty.SlackBuild b/system/kitty/kitty.SlackBuild
index 7a6708062d..50211bc0f2 100644
--- a/system/kitty/kitty.SlackBuild
+++ b/system/kitty/kitty.SlackBuild
@@ -1,15 +1,21 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for kitty
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (email removed)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230720 bkw: hand over maintenance to Eugen Wissner.
+# 20221228 bkw: update for v0.26.5, fix sbopkglint gripes.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=kitty
-VERSION=${VERSION:-0.19.3}
+VERSION=${VERSION:-0.34.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +25,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -46,54 +56,50 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
+
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# The Makefile ain't a real Makefile, everything's done in setup.py. Which
-# has issues:
-# - upstream claims harfbuzz >= 1.5 is required, but 14.2's 1.2 seems to work
-#   just fine.
-# - CFLAGS not supported, -O3 hardcoded. The OVERRIDE stuff works, but the
-#   hardcoded -O3 comes *after* them on the gcc command line. Grr.
-# - -Werror is used when compiling launcher.c, no way to disable. This assumes
-#   upstream is perfect at writing code that compiles without warnings on every
-#   version of gcc we might ever happen to use, and I don't believe it.
-# So, sed surgery.
-
-sed -i \
-    -e "/at_least_version('harfbuzz/s,5,2," \
-    -e 's,-O3,-O2,g' \
-    -e 's,-Werror , ,g' \
-    setup.py
+# Note to self: don't use the Makefile, it just runs setup.py but
+# doesn't give us a way to pass options to it.
+
+# sed surgery: setup.py allows overriding the compiler flags, but
+# puts a -O3 *after* whatever we set them to. All our SLKCFLAGS
+# choices have -O2.
+
+sed -i 's,-O3,-O2,g' setup.py
 
 # The -Wl,-s makes the linker strip the binaries.
+# --ignore-compiler-warnings is needed to turn off -Werror.
+
 OVERRIDE_CPPFLAGS="$SLKCFLAGS -Wl,-s" \
 OVERRIDE_CFLAGS="$SLKCFLAGS -Wl,-s" \
-  python3 setup.py --libdir-name lib$LIBDIRSUFFIX --verbose linux-package
+  python3 setup.py \
+    --libdir-name lib$LIBDIRSUFFIX \
+    --verbose linux-package \
+    --ignore-compiler-warnings
 
 mkdir -p $PKG/usr/bin $PKG/usr/share $PKG/usr/lib$LIBDIRSUFFIX
 cp -a linux-package/bin/* $PKG/usr/bin
 cp -a linux-package/share/* $PKG/usr/share
 cp -a linux-package/lib*/* $PKG/usr/lib$LIBDIRSUFFIX
+strip $PKG/usr/bin/$PRGNAM
 
 mv $PKG/usr/share/man $PKG/usr/man
 gzip $PKG/usr/man/man?/*.?
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/$PRGNAM/html $PKG/usr/doc/$PRGNAM-$VERSION
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+mv $PKG/usr/share/doc/$PRGNAM/html $PKGDOC
 rm -rf $PKG/usr/share/doc/
-cp -a CHANGELOG* CONTRIBUTING* README* LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-# make slack-desc reflect the display types the package is built for
-L=$PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/$PRGNAM
-[ -e $L/glfw-x11.so ] && DISPLAYS+=" X11"
-[ -e $L/glfw-wayland.so ] && DISPLAYS+=" Wayland"
+find $PKGDOC/html -type f -a -empty | xargs rm
+cp -a CHANGELOG* CONTRIBUTING* README* LICENSE* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-sed "s,@DISPLAYS@,$DISPLAYS," $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/kitty/kitty.info b/system/kitty/kitty.info
index 2047627277..bc48b71549 100644
--- a/system/kitty/kitty.info
+++ b/system/kitty/kitty.info
@@ -1,10 +1,10 @@
 PRGNAM="kitty"
-VERSION="0.19.3"
+VERSION="0.34.0"
 HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-DOWNLOAD="https://github.com/kovidgoyal/kitty/releases/download/v0.19.3/kitty-0.19.3.tar.xz"
-MD5SUM="262b677889d9b979b9ce609ec7b75186"
+DOWNLOAD="https://download.dlackware.com/hosted-sources/kitty/kitty-0.34.0.tar.xz"
+MD5SUM="57e592cf4634d2b903885ed50e5ad5ff"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3 libxkbcommon"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+REQUIRES="librsync google-go-lang simde"
+MAINTAINER="Eugen Wissner"
+EMAIL="belka@caraus.de"
diff --git a/system/kitty/slack-desc b/system/kitty/slack-desc
index c48660175a..7d5c2b81a9 100644
--- a/system/kitty/slack-desc
+++ b/system/kitty/slack-desc
@@ -13,7 +13,7 @@ kitty: rendering to the GPU and supports modern terminal features. It also
 kitty: supports tiling multiple terminal windows without using an extra
 kitty: program like screen or tmux.
 kitty:
-kitty: This package supports:@DISPLAYS@
+kitty: Homepage: https://sw.kovidgoyal.net/kitty/
 kitty:
 kitty:
 kitty:
diff --git a/system/kiwix-tools-bin/README b/system/kiwix-tools-bin/README
new file mode 100644
index 0000000000..44081c35d2
--- /dev/null
+++ b/system/kiwix-tools-bin/README
@@ -0,0 +1,21 @@
+kiwix-tools-bin (offline access for Wikipedia)
+
+Kiwix enables you to have the whole Wikipedia at hand wherever you go!
+On a boat, in the middle of nowhere or in Jail, Kiwix gives you access
+to the whole human knowledge. You don't need Internet, everything is
+stored on your computer, USB flash drive or DVD!
+
+This is a repack of the official binary; it does not compile from
+source. Only 32-bit x86, 64-bit x86_64, and 64-bit aarch64 are
+supported.
+
+For aarch64, since there's currently no way to give the aarch64 download
+URL in the .info file, you'll have to download it manually. The file is:
+
+https://download.kiwix.org/release/kiwix-tools/kiwix-tools_linux-aarch64-3.7.0.tar.gz
+
+md5 hash of this package: 12ab8a0d67dee5f63c0a85d9d089b5f2
+
+Note: currently there is no kiwix-tools build that compiles from source.
+If someday someone submits one, be aware that it will likely conflict
+with this build.
diff --git a/system/kiwix-tools-bin/docs/AUTHORS b/system/kiwix-tools-bin/docs/AUTHORS
new file mode 100644
index 0000000000..df29bc970f
--- /dev/null
+++ b/system/kiwix-tools-bin/docs/AUTHORS
@@ -0,0 +1,14 @@
+Emmanuel Engelhart <kelson@kiwix.org>
+Renaud Gaudin <reg@kiwix.org>
+Christian Pühringer <cip@gmx.at>
+Fabien Coullon <fcoulon@linterweb.com>
+Guillaume Duhamel <gduhamel@linterweb.com>
+Wilfredo Rodriguez <wilfredor@kiwix.org>
+Jorge Gonzalez <jag2kn@gmail.com>
+Richzendy <richzendy@fedoraproject.org>
+Ayoub Dardory <ayoubuto@gmail.com>
+Rashiq Ahmad <rashiq.z@gmail.com>
+Isaac Hutt <mhutti1@gmail.com>
+Elad Keyshawn <elad.keyshawn@gmail.com>
+Matthieu Gautier <mgautier@kymeria.fr>
+Translatewiki comunity https://translatewiki.net/wiki/Translating:Kiwix
diff --git a/system/kiwix-tools-bin/docs/COPYING b/system/kiwix-tools-bin/docs/COPYING
new file mode 100644
index 0000000000..4432540474
--- /dev/null
+++ b/system/kiwix-tools-bin/docs/COPYING
@@ -0,0 +1,676 @@
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+ 
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+  
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
diff --git a/system/kiwix-tools-bin/docs/Changelog b/system/kiwix-tools-bin/docs/Changelog
new file mode 100644
index 0000000000..680756cee0
--- /dev/null
+++ b/system/kiwix-tools-bin/docs/Changelog
@@ -0,0 +1,367 @@
+kiwix-tools 3.7.0
+=================
+
+ * Fixed ZIM name vs Book name confusion in documentation (@veloman-yunkan #663)
+ * Fixes compilation dependencies to rely on appropriate version (@kelson42 #667)
+ * New --skipInvalid Kiwix Server command line option (@schuellerf @kelson42 #666)
+
+kiwix-tools 3.6.0
+=================
+
+ * Improved kiwix-serve man page (@iArchitSharma #626)
+ * C++17 compliant code base (@mgautierfr #636)
+ * Support of libkiwix13 (@mgautierfr #633)
+ * Additional docker images archs for armv6 and i386 (@rgaudin #622)
+
+kiwix-tools 3.5.0
+=================
+
+ * Do not use `--static` option when compiling on MacOs (@mgautierfr #615)
+ * Move main branch from `master` to `main`.
+ * Fix docker image (@jacroe #597)
+ * Various CI improvements (@kelson42)
+
+kiwix-serve
+-----------
+
+ * Add documentation about the kiwix-serve API (@veloman-yunkan #586)
+   https://kiwix-tools.readthedocs.io/en/latest/kiwix-serve.html#http-api
+
+kiwix-tools 3.4.0
+=================
+
+ * Remove last reference to kiwix-read tool (@legoktm #569)
+
+kiwix-serve
+-----------
+
+ * Fix broken indentation in usage (@kelson42 #560)
+ * Exit if wrong arguments are passed (@kelson42 #567)
+ * Do not allow multiple values for same option (@juuz0 #564)
+ * Fix default location of "rootLocation" (@rgaudin #571)
+ * [DOCKER] Change default port to 8080 (@neyder #581)
+ * [DOCKER] Simplify dockerfile (@rgaudin #582)
+
+kiwix-manage
+------------
+
+ * Fix man page (@kelson42 #576)
+
+kiwix-tools 3.3.0
+=================
+
+ * Remove kiwix-read tool (@veloman-yunkan #535)
+
+kiwix-serve
+-----------
+
+ * Add an option to limit the number of connections for a same IP (@juuz0 #534)
+ * Add an option to limit the number of zim in a multizim fulltext search (@mgautierfr #558)
+
+kiwix-search
+------------
+
+ * Remove usage of libkiwix's deprecated api (@veloman-yunkan #535)
+
+kiwix-manage
+------------
+
+ * Correctly return a value !0 if something went wrong (@mgautierfr #553)
+
+
+kiwix-tools 3.2.0
+=================
+
+ * Print the version of all dependencies (@kelson42 #516)
+ * Better Docker images (@kelson42 @rgaudin)
+ * Update Readme (@kelson42)
+ * Build debian packages on CI (@legoktm #394)
+ * Add man pages for kiwix-read and kiwix-search (@legoktm #392)
+ * Various fixes (@legoktm @hashworks @mgautierfr)
+
+
+kiwix-serve
+-----------
+
+ * Print the url on which a user can connect to on startup (@juuz0 #499 #522)
+ * Reload library on SIGHUP signal (@veloman-yunkan #497)
+ * Add a option `--monitorLibrary` to monitor and automically reload the library
+   (@veloman-yunkan #503)
+ * Correct handling of SIGTERM and SIGINT (@veloman-yunkan #488)
+ * Add `--customIndexTemplate` option (@manan #477)
+ * Add `--help` option (@kelson42 #511)
+
+
+kiwix-tools 3.1.2
+=================
+
+ * Use new threadsafe API of kiwix-lib to do suggestions search.
+
+kiwix-tools 3.1.1
+=================
+
+ * Fix compilation on Windows' CI
+
+kiwix-tools 3.1.0
+=================
+
+ * [SERVER] Add option to block external links
+
+kiwix-tools 3.0.3
+=================
+
+ * [MANAGER] Fix broken --version argument parsing
+
+kiwix-tools 3.0.2
+=================
+
+ * New option --version for all tools
+ * Remove benchmark.sh file.
+ * [DOCKER] Add ability to download a file at container start.
+ * [CI] Move to github actions instead of travis.
+ * [SERVER] Trust the given library by default.
+ * [SERVER] Add shortcut alias for option `--address` and `--nodatealias`
+
+kiwix-tools 3.0.1
+=================
+
+ * Fix --nodatealiases inverted logic regression
+
+kiwix-tools 3.0.0
+=================
+
+ * Move kiwix-serve implementation in kiwix-lib.
+
+kiwix-tools 2.1.0
+=================
+
+ * Fix few compilation errors.
+
+kiwix-serve
+-----------
+
+ * Use new api to filter the library.
+ * Mobile friendly top bar.
+ * Add notag parameter to be able to exclude tags from the zim search.
+
+
+kiwix-tools 2.0.0
+=================
+
+kiwix-manage
+-----------
+
+ * Better usage()
+ * Adding multiple files bug fix
+ * Remove download command.
+
+kiwix-serve
+-----------
+
+ * Better usage()
+ * Display properly welcome page on 3 columns
+ * New welcome page footer "Powered by Kiwix"
+
+kiwix-tools 1.2.1
+=================
+
+kiwix-serve
+-----------
+
+ * Always use POLL when avaible.
+
+kiwix-tools 1.2.0
+=================
+
+ * Remove rpath for installed binaries.
+
+kiwix-serve
+-----------
+
+ * New Dockerfile of kiwix-serve
+ * New --nodatealiases option
+ * Do not use POLL on windows
+
+kiwix-manage
+------------
+
+ * Do not show all books if book ids has been provided.
+ * Be able to add several zim files in the same time in a library.
+
+kiwix-tools 1.1.0
+=================
+
+kiwix-serve
+-----------
+
+ * Fix bug about handling of absolute url in old zim file.
+ * All the catalog to be searched by tags.
+
+kiwix-tools 1.0.0
+=================
+
+ * [CI] Use the new deps archive xz
+ * Move version 1.0.0. There is no need to stay in pre 1.0 version.
+
+kiwix-serve
+-----------
+
+ * Correctly implement redirection.
+   kiwix-serve now return a 302 http status code instead of resolving the
+   redirection internally and return the content.
+
+
+kiwix-tools 0.9.0
+=================
+
+ * Update README
+ * Update man pages
+ * Remove support of external indexes (manage, search, serve)
+ * Update build system as we don't use ctpp2 anymore
+ * Update to last kiwix-lib API.
+
+kiwix-manage
+------------
+
+ * Update usage.
+
+
+kiwix-tools 0.8.0
+=================
+
+kiwix-manage
+------------
+
+ * Be able to remove several books from the library in one command.
+
+kiwix-tools 0.7.0
+=================
+
+ * Adapt to kiwix-lib new API
+
+kiwix-serve
+-----------
+
+ * Dumps only valid books in the opdsfeed.
+ * Allow the opds feed to be filtered by lang and paginated.
+
+kiwix-manage
+------------
+
+ * Add a download command to download a remote book locally
+ * Book are referenced by bookId not index.
+ * No more indexType option as it is always XAPIAN.
+
+kiwix-tools 0.6.1
+=================
+
+kiwix-serve
+-----------
+
+ * Update README.
+ * Fix crash when `--library` flag is provided without value.
+ * Correctly handle mimetype of file without extension on 64bits.
+ * Minor fixes
+
+kiwix-tools 0.6.0
+=================
+
+ * remove kiwix-install tool.
+
+kiwix-serve
+-----------
+
+ * Improved taskbar #160
+ * Fix global page when using the option `--nosearchbar`
+ * Return 404 for missing resources
+ * Fix compilation for gcc 4.8.
+
+kiwix-manage
+------------
+
+ * Returns proper exit code (not always 0)
+
+
+kiwix-tools 0.5.0
+=================
+
+ * Build kiwix-tools setting the RPATH
+ * Compile without warning.
+
+
+kiwix-serve
+------------
+
+ * Serve metadata information using the "/meta" url.
+ * Serve an OPDS stream of all zim handled by kiwix-serve
+   All informations cannot be infer from the zim file itself,
+   you should use a library.xml to provide needed information (url, ...)
+ * Update kiwix-serve to use the new API of kiwix-lib
+
+kiwix-tools 0.4.0
+=================
+
+ * Use gcc-5 on travis.
+
+kiwix-serve
+-----------
+
+ * Accept zim file with `&` in the name
+ * Do not cache (on client side) global search (as it can depends on the zim
+   files handled)
+ * Fix HTTP byte range handling. (#91)
+ * Fix opening of relative path (#70)
+ * Add a small (and hidden) API to do geo search.
+ * Better request parsing. (#91)
+ * Better handling of invalid request (#116)
+ * Various bug fixes (#146, #150, #153, #165, #168, #165)
+
+kiwix-search
+------------
+
+ * Add an option `--suggestion` to do suggestion search with
+   kiwix-search.(#132)
+
+kiwix-tools 0.3.0
+=================
+
+ * Move to C++11
+
+kiwix-serve
+-----------
+
+ * Add a global taskbar in the welcome page to search in all zims (#49)
+ * Serve the taskbar as css file instead of including it in the html (#68):
+   * Better client caching
+   * The html encoding is now in the first 1024 bytes and firefox correctly
+     detect the encoding
+ * Make kiwix-server multi-threaded (#82)
+ * Correctly return 404 instead of crashing when request inexistant skin file
+   (#83)
+ * Correctly respond to bytes-range requests.(#84)
+ * Directly respond to first request for a url instead of refusing the first
+   connexion
+ * Add support to relative url location. (#86)
+ * Remove caching (on client side) for the welcome page. (#86)
+
+
+kiwix-tools 0.2.0
+=================
+
+ * Remove indexer tools
+
+kiwix-serve
+-----------
+
+ * Correctly fix the deflate data we send over http. (#15)
+ * Update in the taskbar (or topbar):
+    * Taskbar is responsive (github.com/kiwix/kiwix/issues/336)
+    * Force css rules for the taskbar (and not be impacted by content's css)
+ * Add `--nolibrarybutton` to hide the library button from the taskbar.
+ * Rewrite of the welcome page.
+
+
+kiwix-installer
+---------------
+
+ * Remove indexing functionnality
diff --git a/system/kiwix-tools-bin/docs/README.md b/system/kiwix-tools-bin/docs/README.md
new file mode 100644
index 0000000000..81457d8eba
--- /dev/null
+++ b/system/kiwix-tools-bin/docs/README.md
@@ -0,0 +1,153 @@
+Kiwix tools
+===========
+
+The Kiwix tools is a collection of [Kiwix](https://kiwix.org) related
+command line tools:
+* kiwix-manage: Manage XML based library of ZIM files
+* kiwix-search: Full text search in ZIM files
+* kiwix-serve: HTTP daemon serving ZIM files
+
+[![latest release](https://img.shields.io/github/v/tag/kiwix/kiwix-tools?label=latest%20release&sort=semver)](https://download.kiwix.org/release/kiwix-tools/)
+[![Repositories](https://img.shields.io/repology/repositories/kiwix-tools?label=repositories)](https://github.com/kiwix/kiwix-tools/wiki/Repology)
+[![Docker](https://ghcr-badge.deta.dev/kiwix/kiwix-tools/latest_tag?label=docker)](https://ghcr.io/kiwix/kiwix-tools)
+[![Docker](https://ghcr-badge.deta.dev/kiwix/kiwix-tools/latest_tag?label=docker%20(kiwix-serve))](https://ghcr.io/kiwix/kiwix-tools)
+[![Sandstorm](https://img.shields.io/badge/Sandstorm-kiwix-blue)](https://apps.sandstorm.io/app/5uh349d0kky2zp5whrh2znahn27gwha876xze3864n0fu9e5220h)
+[![Build Status](https://github.com/kiwix/kiwix-tools/workflows/CI/badge.svg?query=branch%3Amain)](https://github.com/kiwix/kiwix-tools/actions?query=branch%3Amain)
+[![Doc](https://readthedocs.org/projects/kiwix-tools/badge/?style=flat)](https://kiwix-tools.readthedocs.org/en/latest/?badge=latest)
+[![CodeFactor](https://www.codefactor.io/repository/github/kiwix/kiwix-tools/badge)](https://www.codefactor.io/repository/github/kiwix/kiwix-tools)
+[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+
+Disclaimer
+----------
+
+This document assumes you have a little knowledge about software
+compilation. If you experience difficulties with the dependencies or
+with the Kiwix tools compilation itself, we recommend to have a look
+to [kiwix-build](https://github.com/kiwix/kiwix-build).
+
+Preamble
+--------
+
+Although the Kiwix tools can be compiled/cross-compiled on/for many
+systems, the following documentation explains how to do it on POSIX
+ones. It is primarily thought for GNU/Linux systems and has been tested
+on recent releases of
+[Debian](https://debian.org)/[Ubuntu](https://ubuntu.com) and
+[Fedora](https://getfedora.org).
+
+Dependencies
+------------
+
+The Kiwix tools rely on a few third party software libraries. They are
+prerequisites to the Kiwix tools compilation. Therefore, following
+libraries need to be available:
+* [libkiwix](https://github.com/kiwix/libkiwix) (package `libkiwix` on Debian/Ubuntu)
+* [libzim](https://github.com/openzim/libzim) (package `libzim` on Debian/Ubuntu)
+
+These dependencies may or may not be packaged by your operating
+system. They may also be packaged but only in an older version. They
+may be also packaged but without providing a static version. The
+compilation script will tell you if one of them is missing or too old.
+In the worse case, you will have to download and compile bleeding edge
+version by hand.
+
+If you want to install these dependencies locally, then use the
+kiwix-tools directory as install prefix.
+
+If you want to compile Kiwix tools statically, the dependencies should
+be compiled statically (provide a `lib...a` library), for example by
+using `--enable-static` with `./configure`.
+
+Environment
+-------------
+
+The Kiwix tools build using [Meson](http://mesonbuild.com/) version
+0.43 or higher. Meson relies itself on Ninja, pkg-config and a few other
+compilation tools. Install them first:
+* [Meson](http://mesonbuild.com/)
+* [Ninja](https://ninja-build.org/)
+* [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/)
+
+These tools should be packaged if you use a cutting edge operating
+system. If not, have a look to the [Troubleshooting](#Troubleshooting)
+section.
+
+Compilation
+-----------
+
+Once all dependencies are installed, you can compile Kiwix tools with:
+```bash
+meson . build
+ninja -C build
+```
+
+By default, it will compile dynamic linked libraries. If you want
+statically linked libraries, you can add `-Dstatic-linkage=true`
+option to the Meson command.
+
+Depending of you system, `ninja` may be called `ninja-build`.
+
+Installation
+------------
+
+If you want to install the Kiwix tools, here we go:
+```bash
+ninja -C build install
+```
+
+You might need to run the command as `root` (or using `sudo`),
+depending on where you want to install the Kiwix tools. After the
+installation succeeded, you may need to run ldconfig (as `root`).
+
+Uninstallation
+------------
+
+If you want to uninstall the Kiwix tools:
+```bash
+ninja -C build uninstall
+```
+
+Like for the installation, you might need to run the command as `root`
+(or using `sudo`).
+
+Docker
+------
+
+An official Docker image of the Kiwix tools can be found on 
+[GHCR](https://ghcr.io/kiwix/kiwix-tools). A
+`kiwix-serve` dedicated Docker image [exists
+too](https://ghcr.io/kiwix/kiwix-serve).
+
+Troubleshooting
+---------------
+
+If you need to install Meson "manually":
+```bash
+virtualenv -p python3 ./ # Create virtualenv
+source bin/activate      # Activate the virtualenv
+pip3 install meson       # Install Meson
+hash -r                  # Refresh bash paths
+```
+
+If you need to install Ninja "manually":
+```bash
+git clone git://github.com/ninja-build/ninja.git
+cd ninja
+git checkout release
+./configure.py --bootstrap
+mkdir ../bin
+cp ninja ../bin
+cd ..
+```
+
+If the compilation still fails, you might need to get a more recent
+version of a dependency than the one packaged by your Linux
+distribution. Try then with a source tarball distributed by the
+problematic upstream project or even directly from the source code
+repository.
+
+License
+-------
+
+[GPLv3](https://www.gnu.org/licenses/gpl-3.0) or later, see
+[COPYING](COPYING) for more details.
diff --git a/system/kiwix-tools-bin/docs/man/kiwix-manage.1 b/system/kiwix-tools-bin/docs/man/kiwix-manage.1
new file mode 100644
index 0000000000..fe5d0420ba
--- /dev/null
+++ b/system/kiwix-tools-bin/docs/man/kiwix-manage.1
@@ -0,0 +1,69 @@
+.TH KIWIX-MANAGE 1 "21 May 2012"
+
+.SH NAME
+kiwix\-manage \- Kiwix Library Manager
+
+.SH SYNOPSIS
+.IX Header SYNOPSIS
+.TP
+\fBkiwix\-manage\fR LIBRARY_PATH \fBadd\fR ZIM_PATH ...
+.TP
+\fBkiwix\-manage\fR LIBRARY_PATH \fBshow\fR [ZIM_ID_1] [ZIM_ID_2] ...
+.TP
+\fBkiwix\-manage\fR LIBRARY_PATH \fBremove\fR ZIM_ID_1 [ZIM_ID_2] ...
+.TP
+\fBkiwix\-manage\fR --version
+.TP
+\fBkiwix\-manage\fR --help
+
+.SH DESCRIPTION
+.PP
+\fBkiwix\-manage\fP is a command line tool for manipulating a Kiwix XML library.
+.PP
+\fBkiwix\-manage\fP allows to manage the entries of the Kiwix
+library. The library file is a flat XML file listing ZIM files with
+all necessary information like id, favicon, date, creator,
+description, filepath, title, url, etc.
+
+.SH ACTIONS
+
+.TP
+\fBadd\fR
+Add \fBZIM_FILE\fP to \fBLIBRARY_FILE\fP. Create the library file if necessary.
+
+.TP
+\fBremove\fR
+Remove the given \fBZIM_ID\fR from \fBLIBRARY_FILE\fR. At least one \fBZIM_ID\fR should be specified.
+
+.TP
+\fBshow\fR
+Show given \fBZIM_ID\fP from \fBLIBRARY_FILE\fR. If no \fBZIM_ID\fP is given then all contents from \fBLIBRARY_FILE\fR are shown.
+
+.SH OPTIONS
+.TP
+Options to be used with the action \fBadd\fR:
+
+.TP
+\fB\-\-url=HTTP_URL\fR
+Set the ZIM online HTTP(S) URL
+
+.TP
+\fB\-\-zimPathToSave=OTHER_FS_PATH\fR
+Set an arbitrary ZIM filesystem path (instead of the ZIM_PATH)
+
+.TP
+Other options (to be used alone):
+
+.TP
+\fB\-\-help | \-h\fR
+Display the kiwix-manage help
+
+.TP
+\fB\-\-version | \-v\fR
+Display the version of kiwix-manage and all dependences
+
+.SH SEE ALSO
+kiwix\-serve(1)
+
+.SH AUTHORS
+Kiwix team <contact@kiwix.org>
diff --git a/system/kiwix-tools-bin/docs/man/kiwix-search.1 b/system/kiwix-tools-bin/docs/man/kiwix-search.1
new file mode 100644
index 0000000000..43b61cc46e
--- /dev/null
+++ b/system/kiwix-tools-bin/docs/man/kiwix-search.1
@@ -0,0 +1,21 @@
+.TH KIWIX-SEARCH "1" "July 2020" "kiwix-tools" "User Commands"
+.SH NAME
+kiwix-search \- find articles using a fulltext search pattern
+.SH SYNOPSIS
+\fBkiwix-search\fR [OPTIONS] ZIM PATTERN\fR
+.SH DESCRIPTION
+.TP
+ZIM
+ZIM file to search
+.TP
+PATTERN
+Words or parts of words to search for in the ZIM file
+.TP
+\fB\-s\fR, \fB\-\-suggestion\fR
+Suggest article titles based on the PATTERN instead of a fulltext search
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+print software version
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Give details about the search process
diff --git a/system/kiwix-tools-bin/docs/man/kiwix-serve.1 b/system/kiwix-tools-bin/docs/man/kiwix-serve.1
new file mode 100644
index 0000000000..69d86b462e
--- /dev/null
+++ b/system/kiwix-tools-bin/docs/man/kiwix-serve.1
@@ -0,0 +1,136 @@
+.TH KIWIX 1 "10 July 2023"
+
+.SH NAME
+kiwix-serve \- Kiwix HTTP Server
+
+.SH SYNOPSIS
+
+.B kiwix-serve --library [OPTIONS] LIBRARY_FILE_PATH
+.br
+.B kiwix-serve [OPTIONS] ZIM_FILE_PATH ...
+
+.SH DESCRIPTION
+The \fBkiwix-serve\fR command is used to run a stand-alone HTTP server for serving ZIM contents over the network.
+
+.SH ARGUMENTS
+.TP
+\fBLIBRARY_FILE_PATH\fR
+Path of an XML library file listing ZIM files to serve. To be used only with the --library option. Multiple library files can be provided as a semicolon (;) separated list.
+
+.TP
+\fBZIM_FILE_PATH ...\fR
+ZIM file path(s). Multiple arguments are allowed.
+
+.SH OPTIONS
+.TP
+\fB--library\fR
+By default, kiwix-serve expects a list of ZIM files as command line arguments. Providing the --library option tells kiwix-serve that the command line argument is rather a library XML file.
+
+.TP
+\fB-i ADDR, --address=ADDR\fR
+Listen only on this IP address. By default, the server listens on all available IP addresses.
+
+.TP
+\fB-p PORT, --port=PORT\fR
+TCP port on which to listen for HTTP requests (default: 80).
+
+.TP
+\fB-r ROOT, --urlRootLocation=ROOT\fR
+URL prefix on which the content should be made available (default: empty).
+
+.TP
+\fB-d, --daemon\fR
+Detach the HTTP server daemon from the main process.
+
+.TP
+\fB-a PID, --attachToProcess=PID\fR
+Exit when the process with id PID stops running.
+
+.TP
+\fB-M, --monitorLibrary\fR
+Monitor the XML library file and reload it automatically when it changes.
+
+Library reloading can be forced anytime by sending a SIGHUP signal to the
+\*(lqkiwix-serve\*(rq process (this works regardless of the presence of the
+\*(lq--monitorLibrary\*(rq/\*(lq-M\*(rq option).
+
+.TP
+\fB-m, --nolibrarybutton\fR
+Disable the library home button in the ZIM viewer toolbar.
+
+.TP
+\fB-n, --nosearchbar\fR
+Disable the search box in the ZIM viewer toolbar.
+
+.TP
+\fB-b, --blockexternal\fR
+Prevent users from directly navigating to external resources via links in ZIM content.
+
+.TP
+\fB-t N, --threads=N\fR
+Number of threads to run in parallel (default: 4).
+
+.TP
+\fB-s N, --searchLimit=N\fR
+Maximum number of ZIM files in a fulltext multizim search (default: No limit).
+
+.TP
+\fB-z, --nodatealiases\fR
+Create URL aliases for each content by removing the date embedded in the file name.
+
+The expected format of the date in the filename is \*(lq_YYYY-MM\*(rq. For example, a ZIM file named \*(lqwikipedia_en_all_2020-08.zim\*(rq will be accessible both as \*(lqwikipedia_en_all_2020-08\*(rq and \*(lqwikipedia_en_all\*(rq.
+
+.TP
+\fB-c PATH, --customIndex=PATH\fR
+Override the welcome page with a custom HTML file.
+
+.TP
+\fB-L N, --ipConnectionLimit=N\fR
+Max number of (concurrent) connections per IP (default: infinite, recommended: >= 6).
+
+.TP
+\fB-k, --skipInvalid\fR
+Startup even when ZIM files are invalid (those will be skipped)
+
+.TP
+\fB-v, --verbose\fR
+Print debug log to STDOUT.
+
+.TP
+\fB-V, --version\fR
+Print the software version.
+
+.TP
+\fB-h, --help\fR
+Print a help message.
+
+.SH EXAMPLES
+Serve a single ZIM file:
+.sp
+.nf
+.B kiwix-serve myzim.zim
+.fi
+
+Serve multiple ZIM files:
+.sp
+.nf
+.B kiwix-serve zim1.zim zim2.zim zim3.zim
+.fi
+
+Serve ZIM files from a library:
+.sp
+.nf
+.B kiwix-serve --library library.xml
+.fi
+
+.SH DOCUMENTATION
+Online documentation: https://kiwix-tools.readthedocs.io/en/latest/kiwix-serve.html
+.br
+Source code: https://github.com/kiwix/kiwix-tools
+.br
+More info: https://wiki.kiwix.org/wiki/Kiwix-serve
+
+.SH AUTHORS
+Emmanuel Engelhart <kelson@kiwix.org>
+.br
+Vasudev Kamath <kamathvasudev@gmail.com>
diff --git a/system/kiwix-tools-bin/kiwix-tools-bin.SlackBuild b/system/kiwix-tools-bin/kiwix-tools-bin.SlackBuild
new file mode 100644
index 0000000000..4e9e4115be
--- /dev/null
+++ b/system/kiwix-tools-bin/kiwix-tools-bin.SlackBuild
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+# Slackware build script for kiwix-tools-bin
+
+# Copyright 2024 G. Galdini <jake@dioniso.com.br> Brazil 
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=kiwix-tools-bin
+VERSION=${VERSION:-3.7.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+case "${ARCH:-$(uname -m)}" in
+ i?86) ARCH=i586 ;;
+ aarch64) ARCH=aarch64 ;;
+ x86_64) ARCH=x86_64 ;;
+ *) echo 'This script not support your architecture.' ; exit 1 ;;
+esac
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# Binaries already stripped
+PBIN=${PRGNAM%-bin}_linux-${ARCH}-${VERSION}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PBIN
+tar xvf $CWD/$PBIN.tar.gz
+cd $PBIN
+
+mkdir -p $PKG/usr/{bin,man/man1}
+install -m0755 -oroot -groot * $PKG/usr/bin
+install -m0644 -oroot -groot $CWD/docs/man/*.? $PKG/usr/man/man1
+
+gzip -9 $PKG/usr/man/man?/*.?
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+install -m0644 -oroot -groot $CWD/docs/{README.md,AUTHORS,COPYING,Changelog} \
+ $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/kiwix-tools-bin/kiwix-tools-bin.info b/system/kiwix-tools-bin/kiwix-tools-bin.info
new file mode 100644
index 0000000000..2a985ed122
--- /dev/null
+++ b/system/kiwix-tools-bin/kiwix-tools-bin.info
@@ -0,0 +1,10 @@
+PRGNAM="kiwix-tools-bin"
+VERSION="3.7.0"
+HOMEPAGE="https://kiwix.org"
+DOWNLOAD="https://download.kiwix.org/release/kiwix-tools/kiwix-tools_linux-i586-3.7.0.tar.gz"
+MD5SUM="7c8fc641b35f10dddeccea2703aea483"
+DOWNLOAD_x86_64="https://download.kiwix.org/release/kiwix-tools/kiwix-tools_linux-x86_64-3.7.0.tar.gz"
+MD5SUM_x86_64="1229661b3aca871070c782544063c7f6"
+REQUIRES=""
+MAINTAINER="G. Galdini"
+EMAIL="jake@dioniso.com.br"
diff --git a/system/kiwix-tools-bin/slack-desc b/system/kiwix-tools-bin/slack-desc
new file mode 100644
index 0000000000..17b9651bb4
--- /dev/null
+++ b/system/kiwix-tools-bin/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+kiwix-tools-bin: kiwix-tools-bin (offline access for Wikipedia)
+kiwix-tools-bin:
+kiwix-tools-bin: Kiwix enables you to have the whole Wikipedia at hand wherever you
+kiwix-tools-bin: go! On a boat, in the middle of nowhere or in Jail, Kiwix gives you
+kiwix-tools-bin: access to the whole human knowledge. You don't need Internet,
+kiwix-tools-bin: everything is stored on your computer, USB flash drive or DVD!
+kiwix-tools-bin:
+kiwix-tools-bin: Homepage: https://kiwix.org
+kiwix-tools-bin:
+kiwix-tools-bin:
+kiwix-tools-bin:
diff --git a/system/klish/klish.SlackBuild b/system/klish/klish.SlackBuild
index d3939a9f9c..ac86fe2166 100644
--- a/system/klish/klish.SlackBuild
+++ b/system/klish/klish.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for klish
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=klish
 VERSION=${VERSION:-2.1.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -105,8 +115,10 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/kmscon/README.Slackware b/system/kmscon/README.Slackware
index a3e71f6d80..e8a97402a9 100644
--- a/system/kmscon/README.Slackware
+++ b/system/kmscon/README.Slackware
@@ -5,7 +5,7 @@ As shipped, kmscon only works for root. If you want to be able to run
 it as a normal user, you could make it setuid root (not recommended). A
 better solution:
 
-setcap cap_sys_tty_config,cap_sys_admin=ep
+setcap cap_sys_tty_config,cap_sys_admin=ep /usr/bin/kmscon
 
 See capabilities(7) and http://www.slackbuilds.org/caps/ for more info
 on capabilities.
diff --git a/system/kmscon/git2tarxz.sh b/system/kmscon/git2tarxz.sh
new file mode 100644
index 0000000000..1b26868216
--- /dev/null
+++ b/system/kmscon/git2tarxz.sh
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# This git2tarxz has special case code for kmscon.
+
+# Create source tarball from git repo, with generated version number.
+
+# Takes one optional argument, which is the commit or tag to create a
+# tarball of. With no arg, HEAD is used.
+
+# Version number example: 0.0.1+20200227_ad7ec17
+
+# Notes:
+
+# Do not use this if you're packaging a release.
+
+# This script doesn't need to be run as root. It does need to be able
+# to write to the current directory it's run from.
+
+# Running this script twice for the same commit will NOT give identical
+# tarballs, even if the contents are identical. This is because tar
+# includes the current time in a newly-created tarball (plus there may
+# be other git-related reasons).
+
+# Once you've generated a tarball, you'll still need a place to host it.
+# Ask on the mailing list, if you don't have your own web server to
+# play with.
+
+## Config:
+# final tarball and slackbuild PRGNAM:
+PRGNAM=kmscon
+
+# For github projects, you can use this unmodified:
+CLONE_URL=git://people.freedesktop.org/~dvdhrm/kmscon
+
+## End of config.
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+# special case here: upstream's tags are "kmscon-<version>", not
+# just <version>.
+VERTAG=$( git tag -l | tail -1 | cut -d- -f2 )
+
+VERSION=${VERTAG}+${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=\"$VERSION\""
+echo "MD5SUM=\"$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )\""
diff --git a/system/kmscon/kmscon.SlackBuild b/system/kmscon/kmscon.SlackBuild
index e766a633fa..caa3e0c555 100644
--- a/system/kmscon/kmscon.SlackBuild
+++ b/system/kmscon/kmscon.SlackBuild
@@ -1,15 +1,29 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for kmscon
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230722 bkw: switch to Aetf's fork, which looks actively
+# maintained. Thanks to lockywolf for finding it. Also, include
+# libtsm here instead of as a separate build: it's been on SBo for ~9
+# years and nothing but this ever depended on it.
+
+# 20210825 bkw: update to the last git commit, post v8 release. It's from
+# 2014, so I doubt there will be more version updates.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=kmscon
-VERSION=${VERSION:-8}
+VERSION=${VERSION:-9.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+LIBNAM=libtsm
+LIBVER=${LIBVER:-4.0.2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +33,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -40,48 +58,70 @@ fi
 
 set -e
 
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
+TOPDIR=$TMP/$PRGNAM-build
+rm -rf $PKG $TOPDIR
+mkdir -p $TOPDIR $PKG $OUTPUT
+cd $TOPDIR
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
+tar xvf $CWD/$LIBNAM-$LIBVER.tar.gz
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-SLKCFLAGS="$SLKCFLAGS -DSIGUNUSED=SIGSYS"
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --disable-static \
-  --enable-shared \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+LIBDOC=$PKGDOC/$LIBNAM-$LIBVER
+mkdir -p $LIBDOC
+
+# first, the library:
+cd $TOPDIR/$LIBNAM-$LIBVER
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
+cp -a COPYING LICENSE_htable NEWS README* $LIBDOC
+
+export PKG_CONFIG_PATH=$PKG/usr/lib$LIBDIRSUFFIX/pkgconfig:$PKG_CONFIG_PATH
+
+# now, build the app, using the lib we just built.
+cd $TOPDIR/$PRGNAM-$VERSION
+
+# meson is a moving target. this patch doesn't entirely fix things, we also
+# have to manually set some LDFLAGS and CFLAGS, below.
+patch -p1 < $CWD/meson-compat.diff
+
+mkdir build
+cd build
+  LDFLAGS="-L$PKG/usr/lib$LIBDIRSUFFIX -ldl" \
+  CFLAGS="-I$PKG/usr/include $SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
 gzip $PKG/usr/man/man1/$PRGNAM.1
-
 mkdir -p $PKG/etc/$PRGNAM
 cat $CWD/$PRGNAM.conf > $PKG/etc/$PRGNAM/$PRGNAM.conf.new
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a COPYING NEWS README* docs/*.txt $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/kmscon/kmscon.info b/system/kmscon/kmscon.info
index ffeac16026..895effecbb 100644
--- a/system/kmscon/kmscon.info
+++ b/system/kmscon/kmscon.info
@@ -1,10 +1,12 @@
 PRGNAM="kmscon"
-VERSION="8"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/kmscon/"
-DOWNLOAD="http://www.freedesktop.org/software/kmscon/releases/kmscon-8.tar.xz"
-MD5SUM="90d39c4ef53a11c53f27be4a7e9acee4"
+VERSION="9.0.0"
+HOMEPAGE="https://github.com/Aetf/kmscon"
+DOWNLOAD="https://github.com/Aetf/kmscon/releases/download/v9.0.0/kmscon-9.0.0.tar.xz \
+          https://github.com/Aetf/libtsm/archive/v4.0.2/libtsm-4.0.2.tar.gz"
+MD5SUM="1095a675c17d6adc6aa1537aff72c642 \
+        bcf1bafa3798bced0e9bd16b4afdf256"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libtsm"
+REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/kmscon/meson-compat.diff b/system/kmscon/meson-compat.diff
new file mode 100644
index 0000000000..6e5c693194
--- /dev/null
+++ b/system/kmscon/meson-compat.diff
@@ -0,0 +1,32 @@
+diff -Naur kmscon-9.0.0/meson.build kmscon-9.0.0.patched/meson.build
+--- kmscon-9.0.0/meson.build	2022-06-15 03:48:52.000000000 -0400
++++ kmscon-9.0.0.patched/meson.build	2023-07-22 03:32:29.965571375 -0400
+@@ -7,7 +7,7 @@
+   license: 'MIT',
+   # meson 0.58: f-string
+   # meson 0.62: dependency libdl
+-  meson_version: '>=0.62.0',
++  meson_version: '>=0.59.4',
+   default_options: [
+     'warning_level=1',
+     'werror=true',
+@@ -48,7 +48,6 @@
+ libtsm_deps = dependency('libtsm', version: '>=4.0.0')
+ libudev_deps = dependency('libudev', version: '>=172')
+ libdrm_deps = dependency('libdrm')
+-dl_deps = dependency('dl')
+ threads_deps = dependency('threads')
+ 
+ python = find_program('python3')
+diff -Naur kmscon-9.0.0/src/meson.build kmscon-9.0.0.patched/src/meson.build
+--- kmscon-9.0.0/src/meson.build	2022-06-15 03:48:52.000000000 -0400
++++ kmscon-9.0.0.patched/src/meson.build	2023-07-22 03:33:42.300564567 -0400
+@@ -257,7 +257,7 @@
+   kmscon_srcs += 'kmscon_terminal.c'
+ endif
+ kmscon = executable('kmscon', kmscon_srcs,
+-  dependencies: [xkbcommon_deps, libtsm_deps, threads_deps, dl_deps, conf_deps, shl_deps, eloop_deps, uterm_deps],
++  dependencies: [xkbcommon_deps, libtsm_deps, threads_deps, conf_deps, shl_deps, eloop_deps, uterm_deps],
+   export_dynamic: true,
+   install: true,
+   install_dir: libexecdir,
diff --git a/system/komparator4/README b/system/komparator4/README
deleted file mode 100644
index c2dfb67457..0000000000
--- a/system/komparator4/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Komparator4 is a KDE4 port of Komparator.
-
-Komparator is an application that searches and synchronizes two
-directories. It discovers duplicate, newer or missing files and
-empty folders. It works on local and network / kioslave protocol
-folders (like smb:/, ftp://, media:/).
diff --git a/system/komparator4/komparator4.SlackBuild b/system/komparator4/komparator4.SlackBuild
deleted file mode 100644
index 560868f2ce..0000000000
--- a/system/komparator4/komparator4.SlackBuild
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for komparator4
-# Written by Michael Filz <the_emmel@gmx.net>
-
-# Modified by Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version, with the following exception:
-# the text of the GPL license may be omitted..
-
-# This program is distributed in the hope that it will be useful, but
-# without any warranty; without even the implied warranty of
-# merchantability or fitness for a particular purpose. Compiling,
-# interpreting, executing or merely reading the text of the program
-# may result in lapses of consciousness and/or very being, up to and
-# including the end of all existence and the Universe as we know it.
-# See the GNU General Public License for more details.
-
-# You may have received a copy of the GNU General Public License
-# along with this program (most likely, a file named COPYING).  If
-# not, see <http://www.gnu.org/licenses/>.
-
-
-PRGNAM=komparator4
-VERSION=${VERSION:-1.0}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-SRCPREFIX=116039
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCPREFIX-$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
-cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING INSTALL TODO README ChangeLog \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh  > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/komparator4/komparator4.info b/system/komparator4/komparator4.info
deleted file mode 100644
index 56de2cece7..0000000000
--- a/system/komparator4/komparator4.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="komparator4"
-VERSION="1.0"
-HOMEPAGE="https://www.kde-look.org/p/1127680"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/komparator4/116039-komparator4-1.0.tar.bz2"
-MD5SUM="d78648dfd45dfec0ec8eb161da98ea73"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Jeremy Hansen"
-EMAIL="jebrhansen+SBo@gmail.com"
diff --git a/system/komparator4/slack-desc b/system/komparator4/slack-desc
deleted file mode 100644
index d77c414cdc..0000000000
--- a/system/komparator4/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-           |-----handy-ruler------------------------------------------------------|
-komparator4: komparator4 (compare directories in GUI)
-komparator4:
-komparator4: Komparator is an application that searches and synchronizes two
-komparator4: directories. It discovers duplicate, newer or missing files and empty
-komparator4: folders.
-komparator4: It works on local and network / kioslave protocol folders (like smb:/,
-komparator4: ftp://, media:/).
-komparator4:
-komparator4: It can be found on its project page at
-komparator4: https://www.kde-look.org/p/1127680
-komparator4:
diff --git a/system/krusader/README b/system/krusader/README
deleted file mode 100644
index ebf9e2a48f..0000000000
--- a/system/krusader/README
+++ /dev/null
@@ -1,13 +0,0 @@
-Krusader is an advanced twin panel (commander style) file manager for KDE
-and other desktops in the *nix world, similar to Midnight or Total Commander.
-It provides all the file management features you could possibly want.
-
-Optional run-time dependencies are (available from SlackBuilds.org):
-- krename,
-- p7zip,
-- dpkg,
-- rar,
-- unace,
-- arj,
-- unrar,
-- md5deep.
diff --git a/system/krusader/krusader.SlackBuild b/system/krusader/krusader.SlackBuild
deleted file mode 100644
index 2306895f6a..0000000000
--- a/system/krusader/krusader.SlackBuild
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for krusader
-
-# Copyright 2006,2007,2008,2009,2010  Robby Workman, Northport, Alabama, USA
-# Copyright 2010 Grigorios Bouzakis <grbzks@xsmail.com>
-# Copyright 2012 Bill Kirkpatrick <bkirkp@gmail.com>
-# Copyright 2017 Andrzej Telszewski, Banie
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=krusader
-VERSION=${VERSION:-git_20150309_13fa966}
-SRCVER=${SRCVER:-13fa9666bec443d2f8a49e35c86ce62859fb4ee5}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
-cd $PRGNAM-$SRCVER
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DCMAKE_BUILD_TYPE=Release \
-    ..
-  make
-  make install DESTDIR=$PKG
-cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING CREDITS ChangeLog FAQ INSTALL README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/krusader/krusader.info b/system/krusader/krusader.info
deleted file mode 100644
index 9049c62932..0000000000
--- a/system/krusader/krusader.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="krusader"
-VERSION="git_20150309_13fa966"
-HOMEPAGE="https://krusader.org/"
-DOWNLOAD="https://github.com/KDE/krusader/archive/13fa966/krusader-13fa9666bec443d2f8a49e35c86ce62859fb4ee5.tar.gz"
-MD5SUM="0a444772e0bddbb0602313985b295120"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Andrzej Telszewski"
-EMAIL="atelszewski@gmail.com"
diff --git a/system/krusader/slack-desc b/system/krusader/slack-desc
deleted file mode 100644
index 4b39778c09..0000000000
--- a/system/krusader/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-        |-----handy-ruler------------------------------------------------------|
-krusader: krusader (Krusader File Manager)
-krusader:
-krusader: krusader is an advanced twin panel (commander style) file manager
-krusader: for KDE and other desktops in the *nix world, similar to Midnight
-krusader: or Total Commander. It provides all the file management features
-krusader: you could possibly want.
-krusader:
-krusader: Homepage: https://krusader.org/
-krusader:
-krusader:
-krusader:
diff --git a/system/ksar/README b/system/ksar/README
new file mode 100644
index 0000000000..64752065ab
--- /dev/null
+++ b/system/ksar/README
@@ -0,0 +1,16 @@
+kSAR (GitHub) is a continuation of kSAR, a GUI for sysstat and acct
+
+It plots the graphs that are collected by sa/sar utilities from the
+sysstat and acct packages. This data collection is usually done
+with cron, and should be configured separately.
+
+I particular, the SlackBuild's author has the following in his
+crontab:
+
+```
+* * * * * /usr/lib64/sa/sa1 10 6 -S DISK
+0 0 * * * /usr/lib64/sa/sa1 --rotate
+```
+
+You need Java 8 or later to run this package. The slackbuild 
+author uses zulu-openjdk11, but other versions might work.
diff --git a/system/ksar/ksar.SlackBuild b/system/ksar/ksar.SlackBuild
new file mode 100644
index 0000000000..ab63526cdf
--- /dev/null
+++ b/system/ksar/ksar.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+# Slackware build script for ksar
+
+# © Lockywolf, 2021
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ksar
+TARNAM=ksar
+VERSION=${VERSION:-5.2.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
+mkdir -p $PKG/usr/bin
+
+cd $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
+
+cat $CWD/$TARNAM-$VERSION.jar > ./$PRGNAM-$VERSION.jar
+printf "#!/usr/bin/env bash \n java -jar /usr/lib%s/%s/%s.jar" "$LIBDIRSUFFIX" "$PRGNAM" "$PRGNAM-$VERSION" > $PKG/usr/bin/$PRGNAM
+
+cd $PKG
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+chmod +x $PKG/usr/bin/$PRGNAM
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ksar/ksar.info b/system/ksar/ksar.info
new file mode 100644
index 0000000000..166f4223ac
--- /dev/null
+++ b/system/ksar/ksar.info
@@ -0,0 +1,10 @@
+PRGNAM="ksar"
+VERSION="5.2.4"
+HOMEPAGE="https://github.com/vlsi/ksar/"
+DOWNLOAD="https://github.com/vlsi/ksar/releases/download/v5.2.4/ksar-5.2.4.jar"
+MD5SUM="b24c00e264aeffd8926406c591f6904e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="zulu-openjdk11"
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo-kSAR_2021-12-02@lockywolf.net"
diff --git a/system/ksar/slack-desc b/system/ksar/slack-desc
new file mode 100644
index 0000000000..ca0f133415
--- /dev/null
+++ b/system/ksar/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+ksar: ksar (Java-based GUI for sar/acct/sysstat)
+ksar:
+ksar: ksar lets you plot sar/acct/sysstat data in a GUI.
+ksar:
+ksar:
+ksar:
+ksar:
+ksar:
+ksar:
+ksar: Homepage: https://github.com/vlsi/ksar/
+ksar:
diff --git a/system/ksh-openbsd/README b/system/ksh-openbsd/README
index ced571d1a8..934bcaff89 100644
--- a/system/ksh-openbsd/README
+++ b/system/ksh-openbsd/README
@@ -1,11 +1,12 @@
-This package is a patched version of the OpenBSD ksh ported to Linux, which is
-based on the original PD-ksh, but heavily modified and maintained by OpenBSD
-developers.
-"Patched" means it contains modifications outside of the OpenBSD tree (and
-besides the Linux port bits).
+This package is a patched version of the OpenBSD ksh ported to Linux,
+which is based on the original PD-ksh, but heavily modified and
+maintained by OpenBSD developers.
 
-See the Changelog.ksh-openbsd and the homepage for more information about the
-changes: https://github.com/levaidaniel/ksh-openbsd
+"Patched" means it contains modifications outside of the OpenBSD tree
+(and besides the Linux port bits).
 
-There's a build option (PDKSH_BINNAME) to change the binary and manual names
-during build.
+See the Changelog.ksh-openbsd and the homepage for more information
+about the changes: https://github.com/levaidaniel/ksh-openbsd
+
+There's a build option (PDKSH_BINNAME) to change the binary and manual
+names during build.
diff --git a/system/ksh-openbsd/ksh-openbsd.SlackBuild b/system/ksh-openbsd/ksh-openbsd.SlackBuild
index f1865aa260..de6c73ff57 100644
--- a/system/ksh-openbsd/ksh-openbsd.SlackBuild
+++ b/system/ksh-openbsd/ksh-openbsd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright (c) 2010-2019 LEVAI Daniel
 # All rights reserved.
@@ -27,10 +27,13 @@
 
 # Build script for the Linux port of OpenBSD's ksh
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ksh-openbsd
 VERSION=${VERSION:-20190804}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -40,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,24 +72,30 @@ rm -Rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -Rf $PRGNAM-$VERSION
-[ -e $CWD/$VERSION.tar.gz ] && tar xvf $CWD/$VERSION.tar.gz
-[ -e $CWD/$PRGNAM-$VERSION.tar.gz ] && tar xf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS $(getconf LFS_CFLAGS)" make
-make check
+
+# 20230810 bkw: tired of this thing hanging when run in the background
+# as part of a long queue.
+case "$(ps -o stat= -p $$)" in
+  *+*) make check ;;   # running in foreground
+  *)   echo '*** Not running "make check" because we are in the background.' ;;
+esac
+
 make install DESTDIR=$PKG
 
 if [ -n "${PDKSH_BINNAME}" ];then
-	mv $PKG/bin/pdksh $PKG/bin/"${PDKSH_BINNAME}"
-	mv $PKG/usr/man/man1/pdksh.1 $PKG/usr/man/man1/"${PDKSH_BINNAME}".1
-	mv $PKG/usr/man/man1/pdksh-sh.1 $PKG/usr/man/man1/"${PDKSH_BINNAME}"-sh.1
+  mv $PKG/bin/pdksh $PKG/bin/"${PDKSH_BINNAME}"
+  mv $PKG/usr/man/man1/pdksh.1 $PKG/usr/man/man1/"${PDKSH_BINNAME}".1
+  mv $PKG/usr/man/man1/pdksh-sh.1 $PKG/usr/man/man1/"${PDKSH_BINNAME}"-sh.1
 fi
 BINNAME=${PDKSH_BINNAME:-pdksh}
 
@@ -102,4 +115,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ksh-openbsd/ksh-openbsd.info b/system/ksh-openbsd/ksh-openbsd.info
index 0430f276b5..186e32bce1 100644
--- a/system/ksh-openbsd/ksh-openbsd.info
+++ b/system/ksh-openbsd/ksh-openbsd.info
@@ -1,7 +1,7 @@
 PRGNAM="ksh-openbsd"
 VERSION="20190804"
 HOMEPAGE="https://github.com/levaidaniel/ksh-openbsd"
-DOWNLOAD="https://github.com/levaidaniel/ksh-openbsd/archive/20190804.tar.gz"
+DOWNLOAD="https://github.com/levaidaniel/ksh-openbsd/archive/20190804/ksh-openbsd-20190804.tar.gz"
 MD5SUM="e9f4502ecfa0bc61618ecfd819d1b9f0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/ktls-utils/README b/system/ktls-utils/README
new file mode 100644
index 0000000000..f22db03905
--- /dev/null
+++ b/system/ktls-utils/README
@@ -0,0 +1,11 @@
+ktls-utils
+
+In-kernel TLS consumers need a mechanism to perform TLS handshakes on
+a connected socket to negotiate TLS session parameters that can then
+be programmed into the kernel's TLS record protocol engine.
+
+This package of software provides a TLS handshake user agent that
+listens for kernel requests and then materializes a user space socket
+endpoint on which to perform these handshakes. The resulting
+negotiated session parameters are passed back to the kernel via
+standard kTLS socket options.
diff --git a/system/ktls-utils/ktls-utils.SlackBuild b/system/ktls-utils/ktls-utils.SlackBuild
new file mode 100644
index 0000000000..6af524df1e
--- /dev/null
+++ b/system/ktls-utils/ktls-utils.SlackBuild
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+# Slackware build script for ktls-utils
+
+# Copyright 2024, Lockywolf
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ktls-utils
+VERSION=${VERSION:-0.10}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
+
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+AUTHORS          COPYING NEWS    README.md   \
+CONTRIBUTING.md  ChangeLog  LICENSE.txt  README  SECURITY.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ktls-utils/ktls-utils.info b/system/ktls-utils/ktls-utils.info
new file mode 100644
index 0000000000..d1490c99da
--- /dev/null
+++ b/system/ktls-utils/ktls-utils.info
@@ -0,0 +1,10 @@
+PRGNAM="ktls-utils"
+VERSION="0.10"
+HOMEPAGE="https://github.com/oracle/ktls-utils/"
+DOWNLOAD="https://github.com/oracle/ktls-utils/releases/download/ktls-utils-0.10/ktls-utils-0.10.tar.gz"
+MD5SUM="ca2248d750af81d51b8375f52e89a982"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.ktls-utils_2024-03-22@lockywolf.net"
diff --git a/system/ktls-utils/slack-desc b/system/ktls-utils/slack-desc
new file mode 100644
index 0000000000..38996ad629
--- /dev/null
+++ b/system/ktls-utils/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+ktls-utils: ktls-utils (TLS handshake utilities for in-kernel TLS consumers)
+ktls-utils:
+ktls-utils: In-kernel TLS consumers need a mechanism to perform TLS handshakes on
+ktls-utils: a connected socket to negotiate TLS session parameters that can then
+ktls-utils: be programmed into the kernel's TLS record protocol engine. This
+ktls-utils: package of software provides a TLS handshake user agent that listens
+ktls-utils: for kernel requests and then materializes a user space socket
+ktls-utils: endpoint on which to perform these handshakes. The resulting
+ktls-utils: negotiated session parameters are passed back to the kernel via
+ktls-utils: standard kTLS socket options.
+ktls-utils:
diff --git a/system/ktls-utils/url b/system/ktls-utils/url
new file mode 100644
index 0000000000..25846cb24f
--- /dev/null
+++ b/system/ktls-utils/url
@@ -0,0 +1 @@
+https://github.com/oracle/ktls-utils
diff --git a/system/ktsuss/ktsuss.SlackBuild b/system/ktsuss/ktsuss.SlackBuild
index ddd170f8ad..70ad2df91c 100644
--- a/system/ktsuss/ktsuss.SlackBuild
+++ b/system/ktsuss/ktsuss.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ktsuss
 
 # Copyright 2008 Murat D. Kadirov <banderols@gmail.com>
 # Copyright 2009,2010  Robby Workman  Northport, AL, USA
-# Copyright 2012, 2015-2016  Petar Petrov slackalaxy@gmail.com
+# Copyright 2012, 2015-2021  Petar Petrov slackalaxy@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,27 +24,37 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20240331 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - get rid of generic GNU INSTALL in doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ktsuss
 VERSION=${VERSION:-20140711} # Use date as version
 COMMIT=${COMMIT:-99ea19743328a8e72b8b966635e44f1e816cf294}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -68,9 +78,9 @@ cd $PRGNAM-$COMMIT
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
 ./autogen.sh
 
@@ -92,11 +102,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changelog COPYING CREDITS INSTALL LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changelog COPYING CREDITS LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ktsuss/ktsuss.info b/system/ktsuss/ktsuss.info
index 6ba9e41479..75944f40f1 100644
--- a/system/ktsuss/ktsuss.info
+++ b/system/ktsuss/ktsuss.info
@@ -1,7 +1,7 @@
 PRGNAM="ktsuss"
 VERSION="20140711"
 HOMEPAGE="https://github.com/nomius/ktsuss"
-DOWNLOAD="https://github.com/nomius/ktsuss/archive/99ea19743328a8e72b8b966635e44f1e816cf294.tar.gz"
+DOWNLOAD="https://github.com/nomius/ktsuss/archive/99ea19743328a8e72b8b966635e44f1e816cf294/ktsuss-99ea19743328a8e72b8b966635e44f1e816cf294.tar.gz"
 MD5SUM="edd64e80af42c8fe8207d6dc37a1fab2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/kvantum-qt5/README b/system/kvantum-qt5/README
new file mode 100644
index 0000000000..63983699f4
--- /dev/null
+++ b/system/kvantum-qt5/README
@@ -0,0 +1,4 @@
+Kvantum is an SVG-based theme engine for Qt, tuned to KDE and LXQt,
+with an emphasis on elegance, usability and practicality.
+
+By !red
diff --git a/system/kvantum-qt5/kvantum-qt5.SlackBuild b/system/kvantum-qt5/kvantum-qt5.SlackBuild
new file mode 100644
index 0000000000..2affd9854c
--- /dev/null
+++ b/system/kvantum-qt5/kvantum-qt5.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/bash
+
+# Slackware build script for Kvantum
+
+# Copyright 2019-2022 Pouria Rezaei <Pouria.rz@outlook.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=kvantum-qt5
+VERSION=${VERSION:-1.0.2}
+SRCNAM=Kvantum
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar -xvf $CWD/$SRCNAM-$VERSION.tar.xz
+mv $SRCNAM-$VERSION/$SRCNAM $PRGNAM-$VERSION
+
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+cmake .. \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+
+make
+make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog INSTALL.md README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/kvantum-qt5/kvantum-qt5.info b/system/kvantum-qt5/kvantum-qt5.info
new file mode 100644
index 0000000000..335fe29396
--- /dev/null
+++ b/system/kvantum-qt5/kvantum-qt5.info
@@ -0,0 +1,10 @@
+PRGNAM="kvantum-qt5"
+VERSION="1.0.2"
+HOMEPAGE="https://github.com/tsujan/Kvantum"
+DOWNLOAD="https://github.com/tsujan/Kvantum/releases/download/V1.0.2/Kvantum-1.0.2.tar.xz"
+MD5SUM="0c9f68b350ab9d2814ab93f48305399c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Pouria Rezaei"
+EMAIL="Pouria.rz@outlook.com"
diff --git a/system/kvantum-qt5/slack-desc b/system/kvantum-qt5/slack-desc
new file mode 100644
index 0000000000..c1b8d2c109
--- /dev/null
+++ b/system/kvantum-qt5/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+kvantum-qt5: kvantum-qt5 (SVG-based theme engine for Qt5, KDE and LXQt)
+kvantum-qt5:
+kvantum-qt5: Kvantum is an SVG-based theme engine for Qt, tuned to KDE and LXQt,
+kvantum-qt5: with an emphasis on elegance, usability and practicality.
+kvantum-qt5:
+kvantum-qt5:
+kvantum-qt5: Homepage: https://github.com/tsujan/Kvantums
+kvantum-qt5:
+kvantum-qt5:
+kvantum-qt5:
+kvantum-qt5:
diff --git a/system/kvpm/README b/system/kvpm/README
deleted file mode 100644
index f7de377cf5..0000000000
--- a/system/kvpm/README
+++ /dev/null
@@ -1,5 +0,0 @@
-kvpm is a graphical frontend for Linux LVM and Gnu parted.
-
-It's like KDE Partition Manager, but with a different workflow.
-
-kvpm requires root, so launch with 'kdesu' or 'gksudo'.
diff --git a/system/kvpm/doinst.sh b/system/kvpm/doinst.sh
deleted file mode 100644
index f25bed6fb6..0000000000
--- a/system/kvpm/doinst.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -x /usr/bin/update-mime-database ]; then
-  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
-
-if [ -e usr/share/glib-2.0/schemas ]; then
-  if [ -x /usr/bin/glib-compile-schemas ]; then
-    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
-  fi
-fi
diff --git a/system/kvpm/kvpm.SlackBuild b/system/kvpm/kvpm.SlackBuild
deleted file mode 100644
index 5aeed02917..0000000000
--- a/system/kvpm/kvpm.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-# Slackware build script for kvpm
-# Copyright 2015 Klaatu, Wellington NZ
-#
-# GNU All-Permissive License
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.  This file is offered as-is,
-# without any warranty.
-
-PRGNAM=kvpm
-VERSION=${VERSION:-0.9.9}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
-cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/kvpm/kvpm.info b/system/kvpm/kvpm.info
deleted file mode 100644
index 1a9a062936..0000000000
--- a/system/kvpm/kvpm.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="kvpm"
-VERSION="0.9.9"
-HOMEPAGE="http://kvpm.sourceforge.net"
-DOWNLOAD="https://downloads.sourceforge.net/kvpm/kvpm-0.9.9.tar.gz"
-MD5SUM="ed4f41fd14803d339487a70baf3e68cc"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Klaatu"
-EMAIL="klaatu@member.fsf.org"
diff --git a/system/kvpm/slack-desc b/system/kvpm/slack-desc
deleted file mode 100644
index cc0a2a950b..0000000000
--- a/system/kvpm/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-    |-----handy-ruler------------------------------------------------------|
-kvpm: kvpm (GUI frontend for LVM and Gnu Parted)
-kvpm:
-kvpm: A GUI disk utilities application; it can create and modify
-kvpm: partitions, file systems, LVM volumes and groups, and more! It's
-kvpm: like KDE Partition Manager but with a slightly different workflow.
-kvpm:
-kvpm: http://kvpm.sourceforge.net
-kvpm:
-kvpm:
-kvpm:
-kvpm:
diff --git a/system/kyotocabinet/kyotocabinet.SlackBuild b/system/kyotocabinet/kyotocabinet.SlackBuild
index 08b092fc60..cded6103a3 100644
--- a/system/kyotocabinet/kyotocabinet.SlackBuild
+++ b/system/kyotocabinet/kyotocabinet.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for kyotocabinet
 # Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
@@ -21,14 +21,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=kyotocabinet
 VERSION=${VERSION:-1.2.77}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    # archs i386 and i486 are not supported
+    # archs i386 and i586 are not supported
     # thanks to Thomas Morper
     i?86) ARCH=i686 ;;
     arm*) ARCH=arm ;;
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -97,4 +107,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/kyotocabinet/kyotocabinet.info b/system/kyotocabinet/kyotocabinet.info
index a09aeb44c3..9d47ff72df 100644
--- a/system/kyotocabinet/kyotocabinet.info
+++ b/system/kyotocabinet/kyotocabinet.info
@@ -1,7 +1,7 @@
 PRGNAM="kyotocabinet"
 VERSION="1.2.77"
-HOMEPAGE="https://fallabs.com/kyotocabinet/"
-DOWNLOAD="https://fallabs.com/kyotocabinet/pkg/kyotocabinet-1.2.77.tar.gz"
+HOMEPAGE="http://fallabs.com/kyotocabinet/"
+DOWNLOAD="http://fallabs.com/kyotocabinet/pkg/kyotocabinet-1.2.77.tar.gz"
 MD5SUM="0f1fa6d10cb5501ebc0ad6ded7a90f68"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/laptop-mode-tools/README b/system/laptop-mode-tools/README
index 766e632144..7394ad19de 100644
--- a/system/laptop-mode-tools/README
+++ b/system/laptop-mode-tools/README
@@ -1,10 +1,13 @@
 Laptop Mode Tools is a laptop power saving package for Linux systems.
-It allows you to extend the battery life of your laptop in several ways.
-It is the primary way to enable the Laptop Mode feature of the Linux kernel,
-which lets your hard drive spin down.  In addition, it allows you to tweak
-a number of other power-related settings using a simple configuration file.
+It allows you to extend the battery life of your laptop in several
+ways.  It is the primary way to enable the Laptop Mode feature of the
+Linux kernel, which lets your hard drive spin down.  In addition, it
+allows you to tweak a number of other power-related settings using a
+simple configuration file.
+
+To launch laptop-mode-tools on system start, add the following to
+rc.local:
 
-To launch laptop-mode-tools on system start, add the following to rc.local:
   if [ -x /etc/rc.d/rc.laptop-mode ]; then
     /etc/rc.d/rc.laptop-mode start
   fi
diff --git a/system/laptop-mode-tools/laptop-mode-tools.SlackBuild b/system/laptop-mode-tools/laptop-mode-tools.SlackBuild
index 61cc194757..2c17eb3f84 100644
--- a/system/laptop-mode-tools/laptop-mode-tools.SlackBuild
+++ b/system/laptop-mode-tools/laptop-mode-tools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for laptop-mode-tools
 # Copyright 2010 V'yacheslav Stetskevych <slava18@gmail.com>
@@ -23,10 +23,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=laptop-mode-tools
 VERSION=${VERSION:-1.74}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,11 +76,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Put udev rules in /lib/udev/rules.d/ instead of /etc/udev/rules.d/
-sed -i 's|etc/udev|lib/udev|' install.sh
-
-DESTDIR=$PKG INIT_D=$PKG/etc/rc.d MAN_D=/usr/man ./install.sh
-install -d $PKG/var/run/laptop-mode-tools
+DESTDIR=$PKG INIT_D=$PKG/etc/rc.d MAN_D=/usr/man SYSTEMD=no ./install.sh
 
 [ "$LIBDIRSUFFIX" = "64" ] && mv $PKG/usr/lib $PKG/usr/lib64
 
@@ -89,4 +95,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/laptop-mode-tools/laptop-mode-tools.info b/system/laptop-mode-tools/laptop-mode-tools.info
index dc4da417af..9f8c506dd4 100644
--- a/system/laptop-mode-tools/laptop-mode-tools.info
+++ b/system/laptop-mode-tools/laptop-mode-tools.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/rickysarraf/laptop-mode-tools/archive/1.74/laptop-m
 MD5SUM="990f7aa20adffd2d3482ad57385399a4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-PyQt5"
+REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/system/lbench/README b/system/lbench/README
index dc6e23b2b3..690ffc5d2f 100644
--- a/system/lbench/README
+++ b/system/lbench/README
@@ -1,4 +1,6 @@
-Lbench was written to satisfy a personal desire to better understand some
-obscure performance issues. The performance increase from using multiple
-processor cores can be nearly 100% per core in some cases, and negative (an
-overall slowdown) in others.
+lbench (simple Linux multithread benchmarking tool)
+
+Lbench was written to satisfy a personal desire to better understand
+some obscure performance issues. The performance increase from using
+multiple processor cores can be nearly 100% per core in some cases,
+and negative (an overall slowdown) in others.
diff --git a/system/lbench/lbench.SlackBuild b/system/lbench/lbench.SlackBuild
index 7cc4702d09..52601f7d69 100644
--- a/system/lbench/lbench.SlackBuild
+++ b/system/lbench/lbench.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lbench
 # simple Linux multithread benchmarking tool
@@ -25,10 +25,24 @@
 #
 # Maintained by David Spencer <baildon.research@googlemail.com>
 
+# 20220211 bkw: Modified by SlackBuilds.org
+# - fix build for 15.0.
+# - fix homepage.
+# - leave the full path to the icon in the .desktop file. please, before
+#   you complain about this, go and actually read the freedesktop
+#   standard for .desktop files.
+# - thought about updating to latest lbench (5.0) but it has a couple
+#   new deps that aren't on SBo. also thought about updating to a newer
+#   3.x or 4.x, but upstream disappears the tarballs when new releases
+#   are made. maintainer can worry about this.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lbench
 VERSION=${VERSION:-3.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +52,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -68,9 +86,12 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20220211 bkw: fix for modern gcc
+sed -i '/int popup_report_timeout/s,int,void,' zfuncs.cc
 
 CXXFLAGS="$SLKCFLAGS" \
 PREFIX=/usr \
@@ -93,11 +114,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-sed -i \
-  -e "s|/usr/bin/lbench|lbench|" \
-  -e "s|/usr/share/lbench/icons/lbench.png|lbench|" \
-  $PKG/usr/share/applications/$PRGNAM.desktop
+mkdir -p $PKG/usr/share/pixmaps
 cp $PRGNAM.png $PKG/usr/share/pixmaps/
 
 mkdir -p $PKG/install
@@ -105,4 +122,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lbench/lbench.info b/system/lbench/lbench.info
index 39c6d2d16d..2604dabb21 100644
--- a/system/lbench/lbench.info
+++ b/system/lbench/lbench.info
@@ -1,6 +1,6 @@
 PRGNAM="lbench"
 VERSION="3.7"
-HOMEPAGE="http://kornelix.net/lbench/lbench.html"
+HOMEPAGE="https://kornelix.net/"
 DOWNLOAD="http://ponce.cc/slackware/sources/repo/lbench-3.7.tar.gz"
 MD5SUM="ba1cf6181d3748489ebe68b3c98d3565"
 DOWNLOAD_x86_64=""
diff --git a/system/lbrate/lbrate.SlackBuild b/system/lbrate/lbrate.SlackBuild
index f1de571a7f..b1b5cdd511 100644
--- a/system/lbrate/lbrate.SlackBuild
+++ b/system/lbrate/lbrate.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lbrate
 # Copyright 2012, Bojan Popovic, Belgrade, Serbia <bocke@slackware-srbija.org>
@@ -22,28 +22,38 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lbrate
 VERSION=${VERSION:-1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 DOCS="ChangeLog COPYING NEWS README TODO"
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -89,4 +99,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lbzip2/README b/system/lbzip2/README
deleted file mode 100644
index 2092f0ebfb..0000000000
--- a/system/lbzip2/README
+++ /dev/null
@@ -1,2 +0,0 @@
-lbzip2 is a multi-threaded bzip2/bunzip2 filter that doesn't depend on the 
-lseek() system call and so isn't restricted to regular files.
diff --git a/system/lbzip2/lbzip2.SlackBuild b/system/lbzip2/lbzip2.SlackBuild
deleted file mode 100644
index 801213a810..0000000000
--- a/system/lbzip2/lbzip2.SlackBuild
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for lbzip2
-#
-# Copyright 2009-2010  Erik W. Hanson, Minneapolis, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by B. Watson <yalhcru@gmail.com>.
-
-# 20170302 bkw: use long-format github URL
-
-# 20150519 bkw:
-# - took over maintenance
-# - bump VERSION to 2.5
-# - add gnulib dependency
-# - make VERSION respect environment
-# - clean up slack-desc
-
-PRGNAM=lbzip2
-VERSION=${VERSION:-2.5}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Upstream says automake-1.14 is required, but our
-# 1.11.5 works fine if we change the version check.
-sed -i '/^AM_INIT_AUTOMAKE/s,1\.14,1.11.5,' configure.ac
-
-sh build-aux/autogen.sh
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-gzip $PKG/usr/man/man1/$PRGNAM.1
-
-# The other man pages just source lbzip2.1. Make them
-# symlinks instead (easier to deal with).
-for i in lbunzip2 lbzcat; do
-  rm -f $PKG/usr/man/man1/$i.1
-  ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$i.1.gz
-done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ALGORITHM AUTHORS COPYING ChangeLog* NEWS README THANKS \
-      $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/lbzip2/lbzip2.info b/system/lbzip2/lbzip2.info
deleted file mode 100644
index c1ccd5d21a..0000000000
--- a/system/lbzip2/lbzip2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="lbzip2"
-VERSION="2.5"
-HOMEPAGE="https://github.com/kjn/lbzip2/"
-DOWNLOAD="https://github.com/kjn/lbzip2/archive/v2.5/lbzip2-2.5.tar.gz"
-MD5SUM="288e404f325d9073bdc80759cae30adc"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="gnulib"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/lbzip2/slack-desc b/system/lbzip2/slack-desc
deleted file mode 100644
index fb3286dd7e..0000000000
--- a/system/lbzip2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-      |-----handy-ruler------------------------------------------------------|
-lbzip2: lbzip2 (a pthreads-based parallel bzip2/bunzip2)
-lbzip2:
-lbzip2: Lbzip2 is a Pthreads-based parallel bzip2/bunzip2 filter passable to
-lbzip2: GNU tar with the --use-compress-program option. It isn't restricted
-lbzip2: to regular files on input, nor output.
-lbzip2:
-lbzip2:
-lbzip2:
-lbzip2:
-lbzip2:
-lbzip2:
diff --git a/system/lcdf-typetools/README b/system/lcdf-typetools/README
new file mode 100644
index 0000000000..f7638a6d04
--- /dev/null
+++ b/system/lcdf-typetools/README
@@ -0,0 +1,2 @@
+LCDF Typetools Comprises a set of programs that will
+manipulate Postscript Type 1, OpenFont and TrueType Fonts
diff --git a/system/lcdf-typetools/lcdf-typetools.SlackBuild b/system/lcdf-typetools/lcdf-typetools.SlackBuild
new file mode 100644
index 0000000000..e0c4c7141e
--- /dev/null
+++ b/system/lcdf-typetools/lcdf-typetools.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/bash
+
+# Slackware build script for lcdf-typetools
+
+# Copyright 2022-2024 Vijay Marcel,India
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=lcdf-typetools
+VERSION=${VERSION:-2.110}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-march=i586 -mtune=i686 -pipe -O2 -fPIC"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-march=i686 -mtune=i686 -pipe -O2 -fPIC"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-march=x86-64 -mtune=generic -pipe -O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CPPFLAGS="-D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+LDFLAGS="$SLDFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded --remove-section=.comment --remove-section=.note 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a  *.md COPYING glyphtounicode.tex  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lcdf-typetools/lcdf-typetools.info b/system/lcdf-typetools/lcdf-typetools.info
new file mode 100644
index 0000000000..fee6884521
--- /dev/null
+++ b/system/lcdf-typetools/lcdf-typetools.info
@@ -0,0 +1,10 @@
+PRGNAM="lcdf-typetools"
+VERSION="2.110"
+HOMEPAGE="http://www.lcdf.org/type/"
+DOWNLOAD="http://www.lcdf.org/type/lcdf-typetools-2.110.tar.gz"
+MD5SUM="3ce1ad84e805f052b9d785333dbeb5d4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/lcdf-typetools/slack-desc b/system/lcdf-typetools/slack-desc
new file mode 100644
index 0000000000..c1cd1e1298
--- /dev/null
+++ b/system/lcdf-typetools/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|' 
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also customary
+# to leave one space after the ':'.
+
+              |-----handy-ruler------------------------------------------------------|
+lcdf-typetools: lcdf-typetools (Program for Font Manipulation)
+lcdf-typetools:
+lcdf-typetools: LCDF Typetools Comprises a set of programs that will
+lcdf-typetools: manipulate Postscript Type 1, OpenFont and TrueType Fonts
+lcdf-typetools:
+lcdf-typetools: (http://www.lcdf.org/type/)
+lcdf-typetools:
+lcdf-typetools:
+lcdf-typetools:
+lcdf-typetools:
+lcdf-typetools:
diff --git a/system/lddsafe/README b/system/lddsafe/README
new file mode 100644
index 0000000000..d1f180e6be
--- /dev/null
+++ b/system/lddsafe/README
@@ -0,0 +1,6 @@
+lddsafe (safe replacement for ldd)
+
+lddsafe prints shared library dependencies for executables and shared
+libraries. However, it uses objdump instead of loading the program,
+hence avoiding the security problems of ldd. lddsafe also includes
+nonrecursive mode (-n option), which lists direct dependencies only.
diff --git a/system/lddsafe/lddsafe.1 b/system/lddsafe/lddsafe.1
new file mode 100644
index 0000000000..9b4ae84fbd
--- /dev/null
+++ b/system/lddsafe/lddsafe.1
@@ -0,0 +1,66 @@
+.\" Man page generated from reStructuredText.
+.
+.TH LDDSAFE 1 "2021-02-28" "20110819_02842ba" "SlackBuilds.org"
+.SH NAME
+lddsafe \- safely print shared library dependencies (similar to ldd)
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" RST source for lddsafe(1) man page. Convert with:
+.
+.\" rst2man.py lddsafe.rst > lddsafe.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+lddsafe [\fI\-n\fP] \fBFILE\fP ...
+.SH DESCRIPTION
+.sp
+lddsafe is a shell script written for Linux distributions (tested
+under Slackware Linux) that prints shared library dependencies for
+executable files and shared libraries, similar to ldd. However,
+it uses objdump instead of loading the program, hence avoiding the
+security problems of ldd.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-n
+Nonrecursive mode. List direct dependencies only.
+.UNINDENT
+.SH AUTHORS
+.sp
+lddsafe was written by Ricardo Garcia Gonzalez and Ivan Mironov, and
+released as public domain code.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+The lddsafe homepage: \fI\%https://github.com/rg3/lddsafe/\fP
+.\" Generated by docutils manpage writer.
+.
diff --git a/system/lddsafe/lddsafe.SlackBuild b/system/lddsafe/lddsafe.SlackBuild
new file mode 100644
index 0000000000..5c44de165b
--- /dev/null
+++ b/system/lddsafe/lddsafe.SlackBuild
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# Slackware build script for lddsafe
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20210228 bkw: I've been using this for years, never got around
+# to making a SBo build for it until now. Since it's only one
+# self-contained shell script and one README, no point dealing with a
+# tarball at all, just link to the 'raw' files on github.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=lddsafe
+VERSION=${VERSION:-20110819_02842ba}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $OUTPUT \
+  $PKG/usr/bin $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/man/man1 $PKG/install
+install -m0755 -oroot -groot $CWD/$PRGNAM $PKG/usr/bin/$PRGNAM
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+install -m0644 -oroot -groot $CWD/README.textile $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lddsafe/lddsafe.info b/system/lddsafe/lddsafe.info
new file mode 100644
index 0000000000..a20422ba42
--- /dev/null
+++ b/system/lddsafe/lddsafe.info
@@ -0,0 +1,12 @@
+PRGNAM="lddsafe"
+VERSION="20110819_02842ba"
+HOMEPAGE="https://github.com/rg3/lddsafe/"
+DOWNLOAD="https://raw.githubusercontent.com/rg3/lddsafe/02842bab5b8d1341fb34c632603dbe1c20e7ab51/lddsafe \
+          https://raw.githubusercontent.com/rg3/lddsafe/02842bab5b8d1341fb34c632603dbe1c20e7ab51/README.textile"
+MD5SUM="7c9f3a4035a4b438e2ec44c4d27b158f \
+        6e4fa6979ae375cc60f9c444846bcb8d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/lddsafe/lddsafe.rst b/system/lddsafe/lddsafe.rst
new file mode 100644
index 0000000000..37c15b22b8
--- /dev/null
+++ b/system/lddsafe/lddsafe.rst
@@ -0,0 +1,52 @@
+.. RST source for lddsafe(1) man page. Convert with:
+..   rst2man.py lddsafe.rst > lddsafe.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 20110819_02842ba
+.. |date| date::
+
+=======
+lddsafe
+=======
+
+---------------------------------------------------------
+safely print shared library dependencies (similar to ldd)
+---------------------------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+lddsafe [*-n*] **FILE** ...
+
+DESCRIPTION
+===========
+
+lddsafe is a shell script written for Linux distributions (tested
+under Slackware Linux) that prints shared library dependencies for
+executable files and shared libraries, similar to ldd. However,
+it uses objdump instead of loading the program, hence avoiding the
+security problems of ldd.
+
+OPTIONS
+=======
+
+-n     Nonrecursive mode. List direct dependencies only.
+
+AUTHORS
+=======
+
+lddsafe was written by Ricardo Garcia Gonzalez and Ivan Mironov, and
+released as public domain code.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+The lddsafe homepage: https://github.com/rg3/lddsafe/
diff --git a/system/lddsafe/slack-desc b/system/lddsafe/slack-desc
new file mode 100644
index 0000000000..ddc5f764c2
--- /dev/null
+++ b/system/lddsafe/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+lddsafe: lddsafe (safe replacement for ldd)
+lddsafe:
+lddsafe: lddsafe prints shared library dependencies for executables and shared
+lddsafe: libraries. However, it uses objdump instead of loading the program,
+lddsafe: hence avoiding the security problems of ldd. lddsafe also includes
+lddsafe: nonrecursive mode (-n option), which lists direct dependencies only.
+lddsafe:
+lddsafe:
+lddsafe:
+lddsafe:
+lddsafe:
diff --git a/system/letsencrypt/README b/system/letsencrypt/README
index 98bc09e09f..30b4362b96 100644
--- a/system/letsencrypt/README
+++ b/system/letsencrypt/README
@@ -1,12 +1,12 @@
 The Let's Encrypt Client (now called certbot) is a tool to
-automatically receive and install X.509 certificates to enable TLS on servers.
-The client will interoperate with the Let's Encrypt CA which will be
-issuing browser-trusted certificates for free.
+automatically receive and install X.509 certificates to enable TLS on
+servers.  The client will interoperate with the Let's Encrypt CA which
+will be issuing browser-trusted certificates for free.
 
 See README.Slackware for more detailed instructions.
 
-Note: the certificate client tool is now certbot, but a symlink is provided
-to be backward compatible with previous letsencrypt version.
+Note: the certificate client tool is now certbot, but a symlink is
+provided to be backward compatible with previous letsencrypt version.
 Please rename the script to the new name: certbot
 
 Since 1.1.0, most of deps must be (re)built against Python3.
diff --git a/system/letsencrypt/letsencrypt.SlackBuild b/system/letsencrypt/letsencrypt.SlackBuild
index 4c017a7441..30aa229826 100644
--- a/system/letsencrypt/letsencrypt.SlackBuild
+++ b/system/letsencrypt/letsencrypt.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for letsencrypt
 
-# Copyright 2015-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2015-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=letsencrypt
 SRCNAM=certbot
-VERSION=${VERSION:-1.12.0}
+VERSION=${VERSION:-2.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -97,7 +104,7 @@ cd ..
 
 # We include default options for Apache
 mkdir -p $PKG/etc/letsencrypt/
-cp $PKG/usr/lib${LIBDIRSUFFIX}/python$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')/site-packages/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf \
+cp $PKG/usr/lib*/python$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')/site-packages/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf \
    $PKG/etc/letsencrypt/options-ssl-apache.conf
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -114,4 +121,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/letsencrypt/letsencrypt.info b/system/letsencrypt/letsencrypt.info
index d4831ccca7..318e59fc28 100644
--- a/system/letsencrypt/letsencrypt.info
+++ b/system/letsencrypt/letsencrypt.info
@@ -1,10 +1,10 @@
 PRGNAM="letsencrypt"
-VERSION="1.12.0"
+VERSION="2.10.0"
 HOMEPAGE="https://letsencrypt.org/"
-DOWNLOAD="https://github.com/certbot/certbot/archive/v1.12.0/certbot-1.12.0.tar.gz"
-MD5SUM="c1f0ec078646026f4a60b81f198fef7e"
+DOWNLOAD="https://github.com/certbot/certbot/archive/v2.10.0/certbot-2.10.0.tar.gz"
+MD5SUM="6de5a7810a2157c632b4343f895d2f59"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="configobj mock pytz python3-pythondialog zope.component pyrfc3339 psutil python-parsedatetime python-configargparse werkzeug ndg_httpsclient python3-augeas josepy funcsigs requests-toolbelt python-distro python-certifi python3-packaging"
+REQUIRES="configobj pytz python3-pythondialog zope.component pyrfc3339 python3-psutil python-parsedatetime python3-configargparse werkzeug ndg_httpsclient python3-augeas josepy funcsigs requests-toolbelt python-importlib_metadata"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/system/lf/README b/system/lf/README
new file mode 100644
index 0000000000..e88412aa26
--- /dev/null
+++ b/system/lf/README
@@ -0,0 +1,22 @@
+lf (as in "list files") is a terminal file manager written in Go with
+a heavy inspiration from ranger file manager.
+
+Features:
+
+•Cross-platform (Linux, MacOS, BSDs, Windows)
+•Single binary without any runtime dependencies
+•Fast startup and low memory footprint due to native code and static
+ binaries
+•Asynchronous IO operations to avoid UI locking
+•Server/client architecture and remote commands to manage multiple
+ instances
+•Extendable and configurable with shell commands
+•Customizable keybindings (vi and readline defaults)
+•A reasonable set of other features
+
+Usage:
+
+After the installation lf command should start the application in the
+current directory.
+Run lf -help to see command line options.
+Run lf -doc
diff --git a/system/lf/lf.SlackBuild b/system/lf/lf.SlackBuild
new file mode 100644
index 0000000000..ec12642056
--- /dev/null
+++ b/system/lf/lf.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+# Slackware build script for lf
+
+# Copyright 2022, Damian Perticone, Berisso, Argentina
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=lf
+VERSION=${VERSION:-r27}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+mkdir -p vendor
+cat $CWD/modules.txt > vendor/modules.txt
+for DIR in $(grep -o "^# .* " vendor/modules.txt | cut -d' ' -f2)
+do
+  NAME=$(echo $DIR | sed 's/[./]v[0-9]\+$//' | xargs basename)
+  DIR=vendor/$DIR
+  tar xvf $CWD/$NAME-*.tar.gz
+  mkdir -p $(dirname $DIR)
+  mv $NAME-* $DIR
+done
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CGO_CFLAGS="$SLKCFLAGS" \
+CGO_CXXFLAGS="$SLKCFLAGS" \
+go build -mod vendor
+
+# install the binary
+install -sDm 0755 lf -t $PKG/usr/bin
+# vim integration
+install -vDm644 etc/lf.vim -t $PKG/usr/share/vim/vimfiles/syntax 
+install -vDm644 etc/lf.vim -t $PKG/usr/share/vim/vimfiles/ftdetect 
+# shell integrations
+install -vDm644 etc/*.{sh,csh} -t $PKG/etc/profile.d
+install -vDm644 etc/lfcd.fish -t $PKG/usr/share/fish/vendor_functions.d
+# shell completions
+install -vDm644 etc/lf.bash $PKG/usr/share/bash/bash-completion/completions/lf
+install -vDm644 etc/lf.fish $PKG/usr/share/fish/vendor_completions.d/lf.fish
+install -vDm644 etc/lf.zsh $PKG/usr/share/zsh/site-functions/_lf
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lf/lf.info b/system/lf/lf.info
new file mode 100644
index 0000000000..43218ef4ee
--- /dev/null
+++ b/system/lf/lf.info
@@ -0,0 +1,28 @@
+PRGNAM="lf"
+VERSION="r27"
+HOMEPAGE="https://github.com/gokcehan/lf"
+DOWNLOAD="https://github.com/gokcehan/lf/archive/r27/lf-r27.tar.gz \
+          https://github.com/gdamore/encoding/archive/v1.0.0/encoding-1.0.0.tar.gz \
+          https://github.com/gdamore/tcell/archive/v2.3.1/tcell-2.3.1.tar.gz \
+          https://github.com/lucasb-eyer/go-colorful/archive/v1.0.3/go-colorful-1.0.3.tar.gz \
+          https://github.com/mattn/go-runewidth/archive/v0.0.10/go-runewidth-0.0.10.tar.gz \
+          https://github.com/rivo/uniseg/archive/v0.1.0/uniseg-0.1.0.tar.gz \
+          https://github.com/golang/sys/archive/3681064/sys-3681064d51587c1db0324b3d5c23c2ddbcff6e8f.tar.gz \
+          https://github.com/golang/term/archive/6a3ed07/term-6a3ed077a48de71621ad530f9078fffa0bc0ce3223.tar.gz \
+          https://github.com/golang/text/archive/v0.3.0/text-0.3.0.tar.gz \
+          https://github.com/djherbis/times/archive/v1.2.0/times-1.2.0.tar.gz"
+MD5SUM="d66e29ae9802f085dd6d2fcc58e6828e \
+        fbadc383bc1ace79fa769fe2de36b87b \
+        8eab14d0753c02958e8045a934fde30f \
+        2a1b88991050673c3928342c11d404ae \
+        e281e1ebbc883373e70c1e1086352dd8 \
+        011091eb1591edeab5930738dde793bc \
+        406355209c54747f022e04bbd2983c91 \
+        c1bc1286e1f84a217d4531ef3869962b \
+        3cc27641fa0f4cbcf3c8497b1c823d7d \
+        47b93f96cb258822a3d73d3332731919"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="Damian Perticone"
+EMAIL="mjolnirdam@gmail.com"
diff --git a/system/lf/modules.txt b/system/lf/modules.txt
new file mode 100644
index 0000000000..19e1fc4082
--- /dev/null
+++ b/system/lf/modules.txt
@@ -0,0 +1,60 @@
+# github.com/gdamore/encoding v1.0.0
+github.com/gdamore/encoding
+# github.com/gdamore/tcell/v2 v2.3.1
+github.com/gdamore/tcell/v2
+github.com/gdamore/tcell/v2/terminfo
+github.com/gdamore/tcell/v2/terminfo/a/aixterm
+github.com/gdamore/tcell/v2/terminfo/a/alacritty
+github.com/gdamore/tcell/v2/terminfo/a/ansi
+github.com/gdamore/tcell/v2/terminfo/b/beterm
+github.com/gdamore/tcell/v2/terminfo/base
+github.com/gdamore/tcell/v2/terminfo/c/cygwin
+github.com/gdamore/tcell/v2/terminfo/d/dtterm
+github.com/gdamore/tcell/v2/terminfo/dynamic
+github.com/gdamore/tcell/v2/terminfo/e/emacs
+github.com/gdamore/tcell/v2/terminfo/extended
+github.com/gdamore/tcell/v2/terminfo/g/gnome
+github.com/gdamore/tcell/v2/terminfo/h/hpterm
+github.com/gdamore/tcell/v2/terminfo/k/konsole
+github.com/gdamore/tcell/v2/terminfo/k/kterm
+github.com/gdamore/tcell/v2/terminfo/l/linux
+github.com/gdamore/tcell/v2/terminfo/p/pcansi
+github.com/gdamore/tcell/v2/terminfo/r/rxvt
+github.com/gdamore/tcell/v2/terminfo/s/screen
+github.com/gdamore/tcell/v2/terminfo/s/simpleterm
+github.com/gdamore/tcell/v2/terminfo/s/sun
+github.com/gdamore/tcell/v2/terminfo/t/termite
+github.com/gdamore/tcell/v2/terminfo/t/tmux
+github.com/gdamore/tcell/v2/terminfo/v/vt100
+github.com/gdamore/tcell/v2/terminfo/v/vt102
+github.com/gdamore/tcell/v2/terminfo/v/vt220
+github.com/gdamore/tcell/v2/terminfo/v/vt320
+github.com/gdamore/tcell/v2/terminfo/v/vt400
+github.com/gdamore/tcell/v2/terminfo/v/vt420
+github.com/gdamore/tcell/v2/terminfo/v/vt52
+github.com/gdamore/tcell/v2/terminfo/w/wy50
+github.com/gdamore/tcell/v2/terminfo/w/wy60
+github.com/gdamore/tcell/v2/terminfo/w/wy99_ansi
+github.com/gdamore/tcell/v2/terminfo/x/xfce
+github.com/gdamore/tcell/v2/terminfo/x/xterm
+github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty
+github.com/gdamore/tcell/v2/terminfo/x/xterm_termite
+# github.com/lucasb-eyer/go-colorful v1.0.3
+github.com/lucasb-eyer/go-colorful
+# github.com/mattn/go-runewidth v0.0.10
+github.com/mattn/go-runewidth
+# github.com/rivo/uniseg v0.1.0
+github.com/rivo/uniseg
+# golang.org/x/sys v0.0.0-20220209214540-3681064d5158
+golang.org/x/sys/internal/unsafeheader
+golang.org/x/sys/plan9
+golang.org/x/sys/unix
+golang.org/x/sys/windows
+# golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
+golang.org/x/term
+# golang.org/x/text v0.3.0
+golang.org/x/text/encoding
+golang.org/x/text/encoding/internal/identifier
+golang.org/x/text/transform
+# gopkg.in/djherbis/times.v1 v1.2.0
+gopkg.in/djherbis/times.v1
diff --git a/system/lf/slack-desc b/system/lf/slack-desc
new file mode 100644
index 0000000000..a911f530cf
--- /dev/null
+++ b/system/lf/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+  |-----handy-ruler------------------------------------------------------|
+lf: lf (terminal file manager written in Go)
+lf:
+lf: Lf as in "list files" is a terminal file manager written in Go with
+lf: a heavy inspiration from ranger file manager.
+lf:
+lf:
+lf:
+lf:
+lf:
+lf: Home: https://github.com/gokcehan/lf
+lf:
diff --git a/system/lhasa/README b/system/lhasa/README
deleted file mode 100644
index c6441fdb2b..0000000000
--- a/system/lhasa/README
+++ /dev/null
@@ -1,17 +0,0 @@
-lhasa (Free Software replacement for UNIX LHA tool)
-
-Lhasa is a Free Software replacement for the Unix LHA tool, for
-decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives. The backend for
-the tool is a library, so that it can be reused for other purposes. Lhasa
-aims to be compatible with as many types of lzh/lzs archives as
-possible. It also aims to generate the same output as the (non-free)
-Unix LHA tool, so that it will act as a drop-in free replacement.
-
-Note that lhasa is only for *decompressing*, not compressing/creating
-archives.
-
-The binary is installed as /usr/bin/lhasa. If installing on a system that
-doesn't already have Slackware's lha package, symlinks will be created
-so lhasa can be called as /usr/bin/lha (and "man lha" will work). This
-allows lhasa to replace Slackware's lha package, but doesn't conflict
-if both are installed.
diff --git a/system/lhasa/doinst.sh b/system/lhasa/doinst.sh
deleted file mode 100644
index e48f847b41..0000000000
--- a/system/lhasa/doinst.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# If there's no lha, take over:
-if [ ! -r usr/bin/lha ]; then
-  ( cd usr/bin ; ln -sf lhasa lha )
-  ( cd usr/man/man1 ; ln -sf lhasa.1.gz lha.1.gz )
-fi
diff --git a/system/lhasa/lhasa.SlackBuild b/system/lhasa/lhasa.SlackBuild
deleted file mode 100644
index aa9247fc7c..0000000000
--- a/system/lhasa/lhasa.SlackBuild
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for lhasa
-
-# Written by B. Watson (yalhcru@gmail.com)
-
-# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-
-PRGNAM=lhasa
-VERSION=${VERSION:-0.3.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --program-suffix=sa \
-  --disable-static \
-  --enable-shared \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-gzip $PKG/usr/man/man1/$PRGNAM.1
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/api
-cp -a AUTHORS COPYING INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/html/* $PKG/usr/doc/$PRGNAM-$VERSION/api
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/lhasa/lhasa.info b/system/lhasa/lhasa.info
deleted file mode 100644
index 0324dff668..0000000000
--- a/system/lhasa/lhasa.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="lhasa"
-VERSION="0.3.1"
-HOMEPAGE="http://fragglet.github.io/lhasa/"
-DOWNLOAD="https://soulsphere.org/projects/lhasa/lhasa-0.3.1.tar.gz"
-MD5SUM="b843cb4e97f9788f7845f23cd30cc7c6"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/lhasa/slack-desc b/system/lhasa/slack-desc
deleted file mode 100644
index 98930cceef..0000000000
--- a/system/lhasa/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-     |-----handy-ruler------------------------------------------------------|
-lhasa: lhasa (Free Software replacement for UNIX LHA tool)
-lhasa:
-lhasa: Lhasa is a Free Software replacement for the Unix LHA tool, for
-lhasa: decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives. The
-lhasa: backend for the tool is a library, so that it can be reused for
-lhasa: other purposes. Lhasa aims to be compatible with as many types of
-lhasa: lzh/lzs archives as possible. It also aims to generate the same
-lhasa: output as the (non-free) Unix LHA tool, so that it will act as a
-lhasa: drop-in free replacement.
-lhasa:
-lhasa:
diff --git a/system/libcloudproviders/README b/system/libcloudproviders/README
new file mode 100644
index 0000000000..3566bb68a4
--- /dev/null
+++ b/system/libcloudproviders/README
@@ -0,0 +1,5 @@
+libcloudproviders is a DBus API that allows cloud storage sync clients
+to expose their services. Clients such as file managers and desktop 
+environments can then provide integrated access to the cloud providers
+services.
+
diff --git a/system/libcloudproviders/libcloudproviders.SlackBuild b/system/libcloudproviders/libcloudproviders.SlackBuild
new file mode 100644
index 0000000000..ff8b5908b8
--- /dev/null
+++ b/system/libcloudproviders/libcloudproviders.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+# Slackware build script for libcloudproviders
+
+# Copyright 2022 Isaac Yu <isaacyu1@isaacyu1.com>
+# All rights reserved.
+#
+# 2023 - Updated and Maintained by Bob Funk, Winnipeg, Canada
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=libcloudproviders
+VERSION=${VERSION:-0.3.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --prefix /usr \
+    --mandir /usr/man \
+    --libdir /usr/lib${LIBDIRSUFFIX}
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/libcloudproviders/libcloudproviders.info b/system/libcloudproviders/libcloudproviders.info
new file mode 100644
index 0000000000..ac988b0c9f
--- /dev/null
+++ b/system/libcloudproviders/libcloudproviders.info
@@ -0,0 +1,10 @@
+PRGNAM="libcloudproviders"
+VERSION="0.3.1"
+HOMEPAGE="https://gitlab.gnome.org/World/libcloudproviders"
+DOWNLOAD="https://gitlab.gnome.org/World/libcloudproviders/-/archive/0.3.1/libcloudproviders-0.3.1.tar.gz"
+MD5SUM="4a8a32ca61606995e9266879043aa4f6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Bob Funk"
+EMAIL="bobfunk11@gmail.com"
diff --git a/system/libcloudproviders/slack-desc b/system/libcloudproviders/slack-desc
new file mode 100644
index 0000000000..a08c44dbcf
--- /dev/null
+++ b/system/libcloudproviders/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+libcloudproviders: libcloudproviders (DBus API for cloud sync clients)
+libcloudproviders:
+libcloudproviders: libcloudproviders is a DBus API that allows cloud storage sync clients
+libcloudproviders: to expose their services. Clients such as file managers and desktop 
+libcloudproviders: environments can then provide integrated access to the cloud providers
+libcloudproviders: services.
+libcloudproviders:
+libcloudproviders:
+libcloudproviders:
+libcloudproviders: https://gitlab.gnome.org/World/libcloudproviders
+libcloudproviders:
diff --git a/system/libnatspec/README b/system/libnatspec/README
index 65759ec585..3dfc7498fc 100644
--- a/system/libnatspec/README
+++ b/system/libnatspec/README
@@ -1,5 +1,5 @@
-NATSPEC library is intended to smooth national specificities in using of
-programs, to put it more exactly:
+NATSPEC library is intended to smooth national specificities in using
+of programs, to put it more exactly:
 
-    * to resolve in most cases the problems with charset;
-    * to provide various aids, which facilitate the programs localization.
+* to resolve in most cases the problems with charset;
+* to provide various aids, which facilitate the programs localization.
diff --git a/system/libnatspec/libnatspec.SlackBuild b/system/libnatspec/libnatspec.SlackBuild
index 33b5926127..af13160a29 100644
--- a/system/libnatspec/libnatspec.SlackBuild
+++ b/system/libnatspec/libnatspec.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for libnatspec
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=libnatspec
 VERSION=${VERSION:-0.2.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -98,8 +108,10 @@ cp -ar \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/libratbag/README b/system/libratbag/README
new file mode 100644
index 0000000000..f353d20add
--- /dev/null
+++ b/system/libratbag/README
@@ -0,0 +1,9 @@
+libratbag provides ratbagd, a DBus daemon to configure input devices,
+mainly high-end and gaming mice.
+
+If Sphinx and sphinx-rtd-theme are installed, then the SlackBuild
+will build HTML documentation files as well.
+
+This SlackBuild disables build tests by default. To enable build tests
+(valgrind additionally required), pass TESTS=yes to the SlackBuild:
+TESTS=yes ./libratbag.SlackBuild
diff --git a/system/libratbag/libratbag.SlackBuild b/system/libratbag/libratbag.SlackBuild
new file mode 100644
index 0000000000..f65cfed538
--- /dev/null
+++ b/system/libratbag/libratbag.SlackBuild
@@ -0,0 +1,130 @@
+#!/bin/bash
+
+# Slackware build script for libratbag
+
+# Copyright 2021-2022 Isaac Yu <isaacyu@protonmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2: strip binaries.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=libratbag
+VERSION=${VERSION:-0.17}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# If Sphinx and sphinx-rtd-theme are installed, then build HTML documentation
+if (python3 -c 'import sphinx' 2>/dev/null) && \
+   (python3 -c 'import sphinx_rtd_theme' 2>/dev/null); then
+	DOCS=true
+else
+	DOCS=false
+fi
+
+# Enable or disable tests
+if [ ${TESTS:-no} = yes ]; then
+	ENABLE_TESTS=true
+else
+	ENABLE_TESTS=false
+fi
+
+mkdir -p build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --prefix /usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --mandir /usr/man \
+    -Dsystemd=false \
+    -Dlogind-provider=elogind \
+    -Ddocumentation=$DOCS \
+    -Dtests=$ENABLE_TESTS \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+gzip -9 $PKG/usr/man/man*/*
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# If Sphinx and sphinx_rtd_theme are installed, copy HTML documentation
+if (python3 -c 'import sphinx' 2>/dev/null) && \
+   (python3 -c 'import sphinx_rtd_theme' 2>/dev/null); then
+	cp -a build/doc/html $PKG/usr/doc/$PRGNAM-$VERSION
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/libratbag/libratbag.info b/system/libratbag/libratbag.info
new file mode 100644
index 0000000000..4c5f9896cb
--- /dev/null
+++ b/system/libratbag/libratbag.info
@@ -0,0 +1,10 @@
+PRGNAM="libratbag"
+VERSION="0.17"
+HOMEPAGE="https://github.com/libratbag/libratbag"
+DOWNLOAD="https://github.com/libratbag/libratbag/archive/v0.17/libratbag-0.17.tar.gz"
+MD5SUM="6d3e1d8b9df938be1f1ccfcd1641c7aa"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python-evdev"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/libratbag/slack-desc b/system/libratbag/slack-desc
new file mode 100644
index 0000000000..1e650f81e1
--- /dev/null
+++ b/system/libratbag/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+libratbag: libratbag (daemon for gaming mice)
+libratbag:
+libratbag: libratbag is a DBus daemon to configure input devices, mainly
+libratbag: high-end and gaming mice.
+libratbag:
+libratbag:
+libratbag:
+libratbag:
+libratbag:
+libratbag:
+libratbag:
diff --git a/system/libsignal-protocol-c/README b/system/libsignal-protocol-c/README
index d80dcb6efe..7923ac2069 100644
--- a/system/libsignal-protocol-c/README
+++ b/system/libsignal-protocol-c/README
@@ -1,2 +1,11 @@
 This is a ratcheting forward secrecy protocol that works
 in synchronous and asynchronous messaging environments.
+The code upstream has been marked as "archived" since February 2022.
+
+The default is to provide a shared library. However, one can build it
+statically by passing STATIC=yes:
+
+# STATIC=yes sh libsignal-protocol-c.SlackBuild
+
+This way you can statically link it into your final program and 
+remove the library.
diff --git a/system/libsignal-protocol-c/libsignal-protocol-c-2.3.3-CVE-2022-48468.patch b/system/libsignal-protocol-c/libsignal-protocol-c-2.3.3-CVE-2022-48468.patch
new file mode 100644
index 0000000000..8b3706dd88
--- /dev/null
+++ b/system/libsignal-protocol-c/libsignal-protocol-c-2.3.3-CVE-2022-48468.patch
@@ -0,0 +1,53 @@
+From 478dfe51552243b367cf2e9c5d047cbbd3c21635 Mon Sep 17 00:00:00 2001
+From: Randy Barlow <randy@electronsweatshop.com>
+Date: Fri, 18 Mar 2022 12:42:57 -0400
+Subject: [PATCH] CVE-2022-48468: unsigned integer overflow
+
+This commit combines two upstream commits from protobuf-c[0][1].
+The first fixes an unsigned integer overflow, and the second fixes a
+regression introduced by the first. I originally decided to amend the
+commit message of the first to mention that it fixes a CVE, but then I
+realized it would be better to bring the fix for the regression together
+with it.
+
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-48468
+https://bugzilla.redhat.com/show_bug.cgi?id=2186673
+
+[0]
+https://github.com/protobuf-c/protobuf-c/pull/513/commits/289f5c18b195aa43d46a619d1188709abbfa9c82
+[1]
+https://github.com/protobuf-c/protobuf-c/pull/513/commits/0d1fd124a4e0a07b524989f6e64410ff648fba61
+
+Co-authored-by: 10054172 <hui.zhang@thalesgroup.com>
+Co-authored-by: "Todd C. Miller" <Todd.Miller@sudo.ws>
+Signed-off-by: 10054172 <hui.zhang@thalesgroup.com>
+Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
+---
+ src/protobuf-c/protobuf-c.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/protobuf-c/protobuf-c.c b/src/protobuf-c/protobuf-c.c
+index 4f2f5bc..6ae5287 100644
+--- a/src/protobuf-c/protobuf-c.c
++++ b/src/protobuf-c/protobuf-c.c
+@@ -2456,10 +2456,13 @@ parse_required_member(ScannedMember *scanned_member,
+ 			return FALSE;
+ 
+ 		def_mess = scanned_member->field->default_value;
+-		subm = protobuf_c_message_unpack(scanned_member->field->descriptor,
+-						 allocator,
+-						 len - pref_len,
+-						 data + pref_len);
++		if (len >= pref_len)
++			subm = protobuf_c_message_unpack(scanned_member->field->descriptor,
++							 allocator,
++							 len - pref_len,
++							 data + pref_len);
++		else
++			subm = NULL;
+ 
+ 		if (maybe_clear &&
+ 		    *pmessage != NULL &&
+-- 
+2.39.2
+
diff --git a/system/libsignal-protocol-c/libsignal-protocol-c.SlackBuild b/system/libsignal-protocol-c/libsignal-protocol-c.SlackBuild
index 0a11bdb3cd..742b7f532d 100644
--- a/system/libsignal-protocol-c/libsignal-protocol-c.SlackBuild
+++ b/system/libsignal-protocol-c/libsignal-protocol-c.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for libsignal-protocol-c
 
-# Copyright 2019-2020 CRTS
+# Copyright 2019- CRTS
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=libsignal-protocol-c
-VERSION=${VERSION:-2.3.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.3.3}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,11 +39,20 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+[ "${STATIC:-no}" = "yes" ] && SHARED_LIBS_STATUS=OFF || SHARED_LIBS_STATUS=ON
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -50,6 +62,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -70,6 +85,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Patch for CVE-2022-48468 (obtained from the Gentoo package)
+patch -p1 < $CWD/libsignal-protocol-c-2.3.3-CVE-2022-48468.patch
+
 mkdir -p build
 cd build
   cmake \
@@ -77,15 +95,12 @@ cd build
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DMAN_INSTALL_DIR=/usr/man \
+    -DBUILD_SHARED_LIBS=$SHARED_LIBS_STATUS \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   ISSUE_TEMPLATE.md LICENSE README.md \
@@ -96,4 +111,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/libsignal-protocol-c/libsignal-protocol-c.info b/system/libsignal-protocol-c/libsignal-protocol-c.info
index 2b065374c7..4ef8c569a2 100644
--- a/system/libsignal-protocol-c/libsignal-protocol-c.info
+++ b/system/libsignal-protocol-c/libsignal-protocol-c.info
@@ -1,8 +1,8 @@
 PRGNAM="libsignal-protocol-c"
-VERSION="2.3.2"
+VERSION="2.3.3"
 HOMEPAGE="https://signal.org"
-DOWNLOAD="https://github.com/signalapp/libsignal-protocol-c/archive/v2.3.2/libsignal-protocol-c-2.3.2.tar.gz"
-MD5SUM="ad742a03263c29a468d00c3dcc0269cf"
+DOWNLOAD="https://github.com/signalapp/libsignal-protocol-c/archive/v2.3.3/libsignal-protocol-c-2.3.3.tar.gz"
+MD5SUM="68dae9b8da58f36dcbf9e10b0138d6f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/libtrash/README b/system/libtrash/README
index 6de79c168a..c3855a5825 100644
--- a/system/libtrash/README
+++ b/system/libtrash/README
@@ -3,4 +3,4 @@ trash can under GNU/Linux.
 
 For instance, with libtrash, Midnight Commander will move files 
 to the trash directory:
-LD_PRELOAD=/usr/lib/libtrash.so.3.6 mc
+LD_PRELOAD=/usr/lib/libtrash.so.3.8 mc
diff --git a/system/libtrash/doinst.sh b/system/libtrash/doinst.sh
new file mode 100644
index 0000000000..7c7c3e502e
--- /dev/null
+++ b/system/libtrash/doinst.sh
@@ -0,0 +1,11 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    rm $NEW
+  fi
+}
+
+config etc/libtrash.conf.new
diff --git a/system/libtrash/libtrash.SlackBuild b/system/libtrash/libtrash.SlackBuild
index f3d824421a..0990b54eee 100644
--- a/system/libtrash/libtrash.SlackBuild
+++ b/system/libtrash/libtrash.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for libtrash
-#
-# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.com>
+
+# Copyright 2020-2024 Isaac Yu <isaacyu@protonmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,21 +11,24 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=libtrash
-VERSION=${VERSION:-3.6}
+VERSION=${VERSION:-3.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,7 +67,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,24 +76,39 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Inspired by the following Arch Linux AUR script: 
-# https://aur.archlinux.org/packages/libtrash/
-sed -i -e s/ldconfig// ./src/Makefile
-sed -i -e s/python/python2/ ./src/Makefile
+./autogen.sh
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux \
+  --enable-shared
 
 make
-install -d $PKG/usr/lib $PKG/etc
-make install INSTLIBDIR=$PKG/usr/lib SYSCONFFILE=$PKG/etc/libtrash.conf
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+# Compress man page
+gzip -9 $PKG/usr/man/man2/$PRGNAM.2
+
+mv $PKG/etc/libtrash.conf $PKG/etc/libtrash.conf.new
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README.md TODO config.txt $PKG/usr/doc/$PRGNAM-$VERSION
+rm -f $PKG/usr/doc/$PRGNAM-$VERSION/{AUTHORS,INSTALL}
+cp -a BUILD ChangeLog config.txt COPYING NEWS README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/install 
+mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/libtrash/libtrash.info b/system/libtrash/libtrash.info
index 706271dcea..c0e0dce671 100644
--- a/system/libtrash/libtrash.info
+++ b/system/libtrash/libtrash.info
@@ -1,10 +1,10 @@
 PRGNAM="libtrash"
-VERSION="3.6"
-HOMEPAGE="http://pages.stern.nyu.edu/~marriaga/software/libtrash/"
-DOWNLOAD="http://pages.stern.nyu.edu/~marriaga/software/libtrash/libtrash-3.6.tgz"
-MD5SUM="15cbe6d792e20057b13f46394c7c122a"
+VERSION="3.8"
+HOMEPAGE="https://github.com/pete4abw/libtrash"
+DOWNLOAD="https://github.com/pete4abw/libtrash/archive/v3.8/libtrash-3.8.tar.gz"
+MD5SUM="c0e6ad84375fffc5f5eacf0028b28d7e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Isaac Yu"
-EMAIL="isaacyu1@isaacyu1.com"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/libwmf-type1-fonts/README b/system/libwmf-type1-fonts/README
new file mode 100644
index 0000000000..8a9c936288
--- /dev/null
+++ b/system/libwmf-type1-fonts/README
@@ -0,0 +1,9 @@
+libwmf-type1-fonts (URW base 35 postscript fonts for libwmf)
+
+These Type 1 fonts are required for Slackware's libwmf package to be
+able to render text. They're installed to /usr/share/libwmf/fonts, so
+they're not available for other uses.
+
+Installing this package allows Slackware's Gimp to be able to display
+WMF (Windows MetaFiles) with embedded text, instead of giving an error
+message when it tries. It also allows qiv (from SBo) to display them.
diff --git a/system/libwmf-type1-fonts/libwmf-type1-fonts.SlackBuild b/system/libwmf-type1-fonts/libwmf-type1-fonts.SlackBuild
new file mode 100644
index 0000000000..6b12c46f98
--- /dev/null
+++ b/system/libwmf-type1-fonts/libwmf-type1-fonts.SlackBuild
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# Slackware build script for libwmf-type1-fonts
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=libwmf-type1-fonts
+SRCNAM=urw-base35-fonts
+VERSION=${VERSION:-20200910}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+FONTDIR=$PKG/usr/share/libwmf/fonts
+mkdir -p $FONTDIR
+cp -a fonts/*.{t1,afm} $FONTDIR
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a LICENSE $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+#cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/libwmf-type1-fonts/libwmf-type1-fonts.info b/system/libwmf-type1-fonts/libwmf-type1-fonts.info
new file mode 100644
index 0000000000..22e7c0cbc9
--- /dev/null
+++ b/system/libwmf-type1-fonts/libwmf-type1-fonts.info
@@ -0,0 +1,10 @@
+PRGNAM="libwmf-type1-fonts"
+VERSION="20200910"
+HOMEPAGE="https://github.com/ArtifexSoftware/urw-base35-fonts/"
+DOWNLOAD="https://github.com/ArtifexSoftware/urw-base35-fonts/archive/20200910/urw-base35-fonts-20200910.tar.gz"
+MD5SUM="eb78ab0b6eb4115fc1a68c8f2a81abf6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/libwmf-type1-fonts/slack-desc b/system/libwmf-type1-fonts/slack-desc
new file mode 100644
index 0000000000..c26eae6d60
--- /dev/null
+++ b/system/libwmf-type1-fonts/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+libwmf-type1-fonts: libwmf-type1-fonts (URW base 35 postscript fonts for libwmf)
+libwmf-type1-fonts:
+libwmf-type1-fonts: These Type 1 fonts are required for Slackware's libwmf package to be
+libwmf-type1-fonts: able to render text. They're installed to /usr/share/libwmf/fonts, so
+libwmf-type1-fonts: they're not available for other uses.
+libwmf-type1-fonts:
+libwmf-type1-fonts:
+libwmf-type1-fonts:
+libwmf-type1-fonts:
+libwmf-type1-fonts:
+libwmf-type1-fonts:
diff --git a/system/flSynclient/doinst.sh b/system/lilyterm/doinst.sh
index 5fb28930db..5fb28930db 100644
--- a/system/flSynclient/doinst.sh
+++ b/system/lilyterm/doinst.sh
diff --git a/system/lilyterm/lilyterm.SlackBuild b/system/lilyterm/lilyterm.SlackBuild
index 6d4a4a5835..19ead3a65b 100644
--- a/system/lilyterm/lilyterm.SlackBuild
+++ b/system/lilyterm/lilyterm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lilyterm
 
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - add doinst.sh (needed update-desktop-database).
+# - abs path to icon in .desktop file.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lilyterm
-VERSION=${VERSION:-0.9.9.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.9.9.4}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,9 +76,12 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
+
+sed -i '/^Icon/s,=.*,=/usr/share/pixmaps/lilyterm.png,' \
+       data/$PRGNAM.desktop
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -77,19 +91,15 @@ CXXFLAGS="$SLKCFLAGS" \
 
 make
 make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+strip $PKG/usr/bin/$PRGNAM
 
 # Fix mandir and docdir
 mv $PKG/usr/share/man $PKG/usr/man
+gzip -9 $PKG/usr/man/man*/*
 mkdir -p $PKG/usr/doc
 mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
 rm -fr $PKG/usr/share/doc
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS ChangeLog COPYING README TODO \
@@ -98,6 +108,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lilyterm/lilyterm.info b/system/lilyterm/lilyterm.info
index 18760fdefe..c7f00b5797 100644
--- a/system/lilyterm/lilyterm.info
+++ b/system/lilyterm/lilyterm.info
@@ -1,10 +1,10 @@
 PRGNAM="lilyterm"
-VERSION="0.9.9.2"
+VERSION="0.9.9.4"
 HOMEPAGE="https://lilyterm.luna.com.tw/index.html"
-DOWNLOAD="https://lilyterm.luna.com.tw/file/lilyterm-0.9.9.2.tar.gz"
-MD5SUM="d68dd29ce4894f765adba1efd470f90e"
+DOWNLOAD="https://lilyterm.luna.com.tw/file/lilyterm-0.9.9.4.tar.gz"
+MD5SUM="3bbfd4037d45a16b1b45846ce51d100a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="vte2"
 MAINTAINER="Emil Torofiev"
 EMAIL="etorofiev@gmail.com"
diff --git a/system/limine/README b/system/limine/README
new file mode 100644
index 0000000000..2e884f189b
--- /dev/null
+++ b/system/limine/README
@@ -0,0 +1,3 @@
+Limine is a modern, advanced, portable, multiprotocol bootloader, also
+limine: used as the reference implementation for the Limine boot
+protocol.
diff --git a/system/limine/README.SBo b/system/limine/README.SBo
new file mode 100644
index 0000000000..a3b5bfafbe
--- /dev/null
+++ b/system/limine/README.SBo
@@ -0,0 +1,23 @@
+USAGE
+=====
+
+Posibly prepend the commands with 'sudo':
+
+```
+EFI_PART_MOUNTPT=/boot/efi
+mkdir -p "$EFI_PART_MOUNTPT"/EFI/BOOT
+
+# Install Limine.
+cp /usr/share/limine-"$(limine-version)"/limine/BOOTX64.EFI \
+	"$EFI_PART_MOUNTPT"/EFI/BOOT/BOOTX64.EFI
+# Install Limine config.
+cp /usr/share/limine-"$(limine-version)"/limine/limine-sample.cfg \
+	"$EFI_PART_MOUNTPT/limine.cfg"
+
+$EDITOR "$EFI_PART_MOUNTPT"/limine.cfg # Adjust the paths as needed.
+```
+
+SEE ALSO
+========
+
+1. To understand UEFI - https://kovmir.eu/posts/uefi_demystified.html
diff --git a/system/limine/limine-sample.cfg b/system/limine/limine-sample.cfg
new file mode 100644
index 0000000000..34aeb2411d
--- /dev/null
+++ b/system/limine/limine-sample.cfg
@@ -0,0 +1,22 @@
+TIMEOUT=5 # Boot prompt timeout in seconds.
+TERM_FONT_SCALE=2x2 # Scale font both vertically and horizontally.
+
+# Example Slackware boot entry.
+# Limine can boot Linux natively.
+#
+# boot:// refers to the partition limine config is located at.
+:Slackware
+	PROTOCOL=linux
+	KERNEL_PATH=boot:///EFI/Slackware/vmlinuz   # Adjust kernel path.
+	MODULE_PATH=boot:///EFI/Slackware/initrd.gz # Adjust ramdisk path.
+	CMDLINE=root=/dev/sda3 vga=normal ro        # Adjust root filesystem path.
+
+# Example MS Windows entry using UEFI bootloader chainloading.
+# Limine cannot boot MS Windows natively, so it will instead launch the UEFI
+# bootloader provided by MS Windows and let it do the job.
+#
+# This entry refers to the partition by its UUID, invoke `sudo blkid` to list
+# out partition UUIDs.
+:Windows
+	PROTOCOL=chainload
+	IMAGE_PATH=uuid://6c1ac528-cc9a-804d-b28a-82b7ae8ec9d7/EFI/Microsoft/Boot/bootmgfw.efi
diff --git a/system/limine/limine.SlackBuild b/system/limine/limine.SlackBuild
new file mode 100644
index 0000000000..309d917533
--- /dev/null
+++ b/system/limine/limine.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# Slackware build script for limine
+
+# Copyright 2023 Ivan Kovmir <i@kovmir.eu>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd "$(dirname "$0")" ; CWD=$(pwd)
+
+PRGNAM=limine
+VERSION=${VERSION:-7.3.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+NAMVER=$PRGNAM-$VERSION
+
+if [ -z "$ARCH" ]; then
+	case "$(uname -m)" in
+		i?86) ARCH=ia32 ;;
+		arm*) ARCH=aarch64 ;;
+		*) ARCH=$(uname -m) ;;
+	esac
+fi
+
+if [ -n "${PRINT_PACKAGE_NAME}" ]; then
+	echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+	exit 0
+fi
+
+TMP="${TMP:-/tmp/SBo}"
+SRC="$TMP/$NAMVER"
+PKG="$TMP/package-$PRGNAM"
+OUTPUT="${OUTPUT:-/tmp}"
+
+if [ "$ARCH" = "i586" ]; then
+	SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+	SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+	SLKCFLAGS="-O2 -fPIC"
+else
+	SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf "$PKG"
+mkdir -p "$TMP" "$PKG" "$OUTPUT"
+cd "$TMP"
+rm -rf "$PRGNAM-$VERSION"
+tar xvf "$CWD/$PRGNAM-$VERSION.tar.gz"
+cd "$PRGNAM-$VERSION"
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
+
+INSTPREFIX='/usr'
+
+CFLAGS="$SLKCFLAGS" CROSS_TOOLCHAIN='llvm' ./configure \
+		--bindir="$INSTPREFIX/bin" \
+		--docdir="$INSTPREFIX/doc/$NAMVER" \
+		--datarootdir="$INSTPREFIX/share/$NAMVER" \
+		--includedir="$INSTPREFIX/include" \
+		--mandir="$INSTPREFIX/man" \
+		"--enable-uefi-$ARCH"
+make
+make install-strip DESTDIR="$PKG"
+
+find "$PKG$INSTPREFIX/man" -type f -exec gzip {} +;
+
+mkdir -p "$PKG/install"
+mkdir -p "$PKG/usr/doc/$NAMVER"
+mkdir -p "$PKG/usr/share/$NAMVER"
+cat "$CWD/$PRGNAM.SlackBuild" > "$PKG/usr/doc/$NAMVER/$PRGNAM.SlackBuild"
+cat "$CWD/README"             > "$PKG/usr/doc/$NAMVER/README"
+cat "$CWD/limine-sample.cfg"  > "$PKG/usr/share/$NAMVER/limine/limine-sample.cfg"
+cat "$CWD/slack-desc"         > "$PKG/install/slack-desc"
+
+# Copy useful things directly from the repository folder.
+cat "$SRC/CONFIG.md"     > "$PKG/usr/doc/$NAMVER/CONFIG.md"
+cat "$SRC/COPYING"       > "$PKG/usr/share/$NAMVER/LICENSE"
+cat "$SRC/PHILOSOPHY.md" > "$PKG/usr/share/$NAMVER/PHILOSOPHY.md"
+cat "$SRC/PROTOCOL.md"   > "$PKG/usr/share/$NAMVER/PROTOCOL.md"
+cat "$SRC/README.md"     > "$PKG/usr/doc/$NAMVER/repository-README.md"
+
+cd "$PKG"
+/sbin/makepkg -l y -c n "$OUTPUT/$NAMVER-$ARCH-$BUILD$TAG.$PKGTYPE"
diff --git a/system/limine/limine.info b/system/limine/limine.info
new file mode 100644
index 0000000000..05f9a52420
--- /dev/null
+++ b/system/limine/limine.info
@@ -0,0 +1,10 @@
+PRGNAM="limine"
+VERSION="7.3.1"
+HOMEPAGE="https://limine-bootloader.org/"
+DOWNLOAD="https://github.com/limine-bootloader/limine/releases/download/v7.3.1/limine-7.3.1.tar.gz"
+MD5SUM="51a80cfdccb2e883ed70bc3057aa4ac9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Ivan Kovmir"
+EMAIL="i@kovmir.eu"
diff --git a/system/limine/slack-desc b/system/limine/slack-desc
new file mode 100644
index 0000000000..31095c328f
--- /dev/null
+++ b/system/limine/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+limine: limine (Modern, advanced, portable, multiprotocol bootloader)
+limine:
+limine: Limine is a modern, advanced, portable, multiprotocol bootloader,
+limine: also limine: used as the reference implementation for the Limine
+limine: boot protocol.
+limine:
+limine:
+limine:
+limine:
+limine: https://github.com/limine-bootloader/limine
+limine:
diff --git a/system/linkchecker/linkchecker.SlackBuild b/system/linkchecker/linkchecker.SlackBuild
index 6e7375b2b9..a410787967 100644
--- a/system/linkchecker/linkchecker.SlackBuild
+++ b/system/linkchecker/linkchecker.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for linkchecker
 
-# Copyright 2013-2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2013-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=linkchecker
 SRCNAM=LinkChecker
 VERSION=${VERSION:-9.3}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -74,7 +84,7 @@ find -L . \
 # https://github.com/wummel/linkchecker/commit/c2ce810c3fb00b895a841a7be6b2e78c64e7b042
 patch -p1 < $CWD/fix-python-requests.patch
 
-python setup.py install --root=$PKG
+python2 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -97,4 +107,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/linkchecker/linkchecker.info b/system/linkchecker/linkchecker.info
index c24ee2a855..ee42d2ffc2 100644
--- a/system/linkchecker/linkchecker.info
+++ b/system/linkchecker/linkchecker.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://pypi.python.org/packages/source/L/LinkChecker/LinkChecker-9.3.
 MD5SUM="d7ba7ff04715022af5574b4e6cccbd27"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-requests"
+REQUIRES="qt4"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/system/linux-libertine-fonts/linux-libertine-fonts.SlackBuild b/system/linux-libertine-fonts/linux-libertine-fonts.SlackBuild
index 6860a1e3ab..90fbbfb2fe 100644
--- a/system/linux-libertine-fonts/linux-libertine-fonts.SlackBuild
+++ b/system/linux-libertine-fonts/linux-libertine-fonts.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for linux-libertine-fonts
 
@@ -24,10 +24,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=linux-libertine-fonts
 VERSION=${VERSION:-5.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM1=LinLibertineTTF
 SRCNAM2=LinLibertineOTF
@@ -35,7 +38,14 @@ RELDATE=${RELDATE:-2012_07_02}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -70,4 +80,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/linux-vt-setcolors/linux-vt-setcolors.SlackBuild b/system/linux-vt-setcolors/linux-vt-setcolors.SlackBuild
index 48957505e6..e4cc84e2b0 100644
--- a/system/linux-vt-setcolors/linux-vt-setcolors.SlackBuild
+++ b/system/linux-vt-setcolors/linux-vt-setcolors.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for linux-vt-setcolors
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
@@ -11,10 +11,13 @@
 # and a VT102 are monochrome terminals, so neither name is all that
 # accurate...
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=linux-vt-setcolors
 VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -24,7 +27,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -70,7 +77,7 @@ cp -a LICENSE* README* example-colors $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,\\\$VERSION,$VERSION," $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/linux-vt-setcolors/linux-vt-setcolors.info b/system/linux-vt-setcolors/linux-vt-setcolors.info
index 92ee0d8c30..77c34e87b5 100644
--- a/system/linux-vt-setcolors/linux-vt-setcolors.info
+++ b/system/linux-vt-setcolors/linux-vt-setcolors.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/linuxconsoletools/README b/system/linuxconsoletools/README
index 7d3b6e9b5a..6d412534a1 100644
--- a/system/linuxconsoletools/README
+++ b/system/linuxconsoletools/README
@@ -9,23 +9,20 @@ to test and configure joysticks, connect legacy devices to the kernel's
 input subsystem (providing support for serial mice, touchscreens etc.),
 and test the input event layer.
 
-Optional dependency: SDL2. This is only required for ffmvforce (force
-orientation test for force-feedback devices). If SDL2 is not installed,
-ffmvforce won't be included in the package.
-
 Notes:
 
 - This replaces the "joystick" build that was previously available.
 
-- Included in this build is a simple udev rule to automatically restore the
-  joystick configuration(s); see the package README in the documentation
-  directory for more specific rules.
+- Included in this build is a simple udev rule to automatically restore
+  the joystick configuration(s); see the package README in the
+  documentation directory for more specific rules.
 
-- By default, this build includes a newer version of /usr/bin/inputattach,
+- By default, this build includes a new version of /usr/bin/inputattach,
   which overwrites the one from Slackware's gpm package. The new
-  inputattach should behave identically to the old one, except that it
-  supports many more devices, and is capable of running as a daemon. It
-  also has a man page, which the old one didn't have. If you have problems
-  with the new inputattach, reinstall gpm and then rebuild this package
-  with GPM_COMPAT=yes set in the environment. With this option, the new
-  inputattach will be installed as /usr/bin/inputattach-lct.
+  inputattach should behave identically to the old one, except
+  that it supports many more devices, and is capable of running
+  as a daemon. It also has a man page, which the old one didn't
+  have. If you have problems with the new inputattach, reinstall
+  gpm and then rebuild this package with GPM_COMPAT=yes set in the
+  environment. With this option, the new inputattach will be installed
+  as /usr/bin/inputattach-lct.
diff --git a/system/linuxconsoletools/linuxconsoletools.SlackBuild b/system/linuxconsoletools/linuxconsoletools.SlackBuild
index 9de107a555..1e0c50fe5c 100644
--- a/system/linuxconsoletools/linuxconsoletools.SlackBuild
+++ b/system/linuxconsoletools/linuxconsoletools.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for linuxconsoletools
 
 # Copyright 2011-2012 Roberto Neri, Palermo, Italy
+# Copyright 2021 B. Watson <urchlay@slackware.uk>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,6 +23,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20221228 bkw: update for v1.8.1
+# 20210223 bkw: update for v1.7.1
 # 20191129 bkw: update for v1.7.0, document new optional SDL2 dep.
 # 20181030 bkw: add GPM_COMPAT=yes option, minor cleanups, BUILD=2
 # 20161015 bkw: update for v1.6.0
@@ -30,10 +33,13 @@
 # 20140315 bkw: took over maintenance, updated for 1.4.7,
 #               replaced patch with a bit of sed.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=linuxconsoletools
-VERSION=${VERSION:-1.7.0}
+VERSION=${VERSION:-1.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -43,7 +49,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -109,4 +119,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/linuxconsoletools/linuxconsoletools.info b/system/linuxconsoletools/linuxconsoletools.info
index a337df9362..50f49c1ce9 100644
--- a/system/linuxconsoletools/linuxconsoletools.info
+++ b/system/linuxconsoletools/linuxconsoletools.info
@@ -1,10 +1,10 @@
 PRGNAM="linuxconsoletools"
-VERSION="1.7.0"
+VERSION="1.8.1"
 HOMEPAGE="https://sourceforge.net/projects/linuxconsole/"
-DOWNLOAD="https://downloads.sourceforge.net/linuxconsole/linuxconsoletools-1.7.0.tar.bz2"
-MD5SUM="b30c4daa2329d9af316045657370ee27"
+DOWNLOAD="https://downloads.sourceforge.net/linuxconsole/linuxconsoletools-1.8.1.tar.bz2"
+MD5SUM="e68b6f473d81715e7be836b88fff6afe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/lirc/README b/system/lirc/README
index b73cf20eb3..5117ea673e 100644
--- a/system/lirc/README
+++ b/system/lirc/README
@@ -1,10 +1,10 @@
-LIRC is a package that allows you to decode and send infra-red signals of many
-(but not all) commonly used remote controls.
+LIRC is a package that allows you to decode and send infra-red signals
+of many (but not all) commonly used remote controls.
 
-Former versions focussed on home-brew hardware connected to the serial or
-parallel port. Current versions of LIRC also support a variety of other
-hardware.
+Former versions focussed on home-brew hardware connected to the serial
+or parallel port. Current versions of LIRC also support a variety of
+other hardware.
 
-NOTE: for FTDI chips support you need install libftdi and ftdi_eeprom from
-http://www.intra2net.com/en/developer/libftdi/
-before running the slackbuild.
+NOTE: for FTDI chips support you need install libftdi and ftdi_eeprom
+from http://www.intra2net.com/en/developer/libftdi/ before running the
+SlackBuild.
diff --git a/system/lirc/doinst.sh b/system/lirc/doinst.sh
index 404db1c946..05eac47004 100644
--- a/system/lirc/doinst.sh
+++ b/system/lirc/doinst.sh
@@ -12,7 +12,3 @@ config etc/lircd.conf.new
 config etc/lircmd.conf.new
 config etc/lircrc.new
 config etc/logrotate.d/lirc.new
-
-if [ -x sbin/depmod ]; then
-  chroot . /sbin/depmod -ae @KERNEL@ 1> /dev/null 2> /dev/null
-fi
diff --git a/system/lirc/gi.patch b/system/lirc/gi.patch
new file mode 100644
index 0000000000..63e966eeae
--- /dev/null
+++ b/system/lirc/gi.patch
@@ -0,0 +1,13 @@
+diff --git a/tools/lirc-setup/mvc_control.py b/tools/lirc-setup/mvc_control.py
+index 9d0548a..16395f6 100644
+--- a/tools/lirc-setup/mvc_control.py
++++ b/tools/lirc-setup/mvc_control.py
+@@ -1,5 +1,8 @@
+ ''' Simple lirc setup tool - control part. '''
+ 
++import gi
++gi.require_version('Gtk', '3.0')
++
+ from gi.repository import Gtk         # pylint: disable=no-name-in-module
+ 
+ import os
diff --git a/system/lirc/lirc.SlackBuild b/system/lirc/lirc.SlackBuild
index 20b1e09d51..eca6bc1474 100644
--- a/system/lirc/lirc.SlackBuild
+++ b/system/lirc/lirc.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lirc
 
 # Copyright 2009  Murat D. Kadirov <banderols@gmail.com>
-# Copyright 2015  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
+# Copyright 2015-2022  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,29 +25,49 @@
 
 #  Modified for 0.9.3a by Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
 
+# 20220211 bkw: BUILD=4.
+# - fix build on 15.0 (PyYAML issue).
+# - lirc doesn't ship a kernel module any more, so get rid of the
+#   KERNEL variable and don't put the kernel version in the package's
+#   version.
+# - install usable HTML conversions of the man pages (instead of
+#   identical broken ones).
+# - considered upgrading to 0.10.1 (latest release), but it still has
+#   the same problems (HTML man conversions and PyYAML), and I don't have
+#   any IR hardware to test this with, so I'll leave it at the (presumably)
+#   maintainer-tested version 0.9.3a.
+
+# 20211121 bkw: BUILD=3. install all docs to
+# /usr/doc/$PRGNAM-$VERSION, instead of /usr/share/doc/$PRGNAM. Also
+# don't include useless INSTALL in doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lirc
 VERSION=${VERSION:-0.9.3a}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-5}
 TAG=${TAG:-_SBo}
-
-KERNEL=${KERNEL:-$(uname -r)}
-PKG_VERS=${VERSION}_$(echo $KERNEL| tr - _)
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKG_VERS-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,15 +89,39 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Patch to fix config.status warning for lirc-driver.pc.in ignoring --datarootdir
 patch -p1 < $CWD/datarootdir.patch
 
+# Patch to fix lirc-setup to force gtk3
+# Thanks to Martin Schmidt for the heads up and the patch
+patch -p1 < $CWD/gi.patch
+
+# 20220211 bkw: Fix for PyYAML >= 5.1
+sed -i \
+  's|yaml.load(f.read())|yaml.load(f.read(), Loader=yaml.FullLoader)|' \
+  tools/check_configs.py \
+  tools/lirc-setup/mvc_model.py \
+  doc/data2hwdb \
+  doc/data2table
+
+# 20220211 bkw: Source ships with HTML conversions of man pages, but
+# make thinks it needs to regenerate them. Touching them doesn't help,
+# it always tries to convert them regardless of timestamps. And the
+# conversion fails, because our man2html (from man-db) doesn't support
+# the -M and -r options. It doesn't stop the Makefile from finishing,
+# but all the html pages end up broken/useless. The configure script
+# reads an environment variable MAN2HTML, which... does nothing. We
+# can't even copy them, let make overwrite them, and restore the
+# originals, because 'make install' will regenerate them again.
+
+# So save the originals, let 'make install' generate and install the
+# broken ones, then copy the originals to $PKG/usr/doc afterwards.
+cp -a doc/man-html doc/man-html.shipped
+
+MAN2HTML=no \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -90,7 +134,23 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make -j1
-make install DESTDIR=$PKG
+
+# 20211121 bkw: the top-level Makefile doesn't pass docdir to
+# doc/Makefile, unless we set it here also.
+make install-strip DESTDIR=$PKG docdir=/usr/doc/$PRGNAM-$VERSION
+
+# 20220211 bkw: $PKG/usr/doc now contains a bunch of broken HTML
+# files that just contain the usage message for man2html. Replace them
+# with pre-generated files upstream ships. Why does this have to be
+# so complex?
+cp -a doc/man-html.shipped/*.html $PKG/usr/doc/$PRGNAM-$VERSION/lirc.org/html
+
+gzip -9 $PKG/usr/man/man*/*
+
+# 20220211 bkw: not sure if the .la files in /usr/lib(64?)/lirc/plugins
+# are actually needed, so leave them. they won't bother anything, being
+# in their own private directory.
+rm -f $PKG/usr/lib*/*.la
 
 mkdir -p $PKG/lib/udev/rules.d
 cat contrib/lirc.rules > $PKG/lib/udev/rules.d/96-lirc.rules
@@ -101,26 +161,19 @@ cat contrib/lircmd.conf > $PKG/etc/lircmd.conf.new
 cat contrib/lircrc > $PKG/etc/lircrc.new
 cat $CWD/lirc.logrotate > $PKG/etc/logrotate.d/lirc.new
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-# This is an empty file :|
-rm -f $PKG/usr/man/man1/smode2.1.gz
+# HTML docs are already installed in $PKGDOC/html
+cp -a AUTHORS COPYING ChangeLog NEWS README doc/irxevent.keys $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 # Fixup doc owner & mode
-chown -R root:root $PKG/usr/share/doc/lirc/lirc.org/api-docs
-chmod -R go-w      $PKG/usr/share/doc/lirc/lirc.org/api-docs
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
-  doc/{html,irxevent.keys} $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+chown -R root:root $PKGDOC
+chmod -R go-w      $PKGDOC
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERS-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lirc/lirc.info b/system/lirc/lirc.info
index 4b5767ee9b..41a9697d3b 100644
--- a/system/lirc/lirc.info
+++ b/system/lirc/lirc.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/project/lirc/LIRC/0.9.3a/lirc-0.9.3a.
 MD5SUM="f9ed5dd0684a52c7cd98672e71e81b05"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-PyYAML"
+REQUIRES=""
 MAINTAINER="Jeremy Hansen"
-EMAIL="jebrhansen+SBo -at- gmail.com"
+EMAIL="jebrhansen+SBo@gmail.com"
diff --git a/system/listpkg/listpkg.SlackBuild b/system/listpkg/listpkg.SlackBuild
index 0fb268c08f..522315a06d 100644
--- a/system/listpkg/listpkg.SlackBuild
+++ b/system/listpkg/listpkg.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for listpkg
 # Copyright 2018 Jefferson Rocha <root@slackjeff.com.br>
@@ -21,13 +21,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=listpkg
 VERSION=${VERSION:-0.1a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -57,4 +67,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lnav/lnav.SlackBuild b/system/lnav/lnav.SlackBuild
index 515b0b549c..e7aeaa800f 100644
--- a/system/lnav/lnav.SlackBuild
+++ b/system/lnav/lnav.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lnav
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lnav
-VERSION=${VERSION:-0.9.0}
+VERSION=${VERSION:-0.12.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -90,11 +100,11 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README INSTALL NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lnav/lnav.info b/system/lnav/lnav.info
index 799593cbbf..4a36ab42b7 100644
--- a/system/lnav/lnav.info
+++ b/system/lnav/lnav.info
@@ -1,8 +1,8 @@
 PRGNAM="lnav"
-VERSION="0.9.0"
+VERSION="0.12.0"
 HOMEPAGE="http://lnav.org"
-DOWNLOAD="https://github.com/tstack/lnav/releases/download/v0.9.0/lnav-0.9.0.tar.gz"
-MD5SUM="77e87ccda75ba2c4f223ffac55392716"
+DOWNLOAD="https://github.com/tstack/lnav/releases/download/v0.12.0/lnav-0.12.0.tar.gz"
+MD5SUM="1d14c51ce2ebf2bd84906eafd67a9584"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/local-persist/README b/system/local-persist/README
index 7ebe8ec4a5..655df8c8d5 100644
--- a/system/local-persist/README
+++ b/system/local-persist/README
@@ -2,3 +2,7 @@ Local-persist is a docker plugin that provides persistent local volumes.
 This gives you the same benefits of standalone volumes that "docker
 volume create" normally affords, while also allowing you to create
 volumes that persist in arbitrary disk locations.
+
+Warning: This SlackBuild requires network access when it runs, meaning
+it downloads files from the Internet with root access. You should
+decide for yourself whether or not you think this is a good idea.
diff --git a/system/local-persist/local-persist.SlackBuild b/system/local-persist/local-persist.SlackBuild
index 2aaa2fd26c..83f2bb82dc 100644
--- a/system/local-persist/local-persist.SlackBuild
+++ b/system/local-persist/local-persist.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for local-persist
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=local-persist
 VERSION=${VERSION:-1.3.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -48,6 +58,78 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+# replace glide with go modules
+# https://github.com/MatchbookLab/local-persist/pull/82
+cat << EOF > go.mod
+module local-persist
+
+go 1.15
+
+require (
+	github.com/Microsoft/go-winio v0.3.6-0.20160621211438-ce2922f643c8 // indirect
+	github.com/Sirupsen/logrus v0.7.3 // indirect
+	github.com/coreos/go-systemd v0.0.0-20161102170722-64d5cd7cb947 // indirect
+	github.com/coreos/pkg v0.0.0-20161026222926-447b7ec906e5 // indirect
+	github.com/docker/distribution v2.5.0-rc.1.0.20161102195617-fbe6e8d212ed+incompatible // indirect
+	github.com/docker/engine-api v0.4.0
+	github.com/docker/go-connections v0.2.2-0.20161031182214-f512407a188e // indirect
+	github.com/docker/go-plugins-helpers v0.0.0-20161031114640-60d242cfd0fb
+	github.com/docker/go-units v0.3.2-0.20161020213227-8a7beacffa30 // indirect
+	github.com/fatih/color v1.1.0
+	github.com/mattn/go-colorable v0.0.7-0.20161102080925-6e26b354bd2b // indirect
+	github.com/mattn/go-isatty v0.0.0-20160806122752-66b8e73f3f5c // indirect
+	github.com/opencontainers/runc v1.0.0-rc2.0.20161102180326-49ed0a10e4ed // indirect
+	github.com/stevvooe/resumable v0.0.0-20180830230917-22b14a53ba50 // indirect
+	github.com/stretchr/testify v1.7.0 // indirect
+	golang.org/x/net v0.0.0-20160322021652-4876518f9e71
+	golang.org/x/sys v0.0.0-20161023150541-c200b10b5d5e // indirect
+)
+EOF
+cat << EOF > go.sum
+github.com/Microsoft/go-winio v0.3.6-0.20160621211438-ce2922f643c8 h1:Qp3i6ZUVcAOeTQj0KBsivXCfsnvsBASQYfXXS/N34NY=
+github.com/Microsoft/go-winio v0.3.6-0.20160621211438-ce2922f643c8/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/Sirupsen/logrus v0.7.3 h1:G04jzNEnKQKTemyvbCV32zFbOu+D++ECKnCFazUjPdc=
+github.com/Sirupsen/logrus v0.7.3/go.mod h1:rmk17hk6i8ZSAJkSDa7nOxamrG+SP4P0mm+DAvExv4U=
+github.com/coreos/go-systemd v0.0.0-20161102170722-64d5cd7cb947 h1:9zLgi/vHKaTOHO7YtcSvAzSiytU13fhg/w5t8YOM/Ho=
+github.com/coreos/go-systemd v0.0.0-20161102170722-64d5cd7cb947/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20161026222926-447b7ec906e5 h1:aqoxNZ9nyZ9kabG+daqglH9RtWIbpxDjVQMoUsoVHuo=
+github.com/coreos/pkg v0.0.0-20161026222926-447b7ec906e5/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/docker/distribution v2.5.0-rc.1.0.20161102195617-fbe6e8d212ed+incompatible h1:6W0HnJhig6393/Qm1Qv/4mhZl/TdsVuRP24WRVkCi64=
+github.com/docker/distribution v2.5.0-rc.1.0.20161102195617-fbe6e8d212ed+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/engine-api v0.4.0 h1:D0Osr6+45yAlQqLyoczv5qJtAu+P0HB0rLCddck03wY=
+github.com/docker/engine-api v0.4.0/go.mod h1:xtQCpzf4YysNZCVFfIGIm7qfLvYbxtLkEVVfKhTVOvw=
+github.com/docker/go-connections v0.2.2-0.20161031182214-f512407a188e h1:jcaJgljPmPKABWQTL7kZ4bn75pxBwDrzW9PcLkqkH7o=
+github.com/docker/go-connections v0.2.2-0.20161031182214-f512407a188e/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
+github.com/docker/go-plugins-helpers v0.0.0-20161031114640-60d242cfd0fb h1:3PbRNm4EK4EszBwI3UR2Wv6IR9tT+PozgOdgJjSq8hs=
+github.com/docker/go-plugins-helpers v0.0.0-20161031114640-60d242cfd0fb/go.mod h1:LFyLie6XcDbyKGeVK6bHe+9aJTYCxWLBg5IrJZOaXKA=
+github.com/docker/go-units v0.3.2-0.20161020213227-8a7beacffa30 h1:bANAGhKtjG23j8rJr6QEKZJlUaRhiTuq7kCaYV9Ggbg=
+github.com/docker/go-units v0.3.2-0.20161020213227-8a7beacffa30/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/fatih/color v1.1.0 h1:4RQHlUrrLRssqNPpcM+ZLy+alwucmC4mkIGTbiVdCeY=
+github.com/fatih/color v1.1.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/mattn/go-colorable v0.0.7-0.20161102080925-6e26b354bd2b h1:QDkLN5n0HZJHlRE6QtBlrhuHgiQVYBuJ+R7gfyJBQ84=
+github.com/mattn/go-colorable v0.0.7-0.20161102080925-6e26b354bd2b/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-isatty v0.0.0-20160806122752-66b8e73f3f5c h1:3nKFouDdpgGUV/uerJcYWH45ZbJzX0SiVWfTgmUeTzc=
+github.com/mattn/go-isatty v0.0.0-20160806122752-66b8e73f3f5c/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/opencontainers/runc v1.0.0-rc2.0.20161102180326-49ed0a10e4ed h1:CO6K4Ex3bZFJrue+c19dYXE0ZCa9qoux6JSPMZKEeHw=
+github.com/opencontainers/runc v1.0.0-rc2.0.20161102180326-49ed0a10e4ed/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stevvooe/resumable v0.0.0-20180830230917-22b14a53ba50 h1:4bT0pPowCpQImewr+BjzfUKcuFW+KVyB8d1OF3b6oTI=
+github.com/stevvooe/resumable v0.0.0-20180830230917-22b14a53ba50/go.mod h1:1pdIZTAHUz+HDKDVZ++5xg/duPlhKAIzw9qy42CWYp4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+golang.org/x/net v0.0.0-20160322021652-4876518f9e71 h1:uzpLVINUETeZRto6ZphAoh11snmPXlRiUF+rNKPHlO8=
+golang.org/x/net v0.0.0-20160322021652-4876518f9e71/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sys v0.0.0-20161023150541-c200b10b5d5e h1:uau++4dmjGy3TuvPvRbhZHY+TQVsImIxtWY5HRh9eho=
+golang.org/x/sys v0.0.0-20161023150541-c200b10b5d5e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+EOF
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -60,7 +142,7 @@ if [ -x /etc/profile.d/go.sh ]; then
   . /etc/profile.d/go.sh
 fi
 
-go mod init local-persist
+go mod download
 make binary
 
 mkdir -p $PKG/usr/bin $PKG/etc/rc.d $PKG/install
@@ -82,4 +164,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/localepurge/README b/system/localepurge/README
deleted file mode 100644
index 8e173925f3..0000000000
--- a/system/localepurge/README
+++ /dev/null
@@ -1,14 +0,0 @@
-localepurge (remove superfluous locale data)
-
-localepurge removes superfluous locale data from your system. It is a
-small  script  to recover disk space wasted for unneeded locale files
-and localized man pages.
-
-This  is a script to recover disk space wasted for unneeded  locales,
-Gnome/KDE localizations  and  localized  man pages.  Depending on the
-installation, it is possible to save some 200, 300, or even more mega
-bytes of disk space dedicated for localization you will most probably
-never have any use for.
-
-Before use of localepurge, please edit /etc/locale.nopurge commenting
-the line: NEEDSCONFIGFIRST.
diff --git a/system/localepurge/doinst.sh b/system/localepurge/doinst.sh
deleted file mode 100644
index a631ab8e99..0000000000
--- a/system/localepurge/doinst.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/locale.nopurge.new
diff --git a/system/localepurge/locale.nopurge b/system/localepurge/locale.nopurge
deleted file mode 100644
index 489a35d410..0000000000
--- a/system/localepurge/locale.nopurge
+++ /dev/null
@@ -1,56 +0,0 @@
-####################################################
-# This is the configuration file for localepurge(8).
-####################################################
-# Comment this to enable localepurge.
-# DO NOT COMMENT IT IF YOU ARE NOT SURE WHAT ARE YOU DOING
-# THIS APP DOES NOT ASK FOR CONFIRMATION
-
-NEEDSCONFIGFIRST
-
-####################################################
-# Uncommenting this string enables removal of localized
-# man pages based on the configuration information for
-# locale files defined below:
-
-MANDELETE
-
-####################################################
-# Uncommenting this string causes localepurge to simply delete
-# locales which have newly appeared on the system without
-# bothering you about it:
-
-#DONTBOTHERNEWLOCALE
-
-#####################################################
-# Commenting out this string enables faster but less
-# accurate calculation of freed disk space:
-
-#QUICKNDIRTYCALC
-
-####################################################
-# Uncommenting this string enables display of freed disk
-# space if localepurge has purged any superfluous data:
-
-SHOWFREEDSPACE
-
-#####################################################
-# Commenting out this string disables verbose output:
-
-#VERBOSE
-
-#####################################################
-# You like Colors?
-
-#NOCOLOR
-
-#####################################################
-# You can use the -v -d -nc options in command line.
-
-#####################################################
-# Following locales won't be deleted from this system
-# for example:
-en
-en_GB
-en_GB.UTF-8
-en_US
-en_US.UTF-8
diff --git a/system/localepurge/localelist b/system/localepurge/localelist
deleted file mode 100644
index 07827230e4..0000000000
--- a/system/localepurge/localelist
+++ /dev/null
@@ -1,204 +0,0 @@
-af
-am
-an
-ang
-ar
-as
-ast
-az
-az_IR
-bal
-be
-be@latin
-bg
-bg_BG
-bn
-bn_IN
-br
-brx
-bs
-byn
-ca
-ca.us-ascii
-ca@valencia
-cmn
-crh
-cs
-cs_CZ
-csb
-currency
-cy
-da
-de
-de.us-ascii
-de@hebrew
-de_AT
-de_CH
-de_DE
-dz
-el
-en
-en@arabic
-en@boldquot
-en@cyrillic
-en@greek
-en@hebrew
-en@piglatin
-en@quot
-en@shaw
-en_AU
-en_CA
-en_GB
-en_US
-eo
-es
-es_419
-es_AR
-es_ES
-es_MX
-et
-eu
-fa
-fa_IR
-fi
-fo
-fr
-fr_CA
-fr_FR
-fur
-fy
-ga
-gd
-gez
-gl
-gr
-gu
-haw
-he
-hi
-hne
-hr
-hu
-hu_HU
-hy
-ia
-id
-id_ID
-io
-is
-it
-it_IT
-ja
-ja_JP
-ka
-kg
-kk
-km
-kn
-ko
-ko_KR
-kok
-ks
-ku
-ku_IQ
-ky
-l10n
-lg
-li
-lo
-locale
-lt
-lv
-mai
-mg
-mhr
-mi
-mk
-ml
-ml_IN
-mn
-mr
-ms
-ms_MY
-mt
-my
-my_MM
-nb
-nds
-ne
-nhn
-nl
-nl_NL
-nn
-no
-no.us-ascii
-nso
-oc
-or
-pa
-pl
-ps
-pt
-pt.us-ascii
-pt_BR
-pt_BR.us-ascii
-pt_PT
-rm
-ro
-ru
-ru_RU
-ru_UA
-rw
-sd
-se
-si
-sk
-sl
-so
-sp
-sq
-sr
-sr@Latn
-sr@ije
-sr@ijekavian
-sr@ijekavianlatin
-sr@latin
-sr_RS
-sv
-sv_SE
-sw
-szl
-ta
-te
-tg
-th
-ti
-tig
-tk
-tl
-tlh
-tr
-tt
-tt@iqtelif
-ug
-uk
-uk_UA
-ur
-ur_PK
-uz
-uz@Latn
-uz@cyrillic
-ve
-vi
-wa
-wal
-wo
-xh
-yi
-zh
-zh_CN
-zh_CN.GB2312
-zh_HK
-zh_TW
-zh_TW.Big5
-zu
diff --git a/system/localepurge/localepurge.SlackBuild b/system/localepurge/localepurge.SlackBuild
deleted file mode 100644
index a2619e8c5f..0000000000
--- a/system/localepurge/localepurge.SlackBuild
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for localepurge.
-#
-# Copyright 2016-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=localepurge
-VERSION=${VERSION:-0.7.3.10}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_${VERSION}.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-install -D -m755 usr/sbin/localepurge $PKG/usr/bin/localepurge
-install -D -m644 debian/localepurge.8 $PKG/usr/man/man8/localepurge.8
-install -D -m755 debian/localepurge.config $PKG/usr/bin/localepurge-config
-install -D -m644 $CWD/locale.nopurge $PKG/etc/locale.nopurge.new
-
-if [ ! -e /var/cache/localepurge/localelist ]; then
-  find /usr/share/locale -maxdepth 1 -type d -name "*" -printf "%f\n" | grep "^[a-z]" | cut -d" " -f1 | sort -u > $CWD/localelist
-else
-  install -D -m644 $CWD/localelist /var/cache/localepurge/localelist
-fi
-
-install -D -m644 $CWD/localelist $PKG/var/cache/localepurge/localelist
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-DOCS="debian/README.Debian debian/changelog debian/copyright"
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/localepurge/localepurge.info b/system/localepurge/localepurge.info
deleted file mode 100644
index 6014256630..0000000000
--- a/system/localepurge/localepurge.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="localepurge"
-VERSION="0.7.3.10"
-HOMEPAGE="https://packages.debian.org/search?keywords=localepurge"
-DOWNLOAD="http://deb.debian.org/debian/pool/main/l/localepurge/localepurge_0.7.3.10.tar.xz"
-MD5SUM="cafa19c565e5156c7947c0094fe76a3c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Edinaldo P. Silva"
-EMAIL="edps.mundognu@gmail.com"
diff --git a/system/localepurge/slack-desc b/system/localepurge/slack-desc
deleted file mode 100644
index b7f8f3e446..0000000000
--- a/system/localepurge/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-           |-----handy-ruler------------------------------------------------------|
-localepurge: localepurge (remove superfluous locale data)
-localepurge:
-localepurge: localepurge removes superfluous locale data from your system. It is a
-localepurge: small script to recover disk space wasted for unneeded locale files
-localepurge: and localized man pages.
-localepurge:
-localepurge: Home page: https://packages.debian.org/search?keywords=localepurge
-localepurge:
-localepurge:
-localepurge:
-localepurge:
diff --git a/system/locust/README b/system/locust/README
new file mode 100644
index 0000000000..300f4d4236
--- /dev/null
+++ b/system/locust/README
@@ -0,0 +1,2 @@
+Locust is an easy to use, scriptable and scalable performance testing
+tool.
diff --git a/system/locust/locust.SlackBuild b/system/locust/locust.SlackBuild
new file mode 100644
index 0000000000..9ee283a301
--- /dev/null
+++ b/system/locust/locust.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+# Slackware build script for locust
+
+# Copyright 2021-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=locust
+VERSION=${VERSION:-2.26.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Since dependency python3-pyzmq uses a newer version of setuptools via
+# python3-setuptools-opt, we need to adjust PYTHONPATH to use it here too.
+PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
+export PYTHONPATH=/opt/python$PYVER/site-packages/
+
+python3 -m build --wheel --no-isolation
+
+python3 -m installer --destdir "$PKG" dist/*.whl
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README LICENSE PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/locust/locust.info b/system/locust/locust.info
new file mode 100644
index 0000000000..88dcde1d56
--- /dev/null
+++ b/system/locust/locust.info
@@ -0,0 +1,10 @@
+PRGNAM="locust"
+VERSION="2.26.0"
+HOMEPAGE="https://github.com/locustio/locust"
+DOWNLOAD="https://files.pythonhosted.org/packages/3d/94/fe78c17e7cdcc606aab1a244936e70f9d9d1cff9368af3554bd523b9466a/locust-2.26.0.tar.gz"
+MD5SUM="777451c112311aee0dd57f76770e7a04"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3-geventhttpclient python3-Flask-Basicauth python3-pyzmq msgpack-python zope.interface zope.event python3-psutil python3-configargparse typing-extensions roundrobin python3-Flask-Cors python3-blinker python3-Flask-Login"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/system/locust/slack-desc b/system/locust/slack-desc
new file mode 100644
index 0000000000..49ae7d8c57
--- /dev/null
+++ b/system/locust/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+locust: locust (performance testing tool)
+locust:
+locust: Locust is an easy to use, scriptable and scalable performance testing
+locust: tool.
+locust:
+locust:
+locust:
+locust: Project URL: https://github.com/locustio/locust
+locust:
+locust:
+locust:
diff --git a/system/loggedfs/README b/system/loggedfs/README
index 829d936be5..90617bc62f 100644
--- a/system/loggedfs/README
+++ b/system/loggedfs/README
@@ -1,16 +1,21 @@
 loggedfs (filesystem monitoring with FUSE)
 
 LoggedFS is a fuse-based filesystem which can log every operation that
-happens in it. LoggedFS only sends a message to syslog (or a file) when
-called by fuse and then let the real filesystem do the rest of the job.
+happens in it. LoggedFS only sends a message to syslog (or a file)
+when called by fuse and then lets the real filesystem do the rest of
+the job.
+
+There is a sample config file installed as /etc/loggedfs.xml, for use
+with the -c option.
 
 Note: loggedfs doesn't cross filesystem boundaries. If you e.g. have
-/usr/local mounted as a separate partition, monitoring /usr won't also
-monitor /usr/local (though you can always run another instance of loggedfs
-in that case).
+/usr/local mounted as a separate partition, monitoring /usr won't
+also monitor /usr/local (though you can always run another instance of
+loggedfs in that case).
 
-Slackware note: since Slackware's /etc/mtab is a regular file (not a
-symlink to /proc/mounts), killing a loggedfs process causes its /etc/mtab
-entry to stay. This makes it look like the filesystem is still mounted,
-though it actually isn't. To avoid this, always use "fusermount -u"
-to cleanly umount the fs, which will also make the loggedfs process exit.
+Slackware note: since Slackware's /etc/mtab is a regular file (not
+a symlink to /proc/mounts), killing a loggedfs process causes its
+/etc/mtab entry to stay. This makes it look like the filesystem is
+still mounted, though it actually isn't. To avoid this, always use
+"fusermount -u" to cleanly umount the fs, which will also make the
+loggedfs process exit.
diff --git a/system/loggedfs/loggedfs.SlackBuild b/system/loggedfs/loggedfs.SlackBuild
index 66432962a5..3e7349dad1 100644
--- a/system/loggedfs/loggedfs.SlackBuild
+++ b/system/loggedfs/loggedfs.SlackBuild
@@ -1,17 +1,24 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for loggedfs
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230423 bkw: this got removed 2 years ago because it depended on rlog,
+# which got removed... only, this didn't actually depend on rlog. Re-adding.
+# BUILD=2 because I added a small patch to fix the grammar in the man page.
+
 # 20180612 bkw: updated for v0.9. script will no longer build old version.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=loggedfs
 VERSION=${VERSION:-0.9}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -21,7 +28,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -49,11 +60,10 @@ rm -rf $PRGNAM-$PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+patch -p1 < $CWD/manpage_grammar.diff
 
 sed -i "s,-Wall,& $SLKCFLAGS," Makefile
 
@@ -74,4 +84,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/loggedfs/loggedfs.info b/system/loggedfs/loggedfs.info
index aae8a8371f..0d9afac038 100644
--- a/system/loggedfs/loggedfs.info
+++ b/system/loggedfs/loggedfs.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/rflament/loggedfs/archive/loggedfs-0.9/loggedfs-log
 MD5SUM="d04761535b471a15b7bd4475d0fb3483"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="rlog"
+REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/loggedfs/manpage_grammar.diff b/system/loggedfs/manpage_grammar.diff
new file mode 100644
index 0000000000..a6166133fd
--- /dev/null
+++ b/system/loggedfs/manpage_grammar.diff
@@ -0,0 +1,29 @@
+diff -Naur loggedfs-loggedfs-0.9/loggedfs.1 loggedfs-loggedfs-0.9.patched/loggedfs.1
+--- loggedfs-loggedfs-0.9/loggedfs.1	2018-03-26 04:34:32.000000000 -0400
++++ loggedfs-loggedfs-0.9.patched/loggedfs.1	2023-04-23 02:34:49.572040899 -0400
+@@ -11,7 +11,7 @@
+ .B ...
+ .SH DESCRIPTION
+ .B LoggedFS 
+-is a transparent fuse-filesystem which allows to log every operations that happens in the backend filesystem. Logs can be written to syslog, to a file, or to the standard output. LoggedFS comes with a XML configuration file in which you can choose exactly what you want to log and what you don't want to log. You can add filters on users, operations (open, read, write, chown, chmod, etc.), filenames , and return code. Filename's filters are regular expressions.
++is a transparent fuse-filesystem which allows logging every operation that happens in the backend filesystem. Logs can be written to syslog, to a file, or to the standard output. LoggedFS comes with an XML configuration file in which you can choose exactly what you want to log and what you don't want to log. You can add filters on users, operations (open, read, write, chown, chmod, etc.), filenames, and return codes. Filename filters are regular expressions.
+ .SH OPTIONS
+ .IP -f
+ Do not start as a daemon. Write logs to stdout if no log file is specified.
+@@ -22,13 +22,13 @@
+ .IP "-l log-file"
+ Use the
+ .I log-file
+-to write logs to. If no log file is specified then logs are only written to syslog or to stdout, depending on -f.
++to write logs to. If no log file is specified, then logs are only written to syslog or to stdout, depending on -f.
+ .IP -p
+-Allow every users to see the new loggedfs. 
++Allow every user to see the new loggedfs.
+ .SH FILES
+ .I /etc/fuse.conf
+ .RS
+-The system wide configuration file.
++The system wide FUSE configuration file.
+ .RE
+ .SH AUTHOR
+ Remi Flament <remipouak@gmail.com>
diff --git a/system/loggedfs/slack-desc b/system/loggedfs/slack-desc
index 7ef4c59139..6df7a4af7c 100644
--- a/system/loggedfs/slack-desc
+++ b/system/loggedfs/slack-desc
@@ -10,7 +10,7 @@ loggedfs: loggedfs (filesystem monitoring with FUSE)
 loggedfs:
 loggedfs: LoggedFS is a fuse-based filesystem which can log every operation
 loggedfs: that happens in it. Fuse does almost everything. LoggedFS only
-loggedfs: sends a message to syslog when called by fuse and then let the real
+loggedfs: sends a message to syslog when called by fuse and then lets the real
 loggedfs: filesystem do the rest of the job.
 loggedfs:
 loggedfs:
diff --git a/system/logkeys/README b/system/logkeys/README
index bd492a915a..34fcf52dfa 100644
--- a/system/logkeys/README
+++ b/system/logkeys/README
@@ -1,6 +1,7 @@
-logkeys is a linux keylogger. It is no more advanced than other available linux
-keyloggers, notably lkl and uberkey, but is a bit newer, more up to date, it
-doesn't unreliably repeat keys and it shouldn't crash your X. All in all, it
-just seems to work. It relies on event interface of the Linux input subsystem.
-Once completely set, it logs all common character and function keys, while also
-being fully aware of Shift and AltGr key modifiers.
+logkeys is a linux keylogger. It is no more advanced than other
+available linux keyloggers, notably lkl and uberkey, but is a bit
+newer, more up to date, it doesn't unreliably repeat keys and it
+shouldn't crash your X. All in all, it just seems to work. It relies
+on event interface of the Linux input subsystem. Once completely set,
+it logs all common character and function keys, while also being fully
+aware of Shift and AltGr key modifiers.
diff --git a/system/logkeys/logkeys.SlackBuild b/system/logkeys/logkeys.SlackBuild
index 180988d634..e56be4c4a5 100644
--- a/system/logkeys/logkeys.SlackBuild
+++ b/system/logkeys/logkeys.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for logkeys
 
-# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2022  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=logkeys
-VERSION=${VERSION:-0.1.1c}
+VERSION=${VERSION:-0.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,6 +79,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+./autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -95,11 +106,11 @@ find $PKG -name perllocal.pod \
   | xargs rm -f
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog README.md TODO INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/logkeys/logkeys.info b/system/logkeys/logkeys.info
index a92da6a7f4..f023ccfe87 100644
--- a/system/logkeys/logkeys.info
+++ b/system/logkeys/logkeys.info
@@ -1,8 +1,8 @@
 PRGNAM="logkeys"
-VERSION="0.1.1c"
+VERSION="0.2.0"
 HOMEPAGE="https://github.com/kernc/logkeys"
-DOWNLOAD="https://github.com/kernc/logkeys/archive/0.1.1c.tar.gz"
-MD5SUM="656f031f067b986f66226af391712b7c"
+DOWNLOAD="https://github.com/kernc/logkeys/archive/0.2.0/logkeys-0.2.0.tar.gz"
+MD5SUM="333a0b97fc50f98dcf5cf7202dec51ab"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/logpp/logpp.SlackBuild b/system/logpp/logpp.SlackBuild
index 0e8de44193..3a2beae70c 100644
--- a/system/logpp/logpp.SlackBuild
+++ b/system/logpp/logpp.SlackBuild
@@ -1,28 +1,38 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for logpp
 # Written by Diogo Leal (diogo@diogoleal.com)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=logpp
 VERSION=${VERSION:-0.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -77,4 +87,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/logtool/README b/system/logtool/README
deleted file mode 100644
index 5a24f3c387..0000000000
--- a/system/logtool/README
+++ /dev/null
@@ -1,13 +0,0 @@
-logtool (log analyzer)
-
-Logtool is a command line program that will parse ASCII logfiles into
-a more palatable format.  It will take anything resembling a syslog 
-or multilog file (this includes syslog-ng, and probably most of the 
-other variants out there), and crunch it into one of the following 
-formats for your viewing pleasure: 
-
- * ANSI (colorized for easy "at a glance" viewing) 
- * ASCII (for e-mail'ed reports, and term's that don't support color) 
- * CSV (for importing into your favorite spreadsheet/database) 
- * HTML (for generating web pages) 
- * RAW (for no good reason)
diff --git a/system/logtool/logtool.SlackBuild b/system/logtool/logtool.SlackBuild
deleted file mode 100644
index a1baaddb01..0000000000
--- a/system/logtool/logtool.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for logtool.
-#
-# Copyright 2015-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=logtool
-VERSION=${VERSION:-1.3.1}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc/logtool \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp CHANGES COPYING CREDITS Changes INSTALL README TODO USAGE $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/logtool/logtool.info b/system/logtool/logtool.info
deleted file mode 100644
index f8615dd11c..0000000000
--- a/system/logtool/logtool.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="logtool"
-VERSION="1.3.1"
-HOMEPAGE="http://xjack.org/logtool/download/"
-DOWNLOAD="http://xjack.org/logtool/download/logtool-1.3.1.tar.gz"
-MD5SUM="7da0564dc0fea4f0470d61168871f9c2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
diff --git a/system/logtool/slack-desc b/system/logtool/slack-desc
deleted file mode 100644
index 1d2c8f58e4..0000000000
--- a/system/logtool/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-logtool: logtool (log analyzer)
-logtool:
-logtool: Logtool is a command line program that will parse ASCII logfiles into
-logtool: a more palatable format.
-logtool:
-logtool: Homepage: http://xjack.org/logtool/download/
-logtool:
-logtool:
-logtool:
-logtool:
-logtool:
diff --git a/system/logwatch/logwatch.SlackBuild b/system/logwatch/logwatch.SlackBuild
index 01b45f4253..380daada03 100644
--- a/system/logwatch/logwatch.SlackBuild
+++ b/system/logwatch/logwatch.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for logwatch
 
-# Copyright (c) 2019 Gregory J.L. Tourte <artourter@gmail.com>
+# Copyright (c) 2019-2024 Gregory J. L. Tourte <artourter@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,13 +22,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=logwatch
-VERSION=${VERSION:-7.5.5}
+VERSION=${VERSION:-7.10}
 BUILD=${BUILD:-1}
 ARCH=noarch
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -109,4 +119,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/logwatch/logwatch.info b/system/logwatch/logwatch.info
index 8adcf7d5ad..d219c835e6 100644
--- a/system/logwatch/logwatch.info
+++ b/system/logwatch/logwatch.info
@@ -1,10 +1,10 @@
 PRGNAM="logwatch"
-VERSION="7.5.5"
+VERSION="7.10"
 HOMEPAGE="http://logwatch.sourceforge.net"
-DOWNLOAD="https://downloads.sourceforge.net/project/logwatch/logwatch-7.5.5/logwatch-7.5.5.tar.gz"
-MD5SUM="b658e4db27d905151396ecadcbcb24b1"
+DOWNLOAD="https://downloads.sourceforge.net/project/logwatch/logwatch-7.10/logwatch-7.10.tar.gz"
+MD5SUM="df483fac40fc618029f1ca07ba352659"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="perl-html-parser"
 MAINTAINER="ArTourter"
 EMAIL="artourter@gmail.com"
diff --git a/system/loksh/README b/system/loksh/README
index 9d779b4600..23a313dcc2 100644
--- a/system/loksh/README
+++ b/system/loksh/README
@@ -1,2 +1,6 @@
 loksh is a Linux port of OpenBSD's ksh. It is a small, interactive shell
 targeted at resource-constrained systems.
+
+For a debug build, use:
+
+  DEBUG=yes ./loksh.SlackBuild
diff --git a/system/loksh/loksh.SlackBuild b/system/loksh/loksh.SlackBuild
index 9a57d890d4..b17f14c8b0 100644
--- a/system/loksh/loksh.SlackBuild
+++ b/system/loksh/loksh.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for loksh
 
 # Copyright 2018-2020 Hunter Sezen California, USA
+# Copyright 2023-2024 K. Eugene Carlson Tsukuba, JP
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=loksh
-VERSION=${VERSION:-6.8.1}
+VERSION=${VERSION:-7.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,23 +39,26 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -eu
@@ -80,10 +87,9 @@ fi
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-meson \
+meson setup \
   --prefix=/ \
   --bindir=bin \
-  --libdir=usr/lib${LIBDIRSUFFIX} \
   --mandir=usr/man \
   --datadir=usr \
   -Dstrip=$NDEBUG \
@@ -96,8 +102,9 @@ DESTDIR=$PKG "$NINJA" -C build install
 
 mv -- $PKG/bin/ksh $PKG/bin/$PRGNAM
 mv -- $PKG/usr/man/man1/ksh.1 $PKG/usr/man/man1/$PRGNAM.1
-mv -- $PKG/usr/man/man1/sh.1 $PKG/usr/man/man1/$PRGNAM-sh.1
 mv -- $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
+# bash is the default sh in Slackware, so this page is unwanted.
+rm -f $PKG/usr/man/man1/sh.1
 
 mkdir -p $PKG/usr/bin
 ln -s /bin/$PRGNAM $PKG/usr/bin/$PRGNAM
@@ -113,4 +120,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/loksh/loksh.info b/system/loksh/loksh.info
index eb380c2afa..c151c83ede 100644
--- a/system/loksh/loksh.info
+++ b/system/loksh/loksh.info
@@ -1,10 +1,10 @@
 PRGNAM="loksh"
-VERSION="6.8.1"
+VERSION="7.5"
 HOMEPAGE="https://github.com/dimkr/loksh"
-DOWNLOAD="https://github.com/dimkr/loksh/releases/download/6.8.1/loksh-6.8.1.tar.xz"
-MD5SUM="aad60aef7562ad4cf029411032892c2d"
+DOWNLOAD="https://github.com/dimkr/loksh/releases/download/7.5/loksh-7.5.tar.xz"
+MD5SUM="49f28a294d5768e6a5a39fbd16f43095"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="meson"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+REQUIRES=""
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/loksh/slack-desc b/system/loksh/slack-desc
index 3673d2ad2a..186ed2717f 100644
--- a/system/loksh/slack-desc
+++ b/system/loksh/slack-desc
@@ -11,9 +11,9 @@ loksh:
 loksh: loksh is a Linux port of OpenBSD's ksh. It is a small, interactive
 loksh: shell targeted at resource-constrained systems.
 loksh:
+loksh: Port Author: Dima Krasner
 loksh: Homepage: https://github.com/dimkr/loksh
 loksh:
 loksh:
 loksh:
 loksh:
-loksh:
diff --git a/system/lolcat/lolcat.SlackBuild b/system/lolcat/lolcat.SlackBuild
index 5b591c2421..47e5cf7aa8 100644
--- a/system/lolcat/lolcat.SlackBuild
+++ b/system/lolcat/lolcat.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for lolcat.
 #
-# Copyright 2019-2021  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2019-2023  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lolcat
-VERSION=${VERSION:-1.2}
+VERSION=${VERSION:-1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -84,4 +94,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lolcat/lolcat.info b/system/lolcat/lolcat.info
index 7b8e2bfd3c..5f0d918b38 100644
--- a/system/lolcat/lolcat.info
+++ b/system/lolcat/lolcat.info
@@ -1,8 +1,8 @@
 PRGNAM="lolcat"
-VERSION="1.2"
+VERSION="1.4"
 HOMEPAGE="https://github.com/jaseg/lolcat"
-DOWNLOAD="https://github.com/jaseg/lolcat/archive/v1.2/lolcat-1.2.tar.gz"
-MD5SUM="d1a7f8a4ddee5affe84de2d6ffa055e5"
+DOWNLOAD="https://github.com/jaseg/lolcat/archive/v1.4/lolcat-1.4.tar.gz"
+MD5SUM="138b7d6cc73abcb420546ee4711d2890"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/lomoco/lomoco.SlackBuild b/system/lomoco/lomoco.SlackBuild
index 021c458b9e..78522cad38 100644
--- a/system/lomoco/lomoco.SlackBuild
+++ b/system/lomoco/lomoco.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lomoco
 # Copyright 2011 David Woodfall <dave@slackbuilds.org>
@@ -21,10 +21,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lomoco
 VERSION=${VERSION:-1.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,7 +37,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -68,6 +78,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Removed in glibc-2.33
+sed -i "/stropts.h/d" src/lomoco.h
+
 ./autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -99,4 +112,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lomoco/lomoco.info b/system/lomoco/lomoco.info
index 1cd4b6ba22..675e7f8e91 100644
--- a/system/lomoco/lomoco.info
+++ b/system/lomoco/lomoco.info
@@ -6,5 +6,5 @@ MD5SUM="f5197d0a3ee81229c3eecc1e03f7b08d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
+MAINTAINER="D Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/system/lsb-release/lsb-release.SlackBuild b/system/lsb-release/lsb-release.SlackBuild
index 40e8293469..3add9e69c0 100644
--- a/system/lsb-release/lsb-release.SlackBuild
+++ b/system/lsb-release/lsb-release.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lsb_release
 
@@ -22,38 +22,29 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220212 bkw: Modified by SlackBuilds.org:
+# - stop writing to $CWD. *nothing* should *ever* do this.
+# - make this a noarch package since there's no compiled code.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lsb-release
 VERSION=${VERSION:-1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -63,32 +54,25 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod -x *
+chmod +x help2man lsb_release
 
 make
 make install prefix=$PKG/usr
 
 # create lsb config file and install it into the $PKG directory
 DIST_VER=`cut -d " " -f 2 /etc/slackware-version`
-sed "s/current/$DIST_VER/" $CWD/$PRGNAM.slk > $CWD/$PRGNAM.etc
 mkdir -p $PKG/etc
-cp $CWD/$PRGNAM.etc $PKG/etc/$PRGNAM
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+sed "s/current/$DIST_VER/" $CWD/$PRGNAM.slk > $PKG/etc/$PRGNAM
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lsb-release/lsb-release.etc b/system/lsb-release/lsb-release.etc
deleted file mode 100644
index a5da09854e..0000000000
--- a/system/lsb-release/lsb-release.etc
+++ /dev/null
@@ -1,4 +0,0 @@
-LSB_VERSION=1.4
-DISTRIB_ID=slackware
-DISTRIB_RELEASE=14.2
-DISTRIB_DESCRIPTION="Slackware Linux "
diff --git a/system/lsb-release/lsb-release.slk b/system/lsb-release/lsb-release.slk
index 34511b30c7..3a84c8d6bd 100644
--- a/system/lsb-release/lsb-release.slk
+++ b/system/lsb-release/lsb-release.slk
@@ -1,4 +1,4 @@
 LSB_VERSION=1.4
 DISTRIB_ID=slackware
 DISTRIB_RELEASE=current
-DISTRIB_DESCRIPTION="Slackware Linux "
+DISTRIB_DESCRIPTION="Slackware Linux"
diff --git a/system/lshw/README b/system/lshw/README
index f917315f0f..04d64576eb 100644
--- a/system/lshw/README
+++ b/system/lshw/README
@@ -1,15 +1,27 @@
-lshw (Hardware Lister) is a small tool to provide detailed information on 
-the hardware configuration of the machine. It can report exact memory 
-configuration, firmware version, mainboard configuration, CPU version and 
-speed, cache configuration, bus speed, etc. on DMI-capable x86 or EFI 
-(IA-64) systems and on some PowerPC machines (PowerMac G4 is known to work).
+lshw (Hardware Lister) is a small tool to provide detailed information
+on the hardware configuration of the machine. It can report exact memory
+configuration, firmware version, mainboard configuration, CPU version
+and speed, cache configuration, bus speed, etc. on DMI-capable x86 or
+EFI (IA-64) systems and on some PowerPC machines (PowerMac G4 is known
+to work).
 
 Information can be output in plain text, XML, or HTML.
 
 It currently supports DMI (x86 and EFI only), OpenFirmware device tree
-(PowerPC only), PCI/AGP, ISA PnP (x86), CPUID (x86), IDE/ATA/ATAPI, PCMCIA 
-(only tested on x86), USB, and SCSI.
+(PowerPC only), PCI/AGP, ISA PnP (x86), CPUID (x86), IDE/ATA/ATAPI,
+PCMCIA (only tested on x86), USB, and SCSI.
 
-On x86, lshw needs to be run as root to be able to access DMI information 
-from the BIOS. Running lshw as a non-root user usually gives much less 
-detailed information.
+On x86, lshw needs to be run as root to be able to access DMI
+information from the BIOS. Running lshw as a non-root user usually gives
+much less detailed information.
+
+There several build options available for the SlackBuild:
+
+  GUI=no           Disable GTK GUI support (default: yes)
+  ZLIB=yes         Enable zlib support (default: no)
+  SQLITE=yes       Enable sqlite support (default: no)
+
+where one or more build options are passed to the SlackBuild. For
+example, to disable GUI and enable zlib support use:
+
+  GUI=no ZLIB=yes ./lshw.SlackBuild
diff --git a/system/lshw/lshw.SlackBuild b/system/lshw/lshw.SlackBuild
index 0b24779004..2839e24a9c 100644
--- a/system/lshw/lshw.SlackBuild
+++ b/system/lshw/lshw.SlackBuild
@@ -1,12 +1,47 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lshw
-# Written by Iskar Enev <iskar.enev[@]gmail.com>
+
+# Iskar Enev <iskar.enev[@]gmail.com>
+# Copyright 2017,2021 Jason Graham <jgraham@compukix.net> USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=lshw
-VERSION=${VERSION:-B.02.18}
+VERSION=${VERSION:-B.02.19.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+GUI=${GUI:-yes}
+if [ "$ZLIB" = "no" ]; then
+    ENABLE_ZLIB=0
+else
+    ENABLE_ZLIB=1
+fi
+if [ "$SQLITE" = "no" ]; then
+    ENABLE_SQLITE=0
+else
+    ENABLE_SQLITE=1
+fi
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -16,7 +51,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -53,10 +95,19 @@ find -L . \
 # Fix the MANDIR variable
 sed -i "s%MANDIR=\$(PREFIX)/share/man%MANDIR=\$(PREFIX)/man%" src/Makefile
 
-RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" make
-RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" make gui
-make install DESTDIR=$PKG
-make install-gui DESTDIR=$PKG
+VERSION=$VERSION RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" \
+  make ZLIB=$ENABLE_ZLIB SQLITE=$ENABLE_SQLITE
+if [ "$GUI" = "yes" ]; then
+  VERSION=VERSION RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" \
+    make gui ZLIB=$ENABLE_ZLIB SQLITE=$ENABLE_SQLITE
+fi
+
+VERSION=$VERSION RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" \
+  make install DESTDIR=$PKG ZLIB=$ENABLE_ZLIB SQLITE=$ENABLE_SQLITE
+if [ "$GUI" = "yes" ]; then
+  VERSION=$VERSION RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" \
+    make install-gui DESTDIR=$PKG ZLIB=$ENABLE_ZLIB SQLITE=$ENABLE_SQLITE
+fi
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -64,8 +115,10 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-mkdir -p $PKG/usr/share/applications
-cat $CWD/gtk-lshw.desktop > $PKG/usr/share/applications/gtk-lshw.desktop
+if [ "$GUI" = "yes" ]; then
+  mkdir -p $PKG/usr/share/applications
+  cat $CWD/gtk-lshw.desktop > $PKG/usr/share/applications/gtk-lshw.desktop
+fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a docs/* COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
@@ -76,4 +129,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lshw/lshw.info b/system/lshw/lshw.info
index 4c8d8ae4c5..d6da2e38a2 100644
--- a/system/lshw/lshw.info
+++ b/system/lshw/lshw.info
@@ -1,10 +1,10 @@
 PRGNAM="lshw"
-VERSION="B.02.18"
+VERSION="B.02.19.2"
 HOMEPAGE="https://ezix.org/project/wiki/HardwareLiSter"
-DOWNLOAD="https://www.ezix.org/software/files/lshw-B.02.18.tar.gz"
-MD5SUM="8671c6d94d6324a744b7f21f1bfecfd2"
+DOWNLOAD="https://www.ezix.org/software/files/lshw-B.02.19.2.tar.gz"
+MD5SUM="8c70d46e906688309095c73ecb9396e3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jason Graham"
-EMAIL="jgraha8@gmail.com"
+EMAIL="jgraham@compukix.net"
diff --git a/system/lssecret/README b/system/lssecret/README
new file mode 100644
index 0000000000..2b2cdec52f
--- /dev/null
+++ b/system/lssecret/README
@@ -0,0 +1,4 @@
+lssecret lists all secret items in a secret service using libsecret,
+including their labels, secret values, keys, and values. For example, it
+can be used to list all the passwords and keys stored in a GNOME
+Keyring.
diff --git a/system/lssecret/lssecret.SlackBuild b/system/lssecret/lssecret.SlackBuild
new file mode 100644
index 0000000000..5131094005
--- /dev/null
+++ b/system/lssecret/lssecret.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+# Copyright Lockywolf 2023
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=lssecret
+VERSION=${VERSION:-20230106_7f6378}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+COMMIT=7f63780a8621305a8cc5e0455a603654e472fd30
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$COMMIT
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.?z
+cd $PRGNAM-$COMMIT
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+
+mkdir -p $PKG/usr
+make install DESTDIR=$PKG/usr
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+
+mkdir -p $PKG/install
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -ra README.md  $PKG/usr/doc/$PRGNAM-$VERSION/
+
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lssecret/lssecret.info b/system/lssecret/lssecret.info
new file mode 100644
index 0000000000..6d168170b0
--- /dev/null
+++ b/system/lssecret/lssecret.info
@@ -0,0 +1,10 @@
+PRGNAM="lssecret"
+VERSION="20230106_7f6378"
+HOMEPAGE="https://github.com/gileshuang/lssecret"
+DOWNLOAD="https://github.com/gileshuang/lssecret/archive/7f63780a8621305a8cc5e0455a603654e472fd30/lssecret-7f63780a8621305a8cc5e0455a603654e472fd30.tar.gz"
+MD5SUM="7c91162817f89c6621252c03f8f250b9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.lssecret_2023-05-16@lockywolf.net"
diff --git a/system/lssecret/slack-desc b/system/lssecret/slack-desc
new file mode 100644
index 0000000000..1997c2616a
--- /dev/null
+++ b/system/lssecret/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+lssecret: lssecret (command-line tool to list secrets from libsecret)
+lssecret:
+lssecret: lssecret lists all secret items in a secret service using libsecret,
+lssecret: including their labels, secret values, keys, and values. For example,
+lssecret: is can be used to list all the passwords and keys stored in a GNOME
+lssecret: Keyring.
+lssecret:
+lssecret:
+lssecret:
+lssecret:
+lssecret:
diff --git a/system/lsyncd/lsyncd.SlackBuild b/system/lsyncd/lsyncd.SlackBuild
index 35e731ed72..7c8b67d0c2 100644
--- a/system/lsyncd/lsyncd.SlackBuild
+++ b/system/lsyncd/lsyncd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lsyncd
 
@@ -23,20 +23,30 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lsyncd
 VERSION=${VERSION:-2.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -99,4 +109,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/luckybackup/README b/system/luckybackup/README
index abf04ce152..90e39a2a18 100644
--- a/system/luckybackup/README
+++ b/system/luckybackup/README
@@ -1,3 +1,4 @@
-luckybackup is a powerful, fast and reliable backup & sync tool that relies
-on rsync.  It is written and maintained by Loukas Avgeriou.  The program has
-a graphical frontend as well as a commandline frontend.
+luckybackup is a powerful, fast and reliable backup & sync tool that
+relies on rsync. It is written and maintained by Loukas Avgeriou.
+The program has a graphical frontend as well as a commandline
+frontend.
diff --git a/system/luckybackup/luckybackup.SlackBuild b/system/luckybackup/luckybackup.SlackBuild
index f20c8ef1df..426db86cd4 100644
--- a/system/luckybackup/luckybackup.SlackBuild
+++ b/system/luckybackup/luckybackup.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for luckybackup
 
@@ -21,10 +21,13 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=luckybackup
 VERSION=${VERSION:-0.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,7 +37,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -74,7 +84,7 @@ patch -p0 < $CWD/luckybackup.pro.patch
 sed -i "s/PROGVERSION/$VERSION/" ./luckybackup.pro
 sed -i "s,/usr/share/doc/luckybackup/,/usr/doc/luckybackup-$VERSION/,g" src/global.cpp
 
-qmake luckybackup.pro \
+qmake-qt5 luckybackup.pro \
   QMAKE_CFLAGS="$SLKCFLAGS" \
   QMAKE_CXXFLAGS="$SLKCFLAGS"
 
@@ -96,4 +106,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lv/lv.SlackBuild b/system/lv/lv.SlackBuild
index eb8c06c100..3689d297a6 100644
--- a/system/lv/lv.SlackBuild
+++ b/system/lv/lv.SlackBuild
@@ -1,22 +1,28 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lv
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210824 bkw: update for v4.51_8, which includes all the patches
+# that used to be in patches/ here.
+
+# 20201115 bkw: add 2 new patches from Debian git, BUILD=2.
+
 # 20201111 bkw: added at v4.51_7. The original upstream for this is
 # long gone (dead website), but the maintainer of the Debian package
 # continues to develop this. So I'm treating Debian as upstream, and
 # the _7 in VERSION is the Debian patchlevel.
 
-# 20201115 bkw: add 2 new patches from Debian git, BUILD=2.
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=lv
-VERSION=${VERSION:-4.51_7}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.51_8}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -26,7 +32,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -58,18 +68,12 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# Apply all of debian's patches.
+# Apply all of debian's patches, some of which used to be part of
+# this SlackBuild (upstream likes them, yay!)
 for i in $( cat debian/patches/series ); do
   patch -p1 < "debian/patches/$i"
 done
 
-# Local patches. 4 of these were written by the SlackBuild author, sent
-# upstream (to the Debian maintainer). The height and filename patches
-# are from Debian's git.
-for i in $( cat $CWD/patches/series ); do
-  patch -p1 < "$CWD/patches/$i"
-done
-
 # I wish there were --disable-termcap and/or --enable-ncurses options.
 # The configure script is hardcoded: if termcap is found, it uses that
 # and never looks for ncurses. Since termcap is pretty well deprecated
@@ -116,4 +120,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lv/lv.info b/system/lv/lv.info
index 3d29aca4a8..7d0d69ee7c 100644
--- a/system/lv/lv.info
+++ b/system/lv/lv.info
@@ -1,12 +1,12 @@
 PRGNAM="lv"
-VERSION="4.51_7"
+VERSION="4.51_8"
 HOMEPAGE="https://packages.debian.org/sid/lv"
-DOWNLOAD="http://deb.debian.org/debian/pool/main/l/lv/lv_4.51.orig.tar.gz \
-          http://deb.debian.org/debian/pool/main/l/lv/lv_4.51-7.debian.tar.xz"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/l/lv/lv_4.51.orig.tar.gz \
+          https://deb.debian.org/debian/pool/main/l/lv/lv_4.51-8.debian.tar.xz"
 MD5SUM="893084b35a11eaaee4f71827d0092fa5 \
-        d6d2d0e27a43480b794615a02235b953"
+        ab750b6850f58922122903412c676af1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/lv/patches/change-maximum-height-to-144.patch b/system/lv/patches/change-maximum-height-to-144.patch
deleted file mode 100644
index 84b4afe0c2..0000000000
--- a/system/lv/patches/change-maximum-height-to-144.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: TOMITA Masahiro <tommy@tmtm.org>
-Description: Change maximum height to 144.
-Last-Update: 2020-10-10
-
-Index: lv/src/file.h
-===================================================================
---- lv.orig/src/file.h
-+++ lv/src/file.h
-@@ -16,7 +16,7 @@
- #include <str.h>
- #include <stream.h>
- 
--#define LV_PAGE_SIZE	32U		/* lines per page */
-+#define LV_PAGE_SIZE	48U		/* lines per page */
- 
- #ifdef MSDOS
- #define BLOCK_SIZE	2		/* segments on memory */
diff --git a/system/lv/patches/fix_implicit_decls.diff b/system/lv/patches/fix_implicit_decls.diff
deleted file mode 100644
index 1f9de61b91..0000000000
--- a/system/lv/patches/fix_implicit_decls.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Remove implicit declaration warnings by adding
-appropriate #includes, and fix a typo in a prototype.
-Author: B. Watson <yahlcru@gmail.com>
-
---
-
-diff -Naur lv-4.51.orig/src/file.h lv-4.51.orig.patched/src/file.h
---- lv-4.51.orig/src/file.h	2020-11-12 02:03:33.560002050 -0500
-+++ lv-4.51.orig.patched/src/file.h	2020-11-12 02:04:06.555999050 -0500
-@@ -172,7 +172,7 @@
- public inline int IobufGetc( iobuf_t *iobuf );
- public inline int IobufUngetc( int ch, iobuf_t *iobuf );
- public offset_t IobufFtell( iobuf_t *iobuf );
--public int IobufFseeko( iobuf_t *iobuf, offset_t off, int mode );
-+public int IobufFseek( iobuf_t *iobuf, offset_t off, int mode );
- public int IobufFeof( iobuf_t *iobuf );
- #endif
- #define IobufPutc( a, b )	putc( a, (b)->iop )
-diff -Naur lv-4.51.orig/src/guess.c lv-4.51.orig.patched/src/guess.c
---- lv-4.51.orig/src/guess.c	2003-11-12 22:08:19.000000000 -0500
-+++ lv-4.51.orig.patched/src/guess.c	2020-11-12 02:04:22.621997590 -0500
-@@ -21,6 +21,7 @@
-  */
- 
- #include <stdio.h>
-+#include <string.h>
- 
- #include <import.h>
- #include <decode.h>
-diff -Naur lv-4.51.orig/src/guesslocale.c lv-4.51.orig.patched/src/guesslocale.c
---- lv-4.51.orig/src/guesslocale.c	2004-01-05 03:41:22.000000000 -0500
-+++ lv-4.51.orig.patched/src/guesslocale.c	2020-11-12 02:04:49.294995165 -0500
-@@ -20,6 +20,8 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
-+#include <ctype.h>
-+
- #ifdef HAVE_SETLOCALE
- 
- #include <stdlib.h>
diff --git a/system/lv/patches/makefile.diff b/system/lv/patches/makefile.diff
deleted file mode 100644
index 4c55d7c5d2..0000000000
--- a/system/lv/patches/makefile.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: "make install": Support DESTDIR, use symlink for
-lgrep, use more standard default permissions (and make them
-variables). Create bin/man/lib dirs if they don't already exist.
-Author: B. Watson <yahlcru@gmail.com>
-
---
-
-diff -Naur lv-4.51.orig/src/Makefile.in lv-4.51.orig.patched/src/Makefile.in
---- lv-4.51.orig/src/Makefile.in	2004-01-06 02:22:17.000000000 -0500
-+++ lv-4.51.orig.patched/src/Makefile.in	2020-11-12 01:59:50.646022314 -0500
-@@ -18,6 +18,10 @@
- lvlibdir=	$(libdir)/lv
- distdir = lv$(VERSION)
- 
-+DESTDIR=
-+BINPERMS= 0755
-+DOCPERMS= 0644
-+
- PURIFY=	@PURIFY@
- CC=	@CC@
- CFLAGS=	@CFLAGS@ -DLV_HELP_PATH=\"$(lvlibdir)\" -I$(srcdir) @DEFS@
-@@ -64,18 +68,22 @@
- #
- 
- install::
--	$(INSTALL) -s -m 555 lv $(bindir)
--	if test -f $(bindir)/lgrep; then \
--		/bin/rm -f $(bindir)/lgrep; \
-+	if test ! -d $(DESTDIR)$(bindir); then \
-+		mkdir -p $(DESTDIR)$(bindir); \
-+	fi
-+	$(INSTALL) -s -m $(BINPERMS) lv $(DESTDIR)$(bindir)
-+	if test -f $(DESTDIR)$(bindir)/lgrep; then \
-+		/bin/rm -f $(DESTDIR)$(bindir)/lgrep; \
- 	fi
--	(cd $(bindir); ln lv lgrep)
--	if test ! -d $(lvlibdir); then \
--		mkdir -p $(lvlibdir); \
-+	(cd $(DESTDIR)$(bindir); ln -s lv lgrep)
-+	if test ! -d $(DESTDIR)$(lvlibdir); then \
-+		mkdir -p $(DESTDIR)$(lvlibdir); \
- 	fi
--	$(INSTALL) -m 444 $(srcdir)/../lv.hlp $(lvlibdir)
--	if test -d $(mandir) -a -d $(mandir)/man1; then \
--		$(INSTALL) -m 444 $(srcdir)/../lv.1 $(mandir)/man1; \
-+	$(INSTALL) -m $(DOCPERMS) $(srcdir)/../lv.hlp $(DESTDIR)$(lvlibdir)
-+	if test ! -d $(DESTDIR)$(mandir)/man1; then \
-+		mkdir -p $(DESTDIR)$(mandir)/man1; \
- 	fi
-+	$(INSTALL) -m $(DOCPERMS) $(srcdir)/../lv.1 $(DESTDIR)$(mandir)/man1; \
- 
- uninstall::
- 	for i in $(bindir)/lv $(bindir)/lgrep $(lvlibdir)/lv.hlp $(mandir)/man1/lv.1; do \
diff --git a/system/lv/patches/man_typos.diff b/system/lv/patches/man_typos.diff
deleted file mode 100644
index be6e2ad63d..0000000000
--- a/system/lv/patches/man_typos.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: Fix a few typos in the man & help docs.
-Author: B. Watson <yahlcru@gmail.com>
-
---
-
-diff -Naur lv-4.51.orig/lv.1 lv-4.51.orig.patched/lv.1
---- lv-4.51.orig/lv.1	2020-11-12 01:44:33.656105671 -0500
-+++ lv-4.51.orig.patched/lv.1	2020-11-12 01:45:58.092097996 -0500
-@@ -47,7 +47,7 @@
- but also as a coding-system translation filter
- like \fInkf\fP (1) and \fItcs\fP (1).
- .IP "\fIMultilingual regular expressions / Multilingual grep\fP"
--lv can recognize multi-bytes patterns as regular expressions,
-+lv can recognize multi-byte patterns as regular expressions,
- and lv also provides multilingual \fIgrep\fP (1) functionality
- by giving it another name, \fIlgrep\fP.
- Pattern matching is conducted in the charset level,
-@@ -203,7 +203,7 @@
- Allow physical lines of each logical line printed on the screen
- to be concatenated for cut and paste after screen refresh
- .IP "-s"
--Force old pages to be swept out from the screen Smoothly
-+Force old pages to be swept out from the screen smoothly
- .IP "-u"
- Unify several character sets, eg. JIS X0208 and C6226.
- In addition, lv equates ISO 646 variants,
-@@ -237,7 +237,7 @@
- Show this help
- .SH "CONFIGURATION"
- Options can be described in configuration file ``.lv'' (``_lv'' on MSDOS)
--located at you HOME directory.  If and only if you use MSDOS, you can locate
-+located in your HOME directory.  If and only if you use MSDOS, you can locate
- ``_lv'' at current working directory.
- They can be also described in the environment variable LV.
- Every configuration will be overloaded in this order if there is. Command line
-diff -Naur lv-4.51.orig/lv.hlp lv-4.51.orig.patched/lv.hlp
---- lv-4.51.orig/lv.hlp	2020-11-12 01:44:33.635105673 -0500
-+++ lv-4.51.orig.patched/lv.hlp	2020-11-12 01:45:58.098097995 -0500
-@@ -37,7 +37,7 @@
-               _t_c_s (1).
- 
-        _M_u_l_t_i_l_i_n_g_u_a_l _r_e_g_u_l_a_r _e_x_p_r_e_s_s_i_o_n_s _/ _M_u_l_t_i_l_i_n_g_u_a_l _g_r_e_p
--              lv  can  recognize  multi-bytes patterns as regular expressions,
-+              lv  can  recognize  multi-byte patterns as regular expressions,
-               and lv also provides multilingual _g_r_e_p (1) functionality by giv-
-               ing  it  another  name, _l_g_r_e_p.  Pattern matching is conducted in
-               the charset level, so an EUC fragment, for example, can be found
-@@ -183,7 +183,7 @@
-        -l     Allow physical lines of each logical line printed on the  screen
-               to be concatenated for cut and paste after screen refresh
- 
--       -s     Force old pages to be swept out from the screen Smoothly
-+       -s     Force old pages to be swept out from the screen smoothly
- 
-        -u     Unify several character sets, eg. JIS X0208 and C6226.  In addi-
-               tion, lv equates ISO 646  variants,  eg.  JIS  X0201-Roman,  and
-@@ -219,7 +219,7 @@
- 
- CCOONNFFIIGGUURRAATTIIOONN
-        Options  can  be  described  in  configuration file ``.lv'' (``_lv'' on
--       MSDOS) located at you HOME directory.  If and only if  you  use  MSDOS,
-+       MSDOS) located in your HOME directory.  If and only if  you  use  MSDOS,
-        you  can locate ``_lv'' at current working directory.  They can be also
-        described in the environment variable LV.  Every configuration will  be
-        overloaded  in  this order if there is. Command line options are always
diff --git a/system/lv/patches/no_inline.diff b/system/lv/patches/no_inline.diff
deleted file mode 100644
index ebc1eb58f6..0000000000
--- a/system/lv/patches/no_inline.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Remove inline-related compiler warnings (by not using inline)
-Author: B. Watson <yahlcru@gmail.com>
-
---
-
-diff -Naur lv-4.51.orig/src/file.h lv-4.51.orig.patched/src/file.h
---- lv-4.51.orig/src/file.h	2020-11-12 01:41:53.353120244 -0500
-+++ lv-4.51.orig.patched/src/file.h	2020-11-12 01:44:33.701105667 -0500
-@@ -169,8 +169,8 @@
- # endif
- # define IobufFeof( a )		feof( (a)->iop )
- #else
--public inline int IobufGetc( iobuf_t *iobuf );
--public inline int IobufUngetc( int ch, iobuf_t *iobuf );
-+public int IobufGetc( iobuf_t *iobuf );
-+public int IobufUngetc( int ch, iobuf_t *iobuf );
- public offset_t IobufFtell( iobuf_t *iobuf );
- public int IobufFseek( iobuf_t *iobuf, offset_t off, int mode );
- public int IobufFeof( iobuf_t *iobuf );
diff --git a/system/lv/patches/series b/system/lv/patches/series
deleted file mode 100644
index ce324941d9..0000000000
--- a/system/lv/patches/series
+++ /dev/null
@@ -1,6 +0,0 @@
-change-maximum-height-to-144.patch
-fix_implicit_decls.diff
-no_inline.diff
-man_typos.diff
-makefile.diff
-shows-the-filename-only.diff
diff --git a/system/lv/patches/shows-the-filename-only.diff b/system/lv/patches/shows-the-filename-only.diff
deleted file mode 100644
index 32912b4209..0000000000
--- a/system/lv/patches/shows-the-filename-only.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: shows the file name only if it is shorter than the width of the screen.
-Author: Oohara Yuuma <oohara@libra.interq.or.jp>
-Last-Update: 2008-01-27
-
-Index: lv/src/command.c
-===================================================================
---- lv.orig/src/command.c
-+++ lv/src/command.c
-@@ -1173,8 +1173,15 @@ public void Command( file_t *file, byte
- 	else
- 	  label = "(END)";
-       }
--      if( TRUE == f->top )
-+      if( TRUE == f->top ){
- 	label = FileName( f );
-+        /* if the file name is not shorter than the width of the screen,
-+         * it causes scrolling and moves the first line of the file
-+         * out of the screen
-+         */
-+        if ( strlen(label) >= f->width )
-+          label = NULL;
-+      }
-     }
- 
-     if( NULL != label ){
diff --git a/system/lvm2-cluster/lvm2-cluster.SlackBuild b/system/lvm2-cluster/lvm2-cluster.SlackBuild
index c923f480fa..e0ab207d53 100644
--- a/system/lvm2-cluster/lvm2-cluster.SlackBuild
+++ b/system/lvm2-cluster/lvm2-cluster.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lvm2-cluster
 
@@ -22,10 +22,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2: strip library.
+
+# 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+# This should probably be updated to match the version of lvm2 in
+# Slackware 15.0, but I leave that up to the maintainer to decide.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lvm2-cluster
 VERSION=${VERSION:-2.02.154}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=LVM2
 
@@ -37,7 +46,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,16 +80,18 @@ cd $SRCNAM.$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+sed -i '1i#include <sys/sysmacros.h>' lib/filters/filter-sysfs.c
 
 # Copied from lvm2.SlackBuild
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --disable-readline \
   --enable-cmdlib \
-  --enable-dmeventd \
+  --disable-dmeventd \
   --enable-applib \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --with-usrlibdir=/usr/lib${LIBDIRSUFFIX} \
@@ -95,7 +110,6 @@ CFLAGS="$SLKCFLAGS" \
   --with-default-dm-run-dir=/run/lvm \
   --with-clvmd-pidfile=/run/lvm/clvmd.pid \
   --with-cmirrord-pidfile=/run/lvm/cmirrord.pid \
-  --with-dmeventd-pidfile=/run/lvm/dmeventd.pid \
   --with-clvmd \
   --with-cluster=shared \
   --build=$ARCH-slackware-linux
@@ -103,23 +117,18 @@ CFLAGS="$SLKCFLAGS" \
 make daemons man
 
 # Some assembly required
-install -D -m0755 -oroot -groot daemons/clvmd/clvmd $PKG/usr/sbin/clvmd
-install -D -m0644 -oroot -groot man/clvmd.8 $PKG/usr/man/man8/clvmd.8
+mkdir -p $PKG/usr/{sbin,man/man8}
+install -s -m0755 -oroot -groot daemons/clvmd/clvmd $PKG/usr/sbin/clvmd
+gzip -9c < man/clvmd.8 > $PKG/usr/man/man8/clvmd.8.gz
 
 install -D -m0755 -oroot -groot scripts/clvmd_init_red_hat $PKG/etc/rc.d/rc.clvmd.new
 sed -e "s|/etc/sysconfig|/etc/default|g" -i $PKG/etc/rc.d/rc.clvmd.new
 
-install -D -m0755 -oroot -groot lib/locking/liblvm2clusterlock.so.${VERSION%.*} \
+install -s -D -m0755 -oroot -groot lib/locking/liblvm2clusterlock.so.${VERSION%.*} \
   $PKG/usr/lib${LIBDIRSUFFIX}/lvm2/liblvm2clusterlock.so.${VERSION%.*}
 ln -s liblvm2clusterlock.so.${VERSION%.*} \
   $PKG/usr/lib${LIBDIRSUFFIX}/lvm2/liblvm2clusterlock.so
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -130,4 +139,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lvm2-lockd/README b/system/lvm2-lockd/README
index 6b49d6c7a8..9a04831ba3 100644
--- a/system/lvm2-lockd/README
+++ b/system/lvm2-lockd/README
@@ -1,21 +1,22 @@
-Logical Volume Management (LVM) commands use lvmlockd to coordinate access
-to shared storage.
+Logical Volume Management (LVM) commands use lvmlockd to coordinate
+access to shared storage.
 
 NOTE: lvm2 package that comes with Slackware includes lvmlockd
-support. However, since neither sanlock or dlm were present at build time,
-empty functions were compiled in. In order for lvm commands (such as lvmcreate,
-etc) to discover and leverage lvmlockd support, stock lvm binary has to
-be replaced:
+support. However, since neither sanlock or dlm were present at build
+time, empty functions were compiled in. In order for lvm commands
+(such as lvmcreate, etc) to discover and leverage lvmlockd support,
+stock lvm binary has to be replaced:
 
   CLOBBER_STOCK_BINARY=yes ./lvm2-lockd.SlackBuild
 
-The original binary can be restored by reinstalling the stock lvm2 package.
+The original binary can be restored by reinstalling the stock lvm2
+package.
 
 By default, lock type is set to sanlock, dlm can be selected with:
 
   LOCK_TYPE=dlm ./lvm2-lockd.SlackBuild
 
-This will change package dependancy from sanlock to dlm (also found here
-on SlackBuilds.org).
+This will change package dependency from sanlock to dlm (also found
+here on SlackBuilds.org).
 
 More information post-install can be found in README.SLACKWARE
diff --git a/system/lvm2-lockd/doinst.sh b/system/lvm2-lockd/doinst.sh
index 2133933dde..9be93b50ca 100644
--- a/system/lvm2-lockd/doinst.sh
+++ b/system/lvm2-lockd/doinst.sh
@@ -1,14 +1,11 @@
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
   elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
     rm $NEW
   fi
-  # Otherwise, we leave the .new copy for the admin to consider...
 }
 
 preserve_perms() {
diff --git a/system/lvm2-lockd/lvm2-lockd.SlackBuild b/system/lvm2-lockd/lvm2-lockd.SlackBuild
index 143390df28..56027864ea 100644
--- a/system/lvm2-lockd/lvm2-lockd.SlackBuild
+++ b/system/lvm2-lockd/lvm2-lockd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lvm2-lockd
 
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+# This should probably be updated to match the version of lvm2 in
+# Slackware 15.0, but I leave that up to the maintainer to decide.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lvm2-lockd
 VERSION=${VERSION:-2.02.154}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=LVM2
 
@@ -37,7 +44,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,16 +78,20 @@ cd $SRCNAM.$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+sed -i '1i#include <sys/sysmacros.h>' lib/filters/filter-sysfs.c
 
 # Copied from lvm2.SlackBuild
+# 20220224 bkw: and modified a bit, dmeventd wouldn't compile and we
+# don't need it in this build, so disable it.
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --disable-readline \
   --enable-cmdlib \
-  --enable-dmeventd \
+  --disable-dmeventd \
   --enable-applib \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --with-usrlibdir=/usr/lib${LIBDIRSUFFIX} \
@@ -95,7 +110,6 @@ CFLAGS="$SLKCFLAGS" \
   --with-default-dm-run-dir=/run/lvm \
   --with-clvmd-pidfile=/run/lvm/clvmd.pid \
   --with-cmirrord-pidfile=/run/lvm/cmirrord.pid \
-  --with-dmeventd-pidfile=/run/lvm/dmeventd.pid \
   --enable-use-lvmlockd \
   --enable-lockd-${LOCK_TYPE:-sanlock} \
   --build=$ARCH-slackware-linux
@@ -103,12 +117,18 @@ CFLAGS="$SLKCFLAGS" \
 make daemons man tools
 
 # Some assembly required
-install -D -m0755 -oroot -groot daemons/lvmlockd/lvmlockd $PKG/usr/sbin/lvmlockd
-install -D -m0755 -oroot -groot daemons/lvmlockd/lvmlockctl $PKG/usr/sbin/lvmlockctl
-install -D -m0755 -oroot -groot daemons/lvmetad/lvmetad $PKG/usr/sbin/lvmetad
-install -D -m0644 -oroot -groot man/lvmlockd.8 $PKG/usr/man/man8/lvmlockd.8
-install -D -m0644 -oroot -groot man/lvmlockctl.8 $PKG/usr/man/man8/lvmlockctl.8
-install -D -m0644 -oroot -groot man/lvmetad.8 $PKG/usr/man/man8/lvmetad.8
+mkdir -p $PKG/usr/{sbin,man/man8}
+install -s -m0755 -oroot -groot \
+  daemons/lvmlockd/lvmlock{d,ctl} \
+  daemons/lvmetad/lvmetad \
+  $PKG/usr/sbin/
+
+install -m0644 -oroot -groot \
+  man/lvmlock{d,ctl}.8 \
+  man/lvmetad.8 \
+  $PKG/usr/man/man8/
+
+gzip -9 $PKG/usr/man/man*/*
 
 install -D -m0755 -oroot -groot scripts/lvm2_lvmetad_init_red_hat $PKG/etc/rc.d/rc.lvmetad.new
 
@@ -119,15 +139,9 @@ sed -e "s|metadata|locking|g" \
     -i $PKG/etc/rc.d/rc.lvmlockd.new
 
 if [ "${CLOBBER_STOCK_BINARY:-no}" = "yes" ]; then
-  install -D -m0755 -oroot -groot tools/lvm $PKG/sbin/lvm
+  install -s -D -m0755 -oroot -groot tools/lvm $PKG/sbin/lvm
 fi
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -138,4 +152,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lxd/README b/system/lxd/README
deleted file mode 100644
index 0a65c51c86..0000000000
--- a/system/lxd/README
+++ /dev/null
@@ -1,3 +0,0 @@
-LXD is a container "hypervisor" and a new user experience for LXC.
-
-This package includes scripts to run the lxd service under DJB daemontools.
diff --git a/system/lxd/doinst.sh b/system/lxd/doinst.sh
deleted file mode 100644
index 0b95a44d98..0000000000
--- a/system/lxd/doinst.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-preserve_perms etc/profile.d/lxd.sh.new
-preserve_perms etc/profile.d/lxd.csh.new
-
-config opt/lxd/service/run.new
-config opt/lxd/service/log/run.new
diff --git a/system/lxd/etc-profile-d-lxd.csh b/system/lxd/etc-profile-d-lxd.csh
deleted file mode 100644
index 01bead2ead..0000000000
--- a/system/lxd/etc-profile-d-lxd.csh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/csh
-setenv LXD_HOME /opt/lxd
-setenv PATH ${LXD_HOME}/bin:${PATH}
diff --git a/system/lxd/etc-profile-d-lxd.sh b/system/lxd/etc-profile-d-lxd.sh
deleted file mode 100644
index 3b9034b1ce..0000000000
--- a/system/lxd/etc-profile-d-lxd.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-export LXD_HOME=/opt/lxd
-export PATH=${LXD_HOME}/bin:${PATH}
diff --git a/system/lxd/lxd.SlackBuild b/system/lxd/lxd.SlackBuild
deleted file mode 100644
index d9eb9a658e..0000000000
--- a/system/lxd/lxd.SlackBuild
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for lxd
-
-# Copyright 2017-2018 Vasco Santos <valexsantos[at]gmail[dot]com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=lxd
-VERSION=${VERSION:-3.0.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-
-PREFIX=/opt/lxd
-
-mkdir -p $PKG/$PREFIX/bin
-export GOPATH=$TMP/$PRGNAM-$VERSION/dist
-go build -o $PKG$PREFIX/bin/lxd github.com/lxc/lxd/lxd
-go build -o $PKG$PREFIX/bin/lxc github.com/lxc/lxd/lxc
-go build -o $PKG$PREFIX/bin/fuidshift github.com/lxc/lxd/fuidshift
-go build -o $PKG$PREFIX/bin/lxd-p2c github.com/lxc/lxd/lxd-p2c
-cp -a scripts/lxc-to-lxd $PKG/$PREFIX/bin
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/man/man1
-help2man $PKG$PREFIX/bin/lxd -n "The container hypervisor - daemon" --no-info --no-discard-stderr > $PKG/usr/man/man1/lxd.1
-help2man $PKG$PREFIX/bin/lxc -n "The container hypervisor - client" --no-info --no-discard-stderr > $PKG/usr/man/man1/lxc.1
-help2man $PKG$PREFIX/bin/fuidshift -n "uid/gid shifter" --no-info --no-discard-stderr > $PKG/usr/man/man1/fuidshift.1
-help2man $PKG$PREFIX/bin/lxd-p2c -n "uid/gid shifter" --no-info --no-discard-stderr > $PKG/usr/man/man1/lxd-p2c.1
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-install -D -m0755 $CWD/service-log-lxd-run $PKG$PREFIX/service/log/run.new
-install -D -m0755 $CWD/service-lxd-run     $PKG$PREFIX/service/run.new
-
-install -D -m0755 $CWD/etc-profile-d-lxd.sh  $PKG/etc/profile.d/lxd.sh.new
-install -D -m0755 $CWD/etc-profile-d-lxd.csh $PKG/etc/profile.d/lxd.csh.new
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING README.md contributing.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/lxd/lxd.info b/system/lxd/lxd.info
deleted file mode 100644
index 2620e5a94b..0000000000
--- a/system/lxd/lxd.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="lxd"
-VERSION="3.0.1"
-HOMEPAGE="https://linuxcontainers.org"
-DOWNLOAD="https://linuxcontainers.org/downloads/lxd/lxd-3.0.1.tar.gz"
-MD5SUM="63f5937605f9ba861b4c5f617171920b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="google-go-lang"
-MAINTAINER="Vasco Santos"
-EMAIL="valexsantos_at_gmail_dot_com"
diff --git a/system/lxd/service-log-lxd-run b/system/lxd/service-log-lxd-run
deleted file mode 100644
index 61fa33517d..0000000000
--- a/system/lxd/service-log-lxd-run
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-# generic daemontools log run script
-
-# Copyright 2017-2018 Vasco Santos <valexsantos[at]gmail[dot]com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#
-# cfgs
-#
-LOGUSER=lxd
-LOGDIR=/var/log/$LOGUSER
-LOG_FILE_HISTORY=20
-LOG_FILE_SIZE=100000
-##
-# doit
-##
-PATH=/opt/daemontools/bin:/usr/local/bin:/usr/bin:/bin
-export PATH
-# create log dir
-[ -d $LOGDIR ] || mkdir $LOGDIR
-# set owner
-chown -R $LOGUSER $LOGDIR
-# go
-exec 2>&1
-exec setuidgid $LOGUSER multilog t s$LOG_FILE_SIZE n$LOG_FILE_HISTORY $LOGDIR
diff --git a/system/lxd/service-lxd-run b/system/lxd/service-lxd-run
deleted file mode 100644
index 622a6ae5cb..0000000000
--- a/system/lxd/service-lxd-run
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# lxd daemontools run script
-
-# Copyright 2017-2018 Vasco Santos <valexsantos[at]gmail[dot]com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-exec 2>&1
-
-PATH="/usr/local/bin:/usr/bin:/bin:/sbin:/usr/sbin:/opt/daemontools/bin:/opt/lxd/bin"
-#
-# systemd support
-if [ ! -d /sys/fs/cgroup/systemd ]; then
-	echo "mounting systemd support...."
-	mkdir /sys/fs/cgroup/systemd
-	mount -t cgroup -o rw,nosuid,nodev,noexec,relatime,none,name=systemd cgroup /sys/fs/cgroup/systemd
-fi
-
-CMD="lxd daemon --group=lxd"
-echo "command-line $CMD"
-
-##
-# Doit
-##
-ulimit -f unlimited
-ulimit -t unlimited
-ulimit -v unlimited
-ulimit -n 819200
-ulimit -m unlimited
-ulimit -u 819200
-
-exec $CMD
-
-##
-# err
-echo ERROR: command did not run correctly
-sleep 5
-exit 1
diff --git a/system/lxd/slack-desc b/system/lxd/slack-desc
deleted file mode 100644
index 4cc4ea1907..0000000000
--- a/system/lxd/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-   |-----handy-ruler------------------------------------------------------|
-lxd: lxd (container hypervisor for lxc)
-lxd:
-lxd: LXD is a container "hypervisor" and a new user experience for LXC.
-lxd:
-lxd: Homepage: https://linuxcontainers.org
-lxd:
-lxd:
-lxd:
-lxd:
-lxd:
-lxd:
diff --git a/system/lxdm/lxdm.SlackBuild b/system/lxdm/lxdm.SlackBuild
index 3a44265c69..0547691012 100644
--- a/system/lxdm/lxdm.SlackBuild
+++ b/system/lxdm/lxdm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lxdm
 
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lxdm
 VERSION=${VERSION:-20170805_e3e7517}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -172,4 +182,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lxgw-wenkai-fonts/README b/system/lxgw-wenkai-fonts/README
new file mode 100644
index 0000000000..27cd392425
--- /dev/null
+++ b/system/lxgw-wenkai-fonts/README
@@ -0,0 +1,10 @@
+This package contains a repackage of the LXGW WenKai font family.
+The font is a Japanese textbook-style font that combines features of
+Fangsong and Kai style scripts, modified by LXGW to include common
+Chinese characters. This provides all weights (Bold, Regular, Light)
+and their monospace variants.
+
+For glyphs with additional modifications to comply with GB (China)
+standards, please refer to the fonts-lxgw-wenkai-gb package; for
+inherited-glyph lovers, please refer to the fonts-lxgw-wenkai-tc
+package.
diff --git a/system/lxgw-wenkai-fonts/doinst.sh b/system/lxgw-wenkai-fonts/doinst.sh
new file mode 100644
index 0000000000..883c47ac0a
--- /dev/null
+++ b/system/lxgw-wenkai-fonts/doinst.sh
@@ -0,0 +1,10 @@
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/lxgw-wenkai-fonts/lxgw-wenkai-fonts.SlackBuild b/system/lxgw-wenkai-fonts/lxgw-wenkai-fonts.SlackBuild
new file mode 100644
index 0000000000..5efefa95d2
--- /dev/null
+++ b/system/lxgw-wenkai-fonts/lxgw-wenkai-fonts.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Slackware build script for lxgw-wenkai-fonts
+
+# Copyright 2022-2023 Wen-Wei Kao (ltlnx), Taipei, Taiwan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=lxgw-wenkai-fonts
+VERSION=${VERSION:-1.315}
+SRCNAM="lxgw-wenkai-v$VERSION"
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+tar xvf $CWD/$SRCNAM.tar.gz
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/share/fonts/TTF
+cp -a $SRCNAM/*.ttf $PKG/usr/share/fonts/TTF
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+chmod 644 $SRCNAM/OFL.txt
+cp -a $SRCNAM/OFL.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lxgw-wenkai-fonts/lxgw-wenkai-fonts.info b/system/lxgw-wenkai-fonts/lxgw-wenkai-fonts.info
new file mode 100644
index 0000000000..c63277e88f
--- /dev/null
+++ b/system/lxgw-wenkai-fonts/lxgw-wenkai-fonts.info
@@ -0,0 +1,10 @@
+PRGNAM="lxgw-wenkai-fonts"
+VERSION="1.315"
+HOMEPAGE="https://github.com/lxgw/LxgwWenKai"
+DOWNLOAD="https://github.com/lxgw/LxgwWenKai/releases/download/v1.315/lxgw-wenkai-v1.315.tar.gz"
+MD5SUM="4f4a90cd886a775f7674d45ee4ded3f2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="ltlnx"
+EMAIL="ltlnx@disroot.org"
diff --git a/system/lxgw-wenkai-fonts/slack-desc b/system/lxgw-wenkai-fonts/slack-desc
new file mode 100644
index 0000000000..66b851a2aa
--- /dev/null
+++ b/system/lxgw-wenkai-fonts/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+lxgw-wenkai-fonts: lxgw-wenkai-fonts (open-source Chinese font derived from Klee One)
+lxgw-wenkai-fonts:
+lxgw-wenkai-fonts: This package contains a repackage of the LXGW WenKai font family.
+lxgw-wenkai-fonts: The font is a Japanese textbook-style font that combines features of
+lxgw-wenkai-fonts: Fangsong and Kai style scripts, modified by LXGW to include common
+lxgw-wenkai-fonts: Chinese characters. This provides all weights (Bold, Regular, Light)
+lxgw-wenkai-fonts: and their monospace variants.
+lxgw-wenkai-fonts:
+lxgw-wenkai-fonts:
+lxgw-wenkai-fonts: Homepage: https://github.com/lxgw/LxgwWenKai
+lxgw-wenkai-fonts:
diff --git a/system/lxgw-wenkai-gb-fonts/README b/system/lxgw-wenkai-gb-fonts/README
new file mode 100644
index 0000000000..e5148ef31a
--- /dev/null
+++ b/system/lxgw-wenkai-gb-fonts/README
@@ -0,0 +1,9 @@
+This package contains a repackage of the LXGW WenKai GB font family.
+The font is a Japanese textbook-style font that combines features of
+Fangsong and Kai style scripts, modified by LXGW to include common
+Chinese characters, and adhere to GB standards. This provides all
+weights (Bold, Regular, Light) and their monospace variants.
+
+For the original glyphs, please refer to the fonts-lxgw-wenkai package;
+for inherited-glyph lovers, please refer to the fonts-lxgw-wenkai-tc
+package.
diff --git a/system/lxgw-wenkai-gb-fonts/doinst.sh b/system/lxgw-wenkai-gb-fonts/doinst.sh
new file mode 100644
index 0000000000..883c47ac0a
--- /dev/null
+++ b/system/lxgw-wenkai-gb-fonts/doinst.sh
@@ -0,0 +1,10 @@
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/lxgw-wenkai-gb-fonts/lxgw-wenkai-gb-fonts.SlackBuild b/system/lxgw-wenkai-gb-fonts/lxgw-wenkai-gb-fonts.SlackBuild
new file mode 100644
index 0000000000..4f458157e2
--- /dev/null
+++ b/system/lxgw-wenkai-gb-fonts/lxgw-wenkai-gb-fonts.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Slackware build script for lxgw-wenkai-gb-fonts
+
+# Copyright 2022 Wen-Wei Kao (ltlnx), Taipei, Taiwan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=lxgw-wenkai-gb-fonts
+VERSION=${VERSION:-1.011}
+SRCNAM="lxgw-wenkai-gb-v$VERSION"
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+tar xvf $CWD/$SRCNAM.tar.gz
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/share/fonts/TTF
+cp -a $SRCNAM/*.ttf $PKG/usr/share/fonts/TTF
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+chmod 644 $SRCNAM/OFL.txt
+cp -a $SRCNAM/OFL.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lxgw-wenkai-gb-fonts/lxgw-wenkai-gb-fonts.info b/system/lxgw-wenkai-gb-fonts/lxgw-wenkai-gb-fonts.info
new file mode 100644
index 0000000000..fb9d10f465
--- /dev/null
+++ b/system/lxgw-wenkai-gb-fonts/lxgw-wenkai-gb-fonts.info
@@ -0,0 +1,10 @@
+PRGNAM="lxgw-wenkai-gb-fonts"
+VERSION="1.011"
+HOMEPAGE="https://github.com/lxgw/LxgwWenkaiGB"
+DOWNLOAD="https://github.com/lxgw/LxgwWenkaiGB/releases/download/v1.011/lxgw-wenkai-gb-v1.011.tar.gz"
+MD5SUM="a5502cde851d4875465c3266741e8701"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="ltlnx"
+EMAIL="ltlnx@disroot.org"
diff --git a/system/lxgw-wenkai-gb-fonts/slack-desc b/system/lxgw-wenkai-gb-fonts/slack-desc
new file mode 100644
index 0000000000..82075ecd83
--- /dev/null
+++ b/system/lxgw-wenkai-gb-fonts/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+lxgw-wenkai-gb-fonts: lxgw-wenkai-gb-fonts (open-source Chinese font derived from Klee One)
+lxgw-wenkai-gb-fonts:
+lxgw-wenkai-gb-fonts: This package contains a repackage of the LXGW WenKai GB font family.
+lxgw-wenkai-gb-fonts: The font is a textbook-style font that combines characteristics of
+lxgw-wenkai-gb-fonts: Fangsong and Kai style scripts, modified by LXGW to include common
+lxgw-wenkai-gb-fonts: Chinese characters, and adhere to GB glyph standards. This provides
+lxgw-wenkai-gb-fonts: all weights (Bold, Regular, Light) and their monospace variants.
+lxgw-wenkai-gb-fonts:
+lxgw-wenkai-gb-fonts:
+lxgw-wenkai-gb-fonts: Homepage: https://github.com/lxgw/LxgwWenkaiGB
+lxgw-wenkai-gb-fonts:
diff --git a/system/lxgw-wenkai-tc-fonts/README b/system/lxgw-wenkai-tc-fonts/README
new file mode 100644
index 0000000000..f255da5c1b
--- /dev/null
+++ b/system/lxgw-wenkai-tc-fonts/README
@@ -0,0 +1,10 @@
+This package contains a repackage of the LXGW WenKai TC font family.
+The font is a textbook-style font that combines characteristics of
+Fangsong and Kai style scripts, modified by LXGW to include common
+Chinese characters and adhere to the "inherited glyphs" standard.
+This provides all weights (Bold, Regular, Light) and their monospace
+variants.
+
+For the original glyphs, please refer to the fonts-lxgw-wenkai package;
+for glyphs with additional modifications to comply with GB (China)
+standards, please refer to the fonts-lxgw-wenkai-gb package.
diff --git a/system/lxgw-wenkai-tc-fonts/doinst.sh b/system/lxgw-wenkai-tc-fonts/doinst.sh
new file mode 100644
index 0000000000..883c47ac0a
--- /dev/null
+++ b/system/lxgw-wenkai-tc-fonts/doinst.sh
@@ -0,0 +1,10 @@
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/lxgw-wenkai-tc-fonts/lxgw-wenkai-tc-fonts.SlackBuild b/system/lxgw-wenkai-tc-fonts/lxgw-wenkai-tc-fonts.SlackBuild
new file mode 100644
index 0000000000..0d8e4a8ace
--- /dev/null
+++ b/system/lxgw-wenkai-tc-fonts/lxgw-wenkai-tc-fonts.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Slackware build script for lxgw-wenkai-tc-fonts
+
+# Copyright 2022-2023 Wen-Wei Kao (ltlnx), Taipei, Taiwan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=lxgw-wenkai-tc-fonts
+VERSION=${VERSION:-1.011}
+SRCNAM="lxgw-wenkai-tc-v$VERSION"
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+tar xvf $CWD/$SRCNAM.tar.gz
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/share/fonts/TTF
+cp -a $SRCNAM/*.ttf $PKG/usr/share/fonts/TTF
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+chmod 644 $SRCNAM/OFL.txt
+cp -a $SRCNAM/OFL.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lxgw-wenkai-tc-fonts/lxgw-wenkai-tc-fonts.info b/system/lxgw-wenkai-tc-fonts/lxgw-wenkai-tc-fonts.info
new file mode 100644
index 0000000000..9881fc46e6
--- /dev/null
+++ b/system/lxgw-wenkai-tc-fonts/lxgw-wenkai-tc-fonts.info
@@ -0,0 +1,10 @@
+PRGNAM="lxgw-wenkai-tc-fonts"
+VERSION="1.011"
+HOMEPAGE="https://github.com/lxgw/LxgwWenkaiTC"
+DOWNLOAD="https://github.com/lxgw/LxgwWenkaiTC/releases/download/v1.011/lxgw-wenkai-tc-v1.011.tar.gz"
+MD5SUM="08a4a30674ba77723bcb895ee4c8426b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="ltlnx"
+EMAIL="ltlnx@disroot.org"
diff --git a/system/lxgw-wenkai-tc-fonts/slack-desc b/system/lxgw-wenkai-tc-fonts/slack-desc
new file mode 100644
index 0000000000..709f613423
--- /dev/null
+++ b/system/lxgw-wenkai-tc-fonts/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+lxgw-wenkai-tc-fonts: lxgw-wenkai-tc-fonts (open-source Chinese font derived from Klee One)
+lxgw-wenkai-tc-fonts:
+lxgw-wenkai-tc-fonts: This package contains a repackage of the LXGW WenKai TC font family.
+lxgw-wenkai-tc-fonts: The font is a textbook-style font that combines characteristics of
+lxgw-wenkai-tc-fonts: Fangsong and Kai style scripts, modified by LXGW to include common
+lxgw-wenkai-tc-fonts: Chinese characters and adhere to the "inherited glyphs" standard.
+lxgw-wenkai-tc-fonts: This provides all weights (Bold, Regular, Light) and their monospace
+lxgw-wenkai-tc-fonts: variants.
+lxgw-wenkai-tc-fonts:
+lxgw-wenkai-tc-fonts: Homepage: https://github.com/lxgw/LxgwWenkaiTC
+lxgw-wenkai-tc-fonts:
diff --git a/system/lxinput/lxinput.SlackBuild b/system/lxinput/lxinput.SlackBuild
index 264691f622..3d33a83d7a 100644
--- a/system/lxinput/lxinput.SlackBuild
+++ b/system/lxinput/lxinput.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lxinput
 # Copyright 2010-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
@@ -24,26 +24,36 @@
 # based on slackbuilds.org default template
 # generated by Grissiom's sbo-dev-helper
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lxinput
 VERSION=${VERSION:-0.3.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -102,4 +112,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lxqt-archiver/README b/system/lxqt-archiver/README
new file mode 100644
index 0000000000..9549195489
--- /dev/null
+++ b/system/lxqt-archiver/README
@@ -0,0 +1,3 @@
+LXQt Archiver is a simple & lightweight desktop-agnostic Qt file
+archiver. It is a front-end (a graphical interface) for archiving
+programs such as tar and zip.
diff --git a/system/lxqt-archiver/doinst.sh b/system/lxqt-archiver/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/system/lxqt-archiver/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/lxqt-archiver/lxqt-archiver.SlackBuild b/system/lxqt-archiver/lxqt-archiver.SlackBuild
new file mode 100644
index 0000000000..6f3aaf952d
--- /dev/null
+++ b/system/lxqt-archiver/lxqt-archiver.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/bash
+
+# Slackware build script for lxqt-archiver
+
+# Copyright 2024 Isaac Yu <isaacyu@protonmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=lxqt-archiver
+VERSION=${VERSION:-0.9.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lxqt-archiver/lxqt-archiver.info b/system/lxqt-archiver/lxqt-archiver.info
new file mode 100644
index 0000000000..c0d2d376c4
--- /dev/null
+++ b/system/lxqt-archiver/lxqt-archiver.info
@@ -0,0 +1,10 @@
+PRGNAM="lxqt-archiver"
+VERSION="0.9.1"
+HOMEPAGE="https://github.com/lxqt/lxqt-archiver"
+DOWNLOAD="https://github.com/lxqt/lxqt-archiver/releases/download/0.9.1/lxqt-archiver-0.9.1.tar.xz"
+MD5SUM="7c8dfb71962b67f22f92f75acae8d7ce"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libfm-qt"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/lxqt-archiver/slack-desc b/system/lxqt-archiver/slack-desc
new file mode 100644
index 0000000000..048290cd10
--- /dev/null
+++ b/system/lxqt-archiver/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+lxqt-archiver: lxqt-archiver (LXQt file archiver)
+lxqt-archiver:
+lxqt-archiver: LXQt Archiver is a simple & lightweight desktop-agnostic Qt file
+lxqt-archiver: archiver.
+lxqt-archiver:
+lxqt-archiver:
+lxqt-archiver:
+lxqt-archiver:
+lxqt-archiver:
+lxqt-archiver:
+lxqt-archiver:
diff --git a/system/lxqt-config/README b/system/lxqt-config/README
new file mode 100644
index 0000000000..6068e057ce
--- /dev/null
+++ b/system/lxqt-config/README
@@ -0,0 +1,5 @@
+lxqt-config contains tools for configuring LXQt and the underlying
+operating system.
+
+lxqt-qtplugin allows lxqt-config to change the Qt5 theme, even
+outside of LXQt.
diff --git a/system/lxqt-config/doinst.sh b/system/lxqt-config/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/system/lxqt-config/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/lxqt-config/lxqt-config.SlackBuild b/system/lxqt-config/lxqt-config.SlackBuild
new file mode 100644
index 0000000000..2427723de0
--- /dev/null
+++ b/system/lxqt-config/lxqt-config.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/bash
+
+# Slackware build script for lxqt-config
+
+# Copyright 2022-2023 Isaac Yu <isaacyu@protonmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=lxqt-config
+VERSION=${VERSION:-1.3.0}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# This patch prevents conflicts with lxqt-menu-data
+# It also explicitly sets the lxqt-menu-data requirement
+patch -p1 < $CWD/use-lxqt-menu-data-files.patch
+
+mkdir build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+sed -i '/^Categories/s,LXQt;,X-&,' $PKG/usr/share/applications/*desktop
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mv $PKG/usr/share/man $PKG/usr
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lxqt-config/lxqt-config.info b/system/lxqt-config/lxqt-config.info
new file mode 100644
index 0000000000..1e12c68745
--- /dev/null
+++ b/system/lxqt-config/lxqt-config.info
@@ -0,0 +1,10 @@
+PRGNAM="lxqt-config"
+VERSION="1.3.0"
+HOMEPAGE="https://github.com/lxqt/lxqt-config"
+DOWNLOAD="https://github.com/lxqt/lxqt-config/releases/download/1.3.0/lxqt-config-1.3.0.tar.xz"
+MD5SUM="c925164e691dd8da4f44511f42ef5b4f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="liblxqt lxqt-menu-data"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/lxqt-config/slack-desc b/system/lxqt-config/slack-desc
new file mode 100644
index 0000000000..4c7ded9e23
--- /dev/null
+++ b/system/lxqt-config/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+lxqt-config: lxqt-config (LXQt configuration settings)
+lxqt-config:
+lxqt-config: lxqt-config contains tools for configuring LXQt and the underlying
+lxqt-config: operating system.
+lxqt-config:
+lxqt-config:
+lxqt-config:
+lxqt-config:
+lxqt-config:
+lxqt-config:
+lxqt-config:
diff --git a/system/lxqt-config/use-lxqt-menu-data-files.patch b/system/lxqt-config/use-lxqt-menu-data-files.patch
new file mode 100644
index 0000000000..e19aa64bb7
--- /dev/null
+++ b/system/lxqt-config/use-lxqt-menu-data-files.patch
@@ -0,0 +1,32 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -36,6 +36,7 @@
+ find_package(Qt5X11Extras ${QT_MINIMUM_VERSION} REQUIRED)
+ find_package(Qt5Xml ${QT_MINIMUM_VERSION} REQUIRED)
+ find_package(lxqt ${LXQT_MINIMUM_VERSION} REQUIRED)
++find_package(lxqt-menu-data 1.4.1 REQUIRED)
+ 
+ include(LXQtPreventInSourceBuilds)
+ include(LXQtCompilerSettings NO_POLICY_SCOPE)
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -65,7 +65,3 @@
+     DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications"
+     COMPONENT Runtime
+ )
+-install(FILES lxqt-config.menu
+-    DESTINATION "${LXQT_ETC_XDG_DIR}/menus"
+-    COMPONENT Runtime
+-)
+--- a/src/menuname/CMakeLists.txt
++++ b/src/menuname/CMakeLists.txt
+@@ -8,9 +8,3 @@
+ )
+ add_custom_target(desktop_directories_files ALL DEPENDS ${DIRECTORY_FILES})
+ #************************************************
+-
+-install(FILES
+-    ${DIRECTORY_FILES}
+-    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/desktop-directories"
+-    COMPONENT Runtime
+-)
diff --git a/system/lxqt-globalkeys/README b/system/lxqt-globalkeys/README
new file mode 100644
index 0000000000..573cf2296f
--- /dev/null
+++ b/system/lxqt-globalkeys/README
@@ -0,0 +1,2 @@
+lxqt-globalkeys is a daemon used for registering global keyboard
+shortcuts.
diff --git a/system/trmaid/doinst.sh b/system/lxqt-globalkeys/doinst.sh
index 5fb28930db..5fb28930db 100644
--- a/system/trmaid/doinst.sh
+++ b/system/lxqt-globalkeys/doinst.sh
diff --git a/system/lxqt-globalkeys/lxqt-globalkeys.SlackBuild b/system/lxqt-globalkeys/lxqt-globalkeys.SlackBuild
new file mode 100644
index 0000000000..3641a83d13
--- /dev/null
+++ b/system/lxqt-globalkeys/lxqt-globalkeys.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+# Slackware build script for lxqt-globalkeys
+
+# Copyright 2022-2023 Isaac Yu <isaacyu@protonmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=lxqt-globalkeys
+VERSION=${VERSION:-1.3.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+sed -i '/^Categories/s,LXQt;,X-&,' $PKG/usr/share/applications/*desktop
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lxqt-globalkeys/lxqt-globalkeys.info b/system/lxqt-globalkeys/lxqt-globalkeys.info
new file mode 100644
index 0000000000..6de18bc9da
--- /dev/null
+++ b/system/lxqt-globalkeys/lxqt-globalkeys.info
@@ -0,0 +1,10 @@
+PRGNAM="lxqt-globalkeys"
+VERSION="1.3.0"
+HOMEPAGE="https://github.com/lxqt/lxqt-globalkeys"
+DOWNLOAD="https://github.com/lxqt/lxqt-globalkeys/releases/download/1.3.0/lxqt-globalkeys-1.3.0.tar.xz"
+MD5SUM="decf8632f24aab735c7942540b4c62d2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="liblxqt"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/lxqt-globalkeys/slack-desc b/system/lxqt-globalkeys/slack-desc
new file mode 100644
index 0000000000..08c7c2d2bc
--- /dev/null
+++ b/system/lxqt-globalkeys/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+lxqt-globalkeys: lxqt-globalkeys (LXQt Global Keyboard Shortcut Daemon)
+lxqt-globalkeys:
+lxqt-globalkeys: lxqt-globalkeys is a daemon used for registering global keyboard  
+lxqt-globalkeys: shortcuts.
+lxqt-globalkeys:
+lxqt-globalkeys:
+lxqt-globalkeys:
+lxqt-globalkeys:
+lxqt-globalkeys:
+lxqt-globalkeys:
+lxqt-globalkeys:
diff --git a/system/lxqt-policykit/README b/system/lxqt-policykit/README
new file mode 100644
index 0000000000..a3a519392e
--- /dev/null
+++ b/system/lxqt-policykit/README
@@ -0,0 +1 @@
+lxqt-policykit is the polkit authentification agent of LXQt.
diff --git a/system/lxqt-policykit/lxqt-policykit.SlackBuild b/system/lxqt-policykit/lxqt-policykit.SlackBuild
new file mode 100644
index 0000000000..1c7f9ecca5
--- /dev/null
+++ b/system/lxqt-policykit/lxqt-policykit.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+# Slackware build script for lxqt-policykit
+
+# Copyright 2022-2023 Isaac Yu <isaacyu@protonmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=lxqt-policykit
+VERSION=${VERSION:-1.3.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mv $PKG/usr/share/man $PKG/usr
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lxqt-policykit/lxqt-policykit.info b/system/lxqt-policykit/lxqt-policykit.info
new file mode 100644
index 0000000000..782cd50261
--- /dev/null
+++ b/system/lxqt-policykit/lxqt-policykit.info
@@ -0,0 +1,10 @@
+PRGNAM="lxqt-policykit"
+VERSION="1.3.0"
+HOMEPAGE="https://github.com/lxqt/lxqt-policykit"
+DOWNLOAD="https://github.com/lxqt/lxqt-policykit/releases/download/1.3.0/lxqt-policykit-1.3.0.tar.xz"
+MD5SUM="1edc6f96efe55b07bf60f746c2ec6d1b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="liblxqt"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/lxqt-policykit/slack-desc b/system/lxqt-policykit/slack-desc
new file mode 100644
index 0000000000..b2691b8a29
--- /dev/null
+++ b/system/lxqt-policykit/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+lxqt-policykit: lxqt-policykit (LXQt polkit agent)
+lxqt-policykit:
+lxqt-policykit: lxqt-policykit is the polkit authentification agent of LXQt.
+lxqt-policykit:
+lxqt-policykit:
+lxqt-policykit:
+lxqt-policykit:
+lxqt-policykit:
+lxqt-policykit:
+lxqt-policykit:
+lxqt-policykit:
diff --git a/system/lxqt-session/README b/system/lxqt-session/README
new file mode 100644
index 0000000000..aa1178fee2
--- /dev/null
+++ b/system/lxqt-session/README
@@ -0,0 +1,9 @@
+lxqt-session is the session manager for LXQt. It contains tools for
+handling logins and ending sessions (e.x. logout, shutdown, reboot,
+hibernate).
+
+lxqt-session is responsible for starting LXQt upon login.
+
+A window manager is required for LXQt.
+Openbox is the main window manager; however, other window managers
+may be used (e.x. xfwm4, kwin, i3).
diff --git a/system/lxqt-session/doinst.sh b/system/lxqt-session/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/system/lxqt-session/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/system/lxqt-session/lxqt-session.SlackBuild b/system/lxqt-session/lxqt-session.SlackBuild
new file mode 100644
index 0000000000..01cd52ab04
--- /dev/null
+++ b/system/lxqt-session/lxqt-session.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/bash
+
+# Slackware build script for lxqt-session
+
+# Copyright 2022-2023 Isaac Yu <isaacyu@protonmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=lxqt-session
+VERSION=${VERSION:-1.3.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+sed -i '/^Categories/s,LXQt;,X-&,' $PKG/usr/share/applications/*desktop
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mv $PKG/usr/share/man $PKG/usr
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lxqt-session/lxqt-session.info b/system/lxqt-session/lxqt-session.info
new file mode 100644
index 0000000000..26733c2d0a
--- /dev/null
+++ b/system/lxqt-session/lxqt-session.info
@@ -0,0 +1,10 @@
+PRGNAM="lxqt-session"
+VERSION="1.3.0"
+HOMEPAGE="https://github.com/lxqt/lxqt-session"
+DOWNLOAD="https://github.com/lxqt/lxqt-session/releases/download/1.3.0/lxqt-session-1.3.0.tar.xz"
+MD5SUM="6703a001a5acbf4dad6d13e1e5e9278c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="liblxqt qtxdg-tools"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/lxqt-session/slack-desc b/system/lxqt-session/slack-desc
new file mode 100644
index 0000000000..3923d23604
--- /dev/null
+++ b/system/lxqt-session/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+lxqt-session: lxqt-session (LXQt session manager)
+lxqt-session:
+lxqt-session: lxqt-session is the session manager for LXQt. It contains tools for
+lxqt-session: handling logins and ending sessions (e.x. logout, shutdown, reboot,
+lxqt-session: hibernate).
+lxqt-session:
+lxqt-session:
+lxqt-session:
+lxqt-session:
+lxqt-session:
+lxqt-session:
diff --git a/system/lxrandr/lxrandr.SlackBuild b/system/lxrandr/lxrandr.SlackBuild
index 330ac5a89d..bab357a4ae 100644
--- a/system/lxrandr/lxrandr.SlackBuild
+++ b/system/lxrandr/lxrandr.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # $Id: lxrandr.SlackBuild,v 1.2 2009/09/11 10:27:05 root Exp root $
 # Copyright (c) 2008-2009  Eric Hameleers, Eindhoven, NL
 # Copyright 2010-2019 Matteo Bernardini <ponce@slackbuilds.org, Pisa, Italy
@@ -54,10 +54,13 @@
 #
 # -----------------------------------------------------------------------------
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lxrandr
 VERSION=${VERSION:-0.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -67,7 +70,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -133,4 +143,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lxsession/lxsession.SlackBuild b/system/lxsession/lxsession.SlackBuild
index 6d6b21d1be..183c52298a 100644
--- a/system/lxsession/lxsession.SlackBuild
+++ b/system/lxsession/lxsession.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # $Id: lxsession.SlackBuild,v 1.1 2009/09/11 10:33:13 root Exp root $
 # Copyright (c) 2008-2009  Eric Hameleers, Eindhoven, NL
 # Copyright (c) 2010-2019  Matteo Bernardini, Pisa, IT
@@ -59,6 +59,8 @@
 #             * update.
 # 0.5.5-1:    25/aug/2020 by Matteo Bernardini <ponce@slackbuilds.org>
 #             * update.
+# 0.5.5-2:    13/apr/2022 by B. Watson <urchlay@slackware.uk>
+#             * remove empty file from doc dir.
 #
 # Run 'sh lxsession.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -66,10 +68,13 @@
 #
 # -----------------------------------------------------------------------------
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lxsession
 VERSION=${VERSION:-0.5.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -79,9 +84,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-DOCS="AUTHORS COPYING ChangeLog NEWS README"
+# 20220413 bkw: don't include NEWS, it's a 0-byte placeholder.
+DOCS="AUTHORS COPYING ChangeLog README"
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -109,14 +119,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
@@ -137,9 +147,7 @@ CFLAGS="$SLKCFLAGS" \
 
 make
 make install-strip DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip -9 $PKG/usr/man/man*/*
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -151,4 +159,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lxsession/lxsession.info b/system/lxsession/lxsession.info
index 89022b9b15..d652daab67 100644
--- a/system/lxsession/lxsession.info
+++ b/system/lxsession/lxsession.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://downloads.sf.net/lxde/lxsession-0.5.5.tar.xz"
 MD5SUM="e8380acef215ee7c99c067a2241c2c7b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libunique vala"
+REQUIRES="libunique"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/system/lxsplit/README b/system/lxsplit/README
index 498098968e..9635cf949d 100644
--- a/system/lxsplit/README
+++ b/system/lxsplit/README
@@ -1,4 +1,4 @@
-lxSplit is a simple tool for splitting files and joining the splitted files
-on unix-like platforms, such as Linux, FreeBSD, OpenBSD, etc. It is fully
-compatible with the HJSplit utility which is available for other operating
-systems. Splitting is done without compression.
+lxSplit is a simple tool for splitting files and joining the splitted
+files on unix-like platforms, such as Linux, FreeBSD, OpenBSD, etc. It
+is fully compatible with the HJSplit utility which is available for
+other operating systems. Splitting is done without compression.
diff --git a/system/lxsplit/lxsplit.SlackBuild b/system/lxsplit/lxsplit.SlackBuild
index db087fc028..c50efe0698 100644
--- a/system/lxsplit/lxsplit.SlackBuild
+++ b/system/lxsplit/lxsplit.SlackBuild
@@ -1,28 +1,38 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lxsplit
 # Written by Sebastián Salazar Molina <ssalazar@orangepeople.cl>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lxsplit
 VERSION=${VERSION:-0.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -76,5 +86,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
 
diff --git a/system/lxtask/lxtask.SlackBuild b/system/lxtask/lxtask.SlackBuild
index 773b8f900d..8137d5fa01 100644
--- a/system/lxtask/lxtask.SlackBuild
+++ b/system/lxtask/lxtask.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # $Id: lxtask.SlackBuild,v 1.2 2009/09/11 10:39:38 root Exp root $
 # Copyright (c) 2008-2009  Eric Hameleers, Eindhoven, NL
 # Copyright 2010-2019 Matteo Bernardini <ponce@slackbuilds.org, Pisa, Italy
@@ -51,6 +51,8 @@
 #             * updated.
 # 0.1.9-1:    11/mar/2019 by Matteo Bernardini <ponce@slackbuilds.org>
 #             * updated.
+# 0.1.10-1:   10/apr/2021 by Matteo Bernardini <ponce@slackbuilds.org>
+#             * updated.
 #
 # Run 'sh lxtask.SlackBuild' to build a Slackware package.
 # The package is created in /tmp .
@@ -58,10 +60,13 @@
 #
 # -----------------------------------------------------------------------------
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lxtask
-VERSION=${VERSION:-0.1.9}
+VERSION=${VERSION:-0.1.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -73,7 +78,14 @@ fi
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -135,4 +147,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lxtask/lxtask.info b/system/lxtask/lxtask.info
index 80d2cb4154..8e9a1f2b23 100644
--- a/system/lxtask/lxtask.info
+++ b/system/lxtask/lxtask.info
@@ -1,8 +1,8 @@
 PRGNAM="lxtask"
-VERSION="0.1.9"
+VERSION="0.1.10"
 HOMEPAGE="https://wiki.lxde.org/en/LXTask"
-DOWNLOAD="https://downloads.sf.net/lxde/lxtask-0.1.9.tar.xz"
-MD5SUM="f19a9e4d22a075f984681a480f0aa886"
+DOWNLOAD="https://downloads.sf.net/lxde/lxtask-0.1.10.tar.xz"
+MD5SUM="27b5258847afc237a5b89666e7a8b45b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lxde-common lxpanel"
diff --git a/system/lxterminal/README b/system/lxterminal/README
index f1646ac8fb..bf0c77122c 100644
--- a/system/lxterminal/README
+++ b/system/lxterminal/README
@@ -3,5 +3,4 @@ It uses a single process for each window/tab so it's very light on
 resources.
 
 Pass the script the variable GTK3=yes if you want to link this against
-gtk+3 instead of the default gtk+2 (in this case you will need the
-optional dependency vte3).
+gtk+3 instead of the default gtk+2.
diff --git a/system/lxterminal/lxterminal.SlackBuild b/system/lxterminal/lxterminal.SlackBuild
index 5cd1509a1b..8fc4a29be0 100644
--- a/system/lxterminal/lxterminal.SlackBuild
+++ b/system/lxterminal/lxterminal.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 # $Id: lxterminal.SlackBuild,v 1.6 2009/09/11 10:43:05 root Exp root $
 # Copyright (c) 2008-2009  Eric Hameleers, Eindhoven, NL
-# Copyright (c) 2010-2018  Matteo Bernardini, Pisa, IT
+# Copyright (c) 2010-2021  Matteo Bernardini, Pisa, IT
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -67,6 +67,8 @@
 #             * Update.
 # 0.3.2:      13/oct/2018 by Matteo Bernardini <ponce@slackbuilds.org>
 #             * Update.
+# 0.4.0:      10/apr/2021 by Matteo Bernardini <ponce@slackbuilds.org>
+#             * Update.
 #
 # Run 'sh lxterminal.SlackBuild' to build a Slackware package.
 # The package is created in /tmp .
@@ -74,10 +76,13 @@
 #
 # -----------------------------------------------------------------------------
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lxterminal
-VERSION=${VERSION:-0.3.2}
+VERSION=${VERSION:-0.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -87,7 +92,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -156,4 +168,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lxterminal/lxterminal.info b/system/lxterminal/lxterminal.info
index 8f5130af46..574b0e866d 100644
--- a/system/lxterminal/lxterminal.info
+++ b/system/lxterminal/lxterminal.info
@@ -1,10 +1,10 @@
 PRGNAM="lxterminal"
-VERSION="0.3.2"
+VERSION="0.4.0"
 HOMEPAGE="https://wiki.lxde.org/en/LXTerminal"
-DOWNLOAD="http://downloads.sourceforge.net/lxde/lxterminal-0.3.2.tar.xz"
-MD5SUM="62e57c3aafb831505cc1638b2b737cc9"
+DOWNLOAD="http://downloads.sf.net/lxde/lxterminal-0.4.0.tar.xz"
+MD5SUM="7938dbd50e3826c11f4735a742b278d3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="vte2"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/system/lynis/lynis.SlackBuild b/system/lynis/lynis.SlackBuild
index ca54fe860a..234c69a233 100644
--- a/system/lynis/lynis.SlackBuild
+++ b/system/lynis/lynis.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lynis
 
-# Copyright 2016-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2016-2022 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lynis
-VERSION=${VERSION:-3.0.3}
+VERSION=${VERSION:-3.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,12 +76,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir -p $PKG/usr/bin $PKG/usr/share/lynis/ $PKG/etc/bash_completion.d
+mkdir -p $PKG/usr/bin $PKG/usr/share/lynis/ $PKG/usr/share/bash-completion/completions
 mkdir -p $PKG/usr/man/man8/ $PKG/etc/lynis
 cp default.prf $PKG/etc/lynis
 cp -rf lynis $PKG/usr/bin
 cp -rf include plugins db $PKG/usr/share/lynis/
-cp extras/bash_completion.d/$PRGNAM $PKG/etc/bash_completion.d/
+cp extras/bash_completion.d/$PRGNAM $PKG/usr/share/bash-completion/completions/
 install -m644 lynis.8 $PKG/usr/man/man8/lynis.8
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -92,4 +99,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lynis/lynis.info b/system/lynis/lynis.info
index a6d8d16660..711b418a4d 100644
--- a/system/lynis/lynis.info
+++ b/system/lynis/lynis.info
@@ -1,8 +1,8 @@
 PRGNAM="lynis"
-VERSION="3.0.3"
+VERSION="3.1.1"
 HOMEPAGE="https://cisofy.com/"
-DOWNLOAD="https://downloads.cisofy.com/lynis/lynis-3.0.3.tar.gz"
-MD5SUM="44b26983029929912d5bab53a083f776"
+DOWNLOAD="https://downloads.cisofy.com/lynis/lynis-3.1.1.tar.gz"
+MD5SUM="00b24c3eaa94a697bf20f1063979a32c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/lz4/README b/system/lz4/README
deleted file mode 100644
index f97be58647..0000000000
--- a/system/lz4/README
+++ /dev/null
@@ -1,9 +0,0 @@
-lz4 (compression algorithm)
-
-LZ4 is lossless compression algorithm, providing compression speed at
-400 MB/s per core (0.16 Bytes/cycle). It also features an extremely fast
-decoder, with speed in multiple GB/s per core (0.71 Bytes/cycle). A high
-compression derivative, called LZ4_HC, is also provided. It trades CPU
-time for compression ratio.
-
-This build includes liblz4 and the command-line lz4 tools.
diff --git a/system/lz4/lz4.SlackBuild b/system/lz4/lz4.SlackBuild
deleted file mode 100644
index 17feed23bd..0000000000
--- a/system/lz4/lz4.SlackBuild
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for lz4
-
-# Written by B. Watson (yalhcru@gmail.com)
-
-# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-
-# 20201208 bkw: update for 1.9.3
-# 20191127 bkw: update for 1.9.2
-# 20180911 bkw: update for 1.8.3
-# 20180611 bkw: update for 1.8.2. don't try to use the updated script
-#               to build older versions, the man pages will end up
-#               in the wrong place due to upstream changing how they
-#               interpret MANDIR
-# 20180114 bkw: update for 1.8.1.2. had to add -j1 to the make command.
-# 20170819 bkw: update for 1.8.0
-# 20170302 bkw: use github long-format URL
-# 20170122 bkw: update for 1.7.5
-
-PRGNAM=lz4
-VERSION=${VERSION:-1.9.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz --exclude visual
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-# -j1 was necessary in 1.8.1.2. Not sure it's still needed in 1.8.2, but
-# lz4 is small & builds pretty fast even with -j1, so I'll leave it for now.
-make -j1 \
-  CFLAGS="$SLKCFLAGS" \
-  PREFIX=/usr \
-  LIBDIR=/usr/lib$LIBDIRSUFFIX \
-  MANDIR=/usr/man \
-  DESTDIR=$PKG \
-  BUILD_STATIC=no \
-  default install
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
-mkdir -p $DOCDIR
-cp -a NEWS README* doc/* examples $DOCDIR
-
-# the library is BSD licensed, but the programs are GPL.
-cat programs/COPYING > $DOCDIR/LICENSE.programs.txt
-cat lib/LICENSE > $DOCDIR/LICENSE.lib.txt
-
-cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/lz4/lz4.info b/system/lz4/lz4.info
deleted file mode 100644
index b6bb9ea084..0000000000
--- a/system/lz4/lz4.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="lz4"
-VERSION="1.9.3"
-HOMEPAGE="https://lz4.github.io/lz4/"
-DOWNLOAD="https://github.com/lz4/lz4/archive/v1.9.3/lz4-1.9.3.tar.gz"
-MD5SUM="3a1ab1684e14fc1afc66228ce61b2db3"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/lz4/slack-desc b/system/lz4/slack-desc
deleted file mode 100644
index b9c624ad7d..0000000000
--- a/system/lz4/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-   |-----handy-ruler------------------------------------------------------|
-lz4: lz4 (compression algorithm)
-lz4:
-lz4: LZ4 is lossless compression algorithm, providing compression
-lz4: speed at 400 MB/s per core (0.16 Bytes/cycle). It also features
-lz4: an extremely fast decoder, with speed in multiple GB/s per core
-lz4: (0.71 Bytes/cycle). A high compression derivative, called LZ4_HC,
-lz4: is also provided. It trades CPU time for compression ratio.
-lz4:
-lz4:
-lz4:
-lz4:
diff --git a/system/lziprecover/lziprecover.SlackBuild b/system/lziprecover/lziprecover.SlackBuild
index 4bf23299e9..0978bd32d6 100644
--- a/system/lziprecover/lziprecover.SlackBuild
+++ b/system/lziprecover/lziprecover.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lziprecover
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lziprecover
 VERSION=${VERSION:-1.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -96,4 +106,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lzop/lzop.SlackBuild b/system/lzop/lzop.SlackBuild
index 9e93aae47b..f961122123 100644
--- a/system/lzop/lzop.SlackBuild
+++ b/system/lzop/lzop.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lzop
 
@@ -28,10 +28,13 @@
 
 # 20200129 bkw: take over maintenance, simplify build, remove some cruft.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lzop
 VERSION=${VERSION:-1.04}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -41,7 +44,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -96,4 +103,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/lzop/lzop.info b/system/lzop/lzop.info
index 4f49ad43e6..849fc7ef4a 100644
--- a/system/lzop/lzop.info
+++ b/system/lzop/lzop.info
@@ -1,10 +1,10 @@
 PRGNAM="lzop"
 VERSION="1.04"
-HOMEPAGE="http://www.lzop.org/"
-DOWNLOAD="http://www.lzop.org/download/lzop-1.04.tar.gz"
+HOMEPAGE="https://www.lzop.org/"
+DOWNLOAD="https://www.lzop.org/download/lzop-1.04.tar.gz"
 MD5SUM="271eb10fde77a0a96b9cbf745e719ddf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/macemu/macemu.SlackBuild b/system/macemu/macemu.SlackBuild
index 975eada89d..f74e71ea01 100644
--- a/system/macemu/macemu.SlackBuild
+++ b/system/macemu/macemu.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for macemu (BasiliskII and SheepShaver)
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=macemu
 VERSION=${VERSION:-20180225_2e302d6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -108,7 +118,7 @@ cd $PRGNAM2/src/Unix
 NO_CONFIGURE=1 ./autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -Wno-narrowing" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
@@ -155,4 +165,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/macutils/README b/system/macutils/README
index e4f8cde48c..9900abf928 100644
--- a/system/macutils/README
+++ b/system/macutils/README
@@ -1,3 +1,5 @@
+macutils (tools to handle Macintosh files)
+
 macutils is a package that contains a number of utilities that deal
 with Macintosh files on a Unix system. This is useful for converting
 BinHex-encoded files to the smaller MacBinary format before transferring
diff --git a/system/macutils/macutils.SlackBuild b/system/macutils/macutils.SlackBuild
index de061c5d78..16b70e92e7 100644
--- a/system/macutils/macutils.SlackBuild
+++ b/system/macutils/macutils.SlackBuild
@@ -1,15 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for macutils
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=macutils
 VERSION=${VERSION:-2.0b3_16}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +22,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -46,11 +53,8 @@ tar xvf $CWD/${PRGNAM}_${TARVER}.orig.tar.gz
 cd $PRGNAM
 tar xvf $CWD/$PRGNAM*.debian.tar.gz
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # The code was written in like 1995, but the debian maintainers have been
 # keeping it up-to-date with modern toolchains, so use their patches.
@@ -78,4 +82,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/macutils/macutils.info b/system/macutils/macutils.info
index 6690c09a88..8316359f1e 100644
--- a/system/macutils/macutils.info
+++ b/system/macutils/macutils.info
@@ -1,12 +1,12 @@
 PRGNAM="macutils"
 VERSION="2.0b3_16"
-HOMEPAGE="http://packages.debian.org/sid/macutils"
-DOWNLOAD="http://ftp.debian.org/debian/pool/main/m/macutils/macutils_2.0b3.orig.tar.gz \
-          http://ftp.debian.org/debian/pool/main/m/macutils/macutils_2.0b3-16.debian.tar.gz"
+HOMEPAGE="https://packages.debian.org/sid/macutils"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/m/macutils/macutils_2.0b3.orig.tar.gz \
+          https://deb.debian.org/debian/pool/main/m/macutils/macutils_2.0b3-16.debian.tar.gz"
 MD5SUM="4ff71b1634ea503398c33994458fbe40 \
         23c33ea631db73c653c788de71181809"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/magiic/magiic.SlackBuild b/system/magiic/magiic.SlackBuild
index a01339e96e..c4b9ee395a 100644
--- a/system/magiic/magiic.SlackBuild
+++ b/system/magiic/magiic.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for magiic
 # Copyright 2020 Jefferson 'Slackjeff' Rocha <root@slackjeff.com.br>
@@ -21,13 +21,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=magiic
 VERSION=${VERSION:-0.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -57,4 +67,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mailfromd/README b/system/mailfromd/README
index d3599ea596..0c1dd787c4 100644
--- a/system/mailfromd/README
+++ b/system/mailfromd/README
@@ -1,5 +1,6 @@
-Mail filtering daemon for Sendmail, Postfix and MeTA1. Mailfromd allows the
-system administrator to write filters of arbitrary complexity using a simple
-yet powerful scripting language. Its features include call-out address
-verification, greylisting and whitelisting, sending rate control, local
-account verification and many others.
+Mail filtering daemon for Sendmail, Postfix and MeTA1. Mailfromd
+allows the system administrator to write filters of arbitrary
+complexity using a simple yet powerful scripting language. Its
+features include call-out address verification, greylisting and
+whitelisting, sending rate control, local account verification and
+many others.
diff --git a/system/mailfromd/mailfromd.SlackBuild b/system/mailfromd/mailfromd.SlackBuild
index 18771dd3d2..b7d2376530 100644
--- a/system/mailfromd/mailfromd.SlackBuild
+++ b/system/mailfromd/mailfromd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mailfromd
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mailfromd
 VERSION=${VERSION:-8.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -103,4 +113,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mailutils/README b/system/mailutils/README
index b9645887b0..a7f2ce3c88 100644
--- a/system/mailutils/README
+++ b/system/mailutils/README
@@ -1,8 +1,9 @@
-GNU mailutils is a powerful protocol-independent mail framework. It provides
-a set of libraries for  writing flexible  mail-handling software, as well as
-a number of  utilities for both  local and remote  mail handling. Among  the
-utilities provided are pop3 and imap4 servers, sieve mail filtering utility,
-mailx-compatible mail client and others.
+GNU mailutils is a powerful protocol-independent mail framework. It
+provides a set of libraries for writing flexible mail-handling
+software, as well as a number of utilities for both local and remote
+mail handling. Among the utilities provided are pop3 and imap4
+servers, sieve mail filtering utility, mailx-compatible mail client
+and others.
 
 NOTE: This package overwrite some files in Slackware's core packages:
 - elm
diff --git a/system/mailutils/mailutils.SlackBuild b/system/mailutils/mailutils.SlackBuild
index a5bae7cc7c..2e46f450b0 100644
--- a/system/mailutils/mailutils.SlackBuild
+++ b/system/mailutils/mailutils.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for GNU mailutils
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mailutils
 VERSION=${VERSION:-3.11.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -87,8 +97,10 @@ cp -a AUTHORS COPYING COPYING.LESSER ChangeLog NEWS README THANKS TODO \
    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/maintboot/maintboot.SlackBuild b/system/maintboot/maintboot.SlackBuild
index 403e527b7f..1b33cbc765 100644
--- a/system/maintboot/maintboot.SlackBuild
+++ b/system/maintboot/maintboot.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for maintboot
 
@@ -22,26 +22,33 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=maintboot
 VERSION=${VERSION:-0.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,17 +67,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-if [ -r $CWD/v$VERSION.tar.gz ]; then
-  mv $CWD/v$VERSION.tar.gz $CWD/$PRGNAM-$VERSION.tar.gz
-fi
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
 python3 setup.py install --root=$PKG
 
@@ -85,4 +89,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/maintboot/maintboot.info b/system/maintboot/maintboot.info
index 09d03779e5..720ae104c5 100644
--- a/system/maintboot/maintboot.info
+++ b/system/maintboot/maintboot.info
@@ -1,10 +1,10 @@
 PRGNAM="maintboot"
 VERSION="0.1.0"
 HOMEPAGE="https://github.com/g2p/maintboot"
-DOWNLOAD="https://github.com/g2p/maintboot/archive/v0.1.0.tar.gz"
+DOWNLOAD="https://github.com/g2p/maintboot/archive/v0.1.0/maintboot-0.1.0.tar.gz"
 MD5SUM="6c58f3cd4cc944c22cb0c03054c132e6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
+REQUIRES=""
 MAINTAINER="Nikos Giotis"
 EMAIL="nikos.giotis@gmail.com"
diff --git a/system/makefile2graph/README b/system/makefile2graph/README
index 6df1fa180b..83928d5f3c 100644
--- a/system/makefile2graph/README
+++ b/system/makefile2graph/README
@@ -2,11 +2,12 @@ makefile2graph (creates a dependency graph from a Makefile)
 
 Creates a graph of dependencies from GNU make Makefile.
 
-Output is a graphviz dot file, a Gexf-XML file, or a list of the deepest
-independent targets that should be made. Sub-Makefiles are not supported.
+Output is a graphviz dot file, a Gexf-XML file, or a list of the
+deepest independent targets that should be made. Sub-Makefiles are not
+supported.
 
-Optional dependencies: To actually generate visual graphs, you will need
-or or both of:
+Optional dependencies: To actually generate visual graphs, you will
+need or or both of:
 
 graphics/graphviz
 graphics/graph-easy
diff --git a/system/makefile2graph/makefile2graph.SlackBuild b/system/makefile2graph/makefile2graph.SlackBuild
index 366e81ff41..b58d1d7c1d 100644
--- a/system/makefile2graph/makefile2graph.SlackBuild
+++ b/system/makefile2graph/makefile2graph.SlackBuild
@@ -1,15 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for makefile2graph
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20220611 bkw: updated for v2021.11.06.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=makefile2graph
-VERSION=${VERSION:-1.5.0}
+VERSION=${VERSION:-2021.11.06}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +24,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -49,14 +58,17 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod 644 *
 
-make -j1 \
+# 20210824 bkw: fix parallel build. not that helpful really since
+# there's only one source file to compile anyway.
+sed -i '/^install:/s,$, all,' Makefile
+
+make \
   CFLAGS="$SLKCFLAGS -Wl,-s" DESTDIR=$PKG \
   prefix=/usr man1dir=/usr/man/man1 pkgdocdir=/usr/doc/$PRGNAM-$VERSION \
   all install
 
 chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/* $PKG/usr/man/man1/*
 gzip -9 $PKG/usr/man/man1/*.1
-ln -s make2graph.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -64,4 +76,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/makefile2graph/makefile2graph.info b/system/makefile2graph/makefile2graph.info
index 2a85e06f16..b6ad370ceb 100644
--- a/system/makefile2graph/makefile2graph.info
+++ b/system/makefile2graph/makefile2graph.info
@@ -1,10 +1,10 @@
 PRGNAM="makefile2graph"
-VERSION="1.5.0"
+VERSION="2021.11.06"
 HOMEPAGE="https://github.com/lindenb/makefile2graph"
-DOWNLOAD="https://github.com/lindenb/makefile2graph/archive/v1.5.0/makefile2graph-1.5.0.tar.gz"
-MD5SUM="7eb822eced522ef03ab29c893e59d2d3"
+DOWNLOAD="https://github.com/lindenb/makefile2graph/archive/2021.11.06/makefile2graph-2021.11.06.tar.gz"
+MD5SUM="b4e4ad7b162be53ef41933adebc8358f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/makepasswd/makepasswd.SlackBuild b/system/makepasswd/makepasswd.SlackBuild
index cf6133605a..70598ed123 100644
--- a/system/makepasswd/makepasswd.SlackBuild
+++ b/system/makepasswd/makepasswd.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for makepasswd
 
 # Originally written by Pablo Santamaria (email removed)
 
-# Now maintained by B. Watson <yalhcru@gmail.com>. Original version
+# Now maintained by B. Watson <urchlay@slackware.uk>. Original version
 # had no license, modified version released under the WTFPL. See
 # http://www.wtfpl.net/txt/copying/ for details.
 
@@ -17,10 +17,13 @@
 # - install HTML doc to /usr/doc/$PRGNAM-$VERSION, not /usr/man/html1
 # - script cosmetic cleanups
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=makepasswd
 VERSION=${VERSION:-0.5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -30,7 +33,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,11 +67,8 @@ rm -rf $TARNAM
 tar xvf $CWD/$TARNAM.tar.gz
 cd $TARNAM
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 make CFLAGS="$SLKCFLAGS"
 make PREFIX=$PKG/usr DATADIR=$PKG/usr MANDIR=$PKG/usr/man install
@@ -80,4 +84,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/makepasswd/makepasswd.info b/system/makepasswd/makepasswd.info
index 783e697388..b6e5b99ca0 100644
--- a/system/makepasswd/makepasswd.info
+++ b/system/makepasswd/makepasswd.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/makepp/makepp.SlackBuild b/system/makepp/makepp.SlackBuild
index a9758a50cc..5cad881028 100644
--- a/system/makepp/makepp.SlackBuild
+++ b/system/makepp/makepp.SlackBuild
@@ -1,19 +1,31 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for makepp
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20220316 bkw: derp. fix broken symlinks.
+# 20210824 bkw: update for v2.0.99.2, aka 2.1rc1, because 2.0 won't
+# build on -current and other distros have been shipping 2.1 betas and
+# release candidates for years now.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=makepp
-VERSION=${VERSION:-2.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.0.99.2}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -24,32 +36,41 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
+tar xvf $CWD/$PRGNAM-$VERSION.t?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Most of the executables have 2 names each, short and long, e.g. mpp
 # and makepp. install.pl installs them as hardlinks, which is kinda weird
 # for a Slack package. Not sure they'd cause any problems, but I *know*
 # symlinks work correctly, so:
-sed -i 's,^ *link\>,symlink,' install.pl
+sed -i \
+    -e 's,^ *link\>,symlink,' \
+    install.pl
 
 # configure/make is just a wrapper around install.pl. Skip the tests,
 # because they spam /usr/include and don't even clean up after themselves.
+PERL5LIB="$( pwd )" \
 perl install.pl \
   /usr/bin \
   /usr/share/$PRGNAM \
   /usr/man \
-  /usr/doc/$PRGNAM-$VERSION \
+  /usr/doc/$PRGNAM-$VERSION/html \
   none \
-  $PKG/usr
+  $PKG
+
+# 20220316 bkw: install.pl's symlinks are absolute, pointing to $PKG.
+# Make them relative. This code only works because the link targets
+# are in the same directories as the links.
+for link in $( find -P $PKG -type l); do
+  target="$( realpath $link )"
+  rm -f $link; ln -s $( basename $target ) $link
+done
 
-gzip -9 $PKG/usr/man/man1/*.1
+# in 2.0.99.2, they're already gzipped.
+#gzip -9 $PKG/usr/man/man1/*.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
@@ -59,4 +80,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/makepp/makepp.info b/system/makepp/makepp.info
index 33ddf853c0..fe0624656e 100644
--- a/system/makepp/makepp.info
+++ b/system/makepp/makepp.info
@@ -1,10 +1,10 @@
 PRGNAM="makepp"
-VERSION="2.0"
+VERSION="2.0.99.2"
 HOMEPAGE="http://makepp.sourceforge.net/"
-DOWNLOAD="https://downloads.sourceforge.net/project/makepp/2.0/makepp-2.0.tgz"
-MD5SUM="634d67455bf32fe1f16f65b7e32f4a45"
+DOWNLOAD="https://downloads.sourceforge.net/project/makepp/2.1/makepp-2.0.99.2.txz"
+MD5SUM="62aa55f8a20a4256f7413746724be58a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/makeself/README b/system/makeself/README
index 12125de71f..bfc5aa601c 100644
--- a/system/makeself/README
+++ b/system/makeself/README
@@ -2,9 +2,10 @@ makeself - Make self-extractable archives on Unix
 
 makeself.sh is a small shell script that generates a self-extractable
 tar.gz archive from a directory. The resulting file appears as a shell
-script (many of those have a .run suffix), and can be launched as is. The
-archive will then uncompress itself to a temporary directory and an optional
-arbitrary command will be executed (for example an installation script).
-This is pretty similar to archives generated with WinZip Self-Extractor in
-the Windows world. Makeself archives also include checksums for integrity
-self-validation (CRC and/or MD5 checksums).
+script (many of those have a .run suffix), and can be launched as
+is. The archive will then uncompress itself to a temporary directory
+and an optional arbitrary command will be executed (for example an
+installation script). This is pretty similar to archives generated
+with WinZip Self-Extractor in the Windows world. Makeself archives
+also include checksums for integrity self-validation (CRC and/or MD5
+checksums).
diff --git a/system/makeself/makeself.SlackBuild b/system/makeself/makeself.SlackBuild
index 0c812684bd..3592bfeb15 100644
--- a/system/makeself/makeself.SlackBuild
+++ b/system/makeself/makeself.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for makeself
 
-# Copyright 2020, Erik Falor <ewfalor@gmail.com>, Utah, USA
+# Copyright 2023, Erik Falor <ewfalor@gmail.com>, Utah, USA
 # All rights reserved.
 #
 # Originally maintained by Andrew Tkalia <anddt@yandex.ru>, Ukraine, Kyiv
@@ -24,14 +24,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=makeself
-VERSION=${VERSION:-2.4.2}
+VERSION=${VERSION:-2.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -51,21 +58,22 @@ cd $PRGNAM-release-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-sed -i -e "s,HEADER\=\`dirname \"\$0\"\`,HEADER\=\/usr\/share,g" makeself.sh
+sed -i -e "s,^HEADER\=\`dirname \"\$0\"\`,HEADER=/usr/share/$PRGNAM," makeself.sh
 mkdir -p $PKG/usr/bin
 mkdir -p $PKG/usr/man/man1
-mkdir -p $PKG/usr/share
-cp makeself-header.sh $PKG/usr/share
+mkdir -p $PKG/usr/share/$PRGNAM
+install -m0644 makeself-header.sh $PKG/usr/share/$PRGNAM
 cp makeself.sh $PKG/usr/bin
 cat makeself.1 |gzip -9 > $PKG/usr/man/man1/makeself.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README.md makeself.lsm $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md test $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/test
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
@@ -74,4 +82,4 @@ cd $PKG/usr/bin
 ln -s makeself.sh $PRGNAM
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/makeself/makeself.info b/system/makeself/makeself.info
index a1573f2778..52a3c287cf 100644
--- a/system/makeself/makeself.info
+++ b/system/makeself/makeself.info
@@ -1,8 +1,8 @@
 PRGNAM="makeself"
-VERSION="2.4.2"
+VERSION="2.5.0"
 HOMEPAGE="https://github.com/megastep/makeself"
-DOWNLOAD="https://github.com/megastep/makeself/archive/release-2.4.2.tar.gz"
-MD5SUM="7f81a68ee6a8db39ca099e93e7bbc5ed"
+DOWNLOAD="https://github.com/megastep/makeself/archive/release-2.5.0/makeself-release-2.5.0.tar.gz"
+MD5SUM="0c0811d2134edafd7ac311e66fbdfb19"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/man-db/README b/system/man-db/README
deleted file mode 100644
index 8ac7c0c470..0000000000
--- a/system/man-db/README
+++ /dev/null
@@ -1,14 +0,0 @@
-man-db (database-driven manual pager suite)
-
-This package provides the man command and related utilities
-for examining on-line help files (manual pages). It can act as a
-replacement for Slackware's man package. It has several enhancements
-over man, including an indexed database for searches with -k or
-apropos, the ability to easily view man pages in a browser, better
-i18n support, and a much more efficient implementation of the -K (full
-text search) option.
-
-This build includes a complete install of libpipeline.
-
-By default, man-db doesn't conflict with Slackware's man package. See
-README.Slackware for details.
diff --git a/system/man-db/README.Slackware b/system/man-db/README.Slackware
deleted file mode 100644
index 165e9dfa4c..0000000000
--- a/system/man-db/README.Slackware
+++ /dev/null
@@ -1,49 +0,0 @@
-By default, man-db can be installed alongside Slackware's man package
-without conflict, as it installs its binaries and man pages into
-/opt/man-db. After installation, either log out and back in, or source
-/etc/profile.d/man-db.sh in your shell (this adjusts $PATH so the man
-command from /opt/man-db will be found first).
-
-Alternately, man-db can be built as a replacement for Slackware's
-man package.  To do this, set USR=yes in the script's environment,
-and "removepkg man" before installing man-db. No profile scripts are
-installed in this case.
-
-When installing man-db, the doinst.sh script may take several minutes to
-run. This is because it's indexing all the man pages on the system. Also,
-a cron job is installed in /etc/cron.daily, which adds newly-installed
-man pages to the database. The index speeds up searching via "man -k"
-or "apropos". The disadvantage is that newly-installed man pages won't
-be found in these searches until the database has been updated, so any
-time you install new man pages, you'll want to run "mandb" as root, or
-wait for cron to do it for you (if you don't do this, the new pages can
-still be displayed, they just won't be searchable). The indexing runs
-quickly once the initial database has been created, so the cron job or
-manual update shouldn't bring your system to its knees.
-
-The database is located in /var/cache/man, and on a full Slackware install
-will be approximately 5MB in size. During index creation, approximately
-10MB in /var is used. If you decide to removepkg man-db, you'll probably
-also want to get rid of its database with "rm -rf /var/cache/man". If
-the database gets corrupted somehow, it can be regenerated from scratch
-by running "mandb -c" or just reinstalling the man-db package.
-
-Although man-db supports caching formatted pages ("cat" pages), it's
-disabled in this build, to make man-db behave more like Slackware's man
-(which supports caching, but it's disabled). On modern (and even 10+
-year old) systems, the small amount of extra time it takes to format
-a man page every time it's viewed is probably not worth the headaches
-caused by stale cat pages.
-
-Unlike some distro packages of man-db, this build doesn't install man or
-mandb setuid. This prevents caching cat pages from working (see above),
-and prevents man from automatically adding new man pages to the database
-the first time a user views them (they will be indexed by the cron job,
-or by root manually running "mandb", if you're impatient).
-
-A word about i18n support: the whole reason I packaged man-db is because
-Slackware's man can't handle Japanese man pages, and I couldn't come
-up with a way to make them work after several hours of research and
-man.conf editing. With man-db, they Just Work, with LANG=ja_JP.UTF-8
-(now all I have to do is learn to read Japanese). In general, UTF-8
-locales are preferred for man-db, although non-UTF-8 is also supported.
diff --git a/system/man-db/doinst.sh b/system/man-db/doinst.sh
deleted file mode 100644
index cb474322c8..0000000000
--- a/system/man-db/doinst.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/man_db.conf.new
-
-# In English, the if/find below means "only run the database creation if
-# it was last done over an hour ago". This is needed because upgradepkg
-# runs doinst.sh twice, but I don't want the 10+ minute long database
-# creation to happen twice on upgrade (or at all, when I'm repeatedly
-# reinstalling man-db for testing purposes).
-
-if  \
-  [ ! -e /var/cache/man/man-db ] || \
-  [ -n "$( find var/cache/man/ -type d -a -name man-db -a -mmin +60 )" ]
-then
-# Generate the initial man database (or rebuild it if it exists).
-# We want to skip this step if installing somewhere besides / (e.g. with
-# the -root option or ROOT env variable set for installpkg), hence the
-# readlink silliness.
-
-# The -c option means it blows away any existing db. I thought about
-# leaving it off (it will still create the db if it doesn't exist),
-# but decided it's better to build it fresh if the package gets
-# reinstalled (in case the db format has changed, or in case the
-# db is corrupted and the user is trying to fix it by reinstalling
-# this package).
-
-# the 2>/dev/null was added for 2.7.6 because it complains about
-# missing CACHEDIR.TAG files... which don't matter, because we've
-# got NOCACHE in the config file.
-  ( \
-    [ -x /bin/readlink ] && \
-    [ "$( /bin/readlink -f $( pwd ) )" = "/" ] && \
-    ( [ -x /opt/man-db/bin/mandb ] && /opt/man-db/bin/mandb -c -q ) || \
-    ( [ -x /usr/bin/mandb ] && /usr/bin/mandb -c -q ) \
-  ) 2>/dev/null
-fi
diff --git a/system/man-db/dont_write_in_usr.diff b/system/man-db/dont_write_in_usr.diff
deleted file mode 100644
index 8f71585981..0000000000
--- a/system/man-db/dont_write_in_usr.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Naur man-db-2.7.6.1/configure man-db-2.7.6.1.patched/configure
---- man-db-2.7.6.1/configure	2016-12-12 07:43:48.000000000 -0500
-+++ man-db-2.7.6.1.patched/configure	2017-03-04 16:49:57.389893574 -0500
-@@ -25809,46 +25809,8 @@
- 
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5
--$as_echo_n "checking for long file names... " >&6; }
--if ${ac_cv_sys_long_file_names+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_cv_sys_long_file_names=yes
--# Test for long file names in all the places we know might matter:
--#      .		the current directory, where building will happen
--#      $prefix/lib	where we will be installing things
--#      $exec_prefix/lib	likewise
--#      $TMPDIR		if set, where it might want to write temporary files
--#      /tmp		where it might want to write temporary files
--#      /var/tmp		likewise
--#      /usr/tmp		likewise
--for ac_dir in . "$TMPDIR" /tmp /var/tmp /usr/tmp "$prefix/lib" "$exec_prefix/lib"; do
--  # Skip $TMPDIR if it is empty or bogus, and skip $exec_prefix/lib
--  # in the usual case where exec_prefix is '${prefix}'.
--  case $ac_dir in #(
--    . | /* | ?:[\\/]*) ;; #(
--    *) continue;;
--  esac
--  test -w "$ac_dir/." || continue # It is less confusing to not echo anything here.
--  ac_xdir=$ac_dir/cf$$
--  (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue
--  ac_tf1=$ac_xdir/conftest9012345
--  ac_tf2=$ac_xdir/conftest9012346
--  touch "$ac_tf1" 2>/dev/null && test -f "$ac_tf1" && test ! -f "$ac_tf2" ||
--    ac_cv_sys_long_file_names=no
--  rm -f -r "$ac_xdir" 2>/dev/null
--  test $ac_cv_sys_long_file_names = no && break
--done
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_long_file_names" >&5
--$as_echo "$ac_cv_sys_long_file_names" >&6; }
--if test $ac_cv_sys_long_file_names = yes; then
--
- $as_echo "#define HAVE_LONG_FILE_NAMES 1" >>confdefs.h
- 
--fi
--
- 
- 
- 
diff --git a/system/man-db/man-db.SlackBuild b/system/man-db/man-db.SlackBuild
deleted file mode 100644
index 7e8260ddd1..0000000000
--- a/system/man-db/man-db.SlackBuild
+++ /dev/null
@@ -1,224 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for man-db
-
-# Written by B. Watson (yalhcru@gmail.com)
-
-# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-
-# 20201024 bkw: update for v2.9.3 (matches -current)
-# 20200316 bkw: update for v2.9.1 (resync with -current)
-# 20191201 bkw: update for v2.9.0 (to match -current again).
-# Also got rid of the systemd-specific stuff properly (via configure opts).
-
-# 20180801 bkw: update for v2.8.4.
-# 20180611 bkw: update for v2.8.3, to match what Pat has in -current.
-
-# 20180208 bkw: update for man-db 2.8.0, libpipeline 1.5.0.
-# This may be the last SBo update, since Pat has imported man-db
-# into Slackware-current. Depends on how long it is from now until
-# the next release: I'll maintain this until SBo stops accepting
-# submissions for 14.2.
-
-# 20170305 bkw:
-# - BUILD=2
-# - get rid of systemd-specific /usr/lib/tmpfiles.d from package.
-# - patch configure so it doesn't write to /usr/lib.
-
-# 20170215 bkw:
-# - update for 2.7.6.1 (whoops, last update wasn't for the latest version
-# - only update the cache in doinst.sh if it's over an hour old. this
-#   takes several minutes, and happens twice (uselessly) if the package
-#   is upgraded (since upgradepkg runs doinst.sh twice). waiting an hour
-#   also makes my life easier when I'm testing this script.
-# - fix man-db.cron so it works even if USR=yes (whoops), and stop trying
-#   to chown the cache to the nonexistent 'man' user.
-
-# 20170125 bkw:
-# - update for 2.7.6.
-# - add --disable-cache-owner. TODO: revisit this at some
-#   point. Maybe create a dedicated 'man' user, or use one of the existing
-#   users like 'bin' or 'operator'.
-
-# 20160726 bkw:
-# - update for 2.7.5.
-
-# 20150507 bkw:
-# - update for 2.7.1.
-# - fix homepage in .info file.
-# - had to update libpipeline to 1.4.0.
-
-# 20140924 bkw:
-# - update for 2.7.0.1, which fixes the clash between man-db's zsoelim
-#   and groff's zsoelim.
-# - update README and README.Slackware slightly.
-
-PRGNAM=man-db
-VERSION=${VERSION:-2.9.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-# By default, install binaries to /opt, so as not to stomp on Slackware's
-# man pkg. We will have to include a /etc/profile.d script to set PATH,
-# MANPATH, etc. Note that only binaries and the man pages for man-db itself
-# go to /opt. Everything else (libpipeline, man-db's shared libs, localized
-# messages, etc) goes to /usr as usual.
-
-# If you want a proper replacement for Slack's man pkg, build with
-# USR="yes", which puts the binaries in the usual places. If your name is
-# Patrick V. and you're finally replacing man with man-db in Slackware,
-# feel free to uncomment the next line:
-#USR="yes"
-
-BINDIR=/opt/$PRGNAM/bin
-[ "${USR:-no}" = "yes" ] && BINDIR=/usr/bin
-MANDIR="${BINDIR/bin/man}"
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-
-# libpipeline is a pretty niche-market library. It used to be bundled
-# in the man-db source, and as far as I can tell, nothing else uses it.
-# Instead of making it a separate build and external dep, we'll just
-# bundle it here.
-LIBNAM=libpipeline
-LIBVER=1.5.3
-
-cd $TMP
-rm -rf $LIBNAM-$LIBVER
-tar xvf $CWD/$LIBNAM-$LIBVER.tar.gz
-cd $LIBNAM-$LIBVER
-chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION/$LIBNAM-$LIBVER \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/$LIBNAM-$LIBVER
-cp -a COPYING ChangeLog* NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION/$LIBNAM-$LIBVER
-
-# now build man-db itself, using the libpipeline installed in $PKG
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-# The 'checking for long filenames' test in the configure script writes to
-# /usr/lib, which is bad behaviour for a configure script. Not to mention
-# wrong (it assumes configure is always being run as root). We already
-# know we have long filename support, because we live in the 21st century
-# now, so this patch gets rid of the test and force-enables it.
-patch -p1 < $CWD/dont_write_in_usr.diff
-
-# The circumlocutions below are needed because doing it the sane way:
-# libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX -lpipeline"
-# gets broken by libtool (it *insists* on replacing -lpipeline with
-# /usr/lib64/libpipeline.so, which will fail if it's an older version).
-LD_LIBRARY_PATH="$PKG/usr/lib$LIBDIRSUFFIX" \
-LDFLAGS="$PKG/usr/lib$LIBDIRSUFFIX/libpipeline.so" \
-libpipeline_CFLAGS="-I$PKG/usr/include" \
-libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/lib$LIBDIRSUFFIX/libpipeline.so" \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --with-systemdtmpfilesdir=no \
-  --with-systemdsystemunitdir=no \
-  --disable-setuid \
-  --disable-cache-owner \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=$MANDIR \
-  --bindir=$BINDIR \
-  --sbindir=${BINDIR/bin/sbin} \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-# There will always be man pages here, regardless of USR=yes or no.
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-if [ "${USR:-no}" != "yes" ]; then
-  # separate dir full of man pages and symlinks in /opt
-  find $PKG/$MANDIR -type f -exec gzip -9 {} \;
-  for i in $( find $PKG/$MANDIR -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-  # only need the profile.d stuff if installing to /opt
-  mkdir -p $PKG/etc/profile.d
-  install -m0755 -oroot -groot $CWD/$PRGNAM.sh $CWD/$PRGNAM.csh $PKG/etc/profile.d
-fi
-
-# no special ownership or perms needed here since we --disable-setuid
-mkdir -p $PKG/var/cache/man
-
-# only ship a daily cronjob, don't need a weekly one like Debian has.
-mkdir -p $PKG/etc/cron.daily
-install -m0755 -oroot -groot $CWD/$PRGNAM.cron $PKG/etc/cron.daily/$PRGNAM
-
-# modified default config, customized for Slackware. See the conf file for
-# list of changes.
-zcat $CWD/man_db.conf.new.gz \
-  | sed "s,@LIBDIRSUFFIX@,$LIBDIRSUFFIX,g" \
-  > $PKG/etc/man_db.conf.new
-rm -rf $PKG/etc/man_db.conf
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS Change* FAQ NEWS README docs/* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-sed "s,@BINDIR@,$BINDIR," < $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-# N.B. the -p option is actually needed here (for libpipeline.so).
-cd $PKG
-/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/man-db/man-db.cron b/system/man-db/man-db.cron
deleted file mode 100644
index 93c3a00ff2..0000000000
--- a/system/man-db/man-db.cron
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# man-db daily cronjob, part of the slackbuilds.org man-db package.
-# Author: B. Watson.
-# Adapted from Debian's man-db package, so I guess the license is GPL.
-
-set -e
-
-if ! [ -d /var/cache/man ]; then
-  # Recover from deletion, per FHS.
-  mkdir -p /var/cache/man
-  chown root:root /var/cache/man || true
-  chmod 2755 /var/cache/man
-fi
-
-# expunge old catman pages which have not been read in a week
-# commented out, as we've got cat pages disabled in this build. Left
-# here for reference in case someone really wants to enable cat pages
-# some day.
-#find /var/cache/man -type f -name '*.gz' -atime +6 -print0 | xargs -r0 rm -f &> /dev/null
-
-# regenerate man database. /opt/man-db/bin probably isn't in cron's $PATH,
-# so check for it specially, otherwise use $PATH.
-if [ -x /opt/man-db/bin/mandb ]; then
-  MANDB=/opt/man-db/bin/mandb
-else
-  MANDB=mandb
-fi
-
-$MANDB --no-purge --quiet
diff --git a/system/man-db/man-db.csh b/system/man-db/man-db.csh
deleted file mode 100644
index 6cf39ce0ba..0000000000
--- a/system/man-db/man-db.csh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/csh
-
-# Set up environment for man-db. This file is part of the slackbuilds.org
-# man-db build.
-
-# Author: B. Watson. License: WTFPL
-
-setenv MANPATH /opt/man-db/man:$MANPATH
-set path = ( /opt/man-db/bin $path )
-if ("`id -u`" == "0") then
-   set path = ( /opt/man-db/sbin $path )
-endif
diff --git a/system/man-db/man-db.info b/system/man-db/man-db.info
deleted file mode 100644
index a0c86e1b19..0000000000
--- a/system/man-db/man-db.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="man-db"
-VERSION="2.9.3"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-DOWNLOAD="http://download.savannah.gnu.org/releases/man-db/man-db-2.9.3.tar.xz \
-          http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.5.3.tar.gz"
-MD5SUM="4c8721faa54a4c950c640e5e5c713fb0 \
-        dad443d0911cf9f0f1bd90a334bc9004"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/man-db/man-db.sh b/system/man-db/man-db.sh
deleted file mode 100644
index 54c9b34ae0..0000000000
--- a/system/man-db/man-db.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Set up environment for man-db. This file is part of the slackbuilds.org
-# man-db build.
-
-# Author: B. Watson. License: WTFPL
-
-MANPATH="/opt/man-db/man:$MANPATH"
-PATH="/opt/man-db/bin:$PATH"
-
-if [ "$( id -u )" = "0" ]; then
-  PATH="/opt/man-db/sbin:$PATH"
-fi
-
-export MANPATH
-export PATH
diff --git a/system/man-db/man_db.conf.new.gz b/system/man-db/man_db.conf.new.gz
deleted file mode 100644
index 1d128438c4..0000000000
--- a/system/man-db/man_db.conf.new.gz
+++ /dev/null
diff --git a/system/man-db/slack-desc b/system/man-db/slack-desc
deleted file mode 100644
index 5abdea8fb6..0000000000
--- a/system/man-db/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-      |-----handy-ruler------------------------------------------------------|
-man-db: man-db (database-driven manual pager suite)
-man-db:
-man-db: This package provides the man command and related utilities
-man-db: for examining on-line help files (manual pages). It can act as a
-man-db: replacement for Slackware's man package. It has several enhancements
-man-db: over man, including an indexed database for searches with -k or
-man-db: apropos, the ability to easily view man pages in a browser, better
-man-db: i18n support, and a much more efficient implementation of the -K
-man-db: (full text search) option.
-man-db:
-man-db:
diff --git a/system/man-pages-es/README b/system/man-pages-es/README
index 0b9a5a385a..5c8e242bcd 100644
--- a/system/man-pages-es/README
+++ b/system/man-pages-es/README
@@ -2,8 +2,8 @@ man-pages-es (paginas de manual en Espanol)
 
 Spanish translation of man-pages and man-pages-extra.
 
-LANG should be set to something like es_ES, to see Spanish man pages. UTF-8
-doesn't work without editing /usr/lib(64)?/man.conf.
+LANG should be set to something like es_ES, to see Spanish man
+pages. UTF-8 doesn't work without editing /usr/lib(64)?/man.conf.
 
 Note that the package maintainer doesn't read Spanish well, so please,
 use English if you're sending an email.
diff --git a/system/man-pages-es/man-pages-es.SlackBuild b/system/man-pages-es/man-pages-es.SlackBuild
index c6ec484b1a..a883049aa2 100644
--- a/system/man-pages-es/man-pages-es.SlackBuild
+++ b/system/man-pages-es/man-pages-es.SlackBuild
@@ -1,19 +1,28 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for man-pages-es
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230109 bkw: BUILD=2: get rid of non-manpage files from /usr/man.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=man-pages-es
 VERSION=${VERSION:-1.55}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -33,11 +42,8 @@ rm -rf $PRGNAM-$VERSION $EXTRAPRG-$EXTRAVER
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 tar xvf $CWD/$EXTRAPRG-$EXTRAVER.tar.gz
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # in case of dupes between man-pages-es main package and -extra, we use the
 # one from -extra.
@@ -48,18 +54,19 @@ for i in $PRGNAM-$VERSION/man? $EXTRAPRG-$EXTRAVER/man?; do
   cp $i/* $dir
 done
 
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC/old
+mv $PKG/usr/man/es/man1/{README,LEAME} $PKGDOC/old
+
 find $PKG/usr/man -type f -print0 | xargs -0 gzip -9
 
 mv $EXTRAPRG-$EXTRAVER/README $EXTRAPRG-$EXTRAVER/README.extra
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a */LEEME* */README* */CHANGES* */CAMBIOS* */P* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a */LEEME* */README* */CHANGES* */CAMBIOS* */P* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-#cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/man-pages-es/man-pages-es.info b/system/man-pages-es/man-pages-es.info
index a8d2bcd330..78802c0e0f 100644
--- a/system/man-pages-es/man-pages-es.info
+++ b/system/man-pages-es/man-pages-es.info
@@ -1,12 +1,12 @@
 PRGNAM="man-pages-es"
 VERSION="1.55"
-HOMEPAGE="http://ditec.um.es/~piernas/manpages-es/"
-DOWNLOAD="http://ditec.um.es/~piernas/manpages-es/man-pages-es-1.55.tar.bz2 \
-          http://ditec.um.es/~piernas/manpages-es/man-pages-es-extra-0.8a.tar.gz"
+HOMEPAGE="https://ditec.um.es/~piernas/manpages-es/"
+DOWNLOAD="https://ditec.um.es/~piernas/manpages-es/man-pages-es-1.55.tar.bz2 \
+          https://ditec.um.es/~piernas/manpages-es/man-pages-es-extra-0.8a.tar.gz"
 MD5SUM="b71f701dcae827f2f5e4e848c66321fc \
         5827f41f77658df17f550b7f8e831432"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/man-pages-fr/README b/system/man-pages-fr/README
index 89d72a6805..e613b1418b 100644
--- a/system/man-pages-fr/README
+++ b/system/man-pages-fr/README
@@ -3,8 +3,9 @@ man-pages-fr (french system documentation)
 French translation files for the man pages. This build includes both
 "man-pages-fr" and "man-pages-extra-fr".
 
-By default, the man pages are converted to ISO-8859-1 (aka Latin-1)
-encoding, which works well with LANG=fr_FR. If you're using a UTF-8
-locale, and the pages don't display accented characters properly,
-try rebuilding the package with UTF8=yes set in the environment, and
-possibly also install man-db.
+By default, the man pages are installed as UTF-8. This should work
+with man-db regardless of whether you use a Unicode (fr_FR.UTF-8) or
+ISO-8859-1/Latin-1 (fr_FR) setting for LANG.
+
+If you set UTF8=no in the environment, the man pages will be converted
+to Latin-1. This is not recommended for Slackware 15.0 and up.
diff --git a/system/man-pages-fr/man-pages-fr.SlackBuild b/system/man-pages-fr/man-pages-fr.SlackBuild
index 1df4988113..ccfeaa74b1 100644
--- a/system/man-pages-fr/man-pages-fr.SlackBuild
+++ b/system/man-pages-fr/man-pages-fr.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for man-pages-fr
 
@@ -22,7 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Now maintained by B. Watson <yalhcru@gmail.com>
+# Now maintained by B. Watson <urchlay@slackware.uk>
+
+# 20230109 bkw: BUILD=4
+# - get rid of empty /usr/doc/man-pages-fr/ dir.
+# - remove a couple of *English* man pages (how'd those get there?)
+
+# 20210828 bkw: BUILD=3.
+# - Make UTF8=yes the default (works better with man-db).
 
 # 20170626 bkw:
 # - Take over maintenance, BUILD=2.
@@ -31,15 +38,22 @@
 #   not the other.
 # - Add UTF8 option.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=man-pages-fr
 VERSION=${VERSION:-3.03.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 # Hardcode ARCH
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,17 +61,12 @@ OUTPUT=${OUTPUT:-/tmp}
 XTRANAM=man-pages-extras-fr
 XTRAVER=${XTRAVER:-0.8.1}
 
-UTF8=${UTF8:-no}
-
 set -e
 
 fix_perms() {
   chown -R root:root .
-  find -L . \
-   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-   -exec chmod 755 {} \+ -o \
-   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-   -exec chmod 644 {} \+
+  find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+          \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 }
 
 rm -rf $PKG
@@ -72,7 +81,8 @@ cd $XTRANAM-$XTRAVER
 fix_perms
 make DESTDIR=$PKG MANDIR=/usr/man/fr install
 
-if [ "$UTF8" != "yes" ]; then
+if [ "${UTF8:-yes}" != "yes" ]; then
+  ENC="--encoding=latin1"
   echo "Converting to latin-1..."
   cd $PKG/usr/man/fr
   for MANPAGE in man*/* ; do
@@ -98,8 +108,6 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 fix_perms
 
-[ "$UTF8" != "yes" ] && ENC="--encoding=latin1"
-
 ./configure \
   --prefix=$PKG/usr \
   $ENC \
@@ -109,15 +117,19 @@ make
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/doc/$PRGNAM/* $PKG/usr/doc/$XTRANAM-$XTRAVER $PKG/usr/doc/$PRGNAM-$VERSION
+rmdir $PKG/usr/doc/$PRGNAM
 
 # These two are included in Slackware.
 rm $PKG/usr/man/fr/man5/passwd.5.gz
 rm $PKG/usr/man/fr/man3/getspnam.3.gz
 
+# 20230109 bkw: These aren't even in French.
+rm -f $PKG/usr/man/fr/man8/ld-linux.*
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/man-pages-fr/man-pages-fr.info b/system/man-pages-fr/man-pages-fr.info
index d0d0902505..1c1908ff28 100644
--- a/system/man-pages-fr/man-pages-fr.info
+++ b/system/man-pages-fr/man-pages-fr.info
@@ -9,4 +9,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/man-pages-ja/README b/system/man-pages-ja/README
index 188afea3e4..eb75f1106a 100644
--- a/system/man-pages-ja/README
+++ b/system/man-pages-ja/README
@@ -2,31 +2,30 @@ man-pages-ja (Japanese language man pages)
 
 Notes:
 
-- Script author doesn't speak or read Japanese. If there are problems with
-  the contents of the man pages themselves, contact the upstream author or
-  join the linuxjm-discuss@lists.sourceforge.jp mailing list.
+- Script author doesn't speak or read Japanese. If there are problems
+  with the contents of the man pages themselves, contact the upstream
+  author or join the linuxjm-discuss@lists.sourceforge.jp mailing
+  list.
 
-- Upstream appears to update the source on the 15th of every month. I won't
-  have time to update this SlackBuild every month, but most likely you can
-  use the updated versions like so:
+- Upstream appears to update the source on the 15th of every month. I
+  won't have time to update this SlackBuild every month, but most
+  likely you can use the updated versions like so:
 
   # VERSION=20160115 ./man-pages-ja.SlackBuild
 
   If this doesn't work, let me know and I'll update the build script.
 
-- Don't forget to source /etc/profile.d/man-db.sh or log out and back
-  in after installing man-db. Slackware's standard man can't handle these.
-
-- I tested with LANG=ja_JP.UTF-8 in the environment. You can set this
-  system-wide in /etc/profile.d/lang.sh, or per-user in e.g. .bash_profile.
+- I tested with LANG=ja_JP.UTF-8 in the environment. You can
+  set this system-wide in /etc/profile.d/lang.sh, or per-user in
+  e.g. .bash_profile.
 
 - In X, use a unicode-capable terminal (urxvt, xcfe4-terminal, or even
   xterm with appropriate .Xdefaults) with a font that has glyphs for
   Japanese, such as "WenQuanYi Zen Hei Mono".
 
-- I suspect it would also work to use LANG=ja_JP.eucjp if a eucjp terminal
-  is used, but don't know how to test this.
+- I suspect it would also work to use LANG=ja_JP.eucjp if a eucjp
+  terminal is used, but don't know how to test this.
 
-- I have no idea how (or if) it's possible to use a Japanese font in the
-  Linux console. If anyone has any information, contact me at the email
-  address in the .info file and I'll add it to this README.
+- I have no idea how (or if) it's possible to use a Japanese font in
+  the Linux console. If anyone has any information, contact me at the
+  email address in the .info file and I'll add it to this README.
diff --git a/system/man-pages-ja/man-pages-ja.SlackBuild b/system/man-pages-ja/man-pages-ja.SlackBuild
index 13333c85bb..234db4bee3 100644
--- a/system/man-pages-ja/man-pages-ja.SlackBuild
+++ b/system/man-pages-ja/man-pages-ja.SlackBuild
@@ -1,19 +1,26 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for man-pages-ja
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=man-pages-ja
-VERSION=${VERSION:-20201015}
+VERSION=${VERSION:-20221215}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -53,4 +60,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/man-pages-ja/man-pages-ja.info b/system/man-pages-ja/man-pages-ja.info
index 8cd22f19ca..76d4340ccd 100644
--- a/system/man-pages-ja/man-pages-ja.info
+++ b/system/man-pages-ja/man-pages-ja.info
@@ -1,10 +1,10 @@
 PRGNAM="man-pages-ja"
-VERSION="20201015"
-HOMEPAGE="http://linuxjm.sourceforge.jp/"
-DOWNLOAD="http://linuxjm.sourceforge.jp/man-pages-ja-20201015.tar.gz"
-MD5SUM="2ca73214a0027747ec3cc59e8059bc58"
+VERSION="20221215"
+HOMEPAGE="https://linuxjm.osdn.jp/"
+DOWNLOAD="https://linuxjm.osdn.jp/man-pages-ja-20221215.tar.gz"
+MD5SUM="0697861d59dc02ee0b3641b48971e1f2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="man-db"
+REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/man-pages-ru/man-pages-ru.SlackBuild b/system/man-pages-ru/man-pages-ru.SlackBuild
index ad1a76d094..a19e2acc25 100644
--- a/system/man-pages-ru/man-pages-ru.SlackBuild
+++ b/system/man-pages-ru/man-pages-ru.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for man-pages-ru
 
@@ -22,21 +22,32 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210829 bkw: Install man pages in /usr/share/ru, not
+# /usr/share/ru.UTF-8. man-db will look in both places. Changed this
+# to make it match the other man-pages-* builds.
+
 # 20201105 bkw: This hasn't been updated in 7+ years, and I'm not sure
 # it ever worked properly with 14.2's man command. Update to latest
 # version and document how to get this stuff to work with man-db and a
 # utf-8 capable terminal.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=man-pages-ru
 VERSION=${VERSION:-5.03_20191017} # Set the version to something sane.
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCVERSION="$(echo $PRGNAM_*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d _ | rev)"
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -56,9 +67,9 @@ find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
 # This one is included in Slackware.
 rm man5/passwd.5
 
-mkdir -p $PKG/usr/man/ru.UTF-8
+mkdir -p $PKG/usr/man/ru
 for section in 1 2 3 4 5 6 7 8 ; do
-  mv man$section $PKG/usr/man/ru.UTF-8
+  mv man$section $PKG/usr/man/ru
 done
 
 find $PKG/usr/man -type f -exec gzip -9 {} \+
@@ -71,4 +82,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/man-pages-ru/man-pages-ru.info b/system/man-pages-ru/man-pages-ru.info
index 8d5e4afdd9..184a1538fa 100644
--- a/system/man-pages-ru/man-pages-ru.info
+++ b/system/man-pages-ru/man-pages-ru.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://sourceforge.net/projects/man-pages-ru/files/man-pages-ru_5.03-2
 MD5SUM="0b4bc884e9f94ca107de6a8eaa60f03e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="man-db"
+REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/mandoc/README b/system/mandoc/README
index 4d7be3acbc..8b53f4b2db 100644
--- a/system/mandoc/README
+++ b/system/mandoc/README
@@ -1,17 +1,21 @@
-mandoc is a suite of tools compiling mandoc, the roff macro package of choice for
-BSD manual pages, and man, the predominant historical package for UNIX manuals.
-It is small, ISO C, ISC-licensed, and quite fast.
+mandoc (UNIX manpage viewer)
 
-The tool set features mandoc, based on the libmandoc validating compiler, to
-format output for UNIX terminals (with support for wide-character locales),
-XHTML, HTML, PostScript, and PDF. It also includes preconv, for recoding
-multibyte manuals; demandoc, for emitting only text parts of manuals; mandocdb,
-for indexing manuals; and apropos, whatis, and man.cgi (via catman) for
-semantic search of manual content.
+mandoc is a suite of tools containing mandoc, the roff macro package
+of choice for BSD manual pages, and man, the predominant historical
+package for UNIX manuals.  It is small, ISO C, ISC-licensed, and quite
+fast.
 
-There is an environment variable called REPLACE_MAN, that if set to a non-empty
-string, will instruct the slackbuild script to replace the stock man package
-(you should remove(pkg) it first, though).
+The tool set features mandoc, based on the libmandoc validating
+compiler, to format output for UNIX terminals (with support for
+wide-character locales), XHTML, HTML, PostScript, and PDF. It also
+includes preconv, for recoding multibyte manuals; demandoc, for
+emitting only text parts of manuals; mandocdb, for indexing manuals;
+and apropos, whatis, and man.cgi (via catman) for semantic search of
+manual content.
+
+There is an environment variable called REPLACE_MAN, that if set to a
+non-empty string, will instruct the slackbuild script to replace the
+stock man package (you should remove(pkg) it first, though).
 
 After installing, make sure to (re)create the mandoc specific "whatis"
 database(s) in your manpath(s), eg.:
diff --git a/system/mandoc/mandoc.SlackBuild b/system/mandoc/mandoc.SlackBuild
index 89cd662b21..2f1dc3bbe1 100644
--- a/system/mandoc/mandoc.SlackBuild
+++ b/system/mandoc/mandoc.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright (c) 2014-2019 LEVAI Daniel
 # All rights reserved.
@@ -23,10 +23,18 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220209 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix build for 15.0.
+# - actually use SLKCFLAGS.
+# - remove conflicting files when REPLACE_MAN isn't set.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mandoc
 VERSION=${VERSION:-1.14.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +44,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -70,22 +82,37 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-if [ -z "${REPLACE_MAN}" ];then
-	gzip -dc "${CWD}"/configure-noconflict.local.gz >./configure.local
+if [ -z "${REPLACE_MAN}" ]; then
+  gzip -dc "${CWD}"/configure-noconflict.local.gz >./configure.local
 else
-	gzip -dc "${CWD}"/configure-replace.local.gz >./configure.local
+  gzip -dc "${CWD}"/configure-replace.local.gz >./configure.local
 fi
+
+# 20220209 bkw: the *extremely* stupid way it tries to extract
+# the default value of CC from make, does not work... and is
+# hardcoded (can't override with environment).
+sed -i '/^CC/s,=.*,=gcc,' configure
+
 ./configure
 
-CFLAGS=$SLKCFLAGS \
-	make
+make CFLAGS="-Wl,-s -fcommon $SLKCFLAGS"
+
 make install \
-	DESTDIR=$PKG \
-	PREFIX=/usr \
-	LIBDIR=/usr/lib${LIBDIRSUFFIX}
+  DESTDIR=$PKG \
+  PREFIX=/usr \
+  LIBDIR=/usr/lib${LIBDIRSUFFIX}
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# 20220209 bkw: these would conflict with Slackware's man-db
+# and groff packages.
+if [ -z "${REPLACE_MAN}" ]; then
+  rm -f \
+    $PKG/usr/bin/soelim \
+    $PKG/usr/man/man1/soelim.1 \
+    $PKG/usr/man/man7/tbl.7 \
+    $PKG/usr/man/man7/eqn.7 \
+    $PKG/usr/man/man7/man.7 \
+    $PKG/usr/man/man7/roff.7
+fi
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -99,4 +126,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mandoc/slack-desc b/system/mandoc/slack-desc
index 1f7b5d6c7b..5e8196df52 100644
--- a/system/mandoc/slack-desc
+++ b/system/mandoc/slack-desc
@@ -6,9 +6,9 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-mandoc: mandoc (UNIX manpage compiler)
+mandoc: mandoc (UNIX manpage viewer)
 mandoc:
-mandoc: mandoc is a suite of tools compiling mdoc, the roff macro package of
+mandoc: mandoc is a suite of tools containing mdoc, the roff macro package of
 mandoc: choice for BSD manual pages, and man, the predominant historical
 mandoc: package for UNIX manuals.
 mandoc: It is small, ISO C, ISC-licensed, and quite fast.
diff --git a/system/mathML2dtd/README b/system/mathML2dtd/README
new file mode 100644
index 0000000000..115dbc02c2
--- /dev/null
+++ b/system/mathML2dtd/README
@@ -0,0 +1,12 @@
+'mathML2dtd' is a group of shell scripts, SGML catalog
+and required files used for creating a removable 
+SlackBuild package for W3 MathML2 DTD.
+
+After the installation of W3 MathML2 DTD /etc/xml/catalog
+file will be created if it DOESN'T exist otherwise it will
+be updated.
+
+After uninstallation of the 'mathML2dtd' package
+/etc/xml/catalog and /usr/share/xml/ will be reset
+automatically to the original state defined by the 
+'linuxdoc-tools'
diff --git a/system/mathML2dtd/doinst.sh b/system/mathML2dtd/doinst.sh
new file mode 100644
index 0000000000..b72330b82c
--- /dev/null
+++ b/system/mathML2dtd/doinst.sh
@@ -0,0 +1,86 @@
+catalog_filepath=etc/xml/catalog
+
+if [ ! -e etc/xml ]; then
+    mkdir -p etc/xml
+    xmlcatalog --noout --create $catalog_filepath
+fi
+
+# DocBook V4.x Entries
+xmlcatalog --noout --add 'delegatePublic' \
+  "-//OASIS//ENTITIES DocBook XML" \
+  "file:///etc/xml/docbook" \
+  $catalog_filepath
+xmlcatalog --noout --add 'delegatePublic' \
+  "-//OASIS//DTD DocBook XML" \
+  "file:///etc/xml/docbook" \
+  $catalog_filepath
+xmlcatalog --noout --add 'delegateSystem' \
+  "http://www.oasis-open.org/docbook/" \
+  "file:///etc/xml/docbook" \
+  $catalog_filepath
+xmlcatalog --noout --add 'delegateURI' \
+  "http://www.oasis-open.org/docbook/" \
+  "file:///etc/xml/docbook" \
+  $catalog_filepath
+xmlcatalog --noout --add 'delegateSystem' \
+  "http://www.oasis-open.org/docbook/xml/4.1.2/" \
+  "file:///etc/xml/docbook" \
+  $catalog_filepath
+xmlcatalog --noout --add 'delegateURI' \
+  "http://www.oasis-open.org/docbook/xml/4.1.2/" \
+  "file:///etc/xml/docbook" \
+  $catalog_filepath
+xmlcatalog --noout --add 'delegateSystem' \
+  "http://www.oasis-open.org/docbook/xml/4.2/" \
+  "file:///etc/xml/docbook" \
+  $catalog_filepath
+xmlcatalog --noout --add 'delegateURI' \
+  "http://www.oasis-open.org/docbook/xml/4.2/" \
+  "file:///etc/xml/docbook" \
+  $catalog_filepath
+xmlcatalog --noout --add 'delegateSystem' \
+  "http://www.oasis-open.org/docbook/xml/4.3/" \
+  "file:///etc/xml/docbook" \
+  $catalog_filepath
+xmlcatalog --noout --add 'delegateURI' \
+  "http://www.oasis-open.org/docbook/xml/4.3/" \
+  "file:///etc/xml/docbook" \
+  $catalog_filepath
+xmlcatalog --noout --add 'delegateSystem' \
+  "http://www.oasis-open.org/docbook/xml/4.4/" \
+  "file:///etc/xml/docbook" \
+  $catalog_filepath
+xmlcatalog --noout --add 'delegateURI' \
+  "http://www.oasis-open.org/docbook/xml/4.4/" \
+  "file:///etc/xml/docbook" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteSystem' \
+  "http://cdn.docbook.org/release/xsl-nons/1.79.2" \
+  "file://usr/share/xml/docbook/xsl-stylesheets-1.79.2" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteURI' \
+  "http://cdn.docbook.org/release/xsl-nons/1.79.2" \
+  "file://usr/share/xml/docbook/xsl-stylesheets-1.79.2" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteSystem' \
+  "http://cdn.docbook.org/release/xsl-nons/current" \
+  "file://usr/share/xml/docbook/xsl-stylesheets-1.79.2" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteURI' \
+  "http://cdn.docbook.org/release/xsl-nons/current/" \
+  "file://usr/share/xml/docbook/xsl-stylesheets-1.79.2" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteSystem' \
+  "http://docbook.sourceforge.net/release/xsl/current" \
+  "/usr/share/xml/docbook/xsl-stylesheets-1.79.2" \
+  $catalog_filepath
+xmlcatalog --noout --add 'rewriteURI' \
+  "http://docbook.sourceforge.net/release/xsl/current" \
+  "/usr/share/xml/docbook/xsl-stylesheets-1.79.2" \
+  $catalog_filepath
+
+# 'mathML2dtd' catalog Entry
+xmlcatalog --noout --add 'nextCatalog' \
+  '' \
+  "file:///usr/share/xml/schema/w3c/mathml2/catalog_mathML2.xml" \
+  $catalog_filepath
diff --git a/system/mathML2dtd/douninst.sh b/system/mathML2dtd/douninst.sh
new file mode 100644
index 0000000000..4357542fb3
--- /dev/null
+++ b/system/mathML2dtd/douninst.sh
@@ -0,0 +1,6 @@
+catalog_filepath=etc/xml/catalog
+
+# Remove 'mathML2dtd' catalog Entry
+xmlcatalog --noout --del \
+  "file:///usr/share/xml/schema/w3c/mathml2/catalog_mathML2.xml" \
+  $catalog_filepath
diff --git a/system/mathML2dtd/mathML2dtd.SlackBuild b/system/mathML2dtd/mathML2dtd.SlackBuild
new file mode 100644
index 0000000000..2f60a7fe57
--- /dev/null
+++ b/system/mathML2dtd/mathML2dtd.SlackBuild
@@ -0,0 +1,87 @@
+#!/bin/bash
+
+# mathML2dtd.SlackBuild - SlackBuild script for creating a package of MathML2 DTD
+# Copyright © 2022 Necib ÇAPAR <necipcapar@gmail.com>
+
+# This file is part of mathML2dtd
+
+# mathML2dtd is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# mathML2dtd is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=mathML2dtd
+VERSION=${VERSION:-1.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# create installation directory tree for the original files
+mkdir --parents $PKG/usr/share/xml/schema/w3c
+cp --archive $TMP/$PRGNAM-$VERSION/mathml2 $PKG/usr/share/xml/schema/w3c/
+cp --archive $TMP/$PRGNAM-$VERSION/catalog_mathML2.xml $PKG/usr/share/xml/schema/w3c/mathml2
+cp --archive $TMP/$PRGNAM-$VERSION/catalog_mathML2 $PKG/usr/share/xml/schema/w3c/mathml2
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/douninst.sh > $PKG/install/douninst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mathML2dtd/mathML2dtd.info b/system/mathML2dtd/mathML2dtd.info
new file mode 100644
index 0000000000..3420e4133b
--- /dev/null
+++ b/system/mathML2dtd/mathML2dtd.info
@@ -0,0 +1,10 @@
+PRGNAM="mathML2dtd"
+VERSION="1.0.0"
+HOMEPAGE="https://github.com/N-Tek/mathML2dtd"
+DOWNLOAD="https://github.com/N-Tek/mathML2dtd/releases/download/v1.0.0/mathML2dtd-1.0.0.tar.gz"
+MD5SUM="b91c3e186f3524f5ec75f18f1fd9c055"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="%README%"
+MAINTAINER="Necib ÇAPAR"
+EMAIL="necipcapar@gmail.com"
diff --git a/system/mathML2dtd/slack-desc b/system/mathML2dtd/slack-desc
new file mode 100644
index 0000000000..b28d0692f2
--- /dev/null
+++ b/system/mathML2dtd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+mathML2dtd: mathML2dtd (W3 MathML2 DTD)
+mathML2dtd:
+mathML2dtd: w3 mathml2 dtd with additional required files
+mathML2dtd:
+mathML2dtd:
+mathML2dtd:
+mathML2dtd:
+mathML2dtd:
+mathML2dtd:
+mathML2dtd:
+mathML2dtd: https://www.w3.org/Math/DTD/mathml2.tgz
diff --git a/system/maxcso/maxcso.SlackBuild b/system/maxcso/maxcso.SlackBuild
index 8a20490bc6..d34acddc89 100644
--- a/system/maxcso/maxcso.SlackBuild
+++ b/system/maxcso/maxcso.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for maxcso
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=maxcso
 VERSION=${VERSION:-1.12.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -93,4 +103,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/maxcso/maxcso.info b/system/maxcso/maxcso.info
index 6093cfae01..d27269668e 100644
--- a/system/maxcso/maxcso.info
+++ b/system/maxcso/maxcso.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/unknownbrackets/maxcso/archive/v1.12.0/maxcso-1.12.
 MD5SUM="4ad33bcbc7659046564d3700241364ef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libuv lz4"
+REQUIRES=""
 MAINTAINER="Hunter Sezen"
 EMAIL="orbea@riseup.net"
diff --git a/system/mbootpack/README b/system/mbootpack/README
index d22e86a4c7..d613e4069e 100644
--- a/system/mbootpack/README
+++ b/system/mbootpack/README
@@ -1,8 +1,9 @@
 mbootpack (Multiboot kernel and modules)
 
-This is a tool that takes a multiboot kernel and modules (e.g. a Xen VMM,
-linux kernel and initrd), and packages them up as a single file that looks
-like a bzImage linux kernel. The aim is to allow you to boot multiboot
-kernels (in particular, Xen) using bootloaders that don't support multiboot
-(i.e. pretty much anything except GRUB and SYSLINUX). This is, as you might
-expect, pretty grim stuff, involving lots of lovely 16-bit real-mode code.
+This is a tool that takes a multiboot kernel and modules (e.g. a Xen
+VMM, linux kernel and initrd), and packages them up as a single file
+that looks like a bzImage linux kernel. The aim is to allow you to
+boot multiboot kernels (in particular, Xen) using bootloaders that
+don't support multiboot (i.e. pretty much anything except GRUB and
+SYSLINUX). This is, as you might expect, pretty grim stuff, involving
+lots of lovely 16-bit real-mode code.
diff --git a/system/mbootpack/mbootpack.SlackBuild b/system/mbootpack/mbootpack.SlackBuild
index 60d5f20f01..c80727cbfb 100644
--- a/system/mbootpack/mbootpack.SlackBuild
+++ b/system/mbootpack/mbootpack.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mbootpack
 
@@ -22,10 +22,18 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org:
+# - BUILD=3.
+# - build with clang (gcc fails *hard*).
+# - only install the actual mbootpack binary in /usr/bin.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mbootpack
 VERSION=${VERSION:-0.6a}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,25 +77,32 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Some fixes from ALT Linux folks
 patch -p1 <$CWD/patches/mbootpack-0.6a-alt3.patch
 
-make
+# 20220210 bkw: actually use SLKCFLAGS.
+sed -i -e "s,-O3,$SLKCFLAGS," Makefile
 
-# We have to do things manually since mbootpack doesn't have make install
-mkdir -p $PKG/usr/{bin,man/man1}
-cp -a bootsect mbootpack mkhex setup $PKG/usr/bin
-cp -a mbootpack.man $PKG/usr/man/man1/mbootpack.1
+# 20220210 bkw: speeds up the sed scripts slightly.
+export LANG=C
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# 20220210 bkw: gcc fails *badly* at compiling this, and I'm not sure why.
+# We end up with giant (like 130MB) .c source files and gcc either gets
+# OOM-killed or starves everything else of CPU. clang seems fine though.
+# -I- is an error in clang.
+sed -i -e 's,-I-,-iquote,' Makefile
+make CC=clang
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# We have to do things manually since mbootpack doesn't have make install.
+# 20220210 bkw: looking at the ALT linux package, the bootsect, mkhex,
+# setup binaries don't belong in the package.
+mkdir -p $PKG/usr/{bin,man/man1}
+install -s $PRGNAM $PKG/usr/bin
+gzip -9c $PRGNAM.man > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a Changes GPL README $PKG/usr/doc/$PRGNAM-$VERSION
@@ -93,4 +112,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mbpfan/README b/system/mbpfan/README
new file mode 100644
index 0000000000..5d097af99f
--- /dev/null
+++ b/system/mbpfan/README
@@ -0,0 +1,15 @@
+mbpfan (fan control daemon for Apple MacBookPro machines)
+
+A simple daemon to control fan speed on all MacBook/MacBook Pros
+(probably all Apple computers) for Linux Kernel 3 and newer.
+
+After installation you must add below to /etc/rc.d/rc.local:
+
+if [ -x /etc/rc.d/rc.mbpfan ]; then
+  /etc/rc.d/rc.mbpfan start
+fi
+
+and ensure /etc/rc.d/rc.mbpfan is exec (0755)
+
+Also edit /etc/mbpfan.conf and uncomment min_fan1_speed & max_fan1_speed
+I have found a min of 3000 and max 6200 work well for my mbp.
diff --git a/system/mbpfan/doinst.sh b/system/mbpfan/doinst.sh
new file mode 100644
index 0000000000..a927d07e87
--- /dev/null
+++ b/system/mbpfan/doinst.sh
@@ -0,0 +1,11 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    rm $NEW
+  fi
+}
+
+config etc/mbpfan.conf.new
diff --git a/system/mbpfan/mbpfan.SlackBuild b/system/mbpfan/mbpfan.SlackBuild
new file mode 100644
index 0000000000..cc734e143d
--- /dev/null
+++ b/system/mbpfan/mbpfan.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/bash
+
+# Slackware build script for mbpfan
+
+# Copyright 2022-23 Jay Lanagan (j@lngn.net), Detroit, MI, USA.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=mbpfan
+VERSION=${VERSION:-2.4.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Slackware-ize the makefile
+sed -i -e "/-std=/s,= ,= $SLKCFLAGS ," \
+       -e 's,share/man,man,g' \
+       Makefile
+
+CFLAGS="$SLKCFLAGS" \
+
+make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# rename conf & add rc script
+mv $PKG/etc/mbpfan.conf $PKG/etc/mbpfan.conf.new
+mkdir $PKG/etc/rc.d
+cp $CWD/rc.mbpfan $PKG/etc/rc.d
+
+# cleanup systemd stuff and dupe docs
+rm -r $PKG/lib
+rm -rf $PKG/usr/share
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README.md  \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mbpfan/mbpfan.info b/system/mbpfan/mbpfan.info
new file mode 100644
index 0000000000..208fad019c
--- /dev/null
+++ b/system/mbpfan/mbpfan.info
@@ -0,0 +1,10 @@
+PRGNAM="mbpfan"
+VERSION="2.4.0"
+HOMEPAGE="https://github.com/linux-on-mac/mbpfan/"
+DOWNLOAD="https://github.com/linux-on-mac/mbpfan/archive/v2.4.0/mbpfan-2.4.0.tar.gz"
+MD5SUM="aaa7a3d89f576f18e34fce5f1dda50de"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jay Lanagan"
+EMAIL="j@lngn.net"
diff --git a/system/mbpfan/rc.mbpfan b/system/mbpfan/rc.mbpfan
new file mode 100644
index 0000000000..457f0de967
--- /dev/null
+++ b/system/mbpfan/rc.mbpfan
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# /etc/rc.d/rc.mbpfan
+#
+# Start/stop/restart - mbpfan.
+#
+# To make mbpfan start automatically at boot, make this
+# file executable:  chmod 755 /etc/rc.d/rc.mbpfan
+#
+# and also you must add this to /etc/rc.d/rc.local to
+# start mbpfan:
+#
+# if [ -x /etc/rc.d/rc.mbpfan ]; then
+#   /etc/rc.d/rc.mbpfan start
+# fi
+
+case "$1" in
+  'start')
+    /usr/sbin/mbpfan -f >/dev/null &
+  ;;
+  'stop')
+    pkill -f /usr/sbin/mbpfan >/dev/null &
+    rm -f /var/run/mbpfan.pid
+  ;;
+  'restart')
+    /usr/sbin/mbpfan -f >/dev/null &
+  ;;
+  *)
+    echo "Usage: $0 {start|stop|restart}"
+  ;;
+esac
+
diff --git a/system/mbpfan/slack-desc b/system/mbpfan/slack-desc
new file mode 100644
index 0000000000..10e17620f8
--- /dev/null
+++ b/system/mbpfan/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+mbpfan: mbpfan (fan control daemon for Apple MacBookPro machines)
+mbpfan:
+mbpfan: A simple daemon to control fan speed on all MacBook/MacBook Pros
+mbpfan: (probably all Apple computers) for Linux Kernel 3 and newer.
+mbpfan:
+mbpfan: Homepage: https://github.com/linux-on-mac/mbpfan
+mbpfan:
+mbpfan:
+mbpfan:
+mbpfan:
+mbpfan:
diff --git a/system/mbuffer/README b/system/mbuffer/README
new file mode 100644
index 0000000000..7e63604626
--- /dev/null
+++ b/system/mbuffer/README
@@ -0,0 +1,19 @@
+mbuffer (a tool for buffering data streams)
+
+mbuffer has a large set of unique features:
+  - direct support for TCP based network targets (IPv4 and IPv6)
+  - ability to send to multiple targets in parallel
+  - support for multiple volumes
+  - I/O rate limitation
+  - high/low watermark based restart criteria
+  - configurable buffer size
+  - on the fly MD5 hash calculation
+
+It is especially useful, if you are writing backups to fast tape drives
+or libraries. Those drives tend to stop and rewind if they have a buffer
+underrun. This so called tape screwing reduces the lifetime of the
+motors.
+
+mbuffer can prevent buffer underruns, if used correctly and speed up
+the whole backup process. Please read the man page for details, how to
+use it.
diff --git a/system/mbuffer/mbuffer.SlackBuild b/system/mbuffer/mbuffer.SlackBuild
new file mode 100644
index 0000000000..356bd4de63
--- /dev/null
+++ b/system/mbuffer/mbuffer.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+# Slackware build script for mbuffer
+
+# Copyright 2023 Matt Egger USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=mbuffer
+VERSION=${VERSION:-20240107}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  ChangeLog \
+  README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mbuffer/mbuffer.info b/system/mbuffer/mbuffer.info
new file mode 100644
index 0000000000..b7fbf8b96b
--- /dev/null
+++ b/system/mbuffer/mbuffer.info
@@ -0,0 +1,10 @@
+PRGNAM="mbuffer"
+VERSION="20240107"
+HOMEPAGE="http://www.maier-komor.de/mbuffer.html"
+DOWNLOAD="http://www.maier-komor.de/software/mbuffer/mbuffer-20240107.tgz"
+MD5SUM="355a3251b2dd519691ab094bdc41f819"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="%README% perl-Config-IniFiles"
+MAINTAINER="Matt Egger"
+EMAIL="bru.barwal@sdf.org"
diff --git a/system/mbuffer/slack-desc b/system/mbuffer/slack-desc
new file mode 100644
index 0000000000..87969e9bfb
--- /dev/null
+++ b/system/mbuffer/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+mbuffer: mbuffer (a tool for buffering data streams)
+mbuffer:
+mbuffer: mbuffer has a large set of unique features:
+mbuffer:   - direct support for TCP based network targets (IPv4 and IPv6)
+mbuffer:   - ability to send to multiple targets in parallel
+mbuffer:   - support for multiple volumes
+mbuffer:   - I/O rate limitation
+mbuffer:   - high/low watermark based restart criteria
+mbuffer:   - configurable buffer size
+mbuffer:   - on the fly MD5 hash calculation
+mbuffer: http://www.maier-komor.de/mbuffer.html
diff --git a/system/mcrypt/README b/system/mcrypt/README
index 7040c70841..785491c0be 100644
--- a/system/mcrypt/README
+++ b/system/mcrypt/README
@@ -1,5 +1,7 @@
-mcrypt is a replacement for the old crypt package and crypt command with
-extensions. It allows developers to use a wide range of encryption functions
-including encrypting files or data streams without having to be cryptographers.
+mcrypt is a replacement for the old crypt package and crypt
+command with extensions. It allows developers to use a wide range
+of encryption functions including encrypting files or data streams
+without having to be cryptographers.
 
-mcrypt is recommended if you are using phpmyadmin for database administration.
+mcrypt is recommended if you are using phpmyadmin for database
+administration.
diff --git a/system/mcrypt/mcrypt.SlackBuild b/system/mcrypt/mcrypt.SlackBuild
index deadd5446f..fc73de9002 100644
--- a/system/mcrypt/mcrypt.SlackBuild
+++ b/system/mcrypt/mcrypt.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for mcrypt
 # Home Page http://mcrypt.sourceforge.net/
@@ -24,10 +24,13 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mcrypt
 VERSION=${VERSION:-2.6.8}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -106,4 +116,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/md5deep/README b/system/md5deep/README
index 20824fe48f..9d15711dfa 100644
--- a/system/md5deep/README
+++ b/system/md5deep/README
@@ -1,4 +1,6 @@
-md5deep is a cross-platform set of programs to compute MD5, SHA-1, SHA-256,
-Tiger, or Whirlpool message digests on an arbitrary number of files. md5deep
-is similar to the md5sum program found in the GNU Coreutils package, but has
-additional features.
+md5deep (tools to compare digests)
+
+md5deep is a cross-platform set of programs to compute MD5, SHA-1,
+SHA-256, Tiger, or Whirlpool message digests on an arbitrary number
+of files. md5deep is similar to the md5sum program found in the GNU
+Coreutils package, but has additional features.
diff --git a/system/md5deep/md5deep.SlackBuild b/system/md5deep/md5deep.SlackBuild
index b049d8efab..57e4e075eb 100644
--- a/system/md5deep/md5deep.SlackBuild
+++ b/system/md5deep/md5deep.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for md5deep
 
@@ -23,11 +23,18 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org to fix the build on 15.0.
+# Also, install missing symlinks (e.g. hashdeep => md5deep) and
+# de-duplicate man pages.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=md5deep
 SRCNAM=hashdeep
 VERSION=${VERSION:-4.4}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +44,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -71,13 +82,17 @@ rm -rf tests/testfiles/symlinktest/
 
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20220210 bkw: ordered comparison of pointer and int...
+sed -i 's,base>0,base,' src/hash.cpp
+
+sh bootstrap.sh
 
-chmod +x bootstrap.sh
 CFLAGS="$SLKCFLAGS" \
-./bootstrap.sh
+CXXFLAGS="$SLKCFLAGS -std=gnu++98" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
@@ -85,20 +100,27 @@ CFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+gzip -9 $PKG/usr/man/man*/*
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# 20220210 bkw: program alters its behaviour based on the name it's
+# called as. So provide the alternate names. Also, the man pages are
+# identical, so make them symlinks too.
+for i in md5 sha1 sha256 tiger whirlpool; do
+  ln -s hashdeep $PKG/usr/bin/${i}deep
+  if [ "$i" != "md5" ]; then
+    rm -f $PKG/usr/man/man1/${i}deep.1.gz
+    ln -s md5deep.1.gz $PKG/usr/man/man1/${i}deep.1.gz
+  fi
+done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mdcat-bin/README b/system/mdcat-bin/README
new file mode 100644
index 0000000000..e7bb8ac065
--- /dev/null
+++ b/system/mdcat-bin/README
@@ -0,0 +1,24 @@
+mdcat-bin (cat and less for markdown)
+
+mdcat is a fancy "cat" (or "less") for Markdown (aka CommonMark).
+mdcat renders Markdown in a terminal, using escape codes for
+highlighting and formatting. It works in any terminal, including the
+Linux console, but some features (e.g. italics, strikethrough, images)
+are only supported on certain terminals (such as kitty, for images).
+
+For convenience, mdcat is also installed as mdless (which behaves the
+same as "mdcat -p").
+
+The package installs completion support for bash (requires
+bash-completion from Slackware /extra), zsh, and fish, and
+tab-completion should "just work" after the package is installed.
+
+PowerShell completion is also included, but has to be manually
+set up. To do this, edit your PowerShell profile (usually
+~/.config/powershell/profile.ps1) and add the following lines:
+
+/usr/share/mdcat-bin/powershell-completions/_mdcat.ps1
+/usr/share/mdcat-bin/powershell-completions/_mdless.ps1
+
+This is a repack of the official binary, which only exists for
+x86_64. There are no 32-bit or aarch64 binaries, sorry.
diff --git a/system/mdcat-bin/mdcat-bin.SlackBuild b/system/mdcat-bin/mdcat-bin.SlackBuild
new file mode 100644
index 0000000000..713d56a384
--- /dev/null
+++ b/system/mdcat-bin/mdcat-bin.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/bash
+
+# Slackware build script for mdcat-bin
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# This is a binary repack because the source is in Rust, and won't
+# build with the Rust that ships with Slackware 15.0. It would be
+# possible for someone to use rustup and deal with "cargo vendor"
+# stuff to create build-from-source mdcat SlackBuild, but that
+# someone will not be me. If you are that someone, I've named this one
+# "mdcat-bin" so you can name yours "mdcat".
+
+# Despite the "musl" in the tarball filename, this works fine on
+# Slackware, since it's 100% statically linked. Upstream probably used
+# musl because glibc's not capable of creating a truly static binary
+# that uses DNS...
+
+# Many thanks to chrisdent and pwshdooduk of libera.chat's #powershell,
+# for making sense of the powershell completions and just generally
+# being friendly folks.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=mdcat-bin
+SRCNAM=mdcat
+VERSION=${VERSION:-2.0.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  SRCDIR="$SRCNAM-$VERSION-$ARCH-unknown-linux-musl"
+  TARBALL="$SRCDIR.tar.gz"
+else
+  cat <<EOF
+
+*** ARCH "$ARCH" is not supported (only x86_64 is supported, sorry).
+
+EOF
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+# use e.g. /tmp/SBo/mdcat-bin/<blah>/, for easy cleanup.
+rm -rf $PRGNAM
+mkdir -p $PRGNAM
+cd $PRGNAM
+tar xvf $CWD/$TARBALL
+cd $SRCDIR
+chown -R root:root .
+# no find|chmod, but we install everything with explicit permissions
+# or redirection, below.
+
+PKGBIN=$PKG/usr/bin
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+PKGMAN1=$PKG/usr/man/man1
+PKGBASHC=$PKG/usr/share/bash-completion/completions
+PKGZSHC=$PKG/usr/share/zsh/site-functions
+PKGFISHC=$PKG/usr/share/fish/completions
+
+# powershell doesn't really have a completions directory, so I picked
+# something plausible-looking. The README tells how to edit your
+# profile to add these.
+PKGPSHC="$PKG/usr/share/$PRGNAM/powershell-completions"
+
+mkdir -p $PKGBIN $PKGDOC $PKGMAN1 $PKGBASHC $PKGZSHC $PKGFISHC $PKGPSHC
+
+install -m0755 $SRCNAM $PKGBIN
+ln -s $SRCNAM $PKGBIN/mdless
+
+INST="install -m0644"
+$INST LICENSE *.md $PKGDOC
+gzip -9c < $SRCNAM.1 > $PKGMAN1/$SRCNAM.1.gz
+ln -s $SRCNAM.1.gz $PKGMAN1/mdless.1.gz
+
+cd completions
+$INST mdcat.bash $PKGBASHC/mdcat
+$INST mdless.bash $PKGBASHC/mdless
+$INST _mdcat _mdless $PKGZSHC
+$INST *.fish $PKGFISHC
+$INST *.ps1 $PKGPSHC
+
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mdcat-bin/mdcat-bin.info b/system/mdcat-bin/mdcat-bin.info
new file mode 100644
index 0000000000..1eaa138e3e
--- /dev/null
+++ b/system/mdcat-bin/mdcat-bin.info
@@ -0,0 +1,10 @@
+PRGNAM="mdcat-bin"
+VERSION="2.0.3"
+HOMEPAGE="https://github.com/swsnr/mdcat/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/swsnr/mdcat/releases/download/mdcat-2.0.3/mdcat-2.0.3-x86_64-unknown-linux-musl.tar.gz"
+MD5SUM_x86_64="621e828932a751ea0ac406494844846f"
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/mdcat-bin/slack-desc b/system/mdcat-bin/slack-desc
new file mode 100644
index 0000000000..324f2236ba
--- /dev/null
+++ b/system/mdcat-bin/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+mdcat-bin: mdcat-bin (cat and less for markdown)
+mdcat-bin:
+mdcat-bin: mdcat is a fancy "cat" (or "less") for Markdown (aka CommonMark).
+mdcat-bin: mdcat renders Markdown in a terminal, using escape codes for
+mdcat-bin: highlighting and formatting. It works in any terminal, including the
+mdcat-bin: Linux console, but some features (e.g. italics, strikethrough, images)
+mdcat-bin: are only supported on certain terminals (such as kitty, for images).
+mdcat-bin:
+mdcat-bin:
+mdcat-bin:
+mdcat-bin:
diff --git a/system/mdf2iso/mdf2iso.SlackBuild b/system/mdf2iso/mdf2iso.SlackBuild
index 3cb3bb4732..33794b0d43 100644
--- a/system/mdf2iso/mdf2iso.SlackBuild
+++ b/system/mdf2iso/mdf2iso.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mdf2iso
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mdf2iso
 VERSION=${VERSION:-0.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -94,4 +104,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mediaextract/README b/system/mediaextract/README
new file mode 100644
index 0000000000..0452c5a624
--- /dev/null
+++ b/system/mediaextract/README
@@ -0,0 +1,8 @@
+mediaextract (extract media files that are embedded in other files)
+
+mediaextract extracts known media types such as RIFF, Ogg, etc, from
+various 'resource' or 'archive' format files. It works by looking for
+'magic' byte sequences (like the file(1) command does). A typical use
+case would be extracting resources from a game. mediaextract does not
+support compression (zip/rar/7z/etc), so uncompress the file first,
+if necessary.
diff --git a/system/mediaextract/compilefix.diff b/system/mediaextract/compilefix.diff
new file mode 100644
index 0000000000..f2f4101793
--- /dev/null
+++ b/system/mediaextract/compilefix.diff
@@ -0,0 +1,33 @@
+diff -Naur mediaextract-v1.1.1/source/src/riff.c mediaextract-v1.1.1.patched/source/src/riff.c
+--- mediaextract-v1.1.1/source/src/riff.c	2021-06-25 10:54:31.000000000 -0400
++++ mediaextract-v1.1.1.patched/source/src/riff.c	2022-03-19 13:19:13.506696806 -0400
+@@ -217,28 +217,7 @@
+ 	CHUNK('V','P','8','X',    0)
+ );
+ 
+-#define MAX_CHUNK_SPEC_COUNT \
+-	MAX(CHUNK_SPEC_COUNT(riff_empty_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_wav_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_avi_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_ani_fram_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_ani_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_pal_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_aud_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_dmbd_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_dmpr_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_dmcn_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_dsbc_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_dsfx_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_dmsc_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_sgt_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_sty_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_dmtl_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_dmtg_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_dmtk_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_dmbt_body), \
+-	MAX(CHUNK_SPEC_COUNT(riff_dmpt_body), \
+-	    CHUNK_SPEC_COUNT(riff_webp_body)))))))))))))))))))))
++#define MAX_CHUNK_SPEC_COUNT 9
+ 
+ static const struct riff_file_spec riff_file_specs[] = {
+ 	{ RIFF('W','A','V','E', riff_wav_body ), "wav"  },
diff --git a/system/mediaextract/mediaextract.1 b/system/mediaextract/mediaextract.1
new file mode 100644
index 0000000000..6b73a5a325
--- /dev/null
+++ b/system/mediaextract/mediaextract.1
@@ -0,0 +1,328 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "MEDIAEXTRACT" 1 "2022-01-03" "1.1.1" "SlackBuilds.org"
+.SH NAME
+mediaextract \- extracts media files that are embedded within other files
+.\" RST source for mediaextract(1) man page. Convert with:
+.
+.\" rst2man.py mediaextract.rst > mediaextract.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+mediaextract [\fI\-options\fP] \fIfilename\fP [\fIfilename\fP ...]
+.SH DESCRIPTION
+.sp
+\fBmediaextract\fP extracts known media types such as RIFF, Ogg, etc,
+from various \(aqresource\(aq or \(aqarchive\(aq format files.  files. It works
+by looking for \(aqmagic\(aq byte sequences (like the \fBfile(1)\fP command
+does). A typical use case would be extracting resources from a
+game. \fBmediaextract\fP does not support compression (zip/rar/7z/etc), so
+uncompress the file first, if necessary.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B  \-h\fP,\fB  \-\-help
+Print this help message.
+.TP
+.B  \-q\fP,\fB  \-\-quiet
+Do not print status messages.
+.TP
+.B  \-s\fP,\fB  \-\-simulate
+Don\(aqt write any output files.
+.TP
+.BI \-o\fP,\fB  \-\-output\fB= DIR
+Directory where extracted files  should  be  written.  (default: ".")
+.TP
+.BI \-a\fP,\fB  \-\-filename\fB= FORMAT
+Format  string  for the file names.  (default: "{filename}_{offset}.{ext}")
+.INDENT 7.0
+.TP
+.B Supported variables:
+.INDENT 7.0
+.TP
+.B filename
+Filename of the extracted archive.
+.TP
+.B offset
+Offset within  the  archive, in hexadecimal.
+.TP
+.B index
+0\-based index of the extracted file in decimal.
+.TP
+.B size
+Size of the  extracted file  in decimal.
+.TP
+.B ext
+Extension associated with the filetype of the extracted file.
+.UNINDENT
+.UNINDENT
+.TP
+.BI \-i\fP,\fB  \-\-offset\fB= OFFSET
+Start processing at byte OFFSET. (default: 0)
+.TP
+.BI \-n\fP,\fB  \-\-length\fB= LENGTH
+Only process LENGTH bytes.  (default and maximum: 8 EB)
+.TP
+.BI \-m\fP,\fB  \-\-min\-size\fB= SIZE
+Minumum size of extracted files (skip smaller). (default: 0)
+.TP
+.BI \-x\fP,\fB  \-\-max\-size\fB= SIZE
+Maximum size of extracted files (skip larger). Default and maximum: 16 EB.
+.sp
+The last character of OFFSET, LENGTH and SIZE may be one of the following:
+.INDENT 7.0
+.INDENT 3.5
+.INDENT 0.0
+.IP \(bu 2
+B (or none) for Bytes
+.IP \(bu 2
+k for Kilobytes (units of 1024 Bytes)
+.IP \(bu 2
+M for Megabytes (units of 1024 Kilobytes)
+.IP \(bu 2
+G for Gigabytes (units of 1024 Megabytes)
+.IP \(bu 2
+T for Terabytes (units of 1024 Gigabytes)
+.IP \(bu 2
+P for Petabytes (units of 1024 Terabytes)
+.IP \(bu 2
+E for Exabytes  (units of 1024 Petabytes)
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.sp
+The special value "max" selects the maximum alowed value.
+.TP
+.BI \-f\fP,\fB  \-\-formats\fB= FORMATS
+Comma separated list of formats (file magics) to extract.
+.INDENT 7.0
+.TP
+.B Supported formats:
+.INDENT 7.0
+.TP
+.B all
+all supported formats
+.TP
+.B default
+the default set of formats (AIFF, ASF, AU, BINK, BMP, GIF, ID3v2, IT, JPEG, MPEG 1, MPEG PS, MIDI, MP4, Ogg, PNG, RIFF, S3M, SMK, XM, XMIDI)
+.TP
+.B audio
+all audio files (AIFF, ASF, AU, ID3v2, IT, MIDI, MP4, Ogg, RIFF, S3M, XM, XMIDI)
+.TP
+.B text
+all text files (ASCII, UTF\-8, UTF\-16LE, UTF\-16BE, UTF\-32LE, UTF\-32BE)
+.TP
+.B image
+all image files (BMP, PNG, JPEG, GIF)
+.TP
+.B mpeg
+all safe mpeg files (MPEG 1, MPEG PS, ID3v2)
+.TP
+.B tracker
+all tracker files (MOD, S3M, IT, XM)
+.TP
+.B video
+all video files (ASF, BINK, MP4, RIFF, SMK)
+.TP
+.B aiff
+big\-endian (Apple) wave files
+.TP
+.B ascii
+7\-bit ASCII files (only printable characters)
+.TP
+.B asf
+Advanced Systems Format files (also WMA and WMV)
+.TP
+.B au
+Sun Microsystems audio file format (.au or .snd)
+.TP
+.B bink
+BINK files
+.TP
+.B bmp
+Windows Bitmap files
+.TP
+.B gif
+Graphics Interchange Format files
+.TP
+.B id3v2
+MPEG layer 1/2/3 files with ID3v2 tags
+.TP
+.B it
+ImpulseTracker files
+.TP
+.B jpeg
+JPEG Interchange Format files
+.TP
+.B midi
+MIDI files
+.TP
+.B mod \fI[1]\fP
+Noisetracker/Soundtracker/Protracker Module files
+.TP
+.B mpg123 \fI[1]\fP \fI[2]\fP
+MPEG layer 1/2/3 files (MP1, MP2, MP3)
+.TP
+.B mpeg1
+MPEG 1 System Streams
+.TP
+.B mpegps
+MPEG 2 Program Streams
+.TP
+.B mpegts \fI[1]\fP
+MPEG 2 Transport Streams
+.TP
+.B mp4
+MP4 files (M4A, M4V, 3GPP etc.)
+.TP
+.B ogg
+Ogg files (Vorbis, Opus, Theora, etc.)
+.TP
+.B png
+Portable Network Graphics files
+.TP
+.B riff
+Resource Interchange File Format files (ANI, AVI, MMM, PAL, RDI, RMI, SGT, STY, WAV, WEBP and more)
+.TP
+.B s3m
+ScreamTracker III files
+.TP
+.B smk
+Smaker files
+.TP
+.B utf\-8
+7\-bit ASCII and UTF\-8 files (only printable code points)
+.TP
+.B utf\-16be
+big\-endian UTF\-16 files (only printable code points)
+.TP
+.B utf\-16le
+little\-endian UTF\-16 files (only printable code points)
+.TP
+.B utf\-32be
+big\-endian UTF\-32 files (only printable code points)
+.TP
+.B utf\-32le
+little\-endian UTF\-32 files (only printable code points)
+.TP
+.B xm
+Extended Module files
+.TP
+.B xmidi
+XMIDI files
+.UNINDENT
+.UNINDENT
+.UNINDENT
+.sp
+If \(aq\-\(aq is written before a format name, that format will be removed
+from the set of formats to extract. E.g. extract everything except
+tracker files:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+mediaextract \-\-formats=all,\-tracker data.bin
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+\fI[1]\fP WARNING: Because MP1/2/3 files do not have a nice file magic, using
+the \(aqmpg123\(aq format may cause \fIa lot\fP of false positives. Nowadays
+MP3 files usually have an ID3v2 tag at the start, so using the \(aqid3v2\(aq
+format is the better option anyway.
+.sp
+The detection accuracy of MOD files is not much better and of MPEG TS
+it is even worse and thus the \(aqmpg123\(aq, \(aqmpegts\(aq and \(aqmod\(aq formats are
+per default disabled.
+.sp
+\fI[2]\fP NOTE: When using only the \(aqmpg123\(aq format but not \(aqid3v2\(aq, any ID3v2
+tag will be stripped. ID3v1 tags will still be kept.
+.SH EXAMPLES
+.sp
+Extract .wav, .aif and .ogg (might actually be .ogg, .opus or .ogm) files from
+the file \fBdata.bin\fP and store them in the \fB~/Music\fP directory:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+mediaextract \-f riff,aiff,ogg \-o ~/Music data.bin
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+This will then write files like such into \fB~/Music\fP:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+data.bin_00000000.ogg
+data.bin_00FFB2E3.wav
+data.bin_01F3CD45.aif
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+The hexadecimal number in the written file names gives the offset where the audio
+file was found, within the data file.
+.sp
+Extract .mp3, .mp2 and .mp1 files (with or without ID3v2 tags). The \fBmpg123\fP
+option yields a lot of false positives because there is no nice way to
+unambigiously detect MPEG files. These false positives are however usually very
+small, so using the \fB\-\-min\-size\fP option one can hopefully extract only real MPEG
+files:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+mediaextract \-f id3v2,mpg123 \-\-min\-size=100k \-o ~/Music data.bin
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/mediaextract\-1.1.1/LICENSE.txt for license information.
+.SH AUTHOR
+.sp
+mediaextract was written by Mathias Panzenböck.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.\" Generated by docutils manpage writer.
+.
diff --git a/system/mediaextract/mediaextract.SlackBuild b/system/mediaextract/mediaextract.SlackBuild
new file mode 100644
index 0000000000..d64d96b8a9
--- /dev/null
+++ b/system/mediaextract/mediaextract.SlackBuild
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+# Slackware build script for mediaextract
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=mediaextract
+VERSION=${VERSION:-1.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-v$VERSION
+unzip $CWD/$PRGNAM-v$VERSION.zip -x '*/build-*/*'
+cd $PRGNAM-v$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20220319 bkw: gcc and clang were both hitting the 4GB per-process
+# memory limit, due to ridiculous preprocessor abuse in riff.c. The
+# thing was doing a bunch of nested macro expansions, to determine
+# the maximum size for an array... turns out the size it calculated
+# was 9. The patch just hardcodes it to 9 and gets rid of the nested
+# macro calls. This should be revisited when/if there's a new
+# version of mediaextract.
+patch -p1 < $CWD/compilefix.diff
+
+cd source
+mkdir -p build-linux32 build-linux64
+
+# The last -e here stops it building the man page. Do this because
+# we have our own (better-formatted) man page, and also to fix
+# parallel builds.
+sed -i \
+    -e "s,-Werror,," \
+    -e "/^CFLAGS/s,-O2 -g,$SLKCFLAGS," \
+    -e "/all:/s, [^ ]*MANPAGE.*$,," \
+    Makefile
+
+make
+
+# upstream's install target is weird and inflexible.
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1 $PKG/usr/doc/$PRGNAM-$VERSION
+install -s -m0755 build-linux*/$PRGNAM $PKG/usr/bin
+install    -m0644 LICENSE.txt ../README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# upstream's generated man page has horrible formatting, and the
+# author's own name gets mangled (the ö came out as ??). I spent
+# some time reformatting it in RST, and also added the examples from
+# the README.md.
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mediaextract/mediaextract.info b/system/mediaextract/mediaextract.info
new file mode 100644
index 0000000000..7a00f922f5
--- /dev/null
+++ b/system/mediaextract/mediaextract.info
@@ -0,0 +1,10 @@
+PRGNAM="mediaextract"
+VERSION="1.1.1"
+HOMEPAGE="https://github.com/panzi/mediaextract"
+DOWNLOAD="https://github.com/panzi/mediaextract/releases/download/v1.1.1/mediaextract-v1.1.1.zip"
+MD5SUM="eb24172ca19e141090cbd7330abc55da"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/mediaextract/mediaextract.rst b/system/mediaextract/mediaextract.rst
new file mode 100644
index 0000000000..819354fbd6
--- /dev/null
+++ b/system/mediaextract/mediaextract.rst
@@ -0,0 +1,260 @@
+.. RST source for mediaextract(1) man page. Convert with:
+..   rst2man.py mediaextract.rst > mediaextract.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 1.1.1
+.. |date| date::
+
+============
+mediaextract
+============
+
+---------------------------------------------------------
+extracts media files that are embedded within other files
+---------------------------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+mediaextract [*-options*] *filename* [*filename* ...]
+
+DESCRIPTION
+===========
+
+**mediaextract** extracts known media types such as RIFF, Ogg, etc,
+from various 'resource' or 'archive' format files.  files. It works
+by looking for 'magic' byte sequences (like the **file\(1)** command
+does). A typical use case would be extracting resources from a 
+game. **mediaextract** does not support compression (zip/rar/7z/etc), so
+uncompress the file first, if necessary.
+
+OPTIONS
+=======
+
+-h, --help
+  Print this help message.
+
+-q, --quiet
+  Do not print status messages.
+
+-s, --simulate
+  Don't write any output files.
+
+-o, --output=DIR
+  Directory where extracted files  should  be  written.  (default: ".")
+
+-a, --filename=FORMAT
+  Format  string  for the file names.  (default: "{filename}_{offset}.{ext}")
+
+  Supported variables:
+       filename
+         Filename of the extracted archive.
+       offset
+         Offset within  the  archive, in hexadecimal.
+       index
+         0-based index of the extracted file in decimal.
+       size
+         Size of the  extracted file  in decimal.
+       ext
+         Extension associated with the filetype of the extracted file.
+
+-i, --offset=OFFSET
+  Start processing at byte OFFSET. (default: 0)
+
+-n, --length=LENGTH
+  Only process LENGTH bytes.  (default and maximum: 8 EB)
+
+-m, --min-size=SIZE
+  Minumum size of extracted files (skip smaller). (default: 0)
+
+-x, --max-size=SIZE
+  Maximum size of extracted files (skip larger). Default and maximum: 16 EB.
+
+  The last character of OFFSET, LENGTH and SIZE may be one of the following:
+
+    * B (or none) for Bytes
+    * k for Kilobytes (units of 1024 Bytes)
+    * M for Megabytes (units of 1024 Kilobytes)
+    * G for Gigabytes (units of 1024 Megabytes)
+    * T for Terabytes (units of 1024 Gigabytes)
+    * P for Petabytes (units of 1024 Terabytes)
+    * E for Exabytes  (units of 1024 Petabytes)
+
+  The special value "max" selects the maximum alowed value.
+
+-f, --formats=FORMATS
+  Comma separated list of formats (file magics) to extract.
+
+  Supported formats:
+    all
+      all supported formats
+
+    default
+      the default set of formats (AIFF, ASF, AU, BINK, BMP, GIF, ID3v2, IT, JPEG, MPEG 1, MPEG PS, MIDI, MP4, Ogg, PNG, RIFF, S3M, SMK, XM, XMIDI)
+
+    audio
+      all audio files (AIFF, ASF, AU, ID3v2, IT, MIDI, MP4, Ogg, RIFF, S3M, XM, XMIDI)
+
+    text
+      all text files (ASCII, UTF-8, UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE)
+
+    image
+      all image files (BMP, PNG, JPEG, GIF)
+
+    mpeg
+      all safe mpeg files (MPEG 1, MPEG PS, ID3v2)
+
+    tracker
+      all tracker files (MOD, S3M, IT, XM)
+
+    video
+      all video files (ASF, BINK, MP4, RIFF, SMK)
+
+    aiff
+      big-endian (Apple) wave files
+
+    ascii
+      7-bit ASCII files (only printable characters)
+
+    asf
+      Advanced Systems Format files (also WMA and WMV)
+
+    au
+      Sun Microsystems audio file format (.au or .snd)
+
+    bink
+      BINK files
+
+    bmp
+      Windows Bitmap files
+
+    gif
+      Graphics Interchange Format files
+
+    id3v2
+      MPEG layer 1/2/3 files with ID3v2 tags
+
+    it
+      ImpulseTracker files
+
+    jpeg
+      JPEG Interchange Format files
+
+    midi
+      MIDI files
+
+    mod *[1]*
+      Noisetracker/Soundtracker/Protracker Module files
+
+    mpg123 *[1]* *[2]*
+      MPEG layer 1/2/3 files (MP1, MP2, MP3)
+
+    mpeg1
+      MPEG 1 System Streams
+
+    mpegps
+      MPEG 2 Program Streams
+
+    mpegts *[1]*
+      MPEG 2 Transport Streams
+
+    mp4
+      MP4 files (M4A, M4V, 3GPP etc.)
+
+    ogg
+      Ogg files (Vorbis, Opus, Theora, etc.)
+
+    png
+      Portable Network Graphics files
+
+    riff
+      Resource Interchange File Format files (ANI, AVI, MMM, PAL, RDI, RMI, SGT, STY, WAV, WEBP and more)
+
+    s3m
+      ScreamTracker III files
+
+    smk
+      Smaker files
+
+    utf-8
+      7-bit ASCII and UTF-8 files (only printable code points)
+
+    utf-16be
+      big-endian UTF-16 files (only printable code points)
+
+    utf-16le
+      little-endian UTF-16 files (only printable code points)
+
+    utf-32be
+      big-endian UTF-32 files (only printable code points)
+
+    utf-32le
+      little-endian UTF-32 files (only printable code points)
+
+    xm
+      Extended Module files
+
+    xmidi
+      XMIDI files
+
+If '-' is written before a format name, that format will be removed
+from the set of formats to extract. E.g. extract everything except
+tracker files::
+
+  mediaextract --formats=all,-tracker data.bin
+
+*[1]* WARNING: Because MP1/2/3 files do not have a nice file magic, using
+the 'mpg123' format may cause *a lot* of false positives. Nowadays
+MP3 files usually have an ID3v2 tag at the start, so using the 'id3v2'
+format is the better option anyway.
+
+The detection accuracy of MOD files is not much better and of MPEG TS
+it is even worse and thus the 'mpg123', 'mpegts' and 'mod' formats are
+per default disabled.
+
+*[2]* NOTE: When using only the 'mpg123' format but not 'id3v2', any ID3v2
+tag will be stripped. ID3v1 tags will still be kept.
+
+EXAMPLES
+========
+
+Extract .wav, .aif and .ogg (might actually be .ogg, .opus or .ogm) files from
+the file **data.bin** and store them in the **~/Music** directory::
+
+   mediaextract -f riff,aiff,ogg -o ~/Music data.bin
+
+This will then write files like such into **~/Music**::
+
+   data.bin_00000000.ogg
+   data.bin_00FFB2E3.wav
+   data.bin_01F3CD45.aif
+
+The hexadecimal number in the written file names gives the offset where the audio
+file was found, within the data file.
+
+Extract .mp3, .mp2 and .mp1 files (with or without ID3v2 tags). The **mpg123**
+option yields a lot of false positives because there is no nice way to
+unambigiously detect MPEG files. These false positives are however usually very
+small, so using the **--min-size** option one can hopefully extract only real MPEG
+files::
+
+   mediaextract -f id3v2,mpg123 --min-size=100k -o ~/Music data.bin
+
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/mediaextract-|version|/LICENSE.txt for license information.
+
+AUTHOR
+======
+
+mediaextract was written by Mathias Panzenböck.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
diff --git a/system/mediaextract/slack-desc b/system/mediaextract/slack-desc
new file mode 100644
index 0000000000..745b35c0f4
--- /dev/null
+++ b/system/mediaextract/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+mediaextract: mediaextract (extract media files that are embedded in other files)
+mediaextract:
+mediaextract: mediaextract extracts known media types such as RIFF, Ogg, etc, from
+mediaextract: various 'resource' or 'archive' format files. Typical use case would
+mediaextract: be extracting resources from a game.
+mediaextract:
+mediaextract:
+mediaextract:
+mediaextract:
+mediaextract:
+mediaextract:
diff --git a/system/megacli/megacli.SlackBuild b/system/megacli/megacli.SlackBuild
index 2c0850425c..8cdbaf55a1 100644
--- a/system/megacli/megacli.SlackBuild
+++ b/system/megacli/megacli.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for MegaCLI
 
-# Copyright 2020 Ebben Aries <e@dscp.org>
+# Copyright 2020 Ebben Aries <slackbuilds@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,13 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=megacli
 ZIPNAM=MegaCLI
 RPMNAM=MegaCli
 VERSION=${VERSION:-8.07.14}
 ZIPVER="$(echo $VERSION | sed -e 's/\./\-/g')"
 BUILD=${BUILD:-1}
+RPMBUILD=${RPMBUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +42,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -58,7 +69,7 @@ rm -rf $PRGNAM-$VERSION
 unzip -d $PRGNAM-$VERSION $CWD/${ZIPVER}_$ZIPNAM.zip
 cd $PRGNAM-$VERSION/Linux
 
-rpm2cpio < ${RPMNAM}-${VERSION}-${BUILD}.noarch.rpm | cpio -imdv
+rpm2cpio < ${RPMNAM}-${VERSION}-${RPMBUILD}.noarch.rpm | cpio -imdv
 chown -R root:root .
 find -L . \
 \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -81,4 +92,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/megacli/megacli.info b/system/megacli/megacli.info
index e9d3f740db..d568e57803 100644
--- a/system/megacli/megacli.info
+++ b/system/megacli/megacli.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Ebben Aries"
-EMAIL="e@dscp.org"
+EMAIL="slackbuilds@dscp.org"
diff --git a/system/megacli/slack-desc b/system/megacli/slack-desc
index a0bf177d66..054da44c59 100644
--- a/system/megacli/slack-desc
+++ b/system/megacli/slack-desc
@@ -5,7 +5,7 @@
 # You must make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
 
-        |-----handy-ruler------------------------------------------------------|
+       |-----handy-ruler------------------------------------------------------|
 megacli: megacli (LSI hardware RAID management utility)
 megacli:
 megacli: MegaCLI is an LSI command line interface utility to the MegaRAID
diff --git a/system/memkind/README b/system/memkind/README
new file mode 100644
index 0000000000..f0400d1c0b
--- /dev/null
+++ b/system/memkind/README
@@ -0,0 +1,11 @@
+Memkind helps to fully utilize various kinds of
+memory available in the system,including DRAM,NVDIMM
+and HBM, mostly by adding one additional argument
+destination kind of memory to standard malloc calls.
+
+It also offers a transparent mode that allows memory
+tiering without any modification to the existing app, 
+memory kinds based on file-backed memory on specified 
+device or area supplied by the user, and much more.
+
+hwloc >=2.3.0 is an optional dependency.
diff --git a/system/memkind/changelog b/system/memkind/changelog
new file mode 100644
index 0000000000..83f8e060ab
--- /dev/null
+++ b/system/memkind/changelog
@@ -0,0 +1,12 @@
+Changelog for memkind SlackBuild Script
+--------------------------------------------------------------------
+
+03/09/2022:
+
+Added to slackbuilds.org
+
+15/05/2023:
+
+Updated to version 1.13.0
+From this build onwards it will only build 
+on x86_64 platform only.
diff --git a/system/memkind/memkind.SlackBuild b/system/memkind/memkind.SlackBuild
new file mode 100644
index 0000000000..1c5c9d517c
--- /dev/null
+++ b/system/memkind/memkind.SlackBuild
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+# Slackware build script for memkind
+
+# Copyright 2022-2023 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=memkind
+VERSION=${VERSION:-1.14.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+sys_arch=${sys_arch:-$(uname -m)}
+
+case "$sys_arch" in
+    x86_64) export ARCH=x86_64 ;;
+         *) echo "This program will not build on $sys_arch platform" && exit 1 ;;
+esac
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}"  ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-march=x86-64 -mtune=generic -pipe -O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  echo "This program will not build on $sys_arch platform" && exit 1
+fi
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./autogen.sh
+
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --bindir=/usr/bin \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-tls \
+  --enable-decorators \
+  --enable-gcov \
+  --enable-secure \
+  --enable-memkind-initial-exec-tls \
+  --enable-daxctl \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod \
+  -o -name ".packlist"   -o -name "*.bs" \
+  | xargs rm -f
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a NEWS README COPYING AUTHORS ChangeLog VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/memkind/memkind.info b/system/memkind/memkind.info
new file mode 100644
index 0000000000..9405289355
--- /dev/null
+++ b/system/memkind/memkind.info
@@ -0,0 +1,10 @@
+PRGNAM="memkind"
+VERSION="1.14.0"
+HOMEPAGE="https://pmem.io/memkind/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/memkind/memkind/archive/v1.14.0/memkind-1.14.0.tar.gz"
+MD5SUM_x86_64="252ee2458d7830774ee0ac003f2140a1"
+REQUIRES="numactl pandoc-bin"
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/memkind/slack-desc b/system/memkind/slack-desc
new file mode 100644
index 0000000000..1a7ed41296
--- /dev/null
+++ b/system/memkind/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+memkind: memkind (General Purpose Allocator on top of Jemalloc)
+memkind:
+memkind: Memkind helps to fully utilize various kinds of
+memkind: memory available in the system,including DRAM,NVDIMM
+memkind: and HBM, mostly by adding one additional argument
+memkind: destination kind of memory to standard malloc calls.
+memkind:
+memkind: Homepage:https://pmem.io/memkind
+memkind:
+memkind:
+memkind:
diff --git a/system/memory-editor/README b/system/memory-editor/README
new file mode 100644
index 0000000000..a0f4bc9873
--- /dev/null
+++ b/system/memory-editor/README
@@ -0,0 +1,9 @@
+memory-editor (med) is a memory editor for Linux with a GUI.
+
+There was a memory editor in Windows, that was Game Master. But it
+was not a freeware. And there is a freeware memory editor, it is
+ArtMoney. But it is also for Windows only. In Linux, there is only
+one memory editor, scanmem with GameConqueror as the GUI. However,
+it does not fulfil my needs. Thus, I decided to create one which can
+fit my needs.
+
diff --git a/system/memory-editor/memory-editor.SlackBuild b/system/memory-editor/memory-editor.SlackBuild
new file mode 100644
index 0000000000..fd79cc5079
--- /dev/null
+++ b/system/memory-editor/memory-editor.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# Slackware build script for memory-editor
+
+# Copyright 2022 SPN Team
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=memory-editor
+VERSION=${VERSION:-3.7.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf med-$VERSION
+tar xvf $CWD/med-$VERSION.tar.gz
+cd med-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
+if [ -n "${LIBDIRSUFFIX}" ] ; then
+  mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
+fi
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/memory-editor/memory-editor.info b/system/memory-editor/memory-editor.info
new file mode 100644
index 0000000000..f70b65282e
--- /dev/null
+++ b/system/memory-editor/memory-editor.info
@@ -0,0 +1,10 @@
+PRGNAM="memory-editor"
+VERSION="3.7.2"
+HOMEPAGE="https://github.com/allencch/med"
+DOWNLOAD="https://github.com/allencch/med/archive/3.7.2/med-3.7.2.tar.gz"
+MD5SUM="1c11ec98272c24a0e95a221ff7f1a796"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="jsoncpp"
+MAINTAINER="SPN Team"
+EMAIL="pwmn-master@hotmail.com"
diff --git a/system/memory-editor/slack-desc b/system/memory-editor/slack-desc
new file mode 100644
index 0000000000..70cc8f0632
--- /dev/null
+++ b/system/memory-editor/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+memory-editor: memory-editor (MED Memory Editor)
+memory-editor:
+memory-editor: There was a memory editor in Windows, that was Game Master. But it
+memory-editor: was not a freeware. And there is a freeware memory editor, it is
+memory-editor: ArtMoney. But it is also for Windows only. In Linux, there is only
+memory-editor: one memory editor, scanmem with GameConqueror as the GUI. However,
+memory-editor: it does not fulfil my needs. Thus, I decided to create one which can
+memory-editor: fit my needs.
+memory-editor:
+memory-editor:
+memory-editor: https://github.com/allencch/med
diff --git a/system/memtest86+/20_memtest86+ b/system/memtest86+/20_memtest86+
new file mode 100644
index 0000000000..f585a71cec
--- /dev/null
+++ b/system/memtest86+/20_memtest86+
@@ -0,0 +1,82 @@
+#!/bin/sh
+set -e
+
+prefix="/usr"
+exec_prefix="/usr"
+datarootdir="/usr/share"
+
+. "$pkgdatadir/grub-mkconfig_lib"
+
+CLASS="--class memtest86 --class gnu --class tool"
+
+prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)"
+
+memtest_entry ()
+{
+  image="$1"
+  args="$2"
+  rel_image="$(make_system_path_relative_to_its_root ${image})"
+
+  # Apply some heuristics to show some images only on particular platforms.
+  basename="$(basename ${image})"
+  ftype="$(file ${image} | cut -d: -f2)"
+  if echo "${basename}" | grep -q ".elf\$" || echo "${ftype}" | grep -q "ELF"; then
+    protocol="knetbsd"
+    platform="pc"
+    #platform="" # Uncomment to show on EFI platforms; see below.
+  elif echo "${basename}" | grep -q ".efi\$" || echo "${ftype}" | grep -q "EFI"; then
+    protocol="chainloader"
+    platform="efi"
+  else # .bin, DOS/MBR boot sector
+    protocol="linux16"
+    platform="pc"
+    #platform="" # Uncomment to show on EFI platforms; see below.
+  fi
+
+  # All images listed above should boot on EFI platforms, but many (those
+  # marked with platform="pc") will likely run without graphics and appear to
+  # the casual user to not work, so are hidden by default.  (Some versions
+  # beep at startup, verifying it booted, but the display will be blank.)
+  # Serial consoles may still be useful.
+  #
+  # Uncomment this to un-hide all images on EFI platforms, or selectively edit
+  # the platform lines above to un-hide particular images.
+  #if [ "$platform" = "pc" ]; then
+  #  platform=""
+  #fi
+
+  if echo "${ftype}" | grep -q "Linux"; then # Linux kernel x86 boot executable
+    # .efi or .bin images may also present themselves as a Linux kernel image.
+    # When booted using the "linux" protocol, these images can be used on
+    # either "pc" or "efi" platform, and on EFI platforms they may have better
+    # or native resolution graphics.
+    protocol="linux"
+    #platform="" # Uncomment to discard platform constraint chosen above.
+  fi
+
+  # TODO: Detect multiboot images, use protocol="multiboot"
+
+  # Emit the menuentry.
+  platform_indent=""
+  if [ -n "${platform}" ]; then
+    echo "if [ x\$grub_platform = x${platform} ]; then"
+    platform_indent="${grub_tab}"
+  fi
+  echo "${platform_indent}menuentry \"Memory Tester (${basename})\" ${CLASS} {"
+  if [ "${protocol}" = "linux" -o "${protocol}" = "knetbsd" ]; then
+    echo "${platform_indent}${grub_tab}load_video"
+  fi
+  printf '%s\n' "${prepare_boot_cache}" | sed "s/^/${platform_indent}/"
+  echo "${platform_indent}${grub_tab}${protocol} ${rel_image} ${args}"
+  echo "${platform_indent}}"
+  if [ -n "${platform}" ]; then
+    echo "fi"
+  fi
+}
+
+for image in $(find /boot -maxdepth 1 -type f -regex '/boot/memtest86\+.*' | sort -Vr); do
+  if is_path_readable_by_grub "${image}" ; then
+    gettext_printf "Found memtest86 image: %s\n" "${image}" >&2
+    memtest_entry "${image}" "${GRUB_CMDLINE_MEMTEST86}"
+  fi
+done
diff --git a/system/memtest86+/README b/system/memtest86+/README
index e1c23ed9d5..5aa50f6a31 100644
--- a/system/memtest86+/README
+++ b/system/memtest86+/README
@@ -1,5 +1,5 @@
 Memtest86+ is thorough, stand alone memory test for Intel/AMD x86
-architecture systems.  BIOS based memory tests are only a quick check
+architecture systems. BIOS based memory tests are only a quick check
 and often miss failures that are detected by Memtest86+.
 
 This package installs a bootable image to /boot/memtest86+.bin
@@ -15,19 +15,44 @@ Then run `/sbin/lilo` to update the boot loader.
 Don't forget to re-run `/sbin/lilo` if you upgrade this package.
 
 
-GRUB 2 users:  Append something like this to your /etc/grub.d/40_custom:
+ELILO users:  Append this to your /boot/efi/EFI/Slackware/elilo.conf:
 
-  menuentry 'memtest86+' {
-      linux16 (hd0,1)/boot/memtest86+.bin
-  }
+  image = memtest86+.bin
+    label = memtest86+
+
+Next, copy memtest86+.bin alongside ELILO in your ESP partition:
+`cp /boot/memtest86+.bin /boot/efi/EFI/Slackware/memtest86+.bin`
+(Alternatively, use the .efi file instead of the .bin file; both should
+work identically.  Just ensure that "image" refers to an existing file.)
 
-Then run `grub-mkconfig -o /boot/grub/grub.cfg` to update the boot menu.
+When ELILO starts, press tab to show the available options.  Increase
+the delay parameter in elilo.conf if necessary to give yourself enough
+time to make a selection.
 
 
-GRUB Legacy users:  Append something like this to your /boot/grub/menu.lst:
+GRUB Legacy users:  Append something like this to your
+/boot/grub/menu.lst:
 
   title memtest86+
       kernel (hd0,0)/boot/memtest86+.bin
 
 
-See /usr/doc/memtest86+-$VERSION/README for more info.
+GRUB 2 users:  Auto-detected by the /etc/grub.d/20_memtest86+ script.
+Run `grub-mkconfig -o /boot/grub/grub.cfg` to update the boot menu.
+
+
+rEFInd users:  Auto-detected, no additional steps required.
+You may wish to copy /boot/memtest86+-$EFIARCH-$VERSION.efi
+to /boot/efi/EFI/tools/memtest86.efi so that it will appear on the tools
+line as a memory tester tool.  If at this point it appears on both
+lines, edit the "dont_scan_files" setting in your refind.conf to hide
+the extra entries, or just remove this package.
+
+
+It is possible to build an IA32 EFI image on Slackware64, if you have a
+need for it, using `ARCH=i586 ./memtest86+.SlackBuild`.  Compilation
+will fail due to missing /usr/include/gnu/stubs-32.h from glibc.  Copy
+that file from stubs-64.h in the same directory (or create a symlink),
+and you may delete your copy/symlink after you have created the package.
+
+See /usr/doc/memtest86+-$VERSION/README.md for more info.
diff --git a/system/memtest86+/doinst.sh b/system/memtest86+/doinst.sh
new file mode 100644
index 0000000000..26cd3dea88
--- /dev/null
+++ b/system/memtest86+/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/grub.d/20_memtest86+.new
diff --git a/system/memtest86+/memtest86+.SlackBuild b/system/memtest86+/memtest86+.SlackBuild
index cc9d2156ff..5b60123281 100644
--- a/system/memtest86+/memtest86+.SlackBuild
+++ b/system/memtest86+/memtest86+.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for memtest86+
 
-# Copyright 2013-2019 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2024 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,72 +22,54 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=memtest86+
-VERSION=${VERSION:-5.01}
+SRCNAM=memtest86plus
+VERSION=${VERSION:-7.00}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# i586 or x86_64 only.  Modify the Makefile at your own risk :-)
+ARCH=${ARCH:-$(uname -m)}
+case $ARCH in
+  i?86)   BUILDDIR=build32; EFIARCH=ia32; ARCH=i586 ;;
+  x86_64) BUILDDIR=build64; EFIARCH=x64 ;;
+  *)      echo "$ARCH is not supported." >&2; exit 1 ;;
+esac
 
-# i486 only.  Modify the Makefile at your own risk :-)
-ARCH=i486
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM-$VERSION
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="FAQ README* changelog"
+DOCS="LICENSE README.md"
 
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
-# Upstream is dead.  Lots of patches courtesy of Debian and Gentoo.
-# If these get out-of-hand, consider switching to coreboot's fork:
-# https://review.coreboot.org/cgit/memtest86plus.git/
-
-# https://sources.debian.org/patches/memtest86+/5.01-3/
-# Last 3 are covered or made unnecessary by Gentoo's patches.
-# Multiboot is disabled due to it being experimental and
-# possibly not working correctly:  https://bugs.debian.org/568176
-# Note that we aren't installing the multiboot image (memtest_shared).
-# Note that patches multiboot and memtest86+-5.01-hardcoded_cc.patch conflict.
-patch -p1 < $CWD/patches/doc-serialconsole
-#patch -p1 < $CWD/patches/multiboot
-#patch -p1 < $CWD/patches/memtest86+-5.01-O0.patch
-#patch -p1 < $CWD/patches/memtest86+-5.01-array-size.patch
-#patch -p1 < $CWD/patches/gcc-5
-
-# https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/memtest86+/files
-patch -p1 < $CWD/patches/memtest86+-5.01-gcc-473.patch
-patch -p1 < $CWD/patches/memtest86+-5.01-hardcoded_cc.patch
-patch -p1 < $CWD/patches/memtest86+-5.01-no-scp.patch
-patch -p1 < $CWD/patches/memtest86+-5.01-io-extern-inline.patch
-patch -p1 < $CWD/patches/memtest86+-5.01-reboot-def.patch
-patch -p1 < $CWD/patches/memtest86+-5.01-no-clean.patch
-patch -p1 < $CWD/patches/memtest86+-5.01-no-C-headers.patch
-patch -p1 < $CWD/patches/memtest86+-5.01-test-random-cflags.patch
-
-# More CFLAGS/CPPFLAGS cleanup, inspired by the previous patch.
-patch -p1 < $CWD/patches/makefile.diff
-
-# https://bugs.debian.org/795421
-patch -p1 < $CWD/patches/memtest86+-test-7-smp.patch
-
-# https://bugs.debian.org/629506
-patch -p1 < $CWD/patches/bug_629506_message_15.mbox
-
+cd $BUILDDIR
 make
-install -D -m 0755 memtest $PKG/boot/$PRGNAM-$VERSION
+install -D -m 0755 memtest.efi $PKG/boot/$PRGNAM-$EFIARCH-$VERSION.efi
 install -D -m 0644 memtest.bin $PKG/boot/$PRGNAM-$VERSION.bin
-ln -s $PRGNAM-$VERSION $PKG/boot/$PRGNAM
-ln -s $PRGNAM-$VERSION.bin $PKG/boot/$PRGNAM.bin
+ln -s $PRGNAM-$EFIARCH-$VERSION.efi $PKG/boot/$PRGNAM-$EFIARCH.efi
+ln -s $PRGNAM-$VERSION.bin          $PKG/boot/$PRGNAM.bin
+cd ..
+
+install -D -m 0755 $CWD/20_memtest86+ $PKG/etc/grub.d/20_memtest86+.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
@@ -95,6 +77,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/memtest86+/memtest86+.info b/system/memtest86+/memtest86+.info
index 0b3b6e3dde..9c6b4819cb 100644
--- a/system/memtest86+/memtest86+.info
+++ b/system/memtest86+/memtest86+.info
@@ -1,8 +1,8 @@
 PRGNAM="memtest86+"
-VERSION="5.01"
+VERSION="7.00"
 HOMEPAGE="https://www.memtest.org/"
-DOWNLOAD="https://www.memtest.org/download/5.01/memtest86+-5.01.tar.gz"
-MD5SUM="43c5832baa919e1206e251e735cdee2d"
+DOWNLOAD="https://github.com/memtest86plus/memtest86plus/archive/v7.00/memtest86plus-7.00.tar.gz"
+MD5SUM="237418238fd499509edca8b21c3cc9c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/memtest86+/patches/bug_629506_message_15.mbox b/system/memtest86+/patches/bug_629506_message_15.mbox
deleted file mode 100644
index 0b9362728f..0000000000
--- a/system/memtest86+/patches/bug_629506_message_15.mbox
+++ /dev/null
@@ -1,142 +0,0 @@
-From viro@ftp.linux.org.uk Fri Feb 27 20:21:34 2015
-Received: (at 629506) by bugs.debian.org; 27 Feb 2015 20:21:34 +0000
-X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02
-	(2014-02-07) on buxtehude.debian.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-2.3 required=4.0 tests=BAYES_00,FOURLA,MONEY,
-	MURPHY_DRUGS_REL8,RCVD_IN_DNSWL_MED,STOCKLIKE,T_RP_MATCHES_RCVD autolearn=no
-	autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02
-X-Spam-Bayes: score:0.0000 Tokens: new, 43; hammy, 150; neutral, 234; spammy,
-	0. spammytokens: hammytokens:0.000-+--UD:patch, 0.000-+--H*u:1.5.21,
-	0.000-+--H*UA:1.5.21, 0.000-+--H*u:2010-09-15, 0.000-+--H*UA:2010-09-15
-Return-path: <viro@ftp.linux.org.uk>
-Received: from zeniv.linux.org.uk ([195.92.253.2])
-	by buxtehude.debian.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256)
-	(Exim 4.80)
-	(envelope-from <viro@ftp.linux.org.uk>)
-	id 1YRRPi-0007QW-72
-	for 629506@bugs.debian.org; Fri, 27 Feb 2015 20:21:34 +0000
-Received: from viro by ZenIV.linux.org.uk with local (Exim 4.76 #1 (Red Hat Linux))
-	id 1YRQyr-0000Hl-OS
-	for 629506@bugs.debian.org; Fri, 27 Feb 2015 19:53:49 +0000
-Date: Fri, 27 Feb 2015 19:53:49 +0000
-From: Al Viro <viro@ZenIV.linux.org.uk>
-To: 629506@bugs.debian.org
-Subject: memtest86+.bin crashes if loader ends up putting it not at 9000:0000
-Message-ID: <20150227195349.GN29656@ZenIV.linux.org.uk>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-User-Agent: Mutt/1.5.21 (2010-09-15)
-Sender: Al Viro <viro@ftp.linux.org.uk>
-X-Greylist: delayed 1658 seconds by postgrey-1.34 at buxtehude; Fri, 27 Feb 2015 20:21:33 UTC
-
-	FWIW, the effects described in this bug report are 100% reproducible
-on any version, as long as the loader (lilo, grub, whatever) ends up putting
-the bootsect+setup in any location below 9000:0000.
-
-	zImage-type images consist of 3 parts - bootsect, setup and
-payload.  Payload is loaded at 1000:0, bootsect and setup - n:0 and
-n+2:0 resp., near the top of lowmem.  Payload is protected mode code,
-setup - real mode one.  Bootsect isn't executed at all; when the
-same image is booted directly it would've been the only part loaded
-by BIOS and it would copy itself and read the rest of the image to
-expected locations and pass control to setup.  Values in it can be
-used by setup, though, so it must be present even when the image had been
-brought in by a loader.
-
-	The thing is, we can't be guaranteed n == 0x9000.  E.g. ACPI and
-SMM have every right to use _anything_ in range 512K..1M for their
-state, declaring it reserved.  That's what BIOS int 0x12 is for - it
-reports how high (in kilobytes) can you go in lowmem without running into
-reserved areas.  And while having it report 512K is rare, something like
-20K reserved just below the VRAM (i.e. report 620K) is nothing unusual.
-
-	I hadn't looked into details of GRUB behaviour, but LILO puts its
-secondary loader as high in lowmem as it can, then puts the bootsect and
-setup parts of image below that.  It tries to load at 9000:0 if possible,
-but if there's no space, it'll go lower.  With the sizes it uses 20K reserved
-below 640K is enough to push bootsect + setup combination (just) below 9000:0.
-And memtest86+ setup has that 0x9000 hardwired - this
-gdt_48:
-        .word   0x800           # gdt limit=2048, 256 GDT entries
-        .word   512+gdt - start,0x9     # gdt base = 0X9xxxx
-in setup.S really depends on 'start' (entry to setup) loaded at
-0x90200 physical.  Have it loaded at any other address and you'll trigger
-an exception as soon as you try to assign any segment register after you switch
-to protected mode.  Which will escalate to triple-fault and reboot the
-damn thing immediately.
-
-	GRUB might be better or worse in triggering that "load not at
-9000:0" situation, but it can't possibly avoid it in all cases.  If nothing
-else, 9000:0 might be within one of the reserved areas.  It simply isn't
-guaranteed to be available, period.
-
-	Another issue is that setup of memtest86+ expects to see in %dx
-the value left there by the bootsect of memtest86+.  Fortunately, it's
-not critical - in
-        movw    $INITSEG, %ax
-        movw    %ax, %ds
-        movw    %ax, %es
-        movw    %ax, %fs
-        movw    %ax, %ss        # reset the stack to INITSEG:0x4000-12.
-        movw    %dx, %sp
-        push    %cs
-        pop     %ds
-we really need only the last two instructions.  The stack footprint
-of what follows is fairly low *and* these values are not used past the
-reload of segment registers immediately after protected mode switch.
-
-It's not the only problem in there - the bits after
-# start from grub-a20.patch
-are clearly cargo-culted from grub, badly.  There it was a part of a function
-that expects an argument on stack (it can turn A20 both on and off) and that
-got blindly copied, nevermind that the value on stack is random or that
-we follow it with (unconditional) use of 8042-based method anyway.  I'd rather
-see upstream opinion on that particular piece of code first, though.
-
-Anyway, the patch below fixes dependency on being loaded at 9000:0 and it
-seems to work here without regressions.  Have fun...
-
---- memtest86+-5.01/setup.S	2013-08-09 22:01:58.000000000 -0400
-+++ fixed/setup.S	2015-02-27 14:18:47.000000000 -0500
-@@ -26,14 +26,13 @@
- # APs also execute this code
- #ljmp	$INITSEG, $(reload - start + 0x200)
- reload:
--	movw	$INITSEG, %ax
--	movw	%ax, %ds
--	movw	%ax, %es
--	movw	%ax, %fs
--	movw	%ax, %ss	# reset the stack to INITSEG:0x4000-12.
--	movw	%dx, %sp
-+	xorl	%eax, %eax
- 	push	%cs
--	pop	%ds
-+	pop	%ax
-+	movw	%ax, %ds
-+	shll	$4, %eax
-+	addl    %eax, (gdt_48 - start + 2)
-+
- 	lidt	idt_48 - start	# load idt with 0,0
- 	lgdt	gdt_48 - start	# load gdt with whatever appropriate
- 
-@@ -88,6 +87,7 @@
- 	movw	%ax, %ds
- 	movw	%ax, %es
- 	movw	%ax, %ss
-+	xorl	%esp, %esp	# 32bit code will set it then
- 	movw	%ax, %fs
- 	movw	%ax, %gs
- 
-@@ -144,7 +144,7 @@
- 
- gdt_48:
- 	.word	0x800		# gdt limit=2048, 256 GDT entries
--	.word	512+gdt - start,0x9	# gdt base = 0X9xxxx
-+	.word	gdt - start,0	# gdt base, needs to be adjusted
- 
- msg1:
- 	.asciz "Setup.S\r\n"
-
-
diff --git a/system/memtest86+/patches/doc-serialconsole b/system/memtest86+/patches/doc-serialconsole
deleted file mode 100644
index c124e7a383..0000000000
--- a/system/memtest86+/patches/doc-serialconsole
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 03867c811369be70cd81a42d150e0a250c9d1248
-Author: Yann Dirson <dirson@debian.org>
-Date:   Tue Sep 29 23:40:15 2009 +0200
-
-    git-debimport memtest86+_4.00-1.diff.gz
-
-Index: memtest86+/README
-===================================================================
---- memtest86+.orig/README
-+++ memtest86+/README
-@@ -89,12 +89,10 @@ To create a boot-disk with this pre-buil
- =================
- Memtest86 can be used on PC's equipped with a serial port for the console.
- By default serial port console support is not enabled since it slows
--down testing.  To enable change the SERIAL_CONSOLE_DEFAULT define in
--config.h from a zero to a one.  The serial console baud rate may also
--be set in config.h with the SERIAL_BAUD_RATE define.  The other serial
--port settings are no parity, 8 data bits, 1 stop bit.  All of the features
--used by memtest86 are accessible via the serial console.  However, the
--screen sometimes is garbled when the online commands are used.
-+down testing.
-+
-+To activate it, add a console parameter on the memtest86+
-+command-line, like: "/boot/memtest86+.bin console=ttyS0,115200n8".
- 
- 
- 5) Online Commands
diff --git a/system/memtest86+/patches/makefile.diff b/system/memtest86+/patches/makefile.diff
deleted file mode 100644
index 83bc8b5ff1..0000000000
--- a/system/memtest86+/patches/makefile.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/Makefile b/Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -11,7 +11,6 @@
- 
- CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
- 	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
--CPPFLAGS= -m32
- ASFLAGS= -32
- 
- # This reverts a change introduced with recent binutils (post
-@@ -34,7 +33,7 @@
- 	$(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
- 
- memtest_shared.bin: memtest_shared
--	objcopy -O binary $< memtest_shared.bin
-+	objcopy -O binary $< $@
- 
- memtest: memtest_shared.bin memtest.lds
- 	$(LD) -s -T memtest.lds -b binary memtest_shared.bin -o $@
-@@ -50,10 +49,10 @@
- 
- memtest.bin: memtest_shared.bin bootsect.o setup.o memtest.bin.lds
- 	$(LD) -T memtest.bin.lds bootsect.o setup.o -b binary \
--	memtest_shared.bin -o memtest.bin
-+	memtest_shared.bin -o $@
- 
- reloc.o: reloc.c
--	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-+reloc.o: CFLAGS += -fno-strict-aliasing
- 
- test.o: test.c
- test.o: CFLAGS += -O0 -fno-PIC
diff --git a/system/memtest86+/patches/memtest86+-5.01-gcc-473.patch b/system/memtest86+/patches/memtest86+-5.01-gcc-473.patch
deleted file mode 100644
index af011d67c7..0000000000
--- a/system/memtest86+/patches/memtest86+-5.01-gcc-473.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-http://forum.canardpc.com/threads/110950-fix-controller-loop-error
-
---- memtest86+-5.01/controller.c
-+++ memtest86+-5.01/controller.c
-@@ -292,7 +292,7 @@ static void setup_nhm(void)
- 
- 	/* First, locate the PCI bus where the MCH is located */
- 
--	for(i = 0; i < sizeof(possible_nhm_bus); i++) {
-+	for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
- 		vid &= 0xFFFF;
-@@ -327,7 +327,7 @@ static void setup_nhm32(void)
- 	ctrl.mode = ECC_NONE;
- 
- 	/* First, locate the PCI bus where the MCH is located */
--	for(i = 0; i < sizeof(possible_nhm_bus); i++) {
-+	for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
- 		vid &= 0xFFFF;
---- memtest86+-5.01/Makefile
-+++ memtest86+-5.01/Makefile
-@@ -12,7 +12,7 @@ FDISK=/dev/fd0
- AS=as -32
- CC=gcc
- 
--CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
-+CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
- 	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
- 	
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
diff --git a/system/memtest86+/patches/memtest86+-5.01-hardcoded_cc.patch b/system/memtest86+/patches/memtest86+-5.01-hardcoded_cc.patch
deleted file mode 100644
index 21b51c5b7f..0000000000
--- a/system/memtest86+/patches/memtest86+-5.01-hardcoded_cc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/Makefile.orig	2015-02-01 01:08:33.000000000 +0300
-+++ b/Makefile	2015-02-01 01:10:17.624757244 +0300
-@@ -9,11 +9,10 @@
- #
- FDISK=/dev/fd0
- 
--AS=as -32
--CC=gcc
--
- CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
- 	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
-+CPPFLAGS= -m32
-+ASFLAGS= -32
- 	
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-       config.o cpuid.o linuxbios.o pci.o memsize.o spd.o error.o dmi.o controller.o \
diff --git a/system/memtest86+/patches/memtest86+-5.01-io-extern-inline.patch b/system/memtest86+/patches/memtest86+-5.01-io-extern-inline.patch
deleted file mode 100644
index 682dd5d01a..0000000000
--- a/system/memtest86+/patches/memtest86+-5.01-io-extern-inline.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-http://forum.canardpc.com/threads/110951-fix-build-with-newer-gcc-versions
-
-the meaning of extern inline changed between standards.  use static inline
-for these tiny I/O functions everywhere to keep things simple.
-
---- a/io.h
-+++ b/io.h
-@@ -31,6 +31,6 @@
-  */
- 
- #define __OUT1(s,x) \
--extern inline void __out##s(unsigned x value, unsigned short port) {
-+static inline void __out##s(unsigned x value, unsigned short port) {
- 
- #define __OUT2(s,s1,s2) \
-@@ -43,6 +43,6 @@
- __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; }
- 
- #define __IN1(s) \
--extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;
-+static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;
- 
- #define __IN2(s,s1,s2) \
-@@ -55,6 +55,6 @@
- __IN1(s##c_p) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); SLOW_DOWN_IO; return _v; }
- 
- #define __OUTS(s) \
--extern inline void outs##s(unsigned short port, const void * addr, unsigned long count) \
-+static inline void outs##s(unsigned short port, const void * addr, unsigned long count) \
- { __asm__ __volatile__ ("cld ; rep ; outs" #s \
- : "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
diff --git a/system/memtest86+/patches/memtest86+-5.01-no-C-headers.patch b/system/memtest86+/patches/memtest86+-5.01-no-C-headers.patch
deleted file mode 100644
index ce7f906a19..0000000000
--- a/system/memtest86+/patches/memtest86+-5.01-no-C-headers.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-http://forum.canardpc.com/threads/110955-PATCH-don-t-pull-in-system-headers
-
-avoid using C library headers as it'd mean we'd need 32-bit glibc files available
-
-https://bugs.gentoo.org/592638
-
---- a/dmi.c
-+++ b/dmi.c
-@@ -10,7 +10,7 @@
- 
- 
- #include "test.h"
--#include <stdint.h>
-+#include "stdint.h"
- 
- 
- #define round_up(x,y) (((x) + (y) - 1) & ~((y)-1))
---- a/test.c
-+++ b/test.c
-@@ -14,7 +14,28 @@
- #include "stdint.h"
- #include "cpuid.h"
- #include "smp.h"
--#include <sys/io.h>
-+
-+static inline unsigned char
-+inb_p (unsigned short int __port)
-+{
-+  unsigned char _v;
-+
-+  __asm__ __volatile__ ("inb %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (__port));
-+  return _v;
-+}
-+
-+static inline void
-+outb (unsigned char __value, unsigned short int __port)
-+{
-+  __asm__ __volatile__ ("outb %b0,%w1": :"a" (__value), "Nd" (__port));
-+}
-+
-+static inline void
-+outb_p (unsigned char __value, unsigned short int __port)
-+{
-+  __asm__ __volatile__ ("outb %b0,%w1\noutb %%al,$0x80": :"a" (__value),
-+			"Nd" (__port));
-+}
- 
- extern struct cpu_ident cpu_id;
- extern volatile int    mstr_cpu;
diff --git a/system/memtest86+/patches/memtest86+-5.01-no-clean.patch b/system/memtest86+/patches/memtest86+-5.01-no-clean.patch
deleted file mode 100644
index e9cbf10399..0000000000
--- a/system/memtest86+/patches/memtest86+-5.01-no-clean.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://forum.canardpc.com/threads/110954-PATCH-fix-parallel-build-issues
-
-
-don't run the clean target when building all as we run into parallel races:
- - memtest kicks off building of a bunch of .o files
- - clean runs in parallel which runs `rm` and deletes some of the new .o
- - memtest goes to link and fails because objects are missing
-
---- a/Makefile
-+++ b/Makefile
-@@ -19,7 +19,7 @@
-       smp.o vmem.o random.o
-       
- 
--all: clean memtest.bin memtest 
-+all: memtest.bin memtest
- 
- # Link it statically once so I know I don't have undefined
- # symbols and then link it dynamically so I have full
diff --git a/system/memtest86+/patches/memtest86+-5.01-no-scp.patch b/system/memtest86+/patches/memtest86+-5.01-no-scp.patch
deleted file mode 100644
index 8d830e297e..0000000000
--- a/system/memtest86+/patches/memtest86+-5.01-no-scp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://forum.canardpc.com/threads/110953-PATCH-don-t-try-to-scp-after-building
-
-this makes no sense in a sane build world
-
---- a/Makefile
-+++ b/Makefile
-@@ -21,7 +21,6 @@
-       
- 
- all: clean memtest.bin memtest 
--		 scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus
- 
- # Link it statically once so I know I don't have undefined
- # symbols and then link it dynamically so I have full
diff --git a/system/memtest86+/patches/memtest86+-5.01-reboot-def.patch b/system/memtest86+/patches/memtest86+-5.01-reboot-def.patch
deleted file mode 100644
index f4b42feb5f..0000000000
--- a/system/memtest86+/patches/memtest86+-5.01-reboot-def.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://forum.canardpc.com/threads/110952-fix-build-due-to-missing-reboot-symbol
-
-the reboot func is used elsewhere, so don't mark it inline
-
---- a/lib.c
-+++ b/lib.c
-@@ -33,7 +33,7 @@ struct ascii_map_str {
-         int keycode;
- };
- 
--inline void reboot(void)
-+void reboot(void)
- {
- 	
- 	/* tell the BIOS to do a cold start */
diff --git a/system/memtest86+/patches/memtest86+-5.01-test-random-cflags.patch b/system/memtest86+/patches/memtest86+-5.01-test-random-cflags.patch
deleted file mode 100644
index dcdccb8c6e..0000000000
--- a/system/memtest86+/patches/memtest86+-5.01-test-random-cflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-make sure we re-use the existing CFLAGS settings so that we get all the right
-flags (like -fno-stack-protector).  just append the few changes we want (the
-optimization levels).
-
-https://bugs.gentoo.org/590974
-
---- a/Makefile
-+++ b/Makefile
-@@ -52,10 +52,10 @@ reloc.o: reloc.c
- 	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
- 
- test.o: test.c
--	$(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+test.o: CFLAGS += -O0 -fno-PIC
- 
- random.o: random.c
--	$(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
-+random.o: CFLAGS += -O3 -fno-PIC
- 	
- # rule for build number generation  
- build_number:
diff --git a/system/memtest86+/patches/memtest86+-test-7-smp.patch b/system/memtest86+/patches/memtest86+-test-7-smp.patch
deleted file mode 100644
index 424a88dcfd..0000000000
--- a/system/memtest86+/patches/memtest86+-test-7-smp.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/test.c
-+++ b/test.c
-@@ -1202,7 +1202,7 @@ void block_move(int iter, int me)
- 			} else {
- 				pe = end;
- 			}
--			if (pe >= end) {
-+			if ((pe >= end && end != 0) || (pe < p && end == 0)) {
- 				pe = end;
- 				done++;
- 			}
-@@ -1280,7 +1280,7 @@ void block_move(int iter, int me)
- 			} else {
- 				pe = end;
- 			}
--			if (pe >= end) {
-+			if ((pe >= end && end != 0) || (pe < p && end == 0)) {
- 				pe = end;
- 				done++;
- 			}
-@@ -1359,7 +1359,7 @@ void block_move(int iter, int me)
- 			} else {
- 				pe = end;
- 			}
--			if (pe >= end) {
-+			if ((pe >= end && end != 0) || (pe < p && end == 0)) {
- 				pe = end;
- 				done++;
- 			}
diff --git a/system/memtest86/20_memtest86 b/system/memtest86/20_memtest86
new file mode 100644
index 0000000000..2e820018e0
--- /dev/null
+++ b/system/memtest86/20_memtest86
@@ -0,0 +1,82 @@
+#!/bin/sh
+set -e
+
+prefix="/usr"
+exec_prefix="/usr"
+datarootdir="/usr/share"
+
+. "$pkgdatadir/grub-mkconfig_lib"
+
+CLASS="--class memtest86 --class gnu --class tool"
+
+prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)"
+
+memtest_entry ()
+{
+  image="$1"
+  args="$2"
+  rel_image="$(make_system_path_relative_to_its_root ${image})"
+
+  # Apply some heuristics to show some images only on particular platforms.
+  basename="$(basename ${image})"
+  ftype="$(file ${image} | cut -d: -f2)"
+  if echo "${basename}" | grep -q ".elf\$" || echo "${ftype}" | grep -q "ELF"; then
+    protocol="knetbsd"
+    platform="pc"
+    #platform="" # Uncomment to show on EFI platforms; see below.
+  elif echo "${basename}" | grep -q ".efi\$" || echo "${ftype}" | grep -q "EFI"; then
+    protocol="chainloader"
+    platform="efi"
+  else # .bin, DOS/MBR boot sector
+    protocol="linux16"
+    platform="pc"
+    #platform="" # Uncomment to show on EFI platforms; see below.
+  fi
+
+  # All images listed above should boot on EFI platforms, but many (those
+  # marked with platform="pc") will likely run without graphics and appear to
+  # the casual user to not work, so are hidden by default.  (Some versions
+  # beep at startup, verifying it booted, but the display will be blank.)
+  # Serial consoles may still be useful.
+  #
+  # Uncomment this to un-hide all images on EFI platforms, or selectively edit
+  # the platform lines above to un-hide particular images.
+  #if [ "$platform" = "pc" ]; then
+  #  platform=""
+  #fi
+
+  if echo "${ftype}" | grep -q "Linux"; then # Linux kernel x86 boot executable
+    # .efi or .bin images may also present themselves as a Linux kernel image.
+    # When booted using the "linux" protocol, these images can be used on
+    # either "pc" or "efi" platform, and on EFI platforms they may have better
+    # or native resolution graphics.
+    protocol="linux"
+    #platform="" # Uncomment to discard platform constraint chosen above.
+  fi
+
+  # TODO: Detect multiboot images, use protocol="multiboot"
+
+  # Emit the menuentry.
+  platform_indent=""
+  if [ -n "${platform}" ]; then
+    echo "if [ x\$grub_platform = x${platform} ]; then"
+    platform_indent="${grub_tab}"
+  fi
+  echo "${platform_indent}menuentry \"Memory Tester (${basename})\" ${CLASS} {"
+  if [ "${protocol}" = "linux" -o "${protocol}" = "knetbsd" ]; then
+    echo "${platform_indent}${grub_tab}load_video"
+  fi
+  printf '%s\n' "${prepare_boot_cache}" | sed "s/^/${platform_indent}/"
+  echo "${platform_indent}${grub_tab}${protocol} ${rel_image} ${args}"
+  echo "${platform_indent}}"
+  if [ -n "${platform}" ]; then
+    echo "fi"
+  fi
+}
+
+for image in $(find /boot -maxdepth 1 -type f -regex '/boot/memtest86[^+].*' | sort -Vr); do
+  if is_path_readable_by_grub "${image}" ; then
+    gettext_printf "Found memtest86 image: %s\n" "${image}" >&2
+    memtest_entry "${image}" "${GRUB_CMDLINE_MEMTEST86}"
+  fi
+done
diff --git a/system/memtest86/README b/system/memtest86/README
index 0cad000052..b42a45b16e 100644
--- a/system/memtest86/README
+++ b/system/memtest86/README
@@ -1,6 +1,6 @@
 Memtest86 is a thorough, stand-alone memory test for x86 architecture
-computers.  BIOS based memory tests are a quick, cursory check and often
-miss many of the failures that are detected by Memtest86.
+computers. BIOS based memory tests are a quick, cursory check and
+often miss many of the failures that are detected by Memtest86.
 
 This package installs a bootable image to /boot/memtest86.bin
 which is similar to the kernel images in the same directory.
@@ -15,19 +15,15 @@ Then run `/sbin/lilo` to update the boot loader.
 Don't forget to re-run `/sbin/lilo` if you upgrade this package.
 
 
-GRUB 2 users:  Append something like this to your /etc/grub.d/40_custom:
-
-  menuentry 'memtest86' {
-      linux16 (hd0,1)/boot/memtest86.bin
-  }
-
-Then run `grub-mkconfig -o /boot/grub/grub.cfg` to update the boot menu.
-
-
-GRUB Legacy users:  Append something like this to your /boot/grub/menu.lst:
+GRUB Legacy users:  Append something like this to your
+/boot/grub/menu.lst:
 
   title memtest86
       kernel (hd0,0)/boot/memtest86.bin
 
 
+GRUB 2 users:  Auto-detected by the /etc/grub.d/20_memtest86 script.
+Run `grub-mkconfig -o /boot/grub/grub.cfg` to update the boot menu.
+
+
 See /usr/doc/memtest86-$VERSION/README for more info.
diff --git a/system/memtest86/doinst.sh b/system/memtest86/doinst.sh
new file mode 100644
index 0000000000..22414beaee
--- /dev/null
+++ b/system/memtest86/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/grub.d/20_memtest86.new
diff --git a/system/memtest86/memtest86.SlackBuild b/system/memtest86/memtest86.SlackBuild
index 84d09445d6..a223030e9b 100644
--- a/system/memtest86/memtest86.SlackBuild
+++ b/system/memtest86/memtest86.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for memtest86
 
-# Copyright 2012-2019 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2012-2022 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,17 +22,40 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230515 bkw: Modified by SlackBuilds.org, BUILD=4:
+# - create a proper top-level source directory (to avoid
+#   surprising anyone who expects to find one).
+# - hardcode ARCH=i586, since we no longer allow i486. this
+#   is strictly a cosmetic change (it only affects the name
+#   of the package file, not the contents).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=memtest86
 VERSION=${VERSION:-4.3.7}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=${ARCH:-$(uname -m)}
+case $ARCH in
+  i?86)   ;; # OK
+  x86_64) ;; # OK
+  *)      echo "$ARCH is not supported." >&2; exit 1 ;;
+esac
+
+# 20230515 bkw: Hardcode this. Even if the package contains code that
+# would work on i486, this is the minimum *Slackware supported* CPU it
+# will run on.
+ARCH=i586
 
-# i486 only.  Modify the Makefile at your own risk :-)
-ARCH=i486
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM-$VERSION
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 DOCS="README*"
@@ -42,11 +65,13 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf src
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
-cd src
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
+cd src
 
 # Permissions and line endings need to be sanitized.
 # Required so that memtest86+ backported patches will apply cleanly.
@@ -68,6 +93,9 @@ patch -p1 < $CWD/patches/makefile.diff
 # https://bugs.debian.org/779504 -> https://bugs.debian.org/629506
 patch -p1 < $CWD/patches/bug_629506_message_15.mbox
 
+# https://bugzilla.opensuse.org/show_bug.cgi?id=1185272
+patch -p1 < $CWD/patches/discard-note_gnu_property.patch
+
 # TBD whether these memtest86+ patches should be backported:
 # https://sources.debian.org/patches/memtest86+/5.01-3/
 # https://bugs.debian.org/250864 suggests that it could be backported.
@@ -81,12 +109,15 @@ install -D -m 0644 memtest.bin $PKG/boot/$PRGNAM-$VERSION.bin
 ln -s $PRGNAM-$VERSION $PKG/boot/$PRGNAM
 ln -s $PRGNAM-$VERSION.bin $PKG/boot/$PRGNAM.bin
 
+install -D -m 0755 $CWD/20_memtest86 $PKG/etc/grub.d/20_memtest86.new
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/memtest86/patches/discard-note_gnu_property.patch b/system/memtest86/patches/discard-note_gnu_property.patch
new file mode 100644
index 0000000000..7c1179f077
--- /dev/null
+++ b/system/memtest86/patches/discard-note_gnu_property.patch
@@ -0,0 +1,9 @@
+--- a/memtest.bin.lds	2020-04-12 17:14:51.000000000 +0200
++++ b/memtest.bin.lds	2021-12-04 14:54:33.178625382 +0100
+@@ -11,5 +11,6 @@
+ 		*(.data) 
+ 		_end = . ;
+ 	}
++	/DISCARD/ : { *(.note.gnu.property) }
+ 	_syssize = (_end - _start + 15) >> 4;
+ }
diff --git a/system/memtester/README b/system/memtester/README
index df134f1b2e..18ddf3a81e 100644
--- a/system/memtester/README
+++ b/system/memtester/README
@@ -1,9 +1,9 @@
 memtester (memory test utility)
 
-memtester is a userspace utility for testing the memory subsystem for
-faults. Unlike memtest86, it runs as a process on a running Linux system,
-meaning it can't test all of memory the way memtest86 is able to... but
-you don't have to reboot to use it.
+memtester is a userspace utility for testing the memory subsystem
+for faults. Unlike memtest86, it runs as a process on a running Linux
+system, meaning it can't test all of memory the way memtest86 is able
+to... but you don't have to reboot to use it.
 
 Note that, by definition, memtester counts as a denial-of-service
 (resource exhaustion) attack against the local machine. Be cautious
diff --git a/system/memtester/memtester.SlackBuild b/system/memtester/memtester.SlackBuild
index 9b17fd3fea..332035a7fe 100644
--- a/system/memtester/memtester.SlackBuild
+++ b/system/memtester/memtester.SlackBuild
@@ -1,17 +1,23 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for memtester
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 # The _1 is the debian patchlevel.
 
+# 20221228 bkw: update for v4.6.0_1. switched to debian's renamed
+# source, since the upstream site is broken (temporarily?)
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=memtester
-VERSION=${VERSION:-4.5.0_1}
+VERSION=${VERSION:-4.6.0_1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCVER="$( echo $VERSION | cut -d_ -f1 )"
 DEBVER="$( echo $VERSION | cut -d_ -f2 )"
@@ -24,7 +30,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -49,7 +59,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG/usr $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+tar xvf $CWD/${PRGNAM}_$SRCVER.orig.tar.gz
 cd $PRGNAM-$SRCVER
 tar xvf $CWD/${PRGNAM}_$SRCVER-$DEBVER.debian.tar.xz
 chown -R root:root .
@@ -75,4 +85,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/memtester/memtester.info b/system/memtester/memtester.info
index 083ffb958c..a3f4f97f73 100644
--- a/system/memtester/memtester.info
+++ b/system/memtester/memtester.info
@@ -1,12 +1,12 @@
 PRGNAM="memtester"
-VERSION="4.5.0_1"
+VERSION="4.6.0_1"
 HOMEPAGE="http://pyropus.ca/software/memtester/"
-DOWNLOAD="http://pyropus.ca/software/memtester/old-versions/memtester-4.5.0.tar.gz \
-          http://deb.debian.org/debian/pool/main/m/memtester/memtester_4.5.0-1.debian.tar.xz"
-MD5SUM="674a8a88ff54bdb229ca4148218a41f1 \
-        c4c05a502aedeef0d06d7ebd62b73040"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/m/memtester/memtester_4.6.0.orig.tar.gz \
+          https://deb.debian.org/debian/pool/main/m/memtester/memtester_4.6.0-1.debian.tar.xz"
+MD5SUM="f351462e0a995ac6f96f451ddc17bec5 \
+        7b74c817255d3823ea4489294ac890e0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/memuse/memuse.SlackBuild b/system/memuse/memuse.SlackBuild
index 6bbdfd9163..e08f399519 100644
--- a/system/memuse/memuse.SlackBuild
+++ b/system/memuse/memuse.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for memuse
 
 # Written by Dušan Stefanović <stefanovic.dusan@gmail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=memuse
 VERSION=${VERSION:-0.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -68,4 +78,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mergerfs/README b/system/mergerfs/README
new file mode 100644
index 0000000000..7cac2f973c
--- /dev/null
+++ b/system/mergerfs/README
@@ -0,0 +1,5 @@
+mergerfs is a union filesystem geared towards simplifying storage
+and management of files across numerous commodity storage devices.
+It is similar to mhddfs, unionfs, and aufs.
+
+pandoc is an optional dependency if you want to generate man pages.
diff --git a/system/mergerfs/mergerfs.SlackBuild b/system/mergerfs/mergerfs.SlackBuild
new file mode 100644
index 0000000000..ee9271b391
--- /dev/null
+++ b/system/mergerfs/mergerfs.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+# Slackware build script for <mergerfs>
+
+# Copyright <2022> Justin Teague Texas, US
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=mergerfs
+VERSION=${VERSION:-2.33.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make \
+    CFLAGS="$SLKCFLAGS" \
+    CXXFLAGS="$SLKCFLAGS" \
+    PREFIX="/usr" \
+    MANDIR="/usr/man" \
+    DOCDIR="/usr/doc/$PRGNAM-$VERSION" \
+    BUILD="$ARCH-slackware-linux" \
+    DESTDIR=$PKG \
+    install 
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE \
+  README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mergerfs/mergerfs.info b/system/mergerfs/mergerfs.info
new file mode 100644
index 0000000000..df7ea06f67
--- /dev/null
+++ b/system/mergerfs/mergerfs.info
@@ -0,0 +1,10 @@
+PRGNAM="mergerfs"
+VERSION="2.33.5"
+HOMEPAGE="https://github.com/trapexit/mergerfs"
+DOWNLOAD="https://github.com/trapexit/mergerfs/releases/download/2.33.5/mergerfs-2.33.5.tar.gz"
+MD5SUM="29d389f68d1f4b6300f15db67df817eb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Justin Teague"
+EMAIL="arcadellama@posteo.net"
diff --git a/system/mergerfs/slack-desc b/system/mergerfs/slack-desc
new file mode 100644
index 0000000000..59be8afafa
--- /dev/null
+++ b/system/mergerfs/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+mergerfs: mergerfs (a featureful union filesystem)
+mergerfs:
+mergerfs: mergerfs is a union filesystem geared towards simplifying storage and
+mergerfs: management of files across numerous commodity storage devices. It is
+mergerfs: similar to mhddfs, unionfs, and aufs.
+mergerfs:
+mergerfs: Homepage <https://github.com/trapexit/mergerfs/>
+mergerfs:
+mergerfs:
+mergerfs:
+mergerfs:
diff --git a/system/mhddfs/mhddfs.SlackBuild b/system/mhddfs/mhddfs.SlackBuild
index 3e8828a0fa..ce93bc75be 100644
--- a/system/mhddfs/mhddfs.SlackBuild
+++ b/system/mhddfs/mhddfs.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mhddfs
 
-# Copyright 2015 Ulrich Schaefer Germany
+# Copyright 2015-2022 Ulrich Schaefer Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,30 +22,33 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mhddfs
 VERSION=${VERSION:-0.1.39}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-if [ -f ${PRGNAM}_${VERSION}.tar.gz ]; then
-  mv ${PRGNAM}_${VERSION}.tar.gz ${PRGNAM}-${VERSION}.tar.gz
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -64,26 +67,28 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/${PRGNAM}_${VERSION}.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-make
+# 20220210 bkw: use correct include path for xattr.h
+sed -i 's,<attr,<sys/,' src/*.c
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# 20220210 bkw: actually use SLKCFLAGS (and build stripped)
+sed -i "s|-Wall|& $SLKCFLAGS -Wl,-s|" Makefile
+
+make
 
 mkdir -p $PKG/usr/man/man1
-gzip -9 mhddfs.1
-mv mhddfs.1.gz $PKG/usr/man/man1
+gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING  ChangeLog  LICENSE  README* mhddfs.spec $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog LICENSE README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -93,4 +98,4 @@ mkdir -p $PKG/usr/bin
 mv mhddfs $PKG/usr/bin
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mhddfs/mhddfs.info b/system/mhddfs/mhddfs.info
index 719c0158b0..495bc618a2 100644
--- a/system/mhddfs/mhddfs.info
+++ b/system/mhddfs/mhddfs.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="uthash"
 MAINTAINER="Ulrich Schaefer"
-EMAIL="us@ulischaefer.net"
+EMAIL="us@ulischaefer.de"
diff --git a/system/microcode_ctl/README b/system/microcode_ctl/README
index 5f9c737985..d83b367ee3 100644
--- a/system/microcode_ctl/README
+++ b/system/microcode_ctl/README
@@ -1,12 +1,13 @@
 Intel Microcode Update Utility for Linux
 
-The microcode_ctl utility is a companion to the IA32 microcode driver written
-by Tigran Aivazian <tigran@aivazian.fsnet.co.uk>. The utility has two uses:
+The microcode_ctl utility is a companion to the IA32 microcode driver
+written by Tigran Aivazian <tigran@aivazian.fsnet.co.uk>. The utility
+has two uses:
 
 * It decodes and sends new microcode to the kernel driver to be uploaded
-    to Intel IA32 processors. (Pentium Pro, PII, PIII, Pentium 4, Celeron,
-    Xeon etc - all P6 and above, which does NOT include pentium classics).
-    It also supports processors of the x86_64 architecture.
+  to Intel IA32 processors. (Pentium Pro, PII, PIII, Pentium 4, Celeron,
+  Xeon etc - all P6 and above, which does NOT include pentium classics).
+  It also supports processors of the x86_64 architecture.
 * It signals the kernel driver to release any buffers it may hold.
 
 The microcode update is volatile and needs to be uploaded on each system
diff --git a/system/microcode_ctl/microcode_ctl.SlackBuild b/system/microcode_ctl/microcode_ctl.SlackBuild
index 861f28e729..b840db9bf2 100644
--- a/system/microcode_ctl/microcode_ctl.SlackBuild
+++ b/system/microcode_ctl/microcode_ctl.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for microcode_ctl
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=microcode_ctl
 VERSION=${VERSION:-1.26}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -92,4 +102,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/microemulator/README b/system/microemulator/README
deleted file mode 100644
index 0b5ff3e300..0000000000
--- a/system/microemulator/README
+++ /dev/null
@@ -1,14 +0,0 @@
-MicroEmulator is a pure Java implementation of Java ME in Java SE.
-
-Features:
-
- - Support for MIDP 2.0
- - Generic Connection Framework
- - Support for MMAPI (JSR 135)
- - Support for FileConnection API (JSR 75)
- - Support for Nokia APIs
- - Support for Siemens APIs
- - Skinnable and configurable interface
- - Works with different graphics libraries;
-   currently with Swing and SWT
- - Platform independent: Windows, Linux, OSX
diff --git a/system/microemulator/doinst.sh b/system/microemulator/doinst.sh
deleted file mode 100644
index 4e8ba7071d..0000000000
--- a/system/microemulator/doinst.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/system/microemulator/microemulator.SlackBuild b/system/microemulator/microemulator.SlackBuild
deleted file mode 100644
index ecd60410e4..0000000000
--- a/system/microemulator/microemulator.SlackBuild
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for MicroEmulator
-
-# Copyright 2011  Fridrich von Stauffenberg <cancellor2@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=microemulator
-VERSION=${VERSION:-2.0.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-$VERSION.zip
-cd $PRGNAM-$VERSION
-chown -R root:root .
-
-mkdir -p $PKG/opt/$PRGNAM
-mv * $PKG/opt/$PRGNAM
-
-mkdir -p $PKG/usr/share/applications
-cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-
-cat $CWD/$PRGNAM.sh > $PKG/opt/$PRGNAM/$PRGNAM
-chmod 755 $PKG/opt/$PRGNAM/$PRGNAM
-
-mkdir -p $PKG/usr/bin
-ln -s /opt/$PRGNAM/$PRGNAM $PKG/usr/bin
-
-unzip $PKG/opt/$PRGNAM/microemulator.jar org/microemu/icon.png
-mkdir -p $PKG/usr/share/pixmaps
-mv org/microemu/icon.png $PKG/usr/share/pixmaps/$PRGNAM.png
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/microemulator/microemulator.desktop b/system/microemulator/microemulator.desktop
deleted file mode 100644
index 89fa0a00d9..0000000000
--- a/system/microemulator/microemulator.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=MicroEmulator
-GenericName=J2ME emulator
-Comment=Run Java MIDlets on PC
-Icon=microemulator
-Exec=microemulator
-Categories=System;Emulator;
diff --git a/system/microemulator/microemulator.info b/system/microemulator/microemulator.info
deleted file mode 100644
index ed73324fbe..0000000000
--- a/system/microemulator/microemulator.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="microemulator"
-VERSION="2.0.4"
-HOMEPAGE="https://sourceforge.net/projects/microemulator/"
-DOWNLOAD="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/microemu/microemulator-2.0.4.zip"
-MD5SUM="d4a859a9aae5d90e25f11146abf1e27a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="jdk"
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere.com"
diff --git a/system/microemulator/microemulator.sh b/system/microemulator/microemulator.sh
deleted file mode 100644
index 245de44944..0000000000
--- a/system/microemulator/microemulator.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd $(dirname $(readlink -f $0))
-exec java -jar ./microemulator.jar
diff --git a/system/microemulator/slack-desc b/system/microemulator/slack-desc
deleted file mode 100644
index 68bd0cbd04..0000000000
--- a/system/microemulator/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-             |-----handy-ruler------------------------------------------------------|
-microemulator: microemulator (J2ME emulator)
-microemulator:
-microemulator: MicroEmulator is a pure Java implementation of Java ME in Java SE.
-microemulator:
-microemulator: Homepage: http://www.microemu.org
-microemulator:
-microemulator:
-microemulator:
-microemulator:
-microemulator:
-microemulator:
diff --git a/system/midisport-firmware/midisport-firmware.SlackBuild b/system/midisport-firmware/midisport-firmware.SlackBuild
index 5399df3700..10311be37c 100644
--- a/system/midisport-firmware/midisport-firmware.SlackBuild
+++ b/system/midisport-firmware/midisport-firmware.SlackBuild
@@ -1,17 +1,27 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for midisport-firmware
 
 # Written by Felix Pfeifer (pfeifer[dot]felix[at]googlemail[dot]com)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=midisport-firmware
 VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -48,4 +58,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mingetty/mingetty.SlackBuild b/system/mingetty/mingetty.SlackBuild
index 185614f524..bf98f62c0d 100644
--- a/system/mingetty/mingetty.SlackBuild
+++ b/system/mingetty/mingetty.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mingetty
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mingetty
 VERSION=${VERSION:-1.08}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -90,4 +100,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mjpg-streamer/README b/system/mjpg-streamer/README
deleted file mode 100644
index 5438596857..0000000000
--- a/system/mjpg-streamer/README
+++ /dev/null
@@ -1,28 +0,0 @@
-MJPG-streamer is a very lightweight and resource friendly video
-streamer. It also comes with uvc_stream, which is a very basic
-streamer, and uvc_viewer, a simple gtk viewing application.
-
-MJPG-streamer takes JPGs from Linux-UVC compatible webcams,
-filesystem or other input plugins and streams them as M-JPEG via HTTP
-to webbrowsers, VLC and other software. It is the successor of
-uvc-streamer, a Linux-UVC streaming application with Pan/Tilt
-
-Homepage: https://sourceforge.net/projects/mjpg-streamer/
-
-Note:
-
-The included uvc_viewer is a 32bit binary and therefore will not
-work on other archs. You may use mplayer to watch the stream
-using a similar command to:
-
-mplayer -fps 30 -demuxer lavf -cache 256 \
-"http://192.168.1.2:8080/?action=stream&ignored.mjpg"
-
-You may find that mplayer is lighter on resources anyway. Also
-the viewer leaves a properties.ini file in the CWD.
-
-There is an included start.sh script which contains many
-examples for using the mjpg_streamer application. (The www directory
-mentioned should be replaced by /var/mjpg-www.)
-
-You can find it and more in /usr/doc/mjpg-streamer-$version
diff --git a/system/mjpg-streamer/mjpg-streamer.SlackBuild b/system/mjpg-streamer/mjpg-streamer.SlackBuild
deleted file mode 100644
index 91b069ab37..0000000000
--- a/system/mjpg-streamer/mjpg-streamer.SlackBuild
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for mjpg-streamer
-
-# Copyright 2011  David Woodfall <dave@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=mjpg-streamer
-VERSION=${VERSION:-r163}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Add our flags to the Makefiles
-find . -name Makefile -exec \
-    sed -i "s/^CFLAGS += -O2/CFLAGS += $SLKCFLAGS/
-    s/^CFLAGS += -O1/CFLAGS += $SLKCFLAGS/
-    0,/^CFLAGS +=/ {/^CFLAGS +=.*/a\
-    CXXFLAGS = $SLKCFLAGS
-    }" '{}' \;
-
-# This header is OLD
-sed -i "s|linux/videodev|linux/videodev2|" uvc-streamer/*
-
-# Manual installation section
-cd uvc-streamer
-make
-install -m 755 -D uvc_stream $PKG/usr/bin/uvc_stream
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/uvc-streamer
-cp -a  README CHANGELOG LICENSE \
-     $PKG/usr/doc/$PRGNAM-$VERSION/uvc-streamer
-
-cd ../mjpg-streamer-experimental
-make
-install -m 755 -D mjpg_streamer $PKG/usr/bin/mjpg_streamer
-mkdir -p $PKG/usr/lib$LIBDIRSUFFIX
-install -m 644 *.so $PKG/usr/lib$LIBDIRSUFFIX
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/mjpg-streamer
-cp -a  README CHANGELOG LICENSE TODO start.sh \
-     $PKG/usr/doc/$PRGNAM-$VERSION/mjpg-streamer
-mkdir -p $PKG/var/mjpg-www
-cp -r www/* $PKG/var/mjpg-www
-
-cd ../udp_client
-qmake
-make
-install -m 755 -D udp_client $PKG/usr/bin/udp_client
-
-find $PKG | xargs file | grep -e "executable" -e "shared object"  | grep ELF | \
-  cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# This is already stripped.
-cd ../mjpeg-client/bin/linux_i386_upx
-install -m 755 -D viewer $PKG/usr/bin/uvc_viewer
-
-cd ../../../
-
-cp -a  doc/* \
-     $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/mjpg-streamer/mjpg-streamer.info b/system/mjpg-streamer/mjpg-streamer.info
deleted file mode 100644
index 72d30a7fcd..0000000000
--- a/system/mjpg-streamer/mjpg-streamer.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="mjpg-streamer"
-VERSION="r163"
-HOMEPAGE="https://github.com/jacksonliam/mjpg-streamer"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/mjpg-streamer-r163.tar.xz"
-MD5SUM="bba8b2a5480d04bae0e8df158b8730fd"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@slackbuilds.org"
diff --git a/system/mjpg-streamer/slack-desc b/system/mjpg-streamer/slack-desc
deleted file mode 100644
index f8854ebff0..0000000000
--- a/system/mjpg-streamer/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-             |-----handy-ruler------------------------------------------------------|
-mjpg-streamer: mjpg-streamer (lightweight video streamer)
-mjpg-streamer:
-mjpg-streamer: MJPG-streamer takes JPGs from Linux-UVC compatible webcams,
-mjpg-streamer: filesystem or other input plugins and streams them as M-JPEG via HTTP
-mjpg-streamer: to webbrowsers, VLC and other software. It is the successor of
-mjpg-streamer: uvc-streamer, a Linux-UVC streaming application with Pan/Tilt
-mjpg-streamer:
-mjpg-streamer: Homepage: https://github.com/jacksonliam/mjpg-streamer
-mjpg-streamer:
-mjpg-streamer:
-mjpg-streamer:
diff --git a/system/mksh/README b/system/mksh/README
index 7907a1cfd9..ee62015587 100644
--- a/system/mksh/README
+++ b/system/mksh/README
@@ -1,10 +1,12 @@
 This is mksh, the "MirBSD Korn Shell" (or "MidnightBSD Korn Shell").
 It is a successor to the Public Domain Korn Shell (pdksh)
 
-Pass STATIC=yes to the script to create a static build.
+Pass STATIC=yes to the script to build a static /bin/mksh.
 
-Pass DIET=yes to the script in order to use dietlibc (this
-requires the optional dependency dietlibc)
+Pass DIET=yes to the script to use dietlibc instead of glibc. This
+requires the optional dependency dietlibc. DIET=yes builds are always
+static; no need for STATIC=yes. Cannot be combined with MUSL=yes.
 
-Pass MUSL=yes to the script in order to use musl (this
-requires the optional dependency musl)
+Pass MUSL=yes to the script to use musl instead of glibc. This
+requires the optional dependency musl. Can be combined with
+STATIC=yes. Cannot be combined with DIET=yes.
diff --git a/system/mksh/doinst.sh b/system/mksh/doinst.sh
index ebbd502e4b..b5e1deca03 100644
--- a/system/mksh/doinst.sh
+++ b/system/mksh/doinst.sh
@@ -1,15 +1,15 @@
-if ! grep -q '/bin/mksh' etc/shells ; then
+if ! grep -q '/bin/mksh' etc/shells; then
  echo "/bin/mksh" >> etc/shells
 fi
+
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
     rm $NEW
   fi
-  # Otherwise, we leave the .new copy for the admin to consider...
 }
+
 config etc/skel/.mkshrc.new
diff --git a/system/mksh/mksh.SlackBuild b/system/mksh/mksh.SlackBuild
index 23d3874da8..ae3909e33e 100644
--- a/system/mksh/mksh.SlackBuild
+++ b/system/mksh/mksh.SlackBuild
@@ -1,34 +1,30 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mksh
 
-# Copyright (c) 2011-2020  Markus Reichelt, Aachen, DE
-# All rights reserved.
-#
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
-#
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-#   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-#   IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-#   SUCH DAMAGE.
-#
-# Markus Reichelt, slackbuilds@mareichelt.de, 0xCCEEF115
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Original author: Markus Reichelt, Aachen, DE
+# Now maintained by B. Watson <urchlay@slackware.uk>
+
+# 20230706 bkw:
+# - only run test.sh if both stdin and stdout are TTYs.
+
+# 20230102 bkw: BUILD=2
+# - take over maintenance.
+# - relicense as WTFPL.
+# - install FAQ.htm, not mksh.faq.
+# - make the test suite optional (but default to enabled).
+# - simplify the build script.
+# - make the slack-desc show the build options.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mksh
-VERSION=${VERSION:-R59b}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-R59c}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +34,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,62 +59,89 @@ fi
 
 set -e
 
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM
-tar xf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM
-
 CC="gcc"
 SLKCFLAGS="${SLKCFLAGS} -Wall"
 
-if [ "$STATIC" = "yes" ]; then
-  LDFLAGS="${LDFLAGS} -static"
-  CPPFLAGS="${CPPFLAGS} -DMKSH_NOPWNAM"
+# 20230102 bkw: fail if user passes both DIET=yes and MUSL=yes.
+if [ "$DIET" = "yes" -a "$MUSL" = "yes" ]; then
+  echo "$( basename $0 ): cannot combine DIET=yes with MUSL=yes." 1>&2
+  exit 1
 fi
 
 if [ "$DIET" = "yes" ]; then
+  # no need to log out & back in after installing dietlibc.
+  source /etc/profile.d/dietlibc.sh
   CC="diet -Os gcc"
-fi
-
-if [ "$MUSL" = "yes" ]; then
+  # diet builds are always static
+  STATIC=yes
+  BUILDOPTS+="DIET=yes "
+elif [ "$MUSL" = "yes" ]; then
   CC="musl-gcc"
+  BUILDOPTS+="MUSL=yes "
 fi
 
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+if [ "$STATIC" = "yes" ]; then
+  LDFLAGS="${LDFLAGS} -static"
+  CPPFLAGS="${CPPFLAGS} -DMKSH_NOPWNAM"
+  BUILDOPTS+="STATIC=yes "
+fi
 
-mkdir build
-cd build
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
+cd $PRGNAM
 
-LDFLAGS=$LDFLAGS \
-CPPFLAGS=$CPPFLAGS \
-CFLAGS=$SLKCFLAGS \
-CC=$CC \
-  sh ../Build.sh -r
-./test.sh
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20230706 bkw: only run test.sh if stdin and stdout are TTYs, to avoid
+# the test script hanging forever.
+T=no
+[ -t 0 -a -t 1 ] && T=yes
+TESTS=${TESTS:-$T}
+echo "=== run tests? $TESTS"
+
+LDFLAGS="$LDFLAGS" \
+CPPFLAGS="$CPPFLAGS" \
+CFLAGS="$SLKCFLAGS" \
+CC="$CC" \
+  sh Build.sh -r
+
+# make sure tests pass whether there is a controlling tty or not. There are
+# some changes related to this in CVS, so this can probably be removed with the
+# next release.
+# thanks alpine maintainers.
+# 20230102 bkw: make tests optional with TESTS=no. This is a maintainer-mode
+# option (saves me time if I'm repeatedly editing/running the script).
+if [ "$TESTS" = "yes" ]; then
+  sed -i -e '/^name: selftest-tty-absent$/,/^---$/d' check.t
+  ./test.sh -C regress:no-ctty
+fi
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/man/man1 $PKG/install
+# 20230102 bkw: turns mksh.faq into proper HTML (FAQ.htm).
+sh FAQ2HTML.sh
 
-ginstall -D -m 755 mksh $PKG/bin/mksh
-ginstall -D -m 644 ../mksh.1 $PKG/usr/man/man1/
-ginstall -D -m 644 ../dot.mkshrc $PKG/etc/skel/.mkshrc.new
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC $PKG/{bin,usr/man/man1,etc/skel,install}
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+install -m 755 -s mksh       $PKG/bin
+install -m 644    dot.mkshrc $PKG/etc/skel/.mkshrc.new
+install -m 644    dot.mkshrc $PKGDOC
+install -m 644    FAQ.htm    $PKGDOC
 
-cat ../dot.mkshrc > $PKG/usr/doc/$PRGNAM-$VERSION/dot.mkshrc
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+for i in mksh lksh; do
+  gzip -9c < $i.1 > $PKG/usr/man/man1/$i.1.gz
+done
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 cat $CWD/slack-desc > $PKG/install/slack-desc
+[ -n "$BUILDOPTS" ] && \
+  sed -i "15s,\$, Build options: $BUILDOPTS," $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mksh/mksh.info b/system/mksh/mksh.info
index 49c3168021..6fb39e1456 100644
--- a/system/mksh/mksh.info
+++ b/system/mksh/mksh.info
@@ -1,10 +1,10 @@
 PRGNAM="mksh"
-VERSION="R59b"
+VERSION="R59c"
 HOMEPAGE="http://mirbsd.de/mksh"
-DOWNLOAD="http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R59b.tgz"
-MD5SUM="dce6abffc2036288540b9ba11dfb2ec8"
+DOWNLOAD="http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R59c.tgz"
+MD5SUM="99f8ac3c1d8a30b913d509f1969a4aaa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Markus Reichelt"
-EMAIL="slackbuilds@mareichelt.de"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/mkslack/README b/system/mkslack/README
deleted file mode 100644
index 02924bf5f3..0000000000
--- a/system/mkslack/README
+++ /dev/null
@@ -1,12 +0,0 @@
-NAME
-       mkslack - a SlackBuild generator
-
-SYNOPSIS
-       mkslack [options] archive
-
-DESCRIPTION
-       mkslack generates SlackBuild scripts and supporting
-       files using the standard SBo templates found at
-       https://slackbuilds.org/templates/
-
-       See mkslack(1) for comprehensive option descriptions.
diff --git a/system/mkslack/doinst.sh b/system/mkslack/doinst.sh
deleted file mode 100644
index 16b5983a83..0000000000
--- a/system/mkslack/doinst.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-config() {
-  NEW="$1"
-  OLD="`dirname $NEW`/`basename $NEW .new`"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/mkslack/mkslack.conf.new
-
diff --git a/system/mkslack/mkslack.SlackBuild b/system/mkslack/mkslack.SlackBuild
deleted file mode 100644
index 7ca562007c..0000000000
--- a/system/mkslack/mkslack.SlackBuild
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for mkslack
-
-# Copyright 2010-20 Dave Woodfall <dave@slackbuilds.org>,
-#                   slakmagik <slakmagik@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=mkslack
-VERSION=${VERSION:-5.3.5}
-ARCH=noarch
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-README=$PKG/usr/doc/$PRGNAM-$VERSION/README
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $OUTPUT $PKG/usr/share/mkslack/{templates,tools}
-
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-sed -i -e "s/@VERSION@/$VERSION/g" mkslack.1
-gzip mkslack.1
-install -m 644 -D mkslack.1.gz $PKG/usr/man/man1/mkslack.1.gz
-install -m 755 -D mkslack $PKG/usr/bin/mkslack
-install -m 644 -D mkslack.conf.new $PKG/etc/mkslack/mkslack.conf.new
-install -m 644 templates/* $PKG/usr/share/mkslack/templates
-install -m 644 tools/* $PKG/usr/share/mkslack/tools
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a original-templates $PKG/usr/doc/$PRGNAM-$VERSION
-
-# generate the README from some introductory text and a dump of the manual
-cat << EOF > $README
-mkslack - a SlackBuild generator script
-
-Copyright 2010-2020 Dave Woodfall and slakmagik.
-mkslack is licensed under a "one-clause BSD/Slackware" license.
-See the script for the full text.
-
-Homepage: http://tty1.uk/slackbuilds/noversion/mkslack
-EOF
-man ./mkslack.1.gz | col -b | expand | fmt -72 | cat -s | sed "
-    1d
-    s/\([^[:space:]]\)[[:space:]][[:space:]]*/\1 /g
-    /^$/N;/MKSLACK(1)$/D
-    " >> $README
-
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/mkslack/mkslack.info b/system/mkslack/mkslack.info
deleted file mode 100644
index 58059ed4dc..0000000000
--- a/system/mkslack/mkslack.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="mkslack"
-VERSION="5.3.5"
-HOMEPAGE="http://tty1.uk/slackbuilds/mkslack"
-DOWNLOAD="http://git.tty1.uk/cgit.cgi/mkslack/snapshot/mkslack-5.3.5.tar.gz"
-MD5SUM="d7debd4ffae89f31a407f0e80e73468b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@tty1.uk"
diff --git a/system/mkslack/slack-desc b/system/mkslack/slack-desc
deleted file mode 100644
index 6d4735561d..0000000000
--- a/system/mkslack/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-mkslack: mkslack (a SlackBuild generation system)
-mkslack:
-mkslack: mkslack generates SlackBuild scripts and supporting files using the
-mkslack: standard SBo templates found at https://slackbuilds.org/templates/
-mkslack:
-mkslack: See mkslack(1) for comprehensive option descriptions.
-mkslack:
-mkslack: http://tty1.uk/slackbuilds/mkslack
-mkslack:
-mkslack:
-mkslack:
diff --git a/system/mktorrent/README b/system/mktorrent/README
index de4a055625..d1aeb8fc58 100644
--- a/system/mktorrent/README
+++ b/system/mktorrent/README
@@ -1,2 +1,4 @@
-mktorrent is a console .torrent file creator. 
-It supports Multi Trackers (tier groups).
+mktorrent is a command line utility to create BitTorrent metainfo
+files used by trackers and torrent clients. It can create metainfo
+files  for single files or complete directories in a fast way. It
+supports multiple trackers.
diff --git a/system/mktorrent/mktorrent.SlackBuild b/system/mktorrent/mktorrent.SlackBuild
index eae38b74a9..7cba03c6e0 100644
--- a/system/mktorrent/mktorrent.SlackBuild
+++ b/system/mktorrent/mktorrent.SlackBuild
@@ -1,12 +1,36 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mktorrent
+
 # Written by Grigorios Bouzakis (grbzks@xsmail.com)
+# Copyright 2022, Alexander Verbovetsky, Moscow, Russia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mktorrent
-VERSION=${VERSION:-1.1}
+VERSION=${VERSION:-1.1_de7d011}
+COMMIT=de7d011b35458de1472665f50b96c9cf6c303f39
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -16,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -24,12 +52,19 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
+  OPT="USE_LARGE_FILES=1"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
+  OPT="USE_LARGE_FILES=1"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+  OPT=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+  OPT=""
 fi
 
 set -e
@@ -37,9 +72,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$COMMIT
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
+cd $PRGNAM-$COMMIT
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -47,20 +82,25 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-make CFLAGS+="-w $SLKCFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFS64"
-mkdir -p $PKG/usr/bin
-cat mktorrent > $PKG/usr/bin/mktorrent
-chmod 0755 $PKG/usr/bin/mktorrent
+CFLAGS="$SLKCFLAGS" \
+make USE_PTHREADS=1 USE_OPENSSL=1 USE_LONG_OPTIONS=1 $OPT
+make install USE_PTHREADS=1 USE_OPENSSL=1 USE_LONG_OPTIONS=1 $OPT \
+    PREFIX=/usr DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+mkdir -p $PKG/usr/man/man1
+gzip -9 -c $CWD/mktorrent.1 > $PKG/usr/man/man1/mktorrent.1.gz
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mktorrent/mktorrent.info b/system/mktorrent/mktorrent.info
index 3d86dbecf1..7aafecb277 100644
--- a/system/mktorrent/mktorrent.info
+++ b/system/mktorrent/mktorrent.info
@@ -1,10 +1,12 @@
 PRGNAM="mktorrent"
-VERSION="1.1"
-HOMEPAGE="https://github.com/Rudde/mktorrent/"
-DOWNLOAD="https://github.com/Rudde/mktorrent/archive/v1.1/mktorrent-1.1.tar.gz"
-MD5SUM="0f583dc6d88c3bc7da736c3f0a8c449e"
+VERSION="1.1_de7d011"
+HOMEPAGE="https://github.com/pobrn/mktorrent"
+DOWNLOAD="https://github.com/pobrn/mktorrent/archive/de7d011/mktorrent-de7d011b35458de1472665f50b96c9cf6c303f39.tar.gz \
+          https://salsa.debian.org/debian/mktorrent/-/raw/debian/latest/debian/mktorrent.1"
+MD5SUM="f01f104a052f2e0f257ebc01434caf4f \
+        f99f7416ea847d5f6a01134fe5efa3f2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Markus Reichelt"
-EMAIL="slackbuilds@mareichelt.de"
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/system/mktorrent/slack-desc b/system/mktorrent/slack-desc
index b49b8d3614..dc98c0e23b 100644
--- a/system/mktorrent/slack-desc
+++ b/system/mktorrent/slack-desc
@@ -8,12 +8,12 @@
          |-----handy-ruler------------------------------------------------------|
 mktorrent: mktorrent (Console .torrent file creator)
 mktorrent:
-mktorrent: Console .torrent file creator. It support Multi Trackers.
-mktorrent:
-mktorrent: Homepage: https://github.com/Rudde/mktorrent
-mktorrent:
-mktorrent:
+mktorrent: mktorrent is a command line utility to create BitTorrent metainfo
+mktorrent: files used by trackers and torrent clients. It can create metainfo
+mktorrent: files  for single files or complete directories in a fast way. It
+mktorrent: supports multiple trackers.
 mktorrent:
 mktorrent:
+mktorrent: Homepage: https://github.com/pobrn/mktorrent
 mktorrent:
 mktorrent:
diff --git a/system/mlocate/README b/system/mlocate/README
deleted file mode 100644
index f2029ce76a..0000000000
--- a/system/mlocate/README
+++ /dev/null
@@ -1,31 +0,0 @@
-mlocate (locate/updatedb implementation)
-
-mlocate is a locate/updatedb implementation. It keeps a database of all
-existing files and allows you to lookup files by name. The 'm' stands for
-"merging": updatedb reuses the existing database to avoid rereading most
-of the file system, which makes updatedb faster and does not trash the
-system caches as much as traditional locate implementations.
-
-This is the same "locate" that's in Slackware-current (and eventually 15.0).
-
-This conflicts with Slackware 14.2's slocate package! Before installing
-this, add slocate to /etc/slackpkg/blacklist and then:
-
-  # removepkg slocate
-
-It's also recommended to:
-
-  # rm -rf /var/lib/slocate /etc/updatedb.conf
-
-The locate database will be created daily, as a cron job. If you don't
-want to wait, you can create it manually:
-
-  # /etc/cron.daily/mlocate
-
-If you want to revert to Slackware's slocate, remove slocate from
-/etc/slackpkg/blacklist, then:
-
-  # removepkg mlocate
-  # rm -rf /var/lib/mlocate /etc/updatedb.conf
-  # slackpkg update
-  # slackpkg install slocate
diff --git a/system/mlocate/doinst.sh b/system/mlocate/doinst.sh
deleted file mode 100644
index 8afb2a4fff..0000000000
--- a/system/mlocate/doinst.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# doinst.sh copied from Pat's, got rid of the stuff that creates the
-# slocate group.
-
-config() {
-  NEW="$1"
-  OLD="`dirname $NEW`/`basename $NEW .new`"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-config etc/updatedb.conf.new
-
-if [ ! -r var/lib/mlocate/mlocate.db ]; then
-  touch var/lib/mlocate/mlocate.db
-  chown root:slocate var/lib/mlocate/mlocate.db
-  chmod 640 var/lib/mlocate/mlocate.db
-fi
-
diff --git a/system/mlocate/mlocate-run-updatedb b/system/mlocate/mlocate-run-updatedb
deleted file mode 100644
index 7d3f2ac526..0000000000
--- a/system/mlocate/mlocate-run-updatedb
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-nodevs=$(< /proc/filesystems awk '$1 == "nodev" && $2 != "rootfs" && $2 != "zfs" { print $2 }')
-/usr/bin/updatedb -f "$nodevs"
diff --git a/system/mlocate/mlocate.SlackBuild b/system/mlocate/mlocate.SlackBuild
deleted file mode 100644
index 9f213fbb54..0000000000
--- a/system/mlocate/mlocate.SlackBuild
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for mlocate
-
-# Written by B. Watson (yalhcru@gmail.com)
-
-# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-
-# Notes:
-# - This is intended to be 100% compatible with the mlocate in -current.
-# - mlocate and slocate can't read each others' database formats. Bummer.
-# - DOWNLOAD is upstream's site, but the file is identical to the one
-#   from Pat's source/ dir. I used upstream so the file won't disappear if
-#   Pat upgrades or changes his mind.
-# - mlocate on -current uses the slocate group (there's no mlocate group),
-#   so I do the same here.
-# - mlocate's database is about 40% larger than slocate's, on my build box.
-#   Not a real concern unless you're building a tiny embedded system.
-
-PRGNAM=mlocate
-VERSION=${VERSION:-0.26}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var/lib \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make groupname=slocate
-make install-strip DESTDIR=$PKG
-
-gzip $PKG/usr/man/man?/*.?
-
-# This stuff comes straight from Pat's mlocate.SlackBuild:
-mkdir -p $PKG/etc
-cp -a $CWD/updatedb.conf.new $PKG/etc/updatedb.conf.new
-chown root:root $PKG/etc/updatedb.conf.new
-chmod 644 $PKG/etc/updatedb.conf.new
-
-mv $PKG/usr/bin/locate $PKG/usr/bin/mlocate
-( cd $PKG/usr/bin ; ln -sf mlocate locate )
-
-( cd $PKG/usr/man/man1
-  ln -sf locate.1 mlocate.1
-)
-
-mkdir -p $PKG/usr/libexec
-cp -a $CWD/mlocate-run-updatedb $PKG/usr/libexec/mlocate-run-updatedb
-chown root:root $PKG/usr/libexec/mlocate-run-updatedb
-chmod 755 $PKG/usr/libexec/mlocate-run-updatedb
-
-mkdir -p $PKG/etc/cron.daily
-cp -a $CWD/mlocate.cron $PKG/etc/cron.daily/mlocate
-chown root:root $PKG/etc/cron.daily/mlocate
-chmod 755 $PKG/etc/cron.daily/mlocate
-
-chown root:slocate $PKG/usr/bin/mlocate
-chmod 2711 $PKG/usr/bin/mlocate
-mkdir -p $PKG/var/lib/mlocate
-chown root:slocate $PKG/var/lib/mlocate
-chmod 750 $PKG/var/lib/mlocate
-# End of Pat's stuff.
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* ChangeLog NEWS README* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/mlocate/mlocate.cron b/system/mlocate/mlocate.cron
deleted file mode 100644
index 5464abad35..0000000000
--- a/system/mlocate/mlocate.cron
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-ionice -c3 nice -n 19 /usr/libexec/mlocate-run-updatedb
diff --git a/system/mlocate/mlocate.info b/system/mlocate/mlocate.info
deleted file mode 100644
index b9eb39f232..0000000000
--- a/system/mlocate/mlocate.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="mlocate"
-VERSION="0.26"
-HOMEPAGE="https://pagure.io/mlocate/releases"
-DOWNLOAD="https://releases.pagure.org/mlocate/mlocate-0.26.tar.xz"
-MD5SUM="539e6f86bf387358aa2b14d5f880e49a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="%README%"
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/mlocate/slack-desc b/system/mlocate/slack-desc
deleted file mode 100644
index e28d270792..0000000000
--- a/system/mlocate/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-mlocate: mlocate (locate/updatedb implementation)
-mlocate:
-mlocate: mlocate is a locate/updatedb implementation. It keeps a database
-mlocate: of all existing files and allows you to lookup files by name. The
-mlocate: 'm' stands for "merging": updatedb reuses the existing database
-mlocate: to avoid rereading most of the file system, which makes updatedb
-mlocate: faster and does not trash the system caches as much as traditional
-mlocate: locate implementations.
-mlocate:
-mlocate: This conflicts with Slackware 14.2's slocate package. See README
-mlocate: for details.
diff --git a/system/mlterm/mlterm.SlackBuild b/system/mlterm/mlterm.SlackBuild
index 04efd20c2b..48582e1f03 100644
--- a/system/mlterm/mlterm.SlackBuild
+++ b/system/mlterm/mlterm.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mlterm
 
-# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2023  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mlterm
-VERSION=${VERSION:-3.9.1}
+VERSION=${VERSION:-3.9.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -109,9 +119,11 @@ cp -a README ChangeLog LICENCE ABOUT-NLS $PKG/usr/doc/$PRGNAM-$VERSION
 cp -rf doc/en doc/ja $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mlterm/mlterm.info b/system/mlterm/mlterm.info
index d34b3828cb..da33d4fd11 100644
--- a/system/mlterm/mlterm.info
+++ b/system/mlterm/mlterm.info
@@ -1,8 +1,8 @@
 PRGNAM="mlterm"
-VERSION="3.9.1"
+VERSION="3.9.3"
 HOMEPAGE="http://mlterm.sourceforge.net"
-DOWNLOAD="https://sourceforge.net/projects/mlterm/files/01release/mlterm-3.9.1/mlterm-3.9.1.tar.gz"
-MD5SUM="2811050f2f46fd7a73446b61daeb7999"
+DOWNLOAD="https://sourceforge.net/projects/mlterm/files/01release/mlterm-3.9.3/mlterm-3.9.3.tar.gz"
+MD5SUM="6a17f57aa5083135e974bd6459aebea0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/mmv/mmv.SlackBuild b/system/mmv/mmv.SlackBuild
index 7ea0d50b3b..b2ee4e5618 100644
--- a/system/mmv/mmv.SlackBuild
+++ b/system/mmv/mmv.SlackBuild
@@ -1,22 +1,33 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mmv
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# This is ancient software (1.01b was released in 1990), but still
-# useful. We're treating Debian as upstream here, our version number
-# matches their patchlevel (with _ intead of -).
+# 20240314 bkw: update for v2.6.
+# 20230822 bkw: update for v2.5.1.
+# 20230711 bkw: update for v2.4.
+# 20221228 bkw: update for v2.3.
+
+# This is ancient software (1.01b was released in 1990), but recently
+# someone started maintaining it on github (2.x series), which is
+# excellent! It's now a lot easier to build, and some bugs have been
+# fixed.
+
+# Note to self: do not use the github /archive/ URLs; they require
+# a bunch of cruft and the ./bootstrip script expects to clone git
+# repos. Do use the /releases/download/ URLs; these Just Work with no
+# extra deps.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mmv
-VERSION=${VERSION:-1.01b_19}
+VERSION=${VERSION:-2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
-SRCVER="$( echo $VERSION | cut -d_ -f1 )"
-DEBVER="$( echo $VERSION | cut -d_ -f2 )"
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -26,7 +37,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -50,44 +65,45 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVER.orig
-tar xvf $CWD/${PRGNAM}_$SRCVER.orig.tar.gz
-cd $PRGNAM-$SRCVER.orig
-tar xvf $CWD/${PRGNAM}_$SRCVER-$DEBVER.debian.tar.xz
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-# apply all Debian's patches:
-for i in $( cat debian/patches/series ); do
-  patch -p1 < debian/patches/$i
-done
-
-# one patch of our own:
-patch -p1 < $CWD/compilefix.diff
-
-# the default LDFLAGS cause the build to fail, override with "nothing".
-sed -i "s,-O2,$SLKCFLAGS -Wall," Makefile
-make LDFLAGS=
-
-# easier to do this manually (only 2 files):
-mkdir -p $PKG/usr/bin $PKG/usr/man/man1
-install -s -m0755 $PRGNAM $PKG/usr/bin
-gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man?/*.*
 
 # multi-named executable, uses its name to decide what action to take.
-LINKS="mcp mad mln"
+# 'make install' creates the symlinks to the binary but not the man page.
+# in 2.3, the "mad" symlink is gone. doubt anyone misses it.
+# 20240314 bkw: in 2.6, "mad" is back (someone *did* miss it).
+LINKS="mcp mln mad"
 for i in $LINKS; do
-  ln -s $PRGNAM $PKG/usr/bin/$i
   ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$i.1.gz
 done
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ANNOUNCE READ.ME ARTICLE debian/changelog $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# README.md is already installed in $PKGDOC. NEWS and ChangeLog
+# are both "see git history at <url>", worth keeping one but not both.
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mmv/mmv.info b/system/mmv/mmv.info
index c93d2e5da6..c0a440096a 100644
--- a/system/mmv/mmv.info
+++ b/system/mmv/mmv.info
@@ -1,12 +1,10 @@
 PRGNAM="mmv"
-VERSION="1.01b_19"
-HOMEPAGE="https://packages.debian.org/sid/mmv"
-DOWNLOAD="http://deb.debian.org/debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz \
-          http://deb.debian.org/debian/pool/main/m/mmv/mmv_1.01b-19.debian.tar.xz"
-MD5SUM="1b2135ab2f17bdfa9e08debbb3c46ad8 \
-        5952faa99a610afdbba73d20d68c6d0f"
+VERSION="2.6"
+HOMEPAGE="https://github.com/rrthomas/mmv/"
+DOWNLOAD="https://github.com/rrthomas/mmv/releases/download/v2.6/mmv-2.6.tar.gz"
+MD5SUM="052f216050024d648a1d69e21f5d9a60"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/modules/README b/system/modules/README
index 03fca01a81..a740d43f6d 100644
--- a/system/modules/README
+++ b/system/modules/README
@@ -4,13 +4,13 @@ of a user's environment via modulefiles.
 Each modulefile contains the information needed to configure the shell
 for an application.
 
-Once the Modules package is initialized, the environment can be
-modified on a per-module basis using the module command which interprets
-modulefiles. Typically modulefiles instruct the module command to alter or
-set shell environment variables such as PATH, MANPATH, etc. Modulefiles
-may be shared by many users on a system and users may have their own
-collection to supplement or replace the shared modulefiles.
+Once the Modules package is initialized, the environment can be modified
+on a per-module basis using the module command which interprets
+modulefiles. Typically modulefiles instruct the module command to alter
+or set shell environment variables such as PATH, MANPATH, etc.
+Modulefiles may be shared by many users on a system and users may have
+their own collection to supplement or replace the shared modulefiles.
 
-Modules are useful in managing different versions of applications. Modules
-can also be bundled into metamodules that will load an entire suite of
-different applications.
+Modules are useful in managing different versions of applications.
+Modules can also be bundled into metamodules that will load an entire
+suite of different applications.
diff --git a/system/modules/modules.SlackBuild b/system/modules/modules.SlackBuild
index d87579ff0e..f4851810aa 100644
--- a/system/modules/modules.SlackBuild
+++ b/system/modules/modules.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for Modules
 #
-# Copyright 2015-2019 Emmanuel N. Millan, Mendoza, Argentina.
+# Copyright 2015-2021 Emmanuel N. Millan, Mendoza, Argentina.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,28 +22,35 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=modules
-VERSION=${VERSION:-4.4.0}
+VERSION=${VERSION:-4.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-DOCS="ChangeLog INSTALL.txt COPYING.GPLv2 NEWS.txt README"
+DOCS="CONTRIBUTING.rst ChangeLog INSTALL.rst COPYING.GPLv2 MIGRATING.rst NEWS.rst README.md"
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -102,4 +109,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/modules/modules.info b/system/modules/modules.info
index ca2fcade89..8aaa2c1982 100644
--- a/system/modules/modules.info
+++ b/system/modules/modules.info
@@ -1,8 +1,8 @@
 PRGNAM="modules"
-VERSION="4.4.0"
-HOMEPAGE="https://modules.sourceforge.net/"
-DOWNLOAD="https://downloads.sourceforge.net/project/modules/Modules/modules-4.4.0/modules-4.4.0.tar.bz2"
-MD5SUM="1333e7b5fc2a9a7871c39801f2688099"
+VERSION="4.7.0"
+HOMEPAGE="http://modules.sourceforge.net/"
+DOWNLOAD="https://downloads.sourceforge.net/project/modules/Modules/modules-4.7.0/modules-4.7.0.tar.bz2"
+MD5SUM="d891012c6014de939761b62bbae29155"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/mongo-tools/README b/system/mongo-tools/README
index 30fd7c550c..1c25d3f556 100644
--- a/system/mongo-tools/README
+++ b/system/mongo-tools/README
@@ -1,5 +1,7 @@
 Mongo-Tools is a set of tools for MongoDB.
 
 Includes: bsondump, mongoimport, mongoexport, mongodump,
-  mongorestore, mongostat, mongofiles, mongooplog,
-  and mongotop
+  mongorestore, mongostat, mongofiles, and mongotop
+
+NOTE: this script requires Internet connection to download
+fsnotify sub modules
diff --git a/system/mongo-tools/mongo-tools.SlackBuild b/system/mongo-tools/mongo-tools.SlackBuild
index ae53d83868..9187fad07c 100644
--- a/system/mongo-tools/mongo-tools.SlackBuild
+++ b/system/mongo-tools/mongo-tools.SlackBuild
@@ -1,8 +1,7 @@
-#!/bin/sh
-
+#!/bin/bash
 # Slackware build script for mongo-tools
-
 # Copyright 2015 Miguel De Anda <miguel@thedeanda.com>
+# Copyright 2023-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +21,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mongo-tools
-VERSION=${VERSION:-3.4.9}
+VERSION=${VERSION:-100.9.4}
+COMMITVER="ce6af0fefca324ad5d9cb689d335130f48c99699"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-ARCHIVE=r${VERSION}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,15 +61,12 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$ARCHIVE.tar.gz || tar xvf $CWD/$PRGNAM-$ARCHIVE.tar.gz
-mv $PRGNAM-r$VERSION $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$COMMITVER
+unzip $CWD/$PRGNAM-$COMMITVER.zip
+cd $PRGNAM-$COMMITVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,26 +74,30 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-TARGET_PATH=$PKG/usr/bin
-mkdir -p $TARGET_PATH
-. ./set_gopath.sh
+#export GO111MODULE="off"
+export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+go mod download github.com/fsnotify/fsnotify
+go run build.go -ldflags="$SLKCFLAGS" build
 
 # next block taken from mongo-tools build script
-for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do
+for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop; do
 	echo "Building ${i}..."
 	# if you have issues, remove/add -tags "ssl sasl"
-	go build -o "$TARGET_PATH/$i" "$i/main/$i.go"
+	go build -o "bin/$i" "$i/main/$i.go"
 done
 
+mkdir -p $PKG/usr/bin/
+install bin/* $PKG/usr/bin
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.md README.md THIRD-PARTY-NOTICES CONTRIBUTING.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.md THIRD-PARTY-NOTICES $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mongo-tools/mongo-tools.info b/system/mongo-tools/mongo-tools.info
index 524f69dccc..c20fd18263 100644
--- a/system/mongo-tools/mongo-tools.info
+++ b/system/mongo-tools/mongo-tools.info
@@ -1,10 +1,10 @@
 PRGNAM="mongo-tools"
-VERSION="3.4.9"
+VERSION="100.9.4"
 HOMEPAGE="https://github.com/mongodb/mongo-tools"
-DOWNLOAD="https://github.com/mongodb/mongo-tools/archive/r3.4.9.tar.gz"
-MD5SUM="e464ade045c3af18b83b5a558044edd8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/mongodb/mongo-tools/archive/ce6af0fefca324ad5d9cb689d335130f48c99699/mongo-tools-ce6af0fefca324ad5d9cb689d335130f48c99699.zip"
+MD5SUM_x86_64="2800e943a85d9d0bddb8a55ae90f3c42"
 REQUIRES="google-go-lang"
-MAINTAINER="Miguel De Anda"
-EMAIL="miguel@thedeanda.com"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/system/mongodb/README b/system/mongodb/README
index bf5583fcc2..f2e41d4aff 100644
--- a/system/mongodb/README
+++ b/system/mongodb/README
@@ -7,9 +7,15 @@ the provided init script:
 # groupadd -g 285 mongo
 # useradd -u 285 -d /var/lib/mongodb -s /bin/false -g mongo mongo
 
-
 You'll also need to add the following to /etc/rc.d/rc.local
 
 if [ -x /etc/rc.d/rc.mongodb ]; then
     /etc/rc.d/rc.mongodb start
 fi
+
+NOTE: mongodb 5.0 requires use of the AVX instruction set: check if
+your cpu supports it with
+
+  grep avx /proc/cpuinfo | uniq
+
+(no output means it doesn't)
diff --git a/system/mongodb/doinst.sh b/system/mongodb/doinst.sh
index 43120b22ae..8721b3d5ee 100644
--- a/system/mongodb/doinst.sh
+++ b/system/mongodb/doinst.sh
@@ -23,3 +23,6 @@ preserve_perms() {
 }
 
 preserve_perms etc/rc.d/rc.mongodb.new
+config etc/mongodb.conf.new
+config etc/mongos.conf.new
+config etc/logrotate.d/mongodb.new
diff --git a/system/mongodb/files/mongodb.conf b/system/mongodb/files/mongodb.conf
new file mode 100644
index 0000000000..83b4cc0589
--- /dev/null
+++ b/system/mongodb/files/mongodb.conf
@@ -0,0 +1,34 @@
+# !! IMPORTANT !!
+#
+# This file uses the YAML format as described in the documentation:
+#   http://docs.mongodb.org/manual/reference/configuration-options/
+
+storage:
+    dbPath: "/var/lib/mongodb"
+    #engine: wiredTiger
+
+systemLog:
+    destination: file
+    path: "/var/log/mongodb/mongodb.log"
+    quiet: true
+    logAppend: true
+
+net:
+    port: 27017
+    bindIp: 127.0.0.1
+    #ssl:
+    #    mode: disabled
+
+#security:
+    #keyFile:
+    #clusterAuthMode:
+
+#replication:
+    #replSetName:
+
+# Specifies one of the MongoDB parameters described here:
+#   http://docs.mongodb.org/manual/reference/parameters/
+#
+# You can specify multiple setParameter fields such as:
+#   setParameter: {enableTestCommands: 1}
+#setParameter:
diff --git a/system/mongodb/files/mongodb.logrotate b/system/mongodb/files/mongodb.logrotate
new file mode 100644
index 0000000000..f95a438b5b
--- /dev/null
+++ b/system/mongodb/files/mongodb.logrotate
@@ -0,0 +1,13 @@
+# Default log rotation / compression keeps 1 year of logs.
+/var/log/mongodb/*.log {
+	daily
+	rotate 365
+	dateext
+	copytruncate
+	delaycompress
+	compress
+	notifempty
+	extension gz
+	sharedscripts
+	missingok
+}
diff --git a/system/mongodb/files/mongos.conf b/system/mongodb/files/mongos.conf
new file mode 100644
index 0000000000..fc0068962c
--- /dev/null
+++ b/system/mongodb/files/mongos.conf
@@ -0,0 +1,30 @@
+# !! IMPORTANT !!
+#
+# This file uses the YAML format as described in the documentation:
+#   http://docs.mongodb.org/manual/reference/configuration-options/
+
+systemLog:
+    destination: file
+    path: "/var/log/mongodb/mongos.log"
+    quiet: true
+    logAppend: true
+
+net:
+    port: 27017
+    bindIp: 127.0.0.1
+    ssl:
+        mode: disabled
+
+#security:
+    #keyFile:
+    #clusterAuthMode:
+
+#sharding:
+    #configDB:
+
+# Specifies one of the MongoDB parameters described here:
+#   http://docs.mongodb.org/manual/reference/parameters/
+#
+# You can specify multiple setParameter fields such as:
+#   setParameter: {enableTestCommands: 1}
+#setParameter:
diff --git a/system/mongodb/rc.mongodb b/system/mongodb/files/rc.mongodb
index 47ca19be76..f0b178c3cf 100644
--- a/system/mongodb/rc.mongodb
+++ b/system/mongodb/files/rc.mongodb
@@ -7,7 +7,7 @@
 #
 
 PID=/var/state/mongodb.pid
-LOG=/var/log/mongodb
+LOG=/var/log/mongodb/mongodb.log
 DBPATH=/var/lib/mongodb
 USER=mongo
 GROUP=mongo
@@ -15,17 +15,16 @@ SHELL=${SHELL:-/bin/bash}
 
 mongo_start() {
 	touch $LOG
-	chown $GROUP.$USER $LOG
+	chown $GROUP:$USER $LOG
 	touch $PID
-	chown $GROUP.$USER $PID
+	chown $GROUP:$USER $PID
 
 	su -l $USER -s $SHELL -c "/usr/bin/mongod \
 		--dbpath=$DBPATH \
 		--fork \
 		--pidfilepath=$PID \
 		--logappend \
-		--logpath=$LOG \
-		--nohttpinterface \
+		--logpath=$LOG
 	" && {
 		echo "MongoDB server started successfully."
 	} || {
@@ -41,7 +40,7 @@ mongo_stop() {
 		echo "Failed to stop MongoDB server" > /dev/stderr
 		exit 1
 	}
-	# rm $PID
+	rm -f $PID
 }
 
 mongo_restart() {
diff --git a/system/mongodb/mongodb.SlackBuild b/system/mongodb/mongodb.SlackBuild
index 99d3331f9e..7bcc41e901 100644
--- a/system/mongodb/mongodb.SlackBuild
+++ b/system/mongodb/mongodb.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for MongoDB
 
 # Copyright 2015 Miguel De Anda <miguel@thedeanda.com>
+# Copyright 2023-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,11 +24,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="mongodb"
-VERSION=${VERSION:-3.4.9}
+VERSION=${VERSION:-7.0.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-MAKEJOBS=${MAKEJOBS:-1}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -48,12 +55,18 @@ MONGO_GROUP=${MONGO_GROUP:-285}
 SRC_FILE=$PRGNAM-src-r$VERSION.tar.gz
 SRC_FLDR=$PRGNAM-src-r$VERSION
 
-set -e
+if [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
 
-# Bail if user or group isn't valid on your system
-if ! getent passwd mongo 1>/dev/null 2>/dev/null; then
+set -e
 
-cat << EOF
+bailout() {
+  cat << EOF
 
   You must have a mongo user to run this script
 
@@ -61,53 +74,94 @@ cat << EOF
   # useradd -u $MONGO_USER -d /var/lib/$PRGNAM -s /bin/false -g mongo mongo
 
 EOF
+  exit 1
+}
 
-  exit
-elif ! getent group mongo 1>/dev/null 2>/dev/null; then
-
-cat << EOF
-
-  You must have a mongo group to run this script
-  # groupadd -g $MONGO_GROUP mongo
-
-EOF
-  exit
-fi
+# Bail if user or group isn't valid on your system
+getent passwd mongo &>/dev/null || bailout
+getent group  mongo &>/dev/null || bailout
 
 rm -fr $TMP/$SRC_FLDR $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 tar xvf $CWD/$SRC_FILE
 cd $SRC_FLDR
-chown -R root.root .
+# remove bundled libs
+rm -fR src/third_party/{boost,pcre-*,snappy-*,yaml-cpp,zlib-*}
+# remove compass
+rm -fR src/mongo/installer/compass
+chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# thanks gentoo, also for these patches
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
+
+sed -i "s|GCC 11.3|GCC 11.2|g" SConstruct
+sed -i "s|__GNUC_MINOR__ < 3|__GNUC_MINOR__ < 2|g" SConstruct
+
+scons_opts=(
+  --disable-warnings-as-errors
+  --use-system-boost
+  --use-system-pcre2
+  --use-system-snappy
+  --use-system-yaml
+  --use-system-zlib
+  --use-system-zstd
+  --use-sasl-client
+  --use-system-libbson
+  --use-system-mongo-c
+  --ssl
+)
+
+# Thanks to Lockywolf
+# scons can use multiple jobs. For convenience, read MAKEFLAGS from the environment, if set
+JOBS="$( echo $MAKEFLAGS | sed 's,.*-j *\([0-9][0-9]*\)*.*,\1,' )"
+# or if no MAKEFLAGS, use the number of cores minus 1
+JOBS="${JOBS:-$(( $( nproc ) - 1 ))}"
+# or 1, if we really have one core
+[ "$JOBS" = "0" ] && JOBS=1
+
 if [ "$ARCH" = "x86_64" ]; then
-  scons -j $MAKEJOBS --ssl --disable-warnings-as-errors --prefix=${PKG}/usr core install
+  PREFIX=${PKG}/usr CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" LDFLAGS="-L /lib$LIBDIRSUFFIX -L/usr/lib$LIBDIRSUFFIX" \
+    ./buildscripts/scons.py "${scons_opts[@]}" --force-jobs --jobs="$JOBS" install-core
 else
-  scons -j $MAKEJOBS --ssl --disable-warnings-as-errors --prefix=${PKG}/usr core --wiredtiger=off install
+  PREFIX=${PKG}/usr CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" LDFLAGS="-L /lib$LIBDIRSUFFIX -L/usr/lib$LIBDIRSUFFIX" \
+    ./buildscripts/scons.py "${scons_opts[@]}" --force-jobs --jobs="$JOBS" --wiredtiger=off install-core
 fi
 
+# manual install
+( cd build/install/bin
+  for i in * ; do install -D -m 0755 $i $PKG/usr/bin/$i ; done )
+( cd debian
+  for i in *.1 ; do install -D -m 0644 $i $PKG/usr/man/man1/$i ; done )
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p ${PKG}/usr/doc/${PRGNAM}-${VERSION}
 cp distsrc/* ${PKG}/usr/doc/${PRGNAM}-${VERSION}
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.mongodb > $PKG/etc/rc.d/rc.mongodb.new
+mkdir -p $PKG/etc/{logrotate,rc}.d
+cat $CWD/files/mongodb.conf > $PKG/etc/mongodb.conf.new
+cat $CWD/files/mongos.conf > $PKG/etc/mongos.conf.new
+cat $CWD/files/mongodb.logrotate > $PKG/etc/logrotate.d/mongodb.new
+cat $CWD/files/rc.mongodb > $PKG/etc/rc.d/rc.mongodb.new
+
+mkdir -p $PKG/var/{lib,log}/mongodb
+chmod 750 $PKG/var/{lib,log}/mongodb
+chown mongo:mongo $PKG/var/{lib,log}/mongodb
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-mkdir -p $PKG/var/lib/mongodb
-chown mongo.mongo $PKG/var/lib/mongodb
-
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mongodb/mongodb.info b/system/mongodb/mongodb.info
index 8c57d99cc5..37d4117a32 100644
--- a/system/mongodb/mongodb.info
+++ b/system/mongodb/mongodb.info
@@ -1,10 +1,10 @@
 PRGNAM="mongodb"
-VERSION="3.4.9"
+VERSION="7.0.8"
 HOMEPAGE="https://www.mongodb.org/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://fastdl.mongodb.org/src/mongodb-src-r3.4.9.tar.gz"
-MD5SUM_x86_64="c8c9f521807b1097e04ffa2081e35177"
-REQUIRES=""
-MAINTAINER="Miguel De Anda"
-EMAIL="miguel@thedeanda.com"
+DOWNLOAD_x86_64="https://fastdl.mongodb.org/src/mongodb-src-r7.0.8.tar.gz"
+MD5SUM_x86_64="40608f11bf26fef651bcb4bb172a2c29"
+REQUIRES="cheetah3 python3-psutil snappy snowballstemmer yaml-cpp python3-jsonschema mongo-c-driver pymongo"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/system/mongodb/patches/mongodb-5.0.2-no-compass.patch b/system/mongodb/patches/mongodb-5.0.2-no-compass.patch
new file mode 100644
index 0000000000..7772515772
--- /dev/null
+++ b/system/mongodb/patches/mongodb-5.0.2-no-compass.patch
@@ -0,0 +1,12 @@
+diff --git a/src/mongo/installer/SConscript b/src/mongo/installer/SConscript
+index 5bd89fe9..489e70ac 100644
+--- a/src/mongo/installer/SConscript
++++ b/src/mongo/installer/SConscript
+@@ -7,7 +7,6 @@ env = env.Clone()
+ 
+ env.SConscript(
+     dirs=[
+-        'compass',
+         'msi',
+     ],
+     exports=[
diff --git a/system/mongodb/patches/mongodb-5.0.2-skip-reqs-check.patch b/system/mongodb/patches/mongodb-5.0.2-skip-reqs-check.patch
new file mode 100644
index 0000000000..823d481c20
--- /dev/null
+++ b/system/mongodb/patches/mongodb-5.0.2-skip-reqs-check.patch
@@ -0,0 +1,24 @@
+diff --git a/buildscripts/scons.py b/buildscripts/scons.py
+index 534fca32..c38f64df 100755
+--- a/buildscripts/scons.py
++++ b/buildscripts/scons.py
+@@ -19,13 +19,13 @@ SITE_TOOLS_DIR = os.path.join(MONGODB_ROOT, 'site_scons')
+ sys.path = [SCONS_DIR, SITE_TOOLS_DIR] + sys.path
+ 
+ # pylint: disable=C0413
+-from mongo.pip_requirements import verify_requirements, MissingRequirements
++#from mongo.pip_requirements import verify_requirements, MissingRequirements
+ 
+-try:
+-    verify_requirements('etc/pip/compile-requirements.txt')
+-except MissingRequirements as ex:
+-    print(ex)
+-    sys.exit(1)
++#try:
++#    verify_requirements('etc/pip/compile-requirements.txt')
++#except MissingRequirements as ex:
++#    print(ex)
++#    sys.exit(1)
+ 
+ try:
+     import SCons.Script
diff --git a/system/mongodb/patches/mongodb-7.0.2-sconstruct.patch b/system/mongodb/patches/mongodb-7.0.2-sconstruct.patch
new file mode 100644
index 0000000000..822bd81d0b
--- /dev/null
+++ b/system/mongodb/patches/mongodb-7.0.2-sconstruct.patch
@@ -0,0 +1,159 @@
+diff --git a/SConstruct b/SConstruct
+index 92d557b..80ee9e8 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -23,7 +23,6 @@ from pkg_resources import parse_version
+ 
+ import SCons
+ import SCons.Script
+-from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics
+ from site_scons.mongo import build_profiles
+ 
+ # This must be first, even before EnsureSConsVersion, if
+@@ -1649,13 +1648,6 @@ env.AddMethod(lambda env, name, **kwargs: add_option(name, **kwargs), 'AddOption
+ 
+ # The placement of this is intentional. Here we setup an atexit method to store tooling metrics.
+ # We should only register this function after env, env_vars and the parser have been properly initialized.
+-SConsToolingMetrics.register_metrics(
+-    utc_starttime=datetime.utcnow(),
+-    artifact_dir=env.Dir('$BUILD_DIR').get_abspath(),
+-    env_vars=env_vars,
+-    env=env,
+-    parser=_parser,
+-)
+ 
+ if get_option('build-metrics'):
+     env['BUILD_METRICS_ARTIFACTS_DIR'] = '$BUILD_ROOT/$VARIANT_DIR'
+@@ -3026,7 +3018,6 @@ if env.TargetOSIs('posix'):
+     env.Append(
+         CCFLAGS=[
+             "-fasynchronous-unwind-tables",
+-            "-g2" if not env.TargetOSIs('emscripten') else "-g",
+             "-Wall",
+             "-Wsign-compare",
+             "-Wno-unknown-pragmas",
+@@ -3093,6 +3084,8 @@ if env.TargetOSIs('posix'):
+ 
+     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
+     env.Append(CXXFLAGS=["-Woverloaded-virtual"])
++    env.Append(CXXFLAGS=os.environ['CXXFLAGS'])
++    env.Append(LINKFLAGS=os.environ['LDFLAGS'])
+ 
+     # On OS X, clang doesn't want the pthread flag at link time, or it
+     # issues warnings which make it impossible for us to declare link
+@@ -3143,7 +3136,7 @@ if env.TargetOSIs('posix'):
+         ], )
+ 
+     #make scons colorgcc friendly
+-    for key in ('HOME', 'TERM'):
++    for key in ('HOME', 'TERM', 'PATH'):
+         try:
+             env['ENV'][key] = os.environ[key]
+         except KeyError:
+@@ -3543,33 +3536,6 @@ def doConfigure(myenv):
+         myenv.AddMethod(
+             functools.partial(var_func, var=var, func=CheckFlag), f"Check{var}Supported")
+ 
+-    if myenv.ToolchainIs('gcc', 'clang'):
+-        # This tells clang/gcc to use the gold linker if it is available - we prefer the gold linker
+-        # because it is much faster. Don't use it if the user has already configured another linker
+-        # selection manually.
+-        if any(flag.startswith('-fuse-ld=') for flag in env['LINKFLAGS']):
+-            myenv.FatalError(
+-                f"Use the '--linker' option instead of modifying the LINKFLAGS directly.")
+-
+-        linker_ld = get_option('linker')
+-        if linker_ld == 'auto':
+-            if not env.TargetOSIs('darwin', 'macOS'):
+-                if not myenv.AddToLINKFLAGSIfSupported('-fuse-ld=lld'):
+-                    myenv.FatalError(
+-                        f"The recommended linker 'lld' is not supported with the current compiler configuration, you can try the 'gold' linker with '--linker=gold'."
+-                    )
+-        elif link_model.startswith("dynamic") and linker_ld == 'bfd':
+-            # BFD is not supported due to issues with it causing warnings from some of
+-            # the third party libraries that mongodb is linked with:
+-            # https://jira.mongodb.org/browse/SERVER-49465
+-            myenv.FatalError(f"Linker {linker_ld} is not supported with dynamic link model builds.")
+-        else:
+-            if not myenv.AddToLINKFLAGSIfSupported(f'-fuse-ld={linker_ld}'):
+-                myenv.FatalError(f"Linker {linker_ld} could not be configured.")
+-
+-        if has_option('gcov') and myenv.AddToCCFLAGSIfSupported('-fprofile-update=single'):
+-            myenv.AppendUnique(LINKFLAGS=['-fprofile-update=single'])
+-
+     detectCompiler = Configure(
+         myenv,
+         help=False,
+@@ -4621,43 +4587,6 @@ def doConfigure(myenv):
+     if optBuild == "off" and myenv.ToolchainIs('clang') and env.TargetOSIs('darwin'):
+         myenv.AddToLINKFLAGSIfSupported("-Wl,-no_deduplicate")
+ 
+-    # Apply any link time optimization settings as selected by the 'lto' option.
+-    if has_option('lto'):
+-        if myenv.ToolchainIs('msvc'):
+-            # Note that this is actually more aggressive than LTO, it is whole program
+-            # optimization due to /GL. However, this is historically what we have done for
+-            # windows, so we are keeping it.
+-            #
+-            # /GL implies /LTCG, so no need to say it in CCFLAGS, but we do need /LTCG on the
+-            # link flags.
+-            myenv.Append(CCFLAGS=['/GL'])
+-            myenv.Append(LINKFLAGS=['/LTCG'])
+-            myenv.Append(ARFLAGS=['/LTCG'])
+-        elif myenv.ToolchainIs('gcc', 'clang'):
+-            # For GCC and clang, the flag is -flto, and we need to pass it both on the compile
+-            # and link lines.
+-            if not myenv.AddToCCFLAGSIfSupported('-flto') or \
+-                    not myenv.AddToLINKFLAGSIfSupported('-flto'):
+-                myenv.ConfError("Link time optimization requested, "
+-                                "but selected compiler does not honor -flto")
+-
+-            if myenv.TargetOSIs('darwin'):
+-                myenv.AddToLINKFLAGSIfSupported('-Wl,-object_path_lto,${TARGET}.lto')
+-            else:
+-                # According to intel benchmarks -fno-plt increases perf
+-                # See PM-2215
+-                if linker_ld != "gold":
+-                    myenv.ConfError("lto compilation currently only works with the --linker=gold")
+-                if link_model != "object":
+-                    myenv.ConfError(
+-                        "lto compilation currently only works with the --link-model=object")
+-                if not myenv.AddToCCFLAGSIfSupported('-fno-plt') or \
+-                    not myenv.AddToLINKFLAGSIfSupported('-fno-plt'):
+-                    myenv.ConfError("-fno-plt is not supported by the compiler")
+-
+-        else:
+-            myenv.ConfError("Don't know how to enable --lto on current toolchain")
+-
+     if get_option('runtime-hardening') == "on" and optBuild != "off":
+         # Older glibc doesn't work well with _FORTIFY_SOURCE=2. Selecting 2.11 as the minimum was an
+         # emperical decision, as that is the oldest non-broken glibc we seem to require. It is possible
+@@ -5120,17 +5049,13 @@ def doConfigure(myenv):
+         "BOOST_LOG_NO_SHORTHAND_NAMES",
+         "BOOST_LOG_USE_NATIVE_SYSLOG",
+         "BOOST_LOG_WITHOUT_THREAD_ATTR",
++        "BOOST_LOG_DYN_LINK",
+         "BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS",
+         "BOOST_SYSTEM_NO_DEPRECATED",
+         "BOOST_THREAD_USES_DATETIME",
+         ("BOOST_THREAD_VERSION", "5"),
+     ])
+ 
+-    if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk':
+-        conf.env.AppendUnique(CPPDEFINES=[
+-            "BOOST_LOG_DYN_LINK",
+-        ])
+-
+     if use_system_version_of_library("boost"):
+         if not conf.CheckCXXHeader("boost/filesystem/operations.hpp"):
+             myenv.ConfError("can't find boost headers")
+@@ -5327,6 +5252,9 @@ def doConfigure(myenv):
+ 
+     mongoc_mode = get_option('use-system-mongo-c')
+     conf.env['MONGO_HAVE_LIBMONGOC'] = False
++    conf.env.ParseConfig('pkg-config libbson-1.0 libmongoc-1.0 --cflags')
++    conf.env['LIBDEPS_LIBBSON_SYSLIBDEP'] = 'bson-1.0'
++
+     if mongoc_mode != 'off':
+         if conf.CheckLibWithHeader(
+             ["mongoc-1.0"],
diff --git a/system/monit/README b/system/monit/README
index 5d69ae6cb9..9da317f2f9 100644
--- a/system/monit/README
+++ b/system/monit/README
@@ -1,3 +1,4 @@
-Monit is a utility for managing and monitoring processes, files, directories,
-and devices on a Unix system. Monit conducts automatic maintenance and repair
-and can execute meaningful causal actions in error situations.
+Monit is a utility for managing and monitoring processes, files,
+directories, and devices on a Unix system. Monit conducts automatic
+maintenance and repair and can execute meaningful causal actions in
+error situations.
diff --git a/system/monit/monit.SlackBuild b/system/monit/monit.SlackBuild
index ed66b10940..e6eaf5bcf7 100644
--- a/system/monit/monit.SlackBuild
+++ b/system/monit/monit.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script of monit
 
@@ -22,10 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=monit
 VERSION=${VERSION:-5.25.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -94,8 +104,8 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 cp monitrc $PKG/etc/monitrc.new
 
-mkdir -p $PKG/etc/bash_completion.d
-cp system/bash/monit $PKG/etc/bash_completion.d
+mkdir -p $PKG/usr/share/bash-completion/completions
+cp system/bash/monit $PKG/usr/share/bash-completion/completions/monit
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING CONTRIBUTORS README $PKG/usr/doc/$PRGNAM-$VERSION
@@ -105,4 +115,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -c n -l y -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -c n -l y -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/monitoring-plugins/README b/system/monitoring-plugins/README
index 60c028a08a..cd09a9d22f 100644
--- a/system/monitoring-plugins/README
+++ b/system/monitoring-plugins/README
@@ -1,11 +1,11 @@
 monitoring-plugins (a bundle of more than fifty monitoring plugins)
 
-This bundle contains standard plugins for Icinga, Naemon, Nagios, Shinken,
-Sensu, and other monitoring applications. Each plugin is a stand-alone
-command line tool that provides a specific type of check.
+This bundle contains standard plugins for Icinga, Naemon, Nagios,
+Shinken, Sensu, and other monitoring applications. Each plugin is a
+stand-alone command line tool that provides a specific type of check.
 
-Support for postgresql, libdbi, radius, ldap and mysql check modules can be
-enabled with:
+Support for postgresql, libdbi, radius, ldap and mysql check modules
+can be enabled with:
 
   CHECK_PGSQL=yes \
   CHECK_DBI=yes \
@@ -13,5 +13,6 @@ enabled with:
   CHECK_LDAP=yes \
   CHECK_MYSQL=yes ./monitoring-plugins.SlackBuild
 
-Optional dependencies, postgresql and libdbi, can be found on slackbuilds.org
-website; additionally, fping3 will be autodetected when installed.
+Optional dependencies, postgresql and libdbi, can be found on
+slackbuilds.org website; additionally, fping3 will be autodetected
+when installed.
diff --git a/system/monitoring-plugins/monitoring-plugins.SlackBuild b/system/monitoring-plugins/monitoring-plugins.SlackBuild
index c0307d060a..69361621d8 100644
--- a/system/monitoring-plugins/monitoring-plugins.SlackBuild
+++ b/system/monitoring-plugins/monitoring-plugins.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for monitoring-plugins
 
-# Copyright 2015, 2016, 2017  Mario Preksavec, Zagreb, Croatia
+# Copyright 2015, 2021  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=monitoring-plugins
-VERSION=${VERSION:-2.2}
+VERSION=${VERSION:-2.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -134,4 +144,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/monitoring-plugins/monitoring-plugins.info b/system/monitoring-plugins/monitoring-plugins.info
index 95a4453650..7f11c8eab9 100644
--- a/system/monitoring-plugins/monitoring-plugins.info
+++ b/system/monitoring-plugins/monitoring-plugins.info
@@ -1,8 +1,8 @@
 PRGNAM="monitoring-plugins"
-VERSION="2.2"
+VERSION="2.3.1"
 HOMEPAGE="https://www.monitoring-plugins.org/"
-DOWNLOAD="https://www.monitoring-plugins.org/download/monitoring-plugins-2.2.tar.gz"
-MD5SUM="549e243ba1fb5c5b3be3a86961de40a7"
+DOWNLOAD="https://www.monitoring-plugins.org/download/monitoring-plugins-2.3.1.tar.gz"
+MD5SUM="1bc8d5f1fec4f8ea9746f0d9fafd873a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/monitorix/monitorix.SlackBuild b/system/monitorix/monitorix.SlackBuild
index 878c6edf3c..4700a7a847 100644
--- a/system/monitorix/monitorix.SlackBuild
+++ b/system/monitorix/monitorix.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "monitorix".
 
 # Copyright 2014-2016 Marcel Saegebarth <marc@mos6581.de>
 # All rights reserved.
-# Updated 2019-2020 by Emmanuel N. Millan, Mendoza, Argentina
+# Updated 2019-2021 by Emmanuel N. Millan, Mendoza, Argentina
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -25,10 +25,13 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=monitorix
-VERSION=${VERSION:-3.12.0}
+VERSION=${VERSION:-3.15.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -126,4 +136,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/monitorix/monitorix.info b/system/monitorix/monitorix.info
index 224a2239ff..1135ed3d5a 100644
--- a/system/monitorix/monitorix.info
+++ b/system/monitorix/monitorix.info
@@ -1,8 +1,8 @@
 PRGNAM="monitorix"
-VERSION="3.12.0"
+VERSION="3.15.0"
 HOMEPAGE="https://www.monitorix.org/"
-DOWNLOAD="https://www.monitorix.org/monitorix-3.12.0.tar.gz"
-MD5SUM="f1697a98284ac466b617d5312bd9fbf4"
+DOWNLOAD="https://www.monitorix.org/monitorix-3.15.0.tar.gz"
+MD5SUM="48ff1d8398d7eca13c97270464cd66c7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-lwp-useragent-cached perl-http-server-simple perl-config-general rrdtool"
diff --git a/system/motion/README b/system/motion/README
index 8ac638966a..5a981fc1f7 100644
--- a/system/motion/README
+++ b/system/motion/README
@@ -1,16 +1,17 @@
 Motion is a program that monitors the video signal from one or more
-cameras and is able to detect if a significant part of the picture
-has changed. Or in other words, it can detect motion.
+cameras and is able to detect if a significant part of the picture has
+changed. Or in other words, it can detect motion.
 
 Motion is a command line based tool. It has no graphical user
 interface. Everything is setup via the command line or via a set of
 configuration files.
 
-Once installed, please be sure to read README for any configuration help.
-You will need to rename /etc/motion/motion-dist.conf to
-/etc/motion/motion.conf once you have made the changes you deem necessary.
+Once installed, please be sure to read README for any configuration
+help. You will need to rename /etc/motion/motion-dist.conf to
+/etc/motion/motion.conf once you have made the changes you deem
+necessary.
 
-This build has not been tested with the optional postgresql included, but
-you're welcome to give it a go!
+This build has not been tested with the optional postgresql included,
+but you're welcome to give it a go!
 
 Optional dependencies are libva, ffmpeg, and postgresql.
diff --git a/system/motion/motion.SlackBuild b/system/motion/motion.SlackBuild
index bae4bc7990..09cea9dc89 100644
--- a/system/motion/motion.SlackBuild
+++ b/system/motion/motion.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for motion.
 #
@@ -25,10 +25,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=motion
-VERSION=${VERSION:-4.3.1}
+VERSION=${VERSION:-4.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -75,6 +85,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 autoreconf -fiv
+LIBS="-lwebp" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -109,4 +120,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/motion/motion.info b/system/motion/motion.info
index b077342cc9..db39842d15 100644
--- a/system/motion/motion.info
+++ b/system/motion/motion.info
@@ -1,8 +1,8 @@
 PRGNAM="motion"
-VERSION="4.3.1"
+VERSION="4.6.0"
 HOMEPAGE="https://motion-project.github.io"
-DOWNLOAD="https://github.com/Motion-Project/motion/archive/release-4.3.1/motion-release-4.3.1.tar.gz"
-MD5SUM="2d49f8af48f9deff4ea9204b05cc327c"
+DOWNLOAD="https://github.com/Motion-Project/motion/archive/release-4.6.0/motion-release-4.6.0.tar.gz"
+MD5SUM="311132c00a44686e28674c0449d21aea"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libmicrohttpd"
diff --git a/system/mount-s3/README b/system/mount-s3/README
new file mode 100644
index 0000000000..3a48b400ff
--- /dev/null
+++ b/system/mount-s3/README
@@ -0,0 +1,4 @@
+Mountpoint for Amazon S3 is a simple, high-throughput file client
+for mounting an Amazon S3 bucket as a local file system.
+
+This package repackage the binary
diff --git a/system/mount-s3/mount-s3.SlackBuild b/system/mount-s3/mount-s3.SlackBuild
new file mode 100644
index 0000000000..1b0f4105ad
--- /dev/null
+++ b/system/mount-s3/mount-s3.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Slackware build script for mount-s3
+
+# Copyright Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=mount-s3
+VERSION=${VERSION:-1.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+ARCH=x86_64
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+mkdir -p $PRGNAM
+cd $PRGNAM
+tar xvf $CWD/$PRGNAM-$VERSION-$ARCH.tar.gz
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/bin $PKG/usr/doc/$PRGNAM-$VERSION
+mv bin/$PRGNAM $PKG/usr/bin
+mv NOTICE VERSION LICENSE THIRD_PARTY_LICENSES $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mount-s3/mount-s3.info b/system/mount-s3/mount-s3.info
new file mode 100644
index 0000000000..6aa7552d81
--- /dev/null
+++ b/system/mount-s3/mount-s3.info
@@ -0,0 +1,10 @@
+PRGNAM="mount-s3"
+VERSION="1.0.0"
+HOMEPAGE="https://github.com/awslabs/mountpoint-s3/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://s3.amazonaws.com/mountpoint-s3-release/1.0.0/x86_64/mount-s3-1.0.0-x86_64.tar.gz"
+MD5SUM_x86_64="2eff593b86776ee27ccc408af2532f11"
+REQUIRES="awscli"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/system/mount-s3/slack-desc b/system/mount-s3/slack-desc
new file mode 100644
index 0000000000..0d1b608d83
--- /dev/null
+++ b/system/mount-s3/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+mount-s3: mount-s3 (Amazon S3 bucket)
+mount-s3:
+mount-s3: Mountpoint for Amazon S3 is a simple, high-throughput file client
+mount-s3: for mounting an Amazon S3 bucket as a local file system.
+mount-s3:
+mount-s3:
+mount-s3:
+mount-s3: Project: https://github.com/awslabs/mountpoint-s3/
+mount-s3:
+mount-s3:
+mount-s3:
diff --git a/system/mount-zip/README b/system/mount-zip/README
new file mode 100644
index 0000000000..0977216aca
--- /dev/null
+++ b/system/mount-zip/README
@@ -0,0 +1,8 @@
+mount-zip (FUSE file system for zip archives)
+
+mount-zip mounts a ZIP archive as a read-only FUSE file system, which
+can then be explored and read by any application.
+
+mount-zip aspires to be an excellent ZIP mounter. It starts quickly,
+uses little memory, decodes encrypted files, and provides on-the-go
+decompression and caching for maximum efficiency.
diff --git a/system/mount-zip/mount-zip.SlackBuild b/system/mount-zip/mount-zip.SlackBuild
new file mode 100644
index 0000000000..2c4bd5daf3
--- /dev/null
+++ b/system/mount-zip/mount-zip.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# Slackware build script for mount-zip
+
+# Original author: Charadon
+# Modified and now maintained by B. Watson (urchlay@slackware.uk).
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20240209 bkw:
+# - update for v1.0.12.
+# - relicense as WTFPL with permission from Charadon.
+# - add man page, now that there is one.
+
+# 20230828 bkw: take over maintenance, update for v1.0.9.
+# - actually use SLKCFLAGS.
+# - add CONTRIBUTING.md to the doc dir.
+# - add patch to allow v1.0.9 to build on Slackware 15.0.
+# - trim down README and slack-desc a bit.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=mount-zip
+VERSION=${VERSION:-1.0.12}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+    *) ARCH=$( uname -m ) ;;
+esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}"  ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# 20230829 bkw: Stop mount-zip from requiring a version of libzip
+# greater than 1.8.0. Long explanation:
+
+# mount-zip calls zip_file_is_seekable() to decide whether it should
+# bother to cache the zip file it's working with. This call was added
+# to libzip in its version 1.9.0, and Slackware 15.0 only has 1.8.0.
+
+# It turns out, zip_file_is_seekable() only returns true for zip
+# files that are not compressed (and not encrypted). This means that
+# "stored" zip files are the only ones that don't get cached. This
+# patch causes all zip files to get cached. It won't have much impact
+# because non-compressed zip files are pretty rare anyway.
+
+# This patch should go away when Slackware 15.1 get released.
+
+patch -p1 < $CWD/slackware-15.0-libzip.diff
+
+# 20230829 bkw: actually use SLKCFLAGS.
+sed -i "/^CXXFLAGS/s,-O2,$SLKCFLAGS," Makefile lib/Makefile
+make
+install -s -Dm755 mount-zip $PKG/usr/bin/mount-zip
+
+# 20240209 bkw: upstream now ships a man page.
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+rm -f INSTALL.md
+cp -a LICENSE changelog *.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mount-zip/mount-zip.info b/system/mount-zip/mount-zip.info
new file mode 100644
index 0000000000..37404aa301
--- /dev/null
+++ b/system/mount-zip/mount-zip.info
@@ -0,0 +1,10 @@
+PRGNAM="mount-zip"
+VERSION="1.0.12"
+HOMEPAGE="https://github.com/google/mount-zip"
+DOWNLOAD="https://github.com/google/mount-zip/archive/v1.0.12/mount-zip-1.0.12.tar.gz"
+MD5SUM="f7e2ace30c17737b166c413cee25d49b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/mount-zip/slack-desc b/system/mount-zip/slack-desc
new file mode 100644
index 0000000000..99285a79e6
--- /dev/null
+++ b/system/mount-zip/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+mount-zip: mount-zip (FUSE file system for zip archives)
+mount-zip:
+mount-zip: mount-zip mounts a ZIP archive as a read-only FUSE file system, which
+mount-zip: can then be explored and read by any application.
+mount-zip:
+mount-zip: mount-zip aspires to be an excellent ZIP mounter. It starts quickly,
+mount-zip: uses little memory, decodes encrypted files, and provides on-the-go
+mount-zip: decompression and caching for maximum efficiency.
+mount-zip:
+mount-zip:
+mount-zip:
diff --git a/system/mount-zip/slackware-15.0-libzip.diff b/system/mount-zip/slackware-15.0-libzip.diff
new file mode 100644
index 0000000000..f3cc7c34b7
--- /dev/null
+++ b/system/mount-zip/slackware-15.0-libzip.diff
@@ -0,0 +1,21 @@
+diff -Naur mount-zip-1.0.9/lib/data_node.cc mount-zip-1.0.9.patched/lib/data_node.cc
+--- mount-zip-1.0.9/lib/data_node.cc	2023-08-17 01:41:40.000000000 -0400
++++ mount-zip-1.0.9.patched/lib/data_node.cc	2023-08-29 02:59:18.342998941 -0400
+@@ -269,7 +269,7 @@
+   ZipFile file = Reader::Open(zip, id);
+   assert(file);
+ 
+-  const bool seekable = zip_file_is_seekable(file.get()) > 0;
++  const bool seekable = false;
+   if (seekable) {
+     Log(LOG_DEBUG, "No need to cache ", file_node, ": File is seekable");
+     return false;
+@@ -293,7 +293,7 @@
+   ZipFile file = Reader::Open(zip, id);
+   assert(file);
+ 
+-  const bool seekable = zip_file_is_seekable(file.get()) > 0;
++  const bool seekable = false;
+   Reader::Ptr reader(seekable ? new UnbufferedReader(std::move(file), id, size)
+                               : new BufferedReader(zip, std::move(file), id,
+                                                    size, &cached_reader));
diff --git a/system/mpack/mpack.SlackBuild b/system/mpack/mpack.SlackBuild
index 9bd52bc85f..cc7d94aa3e 100644
--- a/system/mpack/mpack.SlackBuild
+++ b/system/mpack/mpack.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mpack
 
@@ -21,11 +21,20 @@
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#  2021-03-18
+#    - Inc'd BUILD value to 2
+#    - Added comments about patch usage.
+#    - Legacy upstream URL is gone, migrated to gitlab site.
+#
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mpack
 VERSION=${VERSION:-1.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +44,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,7 +85,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 < $CWD/mpack.diff
+# The following patch corrects a number of warnings and build errors in
+# order to compile on a modern (Slackware 14.2+) Linux system.
+patch -p1 < $CWD/mpack.patch
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -97,4 +115,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mpack/mpack.info b/system/mpack/mpack.info
index fd50ec744e..811bb22380 100644
--- a/system/mpack/mpack.info
+++ b/system/mpack/mpack.info
@@ -1,7 +1,7 @@
 PRGNAM="mpack"
 VERSION="1.6"
-HOMEPAGE="http://ftp.andrew.cmu.edu/pub/mpack"
-DOWNLOAD="http://ftp.andrew.cmu.edu/pub/mpack/mpack-1.6.tar.gz"
+HOMEPAGE="https://gitlab.com/osdp/mpack"
+DOWNLOAD="http://distcache.freebsd.org/ports-distfiles/mpack-1.6.tar.gz"
 MD5SUM="a70fa5afa76539a9afb70b9d81568fe8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/mpack/mpack.diff b/system/mpack/mpack.patch
index e00b92f25e..e00b92f25e 100644
--- a/system/mpack/mpack.diff
+++ b/system/mpack/mpack.patch
diff --git a/system/mpich/README b/system/mpich/README
index 12abd1860a..51707b8dbe 100644
--- a/system/mpich/README
+++ b/system/mpich/README
@@ -4,7 +4,11 @@ The goals of MPICH are:
 (1) to provide an MPI implementation that efficiently supports different
   computation and communication platforms including commodity clusters
   (desktop systems, shared-memory systems, multicore architectures),
-  high-speed networks (10 Gigabit Ethernet, InfiniBand, Myrinet, Quadrics)
-  and proprietary high-end computing systems (Blue Gene, Cray) and
+  high-speed networks (10 Gigabit Ethernet, InfiniBand, Myrinet,
+  Quadrics) and proprietary high-end computing systems (Blue Gene,
+  Cray) and
 (2) to enable cutting-edge research in MPI through an easy-to-extend
   modular framework for other derived implementations.
+
+Note: mpich conflicts with openmpi. If you install both on the same
+system, unexpected results may occur.
diff --git a/system/mpich/mpich.SlackBuild b/system/mpich/mpich.SlackBuild
index 3245ac845a..6b43d619a4 100644
--- a/system/mpich/mpich.SlackBuild
+++ b/system/mpich/mpich.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mpich
 
 # Earlier version written by Wainamoinen <wainamoinen@gmail.com>
 #
-# Copyright 2016-2021 Christoph Willing  Brisbane, Australia
+# Copyright 2016-2023 Christoph Willing  Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mpich
-VERSION=${VERSION:-3.4.1}
+VERSION=${VERSION:-4.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -71,6 +78,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Workaround for gfortran-10.x: https://github.com/pmodels/mpich/issues/4300
+FC="gfortran" \
+FFLAGS="-fallow-argument-mismatch" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -103,8 +113,10 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mpich/mpich.info b/system/mpich/mpich.info
index 4d02727e1b..923176d6af 100644
--- a/system/mpich/mpich.info
+++ b/system/mpich/mpich.info
@@ -1,8 +1,8 @@
 PRGNAM="mpich"
-VERSION="3.4.1"
+VERSION="4.1.2"
 HOMEPAGE="https://www.mpich.org/"
-DOWNLOAD="https://www.mpich.org/static/downloads/3.4.1/mpich-3.4.1.tar.gz"
-MD5SUM="10e43fd61fd1a13c89cfbed3eb30b97a"
+DOWNLOAD="https://www.mpich.org/static/downloads/4.1.2/mpich-4.1.2.tar.gz"
+MD5SUM="66185dc9d911ab2b27cb42bec8e8e1a7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/mpollux-digisign-client/README b/system/mpollux-digisign-client/README
new file mode 100644
index 0000000000..7e5304238d
--- /dev/null
+++ b/system/mpollux-digisign-client/README
@@ -0,0 +1,6 @@
+Fujitsu mPollux DigiSign Client Smart Card middleware for ISO7816-15,
+PKCS#15, FINEID-S1 and FINEID-S4 compatible smart cards
+
+This middleware allows programs to access data, such as
+cryptographic keys, on ISO7816-15, PKCS#15, FINEID-S1 and FINEID-S4
+compatible smart cards and similar security tokens.
diff --git a/system/mpollux-digisign-client/doinst.sh b/system/mpollux-digisign-client/doinst.sh
new file mode 100644
index 0000000000..c82fe254cd
--- /dev/null
+++ b/system/mpollux-digisign-client/doinst.sh
@@ -0,0 +1,18 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+config etc/xdg/Fujitsu/CCryptoLib.conf.new
diff --git a/system/mpollux-digisign-client/mpollux-digisign-client.SlackBuild b/system/mpollux-digisign-client/mpollux-digisign-client.SlackBuild
new file mode 100644
index 0000000000..cf29484e64
--- /dev/null
+++ b/system/mpollux-digisign-client/mpollux-digisign-client.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+# Slackware build script for mpollux-digisign-client
+
+# Copyright 2022 pyllyukko
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=mpollux-digisign-client
+DEBNAM=mpollux-digisign-client-for-dvv
+VERSION=${VERSION:-4.2.6b_8414}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ "${ARCH}" = "i586" ]
+then
+  VERSION="4.2.6_8401"
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  LIBDIRSUFFIX=""
+  DEBARCH=i386
+elif [ "$ARCH" = "i686" ]; then
+  LIBDIRSUFFIX=""
+  DEBARCH=i386
+elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+  DEBARCH=amd64
+else
+  LIBDIRSUFFIX=""
+  DEBARCH=i386
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar p $CWD/${DEBNAM}_${VERSION//_/-}_${DEBARCH}.deb data.tar.xz | tar xJv
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -pv "${PKG}/usr/doc"
+mv -v "${PKG}/usr/share/doc/mpollux-digisign-client-for-dvv" "${PKG}/usr/doc/${PRGNAM}-${VERSION}"
+rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/changelog.Debian.gz
+rmdir -v "${PKG}/usr/share/doc" "${PKG}/usr/sbin"
+sed -i 's:^\(\s\+documentFolder\s\+=\s\+\)".\+",\r$:\1"/usr/doc/mpollux-digisign-client*",\r:' "${PKG}/etc/xdg/Fujitsu/CCryptoLib.conf"
+mv -v "${PKG}/etc/xdg/Fujitsu/CCryptoLib.conf" "${PKG}/etc/xdg/Fujitsu/CCryptoLib.conf.new"
+chmod 644 $PKG/usr/share/applications/*.desktop
+chmod 644 $PKG/usr/share/pixmaps/mpollux-digisign-client.*
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mpollux-digisign-client/mpollux-digisign-client.info b/system/mpollux-digisign-client/mpollux-digisign-client.info
new file mode 100644
index 0000000000..95361e9e3e
--- /dev/null
+++ b/system/mpollux-digisign-client/mpollux-digisign-client.info
@@ -0,0 +1,10 @@
+PRGNAM="mpollux-digisign-client"
+VERSION="4.2.6b_8414"
+HOMEPAGE="https://dvv.fi/kortinlukijaohjelmisto"
+DOWNLOAD="https://dvv.fi/documents/16079645/165492525/mpollux-digisign-client-for-dvv_4.2.6-8401_i386.deb"
+MD5SUM="8bca72ee0e387fb630dd627b713179f4"
+DOWNLOAD_x86_64="https://dvv.fi/documents/16079645/169423081/mpollux-digisign-client-for-dvv_4.2.6b-8414_amd64.deb"
+MD5SUM_x86_64="04d138a4eb9693343f94740c926c9a1f"
+REQUIRES=""
+MAINTAINER="pyllyukko"
+EMAIL="pyllyukko@maimed.org"
diff --git a/system/mpollux-digisign-client/slack-desc b/system/mpollux-digisign-client/slack-desc
new file mode 100644
index 0000000000..d774f6f616
--- /dev/null
+++ b/system/mpollux-digisign-client/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                       |-----handy-ruler------------------------------------------------------|
+mpollux-digisign-client: mpollux-digisign-client (smart card middleware)
+mpollux-digisign-client:
+mpollux-digisign-client: Fujitsu mPollux DigiSign Client Smart Card middleware for ISO7816-15,
+mpollux-digisign-client: PKCS#15, FINEID-S1 and FINEID-S4 compatible smart cards
+mpollux-digisign-client:
+mpollux-digisign-client: This middleware allows programs to access data, such as  cryptographic
+mpollux-digisign-client: keys, on ISO7816-15, PKCS#15, FINEID-S1 and FINEID-S4 compatible smart
+mpollux-digisign-client: cards and similar security tokens.
+mpollux-digisign-client:
+mpollux-digisign-client: Homepage: https://dvv.fi/kortinlukijaohjelmisto
+mpollux-digisign-client:
diff --git a/system/mrxvt/mrxvt.SlackBuild b/system/mrxvt/mrxvt.SlackBuild
index 367caa4a3b..ae2cc449d8 100644
--- a/system/mrxvt/mrxvt.SlackBuild
+++ b/system/mrxvt/mrxvt.SlackBuild
@@ -1,14 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mrxvt
 
 # Written by Paul Wisehart wise@lupulin.net
 
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mrxvt
 VERSION=${VERSION:-0.5.4}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -18,7 +20,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -53,10 +59,11 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
+SLKCFLAGS+=" -fcommon"
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -74,13 +81,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-debug
 
 make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+cp -a AUTHORS COPYING ChangeLog NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION/
 rmdir $PKG/usr/share/doc/$PRGNAM
@@ -96,11 +101,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/usr/share/applications
 cat $CWD/mrxvt.desktop > $PKG/usr/share/applications/mrxvt.desktop
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
-
 # Let's not clobber existing config files
 for i in \
   $PKG/etc/mrxvt/default.menu $PKG/etc/mrxvt/submenus.menu \
@@ -113,4 +113,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ms-sys/ms-sys.SlackBuild b/system/ms-sys/ms-sys.SlackBuild
index 154304940b..808695efef 100644
--- a/system/ms-sys/ms-sys.SlackBuild
+++ b/system/ms-sys/ms-sys.SlackBuild
@@ -1,28 +1,38 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ms-sys
 # Written by Cj [cj@abysmal.mx]
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ms-sys
 VERSION=${VERSION:-2.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -68,5 +78,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
 
diff --git a/system/msitools/msitools.SlackBuild b/system/msitools/msitools.SlackBuild
index 9098d66c72..78e37b79a4 100644
--- a/system/msitools/msitools.SlackBuild
+++ b/system/msitools/msitools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "msitools".
 
@@ -24,26 +24,36 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=msitools
 VERSION=${VERSION:-0.94}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -100,8 +110,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING NEWS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/msr-tools/README b/system/msr-tools/README
index 79632612ef..6591a08a19 100644
--- a/system/msr-tools/README
+++ b/system/msr-tools/README
@@ -1,7 +1,8 @@
-MSR Tools project provides utilities to access the processor MSRs and CPU ID
-directly.
+MSR Tools project provides utilities to access the processor MSRs and
+CPU ID directly.
 
-This project is composed of three different user space console applications.
+This project is composed of three different user space console
+applications.
 
     rdmsr – read MSR from any CPU or all CPUs
     wrmsr – write values to MSR on any CPU or all CPUs
diff --git a/system/msr-tools/msr-tools.SlackBuild b/system/msr-tools/msr-tools.SlackBuild
index aaa2e511bb..a2e436d2ab 100644
--- a/system/msr-tools/msr-tools.SlackBuild
+++ b/system/msr-tools/msr-tools.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for <msr-tools>
 #
 # Michales (clavisound) Michaloudes korgie@gmail.com <2017>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=msr-tools
 VERSION=${VERSION:-1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -16,7 +19,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}	
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -73,4 +83,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mtftar/mtftar.SlackBuild b/system/mtftar/mtftar.SlackBuild
index 93067638d3..aaae44a770 100644
--- a/system/mtftar/mtftar.SlackBuild
+++ b/system/mtftar/mtftar.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mtftar
 
@@ -7,26 +7,36 @@
 # Concepts in this script taken from the slackbuilds.org template.
 # Do what you will with this script but give credit where credit is due.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mtftar
 VERSION=${VERSION:-20070205}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,5 +79,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
 
diff --git a/system/mucommander/README b/system/mucommander/README
index dab06e614f..6f994d9577 100644
--- a/system/mucommander/README
+++ b/system/mucommander/README
@@ -12,3 +12,8 @@ Here's a non-exhaustive list of what you'll find:
 - Universal bookmarks and credentials manager
 - Multiple windows support
 - Full keyboard access
+
+Optional dependency: android-tools (to connect to Android devices,
+make sure the adb server is running. You can start it by running
+`adb start-server' from the command line).
+
diff --git a/system/mucommander/mucommander.SlackBuild b/system/mucommander/mucommander.SlackBuild
index bc61b6cc67..bfbf9394cf 100644
--- a/system/mucommander/mucommander.SlackBuild
+++ b/system/mucommander/mucommander.SlackBuild
@@ -1,18 +1,29 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mucommander
 
 # Written by Dario Nicodemi dario.sbo@gmail.com
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mucommander
-VERSION=${VERSION:-0.9.0}
+VERSION=${VERSION:-1.3.0_1}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRC_VERSION=$(echo "$VERSION"|tr _ -)
+SRC_MAIN_VERSION=$(echo "$VERSION"|cut -d "_" -f 1)
 
-SRC_VERSION=$(echo "$VERSION"|tr . _)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -23,8 +34,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.gz
-cd muCommander-$SRC_VERSION
+mkdir $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$SRC_VERSION.tgz -C $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -33,7 +45,7 @@ find -L . \
  -exec chmod 644 {} \;
 
 mkdir -p $PKG/opt/$PRGNAM
-cp mucommander.sh mucommander.jar $PKG/opt/$PRGNAM
+cp -a app bundle conf mucommander.sh mucommander-$SRC_MAIN_VERSION.jar $PKG/opt/$PRGNAM
 mkdir -p $PKG/usr/bin
 ( cd $PKG/usr/bin ; ln -s ../../opt/$PRGNAM/mucommander.sh mucommander)
 
@@ -53,4 +65,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/mucommander/mucommander.desktop b/system/mucommander/mucommander.desktop
index b12886d9ea..da10941d78 100644
--- a/system/mucommander/mucommander.desktop
+++ b/system/mucommander/mucommander.desktop
@@ -6,7 +6,7 @@ Icon=mucommander
 Terminal=false
 Name=muCommander
 GenericName=File manager
-Comment=File manager
+Comment=A dual-pane file manager
 Categories=System;
 Type=Application
 StartupNotify=false
diff --git a/system/mucommander/mucommander.info b/system/mucommander/mucommander.info
index 0aa471d71b..3aaf7094e6 100644
--- a/system/mucommander/mucommander.info
+++ b/system/mucommander/mucommander.info
@@ -1,10 +1,10 @@
 PRGNAM="mucommander"
-VERSION="0.9.0"
+VERSION="1.3.0_1"
 HOMEPAGE="http://www.mucommander.com/"
-DOWNLOAD="https://github.com/mucommander/mucommander/releases/download/0.9.0/mucommander-0_9_0.tar.gz"
-MD5SUM="934f48cefb74da275cfa1f49a4ffb2d5"
+DOWNLOAD="https://github.com/mucommander/mucommander/releases/download/1.3.0-1/mucommander-1.3.0-1.tgz"
+MD5SUM="db02536bf5e27b5a4620c27a1d3c9083"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk17"
 MAINTAINER="Dario Nicodemi"
 EMAIL="dario.sbo@gmail.com"
diff --git a/system/multibootusb/multibootusb.SlackBuild b/system/multibootusb/multibootusb.SlackBuild
index 93515f10bf..849a68db45 100644
--- a/system/multibootusb/multibootusb.SlackBuild
+++ b/system/multibootusb/multibootusb.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for multibootusb
 
@@ -24,10 +24,13 @@
 # Credits:
 # Thanks Azar Shafiei for her helps and great encouragement.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=multibootusb
 VERSION=${VERSION:-8.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -85,4 +95,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/multibootusb/multibootusb.info b/system/multibootusb/multibootusb.info
index 7e234d7235..d5c747cd33 100644
--- a/system/multibootusb/multibootusb.info
+++ b/system/multibootusb/multibootusb.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/mbusb/multibootusb/archive/8.9.0/multibootusb-8.9.0
 MD5SUM="100fd1b979445d4e09ac61cf9d686fb3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="PyQt5"
+REQUIRES=""
 MAINTAINER="Mohammad Etemaddar"
 EMAIL="mohammad.etemaddar@gmail.com"
diff --git a/system/multicorn/README b/system/multicorn/README
deleted file mode 100644
index 10cb398545..0000000000
--- a/system/multicorn/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Multicorn is a PostgreSQL 9.1+ extension meant to make Foreign Data
-Wrapper development easy, by allowing the programmer to use the Python
-programming language.
-
-- Multicorn allows you to access any data source in your PostgreSQL
-  database.
-- You can leverage the full power of SQL to query your data sources.
-- Every tool you use for SQL can be reused with those datasources (think
-  about an ORM, BI tool...).
diff --git a/system/multicorn/multicorn.SlackBuild b/system/multicorn/multicorn.SlackBuild
deleted file mode 100644
index 9b85a03d09..0000000000
--- a/system/multicorn/multicorn.SlackBuild
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for multicorn
-
-# Copyright 2013-2017 Audrius Kažukauskas <audrius@neutrino.lt>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=multicorn
-VERSION=${VERSION:-1.3.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-$VERSION.zip
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Set Python code installation path.
-sed -i "s|install$|install --root=$PKG|" Makefile
-
-CFLAGS="$SLKCFLAGS" make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG README.md $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/multicorn/multicorn.info b/system/multicorn/multicorn.info
deleted file mode 100644
index 178135d0bd..0000000000
--- a/system/multicorn/multicorn.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="multicorn"
-VERSION="1.3.4"
-HOMEPAGE="https://multicorn.org/"
-DOWNLOAD="https://api.pgxn.org/dist/multicorn/1.3.4/multicorn-1.3.4.zip"
-MD5SUM="c69e4d77775aab0bb22d441b8f516bb2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="postgresql"
-MAINTAINER="Audrius Kažukauskas"
-EMAIL="audrius@neutrino.lt"
diff --git a/system/multicorn/slack-desc b/system/multicorn/slack-desc
deleted file mode 100644
index ac2af22b95..0000000000
--- a/system/multicorn/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-         |-----handy-ruler------------------------------------------------------|
-multicorn: multicorn (PostgreSQL extension to build Foreign Data Wrappers)
-multicorn:
-multicorn: Multicorn is a PostgreSQL 9.1+ extension meant to make Foreign Data
-multicorn: Wrapper development easy, by allowing the programmer to use the Python
-multicorn: programming language.
-multicorn:
-multicorn: Homepage: https://multicorn.org/
-multicorn:
-multicorn:
-multicorn:
-multicorn:
diff --git a/system/multiload-ng/README b/system/multiload-ng/README
index 5b5a6effee..b97b387320 100644
--- a/system/multiload-ng/README
+++ b/system/multiload-ng/README
@@ -9,6 +9,9 @@ Note: upstream defaults are
  - build the generic system tray plugin
  - build the xfce4 panel plugin
 
+The xfce4 panel plugin is disabled in this SlackBuid, because it won't
+build with Slackware's version of XFCE4.
+
 any of these may be overridden by passing its corresponding parameter to
 the script, i. e.
  - GTK=2
@@ -16,7 +19,7 @@ the script, i. e.
  - LXPANEL=yes
  - MATE=yes
  - SYSTRAY=no
- - XFCE4=no
+ - XFCE4=yes (currently this causes the build to fail, patches welcome)
 
 for example
    GTK=2 LXPANEL=yes ./multiload-ng.SlackBuild
diff --git a/system/multiload-ng/multiload-ng.SlackBuild b/system/multiload-ng/multiload-ng.SlackBuild
index dc76e3a6d5..a30f27c3d3 100644
--- a/system/multiload-ng/multiload-ng.SlackBuild
+++ b/system/multiload-ng/multiload-ng.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for multiload-ng
 
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org: fix the build on 15.0. I
+# had to disable the XFCE4 plugin; if you know how to fix it, please
+# send a patch.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=multiload-ng
 VERSION=${VERSION:-1.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -84,10 +95,11 @@ case "$SYSTRAY" in
   *) SYSTRAY="yes" ;;
 esac
 
-# default is to build the xfce4 panel plugin
+# 20220210 bkw: default is to NOT build the xfce4 panel plugin,
+# because it fails to build on 15.0.
 case "$XFCE4" in
-  no) ;;
-  *) XFCE4="yes" ;;
+  yes) XFCE4="yes" ;;
+  *) XFCE4="no" ;;
 esac
 
 set -e
@@ -101,12 +113,14 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 ./autogen.sh
 
+SLKCFLAGS+=" -fcommon"
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -122,10 +136,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS Changelog.md CONTRIBUTING.md COPYING README.md \
@@ -137,4 +148,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/multipath-tools/0002-multipathd-add-ncurses-to-linker.patch b/system/multipath-tools/0002-multipathd-add-ncurses-to-linker.patch
index f68c4af0b3..2d452c5582 100644
--- a/system/multipath-tools/0002-multipathd-add-ncurses-to-linker.patch
+++ b/system/multipath-tools/0002-multipathd-add-ncurses-to-linker.patch
@@ -1,11 +1,11 @@
---- multipathd/Makefile.orig	2017-11-10 17:52:36.070562376 +0200
-+++ multipathd/Makefile	2017-11-10 18:10:47.854895039 +0200
-@@ -11,7 +11,7 @@ CFLAGS += $(BIN_CFLAGS) -I$(multipathdir
+--- multipathd/Makefile.orig	2021-09-08 11:49:01.000000000 +0200
++++ multipathd/Makefile	2021-12-05 23:47:00.654767573 +0100
+@@ -15,7 +15,7 @@
  LDFLAGS += $(BIN_LDFLAGS)
  LIBDEPS += -L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist \
  	   -L$(mpathcmddir) -lmpathcmd -ludev -ldl -lurcu -lpthread \
 -	   -ldevmapper -lreadline
 +	   -ldevmapper -lreadline -lncurses
+ CFLAGS += $(shell $(PKGCONFIG) --modversion liburcu 2>/dev/null | \
+ 	awk -F. '{ printf("-DURCU_VERSION=0x%06x", 256 * ( 256 * $$1 + $$2) + $$3); }')
  
- ifdef SYSTEMD
- 	CFLAGS += -DUSE_SYSTEMD=$(SYSTEMD)
diff --git a/system/multipath-tools/multipath-tools.SlackBuild b/system/multipath-tools/multipath-tools.SlackBuild
index 7148af368b..c6e5948398 100644
--- a/system/multipath-tools/multipath-tools.SlackBuild
+++ b/system/multipath-tools/multipath-tools.SlackBuild
@@ -1,5 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 # Copyright 2014,2018 Nikos Yotis <nikos.giotis@gmail.com>
+# Copyright 2021  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -19,30 +20,46 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230809 bkw: Modified by SlackBuilds.org: fix FTBFS.
+
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - fix broken symlink in doc dir.
+# - strip binaries and libraries.
+
+# 20220321 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix 32-bit build.
+# - fix path to kpart_id script in udev rules.
+
 # 22-Oct-2018
 # Updated for version 0.7.8
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=multipath-tools
-VERSION=${VERSION:-0.7.8}
-SRCNAM="index.html?p=multipath-tools%2F.git;a=snapshot;sf=tgz;h=refs%2Ftags%2F$VERSION"
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.8.7}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,32 +78,40 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
+# 20230809 bkw: fix FTBFS due to missing header.
+sed -i '1i#include <assert.h>' libmultipath/checkers.c
+
 # Patch for slackware compatibility
 cat $CWD/0002-multipathd-add-ncurses-to-linker.patch | patch -p0 --verbose
 
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Build
 cd $TMP/$PRGNAM-$VERSION
 CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
 make install DESTDIR=$PKG
 
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
 # Move everything in place
-mv $PKG/usr/lib/ $PKG/
+mkdir -p $PKG/lib
+mv $PKG/usr/lib/udev $PKG/lib/udev
+rmdir $PKG/usr/lib &>/dev/null || true
+sed -i 's,/usr/lib/udev,/lib/udev,' $PKG/lib/udev/rules.d/11-dm-mpath.rules
 
 # Manpages
 mv $PKG/usr/share/man $PKG/usr/
 rm -rf $PKG/usr/share
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip -9 $PKG/usr/man/man*/*
 
 # init script
 mkdir -p $PKG/etc/rc.d
@@ -100,13 +125,18 @@ chmod 644 $PKG/etc/multipath.conf.new
 # Docs
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING README README.alua $CWD/README.SLACKWARE \
+  LICENSES COPYING README.alua README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# 20220413 bkw: note: *never* use "cp -a" to copy files from $CWD to
+# the package. if the file happens not to be owned by root, you end up
+# with bad ownership in the package!
+cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/multipath-tools/multipath-tools.info b/system/multipath-tools/multipath-tools.info
index 54ce6d7b3a..c43233c62c 100644
--- a/system/multipath-tools/multipath-tools.info
+++ b/system/multipath-tools/multipath-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="multipath-tools"
-VERSION="0.7.8"
+VERSION="0.8.7"
 HOMEPAGE="http://christophe.varoqui.free.fr/"
-DOWNLOAD="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;sf=tgz;h=refs/tags/0.7.8"
-MD5SUM="f8d0faed2913bc725c107b4f84f22a3a"
+DOWNLOAD="https://github.com/opensvc/multipath-tools/archive/0.8.7/multipath-tools-0.8.7.tar.gz"
+MD5SUM="5374165735591fac16e9274426a3c56e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="liburcu"
diff --git a/system/multitail/README b/system/multitail/README
index 01f558bd9e..0d951a551c 100644
--- a/system/multitail/README
+++ b/system/multitail/README
@@ -1,4 +1,5 @@
-MultiTail lets you view one or multiple files like the original tail program.
-The difference is that it creates multiple windows on your console (with
-ncurses). It can also monitor wildcards: if another file matching the wildcard
-has a more recent modification date, it will automatically switch to that file.
+MultiTail lets you view one or multiple files like the original tail
+program. The difference is that it creates multiple windows on your
+console (with ncurses). It can also monitor wildcards: if another file
+matching the wildcard has a more recent modification date, it will
+automatically switch to that file.
diff --git a/system/multitail/multitail.SlackBuild b/system/multitail/multitail.SlackBuild
index 9a6f57a9db..7b9cacc814 100644
--- a/system/multitail/multitail.SlackBuild
+++ b/system/multitail/multitail.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for MultiTail
 
 # Copyright 2009-2015  Erik W. Hanson, Minneapolis, MN, USA
-# Copyright 2015-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2015-2023 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=multitail
-VERSION=${VERSION:-6.5.0}
+VERSION=${VERSION:-7.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,7 +62,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -75,8 +82,18 @@ sed -i 's|ncursesw/ncurses.h|ncurses.h|' mt.h
 mkdir -p $PKG/usr/{bin,doc,man/man1} $PKG/etc $PKG/install
 
 # Compile and Install
-CFLAGS="$SLKCFLAGS" make
-install -m 755 multitail $PKG/usr/bin/multitail
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
 install -m 644 multitail.1 $PKG/usr/man/man1/multitail.1
 install -m 655 multitail.conf $PKG/etc/multitail.conf.new
 
@@ -85,8 +102,14 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mv $PKG/usr/share/doc/*/* $PKG/usr/doc/$PRGNAM-$VERSION/
+rm -rf $PKG/usr/share/*
+rm -f $PKG/usr/etc/multitail.conf.new
+mv $PKG/usr/etc/multitail $PKG/usr/share/
+rm -rf $PKG/usr/etc
+
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/multitail/multitail.info b/system/multitail/multitail.info
index 0c50653855..015cdf8dc3 100644
--- a/system/multitail/multitail.info
+++ b/system/multitail/multitail.info
@@ -1,8 +1,8 @@
 PRGNAM="multitail"
-VERSION="6.5.0"
+VERSION="7.1.2"
 HOMEPAGE="http://www.vanheusden.com/multitail/"
-DOWNLOAD="http://www.vanheusden.com/multitail/multitail-6.5.0.tgz"
-MD5SUM="21e692309babbbb5669ef1b17288ee0a"
+DOWNLOAD="https://github.com/folkertvanheusden/multitail/archive/refs/tags/7.1.2/multitail-7.1.2.tar.gz"
+MD5SUM="905002f0d5d436a0d6f70f1007f23bd1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/munin-node/README b/system/munin-node/README
index 99542d1fbf..06d7aeb4d0 100644
--- a/system/munin-node/README
+++ b/system/munin-node/README
@@ -1,9 +1,9 @@
-munin-node is the client portion of the Munin Monitoring system. It allows the 
-Munin master to collect statistics for presentation in RRDTool time-series
-graphs.
+munin-node is the client portion of the Munin Monitoring system. It
+allows the Munin master to collect statistics for presentation in
+RRDTool time-series graphs.
 
-munin-node is a Perl application and requires several Perl modules as external
-dependencies:
+munin-node is a Perl application and requires several Perl modules as
+external dependencies:
 
   Net::Server
 
@@ -13,10 +13,11 @@ Additionally, the following modules are required for some plugins:
   Net::SNMP
   Net::CIDR
 
-Munin requires that user munin exists and belongs to group munin. Create these
-before running the SlackBuild script:
+Munin requires that user munin exists and belongs to group
+munin. Create these before running the SlackBuild script:
 
 groupadd -g 308 munin
 useradd -u 308 -g 308 -s /sbin/nologin munin
 
-Once munin-node is installed, configure plugins per the Munin documentation.
+Once munin-node is installed, configure plugins per the Munin
+documentation.
diff --git a/system/munin-node/munin-node.SlackBuild b/system/munin-node/munin-node.SlackBuild
index 044af0068c..e22ed5cd90 100644
--- a/system/munin-node/munin-node.SlackBuild
+++ b/system/munin-node/munin-node.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for munin-node (http://munin-monitoring.org)
 # SlackBuild source at https://github.com/chapmajs/munin-node-slackbuild
@@ -9,13 +9,31 @@
 # glitch@glitchwrks.com
 # All rights reserved.
 
+# 20220212 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - add a documentation directory (/usr/doc/$PRGNAM-$VERSION).
+# - add the SlackBuild to the doc dir.
+
+# 20220212 bkw: Modified by SlackBuilds.org:
+# - fix download URL.
+# - add missing dependencies to REQUIRES.
+# - fix build (PERL5LIB).
+# - add -j1 to make commands, since parallel builds don't work.
+# - install plugins to $PKG, not the real root fs!
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=munin-node
 VERSION=${VERSION:-2.0.25}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH="noarch"
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -28,15 +46,15 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar zxvf $CWD/$ARCHIVE_NAME-$VERSION.tar.gz
+rm -rf $ARCHIVE_NAME-$VERSION
+tar zxvf $CWD/"$ARCHIVE_NAME"_"$VERSION".orig.tar.gz
 cd $ARCHIVE_NAME-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Fix a bug in Perldoc extension detection
 patch Makefile < $CWD/patches/Makefile.patch
@@ -44,9 +62,12 @@ patch Makefile < $CWD/patches/Makefile.patch
 # Patch Makefile.config for Slackware-esque install locations
 patch Makefile.config < $CWD/patches/Makefile.config.patch
 
-make LIBDIR=/usr/lib${LIBDIRSUFFIX}
-make install-common-prime install-node-prime \
-	install-plugins-prime LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG
+# 20220212 bkw: Note: plugins are in /usr/lib/plugins, regardless of
+# build architecture, because this is noarch.
+export PERL5LIB=.
+make -j1 LIBDIR=/usr/lib
+make -j1 install-common-prime install-node-prime \
+	install-plugins-prime LIBDIR=$PKG/usr/lib DESTDIR=$PKG
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -54,6 +75,14 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 mv $PKG/usr/local/share/ $PKG/usr/
 rm -rf $PKG/usr/local
 
+# 20220426 bkw: docs, please.
+# TODO: maintainer, you should figure out to build the HTML docs using
+# the RST source in the doc/ dir, and include those in the package.
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a COPYING ChangeLog HACKING.pod README UPGRADING* authors $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
 # move config files to .new
 cd $PKG/etc/munin
 for file in $(find . -type f); do
@@ -69,4 +98,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/munin-node/munin-node.info b/system/munin-node/munin-node.info
index dea380e116..63c7a68e0e 100644
--- a/system/munin-node/munin-node.info
+++ b/system/munin-node/munin-node.info
@@ -1,10 +1,10 @@
 PRGNAM="munin-node"
 VERSION="2.0.25"
 HOMEPAGE="http://munin-monitoring.org"
-DOWNLOAD="http://downloads.munin-monitoring.org/munin/stable/2.0.25/munin-2.0.25.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/munin_2.0.25.orig.tar.gz"
 MD5SUM="b418a667ce42665557329a7ac3bd1b93"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-Net-Server Net-SSLeay perl-Module-Build"
+REQUIRES="perl-Net-Server perl-Module-Build perl-HTML-Template perl-Log-Log4perl zulu-openjdk8"
 MAINTAINER="Jonathan Chapman"
 EMAIL="glitch@glitchwrks.com"
diff --git a/system/musl/README b/system/musl/README
index a72afb60b5..eb8c088c99 100644
--- a/system/musl/README
+++ b/system/musl/README
@@ -2,6 +2,6 @@ Musl is a C standard library that is lightweight, fast, simple, free,
 and strives to be correct in the sense of standards-conformance and
 safety.
 
-Musl includes a wrapper, musl-gcc, for building files linked against musl.
-It also provides musl-ldd to print the shared libraries loaded by the
-musl loader.
+Musl includes a wrapper, musl-gcc, for building files linked against
+musl. It also provides musl-ldd to print the shared libraries loaded
+by the musl loader.
diff --git a/system/musl/musl.SlackBuild b/system/musl/musl.SlackBuild
index 99ae51d447..69057a0353 100644
--- a/system/musl/musl.SlackBuild
+++ b/system/musl/musl.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for musl
 
-# Copyright 2014 Weldon Goree <weldon@langurwallah.org>
-# Copyright 2019 - 2020 Johannes Schoepfer, Germany
+# Copyright 2014  Weldon Goree
+# Copyright 2019-2024  Johannes Schoepfer, Germany
 # All rights reserved
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=musl
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.2.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,9 +73,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -86,14 +93,20 @@ make DESTDIR=$PKG install
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/bin ; ln -sf /usr/lib$LIBDIRSUFFIX/ld-musl-$ARCH.so.1 musl-ldd )
+# change symbolic links to relative
+( cd $PKG/usr/bin ; rm -rf musl-ldd )
+( cd $PKG/usr/bin ; ln -sf ../lib$LIBDIRSUFFIX/ld-musl-$ARCH.so.1 musl-ldd )
+( cd $PKG/usr/lib$LIBDIRSUFFIX ; rm -rf ld-musl-$ARCH.so.1 )
+( cd $PKG/usr/lib$LIBDIRSUFFIX ; ln -sf musl/libc.so ld-musl-$ARCH.so.1 )
+( cd $PKG/usr/lib$LIBDIRSUFFIX/musl ; rm -rf ld-musl-$ARCH.so.1 )
+( cd $PKG/usr/lib$LIBDIRSUFFIX/musl ; ln -sf libc.so ld-musl-$ARCH.so.1 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYRIGHT INSTALL README VERSION WHATSNEW $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYRIGHT README VERSION WHATSNEW $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/musl/musl.info b/system/musl/musl.info
index 827759d98e..97e80def38 100644
--- a/system/musl/musl.info
+++ b/system/musl/musl.info
@@ -1,8 +1,8 @@
 PRGNAM="musl"
-VERSION="1.2.0"
+VERSION="1.2.5"
 HOMEPAGE="https://musl.libc.org/"
-DOWNLOAD="https://musl.libc.org/releases/musl-1.2.0.tar.gz"
-MD5SUM="5f13b13501d6ab7c2e06c69484e5a7fc"
+DOWNLOAD="https://musl.libc.org/releases/musl-1.2.5.tar.gz"
+MD5SUM="ac5cfde7718d0547e224247ccfe59f18"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/musl/slack-desc b/system/musl/slack-desc
index a52df43f85..8e9e7cbe54 100644
--- a/system/musl/slack-desc
+++ b/system/musl/slack-desc
@@ -12,7 +12,7 @@ musl: The musl C library. A library that attempts to be fast, simple, and
 musl: correct. Use the musl-gcc wrapper to build against musl, and the
 musl: musl-ldd wrapper to check linkages on the binaries you build.
 musl:
-musl: https://www.musl-libc.org/
+musl: https://musl.libc.org/
 musl:
 musl:
 musl:
diff --git a/system/mysql-utilities/README b/system/mysql-utilities/README
deleted file mode 100644
index 0e382e8fe6..0000000000
--- a/system/mysql-utilities/README
+++ /dev/null
@@ -1,6 +0,0 @@
-MySQL Utilities provides a collection of command-line utilities that 
-are used for maintaining and administering MySQL servers, including:
-
-Admin Utilities (Clone, Copy, Compare, Diff, Export, Import)
-Replication Utilities (Setup, Configuration)
-General Utilities (Disk Usage, Redundant Indexes, Search Meta Data)
diff --git a/system/mysql-utilities/mysql-utilities.SlackBuild b/system/mysql-utilities/mysql-utilities.SlackBuild
deleted file mode 100644
index 3b1f45bf7a..0000000000
--- a/system/mysql-utilities/mysql-utilities.SlackBuild
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for mysql-utilities
-
-# Copyright 2013-2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=mysql-utilities
-VERSION=${VERSION:-1.6.5}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-
-python setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.txt README.txt CHANGES.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/mysql-utilities/mysql-utilities.info b/system/mysql-utilities/mysql-utilities.info
deleted file mode 100644
index f9637d5e04..0000000000
--- a/system/mysql-utilities/mysql-utilities.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="mysql-utilities"
-VERSION="1.6.5"
-HOMEPAGE="https://dev.mysql.com/downloads/tools/utilities/"
-DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-utilities-1.6.5.tar.gz"
-MD5SUM="4a7ac8ada2618308999973dbd201ab31"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="mysql-connector-python"
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
diff --git a/system/mysql-utilities/slack-desc b/system/mysql-utilities/slack-desc
deleted file mode 100644
index b63c79d1a2..0000000000
--- a/system/mysql-utilities/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-               |-----handy-ruler------------------------------------------------------|
-mysql-utilities: mysql-utilities (MySQL Command-Line Utilities)
-mysql-utilities:
-mysql-utilities: MySQL Utilities provides a collection of command-line utilities that
-mysql-utilities: are used for maintaining and administering MySQL servers, including:
-mysql-utilities:
-mysql-utilities: Admin Utilities (Clone, Copy, Compare, Diff, Export, Import)
-mysql-utilities: Replication Utilities (Setup, Configuration)
-mysql-utilities: General Utilities (Disk Usage, Redundant Indexes, Search Meta Data)
-mysql-utilities:
-mysql-utilities:
-mysql-utilities:
diff --git a/system/nagios-plugins/README b/system/nagios-plugins/README
index b3188bef3d..c4fe320f18 100644
--- a/system/nagios-plugins/README
+++ b/system/nagios-plugins/README
@@ -1,15 +1,16 @@
 nagios-plugins (Plugins for the Nagios network monitoring server)
 
-Unlike many other monitoring tools, Nagios does not include any internal
-mechanisms for checking the status of hosts and services on your
-network. Instead, Nagios relies on external programs (called plugins) to
-do all the dirty work. Plugins are compiled executables or scripts (Perl
-scripts, shell scripts, etc.) that can be run from a command line to check
-the status or a host or service.
+Unlike many other monitoring tools, Nagios does not include any
+internal mechanisms for checking the status of hosts and services
+on your network. Instead, Nagios relies on external programs (called
+plugins) to do all the dirty work. Plugins are compiled executables
+or scripts (Perl scripts, shell scripts, etc.) that can be run from a
+command line to check the status or a host or service.
 
-Remember to install the Nagios::Plugin perl module and its dependencies to
-ensure all functionality of perl plugins.
+Remember to install the Nagios::Plugin perl module and its
+dependencies to ensure all functionality of perl plugins.
 
-Remember to install the applications you plan to use plugins with before
-installation of nagios-plugins as some plugins are compiled using the relevant
-libraries installed on your system for the application being probed.
+Remember to install the applications you plan to use plugins with
+before installation of nagios-plugins as some plugins are compiled
+using the relevant libraries installed on your system for the
+application being probed.
diff --git a/system/nagios-plugins/nagios-plugins.SlackBuild b/system/nagios-plugins/nagios-plugins.SlackBuild
index 7764ec607c..9f30ccb5c9 100644
--- a/system/nagios-plugins/nagios-plugins.SlackBuild
+++ b/system/nagios-plugins/nagios-plugins.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nagios-plugins
 
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nagios-plugins
 VERSION=${VERSION:-2.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -120,4 +130,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nagvis/README b/system/nagvis/README
index 0ba3b59838..884df3e4ba 100644
--- a/system/nagvis/README
+++ b/system/nagvis/README
@@ -1,5 +1,6 @@
 nagvis (visualization addon for Nagios or Icinga)
 
-NagVis is a visualization addon for the well known network managment system
-Nagios and Icinga.  NagVis can be used to visualize Nagios Data, e.g. to
-display IT processes like a mail system or a network infrastructure.
+NagVis is a visualization addon for the well known network managment
+system Nagios and Icinga. NagVis can be used to visualize Nagios
+Data, e.g. to display IT processes like a mail system or a network
+infrastructure.
diff --git a/system/nagvis/nagvis.SlackBuild b/system/nagvis/nagvis.SlackBuild
index d905260602..6fbc3d041e 100644
--- a/system/nagvis/nagvis.SlackBuild
+++ b/system/nagvis/nagvis.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nagvis
 
@@ -22,14 +22,25 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - use relative symlinks in usr/share/$PRGNAM.
+# - remove 0-byte files from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nagvis
 VERSION=${VERSION:-1.9.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -45,9 +56,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Patches thanks to Debian folks!
 patch -p1 <$CWD/global.diff
@@ -72,12 +83,12 @@ mv $PKG/etc/$PRGNAM/geomap/demo* $PKG/usr/doc/$PRGNAM-$VERSION/demo/geomap
 mv $PKG/etc/$PRGNAM/maps/demo* $PKG/usr/doc/$PRGNAM-$VERSION/demo/maps
 
 # Symlink stupidity
-ln -s /var/lib/$PRGNAM/userfiles $PKG/usr/share/$PRGNAM/share/userfiles
-ln -s /usr/doc/$PRGNAM-$VERSION/html $PKG/usr/share/$PRGNAM/share/docs
-ln -s /usr/doc/$PRGNAM-$VERSION/html $PKG/usr/share/$PRGNAM/docs
-ln -s /etc/$PRGNAM $PKG/usr/share/$PRGNAM/etc
-ln -s /var/cache/$PRGNAM $PKG/usr/share/$PRGNAM/share/var
-ln -s /var/cache/$PRGNAM $PKG/usr/share/$PRGNAM/var
+ln -s ../../../../var/lib/$PRGNAM/userfiles $PKG/usr/share/$PRGNAM/share/userfiles
+ln -s ../../../doc/$PRGNAM-$VERSION/html $PKG/usr/share/$PRGNAM/share/docs
+ln -s ../../doc/$PRGNAM-$VERSION/html $PKG/usr/share/$PRGNAM/docs
+ln -s ../../../etc/$PRGNAM $PKG/usr/share/$PRGNAM/etc
+ln -s ../../../../var/cache/$PRGNAM $PKG/usr/share/$PRGNAM/share/var
+ln -s ../../../var/cache/$PRGNAM $PKG/usr/share/$PRGNAM/var
 
 # Install configuration
 sed -e "s#@NAGVIS_WEB@#/$PRGNAM#g" \
@@ -106,6 +117,7 @@ find $PKG/etc/$PRGNAM -type f ! -name '*.new' -exec mv {} {}.new \;
 # Apache needs permissions
 chown -R apache:apache $PKG/etc/$PRGNAM $PKG/var/{cache,lib}/$PRGNAM
 
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -a -empty | xargs rm -f
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -113,4 +125,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nano-syntax-highlighting/README b/system/nano-syntax-highlighting/README
index 959f98ad20..cd28b1439e 100644
--- a/system/nano-syntax-highlighting/README
+++ b/system/nano-syntax-highlighting/README
@@ -13,7 +13,9 @@ Or to be less verbose, append content of the folder in one line
 with wildcard:
 
 For current user.
-$ echo 'include "/usr/share/nano-syntax-highlighting/*.nanorc"' >> ~/.nanorc
+$ echo 'include "/usr/share/nano-syntax-highlighting/*.nanorc"' \
+       >> ~/.nanorc
 
 For all users.
-# echo 'include "/usr/share/nano-syntax-highlighting/*.nanorc"' >> /etc/nanorc
+# echo 'include "/usr/share/nano-syntax-highlighting/*.nanorc"' \
+       >> /etc/nanorc
diff --git a/system/nano-syntax-highlighting/nano-syntax-highlighting.SlackBuild b/system/nano-syntax-highlighting/nano-syntax-highlighting.SlackBuild
index 94eafed157..e506d93a12 100644
--- a/system/nano-syntax-highlighting/nano-syntax-highlighting.SlackBuild
+++ b/system/nano-syntax-highlighting/nano-syntax-highlighting.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for the nano-syntax-highlighting.
 #
@@ -22,14 +22,24 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nano-syntax-highlighting
 VERSION=${VERSION:-20180827}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,4 +76,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nanum-coding-fonts-ttf/nanum-coding-fonts-ttf.SlackBuild b/system/nanum-coding-fonts-ttf/nanum-coding-fonts-ttf.SlackBuild
index f304dae9c4..21bdf690d2 100644
--- a/system/nanum-coding-fonts-ttf/nanum-coding-fonts-ttf.SlackBuild
+++ b/system/nanum-coding-fonts-ttf/nanum-coding-fonts-ttf.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script nanum-coding-fonts-ttf
 
@@ -22,16 +22,25 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org: fix the build.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nanum-coding-fonts-ttf
 VERSION=${VERSION:-2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
 SRC_PRGNAM=NanumGothicCoding-$VERSION
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,15 +56,12 @@ cd $PRGNAM-$VERSION
 unzip $CWD/$SRC_PRGNAM.zip
 
 # rename due to unzip failing to preserve euc-kr filenames
-mv *-+*-Bold.ttf NanumGothic_Coding_Bold.ttf
-mv *-+*.ttf NanumGothic_Coding.ttf
+mv *-Bold.ttf NanumGothic_Coding_Bold.ttf.xxx
+mv *.ttf NanumGothic_Coding.ttf
+mv NanumGothic_Coding_Bold.ttf.xxx NanumGothic_Coding_Bold.ttf
 
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+chmod 644 *
 
 mkdir -p $PKG/usr/share/fonts/TTF
 cp -a *.ttf $PKG/usr/share/fonts/TTF
@@ -69,4 +75,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nanum-fonts-ttf/nanum-fonts-ttf.SlackBuild b/system/nanum-fonts-ttf/nanum-fonts-ttf.SlackBuild
index 7136c63ff5..879b31b7e6 100644
--- a/system/nanum-fonts-ttf/nanum-fonts-ttf.SlackBuild
+++ b/system/nanum-fonts-ttf/nanum-fonts-ttf.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script nanum-fonts-ttf
 
@@ -22,16 +22,26 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nanum-fonts-ttf
 VERSION=${VERSION:-3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
 SRC_PRGNAM=NanumFont_TTF_ALL
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,4 +74,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nbench/README b/system/nbench/README
index 4f8895cc93..5c98296384 100644
--- a/system/nbench/README
+++ b/system/nbench/README
@@ -1,2 +1,3 @@
-These are Native Mode (a.k.a. Algorithm Level) tests; benchmarks designed
-to expose the capabilities of a system's CPU, FPU, and memory system.
+These are Native Mode (a.k.a. Algorithm Level) tests; benchmarks
+designed to expose the capabilities of a system's CPU, FPU, and memory
+system.
diff --git a/system/nbench/nbench.SlackBuild b/system/nbench/nbench.SlackBuild
index 876f2c9c7d..e49127153c 100644
--- a/system/nbench/nbench.SlackBuild
+++ b/system/nbench/nbench.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nbench
 
@@ -24,11 +24,14 @@
 #
 # Maintained by David Spencer <baildon.research@googlemail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nbench
 VERSION=${VERSION:-2.2.3}
 SRCVERSION="byte-$VERSION"
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -106,4 +116,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nbench/nbench.info b/system/nbench/nbench.info
index ba6cab431d..da939f54c5 100644
--- a/system/nbench/nbench.info
+++ b/system/nbench/nbench.info
@@ -1,7 +1,7 @@
 PRGNAM="nbench"
 VERSION="2.2.3"
 HOMEPAGE="https://web.archive.org/web/20160530163313/http://www.tux.org/~mayer/linux/bmark.html"
-DOWNLOAD="https://fossies.org/linux/misc/nbench-byte-2.2.3.tar.gz"
+DOWNLOAD="http://attic-distfiles.pld-linux.org/distfiles/by-md5/2/8/285dfab361080759d477ea1fe7d3093a/nbench-byte-2.2.3.tar.gz"
 MD5SUM="285dfab361080759d477ea1fe7d3093a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/ncdu/ncdu.SlackBuild b/system/ncdu/ncdu.SlackBuild
index 82ad23caed..83fc42e17a 100644
--- a/system/ncdu/ncdu.SlackBuild
+++ b/system/ncdu/ncdu.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for ncdu
 #
-# Copyright 2009-2020  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009-2022  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,26 +22,36 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ncdu
-VERSION=${VERSION:-1.15.1}
+VERSION=${VERSION:-1.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -90,4 +100,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ncdu/ncdu.info b/system/ncdu/ncdu.info
index 63f5b81f3a..fe25a662ed 100644
--- a/system/ncdu/ncdu.info
+++ b/system/ncdu/ncdu.info
@@ -1,8 +1,8 @@
 PRGNAM="ncdu"
-VERSION="1.15.1"
+VERSION="1.17"
 HOMEPAGE="https://dev.yorhel.nl/ncdu/"
-DOWNLOAD="https://dev.yorhel.nl/download/ncdu-1.15.1.tar.gz"
-MD5SUM="af25aa8462a6f29c8a0c4d3d83d186e7"
+DOWNLOAD="https://dev.yorhel.nl/download/ncdu-1.17.tar.gz"
+MD5SUM="0a872dbda2d79e45937e22d5c97c01d4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/netatop/README b/system/netatop/README
index fe11b112b6..27ee9ca9c8 100644
--- a/system/netatop/README
+++ b/system/netatop/README
@@ -1,5 +1,5 @@
-kernel module netatop gather statistics about the TCP and UDP packets that 
-have been transmitted/received per process and per thread.
+kernel module netatop gathers statistics about the TCP and UDP packets
+that have been transmitted/received per process and per thread.
 
 This application can be used to work together with atop
 to provide detailed information about processes in your system
diff --git a/system/netatop/netatop.SlackBuild b/system/netatop/netatop.SlackBuild
index b49b105733..ddd624bf17 100644
--- a/system/netatop/netatop.SlackBuild
+++ b/system/netatop/netatop.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for netatop
 
-# Copyright 2012-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2012-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=netatop
-VERSION=${VERSION:-2.0}
+VERSION=${VERSION:-3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 KERNEL=${KERNEL:-$(uname -r)}
 PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
@@ -38,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -100,4 +110,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/netatop/netatop.info b/system/netatop/netatop.info
index 9de4b23775..b5e67146a2 100644
--- a/system/netatop/netatop.info
+++ b/system/netatop/netatop.info
@@ -1,8 +1,8 @@
 PRGNAM="netatop"
-VERSION="2.0"
+VERSION="3.1"
 HOMEPAGE="https://www.atoptool.nl/"
-DOWNLOAD="https://www.atoptool.nl/download/netatop-2.0.tar.gz"
-MD5SUM="b7f25ea12c2c47a41500a3705c3924e7"
+DOWNLOAD="https://www.atoptool.nl/download/netatop-3.1.tar.gz"
+MD5SUM="213ca8de12e25e612fe3a521e9e973de"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/netdata/doinst.sh b/system/netdata/doinst.sh
index 880b643590..32b4f4781c 100644
--- a/system/netdata/doinst.sh
+++ b/system/netdata/doinst.sh
@@ -23,33 +23,29 @@ preserve_perms() {
 }
 
 config etc/netdata/netdata.conf.new
+config etc/netdata/netdata-updater.conf.new
 
-for L in `ls usr/lib%LIBDIRSUFFIX%/netdata/conf.d/*.new`
+for L in `ls usr/lib/netdata/conf.d/*.new`
 do
 config $L
 done
 
-for L in `ls usr/lib%LIBDIRSUFFIX%/netdata/conf.d/python.d/*.new`
+for L in `ls usr/lib/netdata/conf.d/python.d/*.new`
 do
 config $L
 done
 
-for L in `ls usr/lib%LIBDIRSUFFIX%/netdata/conf.d/charts.d/*.new`
+for L in `ls usr/lib/netdata/conf.d/charts.d/*.new`
 do
 config $L
 done
 
-for L in `ls usr/lib%LIBDIRSUFFIX%/netdata/conf.d/health.d/*.new`
+for L in `ls usr/lib/netdata/conf.d/health.d/*.new`
 do
 config $L
 done
 
-#for L in `ls usr/lib%LIBDIRSUFFIX%/netdata/conf.d/node.d/*.new`
-#do
-#config $L
-#done
-
-for L in `ls usr/lib%LIBDIRSUFFIX%/netdata/conf.d/statsd.d/*.new`
+for L in `ls usr/lib/netdata/conf.d/statsd.d/*.new`
 do
 config $L
 done
diff --git a/system/netdata/netdata.SlackBuild b/system/netdata/netdata.SlackBuild
index f9a5a3f02a..338e1da25e 100644
--- a/system/netdata/netdata.SlackBuild
+++ b/system/netdata/netdata.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for netdata
 
-# Copyright 2017-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2017-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=netdata
-VERSION=${VERSION:-1.29.1}
+VERSION=${VERSION:-1.45.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 NETDATA_USER=${NETDATA_USER:-netdata}
 NETDATA_UID=${NETDATA_UID:-338}
@@ -54,7 +57,11 @@ elif ! grep -q "^$NETDATA_GROUP:" /etc/group; then
   bailout
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -78,9 +85,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-v$VERSION
+tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz
+cd $PRGNAM-v$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -88,23 +95,22 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-autoreconf -fiv
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-user=$NETDATA_USER \
-  --with-zlib \
-  --with-math \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/ \
+    -DENABLE_ACLK=FALSE \
+    -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=FALSE \
+    -DENABLE_PLUGIN_XENSTAT=FALSE \
+    -DENABLE_PLUGIN_EBPF=FALSE \
+    -DENABLE_PLUGIN_SYSTEMD_JOURNAL=FALSE \
+    -DENABLE_LOGS_MANAGEMENT_TESTS=FALSE \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -126,41 +132,39 @@ mkdir -p $PKG/etc/rc.d/
 install -m 0644 $CWD/rc.netdata $PKG/etc/rc.d/
 
 # handle all conf files
-touch $PKG/etc/netdata/netdata.conf.new
+rm $PKG/etc/netdata/netdata-updater.conf
+cp system/netdata.conf $PKG/etc/netdata/netdata.conf.new
+cp system/netdata-updater.conf $PKG/etc/netdata/netdata-updater.conf.new
 
-for L in `ls $PKG/usr/lib${LIBDIRSUFFIX}/netdata/conf.d/*.conf`
+# since 1.45.x, all files will be kept in /usr/lib
+for L in `ls $PKG/usr/lib/netdata/conf.d/*.conf`
 do
 mv $L $L.new
 done
 
-for L in `ls $PKG/usr/lib${LIBDIRSUFFIX}/netdata/conf.d/python.d/*.conf`
+for L in `ls $PKG/usr/lib/netdata/conf.d/python.d/*.conf`
 do
 mv $L $L.new
 done
 
-for L in `ls $PKG/usr/lib${LIBDIRSUFFIX}/netdata/conf.d/charts.d/*.conf`
+for L in `ls $PKG/usr/lib/netdata/conf.d/charts.d/*.conf`
 do
 mv $L $L.new
 done
 
-for L in `ls $PKG/usr/lib${LIBDIRSUFFIX}/netdata/conf.d/health.d/*.conf`
+for L in `ls $PKG/usr/lib/netdata/conf.d/health.d/*.conf`
 do
 mv $L $L.new
 done
 
-#for L in `ls $PKG/usr/lib${LIBDIRSUFFIX}/netdata/conf.d/node.d/*.conf`
-#do
-#mv $L $L.new
-#done
-
-for L in `ls $PKG/usr/lib${LIBDIRSUFFIX}/netdata/conf.d/statsd.d/*.conf`
+for L in `ls $PKG/usr/lib/netdata/conf.d/statsd.d/*.conf`
 do
 mv $L $L.new
 done
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-sed -e s/%LIBDIRSUFFIX%/$LIBDIRSUFFIX/g $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/netdata/netdata.info b/system/netdata/netdata.info
index 5e6574e85f..7959f2f02d 100644
--- a/system/netdata/netdata.info
+++ b/system/netdata/netdata.info
@@ -1,10 +1,10 @@
 PRGNAM="netdata"
-VERSION="1.29.1"
+VERSION="1.45.3"
 HOMEPAGE="https://github.com/netdata/netdata"
-DOWNLOAD="https://github.com/netdata/netdata/archive/v1.29.1/netdata-1.29.1.tar.gz"
-MD5SUM="8b5ed5edb20a8c7b7fc08a809d04df6f"
+DOWNLOAD="https://github.com/netdata/netdata/releases/download/v1.45.3/netdata-v1.45.3.tar.gz"
+MD5SUM="862400053058599901fcb9b61573d866"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="PyYAML libuv"
+REQUIRES="python2-PyYAML google-go-lang freeipmi"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/system/newLd/newLd.SlackBuild b/system/newLd/newLd.SlackBuild
index 71d3bf1adc..b518b875fb 100644
--- a/system/newLd/newLd.SlackBuild
+++ b/system/newLd/newLd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2005-2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
@@ -24,12 +24,15 @@
 
 # Adapted by Jan F. Chadima <jfch@jagda.eu> for use as slackport in Slackware 14.2
 
+# 20220210 bkw: Modified by SlackBuilds.org: fix build.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=newLd
 VERSION=${VERSION:-2.33.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
@@ -41,17 +44,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# Not yet in slackbuilds
-## 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
-## could be useful to other scripts.
-#if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-#  echo "$PRGNAM-$VERSION-$ARCH-$BUILD.txz"
-#  exit 0
-#fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
 # Set to ld.gold or ld.bfd:
 DEFAULT_LD=ld.bfd
 
@@ -84,40 +76,48 @@ case "$ARCH" in
     *)    TARGET=$ARCH-slackware-linux ;;
 esac
 
+set -e
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf binutils-$VERSION
-tar xvf $CWD/binutils-$VERSION.tar.?z || exit 1
-cd binutils-$VERSION || exit 1
+tar xvf $CWD/binutils-$VERSION.tar.?z
+cd binutils-$VERSION
 
 # Various upstream patches:
-zcat $CWD/patches/binutils-2.20.51.0.2-libtool-lib64.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/binutils-2.25-version.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/binutils-2.25-set-long-long.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/binutils-2.20.51.0.10-copy-osabi.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/binutils-2.20.51.0.10-sec-merge-emit.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/binutils-2.24-ldforcele.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/binutils-2.25.1-cleansweep.patch.gz | patch -p2 --verbose || exit 1
+zcat $CWD/patches/binutils-2.20.51.0.2-libtool-lib64.patch.gz | patch -p1 --verbose
+zcat $CWD/patches/binutils-2.25-version.patch.gz | patch -p1 --verbose
+zcat $CWD/patches/binutils-2.25-set-long-long.patch.gz | patch -p1 --verbose
+zcat $CWD/patches/binutils-2.20.51.0.10-copy-osabi.patch.gz | patch -p1 --verbose
+zcat $CWD/patches/binutils-2.20.51.0.10-sec-merge-emit.patch.gz | patch -p1 --verbose
+zcat $CWD/patches/binutils-2.24-ldforcele.patch.gz | patch -p1 --verbose
+zcat $CWD/patches/binutils-2.25.1-cleansweep.patch.gz | patch -p2 --verbose
 
 # Export the demangle.h header file:
-zcat $CWD/patches/binutils.export.demangle.h.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/binutils.export.demangle.h.diff.gz | patch -p1 --verbose
 # Don't check to see if "config.h" was included in the installed headers:
-zcat $CWD/patches/binutils.no-config-h-check.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/binutils.no-config-h-check.diff.gz | patch -p1 --verbose
 
 # Set %version to something halfway meaningful:
 sed -i -e 's/%''{release}/slack15/g' bfd/Makefile{.am,.in}
 
 chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # End of preparations
 if echo "$*" | grep -qw -- --prep ; then
@@ -143,8 +143,7 @@ CFLAGS="$SLKCFLAGS" \
   --enable-ld=default \
   --enable-initfini-array \
   $WERROR \
-  --build=$TARGET \
-  || exit 1
+  --build=$TARGET
 
 
 # Use "tooldir=/usr" to avoid internal references to the /usr/${TARGET}/
@@ -155,9 +154,9 @@ CFLAGS="$SLKCFLAGS" \
 # been built into the linker for quite some time and the ones in the
 # filesystem aren't actually loaded. For the most part they are now
 # documentation and it doesn't matter where they reside.
-make clean || exit 1
-make tooldir=$PREFIX $NUMJOBS || make tooldir=$PREFIX || exit 1
-make tooldir=$PREFIX install DESTDIR=$PKG || exit 1
+make clean
+make tooldir=$PREFIX
+make tooldir=$PREFIX install DESTDIR=$PKG
 
 # Using tooldir=/usr also makes the /usr/${TARGET}/lib${LIBDIRSUFFIX}
 # directory obsolete, and the build will no longer install it. But since
@@ -177,7 +176,7 @@ rm -rf $PKG/$PREFIX/$ARCH-slackware-linux
 
 # Delete unwanted programs
 rm -f  $PKG/$PREFIX/bin/{addr2line,ar,as,c++filt,dlltool,dllwrap,elfedit,gprof,ld.bfd,nm,objcopy,objdump,ranlib,readelf,size,strings,strip,windmc,windres}
- 
+
 mkdir -p $PKG/usr/bin
 cat << EOF > $PKG/usr/bin/ld$VERSION
 #!/bin/sh
@@ -220,8 +219,8 @@ chmod +x $PKG/usr/bin/ld$VERSION
 #  ( cd $PKG/$PREFIX/bin ; rm -f ld ; ln -sf $DEFAULT_LD ld )
 #fi
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Remove some unneeded man pages, and then compress the rest
 (cd $PKG/usr/man/man1; mv ld.1 ld$VERSION.1)
@@ -239,7 +238,7 @@ gzip -9 $PKG/usr/info/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp \
-  COPYING* ChangeLog.linux MAI* README* \
+  COPYING* ChangeLog* MAI* README* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
@@ -250,21 +249,8 @@ if [ -r ChangeLog ]; then
   touch -r ChangeLog $DOCSDIR/ChangeLog
 fi
 
-chown -R root:root $PKG/$PREFIX/doc/binutils-$VERSION
-
-# Add slack-desc:
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n /tmp/binutils-$VERSION-$ARCH-$BUILD$TAG.txz
-
-# Not relation for this package
-#cat << EOF
-#
-##############################
-#oprofile links to libbfd so
-#be sure to recompile that
-##############################
-#
-#EOF
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/newrelic-sysmond/newrelic-sysmond.SlackBuild b/system/newrelic-sysmond/newrelic-sysmond.SlackBuild
index d33cf0ce49..4ef84e7ba0 100644
--- a/system/newrelic-sysmond/newrelic-sysmond.SlackBuild
+++ b/system/newrelic-sysmond/newrelic-sysmond.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for newrelic-sysmond
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=newrelic-sysmond
 VERSION=${VERSION:-1.4.0.471}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -99,4 +109,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nilfs-utils/nilfs-utils.SlackBuild b/system/nilfs-utils/nilfs-utils.SlackBuild
index e9a0657de5..fc143b0635 100644
--- a/system/nilfs-utils/nilfs-utils.SlackBuild
+++ b/system/nilfs-utils/nilfs-utils.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nilfs-utils
 
-# Copyright 2010-2018 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2010-2021 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,37 +11,47 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nilfs-utils
-VERSION=${VERSION:-2.2.7}
+VERSION=${VERSION:-2.2.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -86,6 +96,10 @@ make install-strip DESTDIR=$PKG
 
 mv $PKG/etc/nilfs_cleanerd.conf $PKG/etc/nilfs_cleanerd.conf.new
 
+# Don't ship .la/.a files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.a
+
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -97,4 +111,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nilfs-utils/nilfs-utils.info b/system/nilfs-utils/nilfs-utils.info
index 724d3caf49..e7a3a012b9 100644
--- a/system/nilfs-utils/nilfs-utils.info
+++ b/system/nilfs-utils/nilfs-utils.info
@@ -1,10 +1,10 @@
 PRGNAM="nilfs-utils"
-VERSION="2.2.7"
+VERSION="2.2.8"
 HOMEPAGE="https://nilfs.sourceforge.io/en/"
-DOWNLOAD="https://nilfs.sourceforge.io/download/nilfs-utils-2.2.7.tar.bz2"
-MD5SUM="de16b06a7d04ca94b56dcfa37e569064"
+DOWNLOAD="https://nilfs.sourceforge.io/download/nilfs-utils-2.2.8.tar.bz2"
+MD5SUM="feb4fbf72679cb6449935d720b161aec"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+EMAIL="pprkut@slackbuilds.org"
diff --git a/system/nix/README b/system/nix/README
index dcfdc6383e..8e3152761d 100644
--- a/system/nix/README
+++ b/system/nix/README
@@ -1,22 +1,23 @@
 nix (functional package manager)
 
-Nix is a purely functional package manager. This means that it treats packages
-like values in purely functional programming languages such as Haskell -- they
-are built by functions that don't have side-effects, and they never change
-after they have been built. Nix stores packages in the Nix store, usually the
-directory /nix/store, where each package has its own unique subdirectory such
-as
+Nix is a purely functional package manager. This means that it treats
+packages like values in purely functional programming languages
+such as Haskell -- they are built by functions that don't have
+side-effects, and they never change after they have been built. Nix
+stores packages in the Nix store, usually the directory /nix/store,
+where each package has its own unique subdirectory such as
 
     /nix/store/b6gvzjyb2pg0kjfwrjmg1vfhh54ad73z-firefox-33.1/
 
-where b6gvzjyb2pg0... is a unique identifier for the package that captures all
-its dependencies (it's a cryptographic hash of the package's build dependency
-graph).
+where b6gvzjyb2pg0... is a unique identifier for the package that
+captures all its dependencies (it's a cryptographic hash of the
+package's build dependency graph).
 
-Nix may be run in single or multi-user mode (which requires the nix-daemon).
-The following sets up multi-user mode.
+Nix may be run in single or multi-user mode (which requires the
+nix-daemon).  The following sets up multi-user mode.
 
-To have the nix daemon start and stop with your host, add to /etc/rc.d/rc.local:
+To have the nix daemon start and stop with your host, add to
+/etc/rc.d/rc.local:
 
     if [ -x /etc/rc.d/rc.nix ]; then
       /etc/rc.d/rc.nix start
@@ -28,23 +29,23 @@ and to /etc/rc.d/rc.local_shutdown (creating it if needed):
       /etc/rc.d/rc.nix stop
     fi
 
-The daemon requires users for building the nix packages, which should be added
-under the 'nixbld' group.
+The daemon requires users for building the nix packages, which should
+be added under the 'nixbld' group.
 
     # groupadd -g 314 nixbld
     # for n in $(seq 1 10); do useradd -c "Nix build user $n" \
-    #     -d /var/empty -g nixbld -G nixbld -M -N -r -s "$(which nologin)" \
+    #     -d /var/empty -g nixbld -G nixbld -M -N -r -s /sbin/nologin \
     #     nixbld$n; done
 
-Restricting access to the daemon is acheived by setting file permissions for
-the daemon's socket's folder.
+Restricting access to the daemon is acheived by setting file
+permissions for the daemon's socket's folder.
 
     # groupadd nix-users
     # chgrp nix-users /nix/var/nix/daemon-socket
     # chmod ug=rwx,o= /nix/var/nix/daemon-socket
 
-Correct permissions must also be set for the following profile directories to
-give users access.
+Correct permissions must also be set for the following profile
+directories to give users access.
 
     # mkdir -p /nix/var/nix/profiles/per-user
     # chgrp nix-users /nix/var/nix/profiles/per-user
@@ -54,8 +55,8 @@ give users access.
     # chgrp nix-users /nix/var/nix/gcroots/per-user
     # chmod go+wt /nix/var/nix/gcroots/per-user
 
-For setup a user to use nix, add him to the nix-users group and load these
-lines on login (via $HOME/.profile):
+To setup a user to use nix, add him to the nix-users group and load
+these lines on login (via $HOME/.profile):
 
     export NIX_REMOTE=daemon
     source /etc/profile.d/nix.sh
diff --git a/system/nix/fix_nix_DIR_in_doc_local_mk.patch b/system/nix/fix_nix_DIR_in_doc_local_mk.patch
new file mode 100644
index 0000000000..375864b081
--- /dev/null
+++ b/system/nix/fix_nix_DIR_in_doc_local_mk.patch
@@ -0,0 +1,57 @@
+Subject: Fix build phase depending on installed binary
+Author: Thomas Koch <thomas@koch.ro>
+Bug: https://github.com/NixOS/nix/issues/5781
+Forwarded: https://github.com/NixOS/nix/pull/6015
+
+--- a/doc/manual/local.mk
++++ b/doc/manual/local.mk
+@@ -20,7 +20,7 @@ dummy-env = env -i \
+ 	NIX_STATE_DIR=/dummy \
+ 	NIX_CONFIG='cores = 0'
+ 
+-nix-eval = $(dummy-env) $(bindir)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw
++nix-eval = $(dummy-env) $(nix_DIR)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw
+ 
+ $(d)/%.1: $(d)/src/command-ref/%.md
+ 	@printf "Title: %s\n\n" "$$(basename $@ .1)" > $^.tmp
+@@ -44,31 +44,31 @@ $(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md
+ 	$(trace-gen) cat doc/manual/src/SUMMARY.md.in | while IFS= read line; do if [[ $$line = @manpages@ ]]; then cat doc/manual/src/command-ref/new-cli/SUMMARY.md; else echo "$$line"; fi; done > $@.tmp
+ 	@mv $@.tmp $@
+ 
+-$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/generate-manpage.nix $(bindir)/nix
++$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/generate-manpage.nix $(nix_DIR)/nix
+ 	@rm -rf $@
+ 	$(trace-gen) $(nix-eval) --write-to $@ --expr 'import doc/manual/generate-manpage.nix { command = builtins.readFile $<; renderLinks = true; }'
+ 
+-$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.nix $(d)/src/command-ref/conf-file-prefix.md $(bindir)/nix
++$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.nix $(d)/src/command-ref/conf-file-prefix.md $(nix_DIR)/nix
+ 	@cat doc/manual/src/command-ref/conf-file-prefix.md > $@.tmp
+ 	$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-options.nix (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp
+ 	@mv $@.tmp $@
+ 
+-$(d)/nix.json: $(bindir)/nix
+-	$(trace-gen) $(dummy-env) $(bindir)/nix __dump-args > $@.tmp
++$(d)/nix.json: $(nix_DIR)/nix
++	$(trace-gen) $(dummy-env) $(nix_DIR)/nix __dump-args > $@.tmp
+ 	@mv $@.tmp $@
+ 
+-$(d)/conf-file.json: $(bindir)/nix
+-	$(trace-gen) $(dummy-env) $(bindir)/nix show-config --json --experimental-features nix-command > $@.tmp
++$(d)/conf-file.json: $(nix_DIR)/nix
++	$(trace-gen) $(dummy-env) $(nix_DIR)/nix show-config --json --experimental-features nix-command > $@.tmp
+ 	@mv $@.tmp $@
+ 
+-$(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/expressions/builtins-prefix.md $(bindir)/nix
++$(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/expressions/builtins-prefix.md $(nix_DIR)/nix
+ 	@cat doc/manual/src/expressions/builtins-prefix.md > $@.tmp
+ 	$(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-builtins.nix (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp
+ 	@cat doc/manual/src/expressions/builtins-suffix.md >> $@.tmp
+ 	@mv $@.tmp $@
+ 
+-$(d)/builtins.json: $(bindir)/nix
+-	$(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-builtins > $@.tmp
++$(d)/builtins.json: $(nix_DIR)/nix
++	$(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(nix_DIR)/nix __dump-builtins > $@.tmp
+ 	@mv $@.tmp $@
+ 
+ # Generate the HTML manual.
diff --git a/system/nix/nix.SlackBuild b/system/nix/nix.SlackBuild
index 825db7c78a..135693305e 100644
--- a/system/nix/nix.SlackBuild
+++ b/system/nix/nix.SlackBuild
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nix
 
+# Copyright 2019-2022 Pouria Rezaei <Pouria.rz@outlook.com>
 # Copyright 2015 Pragmatic Cypher <slackbuilds@server.ky>
 # All rights reserved.
 #
@@ -22,10 +23,33 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220325 bkw: Modified by SlackBuilds.org: fix multiple issues:
+# - on 64-bit, /usr/bin/nix and some /usr/lib64/libnix*.so files
+#   were being written to the real root partition (this happened
+#   during "make", not "make install"). added a patch from Debian
+#   that prevents this.
+# - on 32-bit, the same thing happened, plus the build failed. the
+#   same patch fixes that.
+# - get rid of empty gzipped file usr/man/man1/nix3-manpages.gz.
+#
+# Note: this defeats ccache by default (it uses
+# e.g. x86_64-slackware-linux-gcc instead of just gcc). If you want
+# cacheable builds, export CC=gcc and CXX=g++ in the environment.
+#
+# Note: during the build, we get "warning: you don't have Internet
+# access; disabling some network-dependent features" when building
+# with network access disabled (e.g. in a container). I have no
+# idea if this is a problem, but it's something the maintainer might
+# want to look into. SlackBuilds aren't supposed to require network
+# access to run.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nix
-VERSION=${VERSION:-2.0.2}
+VERSION=${VERSION:-2.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +59,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,15 +88,22 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-${VERSION}.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20220325 bkw: patch from Debian, stops nix from installing
+# /usr/bin/nix and its libraries during "make". spamming the real
+# root partition is bad, m'kay?
+patch -p1 < $CWD/fix_nix_DIR_in_doc_local_mk.patch
 
+autoreconf -vfim
+autoheader
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -92,14 +127,15 @@ mkdir -p $PKG/var/nix/profiles
 mkdir -p $PKG/nix/var/nix/profiles
 mkdir -p $PKG/nix/var/nix/daemon-socket
 
-rm -fr $PKG/etc/init.d
-rm -fr $PKG/usr/lib/systemd
-
-mv $PKG/usr/lib/pkgconfig/ $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/
+rm -fR $PKG/etc/init.d
+rm -fR $PKG/usr/lib${LIBDIRSUFFIX}/systemd
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+# 20220325 bkw: this isn't even named correctly for a man page...
+rm -f $PKG/usr/man/man1/nix3-manpages.gz
+
 if [ "$ARCH" = "x86_64" ]; then
   rm -rf $PKG/usr/lib
 fi
@@ -113,4 +149,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nix/nix.info b/system/nix/nix.info
index 92e48aae74..2165c124bc 100644
--- a/system/nix/nix.info
+++ b/system/nix/nix.info
@@ -1,10 +1,10 @@
 PRGNAM="nix"
-VERSION="2.0.2"
+VERSION="2.8.1"
 HOMEPAGE="http://nixos.org/nix"
-DOWNLOAD="http://nixos.org/releases/nix/nix-2.0.2/nix-2.0.2.tar.xz"
-MD5SUM="1cd8ce214c1fd2792e445692c756f63e"
+DOWNLOAD="https://github.com/NixOS/nix/archive/2.8.1/nix-2.8.1.tar.gz"
+MD5SUM="b2b6a1756fc6e44fd78cebcb24818843"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libsodium libseccomp"
-MAINTAINER="Pragmatic Cypher"
-EMAIL="slackbuilds@server.ky"
+REQUIRES="gtest jq libeditline lowdown libcpuid mdbook nlohmann_json"
+MAINTAINER="Pouria Rezaei"
+EMAIL="Pouria.rz@outlook.com"
diff --git a/system/nkf/nkf.SlackBuild b/system/nkf/nkf.SlackBuild
index 3111e304a3..597f88b62b 100644
--- a/system/nkf/nkf.SlackBuild
+++ b/system/nkf/nkf.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nkf
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nkf
-VERSION=${VERSION:-2.1.4}
+VERSION=${VERSION:-2.1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,9 +69,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+SRC_VERSION=$(echo $VERSION|tr . _)
+rm -rf $PRGNAM-$SRC_VERSION
+tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.gz
+cd $PRGNAM-$SRC_VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -90,4 +101,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nkf/nkf.info b/system/nkf/nkf.info
index 30eedce9ec..79dd9235bc 100644
--- a/system/nkf/nkf.info
+++ b/system/nkf/nkf.info
@@ -1,8 +1,8 @@
 PRGNAM="nkf"
-VERSION="2.1.4"
+VERSION="2.1.5"
 HOMEPAGE="https://osdn.net/projects/nkf/"
-DOWNLOAD="http://rwthaachen.dl.osdn.jp/nkf/64158/nkf-2.1.4.tar.gz"
-MD5SUM="dbce0a2131cd4e30f73cbfdcc57c06ec"
+DOWNLOAD="https://github.com/nurse/nkf/archive/v2_1_5/nkf-2_1_5.tar.gz"
+MD5SUM="d66cfec484d9baad5adc49ba00221e88"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/nmon/README b/system/nmon/README
index 8aaf2baeea..540eb60570 100644
--- a/system/nmon/README
+++ b/system/nmon/README
@@ -3,9 +3,10 @@ nmon (Nigel's performance MONitor)
 This systems administrator, tuner, benchmark tool gives you a huge
 amount of important performance information in one go. It can output
 the data in different ways.
-You can display the CPU, memory, network, disks (mini graphs or numbers),
-file systems, NFS, top processes, resources. Save the data to a comma
-separated file for analysis and longer term data capture. Directly put
-your data into rrd database.
+
+You can display the CPU, memory, network, disks (mini graphs or
+numbers), file systems, NFS, top processes, resources. Save the
+data to a comma separated file for analysis and longer term data
+capture. Directly put your data into rrd database.
 
 Using export NMON=$(parms) you can change the default view.
diff --git a/system/nmon/nmon.SlackBuild b/system/nmon/nmon.SlackBuild
index 37f748b711..1aa6f13517 100644
--- a/system/nmon/nmon.SlackBuild
+++ b/system/nmon/nmon.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nmon
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nmon
 VERSION=${VERSION:-14i}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-g -O2 -march=i486 -mtune=i686 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -g -D X86"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-g -O2 -march=i586 -mtune=i686 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -g -D X86"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-g -O2 -march=i686 -mtune=i686 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -g -D X86"
@@ -85,4 +95,4 @@ mkdir -p $PKG/usr/bin
 cp $TMP/$PRGNAM/nmon $PKG/usr/bin/
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nmtree/nmtree.SlackBuild b/system/nmtree/nmtree.SlackBuild
index 9a24c1307e..c810f84bde 100644
--- a/system/nmtree/nmtree.SlackBuild
+++ b/system/nmtree/nmtree.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nmtree
 
@@ -24,10 +24,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nmtree
 VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -111,4 +121,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nnn/doinst.sh b/system/nnn/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/system/nnn/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/nnn/nnn.SlackBuild b/system/nnn/nnn.SlackBuild
index 8e330a69bb..43f58f1dfd 100644
--- a/system/nnn/nnn.SlackBuild
+++ b/system/nnn/nnn.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nnn
 
-# Copyright 2017-2020  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2017-2022  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2022-2024 Isaac Yu <isaacyu@protonmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nnn
-VERSION=${VERSION:-3.0}
+VERSION=${VERSION:-4.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +39,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,17 +80,24 @@ find -L . \
 # compile
 make CFLAGS="$SLKCFLAGS"
 
+# install executable, including desktop icons
+make DESTDIR=$PKG PREFIX=/usr MANPREFIX=/usr/man install
+make DESTDIR=$PKG PREFIX=/usr MANPREFIX=/usr/man install-desktop
+
+# Strip ELF binaries
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# install executable
-mkdir -p $PKG/usr/bin
-install -D -m0755 $PRGNAM $PKG/usr/bin/$PRGNAM
+# Compress man page
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+
+# install bash and zsh completions 
+install -Dm644 misc/auto-completion/bash/nnn-completion.bash $PKG/usr/share/bash-completion/completions/nnn
+install -Dm644 misc/auto-completion/zsh/_nnn $PKG/usr/share/zsh/site-functions/_nnn
 
-# install man page
-mkdir -p $PKG/usr/man/man1
-gzip -9 $PRGNAM.1
-install -D -m0644 $PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz
+# install quitcd (cd on quit script)
+# More details at: https://wiki.archlinux.org/title/Nnn#cd_on_quit_(Ctrl-G)
+install -Dm644 -t $PKG/usr/share/nnn/quitcd/ misc/quitcd/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CHANGELOG LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
@@ -90,6 +105,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nnn/nnn.info b/system/nnn/nnn.info
index ff9ad707c3..556abf7fff 100644
--- a/system/nnn/nnn.info
+++ b/system/nnn/nnn.info
@@ -1,10 +1,10 @@
 PRGNAM="nnn"
-VERSION="3.0"
+VERSION="4.9"
 HOMEPAGE="https://github.com/jarun/nnn"
-DOWNLOAD="https://github.com/jarun/nnn/archive/v3.0/nnn-3.0.tar.gz"
-MD5SUM="5550ba49f52b65f4097c1ac353b7ae64"
+DOWNLOAD="https://github.com/jarun/nnn/archive/v4.9/nnn-4.9.tar.gz"
+MD5SUM="4b2c880c78840f4f0d64b0fe84bbbf6c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/nologind/nologind.SlackBuild b/system/nologind/nologind.SlackBuild
index 499e83b83b..41f2bfc560 100644
--- a/system/nologind/nologind.SlackBuild
+++ b/system/nologind/nologind.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nologind <https://github.com/rodlie/nologind>
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nologind
 VERSION=${VERSION:-20181028}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 QMAKE=${QMAKE:-qmake}
 
 if [ -z "$ARCH" ]; then
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -97,4 +107,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nomarch/nomarch.SlackBuild b/system/nomarch/nomarch.SlackBuild
index 867432e032..0e950ffa93 100644
--- a/system/nomarch/nomarch.SlackBuild
+++ b/system/nomarch/nomarch.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nomarch
-# Copyright 2012 Bojan Popovic, Belgrade, Serbia <bocke@slackware-srbija.org>
+# Copyright 2012-2024 Bojan Popovic, Belgrade, Serbia <bocke@slackware-srbija.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,28 +22,38 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nomarch
 VERSION=${VERSION:-1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 DOCS="ChangeLog COPYING NEWS README TODO"
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -89,4 +99,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nomarch/nomarch.info b/system/nomarch/nomarch.info
index b21bf0ed07..8fbaa13fd3 100644
--- a/system/nomarch/nomarch.info
+++ b/system/nomarch/nomarch.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Bojan Popovic"
-EMAIL="bocke@mycity.rs"
+EMAIL="bocke@slackware-srbija.org"
diff --git a/system/noto-emoji/README b/system/noto-emoji/README
index 0afc38e079..098ab35df8 100644
--- a/system/noto-emoji/README
+++ b/system/noto-emoji/README
@@ -1,4 +1 @@
-noto-emoji - Color and Black-and-White Noto emoji fonts
-
-It seems to work well with chromium and gajim (firefox since version 52 bundles
-its own emoji font)
+noto-emoji - Color Noto emoji fonts
diff --git a/system/noto-emoji/noto-emoji.SlackBuild b/system/noto-emoji/noto-emoji.SlackBuild
index ed43f6653b..895eee3b6c 100644
--- a/system/noto-emoji/noto-emoji.SlackBuild
+++ b/system/noto-emoji/noto-emoji.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for noto-emoji
 
-# Copyright 2017-2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-2020,2022 Andrew Clemons, Wellington New Zealand
+# Copyright 2022-2023 Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,16 +23,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=noto-emoji
-VERSION=${VERSION:-20200916}
+VERSION=${VERSION:-2.042}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
-SRCVERSION=${SRCVERSION:-2020-09-16-unicode13_1}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -41,9 +47,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVERSION
-tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
-cd $PRGNAM-$SRCVERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -52,15 +58,11 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 install -d $PKG/usr/share/fonts/TTF/
-
 install -m644 fonts/NotoColorEmoji.ttf $PKG/usr/share/fonts/TTF/
 
-mkdir -p $PKG/etc/fonts/conf.avail/
-install -m 0644 $CWD/51-noto-color-emoji.conf.xml $PKG/etc/fonts/conf.avail/51-noto-color-emoji.conf
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS CONTRIBUTING.md CONTRIBUTORS LICENSE README.md  \
+  AUTHORS CONTRIBUTING.md CONTRIBUTORS LICENSE README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -69,4 +71,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/noto-emoji/noto-emoji.info b/system/noto-emoji/noto-emoji.info
index bf317e605a..08cd257fa9 100644
--- a/system/noto-emoji/noto-emoji.info
+++ b/system/noto-emoji/noto-emoji.info
@@ -1,10 +1,8 @@
 PRGNAM="noto-emoji"
-VERSION="20200916"
+VERSION="2.042"
 HOMEPAGE="https://www.google.com/get/noto/help/emoji/"
-DOWNLOAD="https://github.com/googlei18n/noto-emoji/archive/v2020-09-16-unicode13_1/noto-emoji-2020-09-16-unicode13_1.tar.gz \
-          https://gist.githubusercontent.com/hexchain/47f550472e79d0805060/raw/d9ecd5a5fcb901bcfb75115f4b602f6c1d3020c1/51-noto-color-emoji.conf.xml"
-MD5SUM="c32147c255b366c28a2c4d702e2cfda2 \
-        e2d9cf0460fa0315a8da5d8dedacf702"
+DOWNLOAD="https://github.com/googlei18n/noto-emoji/archive/v2.042/noto-emoji-2.042.tar.gz"
+MD5SUM="32f2e047f379bf9b4e4befac633178f7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/noto-emoji/slack-desc b/system/noto-emoji/slack-desc
index f8a4cce6a2..21a7abd353 100644
--- a/system/noto-emoji/slack-desc
+++ b/system/noto-emoji/slack-desc
@@ -8,8 +8,7 @@
           |-----handy-ruler------------------------------------------------------|
 noto-emoji: noto-emoji (Noto Emoji fonts)
 noto-emoji:
-noto-emoji: Color and Black-and-White Noto emoji fonts, and tools for working
-noto-emoji: with them.
+noto-emoji: Color Noto emoji fonts, and tools for working with them.
 noto-emoji:
 noto-emoji: https://github.com/googlei18n/noto-emoji
 noto-emoji:
@@ -17,3 +16,4 @@ noto-emoji:
 noto-emoji:
 noto-emoji:
 noto-emoji:
+noto-emoji:
diff --git a/system/noto-extra-ttf/README b/system/noto-extra-ttf/README
new file mode 100644
index 0000000000..15ae684057
--- /dev/null
+++ b/system/noto-extra-ttf/README
@@ -0,0 +1,4 @@
+noto-extra-ttf is a collection of Noto fonts that are not included in
+Slackware. They are mostly of religious, linguistic and/or historic
+interest, though some fonts for living languages with a limited online
+presence are included as well.
diff --git a/system/noto-extra-ttf/doinst.sh b/system/noto-extra-ttf/doinst.sh
new file mode 100644
index 0000000000..d119c4ef73
--- /dev/null
+++ b/system/noto-extra-ttf/doinst.sh
@@ -0,0 +1,10 @@
+# Update the X font indices:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd usr/share/fonts/TTF
+    /usr/bin/mkfontscale .
+    /usr/bin/mkfontdir .
+  )
+
+  [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f
+fi
diff --git a/system/noto-extra-ttf/font-list b/system/noto-extra-ttf/font-list
new file mode 100644
index 0000000000..77db330ab2
--- /dev/null
+++ b/system/noto-extra-ttf/font-list
@@ -0,0 +1,87 @@
+hinted/NotoSansAvestan-Regular.ttf
+hinted/NotoSansBamum-Regular.ttf
+hinted/NotoSansBuhid-Regular.ttf
+hinted/NotoSansCarian-Regular.ttf
+hinted/NotoSansCherokee-Black.ttf
+hinted/NotoSansCherokee-Bold.ttf
+hinted/NotoSansCherokee-Light.ttf
+hinted/NotoSansCherokee-Medium.ttf
+hinted/NotoSansCherokee-Regular.ttf
+hinted/NotoSansCherokee-Thin.ttf
+hinted/NotoSansCypriot-Regular.ttf
+hinted/NotoSansDeseret-Regular.ttf
+hinted/NotoSansEthiopic-Black.ttf
+hinted/NotoSansEthiopic-Bold.ttf
+hinted/NotoSansEthiopic-Light.ttf
+hinted/NotoSansEthiopic-Medium.ttf
+hinted/NotoSansEthiopic-Regular.ttf
+hinted/NotoSansEthiopic-Thin.ttf
+hinted/NotoSansGlagolitic-Regular.ttf
+hinted/NotoSansGothic-Regular.ttf
+hinted/NotoSansKayahLi-Regular.ttf
+hinted/NotoSansLisu-Regular.ttf
+hinted/NotoSansMandaic-Regular.ttf
+hinted/NotoSansNKo-Regular.ttf
+hinted/NotoSansOlChiki-Regular.ttf
+hinted/NotoSansOldTurkic-Regular.ttf
+hinted/NotoSansOsmanya-Regular.ttf
+hinted/NotoSansShavian-Regular.ttf
+hinted/NotoSansTibetan-Bold.ttf
+hinted/NotoSansTibetan-Regular.ttf
+hinted/NotoSansTifinagh-Regular.ttf
+hinted/NotoSansVai-Regular.ttf
+hinted/NotoSerifEthiopic-Black.ttf
+hinted/NotoSerifEthiopic-Bold.ttf
+hinted/NotoSerifEthiopic-Light.ttf
+hinted/NotoSerifEthiopic-Medium.ttf
+hinted/NotoSerifEthiopic-Regular.ttf
+hinted/NotoSerifEthiopic-Thin.ttf
+unhinted/NotoSansBalinese-Regular.ttf
+unhinted/NotoSansBatak-Regular.ttf
+unhinted/NotoSansBrahmi-Regular.ttf
+unhinted/NotoSansBuginese-Regular.ttf
+unhinted/NotoSansCanadianAboriginal-Regular.ttf
+unhinted/NotoSansCham-Black.ttf
+unhinted/NotoSansCham-Bold.ttf
+unhinted/NotoSansCham-Light.ttf
+unhinted/NotoSansCham-Medium.ttf
+unhinted/NotoSansCham-Regular.ttf
+unhinted/NotoSansCham-Thin.ttf
+unhinted/NotoSansCuneiform-Regular.ttf
+unhinted/NotoSansEgyptianHieroglyphs-Regular.ttf
+unhinted/NotoSansHanunoo-Regular.ttf
+unhinted/NotoSansImperialAramaic-Regular.ttf
+unhinted/NotoSansInscriptionalPahlavi-Regular.ttf
+unhinted/NotoSansInscriptionalParthian-Regular.ttf
+unhinted/NotoSansJavanese-Regular.ttf
+unhinted/NotoSansKaithi-Regular.ttf
+unhinted/NotoSansKharoshthi-Regular.ttf
+unhinted/NotoSansLepcha-Regular.ttf
+unhinted/NotoSansLimbu-Regular.ttf
+unhinted/NotoSansLinearB-Regular.ttf
+unhinted/NotoSansLycian-Regular.ttf
+unhinted/NotoSansLydian-Regular.ttf
+unhinted/NotoSansMeeteiMayek-Regular.ttf
+unhinted/NotoSansMongolian-Regular.ttf
+unhinted/NotoSansNewTaiLue-Regular.ttf
+unhinted/NotoSansOgham-Regular.ttf
+unhinted/NotoSansOldPersian-Regular.ttf
+unhinted/NotoSansOldSouthArabian-Regular.ttf
+unhinted/NotoSansPhagsPa-Regular.ttf
+unhinted/NotoSansPhoenician-Regular.ttf
+unhinted/NotoSansRejang-Regular.ttf
+unhinted/NotoSansRunic-Regular.ttf
+unhinted/NotoSansSamaritan-Regular.ttf
+unhinted/NotoSansSaurashtra-Regular.ttf
+unhinted/NotoSansSundanese-Regular.ttf
+unhinted/NotoSansSylotiNagri-Regular.ttf
+unhinted/NotoSansSyriacEastern-Regular.ttf
+unhinted/NotoSansSyriacEstrangela-Regular.ttf
+unhinted/NotoSansSyriacWestern-Regular.ttf
+unhinted/NotoSansTagalog-Regular.ttf
+unhinted/NotoSansTagbanwa-Regular.ttf
+unhinted/NotoSansTaiLe-Regular.ttf
+unhinted/NotoSansTaiTham-Regular.ttf
+unhinted/NotoSansTaiViet-Regular.ttf
+unhinted/NotoSansUgaritic-Regular.ttf
+unhinted/NotoSansYi-Regular.ttf
diff --git a/system/noto-extra-ttf/noto-extra-ttf.SlackBuild b/system/noto-extra-ttf/noto-extra-ttf.SlackBuild
new file mode 100644
index 0000000000..62fb021fef
--- /dev/null
+++ b/system/noto-extra-ttf/noto-extra-ttf.SlackBuild
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+# Slackware build script for noto-extra-ttf
+
+# Copyright 2023 K. Eugene Carlson  Tsukuba, Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=noto-extra-ttf
+SRCNAM=noto-fonts
+VERSION=${VERSION:-20171024}
+SRCVER=${SRCVER:-2017-10-24-phase3-second-cleanup}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$SRCVER
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+cd $SRCNAM-$SRCVER
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/share/fonts/TTF
+# Only install the "extra" fonts.
+while read -r font; do
+  install -m 644 $font $PKG/usr/share/fonts/TTF/
+done < $CWD/font-list
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE.md
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/noto-extra-ttf/noto-extra-ttf.info b/system/noto-extra-ttf/noto-extra-ttf.info
new file mode 100644
index 0000000000..45a8ee2fa2
--- /dev/null
+++ b/system/noto-extra-ttf/noto-extra-ttf.info
@@ -0,0 +1,10 @@
+PRGNAM="noto-extra-ttf"
+VERSION="20171024"
+HOMEPAGE="https://notofonts.github.io"
+DOWNLOAD="https://github.com/notofonts/noto-fonts/archive/refs/tags/v2017-10-24-phase3-second-cleanup/noto-fonts-2017-10-24-phase3-second-cleanup.tar.gz"
+MD5SUM="0dc4ff0a99fe81201df099bfe03ce52f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/noto-extra-ttf/slack-desc b/system/noto-extra-ttf/slack-desc
new file mode 100644
index 0000000000..fba093191e
--- /dev/null
+++ b/system/noto-extra-ttf/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+noto-extra-ttf: noto-extra-ttf (extra Noto fonts)
+noto-extra-ttf:
+noto-extra-ttf: noto-extra-ttf is a collection of Noto fonts that are not included in
+noto-extra-ttf: Slackware. They are mostly of religious, linguistic and/or historic
+noto-extra-ttf: interest, though some fonts for living languages with a limited online
+noto-extra-ttf: presence are included as well.
+noto-extra-ttf:
+noto-extra-ttf:
+noto-extra-ttf:
+noto-extra-ttf:
+noto-extra-ttf: Homepage: https://notofonts.github.io
diff --git a/system/noto-fonts/66-noto-mono.conf b/system/noto-fonts/66-noto-mono.conf
deleted file mode 100644
index c003973938..0000000000
--- a/system/noto-fonts/66-noto-mono.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <alias>
-    <family>monospace</family>
-    <prefer>
-      <family>Noto Mono</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>Noto Mono</family>
-    <default>
-      <family>monospace</family>
-    </default>
-  </alias>
-</fontconfig>
diff --git a/system/noto-fonts/66-noto-sans.conf b/system/noto-fonts/66-noto-sans.conf
deleted file mode 100644
index 012aebedf8..0000000000
--- a/system/noto-fonts/66-noto-sans.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>Noto Sans</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>Noto Sans</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-</fontconfig>
diff --git a/system/noto-fonts/66-noto-serif.conf b/system/noto-fonts/66-noto-serif.conf
deleted file mode 100644
index 036baf7764..0000000000
--- a/system/noto-fonts/66-noto-serif.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>Noto Serif</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>Noto Serif</family>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
-</fontconfig>
diff --git a/system/noto-fonts/README b/system/noto-fonts/README
deleted file mode 100644
index 91b48a4d6f..0000000000
--- a/system/noto-fonts/README
+++ /dev/null
@@ -1,14 +0,0 @@
-noto-fonts (Googles Noto fonts)
-
-Noto's goal is to provide a beautiful reading experience for all
-languages.
-
-It is a free, professionally-designed, open-source collection of
-fonts with a harmonious look and feel in multiple weights and styles.
-Noto fonts are published under the SIL Open Font License (OFL) v1.1.
-which allows you to copy, modify, and redistribute them if you need.
-
-Currently, Noto covers all major languages of the world and many
-others, including European, African, Middle Eastern, Indic, South and
-Southeast Asian, Central Asian, American, and East Asian languages.
-Several minority and historical languages are also supported.
diff --git a/system/noto-fonts/doinst.sh b/system/noto-fonts/doinst.sh
deleted file mode 100644
index 8fec9f5340..0000000000
--- a/system/noto-fonts/doinst.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# Update the X font indexes:
-if [ -x /usr/bin/mkfontdir ]; then
-  ( cd /usr/share/fonts/TTF
-    mkfontscale .
-    mkfontdir .
-  )
-fi
-
-if [ -x /usr/bin/fc-cache ]; then
-  /usr/bin/fc-cache -f
-fi
diff --git a/system/noto-fonts/noto-fonts.SlackBuild b/system/noto-fonts/noto-fonts.SlackBuild
deleted file mode 100644
index b13b7d7f67..0000000000
--- a/system/noto-fonts/noto-fonts.SlackBuild
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for noto-fonts.
-#
-# Copyright 2016-2018  Edinaldo P. Silva, Rio de Janeiro, Brazil.
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=noto-fonts
-VERSION=${VERSION:-20180624}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-SRCVER=${SRCVER:-449470a4d83f6eecdb4a537ab66fcbb5ff28917a}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz --exclude=hinted/{Arimo*.ttf,Cousine*.ttf,Tinos*.ttf}
-mv $PRGNAM-$SRCVER $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-install -d $PKG/usr/share/fonts/TTF/
-install -m644 alpha/Noto*.tt[fc] $PKG/usr/share/fonts/TTF/
-install -m644 hinted/Noto*.tt[fc] $PKG/usr/share/fonts/TTF/
-install -m644 unhinted/Noto*.tt[fc] $PKG/usr/share/fonts/TTF/
-
-mkdir -p $PKG/etc/fonts/conf.avail
-install -m644 $CWD/*.conf $PKG/etc/fonts/conf.avail/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp FAQ.md issue_template.md LICENSE NEWS.md README.md $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/noto-fonts/noto-fonts.info b/system/noto-fonts/noto-fonts.info
deleted file mode 100644
index b499de501b..0000000000
--- a/system/noto-fonts/noto-fonts.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="noto-fonts"
-VERSION="20180624"
-HOMEPAGE="https://github.com/googlei18n/noto-fonts"
-DOWNLOAD="https://github.com/googlei18n/noto-fonts/archive/449470a4d83f6eecdb4a537ab66fcbb5ff28917a/noto-fonts-449470a4d83f6eecdb4a537ab66fcbb5ff28917a.tar.gz"
-MD5SUM="acd40dfe3dca60cfb545afd3cba944f4"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Edinaldo P. Silva"
-EMAIL="edps.mundognu@gmail.com"
diff --git a/system/noto-fonts/slack-desc b/system/noto-fonts/slack-desc
deleted file mode 100644
index 2c34909d4f..0000000000
--- a/system/noto-fonts/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-          |-----handy-ruler------------------------------------------------------|
-noto-fonts: noto-fonts (Googles Noto fonts)
-noto-fonts:
-noto-fonts: Noto's goal is to provide a beautiful reading experience for all
-noto-fonts: languages.
-noto-fonts:
-noto-fonts: It is a free, professionally-designed, open-source collection of
-noto-fonts: fonts with a harmonious look and feel in multiple weights and styles.
-noto-fonts: Noto fonts are published under the SIL Open Font License (OFL) v1.1.
-noto-fonts:
-noto-fonts: Home page: https://github.com/googlei18n/noto-fonts
-noto-fonts:
diff --git a/system/nrg2cue/README b/system/nrg2cue/README
new file mode 100644
index 0000000000..14bdadc2a2
--- /dev/null
+++ b/system/nrg2cue/README
@@ -0,0 +1,9 @@
+nrg2cue (convert Nero .nrg CD images to bin/cue)
+
+Usage: nrg2cue <file.NRG> [output.ISO]
+
+If you specify the output ISO file, it will be generated too.
+
+If you're wondering "Where is the .bin file?", the answer is that the
+generated .cue file uses the .nrg image as the "bin" file, since it
+contains all the data in the image anyway.
diff --git a/system/nrg2cue/nrg2cue.SlackBuild b/system/nrg2cue/nrg2cue.SlackBuild
new file mode 100644
index 0000000000..74c3aefabf
--- /dev/null
+++ b/system/nrg2cue/nrg2cue.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Slackware build script for nrg2cue
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=nrg2cue
+VERSION=${VERSION:-0.1.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+unzip -p $CWD/$PRGNAM.zip $PRGNAM.c > $PRGNAM.c
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
+# This is just a single C source file, with no documentation or even a
+# Makefile.
+mkdir -p $PKG/usr/bin $PKGDOC
+${CC:-gcc} $SLKCFLAGS -Wl,-s -o $PKG/usr/bin/$PRGNAM $PRGNAM.c
+
+# The license is GPL, in comments in the source.
+sed -n '2,18p' $PRGNAM.c > $PKGDOC/LICENSE
+
+# Include our own README, it may be helpful.
+cat $CWD/README > $PKGDOC/README
+
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nrg2cue/nrg2cue.info b/system/nrg2cue/nrg2cue.info
new file mode 100644
index 0000000000..e17a151b90
--- /dev/null
+++ b/system/nrg2cue/nrg2cue.info
@@ -0,0 +1,10 @@
+PRGNAM="nrg2cue"
+VERSION="0.1.1"
+HOMEPAGE="https://aluigi.altervista.org/mytoolz.htm"
+DOWNLOAD="https://aluigi.altervista.org/mytoolz/nrg2cue.zip"
+MD5SUM="eb4d8416d18f9ee59f9f3f21016b6820"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/nrg2cue/slack-desc b/system/nrg2cue/slack-desc
new file mode 100644
index 0000000000..7e6212f8d4
--- /dev/null
+++ b/system/nrg2cue/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+nrg2cue: nrg2cue (convert Nero .nrg CD images to bin/cue)
+nrg2cue:
+nrg2cue: Usage: nrg2cue <file.NRG> [output.ISO]
+nrg2cue:
+nrg2cue: If you specify the output ISO file, it will be generated too.
+nrg2cue:
+nrg2cue:
+nrg2cue:
+nrg2cue:
+nrg2cue:
+nrg2cue:
diff --git a/system/nsca-ng/README b/system/nsca-ng/README
index 87ecfb81f4..35543c9d59 100644
--- a/system/nsca-ng/README
+++ b/system/nsca-ng/README
@@ -1,8 +1,13 @@
 nsca-ng (NSCA-ng is a drop-in replacement for NSCA)
 
-NSCA-ng provides a client-server pair which makes the command pipe accessible
-to remote systems. This allows for submitting passive check results, downtimes
-and many other commands to Nagios or Icinga.
+NSCA-ng provides a client-server pair which makes the command pipe
+accessible to remote systems. This allows for submitting passive check
+results, downtimes and many other commands to Nagios or Icinga.
 
 See README.SLACKWARE (which is also installed with the package docs) for
 setup, configuration, and usage hints.
+
+You must have nsca user and a group to run this script:
+
+# groupadd -g 302 nsca
+# useradd -u 302 -d /dev/null -s /bin/false -g nsca nsca
diff --git a/system/nsca-ng/nsca-ng.SlackBuild b/system/nsca-ng/nsca-ng.SlackBuild
index bcf95eacf9..3cd0cd8c93 100644
--- a/system/nsca-ng/nsca-ng.SlackBuild
+++ b/system/nsca-ng/nsca-ng.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nsca-ng
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nsca-ng
 VERSION=${VERSION:-1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,7 +76,7 @@ cat << EOF
 
 EOF
 
-  exit
+  exit 1
 fi
 
 set -e
@@ -130,4 +140,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nss-pam-ldapd/README b/system/nss-pam-ldapd/README
deleted file mode 100644
index bb4b25566a..0000000000
--- a/system/nss-pam-ldapd/README
+++ /dev/null
@@ -1,5 +0,0 @@
-nss-pam-ldap is a Name Service Switch (NSS) module and Pluggable
-Authentication Module (PAM) that allows your LDAP server to provide
-user account, group, host name, alias, netgroup, and basically any
-other information that you would normally get from /etc flat files
-or NIS.  It also allows you to do authentication to an LDAP server.
diff --git a/system/nss-pam-ldapd/doinst.sh b/system/nss-pam-ldapd/doinst.sh
deleted file mode 100644
index d483abce26..0000000000
--- a/system/nss-pam-ldapd/doinst.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-config etc/nslcd.conf.new
-preserve_perms etc/rc.d/rc.nss-pam-ldapd.new
diff --git a/system/nss-pam-ldapd/nss-pam-ldapd.SlackBuild b/system/nss-pam-ldapd/nss-pam-ldapd.SlackBuild
deleted file mode 100644
index ac14ec8fbf..0000000000
--- a/system/nss-pam-ldapd/nss-pam-ldapd.SlackBuild
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for nss-pam-ldapd
-
-# Copyright (c) 2009-2013 Christopher Walker <kris240376@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the following disclaimer
-#   in the documentation and/or other materials provided with the
-#   distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=nss-pam-ldapd
-VERSION=${VERSION:-0.8.12}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-pam \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mv $PKG/etc/nslcd.conf $PKG/etc/nslcd.conf.new
-chmod 0600 $PKG/etc/nslcd.conf.new
-
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.nss-pam-ldapd > $PKG/etc/rc.d/rc.nss-pam-ldapd.new
-
-mkdir -p $PKG/var/run/nslcd
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog* HACKING INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nss-pam-ldapd/nss-pam-ldapd.info b/system/nss-pam-ldapd/nss-pam-ldapd.info
deleted file mode 100644
index a79bf47ade..0000000000
--- a/system/nss-pam-ldapd/nss-pam-ldapd.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="nss-pam-ldapd"
-VERSION="0.8.12"
-HOMEPAGE="https://arthurdejong.org/nss-pam-ldapd/"
-DOWNLOAD="https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.8.12.tar.gz"
-MD5SUM="83121b0a536e763a9c0e3eec66ab2ef8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Christopher Walker"
-EMAIL="kris240376@gmail.com"
diff --git a/system/nss-pam-ldapd/rc.nss-pam-ldapd b/system/nss-pam-ldapd/rc.nss-pam-ldapd
deleted file mode 100644
index 0630c0a349..0000000000
--- a/system/nss-pam-ldapd/rc.nss-pam-ldapd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# rc.nss-pam-ldapd:  start/stop/restart nslcd
-#
-# nslcd is a daemon that will do LDAP queries for local processes that want
-# to do user, group, and other naming lookups (NSS), or do user authentication,
-# authorization, or password modification (PAM).  slapd is typically invoked
-# at boot time, usually out of /etc/rc.d/rc.local.
-#
-
-nslcd_start() {
-  if [ -x /usr/sbin/nslcd -a -r /etc/nslcd.conf ]; then
-    echo "Starting nslcd name service daemon:  /usr/sbin/nslcd"
-    /usr/sbin/nslcd
-  fi
-}
-
-nslcd_stop() {
-  echo "Stopping nslcd name service daemon..."
-  killall nslcd
-}
-
-case "$1" in
-'start')
-  nslcd_start
-  ;;
-'stop')
-  nslcd_stop
-  ;;
-'restart')
-  nslcd_stop
-  sleep 2
-  nslcd_start
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-esac
diff --git a/system/nss-pam-ldapd/slack-desc b/system/nss-pam-ldapd/slack-desc
deleted file mode 100644
index d82845204e..0000000000
--- a/system/nss-pam-ldapd/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-             |-----handy-ruler------------------------------------------------------|
-nss-pam-ldapd: nss-pam-ldapd (LDAP NSS/PAM module)
-nss-pam-ldapd:
-nss-pam-ldapd: nss-pam-ldapd is a NSS and PAM module that allows your LDAP server to
-nss-pam-ldapd: provide user account, group, host name, alias, netgroup, and basically
-nss-pam-ldapd: any other information that you would normally get from /etc/ flat
-nss-pam-ldapd: files or NIS.  It also allows you to do authentication to an LDAP
-nss-pam-ldapd: server.
-nss-pam-ldapd:
-nss-pam-ldapd: Homepage: https://arthurdejong.org/nss-pam-ldapd/
-nss-pam-ldapd:
-nss-pam-ldapd:
diff --git a/system/nss_ldap/README b/system/nss_ldap/README
index 08b9d1e916..79127d372d 100644
--- a/system/nss_ldap/README
+++ b/system/nss_ldap/README
@@ -1,7 +1,8 @@
-The resolution of the entities defined in RFC 2307 is generally performed
-by a set of UNIX C library calls (such as getpwnam() to return the attributes
-of a user).  The nss_ldap module provides the means for Solaris and Linux
-workstations to get this information (such as users, hosts, and groups) from
-LDAP directories.  The module is the reference implementation of RFC 2307,
-and has been studied by vendors such as Sun (who developed the original
-Name Service Switch interface).
+The resolution of the entities defined in RFC 2307 is generally
+performed by a set of UNIX C library calls (such as getpwnam()
+to return the attributes of a user). The nss_ldap module provides
+the means for Solaris and Linux workstations to get this information
+(such as users, hosts, and groups) from LDAP directories. The module
+is the reference implementation of RFC 2307, and has been studied by
+vendors such as Sun (who developed the original Name Service Switch
+interface).
diff --git a/system/nss_ldap/nss_ldap.SlackBuild b/system/nss_ldap/nss_ldap.SlackBuild
index 285d8e60e2..e169b87ca7 100644
--- a/system/nss_ldap/nss_ldap.SlackBuild
+++ b/system/nss_ldap/nss_ldap.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nss_ldap
 
@@ -28,26 +28,38 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - strip library.
+# - i486 => i586.
+# - remove useless INSTALL from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nss_ldap
 VERSION=${VERSION:-265}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -70,9 +82,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 patch -p0 < $CWD/nss_ldap.patch
 CFLAGS="$SLKCFLAGS" \
@@ -85,22 +97,23 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
 mv $PKG/etc/ldap.conf $PKG/etc/ldap.conf.new
 mv $PKG/etc/nsswitch.ldap $PKG/etc/nsswitch.conf-ldap
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+gzip -9 $PKG/usr/man/man*/*
 rm -rf $PKG/usr/usr	# no idea why this happens
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  ANNOUNCE AUTHORS COPYING ChangeLog INSTALL NEWS README doc/README* doc/*.txt \
+  ANNOUNCE AUTHORS COPYING ChangeLog NEWS README doc/README* doc/*.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nss_ldap/nss_ldap.info b/system/nss_ldap/nss_ldap.info
index c146345bd2..59eebb673d 100644
--- a/system/nss_ldap/nss_ldap.info
+++ b/system/nss_ldap/nss_ldap.info
@@ -1,7 +1,7 @@
 PRGNAM="nss_ldap"
 VERSION="265"
 HOMEPAGE="https://www.padl.com/OSS/nss_ldap.html"
-DOWNLOAD="https://www.padl.com/download/nss_ldap-265.tar.gz"
+DOWNLOAD="https://ftp.netbsd.org/pub/pkgsrc/distfiles/nss_ldap-265.tar.gz"
 MD5SUM="c1cb02d1a85538cf16bca6f6a562abe4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/ntopng/README b/system/ntopng/README
new file mode 100644
index 0000000000..90ce3d179d
--- /dev/null
+++ b/system/ntopng/README
@@ -0,0 +1,99 @@
+ntopng is a network probe that shows network usage in a way similar to
+what top does for processes. It acts as a Web
+server, creating an HTML dump of the network status.
+
+It is a successor to ntop, which is discontinued. Main differences seem
+to be:
+
+a. No terminal interface present. Only web.
+b. No built-in flow collector, at least not for NetFlow or sFlow.
+
+When installing ntopng, pay attention to the following:
+
+1. UID/GID
+ntopng needs to run under its own user/group. This has been assigned to
+the following by SlackBuilds.org, but feel free to change it on your
+system for consistency with local assignments.
+  User:   ntopng            UID: 212        GID: 212
+  group:  ntopng                            GID: 212
+You can change pass alternate values for the user and group using
+NTOPUSER and NTOPGROUP variables when running the build script.
+
+The build script will suggest creating these groups if they are not
+present.
+
+2. Log rotation.
+
+Logs are placed in /var/log/ntopng/ and will be rotated every week. The
+log rotation will restart the ntopng server which will reset the ntopng
+statistics. If you want to keep the statistics you have to edit or
+delete the /etc/logrotate.d/ntopng file.
+
+3. Flow collection
+
+ntopng now uses a custom flow collection format, based on zeromq. To
+convert a standard NetFlow or sFlow into this format, the developer
+suggess bying their commercial tool called nProbe.
+
+However, there exists a free software flow collection (supporting only)
+NetFlowV9, called netflow2ng. It is not available on SBo, but there is
+an unfinished SlackBuild for it, which can be found on
+
+https://gitlab.com/Lockywolf/lwfslackbuilds/-/raw/master/\
+10_unfit-for-sbo-require-network/netflow2ng/\
+netflow2ng.SlackBuild?ref_type=heads
+
+4. Geoidentification and dynamic data
+
+ntopng depends on some dynamic data in order to display relevant
+information about the flows.
+
+a. Geographical distribution of IP addresses. ntopng can use both
+   maxmind, and db-ip information, both free-low-quality, and
+   paid-high-quality. Maxmind data can be updated by running
+   geoipupdate from cron on a weekly basis. These data are usually
+   installed globally, into /var/lib/GeoIP/. For more information,
+   consult doc/README.geolocation.md, and keep in mind that ntopng-data
+   does not exist on Slackware, but geoipupdate does.
+b. Various lists:
+'Abuse.ch URLhaus' [https://urlhaus.abuse.ch/downloads/hostfile/]
+'Emerging Threats' [https://rules.emergingthreats.net/fwrules/\
+emerging-Block-IPs.txt]
+'NoCoin Filter List' [https://raw.githubusercontent.com/hoshsadiq/\
+adblock-nocoin-list/master/hosts.txt]
+'SSLBL Botnet C2 IP Blacklist' [https://sslbl.abuse.ch/blacklist/\
+sslipblacklist.txt]
+'Stratosphere Lab' [https://mcfp.felk.cvut.cz/publicDatasets/\
+CTU-AIPP-BlackList/Todays-Blacklists/\
+AIP_historical_blacklist_prioritized_by_newest_attackers.csv]
+'ThreatFox' [https://threatfox.abuse.ch/downloads/hostfile/]
+'dshield 7 days' [https://raw.githubusercontent.com/firehol/\
+blocklist-ipsets/master/dshield_7d.netset]
+        Those lists are updated automatically by ntopng, periodically.
+        There is a configuration option to disable these updates.
+
+
+5. nDPI
+
+ntopng depends on nDPI, a Deep Packet Inspection library. SBo has a
+SlackBuild for nDPI, however, in recent versions ntopng prefers to use
+its own version of nDPI, linked-in statically. If you find that the
+built-in version deviates in features from the standalone one, you are
+welcome to report this.
+
+6. redis
+
+ntopng requires redis. The version on SBo is enough, but it needs to
+be running before ntopng can be started.
+
+7. ntopng crashes when started as a daemon. I am not sure why. The
+initscript at the moment just starts it in the background and disowns.
+ntopng also does not terminate on sigterm normally, hence the rc script
+kill-9's it. If you have better ideas, submit a patch to the slackbuild.
+Due to all this stupidities, rc.ntopng is a .new script, so it will not
+be overwritten on upgrade. We really need a better version.
+
+8. ntopng goes insane when it sees "virtual ethernets" that are usually
+created to communicate between network namespaces. Do not be surprised
+if weird effect appear, and possibly remove those virtual ethernets
+from the listening list.
diff --git a/system/ntopng/doinst.sh b/system/ntopng/doinst.sh
new file mode 100644
index 0000000000..1250e7e18c
--- /dev/null
+++ b/system/ntopng/doinst.sh
@@ -0,0 +1,25 @@
+config() {
+    NEW="$1"
+    OLD="$(dirname $NEW)/$(basename $NEW .new)"
+    # If there's no config file by that name, mv it over:
+    if [ ! -r $OLD ]; then
+        mv $NEW $OLD
+    elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
+        rm $NEW
+    fi
+    # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.ntopng.new
+config etc/logrotate.d/ntopng.new
diff --git a/system/ntopng/ntopng.SlackBuild b/system/ntopng/ntopng.SlackBuild
new file mode 100644
index 0000000000..f0e662cb46
--- /dev/null
+++ b/system/ntopng/ntopng.SlackBuild
@@ -0,0 +1,187 @@
+#!/bin/bash
+
+# Slackware build script for ntopng
+
+# Copyright 2023, Lockywolf
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ntopng
+PRGNAM2=nDPI
+VERSION=${VERSION:-6.0}
+VERSION2=${VERSION2:-4.8}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+MUID=${MUID:-212}
+MGID=${MGID:-212}
+NTOPUSER=${NTOPUSER:-ntopng}
+NTOPGROUP=${NTOPGROUP:-ntopng}
+
+if ! getent group ntopng 2>&1 > /dev/null; then
+  echo "  You must have an ntopng group to run this script."
+  echo "    # groupadd -g $MGID ntopng"
+  exit 1
+elif ! getent passwd ntopng 2>&1 > /dev/null; then
+  echo "  You must have a ntopng user to run this script."
+  echo "    # useradd -u $MUID -g $MGID -d /var/lib/ntopng ntopng"
+  exit 1
+fi
+
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O0 -fPIC -ggdb"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION $PRGNAM2-$VERSION2
+#tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM2-$VERSION2.tar.gz
+cd $PRGNAM2-$VERSION2
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
+
+./autogen.sh
+CXX='ccache g++' \
+CC='ccache gcc'   \
+   CFLAGS="$SLKCFLAGS" \
+   CXXFLAGS="$SLKCFLAGS" ./configure  --with-pcre \
+  --with-maxminddb
+make
+
+export NDPI_HOME=$TMP/$PRGNAM2-$VERSION2
+
+rm -rf ntopng-dist-222d5a0e9ce7b60689b014898f3fc84b3c493687
+tar xvf $CWD/ntopng-dist-222d5a0e9ce7b60689b014898f3fc84b3c493687.tar.gz
+
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+#cd ../$PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
+
+rmdir httpdocs/dist
+mv ../ntopng-dist-222d5a0e9ce7b60689b014898f3fc84b3c493687 httpdocs/dist
+
+./autogen.sh
+CXX='ccache g++' \
+CC='ccache gcc'   \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --datadir=/var/lib/ntopng \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --with-pcre \
+  --with-maxminddb \
+  --build=$ARCH-slackware-linux
+sed -i 's|-lhiredis|-lhiredis -lpcre|g' Makefile
+
+sed -i  's|callbacks_dir = ntop->getValidPath(callbacks_dir);|callbacks_dir = "/usr/share/ntopng/scripts/callbacks";|g' src/Prefs.cpp
+
+make
+make install DESTDIR=$PKG
+cp packages/wizard/ntopng-config $PKG/usr/bin
+
+strip $PKG/usr/bin/ntopng
+
+rm $PKG/usr/share/ntopng/httpdocs/geoip/README.geolocation.md
+
+install -D -m 0644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
+
+mkdir -p $PKG/var/{lib,log}/$PRGNAM
+chown ntopng:ntopng $PKG/var/{lib,log}/$PRGNAM
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/etc/logrotate.d $PKG/etc/rc.d
+install -m 0644 $CWD/$PRGNAM.logrotate $PKG/etc/logrotate.d/$PRGNAM.new
+# sed \
+#   -e "s%@NTOPUSER@%$NTOPUSER%" \
+#   -e "s%@NTOPGROUP@%$NTOPGROUP%" \
+#   $CWD/rc.ntopng > $PKG/etc/rc.d/rc.ntopng.new
+cat $CWD/rc.ntopng > $PKG/etc/rc.d/rc.ntopng.new
+
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/nDPI
+
+cp -a *.md COPYING LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+
+( cd $TMP/$PRGNAM2-$VERSION2
+  cp -a *.md COPYING $PKG/usr/doc/$PRGNAM-$VERSION/nDPI )
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ntopng/ntopng.info b/system/ntopng/ntopng.info
new file mode 100644
index 0000000000..02764f6a21
--- /dev/null
+++ b/system/ntopng/ntopng.info
@@ -0,0 +1,14 @@
+PRGNAM="ntopng"
+VERSION="6.0"
+HOMEPAGE="https://www.ntop.org"
+DOWNLOAD="https://github.com/ntop/ntopng/archive/6.0/ntopng-6.0.tar.gz \
+https://github.com/ntop/nDPI/archive/4.8/nDPI-4.8.tar.gz \
+https://github.com/ntop/ntopng-dist/archive/222d5a0e9ce7b60689b014898f3fc84b3c493687/ntopng-dist-222d5a0e9ce7b60689b014898f3fc84b3c493687.tar.gz"
+MD5SUM="a6f2a09a3114841ea020b23de6db9081 \
+41a5437fa7d274f59f852b17b776558f \
+488fe73c0a221bdab7c74f21720dbe41"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="GeoIP graphviz rrdtool redis hiredis zeromq libmaxminddb"
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.ntopng_2023-11-20@lockywolf.net"
diff --git a/system/ntopng/ntopng.logrotate b/system/ntopng/ntopng.logrotate
new file mode 100644
index 0000000000..05c75dea39
--- /dev/null
+++ b/system/ntopng/ntopng.logrotate
@@ -0,0 +1,11 @@
+/var/log/ntopng {
+    # based on ntopng.logrotate included in the ntopng/debian source.
+    weekly
+    missingok
+    rotate 4
+    # ntopng doesn't handle SIGHUP
+    copytruncate
+    nocompress
+    notifempty
+    create 640 root wheel
+}
diff --git a/system/ntopng/rc.ntopng b/system/ntopng/rc.ntopng
new file mode 100644
index 0000000000..b05335359d
--- /dev/null
+++ b/system/ntopng/rc.ntopng
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+# /etc/rc.d/rc.ntopng : start/stop/restart ntopng
+# usage: ./rc.ntopng { start | stop | restart }
+
+# Thanks to andarius <andarius@errantnutron.com> for donating
+# time and the various cleanups in the script and the start|stop|restart
+# functions.
+
+NTOPUID=ntopng
+NTOPGID=ntopng
+NTOPLOG=/var/log/ntopng/ntopng.log
+DATE=$(date +%a\ %b\ %d\ %T\ %Y)
+RETVAL=0
+
+# Sanity Checking
+if [  ! -r "/var/lib/ntopng/" ]; then
+    echo "Can not read ntopng state directory. Exiting..."
+    exit 1
+fi
+
+ntopng_start() {
+    echo -n $"Starting ntopng ...  "
+    if [ -r /var/run/ntopng.pid ]; then
+        if $(! /sbin/pidof ntopng > /dev/null 2>&1 ) ; then
+            echo "Removing an old /var/run/ntopng.pid"
+            rm -f /var/run/ntopng.pid
+        fi
+    fi
+
+    /usr/bin/ntopng   --scripts-dir=/usr/share/ntopng/scripts \
+                      --install-dir=/usr/share/ntopng \
+                      --httpdocs-dir=/usr/share/ntopng/httpdocs \
+                      --user=$NTOPUID \
+                      --daemon \
+                      --pid=/var/run/ntopng.pid >> $NTOPLOG 2>&1 &
+    disown
+    return 0
+    RETVAL=$?
+
+    if [ $RETVAL -eq 0 ]; then
+        touch /var/lock/ntopng
+        sleep 2
+        echo "Done"
+    else
+        echo "Failed"
+    fi
+    return $RETVAL
+}
+
+ntopng_stop() {
+    echo -n $"Stopping ntopng ...  "
+    RETVAL=$?
+    if [ $RETVAL -eq 0 ]; then
+        if [ -r /var/run/ntopng.pid ]; then
+            pkill ntopng
+            # Give it some time to die gracefully
+            for second in 0 1 2 3 4 5 6 7 8 9 10 ; do
+                if $(! /sbin/pidof ntopng > /dev/null 2>&1 ) ; then
+                    # ntopng is a dirty little daemon:
+                    rm -f /var/run/ntopng.pid
+                    break
+                fi
+                sleep 1
+            done
+
+            if [ "$second" = "10" ]; then
+              echo "\nWARNING: ntopng did not exit normally, killing!"
+              pkill ntopng
+              sleep 10
+            else
+                # Yes there are two spaces as this is the way ntopng writes
+                # their logfiles.
+                echo "$DATE  EXIT: ntopng stopped by user: $USER (UID: $EUID)" >> $NTOPLOG
+                echo "Done"
+            fi
+        fi
+        rm -f /var/lock/ntopng
+    fi
+    return $RETVAL
+}
+
+# Lets see how we are being called:
+case "$1" in
+    start)
+        ntopng_start
+        ;;
+    stop)
+        ntopng_stop
+        ;;
+    restart|reload)
+        ntopng_stop
+        # Takes a few to recover and be able to start again:
+        sleep 10
+        ntopng_start
+        ;;
+    *)
+        echo ""
+        echo "Usage: $(basename $0) {start | stop | restart }"
+        RETVAL=1
+esac
+
+exit $RETVAL
+#EOF
diff --git a/system/ntopng/slack-desc b/system/ntopng/slack-desc
new file mode 100644
index 0000000000..2d610c8b73
--- /dev/null
+++ b/system/ntopng/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+ntopng: ntopng (Network usage with shiny graphs)
+ntopng:
+ntopng: ntopng is a network probe that shows network usage in a way similar to
+ntopng: what top does for processes. In interactive mode, it displays the
+ntopng: network status on the user's terminal. In Web mode, it acts as a Web
+ntopng: server, creating an HTML dump of the network status.
+ntopng:
+ntopng: It sports a NetFlow/sFlow emitter/collector, an HTTP-based client
+ntopng: interface for creating ntopng-centric monitoring applications, and
+ntopng: RRD for persistently storing traffic statistics.
+ntopng:
diff --git a/system/numactl/numactl.SlackBuild b/system/numactl/numactl.SlackBuild
index c859de402a..ccff6ffa79 100644
--- a/system/numactl/numactl.SlackBuild
+++ b/system/numactl/numactl.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for numactl
 
 # Written by Wainamoinen <wainamoinen@gmail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=numactl
 VERSION=${VERSION:-2.0.13}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -76,8 +86,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -ar INSTALL.md README.md test $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/numlockx/README b/system/numlockx/README
index 0a000248c8..9b21b7fdea 100644
--- a/system/numlockx/README
+++ b/system/numlockx/README
@@ -1,3 +1,5 @@
+numlockx (start X with numlock turned on)
+
 This little thingy allows you to start X with NumLock turned on
 (which is a feature that a lot of people seem to miss and nobody
 really knew how to achieve this).  If you use KDE or slim, you
diff --git a/system/numlockx/numlockx.SlackBuild b/system/numlockx/numlockx.SlackBuild
index 859eb52b3a..29f15c3446 100644
--- a/system/numlockx/numlockx.SlackBuild
+++ b/system/numlockx/numlockx.SlackBuild
@@ -1,36 +1,44 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for NumLockX
 
-# Written by Menno Duursma <druiloor@zonnet.nl>
+# Written by Menno Duursma <email removed>
+# Previously maintained Niels Horn <email removed>
+# Now maintained by B. Watson <urchlay@slackware.uk>
 
-# This program is free software. It comes without any warranty.
-# Granted WTFPLv2, as published by Sam Hocevar dec'04.
-# For details see http://sam.zoy.org/wtfpl/COPYING
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# Maintained as of version 1.2 by Niels Horn <niels.horn@gmail.com>
-# Revision date: 2010/10/26
+# 20230419 bkw: BUILD=2
+# - new maintainer.
+# - remove useless INSTALL from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=numlockx
 VERSION=${VERSION:-1.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -52,11 +60,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -65,25 +70,23 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --x-libraries="/usr/lib${LIBDIRSUFFIX}/X11" \
-  --x-includes="/usr/include/X11" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
 # help2man --no-info numlockx > numlockx.1
 mkdir -p $PKG/usr/man/man1
 gzip -9c $CWD/numlockx.1 > $PKG/usr/man/man1/numlockx.1.gz
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog INSTALL LICENSE README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS ChangeLog LICENSE README TODO $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+cat $CWD/README.SLACKWARE > $PKGDOC/README.SLACKWARE
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/numlockx/slack-desc b/system/numlockx/slack-desc
index 3e6bdc42ac..125af7e07e 100644
--- a/system/numlockx/slack-desc
+++ b/system/numlockx/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-numlockx: numlockx (Start X with NumLock Turned On)
+numlockx: numlockx (start X with numlock turned on)
 numlockx:
 numlockx: This little thingy allows you to start X with NumLock turned on
 numlockx: (which is a feature that a lot of people seem to miss and nobody
diff --git a/system/nut/README b/system/nut/README
deleted file mode 100644
index 2d5a3b11d1..0000000000
--- a/system/nut/README
+++ /dev/null
@@ -1,8 +0,0 @@
-The Network UPS Tools is a collection of programs which provide a common 
-interface for monitoring and administering UPS hardware. It uses a 
-layered apporoach to connect all the components.  Drivers are provided 
-for a wide assortment of equipment. The primary goal of the NUT project 
-is to provide reliable monitoring of UPS hardware and ensure safe 
-shutdowns of the systems which are connected.
-
-See README.SLACKWARE for configuration hints.
diff --git a/system/nut/README.SLACKWARE b/system/nut/README.SLACKWARE
deleted file mode 100644
index a73275956c..0000000000
--- a/system/nut/README.SLACKWARE
+++ /dev/null
@@ -1,43 +0,0 @@
-README.SLACKWARE
-Written by V'yacheslav Stetskevych <slava18 dont_spam_me gmail com>
-
-In order to configure Network UPS tools on Slackware you need to rename
-or make copies of the sample config files in /etc/nut and edit them
-to suit your needs.  See documentation in /usr/doc/nut-* for reference.
-As you make your new config files, don't forget to secure them:
-	chown root:nut /etc/nut/*.conf /etc/nut/*.users
-	chmod 640 /etc/nut/*.conf /etc/nut/*.users
-
-If you are using a serial-connected UPS, be sure to add the nut user to
-the 'dialout' group:
-	usermod -a -G dialout nut
-
-A startup script /etc/rc.d/rc.ups is provided with this build.
-You can add these lines to /etc/rc.d/rc.local to launch it on system start:
-	if [ -x /etc/rc.d/rc.ups ]; then
-		/etc/rc.d/rc.ups start
-	fi
-
-If you have more than one box sitting on the same UPS, you should only use
-'start' on the one box that is connected to the device using a signal cable.
-On the other boxes, start rc.ups with the 'start_upsmon' parameter to only
-monitor the power status (client mode). Configure access permissions on the
-server box accordingly.
-
-If you wish for your UPS to turn off it's power during an extended power outage
-in order not to drain it's battery completely, you should make two simple edits
-to the Slackware shutdown script /etc/rc.d/rc.6 near the end of it.
-These are only needed on the server box, one that is connected to the UPS:
-1) Insert after the rootfs has been remounted read-only:
-	if [ -x /usr/libexec/nut/nut_restart_udev ]; then
-		. /usr/libexec/nut/nut_restart_udev
-	fi
-2) Insert after the genpowerd block and before the actual halt:
-	if [ -x /usr/libexec/nut/nut_kill_inverter ]; then
-		. /usr/libexec/nut/nut_kill_inverter
-	fi
-
-Don't forget to set your motherboard BIOS to automatically turn the machine on
-when the power comes back.
-
-Have fun!
diff --git a/system/nut/doinst.sh b/system/nut/doinst.sh
deleted file mode 100644
index ea64d25add..0000000000
--- a/system/nut/doinst.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-config() {
-	NEW="$1"
-	OLD="$(dirname $NEW)/$(basename $NEW .new)"
-	# If there's no config file by that name, mv it over:
-	if [ ! -r $OLD ]; then
-		mv $NEW $OLD
-	elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-		# toss the redundant copy
-		rm $NEW
-	fi
-	# Otherwise, we leave the .new copy for the admin to consider...
-}
-
-# Keep same perms on rc.ups.new:
-if [ -e etc/rc.d/rc.ups ]; then
-	cp -a etc/rc.d/rc.ups etc/rc.d/rc.ups.new.incoming
-	cat etc/rc.d/rc.ups.new > etc/rc.d/rc.ups.new.incoming
-	mv etc/rc.d/rc.ups.new.incoming etc/rc.d/rc.ups.new
-fi
-
-config etc/rc.d/rc.ups.new
diff --git a/system/nut/nut.SlackBuild b/system/nut/nut.SlackBuild
deleted file mode 100644
index 53ae8f2dfc..0000000000
--- a/system/nut/nut.SlackBuild
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for nut (Network UPS Tools)
-
-# Copyright 2010 V'yacheslav Stetskevych <slava18 dont_spam_me gmail com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=nut
-VERSION=${VERSION:-2.7.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-NUTUSER=${NUTUSER:-nut}
-NUTGROUP=${NUTGROUP:-nut}
-
-# The user and group accounts have to be created manually.
-# For slackbuilds.org, assigned nut uid/gid are 218/218.
-# See http://slackbuilds.org/uid_gid.txt
-if ! grep -q ^$NUTGROUP: /etc/group; then
-	echo "  You must have a \"$NUTGROUP\" group to run this script."
-	echo "    # groupadd -g 218 $NUTGROUP"
-	exit 1
-elif ! grep -q ^$NUTUSER: /etc/passwd; then
-	echo "  You must have a \"$NUTUSER\" user to run this script."
-	echo "    # useradd -u 218 -g $NUTGROUP -s /bin/false $NUTUSER"
-	exit 1
-fi
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc/$PRGNAM \
-  --localstatedir=/var \
-  --datadir=/usr/share/nut \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux \
-  --enable-strip \
-  --disable-static \
-  --with-dev \
-  --with-serial \
-  --with-usb \
-  --with-snmp \
-  --with-neon \
-  --with-wrap \
-  --with-cgi\
-  --with-cgipath=/var/www/cgi-bin/nut \
-  --with-htmlpath=/var/www/htdocs/ups \
-  --with-drvpath=/usr/libexec/nut \
-  --with-statepath=/var/run/nut \
-  --with-pidpath=/var/run/nut \
-  --with-altpidpath=/var/run/nut \
-  --with-user=nut \
-  --with-group=nut
-make
-make install DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-# Install the bash_completion script
-install -d $PKG/etc/bash_completion.d
-install -m 755 scripts/misc/nut.bash_completion $PKG/etc/bash_completion.d/nut
-
-# Install the startup script
-install -d $PKG/etc/rc.d
-install -m 644 $CWD/rc.ups $PKG/etc/rc.d/rc.ups.new
-
-# Create the state and run dirs
-install -d -o root -g $NUTGROUP -m 770 $PKG/var/state/ups
-install -d -o $NUTUSER -g $NUTGROUP -m 770 $PKG/var/run/nut
-
-# Install shutdown helper files
-install -m 755 $CWD/nut_restart_udev $CWD/nut_kill_inverter $PKG/usr/libexec/nut
-
-# Install documentation
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -ar docs \
-  AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README UPGRADING \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-rm $PKG/usr/doc/$PRGNAM-$VERSION/docs/Makefile*
-cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nut/nut.info b/system/nut/nut.info
deleted file mode 100644
index b6e4db3b0c..0000000000
--- a/system/nut/nut.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="nut"
-VERSION="2.7.4"
-HOMEPAGE="http://www.networkupstools.org/"
-DOWNLOAD="http://www.networkupstools.org/source/2.7/nut-2.7.4.tar.gz"
-MD5SUM="3ba53656933d7471f95140b32a5b8d5c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="V'yacheslav Stetskevych"
-EMAIL="slava18@gmail.com"
diff --git a/system/nut/nut_kill_inverter b/system/nut/nut_kill_inverter
deleted file mode 100644
index 251a047df7..0000000000
--- a/system/nut/nut_kill_inverter
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# This file is part of Network UPS Tools build for Slackware Linux.
-# It should be sourced in /etc/rc.d/rc.0 as part of the poweroff sequence.
-# Here, we signal the UPS to shut off the power.
-# Reference: http://www.mail-archive.com/nut-upsdev@lists.alioth.debian.org/msg01099.html
-# To be sourced after the genpowerd block and before the actual halt.
-
-if [ -f /etc/killpower ]; then
-	echo "----------------------------------------Shutting down UPS power!"
-	/etc/rc.d/rc.ups shutdown
-	sleep 40
-	echo "The UPS was not shut off properly, or the power came back in the"
-	echo "middle of the shutdown process, or USB communication failed."
-	sleep 10
-fi
diff --git a/system/nut/nut_restart_udev b/system/nut/nut_restart_udev
deleted file mode 100644
index d289c0f87a..0000000000
--- a/system/nut/nut_restart_udev
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# This file is part of Network UPS Tools build for Slackware Linux.
-# It should be sourced in /etc/rc.d/rc.0 as part of the poweroff sequence.
-# Here, we restart udev so that the system is able to kill off the UPS inverter.
-# Reference: http://www.mail-archive.com/nut-upsdev@lists.alioth.debian.org/msg01099.html
-# To be sourced after the rootfs has been remounted read-only.
-
-if [ -f /etc/killpower ]; then
-echo "Restarting udev to be able to shut the UPS inverter off..."
-/etc/rc.d/rc.udev start
-sleep 10
-fi
diff --git a/system/nut/rc.ups b/system/nut/rc.ups
deleted file mode 100644
index 0d9f4bc769..0000000000
--- a/system/nut/rc.ups
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-# Slackware startup script for Network UPS Tools
-# Copyright 2010 V'yacheslav Stetskevych
-
-# UPS drivers live here
-DRIVERPATH=/usr/libexec/nut
-export PATH=$DRIVERPATH:$PATH
-
-POWERDOWNFLAG=/etc/killpower
-NUTUSER=nut
-NUTGROUP=nut
-UPSDCONF=/etc/ups/upsd.conf
-UPSCONF=/etc/ups/ups.conf
-UPSMONCONF=/etc/ups/upsmon.conf
-
-# Check for existense of the nut user and group
-# For slackbuilds.org, assigned nut uid/gid are 218/218.
-# See http://slackbuilds.org/uid_gid.txt
-if ! grep -q ^$NUTGROUP: /etc/group; then
-	echo "  You must have a \"$NUTGROUP\" group to run this script."
-	echo "    # groupadd -g 218 $NUTGROUP"
-	exit 1
-elif ! grep -q ^$NUTUSER: /etc/passwd; then
-	echo "  You must have a \"$NUTUSER\" user to run this script."
-	echo "    # useradd -u 218 -g $NUTGROUP -s /bin/false $NUTUSER"
-	exit 1
-fi
-
-start_driver() {
-	upsdrvctl -u $NUTUSER start || exit 1
-}
-
-start_upsd() {
-	upsd -u $NUTUSER || exit 1
-}
-
-start_upsmon() {
-	upsmon -u $NUTUSER || exit 1
-}
-
-stop() {
-	echo "Stopping the UPS services... "
-	if pgrep upsd 2>&1 >/dev/null; then
-		upsd -c stop; fi
-	if pgrep upsmon 2>&1 >/dev/null; then
-		upsmon -c stop; fi
-	upsdrvctl stop
-}
-
-case "$1" in
-	start)	# starts everything (for a ups server box)
-		start_driver
-		start_upsd
-		start_upsmon
-		;;
-	start_upsmon) # starts upsmon only (for a ups client box)
-		start_upsmon
-		;;
-	stop) # stops all UPS-related daemons
-		stop	
-		;;
-	shutdown) # shuts down the UPS
-		echo "Killing inverter..."
-		upsdrvctl shutdown
-		;;
-	reload)
-		echo "Reloading config files..."
-		upsd -c reload
-		upsmon -c reload
-		;;
-	*)
-		echo "Usage: $0 {start|start_upsmon|stop|shutdown|reload}"
-esac
diff --git a/system/nut/slack-desc b/system/nut/slack-desc
deleted file mode 100644
index c4c8a99c23..0000000000
--- a/system/nut/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-   |-----handy-ruler------------------------------------------------------|
-nut: nut (Network UPS Tools)
-nut:
-nut: The Network UPS Tools is a collection of programs which provide a
-nut: common interface for monitoring and administering UPS hardware.
-nut: It uses a layered apporoach to connect all the components. Drivers
-nut: are provided for a wide assortment of equipment. The primary goal of
-nut: the NUT project is to provide reliable monitoring of UPS hardware
-nut: and ensure safe shutdowns of the systems which are connected.
-nut:
-nut: Homepage: http://www.networkupstools.org
-nut:
diff --git a/system/nvidia-driver/README b/system/nvidia-driver/README
index 9f87edbdff..bf4903ba11 100644
--- a/system/nvidia-driver/README
+++ b/system/nvidia-driver/README
@@ -1,24 +1,20 @@
 This is the proprietary binary video driver from NVidia for the X.Org
-X-server. This package does not include the kernel-module - it is
+X-server. This package does not include the kernel-module - it is a
 part of the nvidia-kernel package at SlackBuilds.org.
 
-NOTE: This driver is ONLY for Slackware64. For x86 32-bit support, use
-nvidia-legacy390-{driver,kernel}.
+NOTE: 64-bit x86_64 support ONLY for Slackware64. For x86 32-bit
+support, use nvidia-legacy390-{driver,kernel}
+
+The Wine libraries are now installed by default.  To disable, pass
+  WINE="no" to the script.
 
 Installing the 32-bit compatibility libraries is available:
 if desired, do:
-  COMPAT32="yes" ./nvidia-driver.SlackBuild
-  
-If you plan to test this buildscript on current/15.0, do:
 
-  CURRENT="yes" ./nvidia-driver.SlackBuild
-  
-This avoids stomping on the libglvnd libraries, plus it forces the
-script to use the prebuilt nvidia-installer since it no longer builds
-in current.  As a consequence, this script may no longer work in a VM.
+  COMPAT32="yes" ./nvidia-driver.SlackBuild
 
-This script now gives the option of installing the nvidia-persitenced
-daemon.  For details, see README.nvidia-persitenced.
+This script now gives the option of installing the nvidia-persistenced
+daemon.  For details, see README.nvidia-persistenced.
 
 Several useful utilities are included: nvidia-xsettings, nvidia-smi,
 and nvidia-settings.  Please refer to the Nvidia documentation and
@@ -26,42 +22,17 @@ man pages for details and usage.
 
 For CUDA/OpenCL to work after reboot, and for utilites such as
 nvidia-smi, you might need to include the following line in your
-/etc/rc.d/rc.local (This is REQUIRED for nvidia-persistenced to work):
+/etc/rc.d/rc.local:
+(This is REQUIRED if you plan on running nvidia-persistenced)
 
     # Create missing nvidia device nodes after reboot
-    if [ -x /usr/bin/nvidia-modprobe ]; then
-      /usr/bin/nvidia-modprobe -c 0 -u
-    fi
+    /usr/bin/nvidia-modprobe -c 0 -u
 
 Notes:
 1.  You still need to blacklist the open source nouveau driver.
     This is easily done by installing xf86-video-nouveau-blacklist in
     extra/xf86-video-nouveau-blacklist on the distibution DVD.
 
-2.  If nvidia-driver is already installed, the script will abort with
-    a prompt to remove the existing driver (it is not necessary to
-    remove the kernel module).
-
-3.  As of version 450.xx, Nvidia no longer includes libGL.la in their
-    distribution package.  On 14.2 ONLY,  nvidia-switch saves these
-    files to /var/log/nvidia/{32,64}:
-
-      libGL{,ESv1_CM,ESv2}.la
-      libGL.so.1.2.0
-      libGLESv1_cm.so.1.1.0
-      libGLESv2.so.2.0.0
-
-    It then modifies the .la files in /usr/lib{,64} to point to the
-    nvidia versions of these libraries.  If you want to revert back to
-    the open source drivers, run 'nvidia-switch --remove' to restore
-    the original mesa libraries, then 'removepkg nvidia-driver'
-    "should" work in most cases.  If you forget to run
-    nvidia-switch --remove, just copy the original files saved in
-    /var/log/nvidia/{32,64} back to /usr/lib{,64} (don't forget to run
-    /sbin/ldconfig).  (THIS STEP IS NOT NECESSARY ON CURRENT.)
-
-4.  (IMPORTANT ON 14.2) When it comes time to remove this package with
-    'removepkg' (or just about any other package for that matter), you
-    MUST run '/sbin/ldconfig' to restore any symlinks.  This is due to
-    removepkg not running ldconfig after removing a package.
-    (This has been added to current/15.0.)
+CAUTION!  Please DO NOT USE this script for Slackware(64) versions 14.2
+or older as it WILL corrupt the mesa and xorg installations.
+Please use the scripts from those repos instead.
diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index 0824298417..d2d4ba4ff6 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nvidia-driver
 
 # Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, US
-# Copyright 2020 Lenard Spencer, Orlando, FL, USA
+# Copyright 2020-2023 Lenard Spencer, Orlando, FL, USA
 #
 # All rights reserved.
 #
@@ -24,14 +24,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# see changelog.txt
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nvidia-driver
-VERSION=${VERSION:-460.39}
+VERSION=${VERSION:-550.67}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
-CURRENT=${CURRENT:-no}
+PKGTYPE=${PKGTYPE:-tgz}
 
 set -e
 
@@ -43,7 +42,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,12 +57,26 @@ else
   exit 1
 fi
 
-# There are a couple of unresolved issues with nvidia-installer, so we
-# abort if an Nvidia driver is still installed:
-if [ -x /usr/bin/nvidia-installer ]; then
-  echo -e "\n A previous Nvidia installation has been detected!"
-  echo -e " Please remove the installed driver and rerun this script.\n"
-  exit 1
+if [ "${COMPAT32}" = "yes" ]; then
+    MULTI="_multilib"
+else
+    MULTI=""
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION$MULTI-$TARGET-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+if [ "${PERSISTENCED:-no}" = "yes" ]; then
+  if [ "`getent group nvidia > /dev/null`" -o "`getent passwd nvidia > /dev/null`" ]; then
+    echo "User and/or group nvidia do not exist!"
+    echo "Please create user and group nvidia and rerun this script."
+    exit 1
+  fi
 fi
 
 SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
@@ -74,10 +86,9 @@ rm -rf $PKG
 rm -rf $TMP/$SRCNAM
 mkdir -p $TMP $PKG $OUTPUT $PKG/install
 mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
-  $PKG/etc/OpenCL/vendors/ $PKG/usr/{bin,doc,man/man1,sbin} \
+  $PKG/etc/OpenCL/vendors/ $PKG/usr/{bin,doc,man/man1} \
   $PKG/usr/share/{applications,nvidia,pixmaps,egl/egl_external_platform.d} \
-  $PKG/usr/include/GL $PKG/etc/vulkan/{icd.d,implicit_layer.d} $PKG/etc/X11/xorg.conf.d \
-  $PKG/etc/X11/glvnd/egl_vendor.d
+  $PKG/etc/X11/glvnd/egl_vendor.d $PKG/var/log
 
 if [ "$COMPAT32" = "yes" ]; then
   mkdir -p $PKG/usr/lib/tls
@@ -104,11 +115,16 @@ find -L . \
 
 # Compiling the various open source apps instead of using the precompiled binaries
 # Compiling nvidia-installer from source
-if [ "$CURRENT" = "no" ]; then
+
 cd $TMP/nvidia-installer-$VERSION
 
-# Let's try to remove the conflicting files and GPU detection
-  patch -p0 < $CWD/skip_conflict-GPU_detect.patch
+# Install various files in $PKG instead of the root filesystem:
+  sed -i "s|/etc/vulkan|$PKG/etc/vulkan|" files.c
+  sed -i "s|/lib/firmware/nvidia|$PKG/lib/firmware/nvidia|" files.c
+  sed -i "s|\"/etc\"|\"$PKG/etc\"|" nvidia-installer.h
+  sed -i "s|/var/lib/nvidia|$PKG/var/lib/nvidia|" backup.c
+  sed -i "s|/usr/lib/nvidia|$PKG/usr/lib/nvidia|" files.c
+  sed -i "s|/usr/lib/nvidia|$PKG/usr/lib/nvidia|" misc.c
 
   chown -R root:root .
   find -L . \
@@ -128,14 +144,15 @@ cd -
 # to the driver source tree for use
 mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM
 mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM
-fi
 
-if [ "${COMPAT32}" = "yes" ]; then
+if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
     COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr"
-    MULTI="_multilib"
 else
-    COMP32="--no-install-compat32-libs"
-    MULTI=""
+    if [ ! "$ARCH" = "x86_64" ]; then
+        COMP32=""
+    else
+        COMP32="--no-install-compat32-libs"
+    fi
 fi
 
 # Install the binary libs using nvidia-installer compiled above
@@ -156,44 +173,41 @@ cd $TMP/$SRCNAM
   --log-file-name=$PKG/var/log/nvidia-installer.log \
   --egl-external-platform-config-path=$PKG/usr/share/egl/egl_external_platform.d \
   --no-nvidia-modprobe \
+  --no-install-libglvnd \
+  --no-wine-files \
+  --no-systemd \
+  --no-peermem \
   $COMP32
 
-  # Move ICDs to $PKG and cleanup (no switch option in installer?)
-mv /etc/OpenCL/vendors/nvidia.icd $PKG/etc/OpenCL/vendors/nvidia.icd
-mv /etc/vulkan/icd.d/nvidia_icd.json $PKG/etc/vulkan/icd.d/nvidia_icd.json
-mv /etc/vulkan/implicit_layer.d/nvidia_layers.json $PKG/etc/vulkan/implicit_layer.d/nvidia_layers.json
-# In current, mesa now puts an entry into this directory, so we
-# leave it alone if it is not empty
-if [ -z "$(ls -A /etc/OpenCL/vendors)" ]; then
-  rm -rf /etc/OpenCL
+# If we are using Wine, then:
+if [ "${WINE:-yes}" != "no" ]; then
+  mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/nvidia/wine
+  install -m 755 _nvngx.dll $PKG/usr/lib$LIBDIRSUFFIX/nvidia/wine
+  install -m 755 nvngx.dll $PKG/usr/lib$LIBDIRSUFFIX/nvidia/wine
 fi
-# just in case any other programs make an entry here
-if [ -z "$(ls -A /etc/vulkan)" ]; then
-  rm -rf /etc/vulkan
-fi
-
-if [ "$CURRENT" = "yes" ]; then
-# libOpenCL.so is now included in current (in ocl-icd),
+# libOpenCL.so is now included in 15.0 (in ocl-icd),
 # so we don't need this one.
-    rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libOpenCL.so.1.0.0
-    if [ "${COMPAT32}" = "yes" ]; then
-        rm -f $PKG/usr/lib/libOpenCL.so.1.0.0
-    fi
-else
-# Bash script to cleanly install (in doinst.sh) and uninstall the nvidia
-# files so we don't stomp on any overlapping xorg files.
-# Note: switching can be problematic ;-)
-    mkdir -p  $PKG/var/log/nvidia/{32,64}
-    install -m 0755 $CWD/nvidia-switch $PKG/usr/sbin/
-    sed -i s/PKGVERSION/$VERSION/g $PKG/usr/sbin/nvidia-switch
-    sed -i s/LIBDIRSUFFIX/$LIBDIRSUFFIX/g $PKG/usr/sbin/nvidia-switch
-    if [ ${COMPAT32} = "yes" ]; then
-        sed -i s/LIB32FLAG/yes/g $PKG/usr/sbin/nvidia-switch
-    else
-        sed -i s/LIB32FLAG/no/g $PKG/usr/sbin/nvidia-switch
-    fi
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libOpenCL.so*
+if [ "${COMPAT32}" = "yes" ]; then
+    rm -f $PKG/usr/lib/libOpenCL.so*
+fi
+# remove a pair of folders installed and used by nvidia-installer but
+# no longer needed (caused the "failed to remove some directories"
+# warning message):
+rm -rf $PKG/usr/lib/nvidia || true
+rm -rf $PKG/var/lib || true
+
+# if not multilib, remove the unneeded /usr/lib folder:
+if [ "${COMPAT32}" != "yes" ]; then
+  rm -rf $PKG/usr/lib || true
 fi
 
+# Mitigate a bug in nvidia-installer that misplaces a symlink
+# (Thanks to marco70 on LQ for catching this)
+( cd $PKG/usr/lib${LIBDIRSUFFIX}/gbm
+rm -f nvidia-drm_gbm.so
+  ln -sf ../libnvidia-allocator.so.1 nvidia-drm_gbm.so
+)
 # Compile utilites from source, replacing the precompiled versions
 #
 # Compiling nvidia-settings
@@ -261,7 +275,9 @@ cd -
 # These update the paths in nvidia-settings.desktop
 sed -i "s|__UTILS_PATH__|/usr/bin|" $PKG/usr/share/applications/nvidia-settings.desktop
 sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" $PKG/usr/share/applications/nvidia-settings.desktop
-sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|" $PKG/usr/share/applications/nvidia-settings.desktop
+sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Settings;|" $PKG/usr/share/applications/nvidia-settings.desktop
+# Remove depcrecated entry in nvidia-settings.desktop
+sed -i '/Encoding/d' $PKG/usr/share/applications/nvidia-settings.desktop
 
 # Remove xorg conf file since we handle that in nvidia-kernel
 rm -rf $PKG/etc/X11/xorg.conf.d
@@ -285,12 +301,7 @@ fi
 
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# 14.2 needs nvidia-switch, -current does not
-if [ "$CURRENT" = "no" ]; then
-  echo -e "usr/sbin/nvidia-switch --install\n" >> $PKG/install/doinst.sh
-fi
-
-# Add rc.nvidia-persistenced:
+# Add nvidia-persistenced:
 if [ "${PERSISTENCED:-no}" = "yes" ]; then
   cd $TMP
   rm -rf nvidia-persistenced-$VERSION.tar.bz2
@@ -307,34 +318,13 @@ if [ "${PERSISTENCED:-no}" = "yes" ]; then
   CFLAGS="$SLKCFLAGS" make
   install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/
   install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/
-
-  if ! getent group nvidia > /dev/null 2>&1; then
-    echo "Creating the group nvidia:"
-    groupadd -g 365 nvidia || exit 1
-  fi
-  if ! getent passwd nvidia > /dev/null 2>&1; then
-    echo "Creating the user nvidia:"
-    useradd -u 365 -g 365 -c "Nvidia" -d /dev/null -s /bin/false nvidia || exit 1
-  fi
-  mkdir -p $PKG/var/run/nvidia-persistenced
-  chown nvidia:nvidia $PKG/var/run/nvidia-persistenced
-  mkdir -p $PKG/etc/rc.d
+# install rc.nvidia-perstistenced:
+  mkdir -p $PKG/etc/rc.d $PKG/var/run/nvidia-persistenced
   install -m 755 $CWD/rc.nvidia-persistenced $PKG/etc/rc.d/rc.nvidia-persistenced
   sed -i "s|__USER__|nvidia|" $PKG/etc/rc.d/rc.nvidia-persistenced
-  cat <<EOF >> $PKG/install/doinst.sh
-# Create group and user nvidia if they don't already exist
-if ! getent group nvidia > /dev/null 2>&1; then
-  echo "Creating the group nvidia:"
-  groupadd -g 365 nvidia || exit 1
-fi
-if ! getent passwd nvidia > /dev/null 2>&1; then
-  echo "Creating the user nvidia:"
-  useradd -u 365 -g 365 -c "Nvidia" -d /dev/null -s /bin/false nvidia || exit 1
-fi
-
-EOF
+  chown nvidia:nvidia $PKG/var/run/nvidia-persistenced
 fi
 
-# Flag multlib as needed and build package.
+# Flag multilib as needed and build package.
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$MULTI-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$MULTI-$TARGET-$BUILD$TAG.$PKGTYPE
diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info
index 60e7394416..09404eb52f 100644
--- a/system/nvidia-driver/nvidia-driver.info
+++ b/system/nvidia-driver/nvidia-driver.info
@@ -1,20 +1,20 @@
 PRGNAM="nvidia-driver"
-VERSION="460.39"
-HOMEPAGE="http://www.nvidia.com"
+VERSION="550.67"
+HOMEPAGE="https://www.nvidia.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/460.39/NVIDIA-Linux-x86_64-460.39.run \
-                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-460.39.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-460.39.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-460.39.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-460.39.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-460.39.tar.bz2"
-MD5SUM_x86_64="79365687506ff548f9504e9fe0e0bc03 \
-               9e4997a15d1a706e233431638b3196bf \
-               8fc729e47da47aacfd0ed19054d092d0 \
-               da967b3e119d34760d9b4c448c97d47f \
-               fdcdc9d1322c91aef187e1239238b319 \
-               3697b05891f99f0882fd55eeb69eec41"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/550.67/NVIDIA-Linux-x86_64-550.67.run \
+                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-550.67.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-550.67.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-550.67.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-550.67.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-550.67.tar.bz2"
+MD5SUM_x86_64="4190c0255fa40acdae1fe00b607ae4f3 \
+               c5cb3f5063b56fbb31e2442cd8c812ed \
+               36e33e89995eb937fddaf96762c30b97 \
+               3da30e7e56b8533a87f7e2f1ed1c94d4 \
+               c424b165a61afe2391aa09d4c4c94d9c \
+               eed570ccfceef899e6f4f58b63e25d5b"
 REQUIRES="nvidia-kernel"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch
deleted file mode 100644
index 9196cf7b8a..0000000000
--- a/system/nvidia-driver/nvidia-switch
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/sh
-
-# Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, USA
-# Copyright 2020 Lenard Spencer, Orlando, FL, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# nvidia-switch utility 4.7.2
-#
-# A tool to install and cleanly remove the nvidia driver without stomping
-# on the mesa files.  Note: this tool "should" allow switching on the fly,
-# but why? Pick a driver! You will stilll need to edit a bunch of other
-# config files.
-
-# When ROOT=<PATH> is specified when using {install,upgrade,remove}pkg,
-# PATH is usually specified without a trailing "/", so we need to add it
-if [ "$ROOT" = "" ]; then
-  ROOT="${ROOT:-"/"}"
-else
-  ROOT="${ROOT}/"
-fi
-CWD=$(pwd)
-COMPAT32="LIB32FLAG" # This will be replaced in the build script (yes | no)
-LIBSUFFIX="LIBDIRSUFFIX" # This will be replaced in the build script
-INC="${ROOT}usr/include/GL"
-LIB="${ROOT}usr/lib${LIBSUFFIX}"
-LIB32="${ROOT}usr/lib"
-
-save_GL(){
-# backup original mesa conflicts
-  cd $2
-  case "$1" in
-    "nvidia")
-      cp libGL{,ES*}.la /var/log/nvidia/$3
-      mv libGL{.so.1.2.0,ESv1_CM.so.1.1.0,ESv2.so.2.0.0} /var/log/nvidia/$3
-      sed -i s/1.2.0/1.7.0/g libGL.la
-      sed -i s/1.1.0/1.2.0/g libGLESv1_CM.la
-      sed -i s/2.0.0/2.1.0/g libGLESv2.la
-    ;;
-
-    "xorg")
-      mv /var/log/nvidia/$3/* .
- ;;
-
-  *)
-        echo "nothing to do for save_gl?"
-        exit 1
-  ;;
-  esac
-  cd "$CWD"
-}
-
-nvidia_install(){
-  echo $'Installing to nvidia-driver files!\n'
-  echo "Make sure the nvidia driver is ENABLED in /etc/X11/xorg.conf"
-  echo "and/or in either /usr/share/X11/xorg.conf.d or"
-  echo "/etc/X11/xorg.conf.d.  Otherwise, this may lead to improperly"
-  echo  -e "working drivers.\n"
-
-  if [ "$LIBSUFFIX" = "64" ]; then
-    save_GL "nvidia" $LIB "64"
-    # Check for multilib configuration
-    if [ "$COMPAT32" = "yes" ]; then
-      save_GL "nvidia" $LIB32 "32"
-    fi
-  else
-    save_GL "nvidia" $LIB "32"
-  fi
-}
-
-nvidia_remove(){
-  echo $'Returning to stock xorg files!\n'
-  echo "Make sure the nvidia driver is DISABLED in /etc/X11/xorg.conf"
-  echo "and in /usr/share/X11/xorg.conf.d and /etc/X11/xorg.conf.d."
-  echo "Otherwise, this may lead to improperly working drivers."
-  echo -e "\nPLEASE run /sbin/ldconfing after removing nvidia-driver.\n"
-
-  if [ "$LIBSUFFIX" = "64" ]; then
-    save_GL "xorg" $LIB "64"
-    # Check for multilib configuration
-    if [ "$COMPAT32" = "yes" ]; then
-      save_GL "xorg" $LIB32 "32"
-    fi
-  else
-    save_GL "xorg" $LIB "32"
-  fi
-}
-
-usage(){
-  echo "Usage:"
-  echo " --install    Set up nvidia driver files and update symlinks"
-  echo " --remove     Return to stock xorg files and restore symlinks"
-  echo " --help	      Show this help message"
-}
-
-case "$1" in
-  "--install")
-    nvidia_install
-    ;;
-  "--remove")
-    nvidia_remove
-    ;;
-  "--help")
-    usage
-    ;;
-  *)
-    usage
-    ;;
-esac
diff --git a/system/nvidia-driver/rc.nvidia-persistenced b/system/nvidia-driver/rc.nvidia-persistenced
index 59bdf18d11..b95480a4e0 100644
--- a/system/nvidia-driver/rc.nvidia-persistenced
+++ b/system/nvidia-driver/rc.nvidia-persistenced
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 #
 # NVIDIA Persistence Daemon Init Script
 #
diff --git a/system/nvidia-driver/slack-desc b/system/nvidia-driver/slack-desc
index 165da72937..7b63dee80e 100644
--- a/system/nvidia-driver/slack-desc
+++ b/system/nvidia-driver/slack-desc
@@ -16,4 +16,4 @@ nvidia-driver: See /usr/doc/nvidia-driver-PKGVERSION/README.Slackware
 nvidia-driver: for more information.
 nvidia-driver:
 nvidia-driver: https://www.nvidia.com
-nvidia-driver: @MULTILIB@
+nvidia-driver:
diff --git a/system/nvidia-firmware/README b/system/nvidia-firmware/README
deleted file mode 100644
index ba64cbc845..0000000000
--- a/system/nvidia-firmware/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This is the proprietary firmware extracted from the NVIDIA binary driver
-needed by nouveau for video decoding.
-
-See the documentation at freedesktop.org to see if your hardware is
-supported or not. One way to find out which chip you have is by running:
-
-  lspci -nn -d 10de:
diff --git a/system/nvidia-firmware/nvidia-firmware.SlackBuild b/system/nvidia-firmware/nvidia-firmware.SlackBuild
deleted file mode 100644
index 4651572f84..0000000000
--- a/system/nvidia-firmware/nvidia-firmware.SlackBuild
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for nvidia-firmware
-
-# Copyright 2015, 2018 Hunter Sezen California, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=nvidia-firmware
-VERSION=${VERSION:-325.15}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-SRC=$TMP/$PRGNAM-$VERSION
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -eu
-
-rm -rf $PKG $SRC
-mkdir -p $TMP $SRC $PKG $OUTPUT
-cd $SRC
-sh $CWD/NVIDIA-Linux-x86-$VERSION.run --extract-only
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python $CWD/extract_firmware.py
-
-mkdir -p $PKG/lib/firmware/nouveau/
-cp -av nv* vuc-* $PKG/lib/firmware/nouveau/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nvidia-firmware/nvidia-firmware.info b/system/nvidia-firmware/nvidia-firmware.info
deleted file mode 100644
index 2e848a4635..0000000000
--- a/system/nvidia-firmware/nvidia-firmware.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="nvidia-firmware"
-VERSION="325.15"
-HOMEPAGE="https://wiki.freedesktop.org/nouveau/VideoAcceleration/"
-DOWNLOAD="http://us.download.nvidia.com/XFree86/Linux-x86/325.15/NVIDIA-Linux-x86-325.15.run \
-          https://raw.githubusercontent.com/imirkin/re-vp2/d19d818d1e05c7c68afb052073cc8a487cac8f5d/extract_firmware.py"
-MD5SUM="528fc538584de6446384b9cec3099d6c \
-        7975d50a07d9cd9131dba60aef32a86f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
diff --git a/system/nvidia-firmware/slack-desc b/system/nvidia-firmware/slack-desc
deleted file mode 100644
index 6632852ec0..0000000000
--- a/system/nvidia-firmware/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-               |-----handy-ruler------------------------------------------------------|
-nvidia-firmware: nvidia-firmware (video firmware for nouveau)
-nvidia-firmware:
-nvidia-firmware: This is the proprietary firmware extracted from the NVIDIA
-nvidia-firmware: binary driver needed by nouveau for video decoding.
-nvidia-firmware:
-nvidia-firmware:
-nvidia-firmware:
-nvidia-firmware:
-nvidia-firmware:
-nvidia-firmware:
-nvidia-firmware:
diff --git a/system/nvidia-kernel/README b/system/nvidia-kernel/README
index 35109efbf0..2af2536f50 100644
--- a/system/nvidia-kernel/README
+++ b/system/nvidia-kernel/README
@@ -5,11 +5,11 @@ To build the package for a kernel different from the running one,
 start the script setting the KERNEL variable as in
     KERNEL=4.6.3 ./nvidia-kernel.SlackBuild
 
-A default config file is placed at
- /usr/share/X11/xorg.conf.d/10-nvidia.conf
-to make sure that X loads the nvidia module.
-If you need to make changes, copy that file to /etc/X11/xorg.conf.d/
-and edit the copy.  You do not need this file at all if you have a
-proper and complete xorg.conf.
+A default config file is placed at 
+  /usr/share/X11/xorg.conf.d/10-nvidia.conf
+to make sure that X loads the nvidia module.  If you need to make
+changes, move that file to /etc/X11/xorg.conf.d/ and edit the copy.
+You do not need this file at all if you have a proper and complete
+xorg.conf.
 
 The xf86-video-nouveau-blacklist package from /extra is required.
diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild
index 38140420a2..815aa79dd1 100644
--- a/system/nvidia-kernel/nvidia-kernel.SlackBuild
+++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nvidia-kernel
 
 # Copyright 2007-2011 Heinz Wiesinger, Amsterdam, The Netherlands
 # Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, USA
-# Updates cpyright 2020 Lenard Spencer, Orlando, FL, USA
+# Updates copyright 2020-2022 Lenard Spencer, Orlando, FL, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,12 +26,13 @@
 
 # Thanks to Robby Workman for suggestions to improve this script.
 
-# see nvidia-driver/changelog.txt
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nvidia-kernel
-VERSION=${VERSION:-460.39}
+VERSION=${VERSION:-550.67}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 KERNEL=${KERNEL:-$(uname -r)}
 KERNELPATH=${KERNELPATH:-/lib/modules/${KERNEL}/build}
@@ -59,9 +60,16 @@ unset ARCH
 
 SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKGVER-$TARGET-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$PRGNAM}
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 rm -rf $PKG
@@ -78,17 +86,18 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 (cd kernel || exit 1
-  make SYSSRC=$KERNELPATH module || exit 1
+
+# CC=${CC:-gcc} suppresses an otherwise harmless "compiler mismatch"
+# message.  If you custom-build your kernel with clang,
+# then pass CC=clang to this script.
+  CC=${CC:-gcc} make SYSSRC=$KERNELPATH module || exit 1
 )
 
 mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video
 install -m 0664 kernel/nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
 install -m 0664 kernel/nvidia-modeset.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
 install -m 0664 kernel/nvidia-drm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
-# 32-bit doesn't have nvidia-uvm
-if [ "$TARGET" = "x86_64" ]; then
-    install -m 0664 kernel/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
-fi
+install -m 0664 kernel/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
 
 mkdir -p $PKG/usr/share/X11/xorg.conf.d/
 cat $TMP/$SRCNAM/nvidia-drm-outputclass.conf > $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
@@ -101,4 +110,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$TARGET-$BUILD$TAG.$PKGTYPE
diff --git a/system/nvidia-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info
index b89abdf464..26efa390c4 100644
--- a/system/nvidia-kernel/nvidia-kernel.info
+++ b/system/nvidia-kernel/nvidia-kernel.info
@@ -1,10 +1,10 @@
 PRGNAM="nvidia-kernel"
-VERSION="460.39"
-HOMEPAGE="http://www.nvidia.com"
+VERSION="550.67"
+HOMEPAGE="https://www.nvidia.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/460.39/NVIDIA-Linux-x86_64-460.39.run"
-MD5SUM_x86_64="79365687506ff548f9504e9fe0e0bc03"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/550.67/NVIDIA-Linux-x86_64-550.67.run"
+MD5SUM_x86_64="4190c0255fa40acdae1fe00b607ae4f3"
 REQUIRES=""
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/system/nvidia-legacy304-driver/README b/system/nvidia-legacy304-driver/README
deleted file mode 100644
index 0bd7937151..0000000000
--- a/system/nvidia-legacy304-driver/README
+++ /dev/null
@@ -1,43 +0,0 @@
-This is the proprietary binary video driver from NVidia for the X.Org
-X-server. This package does not include the kernel-module - it is a part
-of the nvidia-kernel package at SlackBuilds.org.
-
-Since this nvidia-driver conflicts with some files of xorg, it's a bit
-complex to install/uninstall the driver. However, installation of the
-nvidia-driver package itself backs up the conflicting files and puts
-the nvidia-specific files into place.
-
-Included is a script called nvidia-switch, which is used to switch from
-the xorg driver to the nvidia driver, but it will not edit xorg.conf for
-you; you have to do that manually. The nvidia-switch script is installed
-to /usr/sbin.
-
-Usage of nvidia-switch:
-  nvidia-switch --install  <--> install the nvidia files and save the
-                                stock xorg files.
-  nvidia-switch --remove   <--> remove the nvidia files and symlinks and
-                                restore the stock xorg files.
-
-You do NOT have to run nvidia-switch after installing the package.
-
-Note: x86_64 COMPAT32 enviroment is not supported.
-
-Before uninstalling or upgrading this package, it is important that
-you execute 'nvidia-switch --remove', which will switch back to the
-stock xorg files and remove all links created by nvidia-switch during
-installation. If you forget to do this, you'll have to do the switch
-manually, or xorg won't work on next startup.
-
-Here are the affected files:
-  /usr/lib/libGL.so.1.2
-  /usr/lib/xorg/modules/extensions/{libglx.so libglx.la}
-
-or, for Slackware64,
-
-  /usr/lib64/libGL.so.1.2
-  /usr/lib64/xorg/modules/extensions/{libglx.so libglx.la}
-
-Simply remove the dead nvidia symlinks and rename the saved '-xorg'
-appended files.
-
-Requires:  nvidia-kernel,libvdpau
diff --git a/system/nvidia-legacy304-driver/changelog.txt b/system/nvidia-legacy304-driver/changelog.txt
deleted file mode 100644
index ea44fd93d8..0000000000
--- a/system/nvidia-legacy304-driver/changelog.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-1.0	20-MAR-2011	New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
-1.1	10-APR-2011	updated to new version, testing 13.37rc4.6692
-1.2	27-MAY-2011	new version, allow multilib option, minor edits
-1.2.1	20-JUN-2011	minor edits, thanks to Robby and Roberto
-1.5	01-JUL-2011	new version, single driver download, add switch to select pure x86_64 or x86_64 with 32-bit compatibility.
-1.6	27-AUG-2011	version bump, minor edits
-1.7	21-OCT-2011	version bump
-1.8	24-MAR-2012	version bump, fix to nvidia-switch thanks to Phill W.
-1.9	02-AUG-2012	version bmp, fixes, updates, nvidia-switch for install/uninstall only
-3.0	06-JUL-2013 Legacy 304 branch, removed 32-bit compatibility
-3.1	22-SEP-2013	version update
-3.1a	04-NOV-2013	minor fixes for 14.1 release
-3.2	08-FEB-2015 version update, restored 32-bit compatibility
-3.3	05-SEP-2015 version update
-3.4	13-DEC-2015 version update, X.org 1.18
-3.5	19-MAR-2016 remove nvidia-installer (doesn't compile on 14.2RC1), minor edits
-3.6	16-OCT-2016 bug fixes, added nvidia-installer
-4.0	15-FEB-2017 new version, security updates
-4.1	21-OCT-2017 new version for recent kernels
diff --git a/system/nvidia-legacy304-driver/doinst.sh b/system/nvidia-legacy304-driver/doinst.sh
deleted file mode 100644
index 8ee62f049e..0000000000
--- a/system/nvidia-legacy304-driver/doinst.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications
-fi
-
-./usr/sbin/nvidia-switch --install
-
diff --git a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild
deleted file mode 100644
index 18fefdaaa8..0000000000
--- a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild
+++ /dev/null
@@ -1,266 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for nvidia-driver
-
-# Copyright 2007-2011 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2011-2017 Edward W. koenig, Vancouver, WA, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Thanks to Robby Workman for suggestions to improve this script.
-#
-# See changelog.txt
-
-PRGNAM=nvidia-legacy304-driver
-VERSION=${VERSION:-304.137}
-MVERS=304
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-CPROXY=${CPROXY:-no}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  TARGET="x86"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  TARGET="x86"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  TARGET="x86_64"
-  LIBDIRSUFFIX="64"
-# Set 32-bit compatibility flag default
-  COMPAT32=${COMPAT32:-no}
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf nvidia-installer-$VERSION
-tar xvf $CWD/nvidia-installer-$VERSION.tar.bz2
-rm -rf nvidia-settings-$VERSION
-tar xvf $CWD/nvidia-settings-$VERSION.tar.bz2
-rm -rf nvidia-xconfig-$VERSION
-tar xvf $CWD/nvidia-xconfig-$VERSION.tar.bz2
-rm -rf $SRCNAM
-sh $CWD/$SRCNAM.run --extract-only
-cd $SRCNAM
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
-  $PKG/etc/OpenCL/vendors/ $PKG/usr/lib$LIBDIRSUFFIX/tls \
-  $PKG/usr/{bin,man/man1,sbin} $PKG/usr/share/{applications,pixmaps} \
-  $PKG/usr/include/GL
-
-# Get all the libs to the right place
-install -m 755 nvidia_drv.so $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/
-install -m 755 libcuda.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libglx.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/extensions/libglx.so.$VERSION-nvidia
-install -m 755 libGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGL.so.$VERSION-nvidia
-install -m 755 libGL.la $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
-install -m 755 libnvcuvid.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-cfg.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-compiler.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-glcore.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-ml.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libnvidia-opencl.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 tls/libnvidia-tls.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/tls/
-install -m 755 libOpenCL.so.1.0.0 $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libXvMCNVIDIA.a $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libXvMCNVIDIA.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-install -m 755 libvdpau_nvidia.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
-
-# For 8-series GPU if libwfb.so is missing (ie older X servers).
-install -m 755 libnvidia-wfb.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/libnvidia-wfb.so.$VERSION-nvidia
-
-install -m 644 nvidia.icd $PKG/etc/OpenCL/vendors/
-
-# Add optional 32-bit support
-if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-  mkdir -p $PKG/usr/lib/tls
-
-  install -m 755 32/libcuda.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libGL.so.$VERSION $PKG/usr/lib/libGL.so.$VERSION-nvidia
-  install -m 755 32/libGL.la $PKG/usr/lib/libGL.la-nvidia
-  install -m 755 32/libnvidia-compiler.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-glcore.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-ml.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/libnvidia-opencl.so.$VERSION $PKG/usr/lib/
-  install -m 755 32/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/
-  install -m 755 32/libOpenCL.so.1.0.0 $PKG/usr/lib/
-  install -m 755 32/libvdpau_nvidia.so.$VERSION $PKG/usr/lib/
-fi
-
-# symlinks
-cd $PKG/usr/lib$LIBDIRSUFFIX
-  for i in libcuda libnvidia-cfg; do
-    ln -s $i.so.$VERSION $i.so.1
-    ln -s $i.so.1 $i.so
-  done
-  ln -sf libOpenCL.so.1.0.0 libOpenCL.so.1.0
-  ln -sf libOpenCL.so.1.0 libOpenCL.so.1
-  ln -sf libOpenCL.so.1 libOpenCL.so
-  ln -sf libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
-  ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION
-cd -
-
-# symlinks for optional 32-bit support
-if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-  cd $PKG/usr/lib
-    ln -sf libcuda.so.$VERSION libcuda.so.$MVERS
-    ln -sf libcuda.so.$MVERS libcuda.so
-    ln -sf libOpenCL.so.1.0.0 libOpenCL.so.1.0
-    ln -sf libOpenCL.so.1.0 libOpenCL.so.1
-    ln -sf libOpenCL.so.1 libOpenCL.so
-    ln -sf libvdpau_nvidia.so.$VERSION libvdpau_nvidia.so
-    ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION
-  cd -
-fi
-
-# Next come the apps
-for i in nvidia-smi nvidia-bug-report.sh nvidia-debugdump; do
-  install -m 755 $i $PKG/usr/bin/
-done
-
-install -m 644 nvidia-smi.1.gz $PKG/usr/man/man1/
-
-# New CUDA proxy server for 64-bit Linux only, and requires a device that supports
-# Unified Virtual Address (UVA) and CUDA 4.0+.
-if [ "$ARCH" = "x86_64" -a "${CPROXY}" = "yes" ]; then
-   install -m 755 nvidia-cuda-mps-control $PKG/usr/bin/
-   install -m 755 nvidia-cuda-mps-server $PKG/usr/bin/
-   install -m 644 nvidia-cuda-mps-control.1.gz $PKG/usr/man/man1/
-fi
-
-# Compiling nvidia-installer from source
-# Not really needed for this SBo package...yet!
-cd $TMP/nvidia-installer-$VERSION
-  chown -R root:root .
-  find -L . \
-   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-    -o -perm 511 \) -exec chmod 755 {} \; -o \
-   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-  CFLAGS="$SLKCFLAGS" LDFLAGS="-lz" make
-
-  install -m 755 _out/Linux_$TARGET/nvidia-installer $PKG/usr/bin/
-  install -m 644 _out/Linux_$TARGET/nvidia-installer.1.gz $PKG/usr/man/man1/
-cd -
-
-# Compiling nvidia-settings from source
-cd $TMP/nvidia-settings-$VERSION
-  chown -R root:root .
-  find -L . \
-   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-    -o -perm 511 \) -exec chmod 755 {} \; -o \
-   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-  cd src/libXNVCtrl
-    make clean
-    CFLAGS="$SLKCFLAGS" \
-    make
-  cd ../../
-
-  CFLAGS="$SLKCFLAGS" \
-  make
-
-  install -m 755 src/_out/Linux_$TARGET/nvidia-settings $PKG/usr/bin/
-  install -m 644 doc/_out/Linux_$TARGET/nvidia-settings.1.gz $PKG/usr/man/man1/
-  install -m 644 doc/nvidia-settings.desktop $PKG/usr/share/applications/
-  install -m 644 doc/nvidia-settings.png $PKG/usr/share/pixmaps/
-cd ../
-
-# Compiling nvidia-xconfig from source
-cd $TMP/nvidia-xconfig-$VERSION
-  chown -R root:root .
-  find -L . \
-   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-    -o -perm 511 \) -exec chmod 755 {} \; -o \
-   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-  CFLAGS="$SLKCFLAGS" \
-  make
-
-  install -m 755 _out/Linux_$TARGET/nvidia-xconfig $PKG/usr/bin/
-  install -m 644 _out/Linux_$TARGET/nvidia-xconfig.1.gz $PKG/usr/man/man1/
-cd -
-
-# Bash script to cleanly install (in doinst.sh) and uninstall the nvidia files
-# so we don't stomp on the overlapping xorg files.
-# Note: switching "on the fly" is no longer supported.
-install -m 0755 $CWD/nvidia-switch $PKG/usr/sbin/
-sed -i s/PKGVERSION/$VERSION/g $PKG/usr/sbin/nvidia-switch
-sed -i s/LIBDIRSUFFIX/$LIBDIRSUFFIX/g $PKG/usr/sbin/nvidia-switch
-if [ ${COMPAT32} = "yes" ]; then
-  sed -i s/LIB32FLAG/yes/g $PKG/usr/sbin/nvidia-switch
-else
-  sed -i s/LIB32FLAG/no/g $PKG/usr/sbin/nvidia-switch
-fi
-
-# These update placeholders and correct wrong paths
-sed -i "s|__LIBGL_PATH__|/usr/lib$LIBDIRSUFFIX/|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
-sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX/|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
-sed -i "s|__UTILS_PATH__|/usr/bin|" \
-  $PKG/usr/share/applications/nvidia-settings.desktop
-sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" \
-  $PKG/usr/share/applications/nvidia-settings.desktop
-sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|" \
-  $PKG/usr/share/applications/nvidia-settings.desktop
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cd $TMP/$SRCNAM
-cp -a LICENSE NVIDIA_Changelog README.txt html $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-sed "s/PKGVERSION/$VERSION/g" $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info
deleted file mode 100644
index c81c889258..0000000000
--- a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info
+++ /dev/null
@@ -1,22 +0,0 @@
-PRGNAM="nvidia-legacy304-driver"
-VERSION="304.137"
-HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/304.137/NVIDIA-Linux-x86-304.137.run \
-          https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-304.137.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.137.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.137.tar.bz2"
-MD5SUM="133098e70581f6b81c481338cc20f100 \
-	857e15c72cbf72245d4c9e5215a24019 \
-	51a4d5286557f11f06f42ca949431cf8 \
-	40be98ce681fed695e8888f4483f0e48"
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/304.137/NVIDIA-Linux-x86_64-304.137.run \
-                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-304.137.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.137.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-304.137.tar.bz2"
-MD5SUM_x86_64="a61b391d44aa6e7222f64502ef7f3ea1 \
-	       857e15c72cbf72245d4c9e5215a24019 \
-	       51a4d5286557f11f06f42ca949431cf8 \
-	       40be98ce681fed695e8888f4483f0e48"
-REQUIRES="nvidia-legacy304-kernel"
-MAINTAINER="unmaintained"
-EMAIL="unmaintained@gmail.com"
diff --git a/system/nvidia-legacy304-driver/nvidia-switch b/system/nvidia-legacy304-driver/nvidia-switch
deleted file mode 100644
index 4ac2648e9c..0000000000
--- a/system/nvidia-legacy304-driver/nvidia-switch
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/bin/sh
-
-# Copyright 2012-2015 Edward W. Koenig, Vancouver, WA, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# nvidia-switch utility 2.3
-#
-# A tool to install and cleanly remove the nvidia driver without stomping on the xorg files.
-# Note: this tool "should" allow switching on the fly, but why? Pick a driver! You will still
-# need to edit a bunch of other config files.
-
-# TO-DO: needs cleanup; too "wordy" and brittle.
-
-set -e
-
-ROOT="/"
-CWD=$(pwd)
-LIBSUFFIX="LIBDIRSUFFIX" # This will be replaced in the build script
-COMPAT32="LIB32FLAG" # This will be replaced in the build script (yes | no)
-INC="${ROOT}usr/include/GL"
-LIB="${ROOT}usr/lib${LIBSUFFIX}"
-LIB32="${ROOT}usr/lib"
-XMOD="${LIB}/xorg/modules"
-XLIB="$XMOD/extensions"
-NV_VERSION='PKGVERSION' # This will be replaced in the build script
-GL_VERSION="1.2.0"
-NV_CONF="/usr/share/X11/xorg.conf.d/10-nvidia.conf"
-
-save_GL(){
-  cd $2
-  if [ "$1" = "nvidia" ]; then
-    if [ ! -e libGL.so.$GL_VERSION-xorg ]; then
-       mv libGL.so.$GL_VERSION libGL.so.$GL_VERSION-xorg
-       mv libGL.la libGL.la-xorg
-    fi
-    mv libGL.so.$NV_VERSION-nvidia libGL.so.$NV_VERSION
-    ln -sf libGL.so.$NV_VERSION libGL.so.1
-    ln -sf libGL.so.$NV_VERSION libGL.so
-    mv libGL.la-nvidia libGL.la
-  fi
-
-  if [ "$1" = "xorg" ]; then
-     mv libGL.so.$NV_VERSION libGL.so.$NV_VERSION-nvidia
-     mv libGL.la libGL.la-nvidia
-     if [ -e libGL.so.$GL_VERSION-xorg ]; then
-        mv libGL.so.$GL_VERSION-xorg libGL.so.$GL_VERSION
-        ln -sf libGL.so.$GL_VERSION libGL.so.1
-        ln -sf libGL.so.$GL_VERSION libGL.so
-        mv libGL.la-xorg libGL.la
-     else
-	echo WARNING: libGL.so.$GL_VERSION is missing.
-     fi
-
-  fi
-  cd "$CWD"
-}
-
-save_wfb(){
-  cd "$XMOD"
-  if [ "$1" = "nvidia" ]; then
-	mv libnvidia-wfb.so.$NV_VERSION-nvidia libnvidia-wfb.so.$NV_VERSION
-	ln -sf libnvidia-wfb.so.$NV_VERSION libnvidia-wfb.so.1
-	if [ ! -e libwfb.so ]; then
-            mv libwfb.so libwfb.so-xorg
-            ln -sf libnvidia-wfb.so.$NV_VERSION libwfb.so
-        fi
-  elif [ "$1" = "xorg" ]; then
-	mv libnvidia-wfb.so.$NV_VERSION libnvidia-wfb.so.$NV_VERSION-nvidia
-	rm -f libnvidia-wfb.so.1
-        if [ -L libwfb.so ]; then
-	    rm -f libwfb.so
-            if [ -e libwfb.so-xorg ]; then
-                mv libwfb.so-xorg libwfb.so
-            fi
-        fi
-  fi
-  cd "$CWD"
-}
-
-save_glx(){
-  cd "$XLIB"
-  if [ "$1" = "nvidia" ]; then
-	if [ ! -e libglx.so-xorg ]; then
-	    mv libglx.so libglx.so-xorg
-	fi
-	ln -sf libglx.so.$NV_VERSION-nvidia libglx.so.$NV_VERSION
-	ln -sf libglx.so.$NV_VERSION libglx.so
-  elif [ "$1" = "xorg" ]; then
-	rm -f libglx.so.$NV_VERSION
-	rm -f libglx.so
-	mv libglx.so-xorg libglx.so
-  fi
-cd "$CWD"
-}
-
-nvidia_install(){
-  echo $'Installing to nvidia-driver files!\n'
-  echo "Make sure the nvidia driver is ENABLED in /etc/X11/xorg.conf"
-  echo "and in /etc/X11/xorg.conf.d."
-  echo "Otherwise, this may lead to improperly working drivers."
-
-  save_GL "nvidia" $LIB
-  save_wfb "nvidia"
-  save_glx "nvidia"
-# Check for multilib configuration
-  if [ "$COMPAT32" = "yes" ]; then
-    save_GL "nvidia" $LIB32
-  fi
-}
-
-nvidia_remove(){
-  echo $'Returning to stock xorg files!\n'
-  echo "Make sure the nvidia driver is DISABLED in /etc/X11/xorg.conf"
-  echo "and in /etc/X11/xorg.conf.d."
-  echo "Otherwise, this may lead to improperly working drivers."
-
-  save_GL "xorg" $LIB
-  save_wfb "xorg"
-  save_glx "xorg"
-# Check for multilib configuration
-  if [ "$COMPAT32" = "yes" ]; then
-    save_GL "xorg" $LIB32
-  fi
-
-  if [ -e $NV_CONF ]; then
-	rm -f $NV_CONF
-  fi
-}
-
-usage(){
-  echo "Usage:"
-  echo " --install		Set up nvidia driver files (only during pkg install)"
-  echo " --remove		Return to stock xorg files and remove all symlinks"
-  echo " --help			Show this help message"
-}
-
-if [ "$1" = '--install' ]; then
-  nvidia_install
-elif [ "$1" = '--remove' ]; then
-  nvidia_remove
-elif [ "$1" = '--help' ]; then
-  usage
-else
-  usage
-fi
diff --git a/system/nvidia-legacy304-driver/slack-desc b/system/nvidia-legacy304-driver/slack-desc
deleted file mode 100644
index fe8d921d39..0000000000
--- a/system/nvidia-legacy304-driver/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-                       |-----handy-ruler------------------------------------------------------|
-nvidia-legacy304-driver: nvidia-legacy304-driver (Proprietary Binary Nvidia Video Driver)
-nvidia-legacy304-driver:
-nvidia-legacy304-driver: This is the proprietary binary video driver from nvidia for
-nvidia-legacy304-driver: the x.org X server. This package does not include the kernel
-nvidia-legacy304-driver: module - it is included in the nvidia-kernel package.
-nvidia-legacy304-driver:
-nvidia-legacy304-driver: See /usr/doc/nvidia-driver-PKGVERSION/README.Slackware
-nvidia-legacy304-driver: for more information.
-nvidia-legacy304-driver:
-nvidia-legacy304-driver:
-nvidia-legacy304-driver:
diff --git a/system/nvidia-legacy304-kernel/10-nvidia.conf b/system/nvidia-legacy304-kernel/10-nvidia.conf
deleted file mode 100644
index a8992c2a0d..0000000000
--- a/system/nvidia-legacy304-kernel/10-nvidia.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Section "Device"
-    Identifier  "Device0"
-    Driver  "nvidia"
-    VendorName "Nvidia Corporation"
-    BoardName ""
-EndSection
diff --git a/system/nvidia-legacy304-kernel/README b/system/nvidia-legacy304-kernel/README
deleted file mode 100644
index 46388555c1..0000000000
--- a/system/nvidia-legacy304-kernel/README
+++ /dev/null
@@ -1,12 +0,0 @@
-This is the kernel-module needed by the proprietary binary nvidia driver.
-You also need the nvidia-legacy304-driver package from SlackBuilds.org.
-
-To build the package for a kernel different from the running one,
-start the script setting the KERNEL variable as in
-    KERNEL=2.6.38.8 ./nvidia-legacy304-kernel.SlackBuild
-
-A default config file is placed at /usr/share/X11/xorg.conf.d/10-nvidia.conf
-to make sure that X loads the nvidia module.  If you need to make changes,
-copy that file to /etc/X11/xorg.conf.d/ and edit the copy.
-
-The xf86-video-nouveau-blacklist package from /extra is required.
diff --git a/system/nvidia-legacy304-kernel/changelog.txt b/system/nvidia-legacy304-kernel/changelog.txt
deleted file mode 100644
index b9f8fb9f01..0000000000
--- a/system/nvidia-legacy304-kernel/changelog.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-1.0		20-MAR-2011	New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com>
-1.1		10-APR-2011	updated to new version, testing 13.37rc4.6692
-1.2		27-MAY-2011	new version, allow multilib option, minor edits
-1.2.1	20-JUN-2011	minor edits, thanks to Robby and Roberto
-1.5		01-JUL-2011	new version, single driver download, add switch to select pure x86_64 or x86_64 with 32-bit compatibility.
-1.6		27-AUG-2011	version bump, minor edits
-1.7		21-OCT-2011	version bump
-1.8		24-MAR-2012	version bump, fix to nvidia-switch thanks to Phill W.
-1.9		02-AUG-2012	version bmp, fixes, updates, nvidia-switch for install/uninstall only
-3.0		06-JUL-2013 Legacy 304 branch, removed 32-bit compatibility
-3.1		22-SEP-2013	version update
-3.1a	04-NOV-2013	minor fixes for 14.1 release
-3.2		08-FEB-2015 version update, restored 32-bit compatibility
-3.3     05-SEP-2015 version update
-3.4     13-DEC-2015 version update, X.org 1.18
-3.5	26-JUL-2016 Patched to not use deprecated kernel mtrr API in >=4.3.x kernels  --rworkman
-4.0	15-FEB-2017 new version, security updates, remove disable-mtrr patch (fixed)
-4.1	21-OCT-2017 new version for recent kernels
diff --git a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild
deleted file mode 100644
index c789ab3a6a..0000000000
--- a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for nvidia-kernel
-
-# Copyright 2007-2011 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2011-2017 Edward W. Koenig, Vancouver, WA, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# See changelog.txt
-
-PRGNAM=nvidia-legacy304-kernel
-VERSION=${VERSION:-304.137}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-KERNEL=${KERNEL:-$(uname -r)}
-KERNELPATH=${KERNELPATH:-/lib/modules/${KERNEL}/build}
-
-PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  TARGET="x86"
-  SRCSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  TARGET="x86"
-  SRCSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  TARGET="x86_64"
-fi
-
-unset ARCH
-
-SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$PRGNAM}
-OUTPUT=${OUTPUT:-/tmp}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
-rm -rf $SRCNAM
-sh $CWD/$SRCNAM.run --extract-only || exit 1
-cd $SRCNAM || exit 1
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-cd kernel || exit 1
-
-make SYSSRC=$KERNELPATH module || exit 1
-
-mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video
-install -m 0664 nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
-
-# Make sure the X is specified to automagically load the
-# correct driver, since I always forget.
-
-mkdir -p $PKG/usr/share/X11/xorg.conf.d/
-cat $CWD/10-nvidia.conf > $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info
deleted file mode 100644
index 6a12fea304..0000000000
--- a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="nvidia-legacy304-kernel"
-VERSION="304.137"
-HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/304.137/NVIDIA-Linux-x86-304.137.run"
-MD5SUM="133098e70581f6b81c481338cc20f100"
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/304.137/NVIDIA-Linux-x86_64-304.137.run"
-MD5SUM_x86_64="a61b391d44aa6e7222f64502ef7f3ea1"
-REQUIRES=""
-MAINTAINER="unmaintained"
-EMAIL="unmaintained@gmail.com"
diff --git a/system/nvidia-legacy304-kernel/slack-desc b/system/nvidia-legacy304-kernel/slack-desc
deleted file mode 100644
index a9980b2094..0000000000
--- a/system/nvidia-legacy304-kernel/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-                       |-----handy-ruler------------------------------------------------------|
-nvidia-legacy304-kernel: nvidia-legacy304-kernel (Kernel Interface for the nvidia driver)
-nvidia-legacy304-kernel:
-nvidia-legacy304-kernel: This is the kernel module needed by the binary nvidia-driver.
-nvidia-legacy304-kernel:
-nvidia-legacy304-kernel:
-nvidia-legacy304-kernel:
-nvidia-legacy304-kernel:
-nvidia-legacy304-kernel:
-nvidia-legacy304-kernel:
-nvidia-legacy304-kernel:
-nvidia-legacy304-kernel:
diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
index 543b3e6516..2c913e30a8 100644
--- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
+++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for nvidia-driver
 # See changelog.txt
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nvidia-legacy340-driver
 VERSION=${VERSION:-340.108}
 MVERS=340
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 CPROXY=${CPROXY:-yes}
 
 if [ -z "$ARCH" ]; then
@@ -17,7 +20,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -76,7 +86,6 @@ install -m 755 nvidia_drv.so $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/
 install -m 755 libcuda.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libglx.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/extensions/libglx.so.$VERSION-nvidia
 install -m 755 libGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libGL.so.$VERSION-nvidia
-install -m 755 libGL.la $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
 install -m 755 libEGL.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/libEGL.so.$VERSION-nvidia
 install -m 755 libnvcuvid.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
 install -m 755 libnvidia-cfg.so.$VERSION $PKG/usr/lib$LIBDIRSUFFIX/
@@ -104,7 +113,6 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
 
   install -m 755 32/libcuda.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libGL.so.$VERSION $PKG/usr/lib/libGL.so.$VERSION-nvidia
-  install -m 755 32/libGL.la $PKG/usr/lib/libGL.la-nvidia
   install -m 755 32/libEGL.so.$VERSION $PKG/usr/lib/libEGL.so.$VERSION-nvidia
   install -m 755 32/libnvcuvid.so.$VERSION $PKG/usr/lib/
   install -m 755 32/libnvidia-compiler.so.$VERSION $PKG/usr/lib/
@@ -182,7 +190,7 @@ cd $TMP/nvidia-settings-$VERSION
     make
   cd ../../
 
-  CFLAGS="$SLKCFLAGS" \
+  CFLAGS="$SLKCFLAGS -fcommon" \
   make
 
   install -m 755 src/_out/Linux_$TARGET/nvidia-settings $PKG/usr/bin/
@@ -234,7 +242,7 @@ cd -
      \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
       -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-    CFLAGS="$SLKCFLAGS" make
+    CFLAGS="$SLKCFLAGS -I/usr/include/tirpc -Wl,-ltirpc" make
 #FIXME: need rc.nvidia-persistenced script
     install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/
     install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/
@@ -253,8 +261,6 @@ else
 fi
 
 # These update placeholders and correct wrong paths
-sed -i "s|__LIBGL_PATH__|/usr/lib$LIBDIRSUFFIX/|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
-sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX/|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia
 sed -i "s|__UTILS_PATH__|/usr/bin|" \
   $PKG/usr/share/applications/nvidia-settings.desktop
 sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" \
@@ -279,4 +285,4 @@ sed "s/PKGVERSION/$VERSION/g" $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
index 82a53144d8..6d35057cee 100644
--- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
+++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info
@@ -16,11 +16,11 @@ DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/340.108/NVIDIA
                  https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.108.tar.bz2 \
                  https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.108.tar.bz2 \
                  https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.108.tar.bz2"
-MD5SUM_x86_64="28a7ec013c4ef657d3e9b978e2f653c1\
+MD5SUM_x86_64="28a7ec013c4ef657d3e9b978e2f653c1 \
 	       2f63e63b1c475ed023e3ee31b6ed0116 \
 	       b76a6500801b96c2296310e17b2e0cdf \
 	       86944ff799d5798f407c5051282699b3 \
 	       da1c2d34014a4aa4e66627ba18364779"
 REQUIRES="nvidia-legacy340-kernel"
-MAINTAINER="Mats B. Tegner"
-EMAIL="mats.bertil.tegner@gmail.com"
+MAINTAINER="UNMAINTAINED"
+EMAIL="UNMAINTAINED"
diff --git a/system/nvidia-legacy340-driver/nvidia-switch b/system/nvidia-legacy340-driver/nvidia-switch
index fd90c87949..fe6c962fb0 100644
--- a/system/nvidia-legacy340-driver/nvidia-switch
+++ b/system/nvidia-legacy340-driver/nvidia-switch
@@ -40,8 +40,8 @@ LIB32="${ROOT}usr/lib"
 XMOD="${LIB}/xorg/modules"
 XLIB="$XMOD/extensions"
 NV_VERSION='PKGVERSION' # This will be replaced in the build script
-GL_VERSION="1.2.0"
-EGL_VERSION="1.0.0"
+GL_VERSION="1.7.0"
+EGL_VERSION="1.1.0"
 NV_CONF="/usr/share/X11/xorg.conf.d/10-nvidia.conf"
 
 save_GL(){
diff --git a/system/nvidia-legacy340-kernel/README b/system/nvidia-legacy340-kernel/README
index 498bf657da..f54913fcd6 100644
--- a/system/nvidia-legacy340-kernel/README
+++ b/system/nvidia-legacy340-kernel/README
@@ -1,13 +1,14 @@
-This is the kernel-module needed by the proprietary binary nvidia driver.
-You also need the nvidia-driver package from SlackBuilds.org.
+This is the kernel-module needed by the proprietary binary nvidia
+driver. You also need the nvidia-driver package from SlackBuilds.org.
 
 To build the package for a kernel different from the running one,
 start the script setting the KERNEL variable as in
     KERNEL=3.2.34 ./nvidia-kernel.SlackBuild
 
-A default config file is placed at /usr/share/X11/xorg.conf.d/10-nvidia.conf
-to make sure that X loads the nvidia module.  If you need to make changes,
-copy that file to /etc/X11/xorg.conf.d/ and edit the copy.  You do not need
-this file at all if you have a proper and complete xorg.conf.
+A default config file is placed at
+/usr/share/X11/xorg.conf.d/10-nvidia.conf to make sure that X loads
+the nvidia module. If you need to make changes, copy that file to
+/etc/X11/xorg.conf.d/ and edit the copy. You do not need this file at
+all if you have a proper and complete xorg.conf.
 
 The xf86-video-nouveau-blacklist package from /extra is required.
diff --git a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild
index 96454d09f9..251d706348 100644
--- a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild
+++ b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nvidia-kernel
 
@@ -27,10 +27,13 @@
 
 # See changelog.txt
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nvidia-legacy340-kernel
 VERSION=${VERSION:-340.108}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 KERNEL=${KERNEL:-$(uname -r)}
 KERNELPATH=${KERNELPATH:-/lib/modules/${KERNEL}/build}
@@ -55,15 +58,22 @@ elif [ "$ARCH" = "x86_64" ]; then
   TARGET="x86_64"
 fi
 
-unset ARCH
-
 SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$PRGNAM}
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
@@ -77,7 +87,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-(cd kernel || exit 1
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
+
+(
+  unset ARCH
+  cd kernel || exit 1
+  sed -i "s|-DNDEBUG$|-DNDEBUG -Wno-error=return-type -Wno-error=implicit-function-declaration|" Makefile
   make SYSSRC=$KERNELPATH module || exit 1
   cd uvm
   sed -i "s|-O2$|-O2 -Wno-error=incompatible-pointer-types|" Makefile
@@ -109,4 +124,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info
index d5e5bec27e..fbeb334c6d 100644
--- a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info
+++ b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info
@@ -6,5 +6,5 @@ MD5SUM="ffa278e613337e638fd10de41dae3630"
 DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/340.108/NVIDIA-Linux-x86_64-340.108.run"
 MD5SUM_x86_64="28a7ec013c4ef657d3e9b978e2f653c1"
 REQUIRES=""
-MAINTAINER="Mats B. Tegner"
-EMAIL="mats.bertil.tegner@gmail.com"
+MAINTAINER="UNMAINTAINED"
+EMAIL="UNMAINTAINED"
diff --git a/system/nvidia-legacy340-kernel/patches/0001-kernel-5.7.patch b/system/nvidia-legacy340-kernel/patches/0001-kernel-5.7.patch
new file mode 100644
index 0000000000..938ca0f76a
--- /dev/null
+++ b/system/nvidia-legacy340-kernel/patches/0001-kernel-5.7.patch
@@ -0,0 +1,780 @@
+From 2154cc447a2377cfd60a7b7c5b619e689ebf71b1 Mon Sep 17 00:00:00 2001
+From: graysky <graysky@archlinux.us>
+Date: Thu, 22 Oct 2020 06:58:53 -0400
+Subject: [PATCH 1/3] kernel-5.7
+
+credit: https://gitlab.manjaro.org/packages?utf8=%E2%9C%93&filter=nvidia-340xx
+---
+ kernel/Makefile              |   5 +
+ kernel/conftest.sh           |  81 +++++++++++++
+ kernel/dkms.conf             |   8 +-
+ kernel/nv-drm.c              | 229 ++++++++++++++++++++++++++++++++++-
+ kernel/nv-linux.h            |  49 ++++++++
+ kernel/nv-procfs.c           |  20 +++
+ kernel/nv-time.h             |   9 +-
+ kernel/nv.c                  |   2 +-
+ kernel/os-interface.c        |   8 +-
+ kernel/uvm/Makefile          |   1 +
+ kernel/uvm/conftest.sh       |   4 +
+ kernel/uvm/nvidia_uvm_lite.c |  29 ++++-
+ 12 files changed, 431 insertions(+), 14 deletions(-)
+
+diff --git a/kernel/Makefile b/kernel/Makefile
+index 125a690..2597080 100644
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -108,12 +108,14 @@ COMPILE_TESTS = \
+ 	acquire_console_sem \
+ 	console_lock \
+ 	kmem_cache_create \
++	kmem_cache_create_usercopy \
+ 	outer_flush_all \
+ 	on_each_cpu \
+ 	smp_call_function \
+ 	nvmap_support \
+ 	acpi_evaluate_integer \
+ 	ioremap_cache \
++	ioremap_nocache \
+ 	ioremap_wc \
+ 	proc_dir_entry \
+ 	INIT_WORK \
+@@ -122,6 +124,7 @@ COMPILE_TESTS = \
+ 	pci_domain_nr \
+ 	pci_dma_mapping_error \
+ 	file_operations \
++	proc_ops \
+ 	sg_alloc_table \
+ 	sg_init_table \
+ 	pci_get_domain_bus_and_slot \
+@@ -147,6 +150,8 @@ COMPILE_TESTS = \
+ 	vm_fault_present \
+ 	vm_fault_has_address \
+ 	drm_driver_unload_has_int_return_type \
++	drm_get_pci_dev \
++	drm_pci_init \
+ 	drm_legacy_pci_init \
+ 	timer_setup \
+ 	do_gettimeofday \
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index b7a85f0..a5225e5 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -176,6 +176,7 @@ test_headers() {
+     FILES="$FILES linux/ktime.h"
+     FILES="$FILES linux/file.h"
+ 
++    FILES_ARCH="$FILES_ARCH asm/pgtable.h"
+     FILES_ARCH="$FILES_ARCH asm/set_memory.h"
+ 
+     translate_and_find_header_files $HEADERS      $FILES
+@@ -440,6 +441,9 @@ compile_test() {
+             # Determine if the set_memory_array_uc() function is present.
+             #
+             CODE="
++            #if defined(NV_ASM_PGTABLE_H_PRESENT)
++            #include <asm/pgtable.h>
++            #endif
+             #if defined(NV_ASM_SET_MEMORY_H_PRESENT)
+             #include <asm/set_memory.h>
+             #else
+@@ -914,6 +918,21 @@ compile_test() {
+             fi
+         ;;
+ 
++        kmem_cache_create_usercopy)
++            #
++            # Determine if the kmem_cache_create_usercopy function exists.
++            #
++            # This function was added by:
++            #   2017-06-10  8eb8284b412906181357c2b0110d879d5af95e52
++            CODE="
++            #include <linux/slab.h>
++            void kmem_cache_create_usercopy(void) {
++                kmem_cache_create_usercopy();
++            }"
++
++            compile_check_conftest "$CODE" "NV_KMEM_CACHE_CREATE_USERCOPY_PRESENT" "" "functions"
++        ;;
++
+         smp_call_function)
+             #
+             # Determine if the smp_call_function() function is
+@@ -1188,6 +1207,22 @@ compile_test() {
+             compile_check_conftest "$CODE" "NV_IOREMAP_CACHE_PRESENT" "" "functions"
+         ;;
+ 
++        ioremap_nocache)
++            #
++            # Determine if the ioremap_nocache() function is present.
++            #
++            # Removed by commit 4bdc0d676a64 ("remove ioremap_nocache and
++            # devm_ioremap_nocache") in v5.6 (2020-01-06)
++            #
++            CODE="
++            #include <asm/io.h>
++            void conftest_ioremap_nocache(void) {
++                ioremap_nocache();
++            }"
++
++            compile_check_conftest "$CODE" "NV_IOREMAP_NOCACHE_PRESENT" "" "functions"
++        ;;
++
+         ioremap_wc)
+             #
+             # Determine if the ioremap_wc() function is present.
+@@ -1371,6 +1406,16 @@ compile_test() {
+             compile_check_conftest "$CODE" "NV_FILE_OPERATIONS_HAS_COMPAT_IOCTL" "" "types"
+         ;;
+ 
++        proc_ops)
++            CODE="
++            #include <linux/proc_fs.h>
++            int conftest_proc_ops(void) {
++                return offsetof(struct proc_ops, proc_open);
++            }"
++
++            compile_check_conftest "$CODE" "NV_HAVE_PROC_OPS" "" "types"
++        ;;
++
+         sg_init_table)
+             #
+             # Determine if the sg_init_table() function is present.
+@@ -2044,6 +2089,42 @@ compile_test() {
+             compile_check_conftest "$CODE" "NV_DRM_DRIVER_UNLOAD_HAS_INT_RETURN_TYPE" "" "types"
+         ;;
+ 
++        drm_get_pci_dev)
++            #
++            # Determine if drm_get_pci_dev() is present.
++            #
++            CODE="
++            #if defined(NV_DRM_DRMP_H_PRESENT)
++            #include <drm/drmP.h>
++            #endif
++
++            #if defined(NV_DRM_DRM_PCI_H_PRESENT)
++            #include <drm/drm_pci.h>
++            #endif
++
++            void conftest_drm_legacy_pci_init(void) {
++                drm_get_pci_dev();
++            }"
++
++            compile_check_conftest "$CODE" "NV_DRM_GET_PCI_DEV_PRESENT" "" "functions"
++        ;;
++
++        drm_pci_init)
++            #
++            # Determine if drm_pci_init() is present.
++            #
++            CODE="
++            #if defined(NV_DRM_DRMP_H_PRESENT)
++            #include <drm/drmP.h>
++            #endif
++
++            void conftest_drm_legacy_pci_init(void) {
++                drm_pci_init();
++            }"
++
++            compile_check_conftest "$CODE" "NV_DRM_PCI_INIT_PRESENT" "" "functions"
++        ;;
++
+         drm_legacy_pci_init)
+             #
+             # Determine if drm_legacy_pci_init() is present. drm_pci_init() was
+diff --git a/kernel/dkms.conf b/kernel/dkms.conf
+index 79a02ae..3140f03 100644
+--- a/kernel/dkms.conf
++++ b/kernel/dkms.conf
+@@ -1,7 +1,13 @@
++if [ -x /usr/bin/nproc ]; then
++  num_cpu_cores=$(nproc)
++else
++  num_cpu_cores=1
++fi
++
+ PACKAGE_NAME="nvidia"
+ PACKAGE_VERSION="340.108"
+ BUILT_MODULE_NAME[0]="$PACKAGE_NAME"
+ DEST_MODULE_LOCATION[0]="/kernel/drivers/video"
+-MAKE[0]="make module KERNEL_UNAME=${kernelver}"
++MAKE[0]="make -j$num_cpu_cores module KERNEL_UNAME=${kernelver}"
+ CLEAN="make clean"
+ AUTOINSTALL="yes"
+diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
+index 0d1cdbf..85db07e 100644
+--- a/kernel/nv-drm.c
++++ b/kernel/nv-drm.c
+@@ -50,9 +50,236 @@
+ #if defined(NV_DRM_LEGACY_PCI_INIT_PRESENT)
+ #define nv_drm_pci_init drm_legacy_pci_init
+ #define nv_drm_pci_exit drm_legacy_pci_exit
+-#else
++#elif defined(NV_DRM_PCI_INIT_PRESENT)
+ #define nv_drm_pci_init drm_pci_init
+ #define nv_drm_pci_exit drm_pci_exit
++#else
++#if defined(NV_DRM_GET_PCI_DEV_PRESENT)
++#define nv_drm_get_pci_dev drm_get_pci_dev
++#else
++#include <drm/drm_agpsupport.h>
++
++struct nv_drm_agp_head {
++    struct agp_kern_info agp_info;
++    struct list_head memory;
++    unsigned long mode;
++    struct agp_bridge_data *bridge;
++    int enabled;
++    int acquired;
++    unsigned long base;
++    int agp_mtrr;
++    int cant_use_aperture;
++    unsigned long page_mask;
++};
++
++struct nv_drm_agp_mem {
++    unsigned long handle;
++    struct agp_memory *memory;
++    unsigned long bound;
++    int pages;
++    struct list_head head;
++};
++
++/*
++ * Code from drm_agp_init/nv_drm_{free,unbind}_agp
++ * Extracted from commit: 5b8b9d0c6d0e0f1993c6c56deaf9646942c49d94, file: drivers/gpu/drm/drm_agpsupport.c
++ */
++struct drm_agp_head *nv_drm_agp_init(struct drm_device *dev)
++{
++    struct nv_drm_agp_head *head = NULL;
++
++    head = kzalloc(sizeof(*head), GFP_KERNEL);
++    if (!head)
++        return NULL;
++    head->bridge = agp_find_bridge(dev->pdev);
++    if (!head->bridge) {
++        head->bridge = agp_backend_acquire(dev->pdev);
++        if (!head->bridge) {
++            kfree(head);
++            return NULL;
++        }
++        agp_copy_info(head->bridge, &head->agp_info);
++        agp_backend_release(head->bridge);
++    } else {
++        agp_copy_info(head->bridge, &head->agp_info);
++    }
++    if (head->agp_info.chipset == NOT_SUPPORTED) {
++        kfree(head);
++        return NULL;
++    }
++    INIT_LIST_HEAD(&head->memory);
++    head->cant_use_aperture = head->agp_info.cant_use_aperture;
++    head->page_mask = head->agp_info.page_mask;
++    head->base = head->agp_info.aper_base;
++    return (struct drm_agp_head *)head;
++}
++
++void nv_drm_free_agp(struct agp_memory *handle, int pages)
++{
++    agp_free_memory(handle);
++}
++
++int nv_drm_unbind_agp(struct agp_memory *handle)
++{
++    return agp_unbind_memory(handle);
++}
++
++/*
++ * Code from drm_pci_agp_{clear,destroy,init}/drm_get_pci_dev
++ * Extracted from commit: 5b8b9d0c6d0e0f1993c6c56deaf9646942c49d94, file: drivers/gpu/drm/drm_pci.c
++ */
++static void nv_drm_pci_agp_init(struct drm_device *dev)
++{
++    if (drm_core_check_feature(dev, DRIVER_USE_AGP)) {
++        if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP))
++            dev->agp = nv_drm_agp_init(dev);
++        if (dev->agp) {
++            dev->agp->agp_mtrr = arch_phys_wc_add(
++                dev->agp->agp_info.aper_base,
++                dev->agp->agp_info.aper_size *
++                1024 * 1024);
++        }
++    }
++}
++
++void nv_drm_legacy_agp_clear(struct drm_device *dev)
++{
++    struct nv_drm_agp_mem *entry, *tempe;
++
++    if (!dev->agp)
++        return;
++    if (!drm_core_check_feature(dev, DRIVER_LEGACY))
++        return;
++
++    list_for_each_entry_safe(entry, tempe, &dev->agp->memory, head) {
++        if (entry->bound)
++            nv_drm_unbind_agp(entry->memory);
++        nv_drm_free_agp(entry->memory, entry->pages);
++        kfree(entry);
++    }
++    INIT_LIST_HEAD(&dev->agp->memory);
++
++    if (dev->agp->acquired)
++        drm_agp_release(dev);
++
++    dev->agp->acquired = 0;
++    dev->agp->enabled = 0;
++}
++
++void nv_drm_pci_agp_destroy(struct drm_device *dev)
++{
++    if (dev->agp) {
++        arch_phys_wc_del(dev->agp->agp_mtrr);
++        nv_drm_legacy_agp_clear(dev);
++        kfree(dev->agp);
++        dev->agp = NULL;
++    }
++}
++
++static int nv_drm_get_pci_dev(struct pci_dev *pdev,
++               const struct pci_device_id *ent,
++               struct drm_driver *driver)
++{
++    struct drm_device *dev;
++    int ret;
++
++    DRM_DEBUG("\n");
++
++    dev = drm_dev_alloc(driver, &pdev->dev);
++    if (IS_ERR(dev))
++        return PTR_ERR(dev);
++
++    ret = pci_enable_device(pdev);
++    if (ret)
++        goto err_free;
++
++    dev->pdev = pdev;
++#ifdef __alpha__
++    dev->hose = pdev->sysdata;
++#endif
++
++    if (drm_core_check_feature(dev, DRIVER_MODESET))
++        pci_set_drvdata(pdev, dev);
++
++    nv_drm_pci_agp_init(dev);
++
++    ret = drm_dev_register(dev, ent->driver_data);
++    if (ret)
++        goto err_agp;
++
++    /* No locking needed since shadow-attach is single-threaded since it may
++     * only be called from the per-driver module init hook. */
++    if (drm_core_check_feature(dev, DRIVER_LEGACY))
++        list_add_tail(&dev->legacy_dev_list, &driver->legacy_dev_list);
++
++    return 0;
++
++err_agp:
++    nv_drm_pci_agp_destroy(dev);
++    pci_disable_device(pdev);
++err_free:
++    drm_dev_put(dev);
++    return ret;
++}
++#endif
++
++/*
++ * Code from drm_legacy_pci_{init,exit}
++ * Extracted from tag: v5.6.3, file: drivers/gpu/drm/drm_pci.c
++ */
++int nv_drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver)
++{
++    struct pci_dev *pdev = NULL;
++    const struct pci_device_id *pid;
++    int i;
++
++    DRM_DEBUG("\n");
++
++    if (WARN_ON(!(driver->driver_features & DRIVER_LEGACY)))
++        return -EINVAL;
++
++    /* If not using KMS, fall back to stealth mode manual scanning. */
++    INIT_LIST_HEAD(&driver->legacy_dev_list);
++    for (i = 0; pdriver->id_table[i].vendor != 0; i++) {
++        pid = &pdriver->id_table[i];
++
++        /* Loop around setting up a DRM device for each PCI device
++         * matching our ID and device class.  If we had the internal
++         * function that pci_get_subsys and pci_get_class used, we'd
++         * be able to just pass pid in instead of doing a two-stage
++         * thing.
++         */
++        pdev = NULL;
++        while ((pdev =
++            pci_get_subsys(pid->vendor, pid->device, pid->subvendor,
++                       pid->subdevice, pdev)) != NULL) {
++            if ((pdev->class & pid->class_mask) != pid->class)
++                continue;
++
++            /* stealth mode requires a manual probe */
++            pci_dev_get(pdev);
++            nv_drm_get_pci_dev(pdev, pid, driver);
++        }
++    }
++    return 0;
++}
++
++void nv_drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver)
++{
++    struct drm_device *dev, *tmp;
++    DRM_DEBUG("\n");
++
++    if (!(driver->driver_features & DRIVER_LEGACY)) {
++        WARN_ON(1);
++    } else {
++        list_for_each_entry_safe(dev, tmp, &driver->legacy_dev_list,
++                     legacy_dev_list) {
++            list_del(&dev->legacy_dev_list);
++            drm_put_dev(dev);
++        }
++    }
++    DRM_INFO("Module unloaded\n");
++}
+ #endif
+ 
+ extern nv_linux_state_t *nv_linux_devices;
+diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
+index a1d2c68..83e6433 100644
+--- a/kernel/nv-linux.h
++++ b/kernel/nv-linux.h
+@@ -688,11 +688,16 @@ extern nv_spinlock_t km_lock;
+         VM_ALLOC_RECORD(ptr, size, "vm_ioremap"); \
+     }
+ 
++#if defined(NV_IOREMAP_NOCACHE_PRESENT)
+ #define NV_IOREMAP_NOCACHE(ptr, physaddr, size) \
+     { \
+         (ptr) = ioremap_nocache(physaddr, size); \
+         VM_ALLOC_RECORD(ptr, size, "vm_ioremap_nocache"); \
+     }
++#else
++#define NV_IOREMAP_NOCACHE(ptr, physaddr, size) \
++    NV_IOREMAP(ptr, physaddr, size)
++#endif
+ 
+ #if defined(NV_IOREMAP_CACHE_PRESENT)
+ #define NV_IOREMAP_CACHE(ptr, physaddr, size)            \
+@@ -774,6 +779,17 @@ extern nv_spinlock_t km_lock;
+ #error "NV_KMEM_CACHE_CREATE() undefined (kmem_cache_create() unavailable)!"
+ #endif
+ 
++#if defined(NV_KMEM_CACHE_CREATE_USERCOPY_PRESENT)
++#define NV_KMEM_CACHE_CREATE_USERCOPY(kmem_cache, name, type)       \
++    {                                                               \
++        kmem_cache = kmem_cache_create_usercopy(name, sizeof(type), \
++                        0, 0, 0, sizeof(type), NULL);               \
++    }
++#else
++#define NV_KMEM_CACHE_CREATE_USERCOPY(kmem_cache, name, type)       \
++        NV_KMEM_CACHE_CREATE(kmem_cache, name, type)
++#endif
++
+ #define NV_KMEM_CACHE_ALLOC(ptr, kmem_cache, type)              \
+     {                                                           \
+         (ptr) = kmem_cache_alloc(kmem_cache, GFP_KERNEL);       \
+@@ -1971,6 +1987,19 @@ extern NvU32 nv_assign_gpu_count;
+     })
+ #endif
+ 
++#if defined(NV_HAVE_PROC_OPS)
++#define NV_CREATE_PROC_FILE(filename,parent,__name,__data)               \
++   ({                                                                    \
++        struct proc_dir_entry *__entry;                                  \
++        int mode = (S_IFREG | S_IRUGO);                                  \
++        const struct proc_ops *fops = &nv_procfs_##__name##_fops;        \
++        if (fops->proc_write != 0)                                       \
++            mode |= S_IWUSR;                                             \
++        __entry = NV_CREATE_PROC_ENTRY(filename, mode, parent, fops,     \
++            __data);                                                     \
++        __entry;                                                         \
++    })
++#else
+ #define NV_CREATE_PROC_FILE(filename,parent,__name,__data)               \
+    ({                                                                    \
+         struct proc_dir_entry *__entry;                                  \
+@@ -1982,6 +2011,7 @@ extern NvU32 nv_assign_gpu_count;
+             __data);                                                     \
+         __entry;                                                         \
+     })
++#endif
+ 
+ /*
+  * proc_mkdir_mode exists in Linux 2.6.9, but isn't exported until Linux 3.0.
+@@ -2023,6 +2053,24 @@ extern NvU32 nv_assign_gpu_count;
+     remove_proc_entry(entry->name, entry->parent);
+ #endif
+ 
++#if defined(NV_HAVE_PROC_OPS)
++#define NV_DEFINE_PROCFS_SINGLE_FILE(__name)                                  \
++    static int nv_procfs_open_##__name(                                       \
++        struct inode *inode,                                                  \
++        struct file *filep                                                    \
++    )                                                                         \
++    {                                                                         \
++        return single_open(filep, nv_procfs_read_##__name,                    \
++            NV_PDE_DATA(inode));                                              \
++    }                                                                         \
++                                                                              \
++    static const struct proc_ops nv_procfs_##__name##_fops = {                \
++        .proc_open       = nv_procfs_open_##__name,                           \
++        .proc_read       = seq_read,                                          \
++        .proc_lseek      = seq_lseek,                                         \
++        .proc_release    = single_release,                                    \
++    };
++#else
+ #define NV_DEFINE_PROCFS_SINGLE_FILE(__name)                                  \
+     static int nv_procfs_open_##__name(                                       \
+         struct inode *inode,                                                  \
+@@ -2040,6 +2088,7 @@ extern NvU32 nv_assign_gpu_count;
+         .llseek     = seq_lseek,                                              \
+         .release    = single_release,                                         \
+     };
++#endif
+ 
+ #endif  /* CONFIG_PROC_FS */
+ 
+diff --git a/kernel/nv-procfs.c b/kernel/nv-procfs.c
+index ebca3e8..9365c3c 100644
+--- a/kernel/nv-procfs.c
++++ b/kernel/nv-procfs.c
+@@ -409,6 +409,15 @@ done:
+     return ((status < 0) ? status : (int)count);
+ }
+ 
++#if defined(NV_HAVE_PROC_OPS)
++static struct proc_ops nv_procfs_registry_fops = {
++    .proc_open    = nv_procfs_open_registry,
++    .proc_read    = seq_read,
++    .proc_write   = nv_procfs_write_file,
++    .proc_lseek   = seq_lseek,
++    .proc_release = nv_procfs_close_registry,
++};
++#else
+ static struct file_operations nv_procfs_registry_fops = {
+     .owner   = THIS_MODULE,
+     .open    = nv_procfs_open_registry,
+@@ -417,6 +426,7 @@ static struct file_operations nv_procfs_registry_fops = {
+     .llseek  = seq_lseek,
+     .release = nv_procfs_close_registry,
+ };
++#endif
+ 
+ static int
+ nv_procfs_read_unbind_lock(
+@@ -538,6 +548,15 @@ done:
+     return rc;
+ }
+ 
++#if defined(NV_HAVE_PROC_OPS)
++static struct proc_ops nv_procfs_unbind_lock_fops = {
++    .proc_open    = nv_procfs_open_unbind_lock,
++    .proc_read    = seq_read,
++    .proc_write   = nv_procfs_write_file,
++    .proc_lseek   = seq_lseek,
++    .proc_release = nv_procfs_close_unbind_lock,
++};
++#else
+ static struct file_operations nv_procfs_unbind_lock_fops = {
+     .owner   = THIS_MODULE,
+     .open    = nv_procfs_open_unbind_lock,
+@@ -546,6 +565,7 @@ static struct file_operations nv_procfs_unbind_lock_fops = {
+     .llseek  = seq_lseek,
+     .release = nv_procfs_close_unbind_lock,
+ };
++#endif
+ 
+ static int
+ nv_procfs_read_text_file(
+diff --git a/kernel/nv-time.h b/kernel/nv-time.h
+index a34ceb2..780f8bc 100644
+--- a/kernel/nv-time.h
++++ b/kernel/nv-time.h
+@@ -28,7 +28,12 @@
+ #include <linux/ktime.h>
+ #endif
+ 
+-static inline void nv_gettimeofday(struct timeval *tv)
++struct nv_timeval {
++    __kernel_long_t      tv_sec;
++    __kernel_suseconds_t tv_usec;
++};
++
++static inline void nv_gettimeofday(struct nv_timeval *tv)
+ {
+ #ifdef NV_DO_GETTIMEOFDAY_PRESENT
+     do_gettimeofday(tv);
+@@ -37,7 +42,7 @@ static inline void nv_gettimeofday(struct timeval *tv)
+ 
+     ktime_get_real_ts64(&now);
+ 
+-    *tv = (struct timeval) {
++    *tv = (struct nv_timeval) {
+         .tv_sec = now.tv_sec,
+         .tv_usec = now.tv_nsec/1000,
+     };
+diff --git a/kernel/nv.c b/kernel/nv.c
+index a167be9..a218f83 100644
+--- a/kernel/nv.c
++++ b/kernel/nv.c
+@@ -752,7 +752,7 @@ int __init nvidia_init_module(void)
+     NV_SPIN_LOCK_INIT(&km_lock);
+ #endif
+ 
+-    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t);
++    NV_KMEM_CACHE_CREATE_USERCOPY(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t);
+     if (nv_stack_t_cache == NULL)
+     {
+         nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
+diff --git a/kernel/os-interface.c b/kernel/os-interface.c
+index 7190b26..0c0dc05 100644
+--- a/kernel/os-interface.c
++++ b/kernel/os-interface.c
+@@ -439,7 +439,7 @@ RM_STATUS NV_API_CALL os_get_current_time(
+     NvU32 *useconds
+ )
+ {
+-    struct timeval tm;
++    struct nv_timeval tm;
+ 
+     nv_gettimeofday(&tm);
+ 
+@@ -474,7 +474,7 @@ RM_STATUS NV_API_CALL os_delay_us(NvU32 MicroSeconds)
+     unsigned long usec;
+ 
+ #ifdef NV_CHECK_DELAY_ACCURACY
+-    struct timeval tm1, tm2;
++    struct nv_timeval tm1, tm2;
+ 
+     nv_gettimeofday(&tm1);
+ #endif
+@@ -514,9 +514,9 @@ RM_STATUS NV_API_CALL os_delay(NvU32 MilliSeconds)
+     unsigned long MicroSeconds;
+     unsigned long jiffies;
+     unsigned long mdelay_safe_msec;
+-    struct timeval tm_end, tm_aux;
++    struct nv_timeval tm_end, tm_aux;
+ #ifdef NV_CHECK_DELAY_ACCURACY
+-    struct timeval tm_start;
++    struct nv_timeval tm_start;
+ #endif
+ 
+     nv_gettimeofday(&tm_aux);
+diff --git a/kernel/uvm/Makefile b/kernel/uvm/Makefile
+index 0cad8ff..043a08d 100644
+--- a/kernel/uvm/Makefile
++++ b/kernel/uvm/Makefile
+@@ -207,6 +207,7 @@ ccflags-y += $(EXTRA_CFLAGS)
+ 
+ RM_MODULE_SYMVERS:= $(RM_OUT_DIR)/Module.symvers
+ UVM_MODULE_SYMVERS:= $(obj)/Module.symvers
++KBUILD_EXTRA_SYMBOLS:= $(UVM_MODULE_SYMVERS)
+ 
+ module $(MODULE_NAME).ko: $(UVM_MODULE_SYMVERS) debug_diagnostics_printing
+ 
+diff --git a/kernel/uvm/conftest.sh b/kernel/uvm/conftest.sh
+index b7a85f0..33e2a63 100755
+--- a/kernel/uvm/conftest.sh
++++ b/kernel/uvm/conftest.sh
+@@ -176,6 +176,7 @@ test_headers() {
+     FILES="$FILES linux/ktime.h"
+     FILES="$FILES linux/file.h"
+ 
++    FILES_ARCH="$FILES_ARCH asm/pgtable.h"
+     FILES_ARCH="$FILES_ARCH asm/set_memory.h"
+ 
+     translate_and_find_header_files $HEADERS      $FILES
+@@ -440,6 +441,9 @@ compile_test() {
+             # Determine if the set_memory_array_uc() function is present.
+             #
+             CODE="
++            #if defined(NV_ASM_PGTABLE_H_PRESENT)
++            #include <asm/pgtable.h>
++            #endif
+             #if defined(NV_ASM_SET_MEMORY_H_PRESENT)
+             #include <asm/set_memory.h>
+             #else
+diff --git a/kernel/uvm/nvidia_uvm_lite.c b/kernel/uvm/nvidia_uvm_lite.c
+index 6943e7c..9a7e3b6 100644
+--- a/kernel/uvm/nvidia_uvm_lite.c
++++ b/kernel/uvm/nvidia_uvm_lite.c
+@@ -131,8 +131,8 @@ static
+ RM_STATUS _preexisting_error_on_channel(UvmGpuMigrationTracking *pMigTracker,
+                                          UvmCommitRecord *pRecord);
+ 
+-static void _set_timeout_in_usec(struct timeval *src,
+-                                 struct timeval *result,
++static void _set_timeout_in_usec(struct nv_timeval *src,
++                                 struct nv_timeval *result,
+                                  unsigned long timeoutInUsec)
+ {
+     if (!src || !result)
+@@ -820,7 +820,13 @@ done:
+ }
+ 
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
++vm_fault_t _fault(struct vm_fault *vmf)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++int _fault(struct vm_fault *vmf)
++#else
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#endif
+ {
+ #if defined(NV_VM_FAULT_HAS_ADDRESS)
+     unsigned long vaddr = vmf->address;
+@@ -828,8 +834,15 @@ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+     unsigned long vaddr = (unsigned long)vmf->virtual_address;
+ #endif
+     struct page *page = NULL;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
++    vm_fault_t retval;
++#else
+     int retval;
+ 
++#endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++   struct vm_area_struct *vma = vmf->vma;
++#endif
+     retval = _fault_common(vma, vaddr, &page, vmf->flags);
+ 
+     vmf->page = page;
+@@ -868,7 +881,13 @@ static struct vm_operations_struct uvmlite_vma_ops =
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
++vm_fault_t _sigbus_fault(struct vm_fault *vmf)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++int _sigbus_fault(struct vm_fault *vmf)
++#else
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#endif
+ {
+     vmf->page = NULL;
+     return VM_FAULT_SIGBUS;
+@@ -1992,9 +2011,9 @@ void umvlite_destroy_per_process_gpu_resources(UvmGpuUuid *gpuUuidStruct)
+ static RM_STATUS _check_ecc_errors(UvmGpuMigrationTracking *pMigTracker,
+                                     NvBool *pIsEccErrorSet)
+ {
+-    struct timeval eccErrorStartTime = {0};
+-    struct timeval eccErrorCurrentTime = {0};
+-    struct timeval eccTimeout = {0};
++    struct nv_timeval eccErrorStartTime = {0};
++    struct nv_timeval eccErrorCurrentTime = {0};
++    struct nv_timeval eccTimeout = {0};
+     NvBool bEccErrorTimeout = NV_FALSE;
+     NvBool bEccIncomingError = NV_FALSE;
+     unsigned rmInterruptSet = 0;
+-- 
+2.29.0
+
diff --git a/system/nvidia-legacy340-kernel/patches/0002-kernel-5.8.patch b/system/nvidia-legacy340-kernel/patches/0002-kernel-5.8.patch
new file mode 100644
index 0000000000..1d8b1a40e1
--- /dev/null
+++ b/system/nvidia-legacy340-kernel/patches/0002-kernel-5.8.patch
@@ -0,0 +1,92 @@
+From 2cc3342b4b3c96bcc4062513011d35c079b009a2 Mon Sep 17 00:00:00 2001
+From: graysky <graysky@archlinux.us>
+Date: Thu, 22 Oct 2020 06:59:59 -0400
+Subject: [PATCH 2/3] kernel-5.8
+
+credit: https://launchpad.net/~kelebek333/+archive/ubuntu/nvidia-legacy/+packages
+extracted from: https://launchpadlibrarian.net/492468557/nvidia-graphics-drivers-340_340.108-1lmtrfocal3_340.108-2lmtrfocal.diff.gz
+---
+ kernel/nv-linux.h                | 8 ++++++++
+ kernel/nvidia-modules-common.mk  | 1 +
+ kernel/os-mlock.c                | 8 ++++++++
+ kernel/uvm/nvidia_uvm_lite_api.c | 4 ++++
+ 4 files changed, 21 insertions(+)
+
+diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
+index 83e6433..d055552 100644
+--- a/kernel/nv-linux.h
++++ b/kernel/nv-linux.h
+@@ -669,11 +669,19 @@ extern nv_spinlock_t km_lock;
+ #  define KM_FREE_RECORD(a,b,c)
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
++#define NV_VMALLOC(ptr, size)                     \
++    {                                             \
++        (ptr) = __vmalloc(size, GFP_KERNEL);      \
++        VM_ALLOC_RECORD(ptr, size, "vm_vmalloc"); \
++    }
++#else
+ #define NV_VMALLOC(ptr, size)                               \
+     {                                                       \
+         (ptr) = __vmalloc(size, GFP_KERNEL, PAGE_KERNEL);   \
+         VM_ALLOC_RECORD(ptr, size, "vm_vmalloc");           \
+     }
++#endif
+ 
+ #define NV_VFREE(ptr, size)                         \
+     {                                               \
+diff --git a/kernel/nvidia-modules-common.mk b/kernel/nvidia-modules-common.mk
+index b94591b..0e4c228 100644
+--- a/kernel/nvidia-modules-common.mk
++++ b/kernel/nvidia-modules-common.mk
+@@ -222,6 +222,7 @@ build-sanity-checks:
+ define BUILD_MODULE_RULE
+  $(1): build-sanity-checks $(3)
+ 	@echo "NVIDIA: calling KBUILD..."; \
++	touch .nv-kernel.o.cmd; \
+ 	$$(MAKE) "CC=$$(CC)" NV_MODULE_SUFFIX=$$(strip $(2)) $$(KBUILD_PARAMS) modules; \
+ 	echo "NVIDIA: left KBUILD."; \
+ 	if ! [ -f $(1) ]; then \
+diff --git a/kernel/os-mlock.c b/kernel/os-mlock.c
+index 8a1fa2f..fc50543 100644
+--- a/kernel/os-mlock.c
++++ b/kernel/os-mlock.c
+@@ -44,11 +44,19 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
+         return rmStatus;
+     }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
++    down_read(&mm->mmap_lock);
++    ret = NV_GET_USER_PAGES((unsigned long)address,
++                            page_count, write, force, user_pages, NULL);
++    up_read(&mm->mmap_lock);
++    pinned = ret;
++#else
+     down_read(&mm->mmap_sem);
+     ret = NV_GET_USER_PAGES((unsigned long)address,
+                             page_count, write, force, user_pages, NULL);
+     up_read(&mm->mmap_sem);
+     pinned = ret;
++#endif
+ 
+     if (ret < 0)
+     {
+diff --git a/kernel/uvm/nvidia_uvm_lite_api.c b/kernel/uvm/nvidia_uvm_lite_api.c
+index 8448eb6..97a4818 100644
+--- a/kernel/uvm/nvidia_uvm_lite_api.c
++++ b/kernel/uvm/nvidia_uvm_lite_api.c
+@@ -30,6 +30,10 @@
+ #include "uvm_gpu_ops_tests.h"
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
++#define mmap_sem mmap_lock
++#endif
++
+ //
+ // nvidia_uvm_lite_api.c
+ //
+-- 
+2.29.0
+
diff --git a/system/nvidia-legacy340-kernel/patches/0003-kernel-5.9.patch b/system/nvidia-legacy340-kernel/patches/0003-kernel-5.9.patch
new file mode 100644
index 0000000000..d8584314f2
--- /dev/null
+++ b/system/nvidia-legacy340-kernel/patches/0003-kernel-5.9.patch
@@ -0,0 +1,107 @@
+From fea401df7500bfbead5a42b1e74560dbddf2f5a3 Mon Sep 17 00:00:00 2001
+From: graysky <graysky@archlinux.us>
+Date: Thu, 22 Oct 2020 07:00:35 -0400
+Subject: [PATCH 3/3] kernel-5.9
+
+credit: https://github.com/warpme/minimyth2/blob/master/script/nvidia/nvidia-340.108/files/nvidia-340.108-fix-5.9-kernel-compile.patch
+---
+ kernel/nv-drm.c               | 8 ++++++++
+ kernel/nv-linux.h             | 9 +++++++--
+ kernel/nv.c                   | 4 ++++
+ kernel/uvm/nvidia_uvm_linux.h | 2 ++
+ 4 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
+index 85db07e..f0c1299 100644
+--- a/kernel/nv-drm.c
++++ b/kernel/nv-drm.c
+@@ -415,7 +415,11 @@ static struct drm_driver nv_drm_driver = {
+     .set_busid = drm_pci_set_busid,
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
++    .gem_free_object_unlocked = nv_gem_free,
++#else
+     .gem_free_object = nv_gem_free,
++#endif
+ 
+     .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
+     .gem_prime_export = drm_gem_prime_export,
+@@ -511,8 +515,12 @@ RM_STATUS NV_API_CALL nv_alloc_os_descriptor_handle(
+ 
+ #if defined(NV_DRM_GEM_OBJECT_PUT_UNLOCKED_PRESENT)
+     drm_gem_object_put_unlocked(&nv_obj->base);
++#else
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
++    drm_gem_object_put_locked(&nv_obj->base);
+ #else
+     drm_gem_object_unreference_unlocked(&nv_obj->base);
++#endif
+ #endif
+ 
+     status = RM_OK;
+diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
+index d055552..524a8fe 100644
+--- a/kernel/nv-linux.h
++++ b/kernel/nv-linux.h
+@@ -136,8 +136,10 @@
+ 
+ #if defined(NVCPU_X86_64) && !defined(HAVE_COMPAT_IOCTL)
+ #include <linux/syscalls.h>         /* sys_ioctl()                      */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+ #include <linux/ioctl32.h>          /* register_ioctl32_conversion()    */
+ #endif
++#endif
+ 
+ #if !defined(NV_FILE_OPERATIONS_HAS_IOCTL) && \
+   !defined(NV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL)
+@@ -2249,10 +2251,13 @@ static inline NvU64 nv_node_end_pfn(int nid)
+                                             pages, vmas, NULL);
+ 
+         #else
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
++               return get_user_pages_remote(mm, start, nr_pages, flags,
++                                            pages, vmas, NULL);
++#else
+                return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
+                                             pages, vmas);
+-
++#endif
+         #endif
+ 
+         }
+diff --git a/kernel/nv.c b/kernel/nv.c
+index a218f83..be4e0f8 100644
+--- a/kernel/nv.c
++++ b/kernel/nv.c
+@@ -2785,7 +2785,11 @@ nvidia_probe
+ 
+ #if defined(CONFIG_VGA_ARB)
+ #if defined(VGA_DEFAULT_DEVICE)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
++    vga_get(VGA_DEFAULT_DEVICE, VGA_RSRC_LEGACY_MASK, 0);
++#else
+     vga_tryget(VGA_DEFAULT_DEVICE, VGA_RSRC_LEGACY_MASK);
++#endif
+ #endif
+     vga_set_legacy_decoding(dev, VGA_RSRC_NONE);
+ #endif
+diff --git a/kernel/uvm/nvidia_uvm_linux.h b/kernel/uvm/nvidia_uvm_linux.h
+index 1625209..efc181f 100644
+--- a/kernel/uvm/nvidia_uvm_linux.h
++++ b/kernel/uvm/nvidia_uvm_linux.h
+@@ -158,8 +158,10 @@
+ 
+ #if defined(NVCPU_X86_64) && !defined(HAVE_COMPAT_IOCTL)
+ #include <linux/syscalls.h>         /* sys_ioctl()                      */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+ #include <linux/ioctl32.h>          /* register_ioctl32_conversion()    */
+ #endif
++#endif
+ 
+ #if !defined(NV_FILE_OPERATIONS_HAS_IOCTL) && \
+   !defined(NV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL)
+-- 
+2.29.0
+
diff --git a/system/nvidia-legacy340-kernel/patches/0004-kernel-5.10.patch b/system/nvidia-legacy340-kernel/patches/0004-kernel-5.10.patch
new file mode 100644
index 0000000000..8bc213c21c
--- /dev/null
+++ b/system/nvidia-legacy340-kernel/patches/0004-kernel-5.10.patch
@@ -0,0 +1,18 @@
+https://github.com/warpme/minimyth2/tree/master/script/nvidia/nvidia-340.108/files
+
+diff -Naur NVIDIA-Linux-x86_64-340.108-old/kernel/nv-drm.c NVIDIA-Linux-x86_64-340.108-new/kernel/nv-drm.c
+--- NVIDIA-Linux-x86_64-340.108-old/kernel/nv-drm.c	2020-12-13 19:10:56.759999937 +0100
++++ NVIDIA-Linux-x86_64-340.108-new/kernel/nv-drm.c	2020-12-13 19:09:02.039999925 +0100
+@@ -322,8 +322,11 @@
+ {
+     struct nv_gem_object *nv_obj = container_of(obj, struct nv_gem_object, base);
+     int page_count = obj->size >> PAGE_SHIFT;
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)
++    return drm_prime_pages_to_sg(obj->dev, nv_obj->pages, page_count);
++#else
+     return drm_prime_pages_to_sg(nv_obj->pages, page_count);
++#endif
+ }
+ 
+ static void* nv_gem_prime_vmap(
diff --git a/system/nvidia-legacy340-kernel/patches/0005-kernel-5.11.patch b/system/nvidia-legacy340-kernel/patches/0005-kernel-5.11.patch
new file mode 100644
index 0000000000..382d7d3b5a
--- /dev/null
+++ b/system/nvidia-legacy340-kernel/patches/0005-kernel-5.11.patch
@@ -0,0 +1,174 @@
+diff -Naur NVIDIA-Linux-x86_64-340.108-old/kernel/conftest.sh NVIDIA-Linux-x86_64-340.108-new/kernel/conftest.sh
+--- NVIDIA-Linux-x86_64-340.108-old/kernel/conftest.sh	2021-05-24 20:08:18.743742335 +0200
++++ NVIDIA-Linux-x86_64-340.108-new/kernel/conftest.sh	2021-05-24 20:13:18.019314390 +0200
+@@ -1578,21 +1578,21 @@
+             #include <drm/drm_drv.h>
+             #endif
+ 
+-            #if defined(NV_DRM_DRM_PRIME_H_PRESENT)
+-            #include <drm/drm_prime.h>
+-            #endif
+-
+             #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
+             #error DRM not enabled
+             #endif
++
+             void conftest_drm_available(void) {
+                 struct drm_driver drv;
+-                drv.gem_prime_pin = 0;
+-                drv.gem_prime_get_sg_table = 0;
+-                drv.gem_prime_vmap = 0;
+-                drv.gem_prime_vunmap = 0;
+-                (void)drm_gem_prime_import;
+-                (void)drm_gem_prime_export;
++
++                /* 2013-10-02 1bb72532ac260a2d3982b40bdd4c936d779d0d16 */
++                (void)drm_dev_alloc;
++
++                /* 2013-10-02 c22f0ace1926da399d9a16dfaf09174c1b03594c */
++                (void)drm_dev_register;
++
++                /* 2013-10-02 c3a49737ef7db0bdd4fcf6cf0b7140a883e32b2a */
++                (void)drm_dev_unregister;
+             }"
+ 
+             compile_check_conftest "$CODE" "NV_DRM_AVAILABLE" "" "generic"
+diff -Naur NVIDIA-Linux-x86_64-340.108-old/kernel/nv-drm.c NVIDIA-Linux-x86_64-340.108-new/kernel/nv-drm.c
+--- NVIDIA-Linux-x86_64-340.108-old/kernel/nv-drm.c	2021-05-24 20:08:18.779739237 +0200
++++ NVIDIA-Linux-x86_64-340.108-new/kernel/nv-drm.c	2021-05-24 20:42:13.443288819 +0200
+@@ -60,6 +60,8 @@
+ #else
+ #include <drm/drm_agpsupport.h>
+ 
++#include "linux/dma-buf.h"
++
+ struct nv_drm_agp_head {
+     struct agp_kern_info agp_info;
+     struct list_head memory;
+@@ -210,8 +212,10 @@
+ 
+     /* No locking needed since shadow-attach is single-threaded since it may
+      * only be called from the per-driver module init hook. */
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(5, 10, 0)
+     if (drm_core_check_feature(dev, DRIVER_LEGACY))
+         list_add_tail(&dev->legacy_dev_list, &driver->legacy_dev_list);
++#endif
+ 
+     return 0;
+ 
+@@ -239,8 +243,10 @@
+     if (WARN_ON(!(driver->driver_features & DRIVER_LEGACY)))
+         return -EINVAL;
+ 
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(5, 10, 0)
+     /* If not using KMS, fall back to stealth mode manual scanning. */
+     INIT_LIST_HEAD(&driver->legacy_dev_list);
++#endif
+     for (i = 0; pdriver->id_table[i].vendor != 0; i++) {
+         pid = &pdriver->id_table[i];
+ 
+@@ -273,11 +279,13 @@
+     if (!(driver->driver_features & DRIVER_LEGACY)) {
+         WARN_ON(1);
+     } else {
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(5, 10, 0)
+         list_for_each_entry_safe(dev, tmp, &driver->legacy_dev_list,
+                      legacy_dev_list) {
+             list_del(&dev->legacy_dev_list);
+             drm_put_dev(dev);
+         }
++#endif
+     }
+     DRM_INFO("Module unloaded\n");
+ }
+@@ -402,6 +410,39 @@
+     .llseek = noop_llseek,
+ };
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)
++struct sg_table *nv_drm_gem_prime_get_sg_table(struct drm_gem_object *gem)
++{
++    return nv_gem_prime_get_sg_table(gem);
++}
++
++static int nv_drm_gem_vmap(struct drm_gem_object *gem,
++                           struct dma_buf_map *map)
++{
++    map->vaddr = nv_gem_prime_vmap(gem);
++    if (map->vaddr == NULL) {
++        return -ENOMEM;
++    }
++    map->is_iomem = true;
++    return 0;
++}
++
++static void nv_drm_gem_vunmap(struct drm_gem_object *gem,
++                              struct dma_buf_map *map)
++{
++    nv_gem_prime_vunmap(gem, map->vaddr);
++    map->vaddr = NULL;
++}
++
++static struct drm_gem_object_funcs nv_drm_gem_object_funcs = {
++  .free = nv_gem_free,
++  .export = drm_gem_prime_export,
++  .get_sg_table = nv_drm_gem_prime_get_sg_table,
++  .vmap = nv_drm_gem_vmap,
++  .vunmap = nv_drm_gem_vunmap,
++};
++#endif
++
+ static struct drm_driver nv_drm_driver = {
+ 
+     .driver_features = DRIVER_GEM
+@@ -420,17 +461,19 @@
+     .set_busid = drm_pci_set_busid,
+ #endif
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
+-    .gem_free_object_unlocked = nv_gem_free,
+-#else
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(5, 8, 0)
+     .gem_free_object = nv_gem_free,
++#elif LINUX_VERSION_CODE <= KERNEL_VERSION(5, 10, 0)
++    .gem_free_object_unlocked = nv_gem_free,
+ #endif
+ 
+     .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(5, 10, 0)
+     .gem_prime_export = drm_gem_prime_export,
+     .gem_prime_get_sg_table = nv_gem_prime_get_sg_table,
+     .gem_prime_vmap = nv_gem_prime_vmap,
+     .gem_prime_vunmap = nv_gem_prime_vunmap,
++#endif
+ 
+     .name = "nvidia-drm",
+     .desc = "NVIDIA DRM driver",
+diff -Naur NVIDIA-Linux-x86_64-340.108-old/kernel/nv-linux.h NVIDIA-Linux-x86_64-340.108-new/kernel/nv-linux.h
+--- NVIDIA-Linux-x86_64-340.108-old/kernel/nv-linux.h	2021-05-24 20:08:18.775739581 +0200
++++ NVIDIA-Linux-x86_64-340.108-new/kernel/nv-linux.h	2021-05-24 20:09:18.748287771 +0200
+@@ -119,7 +119,9 @@
+ #include <asm/tlbflush.h>           /* flush_tlb(), flush_tlb_all()     */
+ #include <linux/cpu.h>              /* CPU hotplug support              */
+ #endif
+-#include <asm/kmap_types.h>         /* page table entry lookup          */
++#if LINUX_VERSION_CODE	< KERNEL_VERSION(5, 11,	0)
++	#include <asm/kmap_types.h>         /* page table entry lookup          */
++#endif
+ 
+ #include <linux/pci.h>              /* pci_find_class, etc              */
+ #include <linux/interrupt.h>        /* tasklets, interrupt helpers      */
+diff -Naur NVIDIA-Linux-x86_64-340.108-old/kernel/uvm/nvidia_uvm_linux.h NVIDIA-Linux-x86_64-340.108-new/kernel/uvm/nvidia_uvm_linux.h
+--- NVIDIA-Linux-x86_64-340.108-old/kernel/uvm/nvidia_uvm_linux.h	2021-05-24 20:08:18.775739581 +0200
++++ NVIDIA-Linux-x86_64-340.108-new/kernel/uvm/nvidia_uvm_linux.h	2021-05-24 20:09:18.749287739 +0200
+@@ -141,7 +141,9 @@
+ #if !defined(NV_VMWARE)
+ #include <asm/tlbflush.h>           /* flush_tlb(), flush_tlb_all()     */
+ #endif
+-#include <asm/kmap_types.h>         /* page table entry lookup          */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
++	#include <asm/kmap_types.h>         /* page table entry lookup          */
++#endif
+ 
+ #include <linux/interrupt.h>        /* tasklets, interrupt helpers      */
+ #include <linux/timer.h>
diff --git a/system/nvidia-legacy340-kernel/patches/0006-kernel-5.14.patch b/system/nvidia-legacy340-kernel/patches/0006-kernel-5.14.patch
new file mode 100644
index 0000000000..56c8c45ddb
--- /dev/null
+++ b/system/nvidia-legacy340-kernel/patches/0006-kernel-5.14.patch
@@ -0,0 +1,213 @@
+diff -Naur NVIDIA-Linux-x86_64-340.108-no-compat32.5.13/kernel/nv-drm.c NVIDIA-Linux-x86_64-340.108-no-compat32.5.14/kernel/nv-drm.c
+--- NVIDIA-Linux-x86_64-340.108-no-compat32.5.13/kernel/nv-drm.c	2021-07-25 10:29:29.336505688 +0200
++++ NVIDIA-Linux-x86_64-340.108-no-compat32.5.14/kernel/nv-drm.c	2021-09-16 16:49:10.929858547 +0200
+@@ -57,8 +57,11 @@
+ #if defined(NV_DRM_GET_PCI_DEV_PRESENT)
+ #define nv_drm_get_pci_dev drm_get_pci_dev
+ #else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0)
+ #include <drm/drm_agpsupport.h>
+-
++#else
++#include <drm/drm_legacy.h>
++#endif
+ #include "linux/dma-buf.h"
+ 
+ struct nv_drm_agp_head {
+@@ -82,6 +85,11 @@
+     struct list_head head;
+ };
+ 
++struct nv_drm_extra_priv_data {
++    struct pci_dev *pdev;
++    struct drm_agp_head *agp;
++};
++
+ /*
+  * Code from drm_agp_init/nv_drm_{free,unbind}_agp
+  * Extracted from commit: 5b8b9d0c6d0e0f1993c6c56deaf9646942c49d94, file: drivers/gpu/drm/drm_agpsupport.c
+@@ -89,13 +97,14 @@
+ struct drm_agp_head *nv_drm_agp_init(struct drm_device *dev)
+ {
+     struct nv_drm_agp_head *head = NULL;
++    struct nv_drm_extra_priv_data *extra = dev->dev_private;
+ 
+     head = kzalloc(sizeof(*head), GFP_KERNEL);
+     if (!head)
+         return NULL;
+-    head->bridge = agp_find_bridge(dev->pdev);
++    head->bridge = agp_find_bridge(extra->pdev);
+     if (!head->bridge) {
+-        head->bridge = agp_backend_acquire(dev->pdev);
++        head->bridge = agp_backend_acquire(extra->pdev);
+         if (!head->bridge) {
+             kfree(head);
+             return NULL;
+@@ -133,48 +142,71 @@
+ static void nv_drm_pci_agp_init(struct drm_device *dev)
+ {
+     if (drm_core_check_feature(dev, DRIVER_USE_AGP)) {
+-        if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP))
+-            dev->agp = nv_drm_agp_init(dev);
+-        if (dev->agp) {
+-            dev->agp->agp_mtrr = arch_phys_wc_add(
+-                dev->agp->agp_info.aper_base,
+-                dev->agp->agp_info.aper_size *
++        struct nv_drm_extra_priv_data *extra = dev->dev_private;
++
++        if (pci_find_capability(extra->pdev, PCI_CAP_ID_AGP))
++            extra->agp = nv_drm_agp_init(dev);
++        if (extra->agp) {
++            extra->agp->agp_mtrr = arch_phys_wc_add(
++                extra->agp->agp_info.aper_base,
++                extra->agp->agp_info.aper_size *
+                 1024 * 1024);
+         }
+     }
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0)
++
++#else
++/* copied from v5.14.5 */
++int nv_drm_legacy_agp_release(struct drm_device *dev)
++{
++    struct nv_drm_extra_priv_data *extra = dev->dev_private;
++
++    if (!extra->agp || !extra->agp->acquired)
++        return -EINVAL;
++    agp_backend_release(extra->agp->bridge);
++    extra->agp->acquired = 0;
++    return 0;
++}
++#endif
++
+ void nv_drm_legacy_agp_clear(struct drm_device *dev)
+ {
+     struct nv_drm_agp_mem *entry, *tempe;
++    struct nv_drm_extra_priv_data *extra = dev->dev_private;
+ 
+-    if (!dev->agp)
++    if (!extra->agp)
+         return;
+     if (!drm_core_check_feature(dev, DRIVER_LEGACY))
+         return;
+ 
+-    list_for_each_entry_safe(entry, tempe, &dev->agp->memory, head) {
++    list_for_each_entry_safe(entry, tempe, &extra->agp->memory, head) {
+         if (entry->bound)
+             nv_drm_unbind_agp(entry->memory);
+         nv_drm_free_agp(entry->memory, entry->pages);
+         kfree(entry);
+     }
+-    INIT_LIST_HEAD(&dev->agp->memory);
++    INIT_LIST_HEAD(&extra->agp->memory);
+ 
+-    if (dev->agp->acquired)
++    if (extra->agp->acquired)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 14, 0)
+         drm_agp_release(dev);
+-
+-    dev->agp->acquired = 0;
+-    dev->agp->enabled = 0;
++#else
++        nv_drm_legacy_agp_release(dev);
++#endif
++    extra->agp->acquired = 0;
++    extra->agp->enabled = 0;
+ }
+ 
+ void nv_drm_pci_agp_destroy(struct drm_device *dev)
+ {
+-    if (dev->agp) {
+-        arch_phys_wc_del(dev->agp->agp_mtrr);
++    struct nv_drm_extra_priv_data *extra = dev->dev_private;
++    if (extra->agp) {
++        arch_phys_wc_del(extra->agp->agp_mtrr);
+         nv_drm_legacy_agp_clear(dev);
+-        kfree(dev->agp);
+-        dev->agp = NULL;
++        kfree(extra->agp);
++        extra->agp = NULL;
+     }
+ }
+ 
+@@ -183,6 +215,7 @@
+                struct drm_driver *driver)
+ {
+     struct drm_device *dev;
++    struct nv_drm_extra_priv_data *extra;
+     int ret;
+ 
+     DRM_DEBUG("\n");
+@@ -191,11 +224,18 @@
+     if (IS_ERR(dev))
+         return PTR_ERR(dev);
+ 
++    extra = kzalloc(sizeof(*extra), GFP_KERNEL);
++    if (IS_ERR(extra))
++        goto err_free;
++
++    extra->pdev = pdev;
++
+     ret = pci_enable_device(pdev);
+     if (ret)
+-        goto err_free;
++        goto err_free2;
+ 
+-    dev->pdev = pdev;
++    /* use the not used (i hope) dev_private to store deprecated/legacy pointers */
++    dev->dev_private = extra;
+ #ifdef __alpha__
+     dev->hose = pdev->sysdata;
+ #endif
+@@ -221,6 +261,8 @@
+ err_agp:
+     nv_drm_pci_agp_destroy(dev);
+     pci_disable_device(pdev);
++err_free2:
++    kfree(extra);
+ err_free:
+     drm_dev_put(dev);
+     return ret;
+@@ -303,10 +345,11 @@
+ )
+ {
+     nv_linux_state_t *nvl;
++    struct nv_drm_extra_priv_data *extra = dev->dev_private;
+ 
+     for (nvl = nv_linux_devices; nvl != NULL; nvl = nvl->next)
+     {
+-        if (nvl->dev == dev->pdev)
++        if (nvl->dev == extra->pdev)
+         {
+             nvl->drm = dev;
+             return 0;
+@@ -327,10 +370,11 @@
+ )
+ {
+     nv_linux_state_t *nvl;
++    struct nv_drm_extra_priv_data *extra = dev->dev_private;
+ 
+     for (nvl = nv_linux_devices; nvl != NULL; nvl = nvl->next)
+     {
+-        if (nvl->dev == dev->pdev)
++        if (nvl->dev == extra->pdev)
+         {
+             BUG_ON(nvl->drm != dev);
+             nvl->drm = NULL;
+diff -Naur NVIDIA-Linux-x86_64-340.108-no-compat32.5.13/kernel/os-interface.c NVIDIA-Linux-x86_64-340.108-no-compat32.5.14/kernel/os-interface.c
+--- NVIDIA-Linux-x86_64-340.108-no-compat32.5.13/kernel/os-interface.c	2021-07-25 10:29:29.083168593 +0200
++++ NVIDIA-Linux-x86_64-340.108-no-compat32.5.14/kernel/os-interface.c	2021-09-16 13:17:43.345906445 +0200
+@@ -549,7 +549,11 @@
+         // the requested timeout has expired, loop until less
+         // than a jiffie of the desired delay remains.
+         //
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 14, 0)
++        current->__state = TASK_INTERRUPTIBLE;
++#else
+         current->state = TASK_INTERRUPTIBLE;
++#endif
+         do
+         {
+             schedule_timeout(jiffies);
diff --git a/system/nvidia-legacy340-kernel/patches/0007-kernel-5.15.patch b/system/nvidia-legacy340-kernel/patches/0007-kernel-5.15.patch
new file mode 100644
index 0000000000..dd367186f9
--- /dev/null
+++ b/system/nvidia-legacy340-kernel/patches/0007-kernel-5.15.patch
@@ -0,0 +1,14 @@
+diff -Naur NVIDIA-Linux-x86_64-340.108-old/kernel/nv-drm.c NVIDIA-Linux-x86_64-340.108-new/kernel/nv-drm.c
+--- NVIDIA-Linux-x86_64-340.108-old/kernel/nv-drm.c	2021-11-06 20:08:18.779739237 +0200
++++ NVIDIA-Linux-x86_64-340.108-new/kernel/nv-drm.c	2021-11-06 20:42:13.443288819 +0200
+@@ -529,7 +529,9 @@ RM_STATUS NV_API_CALL nv_alloc_os_descri
+ #if defined(NV_DRM_GEM_OBJECT_PUT_UNLOCKED_PRESENT)
+     drm_gem_object_put_unlocked(&nv_obj->base);
+ #else
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
++    drm_gem_object_put(&nv_obj->base);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
+     drm_gem_object_put_locked(&nv_obj->base);
+ #else
+     drm_gem_object_unreference_unlocked(&nv_obj->base);
diff --git a/system/nvidia-legacy340-kernel/patches/0008-kernel-5.16.patch b/system/nvidia-legacy340-kernel/patches/0008-kernel-5.16.patch
new file mode 100644
index 0000000000..0337bc6d3d
--- /dev/null
+++ b/system/nvidia-legacy340-kernel/patches/0008-kernel-5.16.patch
@@ -0,0 +1,30 @@
+--- a/kernel/os-interface.h	2019-12-11 22:04:24.000000000 +0000
++++ b/kernel/os-interface.h	2022-01-10 02:04:26.740899810 +0000
+@@ -24,7 +24,12 @@
+ *                                                                           *
+ \***************************************************************************/
+ 
++#include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0)
++#include <linux/stdarg.h>
++#else
+ #include <stdarg.h>
++#endif
+ 
+ /*
+  * Define away Microsoft compiler extensions when possible
+--- a/kernel/nv.h	2019-12-11 22:04:24.000000000 +0000
++++ b/kernel/nv.h	2022-01-10 02:29:07.828733372 +0000
+@@ -13,7 +13,12 @@
+ #define _NV_H_
+ 
+ #include <nvtypes.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0)
++#include <linux/stdarg.h>
++#else
+ #include <stdarg.h>
++#endif
+ 
+ #if !defined(NV_MIN)
+ #define NV_MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
diff --git a/system/nvidia-legacy340-kernel/patches/0009-kernel-5.17.patch b/system/nvidia-legacy340-kernel/patches/0009-kernel-5.17.patch
new file mode 100644
index 0000000000..2c55f8092b
--- /dev/null
+++ b/system/nvidia-legacy340-kernel/patches/0009-kernel-5.17.patch
@@ -0,0 +1,57 @@
+diff -Naur a/kernel/conftest.sh b/kernel/conftest.sh
+--- a/kernel/conftest.sh	2022-04-02 10:27:54.463179319 +0000
++++ b/kernel/conftest.sh	2022-04-02 10:27:54.553179467 +0000
+@@ -1619,7 +1619,11 @@
+             CODE="
+             #include <linux/proc_fs.h>
+             void conftest_PDE_DATA(void) {
++            #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0)
++                pde_data();
++            #else
+                 PDE_DATA();
++            #endif
+             }"
+ 
+             compile_check_conftest "$CODE" "NV_PDE_DATA_PRESENT" "" "functions"
+diff -Naur a/kernel/nv-linux.h b/kernel/nv-linux.h
+--- a/kernel/nv-linux.h	2022-04-02 10:27:54.463179319 +0000
++++ b/kernel/nv-linux.h	2022-04-02 10:27:54.556512806 +0000
+@@ -266,9 +266,9 @@
+ #endif
+ 
+ #ifdef CONFIG_PROC_FS
+-#include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
+ #endif
++#include <linux/proc_fs.h>
+ 
+ #ifdef CONFIG_KDB
+ #include <linux/kdb.h>
+@@ -2052,8 +2052,12 @@
+     })
+ 
+ #if defined(NV_PDE_DATA_PRESENT)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
+ # define NV_PDE_DATA(inode) PDE_DATA(inode)
+ #else
++# define NV_PDE_DATA(inode) pde_data(inode)
++#endif
++#else
+ # define NV_PDE_DATA(inode) PDE(inode)->data
+ #endif
+ 
+diff -Naur a/kernel/uvm/conftest.sh b/kernel/uvm/conftest.sh
+--- a/kernel/uvm/conftest.sh	2022-04-02 10:27:54.456512642 +0000
++++ b/kernel/uvm/conftest.sh	2022-04-02 10:27:54.556512806 +0000
+@@ -1578,7 +1578,11 @@
+             CODE="
+             #include <linux/proc_fs.h>
+             void conftest_PDE_DATA(void) {
++            #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0)
++                pde_data();
++            #else
+                 PDE_DATA();
++            #endif
+             }"
+ 
+             compile_check_conftest "$CODE" "NV_PDE_DATA_PRESENT" "" "functions"
diff --git a/system/nvidia-legacy340-kernel/patches/0010-kernel-5.18.patch b/system/nvidia-legacy340-kernel/patches/0010-kernel-5.18.patch
new file mode 100644
index 0000000000..a2d19b0fed
--- /dev/null
+++ b/system/nvidia-legacy340-kernel/patches/0010-kernel-5.18.patch
@@ -0,0 +1,151 @@
+diff -Naur a/kernel/nv-acpi.c b/kernel/nv-acpi.c
+--- a/kernel/nv-acpi.c	2019-12-12 06:04:24.000000000 +0800
++++ b/kernel/nv-acpi.c	2022-05-29 20:00:00.000000000 +0800
+@@ -577,9 +577,13 @@
+         {
+             if (!nvif_parent_gpu_handle) /* unknown error */
+                 break;
+-            
+-            retVal = acpi_bus_get_device(nvif_parent_gpu_handle, &device);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++            device = acpi_fetch_acpi_dev(nvif_parent_gpu_handle);
++            retVal = 0;
++#else
++            retVal = acpi_bus_get_device(nvif_parent_gpu_handle, &device);
++#endif
+             if (ACPI_FAILURE(retVal) || !device)
+                 break;
+
+@@ -652,8 +656,11 @@
+     if (nvif_parent_gpu_handle == NULL)
+         return;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++    device = acpi_fetch_acpi_dev(nvif_parent_gpu_handle);
++#else
+     acpi_bus_get_device(nvif_parent_gpu_handle, &device);
+-
++#endif
+     nv_uninstall_notifier(device, nv_acpi_event);
+     nvif_parent_gpu_handle = NULL;
+
+@@ -1212,7 +1219,12 @@
+     if (!dev_handle)
+         return RM_ERR_INVALID_ARGUMENT;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++    device = acpi_fetch_acpi_dev(dev_handle);
++    status = 0;
++#else
+     status = acpi_bus_get_device(dev_handle, &device);
++#endif
+
+     if (ACPI_FAILURE(status) || !device)
+         return RM_ERR_INVALID_ARGUMENT;
+diff -Naur a/kernel/nv-dma.c b/kernel/nv-dma.c
+--- a/kernel/nv-dma.c	2019-12-12 06:04:24.000000000 +0800
++++ b/kernel/nv-dma.c	2022-05-29 20:00:00.000000000 +0800
+@@ -136,10 +136,17 @@
+         return status;
+     }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++    dma_map->sg_map_count = dma_map_sg(&dma_map->dev->dev,
++            NV_DMA_MAP_SCATTERLIST(dma_map),
++            NV_DMA_MAP_SCATTERLIST_LENGTH(dma_map),
++            DMA_BIDIRECTIONAL);
++#else
+     dma_map->sg_map_count = pci_map_sg(dma_map->dev,
+             NV_DMA_MAP_SCATTERLIST(dma_map),
+             NV_DMA_MAP_SCATTERLIST_LENGTH(dma_map),
+             PCI_DMA_BIDIRECTIONAL);
++#endif
+     if (dma_map->sg_map_count == 0)
+     {
+         nv_printf(NV_DBG_ERRORS,
+@@ -211,8 +218,13 @@
+
+     if (dma_map->sg_map_count != 0)
+     {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++        dma_unmap_sg(&dma_map->dev->dev, NV_DMA_MAP_SCATTERLIST(dma_map),
++                NV_DMA_MAP_SCATTERLIST_LENGTH(dma_map), DMA_BIDIRECTIONAL);
++#else
+         pci_unmap_sg(dma_map->dev, NV_DMA_MAP_SCATTERLIST(dma_map),
+                 NV_DMA_MAP_SCATTERLIST_LENGTH(dma_map), PCI_DMA_BIDIRECTIONAL);
++#endif
+     }
+
+     *priv = dma_map->user_pages;
+diff -Naur a/kernel/nv-drm.c b/kernel/nv-drm.c
+--- a/kernel/nv-drm.c	2022-05-29 21:57:55.203782383 +0800
++++ b/kernel/nv-drm.c	2022-05-29 20:00:00.000000000 +0800
+@@ -458,9 +458,15 @@
+     return nv_gem_prime_get_sg_table(gem);
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++static int nv_drm_gem_vmap(struct drm_gem_object *gem,
++                           struct iosys_map *map)
++{
++#else
+ static int nv_drm_gem_vmap(struct drm_gem_object *gem,
+                            struct dma_buf_map *map)
+ {
++#endif
+     map->vaddr = nv_gem_prime_vmap(gem);
+     if (map->vaddr == NULL) {
+         return -ENOMEM;
+@@ -469,9 +475,15 @@
+     return 0;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++static void nv_drm_gem_vunmap(struct drm_gem_object *gem,
++                              struct iosys_map *map)
++{
++#else
+ static void nv_drm_gem_vunmap(struct drm_gem_object *gem,
+                               struct dma_buf_map *map)
+ {
++#endif
+     nv_gem_prime_vunmap(gem, map->vaddr);
+     map->vaddr = NULL;
+ }
+diff -Naur a/kernel/nv-vm.c b/kernel/nv-vm.c
+--- a/kernel/nv-vm.c	2019-12-12 06:04:24.000000000 +0800
++++ b/kernel/nv-vm.c	2022-05-29 20:00:00.000000000 +0800
+@@ -169,12 +169,20 @@
+
+ static inline int nv_map_sg(struct pci_dev *dev, struct scatterlist *sg)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++    return dma_map_sg(&dev->dev, sg, 1, DMA_BIDIRECTIONAL);
++#else
+     return pci_map_sg(dev, sg, 1, PCI_DMA_BIDIRECTIONAL);
++#endif
+ }
+
+ static inline void nv_unmap_sg(struct pci_dev *dev, struct scatterlist *sg)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++    dma_unmap_sg(&dev->dev, sg, 1, DMA_BIDIRECTIONAL);
++#else
+     pci_unmap_sg(dev, sg, 1, PCI_DMA_BIDIRECTIONAL);
++#endif
+ }
+
+ #define NV_MAP_SG_MAX_RETRIES 16
+diff -Naur a/kernel/nv-frontend.c b/kernel/nv-frontend.c
+--- a/kernel/nv-frontend.c	2019-12-12 06:04:24.000000000 +0800
++++ b/kernel/nv-frontend.c	2022-05-29 20:00:00.000000000 +0800
+@@ -15,7 +15,7 @@
+ #include "nv-frontend.h"
+
+ #if defined(MODULE_LICENSE)
+-MODULE_LICENSE("NVIDIA");
++MODULE_LICENSE("GPL");
+ #endif
+ #if defined(MODULE_INFO)
+ MODULE_INFO(supported, "external");
diff --git a/system/nvidia-legacy390-driver/README b/system/nvidia-legacy390-driver/README
index 56e253398f..e9d688e422 100644
--- a/system/nvidia-legacy390-driver/README
+++ b/system/nvidia-legacy390-driver/README
@@ -1,48 +1,27 @@
 This is the proprietary binary video driver from NVidia for the X.Org
-X-server. This package does not include the kernel module - it is a part
-of the nvidia-legacy390-kernel package at SlackBuilds.org.
+X-server. This package does not include the kernel module - it is a
+part of the nvidia-legacy390-kernel package at SlackBuilds.org.
 
-Installing the 32-bit compatibility libraries is available: if desired,
-do:
+Installing the 32-bit compatibility libraries is available:
+if desired, do:
   COMPAT32="yes" ./nvidia-legacy390-driver.SlackBuild
 
-If you plan to test this buildscript on current/15.0, do:
+This script now gives the option of installing the nvidia-persitenced
+daemon.  PLEASE read README.nvidia-persitenced before building with
+perstistenced.
 
-  CURRENT="yes" ./nvidia-legacy390-driver.SlackBuild
-  
-This avoids stomping on the libglvnd libraries, plus it forces the
-script to use the prebuilt nvidia-installer since it no longer builds
-in current.  As a consequence, this script may no longer work in a VM.
-
-If you build and install this driver on current WITHOUT using the
-CURRENT="yes" flag, it will corrupt both xorg-server AND libglvnd, so
-after removing the driver both packages will have to be reinstalled.
-
-This script now gives the option of installing the nvidia-persistenced
-daemon.  For details see README.nvidia-persistenced.
-
-Several useful utilities are included: nvidia-xsettings, nvidia-smi, and
-nvidia-settings.  Please refer to the Nvidia documentation and man pages
-for details and usage.
+Several useful utilities are included: nvidia-xsettings, nvidia-smi,
+and nvidia-settings.  Please refer to the Nvidia documentation and man
+pages for details and usage.
 
 For CUDA/OpenCL to work after reboot, and for utilites such as
 nvidia-smi, you might need to include the following line in your
-/etc/rc.d/rc.local: (this is REQUIRED for nvidia-persistenced to work
-properly)
+/etc/rc.d/rc.local:
 
-    # Create missing nvidia device nodes after reboot
-    /usr/bin/nvidia-modprobe -c 0 -u
-
-Included is a script called nvidia-switch, which is used to switch
-between the xorg and nvidia drivers, but it will not edit xorg.conf for
-you; you have to do that manually.  The nvidia-switch script is
-installed to /usr/sbin.
-
-Usage of nvidia-switch:
-  nvidia-switch --install  <--> save the stock xorg files and
-                                install the nvidia files and symlinks.
-  nvidia-switch --remove   <--> remove the nvidia files and symlinks and
-                                restore the stock xorg files.
+# Create missing nvidia device nodes after reboot
+if [ -x /usr/bin/nvidia-modprobe ]; then
+  /usr/bin/nvidia-modprobe -c 0 -u
+fi
 
 NOTES:
 Since nvidia-legacy390-driver conflicts with some files of xorg, it's a
@@ -51,22 +30,27 @@ the nvidia-legacy390-driver package backs up the conflicting files and
 puts the nvidia-specific files into place by automatically running
 nvidia-switch --install in doinst.sh.
 
-Before uninstalling or upgrading this package, it is IMPORTANT that
-you execute 'nvidia-switch --remove', which will switch back to the
-stock xorg files and remove all links created by nvidia-switch during
-installation. If you forget to do this, you might have to do the switch
-manually, since 'nvidia-switch --install' may fail, resulting in xorg
-not working. Here are the affected files (and their packages):
-
-  /usr/lib[64]/libGL.so.1.2 (mesa)
-  /usr/lib[64]/libGL.la (mesa)
-  /usr/lib[64]/libGLESv1_CM.so.1.0.0 (mesa)
-  /usr/lib[64]/libGLESv2.so.2.0.0 (mesa)
-  /usr/lib[64]/libEGL.so.1.0.0 (mesa)
-  /usr/lib[64]/xorg/modules/libwfb.so (xorg-server)
-  /usr/lib[64]/xorg/modules/extensions/libglx.so (xorg-server)
-
-Simply remove the dead nvidia symlinks and and reinstall the mesa and
-xorg-server packages.  (In current, if libglx.so is a dead symlink,
-it MUST be removed before reinstalling xorg-server.)
+This package now includes a douninst.sh script, so it is no longer
+necessary to run nvidia-switch --remove before uninstalling or
+upgrading.  However, nvidia-switch is still included for use when
+xorg-server is upgraded.  Usage of nvidia-switch:
 
+  nvidia-switch --install  <--> save the stock xorg files and
+                                install the nvidia symlinks.
+  nvidia-switch --remove   <--> remove the nvidia symlinks
+                                and restore the stock xorg files.
+The affected files are:
+/usr/lib[64]/xorg/modules/extensions/libglx.so (xorg-server)
+/usr/lib[64]/xorg/modules/libnvidia-wfb.so.1 (nvidia-specific symlink)
+
+If you forget to run nvidia-switch --remove before upgrading
+xorg-server, all you need to do is run nvidia-switch --install and all
+should be well.
+
+CAUTION!  Please DO NOT USE this script for Slackware(64) versions 14.2
+or older as it WILL corrupt the mesa and xorg installations.
+Please use the script from those repos instead.
+
+BIG FAT NOTE: The Nvidia 390.xx series is EOL as of December 2022.
+Because of the ABI change from xorg-server 1.20 to 1.21, the Nvidia 390
+driver will no longer work on Slackware versions later than 15.0.
diff --git a/system/nvidia-legacy390-driver/README.nvidia-persistenced b/system/nvidia-legacy390-driver/README.nvidia-persistenced
index 38e8937cde..8bdb77aa5f 100644
--- a/system/nvidia-legacy390-driver/README.nvidia-persistenced
+++ b/system/nvidia-legacy390-driver/README.nvidia-persistenced
@@ -1,12 +1,12 @@
 The NVIDIA Persistence Daemon is a userspace daemon on Linux to support
-persistence of driver state across Cuda job runs.  The daemon targets all
-current Tesla, Quadro and GRID GPUs.  For further information, see
+persistence of driver state across Cuda job runs.  The daemon targets
+all current Tesla, Quadro and GRID GPUs.  For further information, see
 
 https://docs.nvidia.com/deploy/driver-persistence/index.html
 
-The driver now includes rc.nvidia-persistenced as an option.  While it can
-be run as root, it is more secure to run it as an unpriveleged user, so we
-run it as user nvidia.
+The driver now includes rc.nvidia-persistenced as an option.  While it
+can be run as root, it is more secure to run it as an unpriveleged
+user, so we run it as user nvidia.
 
 To install it, Pass PERSISTENCED=yes to the script.  It will create the
 user and group nvidia, and install rc.nvidia-persistenced to /etc/rc.d.
@@ -18,7 +18,8 @@ if  [ -x /etc/rc.d/rc.nvidia-persistenced ]; then
     /etc/rc.d/rc.nvidia-persistenced start
 fi
 
-and then 'chmod +x /etc/rc.d/rc.nvidia-persistenced' to make it executable.
+and then 'chmod +x /etc/rc.d/rc.nvidia-persistenced' to make it
+executable.
 
 Add the following to /etc/rc.d/rc.local_shutdown:
 
diff --git a/system/nvidia-legacy390-driver/douninst.sh b/system/nvidia-legacy390-driver/douninst.sh
new file mode 100644
index 0000000000..1bf7bd2edf
--- /dev/null
+++ b/system/nvidia-legacy390-driver/douninst.sh
@@ -0,0 +1,14 @@
+( cd usr/libSUFFIX/xorg/modules/extensions
+  if [ -f libglx.so-xorg ]; then
+    mv libglx.so-xorg libglx.so
+  else
+    if [ ! -e libglx.so ]; then
+      echo -e "WARNING: libglx.so not found!  Please reinstall xorg-server!\n"
+    fi
+  fi
+  )
+echo "The Nvidia legacy390 driver is removed.  Make sure the Nvidia driver is"
+echo "DISABLED in /etc/X11/xorg.conf as well as /etc/X11/xorg.conf.d/ and"
+echo "/usr/share/X11/xorg.conf.d/.  Otherwise, this may lead to improperly"
+echo -e "working drivers.\n"
+
diff --git a/system/nvidia-legacy390-driver/nvidia-installer-removed-sysctl-h.patch b/system/nvidia-legacy390-driver/nvidia-installer-removed-sysctl-h.patch
new file mode 100644
index 0000000000..df61dfa85d
--- /dev/null
+++ b/system/nvidia-legacy390-driver/nvidia-installer-removed-sysctl-h.patch
@@ -0,0 +1,58 @@
+diff -Nur nvidia-installer-390.143.orig/kernel.c nvidia-installer-390.143/kernel.c
+--- nvidia-installer-390.143.orig/kernel.c	2021-03-12 02:29:56.000000000 -0500
++++ nvidia-installer-390.143/kernel.c	2021-06-23 11:15:12.813980616 -0400
+@@ -23,7 +23,6 @@
+ #include <sys/utsname.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <sys/sysctl.h>
+ #include <ctype.h>
+ #include <stdlib.h>
+ #include <dirent.h>
+@@ -1055,9 +1050,9 @@
+ #define PRINTK_LOGLEVEL_KERN_ALERT 1
+ 
+ /*
+- * Attempt to set the printk loglevel, first using the /proc/sys interface,
+- * and falling back to the deprecated sysctl if that fails. Pass the previous
+- * loglevel back to the caller and return TRUE on success, or FALSE on failure.
++ * Attempt to set the printk loglevel using the /proc/sys interface.
++ * Pass the previous loglevel back to the caller and return TRUE on success,
++ * or FALSE on failure.
+  */
+ static int set_loglevel(int level, int *old_level)
+ {
+@@ -1067,6 +1062,9 @@
+     fp = fopen("/proc/sys/kernel/printk", "r+");
+     if (fp) {
+         if (!old_level || fscanf(fp, "%d ", old_level) == 1) {
++            /* Use a dynamic buffer for the string: the kernel does not range
++             * check the loglevel, so the value reported by the procfs file
++             * may have an unknown number of digits. */
+             char *strlevel = nvasprintf("%d", level);
+ 
+             fseek(fp, 0, SEEK_SET);
+@@ -1079,23 +1077,6 @@
+         fclose(fp);
+     }
+ 
+-    if (!loglevel_set) {
+-        /*
+-         * Explicitly initialize the value of len, even though it looks like the
+-         * syscall should do that, since in practice it doesn't always actually
+-         * set the value of the pointed-to length parameter.
+-         */
+-        size_t len = sizeof(int);
+-        int name[] = { CTL_KERN, KERN_PRINTK };
+-
+-        if (!old_level ||
+-            sysctl(name, ARRAY_LEN(name), old_level, &len, NULL, 0) == 0) {
+-            if (sysctl(name, ARRAY_LEN(name), NULL, 0, &level, len) == 0) {
+-                loglevel_set = TRUE;
+-            }
+-        }
+-    }
+-
+     return loglevel_set;
+ }
+ 
diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
index b984a32580..278a5ed9f7 100644
--- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
+++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nvidia-legacy390-driver
 
 # Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, USA
-# Copyright 2020 Lenard Spencer, Orlando, FL, USA
+# Copyright 2020-2023 Lenard Spencer, Orlando, FL, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,14 +23,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# see changelog.txt
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nvidia-legacy390-driver
-VERSION=${VERSION:-390.141}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-390.157}
+BUILD=${BUILD:-7}
 TAG=${TAG:-_SBo}
-
-CURRENT=${CURRENT:-no}
+PKGTYPE=${PKGTYPE:-tgz}
 
 set -e
 
@@ -42,7 +41,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,11 +67,26 @@ else
   COMPAT32=no
 fi
 
-# Abort if an Nvidia driver is still installed:
-if [ -x /usr/bin/nvidia-installer ]; then
-  echo -e "\n A previous Nvidia installation has been detected!"
-  echo -e " Please remove the installed driver and rerun this script.\n"
-  exit 1
+if [ "$COMPAT32" = "yes" ]; then
+    MULTI="_multilib"
+else
+    MULTI=""
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION$MULTI-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+if [ "${PERSISTENCED:-no}" = "yes" ]; then
+  if [ `getent group nvidia /dev/null` -o `getent passwd nvidia > /dev/null` ]; then
+    echo "User and/or group nvidia do not exist!"
+    echo "Please create user and group nvidia and rerun this script."
+    exit 1
+  fi
 fi
 
 SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
@@ -85,7 +98,6 @@ mkdir -p $TMP $PKG $OUTPUT $PKG/install
 mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
   $PKG/etc/OpenCL/vendors/ $PKG/usr/{bin,doc,man/man1} \
   $PKG/usr/share/{applications,nvidia,pixmaps,egl/egl_external_platform.d} \
-  $PKG/usr/include/GL $PKG/etc/vulkan/icd.d $PKG/etc/X11/xorg.conf.d \
   $PKG/etc/X11/glvnd/egl_vendor.d $PKG/var/log
 
 
@@ -108,13 +120,27 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# If you are building in a 32-bit chroot on 64-bit,
+# this is now necessary or the utilities will not build:
+export TARGET_ARCH=$TARGET
+
+# Compiling the various open source apps instead of using the precompiled binaries
 # Compiling nvidia-installer from source
-if [ "$CURRENT" = "no" ]; then
-  cd $TMP/nvidia-installer-$VERSION
+cd $TMP/nvidia-installer-$VERSION
+
+# First, patch for the removed sys/sysctl.h:
+  patch -p1 < $CWD/nvidia-installer-removed-sysctl-h.patch
 
 # Let's try to remove the conflicting files and GPU detection
   patch -p0 < $CWD/skip_conflict-GPU_detect.patch
 
+# Install various files in $PKG instead of the root filesystem:
+  sed -i "s|/etc/vulkan|$PKG/etc/vulkan|" files.c
+  sed -i "s|\"/etc\"|\"$PKG/etc\"|" nvidia-installer.h
+  sed -i "s|/var/lib/nvidia|$PKG/var/lib/nvidia|" backup.c
+  sed -i "s|\"/usr/lib/\"|\"$PKG/usr/lib/\"|" files.c
+  sed -i "s|/usr/lib/nvidia|$PKG/usr/lib/nvidia|" misc.c
+
   chown -R root:root .
   find -L . \
    \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -127,24 +153,20 @@ if [ "$CURRENT" = "no" ]; then
   install -m 755 _out/Linux_$TARGET/nvidia-installer $PKG/usr/bin/
   install -m 644 _out/Linux_$TARGET/nvidia-installer.1.gz $PKG/usr/man/man1/
 
-  cd -
+cd -
 
 # Now we need to copy the newly patched and compiled nvidia-installer
 # to the driver source tree for use
-  mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM
-  mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM
-fi
+mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM
+mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM
 
 if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
     COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr"
-    MULTI="_multilib"
-    mkdir $PKG/usr/lib
 else
     if [ ! "$ARCH" = "x86_64" ]; then
         COMP32=""
     else
         COMP32="--no-install-compat32-libs"
-	MULTI=""
     fi
 fi
 
@@ -167,19 +189,17 @@ cd $TMP/$SRCNAM
   --log-file-name=$PKG/var/log/nvidia-installer.log \
   --egl-external-platform-config-path=$PKG/usr/share/egl/egl_external_platform.d \
   --no-nvidia-modprobe \
+  --no-install-libglvnd \
   $COMP32
 
-# Move ICDs to $PKG and cleanup (no switch option in installer?)
-mv /etc/OpenCL/vendors/nvidia.icd $PKG/etc/OpenCL/vendors/nvidia.icd
-mv /etc/vulkan/icd.d/nvidia_icd.json $PKG/etc/vulkan/icd.d/nvidia_icd.json
-# In current, mesa now puts an entry into this directory, so we
-# leave it alone if it is not empty
-if [ -z "$(ls -A /etc/OpenCL/vendors)" ]; then
-  rm -rf /etc/OpenCL
-fi
-# just in case any other programs make an entry here
-if [ -z "$(ls -A /etc/vulkan)" ]; then
-  rm -rf /etc/vulkan
+# Remove a /var/lib/nvidia entry installed by nvidia-installer but
+# no longer needed (caused the "failed to remove some directories"
+# warning message):
+rm -rf $PKG/var/lib
+
+# if not multilib, remove the unneeded /usr/lib folder:
+if [ "$ARCH" = "x86_64" -a "${COMPAT32}" != "yes" ]; then
+  rm -rf $PKG/usr/lib || true
 fi
 
 # Compile utilites from source, replacing the precompiled versions
@@ -253,13 +273,6 @@ mkdir -p $PKG/usr/sbin
 install -m 0755 $CWD/nvidia-switch $PKG/usr/sbin/
 sed -i s/PKGVERSION/$VERSION/g $PKG/usr/sbin/nvidia-switch
 sed -i s/LIBDIRSUFFIX/$LIBDIRSUFFIX/g $PKG/usr/sbin/nvidia-switch
-if [ "$CURRENT" = "no" ]; then
-  sed -i s/GLVNDFLAG/yes/g $PKG/usr/sbin/nvidia-switch
-  sed -i s/GLVERSION/1.2.0/g $PKG/usr/sbin/nvidia-switch
-else
-  sed -i s/GLVNDFLAG/no/g $PKG/usr/sbin/nvidia-switch
-  sed -i s/GLVERSION/1.7.0/g $PKG/usr/sbin/nvidia-switch  
-fi
 if [ ${COMPAT32} = "yes" ]; then
   sed -i s/LIB32FLAG/yes/g $PKG/usr/sbin/nvidia-switch
 else
@@ -267,78 +280,35 @@ else
 fi
 
 # These add or correct wrong paths
-if [ "$CURRENT" = "no" ]; then
-  sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la
-  sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la
-
-  if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-    sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib/libGL.la
-    sed -i "s|/usr/X11R6/lib|/usr/lib|" $PKG/usr/lib/libGL.la
-    sed -i "s|'/usr/'|'/usr/lib'|" $PKG/usr/lib/libGL.la
-  fi
-fi
 sed -i "s|__UTILS_PATH__|/usr/bin|" $PKG/usr/share/applications/nvidia-settings.desktop
 sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" $PKG/usr/share/applications/nvidia-settings.desktop
-sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|" $PKG/usr/share/applications/nvidia-settings.desktop
+sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Settings;|" $PKG/usr/share/applications/nvidia-settings.desktop
+# Remove depcrecated entry in nvidia-settings.desktop
+sed -i '/Encoding/d' $PKG/usr/share/applications/nvidia-settings.desktop
 
 # rename wrong/conficting files as needed; remove conflicting symlinks created by installer
 cd $PKG/usr/lib$LIBDIRSUFFIX
-   if [ "$CURRENT" = "no" ]; then
-      mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia
-      mv libGL.la libGL.la-nvidia
-      mv libGL.so.1.7.0 libGL.so.1.7.0-nvidia
-      mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia
-      mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia
-      rm -f libEGL.so
-      rm -f libGL.so
-      rm -f libGL.so.1
-      rm -f libGLESv1_CM.so
-      rm -f libGLESv2.so
-   else
-      rm libGL.la
-      rm libOpenCL.so.1.0.0
-   fi
-   rm -f xorg/modules/libwfb.so
-   if [ -e xorg/modules/extensions/libglx.so ]; then
-      (cd xorg/modules/extensions
-        rm libglx.so
-      )
-   fi
+  rm libGL.la
+  rm libOpenCL.so*
+  rm -f xorg/modules/libwfb.so
+  if [ -e xorg/modules/extensions/libglx.so ]; then
+    rm -f xorg/modules/extensions/libglx.so
+  fi
 cd -
 
 if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
-   cd $PKG/usr/lib
-         if [ "$CURRENT" = "no" ]; then
-            mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia
-            mv libGL.la libGL.la-nvidia
-            mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia
-            mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia
-            rm -f libEGL.so
-            rm -f libGL.so
-            rm -f libGL.so.1
-            rm -f libGLESv1_CM.so
-            rm -f libGLESv2.so
-         else
-            rm libGL.la
-            rm libOpenCL.so.1.0.0
-         fi
-   cd -
+  cd $PKG/usr/lib
+  rm libGL.la
+  rm libOpenCL.so.1.0.0
+  cd -
 # FIXME With COMPAT32=yes on pure x86_64, a weird /usr/lib/libGL.so.1
 # symlink to $PKG/usr/lib64/libGL.so.1 appears? Who would do this,
 # so ignoring for now.
 fi
 
-# Remove xorg conf file since we handle that in nvidia-legacy390-kernel
+# Remove xorg.conf.d file since we handle that in nvidia-legacy390-kernel
 rm -rf $PKG/etc/X11/xorg.conf.d
 
-if [ "$CURRENT" = "no" ]; then
-  mkdir -p $PKG/var/log/nvidia/{32,64}
-  cat <<EOF > $PKG/var/log/nvidia/README.txt
-Do NOT delete this directory!
-nvidia-switch will backup the original X.org libraries here.
-EOF
-fi
-
 cd $TMP/$SRCNAM
 # put docs in the right place
 mv $PKG/usr/share/man/man1/nvidia-* $PKG/usr/man/man1
@@ -352,13 +322,16 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 sed "s/PKGVERSION/$VERSION/g" $CWD/slack-desc > $PKG/install/slack-desc
 if [ "$COMPAT32" = "yes" ]; then
-   sed -i "s|@MULTILIB@|This package includes the 32-bit compatibility libraries.|" $PKG/install/slack-desc
+   sed -i "s|@MULTILIB@| This package includes the 32-bit compatibility libraries.|" $PKG/install/slack-desc
 else
    sed -i "s|@MULTILIB@||" $PKG/install/slack-desc
 fi
 
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+# Add new douninst.sh script:
+sed "s/SUFFIX/$LIBDIRSUFFIX/g" $CWD/douninst.sh > $PKG/install/douninst.sh
+
 # Add rc.nvidia-persistenced:
 if [ "${PERSISTENCED:-no}" = "yes" ]; then
   cd $TMP
@@ -366,6 +339,8 @@ if [ "${PERSISTENCED:-no}" = "yes" ]; then
   tar xvf $CWD/nvidia-persistenced-$VERSION.tar.bz2
 # Compiling nvidia-persistenced
   cd $TMP/nvidia-persistenced-$VERSION
+# Patch for tirpc (backport from 470.xx):
+  patch -p1 < $CWD/nvidia-persistenced-390-tirpc.patch
   chown -R root:root .
   find -L . \
    \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -376,34 +351,14 @@ if [ "${PERSISTENCED:-no}" = "yes" ]; then
   CFLAGS="$SLKCFLAGS" make
   install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/
   install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/
-
-  if ! getent group nvidia > /dev/null 2>&1; then
-    echo "Creating the group nvidia:"
-    groupadd -g 365 nvidia || exit 1
-  fi
-  if ! getent passwd nvidia > /dev/null 2>&1; then
-    echo "Creating the user nvidia:"
-    useradd -u 365 -g 365 -c "Nvidia" -d /dev/null -s /bin/false nvidia || exit 1
-  fi
-  mkdir -p $PKG/var/run/nvidia-persistenced
-  chown nvidia:nvidia $PKG/var/run/nvidia-persistenced
-  mkdir -p $PKG/etc/rc.d
+# install rc.nvidia-perstistenced:
+  mkdir -p $PKG/etc/rc.d $PKG/var/run/nvidia-persistenced
   install -m 755 $CWD/rc.nvidia-persistenced $PKG/etc/rc.d/rc.nvidia-persistenced
   sed -i "s|__USER__|nvidia|" $PKG/etc/rc.d/rc.nvidia-persistenced
-  cat <<EOF >> $PKG/install/doinst.sh
-# Create group and user nvidia if they don't already exist
-if ! getent group nvidia > /dev/null 2>&1; then
-  echo "Creating the group nvidia:"
-  groupadd -g 365 nvidia || exit 1
-fi
-if ! getent passwd nvidia > /dev/null 2>&1; then
-  echo "Creating the user nvidia:"
-  useradd -u 365 -g 365 -c "Nvidia" -d /dev/null -s /bin/false nvidia || exit 1
+  chown nvidia:nvidia $PKG/var/run/nvidia-persistenced
 fi
 
-EOF
-fi
 
 # Flag multlib as needed and build package.
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$MULTI-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$MULTI-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info
index 110f8ab193..e1520ab0aa 100644
--- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info
+++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info
@@ -1,30 +1,30 @@
 PRGNAM="nvidia-legacy390-driver"
-VERSION="390.141"
-HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.141/NVIDIA-Linux-x86-390.141.run \
-          https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.141.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.141.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.141.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.141.tar.bz2 \
-          https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.141.tar.bz2"
-MD5SUM="f3e6660ffe5338b17b7e643d0eceb57e \
-        ff1c359809225ac9fc3562a16bc302bd \
-        baa8df62e2449ec6dd55c3d27cf23490 \
-        24c4e151626dc920525966d4bd3a2dbd \
-        61be9b85fd9b2198cdbc555a3625d39b \
-        94c281d2704d87809176e3084102bfee"
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.141/NVIDIA-Linux-x86_64-390.141.run \
-                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.141.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.141.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.141.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.141.tar.bz2 \
-                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.141.tar.bz2"
-MD5SUM_x86_64="0c7fc061349bbb2f0d7e26af9f1b082a \
-               ff1c359809225ac9fc3562a16bc302bd \
-               baa8df62e2449ec6dd55c3d27cf23490 \
-               24c4e151626dc920525966d4bd3a2dbd \
-               61be9b85fd9b2198cdbc555a3625d39b \
-               94c281d2704d87809176e3084102bfee"
+VERSION="390.157"
+HOMEPAGE="https://www.nvidia.com"
+DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.157/NVIDIA-Linux-x86-390.157.run \
+          https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.157.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.157.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.157.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.157.tar.bz2 \
+          https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.157.tar.bz2"
+MD5SUM="0975ee17f9c690555dfb2a342a0138b8 \
+        b5d9a2036637cb2292d513caf38c6471 \
+        bebac9781d1b307abdb6c183054fdd82 \
+        ec1ef1ce2d619d14b60f1ebbf22db674 \
+        70c481fc124052d0c20907c4dd0e57ec \
+        3ff8e45fa66fd00ef824c3e8d297c3e6"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.157/NVIDIA-Linux-x86_64-390.157.run \
+                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.157.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.157.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.157.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.157.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.157.tar.bz2"
+MD5SUM_x86_64="d564c4a0f57eb7715a5f11ed8da17b6c \
+               b5d9a2036637cb2292d513caf38c6471 \
+               bebac9781d1b307abdb6c183054fdd82 \
+               ec1ef1ce2d619d14b60f1ebbf22db674 \
+               70c481fc124052d0c20907c4dd0e57ec \
+               3ff8e45fa66fd00ef824c3e8d297c3e6"
 REQUIRES="nvidia-legacy390-kernel"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/system/nvidia-legacy390-driver/nvidia-persistenced-390-tirpc.patch b/system/nvidia-legacy390-driver/nvidia-persistenced-390-tirpc.patch
new file mode 100644
index 0000000000..e92a31a716
--- /dev/null
+++ b/system/nvidia-legacy390-driver/nvidia-persistenced-390-tirpc.patch
@@ -0,0 +1,21 @@
+diff -Nur nvidia-persistenced-390.157.orig/Makefile nvidia-persistenced-390.157/Makefile
+--- nvidia-persistenced-390.157.orig/Makefile	2022-10-12 05:30:58.000000000 -0400
++++ nvidia-persistenced-390.157/Makefile	2023-05-21 17:17:39.137443544 -0400
+@@ -104,6 +104,17 @@
+   LIBS += -ldl
+ endif
+ 
++PKG_CONFIG ?= pkg-config
++
++USE_TIRPC ?= $(shell $(PKG_CONFIG) --exists libtirpc && echo 1)
++
++ifeq ($(USE_TIRPC),1)
++  TIRPC_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs libtirpc)
++  TIRPC_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags libtirpc)
++  $(call BUILD_OBJECT_LIST,$(SRC)): CFLAGS += $(TIRPC_CFLAGS)
++  LIBS += $(TIRPC_LDFLAGS)
++endif
++
+ ##############################################################################
+ # build rules
+ ##############################################################################
diff --git a/system/nvidia-legacy390-driver/nvidia-switch b/system/nvidia-legacy390-driver/nvidia-switch
index 2f57366cfd..8ba674a6e7 100644
--- a/system/nvidia-legacy390-driver/nvidia-switch
+++ b/system/nvidia-legacy390-driver/nvidia-switch
@@ -39,93 +39,31 @@ else
   ROOT="${ROOT}/"
 fi
 CWD=$(pwd)
-COMPAT32="LIB32FLAG" # This will be replaced in the build script (yes | no)
 LIBSUFFIX="LIBDIRSUFFIX" # This will be replaced in the build script
 INC="${ROOT}usr/include/GL"
 LIB="${ROOT}usr/lib${LIBSUFFIX}"
-LIB32="${ROOT}usr/lib"
 XMOD="${LIB}/xorg/modules"
 XLIB="$XMOD/extensions"
 NV_VERSION="PKGVERSION" # This will be replaced in the build script
-GL_VERSION="GLVERSION"
-GLVND="GLVNDFLAG" # This will be replaced in the build script (yes | no)
-SAVELIBS="${ROOT}var/log/nvidia"
-
-save_GL(){
-# backup original mesa and xorg conflicts to /var/log/nvidia
-  cd $2
-  # Need to make sure save path is reset incase of multilib
-  SAVELIBS="${ROOT}var/log/nvidia"
-  if [ "$2" = "$LIB32" ]; then
-     SAVELIBS="${SAVELIBS}/32"
-  elif [ "$2" = "$LIB" ]; then
-     SAVELIBS="${SAVELIBS}/64"
-  fi
-
-  case "$1" in
-    "nvidia")
-
-      if [ "$GLVND" = "yes" ]; then
-        mv libGL.so.$GL_VERSION $SAVELIBS
-        mv libGL.la $SAVELIBS
-        mv libEGL.so.1.?.0 $SAVELIBS
-        mv libGLESv1_CM.so.1.1.0 $SAVELIBS
-        mv libGLESv2.so.2.0.0 $SAVELIBS
-        mv libGL.la-nvidia libGL.la
-        ln -sf libGL.so.1.7.0-nvidia libGL.so.1
-        ln -sf libGL.so.1 libGL.so
-        ln -sf libEGL.so.1.1.0-nvidia libEGL.so.1.1.0
-        ln -sf libEGL.so.1 libEGL.so
-        ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.libGLESv1_CM.so.1
-        ln -sf libGLESv1_CM.so.1 libGLESv1_CM.so
-        ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so.2
-        ln -sf libGLESv2.so.2 libGLESv2.so
-      fi
-    ;;
-
-    "xorg")
-       if [ -e libGL.la ]; then
-          mv libGL.la libGL.la-nvidia
-       fi
-       if [ "$GLVND" = "yes" ]; then
-          mv $SAVELIBS/* .
-          ln -sf libGL.so.$GL_VERSION libGL.so.1
-          ln -sf libGL.so.1 libGL.so
-          ln -sf libEGL.so.1.0.0 libEGL.so.1
-          ln -sf libEGL.so.1 libEGL.so
-          ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1
-          ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so
-          ln -sf libGLESv2.so.2.0.0 libGLESv2.so.2
-          ln -sf libGLESv2.so.2.0.0 libGLESv2.so
-       fi
-  ;;
-
-  *)
-        echo "nothing to do for save_gl?"
-        exit 1
-  ;;
-  esac
-  cd "$CWD"
-}
 
 save_glx(){
   cd "$XLIB"
   case "$1" in
       "nvidia")
-        if [ -e libglx.so ]; then
-          cp -a libglx.so libglx.so-xorg
+        if [ -f libglx.so ]; then
+          mv libglx.so libglx.so-xorg
         fi
 	  ln -sf libglx.so.$NV_VERSION libglx.so
       ;;
       "xorg")
-        if [ -e libglx.so-xorg ]; then
+        if [ -f libglx.so-xorg ]; then
           rm -f libglx.so
           mv libglx.so-xorg libglx.so
         else
           if [ ! -e libglx.so ]; then
-            echo -e "WARNING: libglx.so not found! Please reinstall xorg-server!\n"
+            echo -e "WARNING: libglx.so not found!  Please reinstall xorg-server!\n"
           else
-            if [ -L libglx.so ]; then
+            if [ -h libglx.so ]; then
               rm libglx.so
               echo -e "WARNING: removed dead symlink libglx.so!  Please reinstall xorg-server!\n"
             fi
@@ -152,22 +90,13 @@ save_wfb(){
 }
 
 nvidia_install(){
-  if [ ! -d $SAVELIBS ]; then
-     echo "Creating missing $SAVELIB ..."
-     mkdir -p $SAVELIBS
-  fi
   echo $'Installing to nvidia-legacy390-driver files:\n'
   echo "Make sure the nvidia driver is ENABLED in /etc/X11/xorg.conf"
   echo "and in /etc/X11/xorg.conf.d.  Otherwise, this may lead to"
   echo -e "improperly working drivers.\n"
 
   save_glx "nvidia"
-  save_GL "nvidia" $LIB
   save_wfb "nvidia"
-# Check for multilib configuration
-  if [ "$COMPAT32" = "yes" ]; then
-    save_GL "nvidia" $LIB32
-  fi
 }
 
 nvidia_remove(){
@@ -175,17 +104,8 @@ nvidia_remove(){
   echo "Make sure the nvidia driver is DISABLED in /usr/share/X11/xorg.conf.d"
   echo "/etc/X11/xorg.conf and in /etc/X11/xorg.conf.d."
   echo -e "Otherwise, this may lead to improperly working drivers.\n"
-  if [ "$GLVND" = "yes" ]; then
-    echo -e "Be sure to run /sbin/ldconfig after removing nvidia-legacy390-driver.\n"
-  fi
   save_glx "xorg"
-  save_GL "xorg" $LIB
   save_wfb "xorg"
-
-# Check for multilib configuration
-  if [ "$COMPAT32" = "yes" ]; then
-    save_GL "xorg" $LIB32
-  fi
 }
 
 if [ "$LIBSUFFIX" = "64" ]; then
diff --git a/system/nvidia-legacy390-driver/rc.nvidia-persistenced b/system/nvidia-legacy390-driver/rc.nvidia-persistenced
index 59bdf18d11..b95480a4e0 100644
--- a/system/nvidia-legacy390-driver/rc.nvidia-persistenced
+++ b/system/nvidia-legacy390-driver/rc.nvidia-persistenced
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 #
 # NVIDIA Persistence Daemon Init Script
 #
diff --git a/system/nvidia-legacy390-kernel/README b/system/nvidia-legacy390-kernel/README
index adb7c9d3fd..d31e2f0953 100644
--- a/system/nvidia-legacy390-kernel/README
+++ b/system/nvidia-legacy390-kernel/README
@@ -1,18 +1,21 @@
 This is the kernel-module needed by the proprietary binary nvidia
-driver.  You also need the nvidia-legacy390-driver package from
-SlackBuilds.org.
+driver.  You also need the nvidia-driver package from SlackBuilds.org.
 
 To build the package for a kernel different from the running one,
 start the script setting the KERNEL variable as in
     KERNEL=4.6.3 ./nvidia-legacy390-kernel.SlackBuild
 
-A default config file is placed at
-/usr/share/X11/xorg.conf.d/10-nvidia.conf to make sure that X loads
-the nvidia module.  If you need to make changes, copy that file to
-/etc/X11/xorg.conf.d/ and edit the copy.  You do not need this file
-at all if you have a proper and complete xorg.conf.
-
-This script now includes the patches to enable building on newer
-kernels.  (MANY thanks to willysr and Herecura for the fixes.)
+A default config file is placed at 
+  /usr/share/X11/xorg.conf.d/10-nvidia.conf
+to make sure that X loads the nvidia module.  If you need to make
+changes, copy that file to /etc/X11/xorg.conf.d/ and edit the copy.
+You do not need this file at all if you have a proper and complete
+/etc/X11/xorg.conf.
 
 The xf86-video-nouveau-blacklist package from /extra is required.
+
+To build against the new 6.6.x kernel, pass KERNEL66=yes to the script.
+
+BIG FAT NOTE: The Nvidia 390.xx series is EOL as of December 2022.
+Because of the ABI change from xorg-server 1.20 to 1.21, the Nvidia 390
+driver will no longer work on Slackware versions later than 15.0.
diff --git a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild
index dadc3c08c9..ff10dd4520 100644
--- a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild
+++ b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nvidia-legacy390-kernel
 
@@ -25,12 +25,13 @@
 
 # Thanks to Robby Workman for suggestions to improve this script.
 
-# see nvidia-driver/changelog.txt
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nvidia-legacy390-kernel
-VERSION=${VERSION:-390.141}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-390.157}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 KERNEL=${KERNEL:-$(uname -r)}
 KERNELPATH=${KERNELPATH:-/lib/modules/${KERNEL}/build}
@@ -55,13 +56,18 @@ elif [ "$ARCH" = "x86_64" ]; then
   TARGET="x86_64"
 fi
 
-unset ARCH
-
 SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$PRGNAM}
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 rm -rf $PKG
@@ -77,8 +83,26 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-(cd kernel || exit 1
-  make SYSSRC=$KERNELPATH module || exit 1
+(
+  unset ARCH
+  cd kernel || exit 1
+
+# Patches for kernel 6.6.x
+  if [ "${KERNEL66:-no}" = "yes" ]; then
+    patch -p1 < $CWD/patches/kernel-6.2.patch
+    patch -p1 < $CWD/patches/kernel-6.3.patch
+    if [ "$TARGET" = "x86_64" ]; then
+      patch -p1 < $CWD/patches/kernel-6.3_64.patch
+    fi
+    patch -p1 < $CWD/patches/kernel-6.4.patch
+    patch -p1 < $CWD/patches/kernel-6.5.patch
+    patch -p1 < $CWD/patches/kernel-6.6.patch
+  fi
+
+# CC=${CC:-gcc} suppresses an otherwise harmless "compiler mismatch"
+# message.  If you custom-build your kernel with clang,
+# then pass CC=clang to this script.
+  CC=${CC:-gcc} make SYSSRC=$KERNELPATH module || exit 1
 )
 
 mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video
@@ -105,4 +129,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info
index 2cf1128cb0..8a2187c6c9 100644
--- a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info
+++ b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info
@@ -1,10 +1,10 @@
 PRGNAM="nvidia-legacy390-kernel"
-VERSION="390.141"
-HOMEPAGE="http://www.nvidia.com"
-DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.141/NVIDIA-Linux-x86-390.141.run"
-MD5SUM="f3e6660ffe5338b17b7e643d0eceb57e"
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.141/NVIDIA-Linux-x86_64-390.141.run"
-MD5SUM_x86_64="0c7fc061349bbb2f0d7e26af9f1b082a"
+VERSION="390.157"
+HOMEPAGE="https://www.nvidia.com"
+DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.157/NVIDIA-Linux-x86-390.157.run"
+MD5SUM="0975ee17f9c690555dfb2a342a0138b8"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.157/NVIDIA-Linux-x86_64-390.157.run"
+MD5SUM_x86_64="d564c4a0f57eb7715a5f11ed8da17b6c"
 REQUIRES=""
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmai.com"
diff --git a/system/nvidia-legacy390-kernel/patches/kernel-6.2.patch b/system/nvidia-legacy390-kernel/patches/kernel-6.2.patch
new file mode 100644
index 0000000000..e88c982de9
--- /dev/null
+++ b/system/nvidia-legacy390-kernel/patches/kernel-6.2.patch
@@ -0,0 +1,145 @@
+From 5db7eb5a62003bbe04f3f07d089fcf5445b34a29 Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Sun, 25 Dec 2022 22:05:14 +0000
+Subject: [PATCH] Tentative fix for NVIDIA 470.161.03 driver for Linux 6.2-rc1
+
+---
+ nvidia-drm/nvidia-drm-connector.c | 22 ++++++++++++++++++++++
+ nvidia-drm/nvidia-drm-drv.c       |  4 ++++
+ nvidia/nv-acpi.c                  | 19 ++++++++++++++++---
+ 3 files changed, 42 insertions(+), 3 deletions(-)
+
+diff --git a/nvidia-drm/nvidia-drm-connector.c b/nvidia-drm/nvidia-drm-connector.c
+index 6fbcd63..a5ab9e9 100644
+--- a/nvidia-drm/nvidia-drm-connector.c
++++ b/nvidia-drm/nvidia-drm-connector.c
+@@ -20,6 +20,8 @@
+  * DEALINGS IN THE SOFTWARE.
+  */
+ 
++#include <linux/version.h>
++#include <drm/drm_edid.h>
+ #include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
+ 
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+@@ -98,6 +100,7 @@ __nv_drm_detect_encoder(struct NvKmsKapiDynamicDisplayParams *pDetectParams,
+             break;
+     }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0)
+     if (connector->override_edid) {
+         const struct drm_property_blob *edid = connector->edid_blob_ptr;
+ 
+@@ -110,6 +113,25 @@ __nv_drm_detect_encoder(struct NvKmsKapiDynamicDisplayParams *pDetectParams,
+                     sizeof(pDetectParams->edid.buffer));
+         }
+     }
++#else
++    // Rel. commit "drm/edid: detach debugfs EDID override from EDID property update" (Jani Nikula, 24 Oct 2022)
++    // NOTE: HUGE HACK!
++    mutex_lock(&connector->edid_override_mutex);
++    if (connector->edid_override) {
++        const struct edid *edid = drm_edid_raw(connector->edid_override);
++        size_t edid_length = EDID_LENGTH * (edid->extensions + 1);
++        if (edid_length <= sizeof(pDetectParams->edid.buffer)) {
++            memcpy(pDetectParams->edid.buffer, edid, edid_length);
++            pDetectParams->edid.bufferSize = edid_length;
++            pDetectParams->overrideEdid = NV_TRUE;
++        } else {
++            WARN_ON(edid_length >
++                    sizeof(pDetectParams->edid.buffer));
++        }
++    }
++    mutex_unlock(&connector->edid_override_mutex);
++
++#endif
+ 
+     if (!nvKms->getDynamicDisplayInfo(nv_dev->pDevice, pDetectParams)) {
+         NV_DRM_DEV_LOG_ERR(
+diff --git a/nvidia-drm/nvidia-drm-drv.c b/nvidia-drm/nvidia-drm-drv.c
+index 6d007b1..d08ab4c 100644
+--- a/nvidia-drm/nvidia-drm-drv.c
++++ b/nvidia-drm/nvidia-drm-drv.c
+@@ -20,6 +20,7 @@
+  * DEALINGS IN THE SOFTWARE.
+  */
+ 
++#include <linux/version.h>
+ #include "nvidia-drm-conftest.h" /* NV_DRM_AVAILABLE and NV_DRM_DRM_GEM_H_PRESENT */
+ 
+ #include "nvidia-drm-priv.h"
+@@ -240,9 +241,12 @@ nv_drm_init_mode_config(struct nv_drm_device *nv_dev,
+     dev->mode_config.preferred_depth = 24;
+     dev->mode_config.prefer_shadow = 1;
+ 
++// Rel. commit "drm: Remove drm_mode_config::fb_base" (Zack Rusin, 18 Oct 2022)
++#if defined(CONFIG_FB) && LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0)
+     /* Currently unused. Update when needed. */
+ 
+     dev->mode_config.fb_base = 0;
++#endif
+ 
+ #if defined(NV_DRM_CRTC_STATE_HAS_ASYNC_FLIP) || \
+     defined(NV_DRM_CRTC_STATE_HAS_PAGEFLIP_FLAGS)
+diff --git a/nvidia/nv-acpi.c b/nvidia/nv-acpi.c
+index 07501eb..1fdf71c 100644
+--- a/nvidia/nv-acpi.c
++++ b/nvidia/nv-acpi.c
+@@ -8,6 +8,7 @@
+  * _NVRM_COPYRIGHT_END_
+  */
+ 
++#include <linux/version.h>
+ #define  __NO_VERSION__
+ 
+ #include "os-interface.h"
+@@ -24,7 +25,10 @@ static NV_STATUS   nv_acpi_extract_object  (const union acpi_object *, void *, N
+ 
+ static int         nv_acpi_add             (struct acpi_device *);
+ 
+-#if !defined(NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT) || (NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT == 2)
++// Rel. commit "ACPI: make remove callback of ACPI driver void" (Dawei Li, 14 Nov 2022)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0))
++static void        nv_acpi_remove_one_arg_void(struct acpi_device *device);
++#elif !defined(NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT) || (NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT == 2)
+ static int         nv_acpi_remove_two_args(struct acpi_device *device, int type);
+ #else
+ static int         nv_acpi_remove_one_arg(struct acpi_device *device);
+@@ -80,7 +84,10 @@ static const struct acpi_driver nv_acpi_driver_template = {
+     .ids = nv_video_device_ids,
+     .ops = {
+         .add = nv_acpi_add,
+-#if !defined(NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT) || (NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT == 2)
++// Rel. commit "ACPI: make remove callback of ACPI driver void" (Dawei Li, 14 Nov 2022)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0))
++        .remove = nv_acpi_remove_one_arg_void,
++#elif !defined(NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT) || (NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT == 2)
+         .remove = nv_acpi_remove_two_args,
+ #else
+         .remove = nv_acpi_remove_one_arg,
+@@ -342,7 +349,10 @@ static int nv_acpi_add(struct acpi_device *device)
+     return 0;
+ }
+ 
+-#if !defined(NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT) || (NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT == 2)
++// Rel. commit "ACPI: make remove callback of ACPI driver void" (Dawei Li, 14 Nov 2022)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0))
++static void nv_acpi_remove_one_arg_void(struct acpi_device *device)
++#elif !defined(NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT) || (NV_ACPI_DEVICE_OPS_REMOVE_ARGUMENT_COUNT == 2)
+ static int nv_acpi_remove_two_args(struct acpi_device *device, int type)
+ #else
+ static int nv_acpi_remove_one_arg(struct acpi_device *device)
+@@ -396,7 +406,10 @@ static int nv_acpi_remove_one_arg(struct acpi_device *device)
+         device->driver_data = NULL;
+     }
+ 
++// Rel. commit "ACPI: make remove callback of ACPI driver void" (Dawei Li, 14 Nov 2022)
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0))
+     return status;
++#endif
+ }
+ 
+ /*
+-- 
+2.39.0
+
diff --git a/system/nvidia-legacy390-kernel/patches/kernel-6.3.patch b/system/nvidia-legacy390-kernel/patches/kernel-6.3.patch
new file mode 100644
index 0000000000..b6c7bb1580
--- /dev/null
+++ b/system/nvidia-legacy390-kernel/patches/kernel-6.3.patch
@@ -0,0 +1,76 @@
+diff --git a/common/inc/nv-linux.h b/common/inc/nv-linux.h
+index 2c4cb7b..f68fcf2 100644
+--- a/common/inc/nv-linux.h
++++ b/common/inc/nv-linux.h
+@@ -1996,4 +1996,17 @@ static inline NvU64 nv_expand_nvlink_addr(NvU64 addr47)
+ #include <linux/backlight.h>
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
++// Rel. commit "mm: introduce vma->vm_flags wrapper functions" (Suren Baghdasaryan, 26 Jan 2023)
++static inline void vm_flags_set(struct vm_area_struct *vma, vm_flags_t flags)
++{
++    vma->vm_flags |= flags;
++}
++
++static inline void vm_flags_clear(struct vm_area_struct *vma, vm_flags_t flags)
++{
++    vma->vm_flags &= ~flags;
++}
++#endif
++
+ #endif  /* _NV_LINUX_H_ */
+diff --git a/nvidia-drm/nvidia-drm-fb.c b/nvidia-drm/nvidia-drm-fb.c
+index 725164a..c35e0ee 100644
+--- a/nvidia-drm/nvidia-drm-fb.c
++++ b/nvidia-drm/nvidia-drm-fb.c
+@@ -29,6 +29,7 @@
+ #include "nvidia-drm-fb.h"
+ #include "nvidia-drm-utils.h"
+ #include "nvidia-drm-gem.h"
++#include "nvidia-drm-helper.h"
+ 
+ #include <drm/drm_crtc_helper.h>
+ 
+diff --git a/nvidia/nv-mmap.c b/nvidia/nv-mmap.c
+index 0b0a6f2..da891ff 100644
+--- a/nvidia/nv-mmap.c
++++ b/nvidia/nv-mmap.c
+@@ -447,7 +447,7 @@ int nvidia_mmap_helper(
+             addr  = mmap_start;
+             
+             // Needed for the linux kernel for mapping compound pages
+-            vma->vm_flags |= VM_MIXEDMAP;
++            vm_flags_set(vma, VM_MIXEDMAP);
+ 
+             for (j = 0; j < pages; j++)
+             {
+@@ -471,7 +471,7 @@ int nvidia_mmap_helper(
+             }
+         }
+ 
+-        vma->vm_flags |= VM_IO;
++        vm_flags_set(vma, VM_IO);
+     }
+     else
+     {
+@@ -533,15 +533,15 @@ int nvidia_mmap_helper(
+ 
+         NV_PRINT_AT(NV_DBG_MEMINFO, at);
+ 
+-        vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
+-        vma->vm_flags |= (VM_DONTEXPAND | VM_DONTDUMP);
++        vm_flags_set(vma, VM_IO | VM_LOCKED | VM_RESERVED);
++        vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP);
+     }
+ 
+     if ((prot & NV_PROTECT_WRITEABLE) == 0)
+     {
+         vma->vm_page_prot = NV_PGPROT_READ_ONLY(vma->vm_page_prot);
+-        vma->vm_flags &= ~VM_WRITE;
+-        vma->vm_flags &= ~VM_MAYWRITE;
++        vm_flags_clear(vma, VM_WRITE);
++        vm_flags_clear(vma, VM_MAYWRITE);
+     }
+ 
+     vma->vm_ops = &nv_vm_ops;
diff --git a/system/nvidia-legacy390-kernel/patches/kernel-6.3_64.patch b/system/nvidia-legacy390-kernel/patches/kernel-6.3_64.patch
new file mode 100644
index 0000000000..1b2bfe6c89
--- /dev/null
+++ b/system/nvidia-legacy390-kernel/patches/kernel-6.3_64.patch
@@ -0,0 +1,13 @@
+diff --git a/nvidia-uvm/uvm8.c b/nvidia-uvm/uvm8.c
+index 11cb373..49e1047 100644
+--- a/nvidia-uvm/uvm8.c
++++ b/nvidia-uvm/uvm8.c
+@@ -658,7 +658,7 @@ static int uvm_mmap(struct file *filp, struct vm_area_struct *vma)
+     // Using VM_DONTCOPY would be nice, but madvise(MADV_DOFORK) can reset that
+     // so we have to handle vm_open on fork anyway. We could disable MADV_DOFORK
+     // with VM_IO, but that causes other mapping issues.
+-    vma->vm_flags |= VM_MIXEDMAP | VM_DONTEXPAND;
++    vm_flags_set(vma, VM_MIXEDMAP | VM_DONTEXPAND);
+ 
+     vma->vm_ops = &uvm_vm_ops_managed;
+ 
diff --git a/system/nvidia-legacy390-kernel/patches/kernel-6.4.patch b/system/nvidia-legacy390-kernel/patches/kernel-6.4.patch
new file mode 100644
index 0000000000..a4f1762ea1
--- /dev/null
+++ b/system/nvidia-legacy390-kernel/patches/kernel-6.4.patch
@@ -0,0 +1,14 @@
+*** a/nvidia-drm/nvidia-drm-drv.c   2023-07-02 16:08:37.702462187 -0400
+--- b/nvidia-drm/nvidia-drm-drv.c   2023-07-02 16:23:58.040020274 -0400
+*************** static void nv_drm_update_drm_driver_fea
+*** 766,772 ****
+--- 766,774 ----
+
+      nv_drm_driver.dumb_create      = nv_drm_dumb_create;
+      nv_drm_driver.dumb_map_offset  = nv_drm_dumb_map_offset;
++ #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)
+      nv_drm_driver.dumb_destroy     = nv_drm_dumb_destroy;
++ #endif
+
+  #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_CALLBACKS)
+      nv_drm_driver.gem_vm_ops       = &nv_drm_gem_vma_ops;
diff --git a/system/nvidia-legacy390-kernel/patches/kernel-6.5.patch b/system/nvidia-legacy390-kernel/patches/kernel-6.5.patch
new file mode 100644
index 0000000000..6bed8e1a78
--- /dev/null
+++ b/system/nvidia-legacy390-kernel/patches/kernel-6.5.patch
@@ -0,0 +1,70 @@
+diff --git a/common/inc/nv-mm.h b/kernel/common/inc/nv-mm.h
+index aec55b0..acd396d 100644
+--- a/common/inc/nv-mm.h
++++ b/common/inc/nv-mm.h
+@@ -23,6 +23,7 @@
+ #ifndef __NV_MM_H__
+ #define __NV_MM_H__
+
++#include <linux/version.h>
+ #include "conftest.h"
+
+ #if !defined(NV_VM_FAULT_T_IS_PRESENT)
+@@ -47,7 +48,27 @@ typedef int vm_fault_t;
+  *
+  */
+
+-#if defined(NV_GET_USER_PAGES_HAS_TASK_STRUCT)
++// Rel. commit. "mm/gup: remove unused vmas parameter from get_user_pages()" (Lorenzo Stoakes, 14 May 2023)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0)
++#include <linux/mm.h>
++
++static inline long NV_GET_USER_PAGES(unsigned long start,
++                                     unsigned long nr_pages,
++                                     int write,
++                                     int force,
++                                     struct page **pages,
++                                     struct vm_area_struct **vmas)
++{
++    unsigned int flags = 0;
++
++    if (write)
++        flags |= FOLL_WRITE;
++    if (force)
++        flags |= FOLL_FORCE;
++
++    return get_user_pages(start, nr_pages, flags, pages);
++}
++#elif defined(NV_GET_USER_PAGES_HAS_TASK_STRUCT)
+     #if defined(NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS)
+         #define NV_GET_USER_PAGES(start, nr_pages, write, force, pages, vmas) \
+             get_user_pages(current, current->mm, start, nr_pages, write, force, pages, vmas)
+@@ -130,7 +151,27 @@ typedef int vm_fault_t;
+  *
+  */
+
+-#if defined(NV_GET_USER_PAGES_REMOTE_PRESENT)
++// Rel. commit. "mm/gup: remove unused vmas parameter from get_user_pages_remote()" (Lorenzo Stoakes, 14 May 2023)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0)
++static inline long NV_GET_USER_PAGES_REMOTE(struct task_struct *tsk,
++                                            struct mm_struct *mm,
++                                            unsigned long start,
++                                            unsigned long nr_pages,
++                                            int write,
++                                            int force,
++                                            struct page **pages,
++                                            struct vm_area_struct **vmas)
++{
++    unsigned int flags = 0;
++
++    if (write)
++        flags |= FOLL_WRITE;
++    if (force)
++        flags |= FOLL_FORCE;
++
++    return get_user_pages_remote(mm, start, nr_pages, flags, pages, NULL);
++}
++#elif defined(NV_GET_USER_PAGES_REMOTE_PRESENT)
+     #if defined(NV_GET_USER_PAGES_REMOTE_HAS_WRITE_AND_FORCE_ARGS)
+         #define NV_GET_USER_PAGES_REMOTE    get_user_pages_remote
+     #else
diff --git a/system/nvidia-legacy390-kernel/patches/kernel-6.6.patch b/system/nvidia-legacy390-kernel/patches/kernel-6.6.patch
new file mode 100644
index 0000000000..8f246b9888
--- /dev/null
+++ b/system/nvidia-legacy390-kernel/patches/kernel-6.6.patch
@@ -0,0 +1,16 @@
+diff --ignore-space-change --unified --recursive --no-dereference a/nvidia-drm/nvidia-drm-drv.c b/nvidia-drm/nvidia-drm-drv.c
+--- a/nvidia-drm/nvidia-drm-drv.c  
++++ b/nvidia-drm/nvidia-drm-drv.c  
+@@ -700,8 +700,11 @@
+ 
+     .ioctls                 = nv_drm_ioctls,
+     .num_ioctls             = ARRAY_SIZE(nv_drm_ioctls),
+-
++// Rel. commit "drm/prime: Unexport helpers for fd/handle conversion" (Thomas Zimmermann, 20 Jun 2023)
++// This function is no longer exported, but leaving it to NULL is equivalent
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0)
+     .prime_handle_to_fd     = drm_gem_prime_handle_to_fd,
++#endif
+ 
+ #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_CALLBACKS)
+     .gem_prime_export       = nv_drm_gem_prime_export,
diff --git a/system/nvidia-legacy470-driver/README b/system/nvidia-legacy470-driver/README
new file mode 100644
index 0000000000..a25c03aef0
--- /dev/null
+++ b/system/nvidia-legacy470-driver/README
@@ -0,0 +1,47 @@
+This is the proprietary binary video driver from NVidia for the X.Org
+X-server. This package does not include the kernel-module - it is a
+part of the nvidia-kernel package at SlackBuilds.org.
+
+NOTE: 64-bit x86_64 support ONLY for Slackware64. For x86 32-bit
+support, use nvidia-legacy390-{driver,kernel}
+
+The Wine libraries are now installed by default.  To disable, pass
+  WINE="no" to the script.
+
+Installing the 32-bit compatibility libraries is available:
+if desired, do:
+
+  COMPAT32="yes" ./nvidia-legacy470-driver.SlackBuild
+
+This script now gives the option of installing the nvidia-persitenced
+daemon.  For details, see README.nvidia-persitenced.
+
+Several useful utilities are included: nvidia-xsettings, nvidia-smi,
+and nvidia-settings.  Please refer to the Nvidia documentation and
+man pages for details and usage.
+
+For CUDA/OpenCL to work after reboot, and for utilites such as
+nvidia-smi, you might need to include the following line in your
+/etc/rc.d/rc.local:
+(This is required if you plan on running nvidia-persistenced)
+
+    # Create missing nvidia device nodes after reboot
+    /usr/bin/nvidia-modprobe -c 0 -u
+
+Notes:
+1.  You still need to blacklist the open source nouveau driver.
+    This is easily done by installing xf86-video-nouveau-blacklist in
+    extra/xf86-video-nouveau-blacklist on the distibution DVD.
+
+2.  It is now no longer required to remove the old driver before
+    running this script.
+
+
+3.  With Slackware 15.0, nvidia-switch has been dropped once and for
+    all as there are no longer any conflicts.
+
+CAUTION!  Please DO NOT USE this script for Slackware(64) versions 14.2
+or older as it WILL corrupt the mesa and xorg installations.
+Please use the script from those repos instead.
+
+The Nvidia 470.xx series will be supported through December 2024.
diff --git a/system/nvidia-legacy470-driver/README.nvidia-persistenced b/system/nvidia-legacy470-driver/README.nvidia-persistenced
new file mode 100644
index 0000000000..5dd841ff87
--- /dev/null
+++ b/system/nvidia-legacy470-driver/README.nvidia-persistenced
@@ -0,0 +1,33 @@
+The NVIDIA Persistence Daemon is a userspace daemon on Linux to support
+persistence of driver state across Cuda job runs.  The daemon targets
+all current Tesla, Quadro and GRID GPUs.  For further information, see
+
+https://docs.nvidia.com/deploy/driver-persistence/index.html
+
+The driver now includes rc.nvidia-persistenced as an option.
+While it can be run as root, it is more secure to run it as an
+unpriveleged user, so we run it as user nvidia.
+
+To install it, Pass PERSISTENCED=yes to the script.  It will create the
+user and group nvidia, and install rc.nvidia-persistenced to /etc/rc.d.
+
+To activate the daemon, add the following to /etc/rc.d/local:
+
+# Start the nvidia-persistenced daemon:
+if  [ -x /etc/rc.d/rc.nvidia-persistenced ]; then
+    /etc/rc.d/rc.nvidia-persistenced start
+fi
+
+and then 'chmod +x /etc/rc.d/rc.nvidia-persistenced' to make it
+executable.
+
+Add the following to /etc/rc.d/rc.local_shutdown:
+
+# Stop the nvidia-persistenced daemon:
+if  [ -x /etc/rc.d/rc.nvidia-persistenced ]; then
+    /etc/rc.d/rc.nvidia-persistenced stop
+fi
+
+NOTE: This may not work on all systems.  If you encounter problems
+with it, just 'chmod -x /etc/rc.d/rc.persistenced' and it will no
+longer load.  YMMV.
diff --git a/system/nvidia-legacy470-driver/doinst.sh b/system/nvidia-legacy470-driver/doinst.sh
new file mode 100644
index 0000000000..392c12adb9
--- /dev/null
+++ b/system/nvidia-legacy470-driver/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications
+fi
+
diff --git a/system/nvidia-legacy470-driver/nvidia-legacy470-driver.SlackBuild b/system/nvidia-legacy470-driver/nvidia-legacy470-driver.SlackBuild
new file mode 100644
index 0000000000..8b370895b2
--- /dev/null
+++ b/system/nvidia-legacy470-driver/nvidia-legacy470-driver.SlackBuild
@@ -0,0 +1,327 @@
+#!/bin/bash
+
+# Slackware build script for nvidia-legacy470-driver
+
+# Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, US
+# Copyright 2021-2023 Lenard Spencer, Orlando, FL, USA
+#
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=nvidia-legacy470-driver
+VERSION=${VERSION:-470.239.06}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+set -e
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  TARGET="x86_64"
+  LIBDIRSUFFIX="64"
+# Set 32-bit compatibility flag default
+  COMPAT32=${COMPAT32:-no}
+else
+  echo "$ARCH is not supported."
+  exit 1
+fi
+
+if [ "$COMPAT32" = "yes" ]; then
+    MULTI="_multilib"
+else
+    MULTI=""
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION$MULTI-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+if [ "${PERSISTENCED:-no}" = "yes" ]; then
+  if [ `getent group nvidia > /dev/null` -o `getent passwd nvidia > /dev/null` ]; then
+    echo "User and/or group nvidia do not exist!"
+    echo "Please create user and group nvidia and rerun this script."
+    exit 1
+  fi
+fi
+
+SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
+
+# make a clean package directory tree
+rm -rf $PKG
+rm -rf $TMP/$SRCNAM
+mkdir -p $TMP $PKG $OUTPUT $PKG/install
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \
+  $PKG/etc/OpenCL/vendors/ $PKG/usr/{bin,doc,man/man1} \
+  $PKG/usr/share/{applications,nvidia,pixmaps,egl/egl_external_platform.d} \
+  $PKG/etc/X11/glvnd/egl_vendor.d $PKG/var/log
+
+if [ "$COMPAT32" = "yes" ]; then
+  mkdir -p $PKG/usr/lib/tls
+fi
+
+# Extract all the sources
+cd $TMP
+rm -rf nvidia-installer-$VERSION
+tar xvf $CWD/nvidia-installer-$VERSION.tar.bz2
+rm -rf nvidia-settings-$VERSION
+tar xvf $CWD/nvidia-settings-$VERSION.tar.bz2
+rm -rf nvidia-xconfig-$VERSION
+tar xvf $CWD/nvidia-xconfig-$VERSION.tar.bz2
+rm -rf nvidia-modprobe-$VERSION
+tar xvf $CWD/nvidia-modprobe-$VERSION.tar.bz2
+sh $CWD/$SRCNAM.run --extract-only
+cd $SRCNAM
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Compiling the various open source apps instead of using the precompiled binaries
+# Compiling nvidia-installer from source
+
+cd $TMP/nvidia-installer-$VERSION
+
+# Let's try to remove the conflicting files and GPU detection
+  patch -p0 < $CWD/skip_conflict-GPU_detect.patch
+
+# Install various files in $PKG instead of the root filesystem:
+  sed -i "s|/etc/vulkan|$PKG/etc/vulkan|" files.c
+  sed -i "s|/lib/firmware/nvidia|$PKG/lib/firmware/nvidia|" files.c
+  sed -i "s|\"/etc\"|\"$PKG/etc\"|" nvidia-installer.h
+  sed -i "s|/var/lib/nvidia|$PKG/var/lib/nvidia|" backup.c
+  sed -i "s|/usr/lib/nvidia|$PKG/usr/lib/nvidia|" files.c
+  sed -i "s|/usr/lib/nvidia|$PKG/usr/lib/nvidia|" misc.c
+
+  chown -R root:root .
+  find -L . \
+   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+    -o -perm 511 \) -exec chmod 755 {} \; -o \
+   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+  CFLAGS="$SLKCFLAGS" LDFLAGS="-lz" make
+
+  install -m 755 _out/Linux_$TARGET/nvidia-installer $PKG/usr/bin/
+  install -m 644 _out/Linux_$TARGET/nvidia-installer.1.gz $PKG/usr/man/man1/
+
+cd -
+
+# Now we need to copy the newly patched and compiled nvidia-installer
+# to the driver source tree for use
+mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM
+mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM
+
+if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then
+    COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr"
+else
+    if [ ! "$ARCH" = "x86_64" ]; then
+        COMP32=""
+    else
+        COMP32="--no-install-compat32-libs"
+    fi
+fi
+
+# Install the binary libs using nvidia-installer compiled above
+cd $TMP/$SRCNAM
+./nvidia-installer -s --no-kernel-module --no-drm --no-unified-memory \
+  -z -n -b --no-rpms --no-distro-scripts \
+  --no-kernel-module-source --no-x-check --force-libglx-indirect \
+  --x-prefix=$PKG/usr \
+  --x-module-path=$PKG/usr/lib${LIBDIRSUFFIX}/xorg/modules \
+  --x-library-path=$PKG/usr/lib${LIBDIRSUFFIX} \
+  --x-sysconfig-path=$PKG/etc/X11/xorg.conf.d \
+  --opengl-prefix=$PKG/usr \
+  --utility-prefix=$PKG/usr \
+  --utility-libdir=lib${LIBDIRSUFFIX} \
+  --documentation-prefix=$PKG/usr \
+  --application-profile-path=$PKG/usr/share/nvidia \
+  --glvnd-egl-config-path=$PKG/etc/X11/glvnd/egl_vendor.d \
+  --log-file-name=$PKG/var/log/nvidia-installer.log \
+  --egl-external-platform-config-path=$PKG/usr/share/egl/egl_external_platform.d \
+  --no-nvidia-modprobe \
+  --no-install-libglvnd \
+  --no-wine-files \
+  --no-systemd \
+  --no-peermem \
+  $COMP32
+
+# If we are using Wine, then:
+if [ "${WINE:-yes}" != "no" ]; then
+  mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/nvidia/wine
+  install -m 755 _nvngx.dll $PKG/usr/lib$LIBDIRSUFFIX/nvidia/wine
+  install -m 755 nvngx.dll $PKG/usr/lib$LIBDIRSUFFIX/nvidia/wine
+fi
+# libOpenCL.so is now included in 15.0 (in ocl-icd),
+# so we don't need this one.
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libOpenCL.so*
+if [ "${COMPAT32}" = "yes" ]; then
+    rm -f $PKG/usr/lib/libOpenCL.so*
+fi
+# remove a pair of folders installed and used by nvidia-installer but
+# no longer needed (caused the "failed to remove some directories"
+# warning message):
+rm -rf $PKG/usr/lib/nvidia || true
+rm -rf $PKG/var/lib || true
+
+# if not multilib, remove the unneeded /usr/lib folder:
+if [ "${COMPAT32}" != "yes" ]; then
+  rm -rf $PKG/usr/lib || true
+fi
+
+# Compile utilites from source, replacing the precompiled versions
+#
+# Compiling nvidia-settings
+cd $TMP/nvidia-settings-$VERSION
+  chown -R root:root .
+  find -L . \
+   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+    -o -perm 511 \) -exec chmod 755 {} \; -o \
+   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+  cd src/libXNVCtrl
+    make clean
+    CFLAGS="$SLKCFLAGS" \
+    make
+  cd ../../
+
+  CFLAGS="$SLKCFLAGS" \
+  make
+
+  install -m 755 src/_out/Linux_$TARGET/nvidia-settings $PKG/usr/bin/
+  install -m 644 doc/_out/Linux_$TARGET/nvidia-settings.1.gz $PKG/usr/man/man1/
+  install -m 644 doc/nvidia-settings.desktop $PKG/usr/share/applications/
+  install -m 644 doc/nvidia-settings.png $PKG/usr/share/pixmaps/
+# For nvidia-settings GUI support
+  install -m 755 src/_out/Linux_$TARGET/libnvidia-gtk2.so $PKG/usr/lib$LIBDIRSUFFIX/libnvidia-gtk2.so.$VERSION
+  install -m 755 src/_out/Linux_$TARGET/libnvidia-gtk3.so $PKG/usr/lib$LIBDIRSUFFIX/libnvidia-gtk3.so.$VERSION
+cd -
+
+# Compiling nvidia-xconfig
+cd $TMP/nvidia-xconfig-$VERSION
+  chown -R root:root .
+  find -L . \
+   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+    -o -perm 511 \) -exec chmod 755 {} \; -o \
+   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+  CFLAGS="$SLKCFLAGS" \
+  make
+
+  install -m 755 _out/Linux_$TARGET/nvidia-xconfig $PKG/usr/bin/
+  install -m 644 _out/Linux_$TARGET/nvidia-xconfig.1.gz $PKG/usr/man/man1/
+cd -
+
+# Some optional utilities, such as laptop for possible GPU switching and
+# nvidia-modprobe needed to create device nodes, see README!
+# FIXME: Needs cleanup at a later date.
+
+# Compiling nvidia-modprobe
+  cd $TMP/nvidia-modprobe-$VERSION
+    chown -R root:root .
+    find -L . \
+     \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+      -o -perm 511 \) -exec chmod 755 {} \; -o \
+     \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+      -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+    CFLAGS="$SLKCFLAGS" make
+# must be installed suid root for nvidia-persistenced to work properly
+    install -m 4755 _out/Linux_$TARGET/nvidia-modprobe $PKG/usr/bin/
+    install -m 644 _out/Linux_$TARGET/nvidia-modprobe.1.gz $PKG/usr/man/man1/
+  cd -
+
+# These update the paths in nvidia-settings.desktop
+sed -i "s|__UTILS_PATH__|/usr/bin|" $PKG/usr/share/applications/nvidia-settings.desktop
+sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" $PKG/usr/share/applications/nvidia-settings.desktop
+sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Settings;|" $PKG/usr/share/applications/nvidia-settings.desktop
+# Remove depcrecated entry in nvidia-settings.desktop
+sed -i '/Encoding/d' $PKG/usr/share/applications/nvidia-settings.desktop
+
+# Remove xorg conf file since we handle that in nvidia-kernel
+rm -rf $PKG/etc/X11/xorg.conf.d
+
+cd $TMP/$SRCNAM
+# put docs in the right place
+mv $PKG/usr/share/man/man1/nvidia-* $PKG/usr/man/man1
+rm -rf $PKG/usr/share/man
+mv $PKG/usr/share/doc/NVIDIA_GLX-1.0 $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG/usr/share/doc
+cp -a LICENSE NVIDIA_Changelog README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+sed "s/PKGVERSION/$VERSION/g" $CWD/slack-desc > $PKG/install/slack-desc
+if [ "$COMPAT32" = "yes" ]; then
+   sed -i "s|nvidia-driver: @MULTILIB@|nvidia-driver: This package includes the 32-bit libraries.|" $PKG/install/slack-desc
+else
+   sed -i "s|nvidia-driver: @MULTILIB@|nvidia-driver:|" $PKG/install/slack-desc
+fi
+
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+# Add rc.nvidia-persistenced:
+if [ "${PERSISTENCED:-no}" = "yes" ]; then
+  cd $TMP
+  rm -rf nvidia-persistenced-$VERSION.tar.bz2
+  tar xvf $CWD/nvidia-persistenced-$VERSION.tar.bz2
+# Compiling nvidia-persistenced
+  cd $TMP/nvidia-persistenced-$VERSION
+  chown -R root:root .
+  find -L . \
+   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+    -o -perm 511 \) -exec chmod 755 {} \; -o \
+   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+    -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+  CFLAGS="$SLKCFLAGS" make
+  install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/
+  install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/
+# install rc.nvidia-perstistenced:
+  mkdir -p $PKG/etc/rc.d $PKG/var/run/nvidia-persistenced
+  install -m 755 $CWD/rc.nvidia-persistenced $PKG/etc/rc.d/rc.nvidia-persistenced
+  sed -i "s|__USER__|nvidia|" $PKG/etc/rc.d/rc.nvidia-persistenced
+  chown nvidia:nvidia $PKG/var/run/nvidia-persistenced
+fi
+
+# Flag multlib as needed and build package.
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$MULTI-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nvidia-legacy470-driver/nvidia-legacy470-driver.info b/system/nvidia-legacy470-driver/nvidia-legacy470-driver.info
new file mode 100644
index 0000000000..47823b7eb4
--- /dev/null
+++ b/system/nvidia-legacy470-driver/nvidia-legacy470-driver.info
@@ -0,0 +1,20 @@
+PRGNAM="nvidia-legacy470-driver"
+VERSION="470.239.06"
+HOMEPAGE="https://www.nvidia.com"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/470.239.06/NVIDIA-Linux-x86_64-470.239.06.run \
+                 https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.239.06.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.239.06.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.239.06.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.239.06.tar.bz2 \
+                 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.239.06.tar.bz2"
+MD5SUM_x86_64="4d007f78ef892929399aaf02152f4c38 \
+               586ae414f1479c24d1bada70d2b66dce \
+               3f5dc7b95501fe705cad6ca6cc0e3abf \
+               acf01b956ddcf46eb587bf5e23a74721 \
+               16741b7af49a2ce2f81bcb837d0f1edc \
+               4b8c7cac9d3f215d3bd9ec6388383a81"
+REQUIRES="nvidia-legacy470-kernel"
+MAINTAINER="Lenard Spencer"
+EMAIL="lenardrspencer@gmail.com"
diff --git a/system/nvidia-legacy470-driver/rc.nvidia-persistenced b/system/nvidia-legacy470-driver/rc.nvidia-persistenced
new file mode 100644
index 0000000000..59bdf18d11
--- /dev/null
+++ b/system/nvidia-legacy470-driver/rc.nvidia-persistenced
@@ -0,0 +1,61 @@
+#!/bin/sh -e
+#
+# NVIDIA Persistence Daemon Init Script
+#
+# Copyright (c) 2013 NVIDIA Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+
+NVPD=nvidia-persistenced
+NVPD_BIN=/usr/bin/${NVPD}
+NVPD_RUNTIME=/var/run/${NVPD}
+NVPD_PIDFILE=${NVPD_RUNTIME}/${NVPD}.pid
+NVPD_USER=__USER__
+
+if [ -f ${NVPD_PIDFILE} ]; then
+  read -r NVPD_PID < "${NVPD_PIDFILE}"
+  # Remove stale runtime files
+  if [ "${NVPD_PID}" ] && [ ! -d /proc/${NVPD_PID} ]; then
+    unset NVPD_PID
+    rm -rf "${NVPD_RUNTIME}"
+  fi
+fi
+
+case "${1}" in
+  start)
+      echo "Starting NVIDIA Persistence Daemon"
+
+      # Execute the daemon as the intended user
+      ${NVPD_BIN} --user ${NVPD_USER}
+      ;;
+  stop)
+      echo "Stopping NVIDIA Persistence Daemon"
+
+      # Stop the daemon - its PID should have been read in
+      [ ! -z "${NVPD_PID}" ] && kill ${NVPD_PID} &> /dev/null
+      ;;
+  restart)
+      $0 stop
+      sleep 2
+      $0 start
+      ;;
+  *) echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/system/nvidia-driver/skip_conflict-GPU_detect.patch b/system/nvidia-legacy470-driver/skip_conflict-GPU_detect.patch
index a64b671d60..a64b671d60 100644
--- a/system/nvidia-driver/skip_conflict-GPU_detect.patch
+++ b/system/nvidia-legacy470-driver/skip_conflict-GPU_detect.patch
diff --git a/system/nvidia-legacy470-driver/slack-desc b/system/nvidia-legacy470-driver/slack-desc
new file mode 100644
index 0000000000..5abffe7275
--- /dev/null
+++ b/system/nvidia-legacy470-driver/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                       |-----handy-ruler------------------------------------------------------|
+nvidia-legacy470-driver: nvidia-legacy470-driver (Proprietary Binary Nvidia Video Driver)
+nvidia-legacy470-driver:
+nvidia-legacy470-driver: This is the proprietary binary video driver from nvidia for
+nvidia-legacy470-driver: the x.org X server. This package does not include the kernel
+nvidia-legacy470-driver: module - it is included in the nvidia-kernel package.
+nvidia-legacy470-driver:
+nvidia-legacy470-driver: See /usr/doc/nvidia-legacy470-driver-PKGVERSION/README.Slackware
+nvidia-legacy470-driver: for more information.
+nvidia-legacy470-driver:
+nvidia-legacy470-driver: https://www.nvidia.com
+nvidia-legacy470-driver:
diff --git a/system/nvidia-legacy470-kernel/README b/system/nvidia-legacy470-kernel/README
new file mode 100644
index 0000000000..453a636378
--- /dev/null
+++ b/system/nvidia-legacy470-kernel/README
@@ -0,0 +1,17 @@
+This is the kernel-module needed by the proprietary binary nvidia
+driver.  You also need the nvidia-driver package from SlackBuilds.org.
+
+To build the package for a kernel different from the running one,
+start the script setting the KERNEL variable as in
+    KERNEL=4.6.3 ./nvidia-legacy470-kernel.SlackBuild
+
+A default config file is placed at 
+  /usr/share/X11/xorg.conf.d/10-nvidia.conf
+to make sure that X loads the nvidia module.  If you need to make
+changes, move that file to /etc/X11/xorg.conf.d/ and edit the copy.
+You do not need this file at all if you have a proper and complete
+xorg.conf.
+
+The xf86-video-nouveau-blacklist package from /extra is required.
+
+The Nvidia 470.xx series will be supported through December 2024.
diff --git a/system/nvidia-legacy304-kernel/doinst.sh b/system/nvidia-legacy470-kernel/doinst.sh
index dcfb80855f..dcfb80855f 100644
--- a/system/nvidia-legacy304-kernel/doinst.sh
+++ b/system/nvidia-legacy470-kernel/doinst.sh
diff --git a/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.SlackBuild b/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.SlackBuild
new file mode 100644
index 0000000000..ac68713929
--- /dev/null
+++ b/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.SlackBuild
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+# Slackware build script for nvidia-legacy470-kernel
+
+# Copyright 2007-2011 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, USA
+# Updates cpyright 2021 Lenard Spencer, Orlando, FL, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Thanks to Robby Workman for suggestions to improve this script.
+
+# see nvidia-driver/changelog.txt
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=nvidia-legacy470-kernel
+VERSION=${VERSION:-470.239.06}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+KERNEL=${KERNEL:-$(uname -r)}
+KERNELPATH=${KERNELPATH:-/lib/modules/${KERNEL}/build}
+
+set -e
+
+PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ "$ARCH" = "x86_64" ]; then
+  TARGET="x86_64"
+else
+  echo "$ARCH is not supported."
+  exit 1
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+SRCNAM=NVIDIA-Linux-$TARGET-${VERSION}
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP || exit 1
+rm -rf $SRCNAM
+sh $CWD/$SRCNAM.run --extract-only || exit 1
+cd $SRCNAM || exit 1
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+(cd kernel || exit 1
+
+  unset ARCH
+
+# CC=${CC:-gcc} suppresses an otherwise harmless "compiler mismatch"
+# message.  If you custom-build your kernel with clang,
+# then pass CC=clang to this script.
+  CC=${CC:-gcc} make SYSSRC=$KERNELPATH module || exit 1
+)
+
+mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video
+install -m 0664 kernel/nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
+install -m 0664 kernel/nvidia-modeset.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
+install -m 0664 kernel/nvidia-drm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
+install -m 0664 kernel/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
+
+mkdir -p $PKG/usr/share/X11/xorg.conf.d/
+cat $TMP/$SRCNAM/nvidia-drm-outputclass.conf > $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.info b/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.info
new file mode 100644
index 0000000000..7bde5b3a4b
--- /dev/null
+++ b/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.info
@@ -0,0 +1,10 @@
+PRGNAM="nvidia-legacy470-kernel"
+VERSION="470.239.06"
+HOMEPAGE="https://www.nvidia.com"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/470.239.06/NVIDIA-Linux-x86_64-470.239.06.run"
+MD5SUM_x86_64="4d007f78ef892929399aaf02152f4c38"
+REQUIRES=""
+MAINTAINER="Lenard Spencer"
+EMAIL="lenardrspencer@gmail.com"
diff --git a/system/nvidia-legacy470-kernel/slack-desc b/system/nvidia-legacy470-kernel/slack-desc
new file mode 100644
index 0000000000..c32b121efa
--- /dev/null
+++ b/system/nvidia-legacy470-kernel/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                       |-----handy-ruler------------------------------------------------------|
+nvidia-legacy470-kernel: nvidia-legacy470-kernel (kernel interface for the Nvidia 470 driver)
+nvidia-legacy470-kernel:
+nvidia-legacy470-kernel: This is the kernel module needed by nvidia-legacy470-driver.
+nvidia-legacy470-kernel:
+nvidia-legacy470-kernel:
+nvidia-legacy470-kernel:
+nvidia-legacy470-kernel:
+nvidia-legacy470-kernel:
+nvidia-legacy470-kernel:
+nvidia-legacy470-kernel:
+nvidia-legacy470-kernel:
diff --git a/system/nvidia-open-kernel/10-nvidia.conf b/system/nvidia-open-kernel/10-nvidia.conf
new file mode 100644
index 0000000000..cc09382e41
--- /dev/null
+++ b/system/nvidia-open-kernel/10-nvidia.conf
@@ -0,0 +1,11 @@
+# This xorg.conf.d configuration snippet configures the X server to
+# automatically load the nvidia X driver when it detects a device driven by the
+# nvidia-drm.ko kernel module.  Please note that this only works on Linux kernels
+# version 3.9 or higher with CONFIG_DRM enabled, and only if the nvidia-drm.ko
+# kernel module is loaded before the X server is started.
+
+Section "OutputClass"
+    Identifier     "nvidia"
+    MatchDriver    "nvidia-drm"
+    Driver         "nvidia"
+EndSection
diff --git a/system/nvidia-open-kernel/README b/system/nvidia-open-kernel/README
new file mode 100644
index 0000000000..8812b2ea51
--- /dev/null
+++ b/system/nvidia-open-kernel/README
@@ -0,0 +1,50 @@
+This is the open-source version of the kernel module needed by the
+proprietary binary nvidia driver.  It is provided as an alterative to
+the nvidia-kernel SBo script that builds the modules from the binary
+Nvidia package.  Note that it CANNOT be installed with the
+nvidia-kernel package, but you will still need the nvidia-driver
+package from SlackBuilds.org.
+
+To build the package for a kernel different from the running one,
+start the script setting the KERNEL variable as in
+    KERNEL=4.6.3 ./nvidia-open-kernel.SlackBuild
+
+A default config file is placed at 
+  /usr/share/X11/xorg.conf.d/10-nvidia.conf
+to make sure that X loads the nvidia module.  If you need to make
+changes, move that file to /etc/X11/xorg.conf.d/ and edit the copy.
+You do not need this file at all if you have a proper and complete
+xorg.conf.
+
+The xf86-video-nouveau-blacklist package from /extra is required.
+
+NOTES (quoted from the Nvidia driver README)
+
+"The open flavor of kernel modules supports Turing, Ampere, and
+forward.  The open kernel modules cannot support GPUs before Turing,
+because the open kernel modules depend on the GPU System Processor
+(GSP) first introduced in Turing.
+
+"Most features of the Linux GPU driver are supported with the open
+flavor of kernel modules, including CUDA, Vulkan, OpenGL, OptiX, and
+X11.  G-Sync with desktop GPUs is supported.  Suspend, Hibernate,
+and Resume power management is supported, as is Run Time D3 (RTD3) on
+Ampere and later GPUs.  However, in the current release, some display
+and graphics features (notably: SLI, G-Sync on notebooks, preserving
+video memory across power management events with
+NVreg_PreserveVideoMemoryAllocations set) and NVIDIA virtual GPU
+(vGPU), are not yet supported.  These features will be added in
+upcoming driver releases.
+
+"Use of the open kernel modules on GeForce and Workstation GPUs should
+be considered alpha-quality in this release due to the missing features
+listed above."
+
+To use this module on these GPUs, pass GEFORCE=yes to the script.
+
+PLEASE NOTE that ffmpeg hardware video encoding will NOT work with this
+module.  If you need this functionality, you MUST use the nvidia-kernel
+script which builds from the proprietary release package.
+
+After installation, you will need to reboot your computer for the
+changes to take effect.
diff --git a/system/nvidia-open-kernel/doinst.sh b/system/nvidia-open-kernel/doinst.sh
new file mode 100644
index 0000000000..dcfb80855f
--- /dev/null
+++ b/system/nvidia-open-kernel/doinst.sh
@@ -0,0 +1,3 @@
+
+chroot . /sbin/depmod -a @KERNEL@ 2>/dev/null
+
diff --git a/system/nvidia-open-kernel/geforce.conf b/system/nvidia-open-kernel/geforce.conf
new file mode 100644
index 0000000000..9753fd91b4
--- /dev/null
+++ b/system/nvidia-open-kernel/geforce.conf
@@ -0,0 +1 @@
+options nvidia NVreg_OpenRmEnableUnsupportedGpus=1
diff --git a/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild b/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild
new file mode 100644
index 0000000000..90290c7438
--- /dev/null
+++ b/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+# Slackware build script for nvidia-open-kernel
+
+# Copyright 2022 Lenard Spencer, Orlando, FL, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Thanks to Robby Workman for suggestions to improve this script.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=nvidia-open-kernel
+VERSION=${VERSION:-550.67}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+KERNEL=${KERNEL:-$(uname -r)}
+KERNELPATH=${KERNELPATH:-/lib/modules/${KERNEL}/build}
+
+set -e
+
+PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ "$ARCH" = "x86_64" ]; then
+  TARGET="x86_64"
+else
+  echo "$ARCH is not supported."
+  exit 1
+fi
+
+unset ARCH
+
+SRCNAM=NVIDIA-kernel-module-source-${VERSION}
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKGVER-$TARGET-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP || exit 1
+rm -rf $SRCNAM
+tar -xvf $CWD/$SRCNAM.tar.?z || exit 1
+cd $SRCNAM || exit 1
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# CC=${CC:-gcc} suppresses an otherwise harmless "compiler mismatch"
+# message.  If you custom-build your kernel with clang,
+# then pass CC=clang to this script.
+CC=${CC:-gcc} make SYSSRC=$KERNELPATH modules || exit 1
+
+mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video
+install -m 0664 kernel-open/nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
+install -m 0664 kernel-open/nvidia-modeset.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
+install -m 0664 kernel-open/nvidia-drm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
+install -m 0664 kernel-open/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/
+
+mkdir -p $PKG/usr/share/X11/xorg.conf.d/
+cat $CWD/10-nvidia.conf > $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER
+cp -a README.md CHANGELOG.md SECURITY.md $PKG/usr/doc/$PRGNAM-$PKGVER
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild
+
+# Geforce and workstation GPUs are not yet fully supported,
+# so we need this if you are on those GPUs:
+if [ "${GEFORCE:-no}" = "yes" ]; then
+  mkdir -p $PKG/etc/modprobe.d
+  cat $CWD/geforce.conf > $PKG/etc/modprobe.d/geforce.conf
+fi
+
+mkdir -p $PKG/install
+sed "s%@VERSION@%$VERSION%" $CWD/slack-desc > $PKG/install/slack-desc
+sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$TARGET-$BUILD$TAG.$PKGTYPE
diff --git a/system/nvidia-open-kernel/nvidia-open-kernel.info b/system/nvidia-open-kernel/nvidia-open-kernel.info
new file mode 100644
index 0000000000..17dbf177dd
--- /dev/null
+++ b/system/nvidia-open-kernel/nvidia-open-kernel.info
@@ -0,0 +1,10 @@
+PRGNAM="nvidia-open-kernel"
+VERSION="550.67"
+HOMEPAGE="https://github.com/NVIDIA/open-gpu-kernel-modules/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-550.67.tar.xz"
+MD5SUM_x86_64="044025c997205dc165e95084d40aa775"
+REQUIRES=""
+MAINTAINER="Lenard Spencer"
+EMAIL="lenardrspencer@gmail.com"
diff --git a/system/nvidia-open-kernel/slack-desc b/system/nvidia-open-kernel/slack-desc
new file mode 100644
index 0000000000..dc783a7f0f
--- /dev/null
+++ b/system/nvidia-open-kernel/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+nvidia-open-kernel: nvidia-open-kernel (Open kernel Interface for the nvidia driver)
+nvidia-open-kernel:
+nvidia-open-kernel: This is the source release of the NVIDIA Linux open GPU kernel
+nvidia-open-kernel: modules, version @VERSION@.  It is meant as an open source
+nvidia-open-kernel: alternative to the proprietary nvidia-kernel.  See README.md for
+nvidia-open-kernel: supported GPUs.
+nvidia-open-kernel: Note that it CANNOT be installed alongside the proprietary
+nvidia-open-kernel: nvidia-kernel SBo package.
+nvidia-open-kernel:
+nvidia-open-kernel: https://github.com/NVIDIA/open-gpu-kernel-modules/
+nvidia-open-kernel:
diff --git a/system/nvme-cli/README b/system/nvme-cli/README
deleted file mode 100644
index 81b59c533e..0000000000
--- a/system/nvme-cli/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The nvme-cli is a NVMe management command line interface.
-
-NVMe is a fast, scalable, direct attached storage interface, accessing
-solid state drives through PCIe.
-
-The nvme CLI contains core management tools with minimal dependencies.
diff --git a/system/nvme-cli/doinst.sh b/system/nvme-cli/doinst.sh
deleted file mode 100644
index b5a41d1d89..0000000000
--- a/system/nvme-cli/doinst.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/bash_completion.d/nvme.new
diff --git a/system/nvme-cli/nvme-cli.SlackBuild b/system/nvme-cli/nvme-cli.SlackBuild
deleted file mode 100644
index e8980f65af..0000000000
--- a/system/nvme-cli/nvme-cli.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for nvme-cli
-
-# Copyright 2017-2020, Alexander Verbovetsky, Moscow, Russia
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=nvme-cli
-VERSION=${VERSION:-1.13}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -I."
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -I."
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC -I."
-else
-  SLKCFLAGS="-O2 -I."
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" PREFIX=/usr SBINDIR=/usr/sbin
-make install CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \
-  PREFIX=/usr SBINDIR=/usr/sbin DESTDIR=$PKG
-
-rm -f $PKG/etc/nvme/*
-rm -r $PKG/etc/udev
-rm -r $PKG/usr/lib/{dracut,systemd}
-rmdir --ignore-fail-on-non-empty $PKG/usr/lib
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/etc/bash_completion.d
-mv $PKG/usr/share/bash-completion/completions/nvme $PKG/etc/bash_completion.d/nvme.new
-rmdir $PKG/usr/share/bash-completion/completions/
-rmdir $PKG/usr/share/bash-completion/
-
-mv $PKG/usr/share/man $PKG/usr/man
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/completions
-cp -a CONTRIBUTING* README* LICENSE* scripts $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a completions/{README,_nvme} $PKG/usr/doc/$PRGNAM-$VERSION/completions
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/nvme-cli/nvme-cli.info b/system/nvme-cli/nvme-cli.info
deleted file mode 100644
index b5ecb010b2..0000000000
--- a/system/nvme-cli/nvme-cli.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="nvme-cli"
-VERSION="1.13"
-HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
-DOWNLOAD="https://github.com/linux-nvme/nvme-cli/archive/v1.13/nvme-cli-1.13.tar.gz"
-MD5SUM="a9a326d481fa7bd68cb03bfc5c5e7f44"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Alexander Verbovetsky"
-EMAIL="alik@ejik.org"
diff --git a/system/nvme-cli/slack-desc b/system/nvme-cli/slack-desc
deleted file mode 100644
index 6dfba6a52b..0000000000
--- a/system/nvme-cli/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-        |-----handy-ruler------------------------------------------------------|
-nvme-cli: nvme-cli (NVMe management command line interface)
-nvme-cli:
-nvme-cli: Userspace tooling to control NVMe drives
-nvme-cli:
-nvme-cli: NVMe is a fast, scalable, direct attached storage interface,
-nvme-cli: accessing solid state drives through PCIe.
-nvme-cli:
-nvme-cli: The nvme CLI contains core management tools with minimal
-nvme-cli: dependencies.
-nvme-cli:
-nvme-cli: Homepage: https://github.com/linux-nvme/nvme-cli
diff --git a/system/nvtop/README b/system/nvtop/README
new file mode 100644
index 0000000000..b4656d22c0
--- /dev/null
+++ b/system/nvtop/README
@@ -0,0 +1,7 @@
+Nvtop
+
+Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD,
+Intel and NVIDIA GPUs. It can handle multiple GPUs and print information
+about them in a htop familiar way.
+
+Homepage: https://github.com/Syllo/nvtop
diff --git a/system/nvtop/doinst.sh b/system/nvtop/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/system/nvtop/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/system/nvtop/nvtop.SlackBuild b/system/nvtop/nvtop.SlackBuild
new file mode 100644
index 0000000000..c12cffc8ca
--- /dev/null
+++ b/system/nvtop/nvtop.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# Slackware build script for nvtop
+
+# Copyright 2023 Dustin Metcalf USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=nvtop
+VERSION=${VERSION:-3.0.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+mv $PKG/usr/share/man $PKG/usr/man
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nvtop/nvtop.info b/system/nvtop/nvtop.info
new file mode 100644
index 0000000000..ddbfcf760f
--- /dev/null
+++ b/system/nvtop/nvtop.info
@@ -0,0 +1,10 @@
+PRGNAM="nvtop"
+VERSION="3.0.2"
+HOMEPAGE="https://github.com/Syllo/nvtop"
+DOWNLOAD="https://github.com/Syllo/nvtop/archive/3.0.2/nvtop-3.0.2.tar.gz"
+MD5SUM="fdf9bc33c2240ba99cee0d726d267427"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dustin Metcalf"
+EMAIL="metcalf.nerd+SBo@gmail.com"
diff --git a/system/nvtop/slack-desc b/system/nvtop/slack-desc
new file mode 100644
index 0000000000..39f1eadc6b
--- /dev/null
+++ b/system/nvtop/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+nvtop: nvtop (Neat Videocare TOP)
+nvtop:
+nvtop: Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for
+nvtop: AMD,Intel and NVIDIA GPUs. It can handle multiple GPUs and print
+nvtop: information about them in a htop familiar way.
+nvtop:
+nvtop: Homepage: https://github.com/Syllo/nvtop
+nvtop:
+nvtop:
+nvtop:
+nvtop:
diff --git a/system/nwipe/README b/system/nwipe/README
new file mode 100644
index 0000000000..8faf10c22c
--- /dev/null
+++ b/system/nwipe/README
@@ -0,0 +1,20 @@
+nwipe is a fork of the dwipe command originally used by Darik's Boot
+and Nuke (DBAN). nwipe was created out of a need to run the DBAN dwipe
+command outside of DBAN, in order to allow its use with any host
+distribution, thus giving better hardware support.
+
+nwipe is a program that will securely erase the entire contents of
+disks. It can wipe a single drive or multiple disks simultaneously.
+It can operate as both a command line tool without a GUI or with a
+ncurses GUI.
+
+The user can select from a variety of recognised secure erase methods:
+
+- Fill With Zeros
+- Fill With Ones
+- RCMP TSSIT OPS-II
+- DoD Short
+- DoD 5220.22M
+- Gutmann Wipe
+- PRNG Stream
+- HMG IS5 enhanced
diff --git a/system/nwipe/nwipe.SlackBuild b/system/nwipe/nwipe.SlackBuild
new file mode 100644
index 0000000000..59dc6d2f4f
--- /dev/null
+++ b/system/nwipe/nwipe.SlackBuild
@@ -0,0 +1,118 @@
+#!/bin/bash
+
+# Slackware build script for nwipe
+
+# Copyright 2022 Michael Edie Tampa, FL, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=nwipe	
+VERSION=${VERSION:-0.34}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}	
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+DOCS="CHANGELOG.md COPYING README.md"
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+if [ ! -x configure ]; then
+  if [ -x autogen.sh ]; then
+    ./autogen.sh
+  fi
+fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  $DOCS \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nwipe/nwipe.info b/system/nwipe/nwipe.info
new file mode 100644
index 0000000000..abde55e9b1
--- /dev/null
+++ b/system/nwipe/nwipe.info
@@ -0,0 +1,10 @@
+PRGNAM="nwipe"
+VERSION="0.34"
+HOMEPAGE="https://github.com/martijnvanbrummelen/nwipe"
+DOWNLOAD="https://github.com/martijnvanbrummelen/nwipe/archive/v0.34/nwipe-0.34.tar.gz"
+MD5SUM="e8fd0601247499a0ececf28fb1575434"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Michael Edie"
+EMAIL="michael@sawbox.net"
diff --git a/system/nwipe/slack-desc b/system/nwipe/slack-desc
new file mode 100644
index 0000000000..1666e9df6e
--- /dev/null
+++ b/system/nwipe/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+nwipe: nwipe (secure disk eraser)
+nwipe:
+nwipe: nwipe is a fork of the dwipe that will securely erase the
+nwipe: entire contents of disks. It can wipe a single drive or 
+nwipe: multiple disks simultaneously. It can operate as both a 
+nwipe: command line tool without a GUI or with a ncurses GUI.
+nwipe:
+nwipe: Git Repo: https://github.com/martijnvanbrummelen/nwipe
+nwipe:
+nwipe:
+nwipe:
diff --git a/system/ocfs2-tools/ocfs2-tools.SlackBuild b/system/ocfs2-tools/ocfs2-tools.SlackBuild
index b0db7d0ce9..5a7168f481 100644
--- a/system/ocfs2-tools/ocfs2-tools.SlackBuild
+++ b/system/ocfs2-tools/ocfs2-tools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ocfs2-tools
 
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org: use correct github download URL,
+# and update for v1.8.7 as the old version doesn't support 15.0's kernel.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ocfs2-tools
-VERSION=${VERSION:-1.8.5}
+VERSION=${VERSION:-1.8.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,14 +77,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-{$VERSION,$PRGNAM-$VERSION}
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION || cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -132,4 +142,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ocfs2-tools/ocfs2-tools.info b/system/ocfs2-tools/ocfs2-tools.info
index fc59cc59a6..e5907d2d28 100644
--- a/system/ocfs2-tools/ocfs2-tools.info
+++ b/system/ocfs2-tools/ocfs2-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="ocfs2-tools"
-VERSION="1.8.5"
+VERSION="1.8.7"
 HOMEPAGE="https://github.com/markfasheh/ocfs2-tools/"
-DOWNLOAD="https://github.com/markfasheh/ocfs2-tools/archive/ocfs2-tools-1.8.5.tar.gz"
-MD5SUM="d6d76da6006e28272a223065a7802798"
+DOWNLOAD="https://github.com/markfasheh/ocfs2-tools/archive/ocfs2-tools-1.8.7/ocfs2-tools-ocfs2-tools-1.8.7.tar.gz"
+MD5SUM="c4a155e7f844d38d3d08438eb9997d7f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ohmyalias/ohmyalias.SlackBuild b/system/ohmyalias/ohmyalias.SlackBuild
index e3e6592f8c..b8aee9e68b 100644
--- a/system/ohmyalias/ohmyalias.SlackBuild
+++ b/system/ohmyalias/ohmyalias.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ohmyalias
 # Copyright 2018 Jefferson Rocha 'slackjeff' <lrcjefferson@gmail.com>
@@ -21,14 +21,24 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ohmyalias
 VERSION=${VERSION:-1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -58,4 +68,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ohmyalias/ohmyalias.info b/system/ohmyalias/ohmyalias.info
index 22286f29d6..c59f159b37 100644
--- a/system/ohmyalias/ohmyalias.info
+++ b/system/ohmyalias/ohmyalias.info
@@ -1,7 +1,7 @@
 PRGNAM="ohmyalias"
 VERSION="1.1"
 HOMEPAGE="https://notabug.org/jeffersonrocha/Oh_My_Alias"
-DOWNLOAD="https://notabug.org/jeffersonrocha/Oh_My_Alias/raw/master/ohmyalias-1.1.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/ohmyalias-1.1.tar.xz"
 MD5SUM="00de518710afd465476428cb230575e4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/ohsnap/README b/system/ohsnap/README
index 351676e585..a0c908ea77 100644
--- a/system/ohsnap/README
+++ b/system/ohsnap/README
@@ -1 +1,2 @@
-Monospaced font based on Artwiz Snap with bold and versions with status icons.
+Monospaced font based on Artwiz Snap with bold and versions with
+status icons.
diff --git a/system/ohsnap/ohsnap.SlackBuild b/system/ohsnap/ohsnap.SlackBuild
index ecae1f630b..dfe15f4cf5 100644
--- a/system/ohsnap/ohsnap.SlackBuild
+++ b/system/ohsnap/ohsnap.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware package build script for ohsnap
 
@@ -7,13 +7,23 @@
 # Redistribution and use with or without modification are permitted.
 # There is ABSOLUTELY NO WARRANTY, express or implied.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ohsnap
 VERSION=${VERSION:-1.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,4 +57,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/oksh/oksh.SlackBuild b/system/oksh/oksh.SlackBuild
index b1b8988316..fb15c641b5 100644
--- a/system/oksh/oksh.SlackBuild
+++ b/system/oksh/oksh.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for oksh
 
 # Copyright 2019-2020 Hunter Sezen California, USA
+# Copyright 2023-2024 Samuel Young, MO, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=oksh
-VERSION=${VERSION:-6.8.1}
+VERSION=${VERSION:-7.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,23 +39,23 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -eu
@@ -97,4 +101,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/oksh/oksh.info b/system/oksh/oksh.info
index ca37cc9ba1..5efb227e1a 100644
--- a/system/oksh/oksh.info
+++ b/system/oksh/oksh.info
@@ -1,10 +1,10 @@
 PRGNAM="oksh"
-VERSION="6.8.1"
+VERSION="7.5"
 HOMEPAGE="https://github.com/ibara/oksh"
-DOWNLOAD="https://github.com/ibara/oksh/releases/download/oksh-6.8.1/oksh-6.8.1.tar.gz"
-MD5SUM="ce8b7c278e6d36bbbd7b54c218fae7ba"
+DOWNLOAD="https://github.com/ibara/oksh/releases/download/oksh-7.5/oksh-7.5.tar.gz"
+MD5SUM="f84ca2cfa0211eaa981fe198fd2db538"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="Samuel Young"
+EMAIL="samyoung12788@gmail.com"
diff --git a/system/oldschool-pc-fonts/doinst.sh b/system/oldschool-pc-fonts/doinst.sh
index 4d463758c8..7e3c5f0234 100644
--- a/system/oldschool-pc-fonts/doinst.sh
+++ b/system/oldschool-pc-fonts/doinst.sh
@@ -9,6 +9,9 @@ if [ -x /usr/bin/mkfontdir  -a -x /usr/bin/mkfontscale ]; then
     /usr/bin/mkfontdir .
   )
 fi
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
 if [ -x /usr/bin/fc-cache ]; then
   /usr/bin/fc-cache -f
 fi
diff --git a/system/oldschool-pc-fonts/oldschool-pc-fonts.SlackBuild b/system/oldschool-pc-fonts/oldschool-pc-fonts.SlackBuild
index 0cf5777b79..bf44c7de08 100644
--- a/system/oldschool-pc-fonts/oldschool-pc-fonts.SlackBuild
+++ b/system/oldschool-pc-fonts/oldschool-pc-fonts.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for oldschool-pc-fonts
 
@@ -22,7 +22,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Now maintained by B. Watson <yalhcru@gmail.com>
+# Now maintained by B. Watson <urchlay@slackware.uk>
+
+# 20230307 bkw: BUILD=2, add douninst.sh.
 
 # 20201207 bkw:
 # - Update for v2.2. Enough changes that we can't build the old version with
@@ -38,14 +40,21 @@
 # - Add variables TTF and CONSOLE to control which fonts are installed.
 # - A bit of useful documentation in README_console.txt.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=oldschool-pc-fonts
 VERSION=${VERSION:-2.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -131,7 +140,8 @@ sed "s,@TYPE@,$TYPE," $CWD/slack-desc > $PKG/install/slack-desc
 # actually included.
 if [ "$TTF" = "yes" ]; then
   cat $CWD/doinst.sh > $PKG/install/doinst.sh
+  cp $PKG/install/doinst.sh $PKG/install/douninst.sh
 fi
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/oldschool-pc-fonts/oldschool-pc-fonts.info b/system/oldschool-pc-fonts/oldschool-pc-fonts.info
index 50cb1c1984..1024d84c49 100644
--- a/system/oldschool-pc-fonts/oldschool-pc-fonts.info
+++ b/system/oldschool-pc-fonts/oldschool-pc-fonts.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/omnidb-app/omnidb-app.SlackBuild b/system/omnidb-app/omnidb-app.SlackBuild
index e2e59debad..d8a16c514c 100644
--- a/system/omnidb-app/omnidb-app.SlackBuild
+++ b/system/omnidb-app/omnidb-app.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for omnidb-app
 #
@@ -26,10 +26,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=omnidb-app
 VERSION=${VERSION:-2.17.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -39,7 +42,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -86,4 +96,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/omnidb-app/omnidb-app.info b/system/omnidb-app/omnidb-app.info
index 35f425e091..62ac679420 100644
--- a/system/omnidb-app/omnidb-app.info
+++ b/system/omnidb-app/omnidb-app.info
@@ -3,7 +3,7 @@ VERSION="2.17.0"
 HOMEPAGE="https://omnidb.org/en/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://omnidb.org/dist/2.17.0/omnidb-app_2.17.0-debian-amd64.deb"
+DOWNLOAD_x86_64="https://downloads.sourceforge.net/project/omnidb.mirror/2.17.0/omnidb-app_2.17.0-debian-amd64.deb"
 MD5SUM_x86_64="1e73923ad22c02d58c5a66207cc2e69d"
 REQUIRES=""
 MAINTAINER="Gabriel Diniz Gisoldo"
diff --git a/system/onefetch/README b/system/onefetch/README
new file mode 100644
index 0000000000..b0f671cec6
--- /dev/null
+++ b/system/onefetch/README
@@ -0,0 +1,5 @@
+onefetch (command line Git information tool)
+
+Onefetch is a neofetch-style command line Git information tool that
+displays project information and code statistics for a local Git
+repository. The tool is offline - no network access is required.
diff --git a/system/onefetch/onefetch-misc-2.20.0.tar b/system/onefetch/onefetch-misc-2.20.0.tar
new file mode 100644
index 0000000000..54b3c948e5
--- /dev/null
+++ b/system/onefetch/onefetch-misc-2.20.0.tar
diff --git a/system/onefetch/onefetch.SlackBuild b/system/onefetch/onefetch.SlackBuild
new file mode 100644
index 0000000000..413c9f57ea
--- /dev/null
+++ b/system/onefetch/onefetch.SlackBuild
@@ -0,0 +1,191 @@
+#!/bin/bash
+
+# Slackware build script for onefetch
+
+# Copyright 2023-2024 K. Eugene Carlson  Tsukuba, Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=onefetch
+VERSION=${VERSION:-2.20.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+
+  if [ "$ARCH" = "i586" ]; then
+    if rustc -Vv | grep host | grep i686 > /dev/null ; then
+      ARCH=i686
+    fi
+  fi
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  CARGOTARGET="--target i586-unknown-linux-gnu"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  CARGOTARGET="--target i686-unknown-linux-gnu"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  CARGOTARGET="--target x86_64-unknown-linux-gnu"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  CARGOTARGET=""
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+mkdir misc
+cd misc
+tar xvf $CWD/$PRGNAM-misc-$VERSION.tar
+cd ..
+
+# build offline
+# configuration tells cargo to use the configured directory
+# for dependencies instead of downloading from crates.io
+cat << EOF >> .cargo/config
+[source.crates-io]
+registry = 'https://github.com/rust-lang/crates.io-index'
+replace-with = 'vendored-sources'
+
+[source.vendored-sources]
+directory = '$(pwd)/vendor'
+EOF
+
+# deps and versions come from Cargo.lock
+mkdir vendor
+(
+  cd vendor
+
+  grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
+    sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
+    awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \
+    grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do
+
+    ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
+    dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
+
+    tar xvf $CWD/$dep-$ver.crate
+
+    touch $dep-$ver/.cargo-ok
+
+    # generate checksum
+    {
+      printf "{\n"
+      printf '    "files": {\n'
+
+      (
+        cd $dep-$ver
+        find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/'
+      ) | sed '$ s/,$//'
+
+      printf "    },\n"
+      printf '    "package": "'
+
+      sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
+
+      printf "}\n"
+    } > $dep-$ver/.cargo-checksum.json
+  done
+)
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
+CARGO_HOME=.cargo \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+cargo build --release $CARGOTARGET
+
+mkdir -p $PKG/usr/bin
+find target -name $PRGNAM -exec install -m 755 {} $PKG/usr/bin \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/man/man1
+install -m 644 docs/$PRGNAM.1 $PKG/usr/man/man1
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.md README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Completions
+mkdir -p $PKG/usr/share/bash-completion/completions
+install -m 644 misc/$PRGNAM.bash $PKG/usr/share/bash-completion/completions
+mkdir -p $PKG/usr/share/zsh/site-functions
+install -m 644 misc/_$PRGNAM $PKG/usr/share/zsh/site-functions
+# Only install the fish completions if fish is installed.
+if [ -x /usr/bin/fish ]; then
+  mkdir -p $PKG/usr/share/fish/vendor_completions.d
+  install -m 644 misc/$PRGNAM.fish $PKG/usr/share/fish/vendor_completions.d
+fi
+# Keep files for fish, PowerShell and Elvish completions in the doc directory.
+install -m 644 misc/$PRGNAM.fish $PKG/usr/doc/$PRGNAM-$VERSION
+install -m 644 misc/_$PRGNAM.ps1 $PKG/usr/doc/$PRGNAM-$VERSION
+install -m 644 misc/$PRGNAM.elv $PKG/usr/doc/$PRGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/onefetch/onefetch.info b/system/onefetch/onefetch.info
new file mode 100644
index 0000000000..7f07c5ee44
--- /dev/null
+++ b/system/onefetch/onefetch.info
@@ -0,0 +1,926 @@
+PRGNAM="onefetch"
+VERSION="2.20.0"
+HOMEPAGE="https://github.com/o2sh/onefetch"
+DOWNLOAD="https://github.com/o2sh/onefetch/archive/2.20.0/onefetch-2.20.0.tar.gz \
+          https://static.crates.io/crates/addr2line/addr2line-0.19.0.crate \
+          https://static.crates.io/crates/adler/adler-1.0.2.crate \
+          https://static.crates.io/crates/ahash/ahash-0.7.7.crate \
+          https://static.crates.io/crates/ahash/ahash-0.8.7.crate \
+          https://static.crates.io/crates/aho-corasick/aho-corasick-0.7.20.crate \
+          https://static.crates.io/crates/aho-corasick/aho-corasick-1.1.2.crate \
+          https://static.crates.io/crates/allocator-api2/allocator-api2-0.2.16.crate \
+          https://static.crates.io/crates/android-tzdata/android-tzdata-0.1.1.crate \
+          https://static.crates.io/crates/android_system_properties/android_system_properties-0.1.5.crate \
+          https://static.crates.io/crates/anes/anes-0.1.6.crate \
+          https://static.crates.io/crates/ansi_term/ansi_term-0.12.1.crate \
+          https://static.crates.io/crates/anstream/anstream-0.6.11.crate \
+          https://static.crates.io/crates/anstyle/anstyle-1.0.1.crate \
+          https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.1.crate \
+          https://static.crates.io/crates/anstyle-query/anstyle-query-1.0.0.crate \
+          https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-3.0.1.crate \
+          https://static.crates.io/crates/anyhow/anyhow-1.0.75.crate \
+          https://static.crates.io/crates/arc-swap/arc-swap-1.6.0.crate \
+          https://static.crates.io/crates/arrayvec/arrayvec-0.7.4.crate \
+          https://static.crates.io/crates/askalono/askalono-0.4.6.crate \
+          https://static.crates.io/crates/atty/atty-0.2.14.crate \
+          https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \
+          https://static.crates.io/crates/backtrace/backtrace-0.3.67.crate \
+          https://static.crates.io/crates/base64/base64-0.22.0.crate \
+          https://static.crates.io/crates/bit_field/bit_field-0.10.2.crate \
+          https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \
+          https://static.crates.io/crates/bitflags/bitflags-2.4.1.crate \
+          https://static.crates.io/crates/bitvec/bitvec-1.0.1.crate \
+          https://static.crates.io/crates/block-buffer/block-buffer-0.10.4.crate \
+          https://static.crates.io/crates/borsh/borsh-1.3.0.crate \
+          https://static.crates.io/crates/borsh-derive/borsh-derive-1.3.0.crate \
+          https://static.crates.io/crates/bstr/bstr-1.8.0.crate \
+          https://static.crates.io/crates/btoi/btoi-0.4.3.crate \
+          https://static.crates.io/crates/bumpalo/bumpalo-3.13.0.crate \
+          https://static.crates.io/crates/byte-unit/byte-unit-5.1.2.crate \
+          https://static.crates.io/crates/bytecheck/bytecheck-0.6.11.crate \
+          https://static.crates.io/crates/bytecheck_derive/bytecheck_derive-0.6.11.crate \
+          https://static.crates.io/crates/bytecount/bytecount-0.6.7.crate \
+          https://static.crates.io/crates/bytemuck/bytemuck-1.13.1.crate \
+          https://static.crates.io/crates/byteorder/byteorder-1.4.3.crate \
+          https://static.crates.io/crates/bytes/bytes-1.5.0.crate \
+          https://static.crates.io/crates/byteyarn/byteyarn-0.2.3.crate \
+          https://static.crates.io/crates/cargo_toml/cargo_toml-0.19.1.crate \
+          https://static.crates.io/crates/cast/cast-0.3.0.crate \
+          https://static.crates.io/crates/cc/cc-1.0.79.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://static.crates.io/crates/cfg_aliases/cfg_aliases-0.1.1.crate \
+          https://static.crates.io/crates/chrono/chrono-0.4.26.crate \
+          https://static.crates.io/crates/chrono-tz/chrono-tz-0.8.3.crate \
+          https://static.crates.io/crates/chrono-tz-build/chrono-tz-build-0.2.0.crate \
+          https://static.crates.io/crates/ciborium/ciborium-0.2.1.crate \
+          https://static.crates.io/crates/ciborium-io/ciborium-io-0.2.1.crate \
+          https://static.crates.io/crates/ciborium-ll/ciborium-ll-0.2.1.crate \
+          https://static.crates.io/crates/clap/clap-2.34.0.crate \
+          https://static.crates.io/crates/clap/clap-4.5.3.crate \
+          https://static.crates.io/crates/clap_builder/clap_builder-4.5.2.crate \
+          https://static.crates.io/crates/clap_complete/clap_complete-4.5.1.crate \
+          https://static.crates.io/crates/clap_derive/clap_derive-4.5.3.crate \
+          https://static.crates.io/crates/clap_lex/clap_lex-0.7.0.crate \
+          https://static.crates.io/crates/clru/clru-0.6.1.crate \
+          https://static.crates.io/crates/cmake/cmake-0.1.50.crate \
+          https://static.crates.io/crates/color_quant/color_quant-1.1.0.crate \
+          https://static.crates.io/crates/colorchoice/colorchoice-1.0.0.crate \
+          https://static.crates.io/crates/console/console-0.15.7.crate \
+          https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.4.crate \
+          https://static.crates.io/crates/cpufeatures/cpufeatures-0.2.8.crate \
+          https://static.crates.io/crates/crc/crc-3.0.1.crate \
+          https://static.crates.io/crates/crc-catalog/crc-catalog-2.2.0.crate \
+          https://static.crates.io/crates/crc32fast/crc32fast-1.3.2.crate \
+          https://static.crates.io/crates/criterion/criterion-0.5.1.crate \
+          https://static.crates.io/crates/criterion-plot/criterion-plot-0.5.0.crate \
+          https://static.crates.io/crates/crossbeam/crossbeam-0.8.2.crate \
+          https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.9.crate \
+          https://static.crates.io/crates/crossbeam-deque/crossbeam-deque-0.8.3.crate \
+          https://static.crates.io/crates/crossbeam-epoch/crossbeam-epoch-0.9.15.crate \
+          https://static.crates.io/crates/crossbeam-queue/crossbeam-queue-0.3.8.crate \
+          https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.17.crate \
+          https://static.crates.io/crates/crunchy/crunchy-0.2.2.crate \
+          https://static.crates.io/crates/crypto-common/crypto-common-0.1.6.crate \
+          https://static.crates.io/crates/dashmap/dashmap-4.0.2.crate \
+          https://static.crates.io/crates/dashmap/dashmap-5.5.3.crate \
+          https://static.crates.io/crates/deranged/deranged-0.3.9.crate \
+          https://static.crates.io/crates/deunicode/deunicode-0.4.3.crate \
+          https://static.crates.io/crates/diff/diff-0.1.13.crate \
+          https://static.crates.io/crates/digest/digest-0.10.7.crate \
+          https://static.crates.io/crates/dirs/dirs-3.0.2.crate \
+          https://static.crates.io/crates/dirs-sys/dirs-sys-0.3.7.crate \
+          https://static.crates.io/crates/dunce/dunce-1.0.4.crate \
+          https://static.crates.io/crates/either/either-1.8.1.crate \
+          https://static.crates.io/crates/enable-ansi-support/enable-ansi-support-0.2.1.crate \
+          https://static.crates.io/crates/encode_unicode/encode_unicode-0.3.6.crate \
+          https://static.crates.io/crates/encoding_rs/encoding_rs-0.8.32.crate \
+          https://static.crates.io/crates/encoding_rs_io/encoding_rs_io-0.1.7.crate \
+          https://static.crates.io/crates/env_logger/env_logger-0.8.4.crate \
+          https://static.crates.io/crates/equivalent/equivalent-1.0.0.crate \
+          https://static.crates.io/crates/erased-serde/erased-serde-0.4.0.crate \
+          https://static.crates.io/crates/errno/errno-0.3.8.crate \
+          https://static.crates.io/crates/exr/exr-1.6.4.crate \
+          https://static.crates.io/crates/faster-hex/faster-hex-0.9.0.crate \
+          https://static.crates.io/crates/fastrand/fastrand-2.0.1.crate \
+          https://static.crates.io/crates/fdeflate/fdeflate-0.3.0.crate \
+          https://static.crates.io/crates/filetime/filetime-0.2.21.crate \
+          https://static.crates.io/crates/flate2/flate2-1.0.26.crate \
+          https://static.crates.io/crates/flume/flume-0.10.14.crate \
+          https://static.crates.io/crates/fnv/fnv-1.0.7.crate \
+          https://static.crates.io/crates/form_urlencoded/form_urlencoded-1.2.1.crate \
+          https://static.crates.io/crates/fs_extra/fs_extra-1.3.0.crate \
+          https://static.crates.io/crates/funty/funty-2.0.0.crate \
+          https://static.crates.io/crates/futures/futures-0.3.28.crate \
+          https://static.crates.io/crates/futures-channel/futures-channel-0.3.28.crate \
+          https://static.crates.io/crates/futures-core/futures-core-0.3.28.crate \
+          https://static.crates.io/crates/futures-executor/futures-executor-0.3.28.crate \
+          https://static.crates.io/crates/futures-io/futures-io-0.3.28.crate \
+          https://static.crates.io/crates/futures-macro/futures-macro-0.3.28.crate \
+          https://static.crates.io/crates/futures-sink/futures-sink-0.3.28.crate \
+          https://static.crates.io/crates/futures-task/futures-task-0.3.28.crate \
+          https://static.crates.io/crates/futures-timer/futures-timer-3.0.2.crate \
+          https://static.crates.io/crates/futures-util/futures-util-0.3.28.crate \
+          https://static.crates.io/crates/generic-array/generic-array-0.14.7.crate \
+          https://static.crates.io/crates/getrandom/getrandom-0.2.10.crate \
+          https://static.crates.io/crates/gif/gif-0.13.1.crate \
+          https://static.crates.io/crates/gimli/gimli-0.27.3.crate \
+          https://static.crates.io/crates/gix/gix-0.60.0.crate \
+          https://static.crates.io/crates/gix-actor/gix-actor-0.27.0.crate \
+          https://static.crates.io/crates/gix-actor/gix-actor-0.28.1.crate \
+          https://static.crates.io/crates/gix-actor/gix-actor-0.31.0.crate \
+          https://static.crates.io/crates/gix-attributes/gix-attributes-0.19.0.crate \
+          https://static.crates.io/crates/gix-attributes/gix-attributes-0.22.2.crate \
+          https://static.crates.io/crates/gix-bitmap/gix-bitmap-0.2.11.crate \
+          https://static.crates.io/crates/gix-chunk/gix-chunk-0.4.8.crate \
+          https://static.crates.io/crates/gix-command/gix-command-0.3.6.crate \
+          https://static.crates.io/crates/gix-commitgraph/gix-commitgraph-0.21.0.crate \
+          https://static.crates.io/crates/gix-commitgraph/gix-commitgraph-0.24.2.crate \
+          https://static.crates.io/crates/gix-config/gix-config-0.36.0.crate \
+          https://static.crates.io/crates/gix-config-value/gix-config-value-0.14.6.crate \
+          https://static.crates.io/crates/gix-date/gix-date-0.8.5.crate \
+          https://static.crates.io/crates/gix-diff/gix-diff-0.42.0.crate \
+          https://static.crates.io/crates/gix-dir/gix-dir-0.2.0.crate \
+          https://static.crates.io/crates/gix-discover/gix-discover-0.26.0.crate \
+          https://static.crates.io/crates/gix-discover/gix-discover-0.31.0.crate \
+          https://static.crates.io/crates/gix-features/gix-features-0.35.0.crate \
+          https://static.crates.io/crates/gix-features/gix-features-0.36.1.crate \
+          https://static.crates.io/crates/gix-features/gix-features-0.38.1.crate \
+          https://static.crates.io/crates/gix-filter/gix-filter-0.11.0.crate \
+          https://static.crates.io/crates/gix-fs/gix-fs-0.7.0.crate \
+          https://static.crates.io/crates/gix-fs/gix-fs-0.8.1.crate \
+          https://static.crates.io/crates/gix-fs/gix-fs-0.10.1.crate \
+          https://static.crates.io/crates/gix-glob/gix-glob-0.13.0.crate \
+          https://static.crates.io/crates/gix-glob/gix-glob-0.16.2.crate \
+          https://static.crates.io/crates/gix-hash/gix-hash-0.13.3.crate \
+          https://static.crates.io/crates/gix-hash/gix-hash-0.14.2.crate \
+          https://static.crates.io/crates/gix-hashtable/gix-hashtable-0.4.1.crate \
+          https://static.crates.io/crates/gix-hashtable/gix-hashtable-0.5.2.crate \
+          https://static.crates.io/crates/gix-ignore/gix-ignore-0.8.0.crate \
+          https://static.crates.io/crates/gix-ignore/gix-ignore-0.11.2.crate \
+          https://static.crates.io/crates/gix-index/gix-index-0.25.0.crate \
+          https://static.crates.io/crates/gix-index/gix-index-0.31.0.crate \
+          https://static.crates.io/crates/gix-lock/gix-lock-10.0.0.crate \
+          https://static.crates.io/crates/gix-lock/gix-lock-11.0.1.crate \
+          https://static.crates.io/crates/gix-lock/gix-lock-13.1.1.crate \
+          https://static.crates.io/crates/gix-macros/gix-macros-0.1.4.crate \
+          https://static.crates.io/crates/gix-mailmap/gix-mailmap-0.23.0.crate \
+          https://static.crates.io/crates/gix-object/gix-object-0.37.0.crate \
+          https://static.crates.io/crates/gix-object/gix-object-0.38.0.crate \
+          https://static.crates.io/crates/gix-object/gix-object-0.42.0.crate \
+          https://static.crates.io/crates/gix-odb/gix-odb-0.59.0.crate \
+          https://static.crates.io/crates/gix-pack/gix-pack-0.49.0.crate \
+          https://static.crates.io/crates/gix-packetline-blocking/gix-packetline-blocking-0.17.3.crate \
+          https://static.crates.io/crates/gix-path/gix-path-0.10.7.crate \
+          https://static.crates.io/crates/gix-pathspec/gix-pathspec-0.7.1.crate \
+          https://static.crates.io/crates/gix-quote/gix-quote-0.4.12.crate \
+          https://static.crates.io/crates/gix-ref/gix-ref-0.38.0.crate \
+          https://static.crates.io/crates/gix-ref/gix-ref-0.43.0.crate \
+          https://static.crates.io/crates/gix-refspec/gix-refspec-0.23.0.crate \
+          https://static.crates.io/crates/gix-revision/gix-revision-0.27.0.crate \
+          https://static.crates.io/crates/gix-revwalk/gix-revwalk-0.8.0.crate \
+          https://static.crates.io/crates/gix-revwalk/gix-revwalk-0.13.0.crate \
+          https://static.crates.io/crates/gix-sec/gix-sec-0.10.6.crate \
+          https://static.crates.io/crates/gix-status/gix-status-0.7.0.crate \
+          https://static.crates.io/crates/gix-submodule/gix-submodule-0.10.0.crate \
+          https://static.crates.io/crates/gix-tempfile/gix-tempfile-10.0.0.crate \
+          https://static.crates.io/crates/gix-tempfile/gix-tempfile-11.0.1.crate \
+          https://static.crates.io/crates/gix-tempfile/gix-tempfile-13.1.1.crate \
+          https://static.crates.io/crates/gix-testtools/gix-testtools-0.13.0.crate \
+          https://static.crates.io/crates/gix-trace/gix-trace-0.1.8.crate \
+          https://static.crates.io/crates/gix-traverse/gix-traverse-0.33.0.crate \
+          https://static.crates.io/crates/gix-traverse/gix-traverse-0.38.0.crate \
+          https://static.crates.io/crates/gix-url/gix-url-0.27.2.crate \
+          https://static.crates.io/crates/gix-utils/gix-utils-0.1.11.crate \
+          https://static.crates.io/crates/gix-validate/gix-validate-0.8.4.crate \
+          https://static.crates.io/crates/gix-worktree/gix-worktree-0.26.0.crate \
+          https://static.crates.io/crates/gix-worktree/gix-worktree-0.32.0.crate \
+          https://static.crates.io/crates/glob/glob-0.3.1.crate \
+          https://static.crates.io/crates/globset/globset-0.4.14.crate \
+          https://static.crates.io/crates/globwalk/globwalk-0.8.1.crate \
+          https://static.crates.io/crates/grep-matcher/grep-matcher-0.1.6.crate \
+          https://static.crates.io/crates/grep-searcher/grep-searcher-0.1.11.crate \
+          https://static.crates.io/crates/half/half-1.8.2.crate \
+          https://static.crates.io/crates/half/half-2.3.1.crate \
+          https://static.crates.io/crates/hashbrown/hashbrown-0.12.3.crate \
+          https://static.crates.io/crates/hashbrown/hashbrown-0.14.3.crate \
+          https://static.crates.io/crates/heck/heck-0.4.1.crate \
+          https://static.crates.io/crates/heck/heck-0.5.0.crate \
+          https://static.crates.io/crates/hermit-abi/hermit-abi-0.1.19.crate \
+          https://static.crates.io/crates/hermit-abi/hermit-abi-0.3.1.crate \
+          https://static.crates.io/crates/home/home-0.5.5.crate \
+          https://static.crates.io/crates/human-panic/human-panic-1.2.1.crate \
+          https://static.crates.io/crates/humansize/humansize-2.1.3.crate \
+          https://static.crates.io/crates/humantime/humantime-2.1.0.crate \
+          https://static.crates.io/crates/iana-time-zone/iana-time-zone-0.1.57.crate \
+          https://static.crates.io/crates/iana-time-zone-haiku/iana-time-zone-haiku-0.1.2.crate \
+          https://static.crates.io/crates/idna/idna-0.5.0.crate \
+          https://static.crates.io/crates/ignore/ignore-0.4.20.crate \
+          https://static.crates.io/crates/image/image-0.24.9.crate \
+          https://static.crates.io/crates/imara-diff/imara-diff-0.1.5.crate \
+          https://static.crates.io/crates/indexmap/indexmap-2.0.0.crate \
+          https://static.crates.io/crates/insta/insta-1.34.0.crate \
+          https://static.crates.io/crates/instant/instant-0.1.12.crate \
+          https://static.crates.io/crates/inventory/inventory-0.3.11.crate \
+          https://static.crates.io/crates/io-close/io-close-0.3.7.crate \
+          https://static.crates.io/crates/io-lifetimes/io-lifetimes-1.0.11.crate \
+          https://static.crates.io/crates/is-terminal/is-terminal-0.4.7.crate \
+          https://static.crates.io/crates/is_ci/is_ci-1.1.1.crate \
+          https://static.crates.io/crates/itertools/itertools-0.10.5.crate \
+          https://static.crates.io/crates/itoa/itoa-1.0.6.crate \
+          https://static.crates.io/crates/jobserver/jobserver-0.1.26.crate \
+          https://static.crates.io/crates/jpeg-decoder/jpeg-decoder-0.3.0.crate \
+          https://static.crates.io/crates/js-sys/js-sys-0.3.64.crate \
+          https://static.crates.io/crates/jwalk/jwalk-0.8.1.crate \
+          https://static.crates.io/crates/kstring/kstring-2.0.0.crate \
+          https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \
+          https://static.crates.io/crates/lebe/lebe-0.5.2.crate \
+          https://static.crates.io/crates/libc/libc-0.2.153.crate \
+          https://static.crates.io/crates/libm/libm-0.2.7.crate \
+          https://static.crates.io/crates/libz-ng-sys/libz-ng-sys-1.1.9.crate \
+          https://static.crates.io/crates/linked-hash-map/linked-hash-map-0.5.6.crate \
+          https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.3.8.crate \
+          https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.12.crate \
+          https://static.crates.io/crates/lock_api/lock_api-0.4.10.crate \
+          https://static.crates.io/crates/log/log-0.4.20.crate \
+          https://static.crates.io/crates/lzma-sys/lzma-sys-0.1.20.crate \
+          https://static.crates.io/crates/memchr/memchr-2.6.3.crate \
+          https://static.crates.io/crates/memmap2/memmap2-0.5.10.crate \
+          https://static.crates.io/crates/memmap2/memmap2-0.7.1.crate \
+          https://static.crates.io/crates/memmap2/memmap2-0.9.0.crate \
+          https://static.crates.io/crates/memoffset/memoffset-0.9.0.crate \
+          https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.6.2.crate \
+          https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.7.1.crate \
+          https://static.crates.io/crates/nanorand/nanorand-0.7.0.crate \
+          https://static.crates.io/crates/npm-package-json/npm-package-json-0.1.3.crate \
+          https://static.crates.io/crates/num-conv/num-conv-0.1.0.crate \
+          https://static.crates.io/crates/num-format/num-format-0.4.4.crate \
+          https://static.crates.io/crates/num-traits/num-traits-0.2.15.crate \
+          https://static.crates.io/crates/num_cpus/num_cpus-1.16.0.crate \
+          https://static.crates.io/crates/num_threads/num_threads-0.1.6.crate \
+          https://static.crates.io/crates/object/object-0.30.4.crate \
+          https://static.crates.io/crates/once_cell/once_cell-1.18.0.crate \
+          https://static.crates.io/crates/oorandom/oorandom-11.1.3.crate \
+          https://static.crates.io/crates/os_info/os_info-3.7.0.crate \
+          https://static.crates.io/crates/owo-colors/owo-colors-3.5.0.crate \
+          https://static.crates.io/crates/parking_lot/parking_lot-0.11.2.crate \
+          https://static.crates.io/crates/parking_lot/parking_lot-0.12.1.crate \
+          https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.8.6.crate \
+          https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.9.8.crate \
+          https://static.crates.io/crates/parse-zoneinfo/parse-zoneinfo-0.3.0.crate \
+          https://static.crates.io/crates/paste/paste-1.0.12.crate \
+          https://static.crates.io/crates/percent-encoding/percent-encoding-2.3.1.crate \
+          https://static.crates.io/crates/pest/pest-2.7.0.crate \
+          https://static.crates.io/crates/pest_derive/pest_derive-2.7.0.crate \
+          https://static.crates.io/crates/pest_generator/pest_generator-2.7.0.crate \
+          https://static.crates.io/crates/pest_meta/pest_meta-2.7.0.crate \
+          https://static.crates.io/crates/phf/phf-0.11.2.crate \
+          https://static.crates.io/crates/phf_codegen/phf_codegen-0.11.2.crate \
+          https://static.crates.io/crates/phf_generator/phf_generator-0.11.2.crate \
+          https://static.crates.io/crates/phf_shared/phf_shared-0.11.2.crate \
+          https://static.crates.io/crates/pin-project/pin-project-1.1.1.crate \
+          https://static.crates.io/crates/pin-project-internal/pin-project-internal-1.1.1.crate \
+          https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.9.crate \
+          https://static.crates.io/crates/pin-utils/pin-utils-0.1.0.crate \
+          https://static.crates.io/crates/pkg-config/pkg-config-0.3.27.crate \
+          https://static.crates.io/crates/plotters/plotters-0.3.5.crate \
+          https://static.crates.io/crates/plotters-backend/plotters-backend-0.3.5.crate \
+          https://static.crates.io/crates/plotters-svg/plotters-svg-0.3.5.crate \
+          https://static.crates.io/crates/png/png-0.17.9.crate \
+          https://static.crates.io/crates/powerfmt/powerfmt-0.2.0.crate \
+          https://static.crates.io/crates/ppv-lite86/ppv-lite86-0.2.17.crate \
+          https://static.crates.io/crates/pretty_assertions/pretty_assertions-1.4.0.crate \
+          https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-2.0.0.crate \
+          https://static.crates.io/crates/proc-macro-error/proc-macro-error-1.0.4.crate \
+          https://static.crates.io/crates/proc-macro-error-attr/proc-macro-error-attr-1.0.4.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.79.crate \
+          https://static.crates.io/crates/prodash/prodash-26.2.2.crate \
+          https://static.crates.io/crates/prodash/prodash-28.0.0.crate \
+          https://static.crates.io/crates/ptr_meta/ptr_meta-0.1.4.crate \
+          https://static.crates.io/crates/ptr_meta_derive/ptr_meta_derive-0.1.4.crate \
+          https://static.crates.io/crates/qoi/qoi-0.4.1.crate \
+          https://static.crates.io/crates/quote/quote-1.0.35.crate \
+          https://static.crates.io/crates/radium/radium-0.7.0.crate \
+          https://static.crates.io/crates/rand/rand-0.8.5.crate \
+          https://static.crates.io/crates/rand_chacha/rand_chacha-0.3.1.crate \
+          https://static.crates.io/crates/rand_core/rand_core-0.6.4.crate \
+          https://static.crates.io/crates/rayon/rayon-1.7.0.crate \
+          https://static.crates.io/crates/rayon-core/rayon-core-1.11.0.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.2.16.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.3.5.crate \
+          https://static.crates.io/crates/redox_users/redox_users-0.4.3.crate \
+          https://static.crates.io/crates/regex/regex-1.10.2.crate \
+          https://static.crates.io/crates/regex-automata/regex-automata-0.4.3.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.2.crate \
+          https://static.crates.io/crates/relative-path/relative-path-1.8.0.crate \
+          https://static.crates.io/crates/rend/rend-0.4.1.crate \
+          https://static.crates.io/crates/rkyv/rkyv-0.7.43.crate \
+          https://static.crates.io/crates/rkyv_derive/rkyv_derive-0.7.43.crate \
+          https://static.crates.io/crates/rmp/rmp-0.8.11.crate \
+          https://static.crates.io/crates/rmp-serde/rmp-serde-0.14.4.crate \
+          https://static.crates.io/crates/rstest/rstest-0.18.2.crate \
+          https://static.crates.io/crates/rstest_macros/rstest_macros-0.18.2.crate \
+          https://static.crates.io/crates/rust_decimal/rust_decimal-1.33.1.crate \
+          https://static.crates.io/crates/rustc-demangle/rustc-demangle-0.1.23.crate \
+          https://static.crates.io/crates/rustc_version/rustc_version-0.4.0.crate \
+          https://static.crates.io/crates/rustix/rustix-0.37.25.crate \
+          https://static.crates.io/crates/rustix/rustix-0.38.31.crate \
+          https://static.crates.io/crates/rustversion/rustversion-1.0.12.crate \
+          https://static.crates.io/crates/ryu/ryu-1.0.13.crate \
+          https://static.crates.io/crates/same-file/same-file-1.0.6.crate \
+          https://static.crates.io/crates/scopeguard/scopeguard-1.1.0.crate \
+          https://static.crates.io/crates/seahash/seahash-4.1.0.crate \
+          https://static.crates.io/crates/semver/semver-1.0.17.crate \
+          https://static.crates.io/crates/serde/serde-1.0.197.crate \
+          https://static.crates.io/crates/serde_derive/serde_derive-1.0.197.crate \
+          https://static.crates.io/crates/serde_json/serde_json-1.0.108.crate \
+          https://static.crates.io/crates/serde_spanned/serde_spanned-0.6.4.crate \
+          https://static.crates.io/crates/serde_yaml/serde_yaml-0.9.27.crate \
+          https://static.crates.io/crates/sha1_smol/sha1_smol-1.0.0.crate \
+          https://static.crates.io/crates/sha2/sha2-0.10.7.crate \
+          https://static.crates.io/crates/shell-words/shell-words-1.1.0.crate \
+          https://static.crates.io/crates/signal-hook/signal-hook-0.3.15.crate \
+          https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.4.1.crate \
+          https://static.crates.io/crates/simd-adler32/simd-adler32-0.3.5.crate \
+          https://static.crates.io/crates/simdutf8/simdutf8-0.1.4.crate \
+          https://static.crates.io/crates/similar/similar-2.2.1.crate \
+          https://static.crates.io/crates/siphasher/siphasher-0.3.10.crate \
+          https://static.crates.io/crates/slab/slab-0.4.8.crate \
+          https://static.crates.io/crates/slug/slug-0.1.4.crate \
+          https://static.crates.io/crates/smallvec/smallvec-1.10.0.crate \
+          https://static.crates.io/crates/spin/spin-0.9.8.crate \
+          https://static.crates.io/crates/static_assertions/static_assertions-1.1.0.crate \
+          https://static.crates.io/crates/strsim/strsim-0.8.0.crate \
+          https://static.crates.io/crates/strsim/strsim-0.11.0.crate \
+          https://static.crates.io/crates/strum/strum-0.25.0.crate \
+          https://static.crates.io/crates/strum_macros/strum_macros-0.25.0.crate \
+          https://static.crates.io/crates/syn/syn-1.0.109.crate \
+          https://static.crates.io/crates/syn/syn-2.0.53.crate \
+          https://static.crates.io/crates/syn_derive/syn_derive-0.1.8.crate \
+          https://static.crates.io/crates/tap/tap-1.0.1.crate \
+          https://static.crates.io/crates/tar/tar-0.4.38.crate \
+          https://static.crates.io/crates/tempfile/tempfile-3.10.1.crate \
+          https://static.crates.io/crates/tera/tera-1.19.1.crate \
+          https://static.crates.io/crates/term_size/term_size-0.3.2.crate \
+          https://static.crates.io/crates/termcolor/termcolor-1.2.0.crate \
+          https://static.crates.io/crates/textwrap/textwrap-0.11.0.crate \
+          https://static.crates.io/crates/thiserror/thiserror-1.0.47.crate \
+          https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.47.crate \
+          https://static.crates.io/crates/thread_local/thread_local-1.1.4.crate \
+          https://static.crates.io/crates/tiff/tiff-0.9.0.crate \
+          https://static.crates.io/crates/time/time-0.3.34.crate \
+          https://static.crates.io/crates/time-core/time-core-0.1.2.crate \
+          https://static.crates.io/crates/time-humanize/time-humanize-0.1.3.crate \
+          https://static.crates.io/crates/time-macros/time-macros-0.2.17.crate \
+          https://static.crates.io/crates/tinytemplate/tinytemplate-1.2.1.crate \
+          https://static.crates.io/crates/tinyvec/tinyvec-1.6.0.crate \
+          https://static.crates.io/crates/tinyvec_macros/tinyvec_macros-0.1.1.crate \
+          https://static.crates.io/crates/tokei/tokei-12.1.2.crate \
+          https://static.crates.io/crates/toml/toml-0.5.11.crate \
+          https://static.crates.io/crates/toml/toml-0.7.5.crate \
+          https://static.crates.io/crates/toml/toml-0.8.6.crate \
+          https://static.crates.io/crates/toml_datetime/toml_datetime-0.6.5.crate \
+          https://static.crates.io/crates/toml_edit/toml_edit-0.19.11.crate \
+          https://static.crates.io/crates/toml_edit/toml_edit-0.20.7.crate \
+          https://static.crates.io/crates/typenum/typenum-1.16.0.crate \
+          https://static.crates.io/crates/typetag/typetag-0.2.16.crate \
+          https://static.crates.io/crates/typetag-impl/typetag-impl-0.2.16.crate \
+          https://static.crates.io/crates/ucd-trie/ucd-trie-0.1.5.crate \
+          https://static.crates.io/crates/uluru/uluru-3.0.0.crate \
+          https://static.crates.io/crates/unic-char-property/unic-char-property-0.9.0.crate \
+          https://static.crates.io/crates/unic-char-range/unic-char-range-0.9.0.crate \
+          https://static.crates.io/crates/unic-common/unic-common-0.9.0.crate \
+          https://static.crates.io/crates/unic-segment/unic-segment-0.9.0.crate \
+          https://static.crates.io/crates/unic-ucd-segment/unic-ucd-segment-0.9.0.crate \
+          https://static.crates.io/crates/unic-ucd-version/unic-ucd-version-0.9.0.crate \
+          https://static.crates.io/crates/unicode-bidi/unicode-bidi-0.3.13.crate \
+          https://static.crates.io/crates/unicode-bom/unicode-bom-2.0.2.crate \
+          https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.9.crate \
+          https://static.crates.io/crates/unicode-normalization/unicode-normalization-0.1.22.crate \
+          https://static.crates.io/crates/unicode-width/unicode-width-0.1.10.crate \
+          https://static.crates.io/crates/unsafe-libyaml/unsafe-libyaml-0.2.10.crate \
+          https://static.crates.io/crates/url/url-2.5.0.crate \
+          https://static.crates.io/crates/utf8-width/utf8-width-0.1.6.crate \
+          https://static.crates.io/crates/utf8parse/utf8parse-0.2.1.crate \
+          https://static.crates.io/crates/uuid/uuid-1.4.0.crate \
+          https://static.crates.io/crates/vec_map/vec_map-0.8.2.crate \
+          https://static.crates.io/crates/version_check/version_check-0.9.4.crate \
+          https://static.crates.io/crates/walkdir/walkdir-2.3.3.crate \
+          https://static.crates.io/crates/wasi/wasi-0.11.0+wasi-snapshot-preview1.crate \
+          https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.87.crate \
+          https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.87.crate \
+          https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.87.crate \
+          https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.87.crate \
+          https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.87.crate \
+          https://static.crates.io/crates/web-sys/web-sys-0.3.64.crate \
+          https://static.crates.io/crates/weezl/weezl-0.1.8.crate \
+          https://static.crates.io/crates/winapi/winapi-0.3.9.crate \
+          https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi-util/winapi-util-0.1.5.crate \
+          https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/windows/windows-0.48.0.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.42.0.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.45.0.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.48.0.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.52.0.crate \
+          https://static.crates.io/crates/windows-targets/windows-targets-0.42.2.crate \
+          https://static.crates.io/crates/windows-targets/windows-targets-0.48.1.crate \
+          https://static.crates.io/crates/windows-targets/windows-targets-0.52.0.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.42.2.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.48.0.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.52.0.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.42.2.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.48.0.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.52.0.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.42.2.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.48.0.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.52.0.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.42.2.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.48.0.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.52.0.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.42.2.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.48.0.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.52.0.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.42.2.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.48.0.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.52.0.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.42.2.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.0.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.52.0.crate \
+          https://static.crates.io/crates/winnow/winnow-0.4.7.crate \
+          https://static.crates.io/crates/winnow/winnow-0.5.27.crate \
+          https://static.crates.io/crates/winnow/winnow-0.6.5.crate \
+          https://static.crates.io/crates/winres/winres-0.1.12.crate \
+          https://static.crates.io/crates/wyz/wyz-0.5.1.crate \
+          https://static.crates.io/crates/xz2/xz2-0.1.7.crate \
+          https://static.crates.io/crates/yaml-rust/yaml-rust-0.4.5.crate \
+          https://static.crates.io/crates/yansi/yansi-0.5.1.crate \
+          https://static.crates.io/crates/zerocopy/zerocopy-0.7.32.crate \
+          https://static.crates.io/crates/zerocopy-derive/zerocopy-derive-0.7.32.crate \
+          https://static.crates.io/crates/zstd/zstd-0.11.2+zstd.1.5.2.crate \
+          https://static.crates.io/crates/zstd-safe/zstd-safe-5.0.2+zstd.1.5.2.crate \
+          https://static.crates.io/crates/zstd-sys/zstd-sys-2.0.8+zstd.1.5.5.crate \
+          https://static.crates.io/crates/zune-inflate/zune-inflate-0.2.54.crate"
+MD5SUM="15077553660cff22d928a08cd1c1a5f0 \
+        b8e7ee27350aad1efd1cbe7a6a32c551 \
+        669215548c64019c08c92b2c1afd3deb \
+        9651c5e4f543baa1936451ff40d8a322 \
+        1e5f1d1c6887e4b84ae33559faec5fa7 \
+        96f06331c915195bce97c8542c0eb728 \
+        95e5f8d0b7ab37171b8d3118542ba06a \
+        a2d3656a58d89472063fd35db901f137 \
+        e0a03581a6aea080315323651f272d65 \
+        bf23cd323c33a8c283c41bb9b79e4ce4 \
+        a5edbb16fb71d6000e6978cba3dbce14 \
+        f44e8d1d2e61974b268852797530ea41 \
+        4b4d7f148688efba960f4fbf13445101 \
+        b47f7f36350970f1d65728a25ecf349f \
+        a6c4e3f7eda9068fe0049c291e8e7d89 \
+        d2453c99c7af98286c2dc9017a8dba6d \
+        b57fd47f132f32001e0d4bfc4621f1bf \
+        39a78bec5a0ae75f210c1f67250152b0 \
+        b7916cf807e8e1e3d0bc59b71f7f2500 \
+        504b5d258d68bdb980c997b93f0c6e6e \
+        7e55e25f387145f36dbfa9ff2390e0ae \
+        142cb4b9a653e56e56311f0c883b8582 \
+        05d77ef52e90ad161fdd41b252420467 \
+        58637599fb4e68ecbca68939709aca1a \
+        2b85559c818ca984fc61f5e7ef3ccf24 \
+        521abf54ccebb983d14c40f47a908a97 \
+        a295edb6953237ebbdfa8e731229f9a3 \
+        ebcf604c44976809506192718f439dc1 \
+        771aa8bb6e0811a97971fceecabb3245 \
+        023b03cf9968b29253a5dfe62051008d \
+        49cb344d320431234061ddfb1bb38c53 \
+        89442bf42a77994420a56f79c30c6216 \
+        494bc55e3713f1e861b0b6ae328a40f4 \
+        841b2dfaad47fc76cd42a45e074a1e78 \
+        e77008d07412b61bb1b5d67c5758c95d \
+        39cfa6f22ef51646096b072638f7d17c \
+        ba444785b3772c818677c4ccd42ee16f \
+        4a30bb499d535a719fca7f7775ff29d6 \
+        d2ff6bc07572bd5842794cc70cc0733a \
+        9a279086f2974a706e1f62fb2aac1e4c \
+        1e704be5ddde9d6b5383ef1035309f91 \
+        51ed49380bb7d086c005208e805983b2 \
+        d733a7dcbaf0a4bc44e4fef568dcee32 \
+        c1d1de018112c1d2d855fa7808a9f6f3 \
+        f686e99053239b98e9aca46c3e06c6f9 \
+        7d83f411bb22318c65fec8bbee937ece \
+        74634128440dbc3766bda76fdf0aaa05 \
+        126712a51ed2962e587048a634186390 \
+        48cc8f84c65f9de706a31832e4101350 \
+        58dd690a9d43bb9f8b361b9579a86fba \
+        0098d16049f29cebad0be1bda2212c50 \
+        43f8415008eb5775962023405a445462 \
+        aa7628187a64682bef0500d38db6b309 \
+        435b8bef0d3bd0b0ab5297728f1073c2 \
+        59ae9122b2946d4d52bc48a1da5c5e06 \
+        b444496ca4d820b2c75bd6ca4f269126 \
+        6a7300e86333500f11f30e3e20e68808 \
+        31f09812c68c3d67e0abc29ebcf74f1a \
+        fae4ac14d3f6db474aad2d3c73649420 \
+        f780b94573a4c3e9261b0ef07ace6529 \
+        b4b717e9ccaca16de32c52b11e851916 \
+        54e4adfd2d64f037c5115993a5da57b2 \
+        ee1260862a62c0d8824b664a1abda7b8 \
+        010f6d0e98cc2a2b99907a23c6cd6bbc \
+        53eecae550b37e10f2f127cfbf892465 \
+        b477cc1c7b45e2187b3cad0377b504d8 \
+        87d6cb99c9baea54826ce11c64ecd00b \
+        2328b6c50592b6a886bb9ccaf8a9bed6 \
+        8d9d64d52f8413bff916ac5c3ec06539 \
+        a9d6492a1bd21d93dbc27c32eabd0c70 \
+        c3ca987d21c9d0af2c1e9794f70e7175 \
+        4cb359fe1ce3ec8463a78cabc468037e \
+        275b369d81fc7f92f4ad2a7adc6ca74b \
+        41cea5adc01c6c125dd675cff2559fed \
+        fd98c74ef4f8e5abcd938173ae8e2ab5 \
+        9970b72159dfdaf0ebb3eab0edfd37a4 \
+        075bba4c4ec3da4784a8842db294845c \
+        f990d49f0e0b507415b06dfac2b02a36 \
+        32e5a346cb92729cf6c2d8d0e8202c73 \
+        89e88633cab0e4b6f3d3878b84dffe8b \
+        42707c74fb3d19c2457f8b1f36136bce \
+        7bb48920721b07af916c63b6c594012f \
+        d1c2696d101141971eb2716c17c22b9a \
+        e05e0f778a21d591052d682ef3063210 \
+        434e2423f372fed80f69ed8873fdd2a3 \
+        3d62bfbbe08bdcee55fcb8cda85554d9 \
+        92499f5db37eadb0efa33bcc91248577 \
+        4c21da37e71a52f26c8c5490f3ec4837 \
+        09fbe9408a658ae3e5d294812af2bc65 \
+        ba94e4b62665e48cc27ca8b14c5f5ff7 \
+        d7b336d7465ac09ff26154906d5c49f2 \
+        95a243b2d7c30018a643e218b3c5d693 \
+        28925d0d3649d0577f07bc9ab288999c \
+        98dd664015c5a6c5e1d3cfb8dce1c4ff \
+        3fa75bcd254d37247ec3e97bad1dd445 \
+        ce89e021cda1c79b29eebccd489d20d4 \
+        f58435d9964d16e52617556746674cc8 \
+        349e0ae5420f0b7e6ff835cd03cc7428 \
+        060466dc8b71e71789cf55c04cb42dc6 \
+        b4944c105ff1b8614beeb153e7179027 \
+        80e1c1b89d858c93fc5946b4a8266504 \
+        06ec9c584466e4e4dd9ab7ce6a9c9138 \
+        3091bf9ce6381222c8dbf65a439ab524 \
+        b2a011d8791e87418d9568ac99c0c9a0 \
+        8701f92ac138af6c3972bf8d1a8bd5fa \
+        8dab3b3ec00dc56cffde0b0c410d47b5 \
+        c3e51926c9853b714191ef1bec90e2ce \
+        ac9acb45412c8c2e1437db4e50fb834f \
+        6c162f039387980e6b6c4fecf8be744d \
+        10764f40bd10141d9f12920d7cfa123c \
+        378bd2c8eb6adcc1a837558e1927e1eb \
+        b2458958308a0923a65777b9297bf11a \
+        2399b8b3b39b993d8e44d2fc1628663c \
+        6052db16e7627061500931e7f53b0128 \
+        3f798ffba5e1f1ec5ad2df0afd1f76f8 \
+        3e2c0b885f7430e02dd6df1f8c626bc7 \
+        83e4c4337a8dac395b19ebcb8e3136a7 \
+        23e8b9cc40cb6247022c1265fb95505b \
+        7ee7fac47a513e4f7e44c66195ad8051 \
+        64a6d8fe0c9a450bcefa41894e17d7ac \
+        f204ba6fc9394724826f177433fe9a98 \
+        2ec5419c5ca1c626f0b158e5ebec75d4 \
+        ff87974aed9ddf2f97785fae88b9027a \
+        db79900dbfc6f8c7433f6d2f3a6c2e20 \
+        0947453e2549f2345bb78b3960bc5c43 \
+        fdd2e9f2c895cf626e0e94dfc14ad78d \
+        05e7099ffe7a6978b92850e2dc25836a \
+        e1af794e9888f836976bc09d0a77bf72 \
+        f37c2af51761ee99148accc64a789dbc \
+        101226d32a04adc0a4232050dbf85056 \
+        0f5f5b1f9ebc3d31770c7ae2e33d409c \
+        980abe4b3b80e451332e7f38105425d6 \
+        026d80b53333b71b18854ceb02e958b0 \
+        3b8e59515d02078032fbf89d2f7b47ec \
+        34659f460f1c9d7d938d167b3ae322ff \
+        2f1beb665ae673db2d89821a436b1cef \
+        e1aa1cf30530143595c6efaa1823731d \
+        b93d074890d39df694839d7d7abf0e48 \
+        cc547438ab5a5d0b50014083f57e2d32 \
+        ecf93232214d1e643e3b4cc76374db4b \
+        ced6fbb4456383135131cc616b75df8c \
+        258cc63567b01321d5090b3a4895d79a \
+        674f63065bbac7ced2770b0b5f02e749 \
+        fadaf8220f83f0ac4b8323919f2f5084 \
+        94051695cf569c0684d6f79b9ee20c9d \
+        c6234296409a24272b1783b8e1034385 \
+        ed939afc9dc6b2d98622184d1404933a \
+        8720b43335c8f32a89d01c8596aa428c \
+        226c77aabe608ec895e09eb138ad6fdb \
+        67fe1df33f7a2b122066176117d068f5 \
+        e949ccbcbb010c4e05896ab14562bf86 \
+        2180948a1fe17db88e9f97870234f87a \
+        fd45b8558a6621031ce21637ec2091dd \
+        adafc45a92f42b3377a06b041a2ab658 \
+        dc2287b30f0ddde28a3afbca83f252b3 \
+        1fa83fef2a7b9fc99c31de029f660d70 \
+        7a91807db2398fae9834f664a963c076 \
+        062d496249d9639508c106a2a393d199 \
+        03ef15a9cfe3d6befacd9ff7cdbd1634 \
+        d4d0effc77b6f82b37e0c783382711bd \
+        fd74cb12863c361e5e96d73cd7f4539e \
+        d22cc4f89be7e3d6325c040cb93d9065 \
+        b825bef7d62cf8e4e7d01968264e6a2f \
+        ed01e512e43388faba720890b368b164 \
+        c552aefe481234861e76c933da373d78 \
+        ad5436ea271f08706a1fd7430f034d58 \
+        0ebc0020bfa6e96a49bc2d6ab110023c \
+        d241450b0e03845ade667e536f021376 \
+        d1520e89eee5687482d00bbf693732ef \
+        afb7f0126b110b2b69385e7da7b038ee \
+        2db9ac38028a9e4a835694b3ee2ad1e4 \
+        539588dc3151dd1a2eafb1abc1b328e7 \
+        97ce0b3fde37ca86ec399a8832dd909e \
+        356b4a97654b1166cc19d2e01c50f285 \
+        dbce02b8b83b6e5060de22e3f6f95de3 \
+        7fdff136b8f92ca607b2d3cf8ef2bdc4 \
+        c511739ea5d706ec5514605c3822ee22 \
+        bc9add4fa8e8d6925b1cabe74e7ac108 \
+        a865ed2b74e73c390f769b702aa02713 \
+        fc67bbd30be33b63741209b920e248f2 \
+        3d177ac594201061c57c199cea0b1156 \
+        3952f33e9615f0c3cb881de6973470ed \
+        0659f4d8c73fba300470c8b507ea59e7 \
+        82efaf83a661ed30807897cac0c128b5 \
+        8b073553327fe547d0b367cfcd81bb59 \
+        2853be6b1b40b0e9731893a50660915a \
+        65fbc7f054a0295660ccd6ceb6dac760 \
+        dc2df652164cf85a1056a2e4e89f62b3 \
+        c6bdde89a5ba20c1047647566c78f32d \
+        e9ba7f6e1efec40f348488b04a50e5a6 \
+        6cf5295ccac485b29e978e762b0f3d8a \
+        7baeb96294a80f18ce722ec603737044 \
+        e671fc1401198c93ba9b382795fcbdcc \
+        2d6d28ec311884da69bcaf320ada8ad5 \
+        423ea3c18df8759400c3d0a381738c64 \
+        28fb2d3e8fbb4c9df2e53c8a6c7f3e88 \
+        8f76ccfaf8def788cc97c441d5d1a5da \
+        05960f636025bd61830414f5d49e0881 \
+        fea840ce07a32bdace46c59c41362f3b \
+        1c5130ef94d44cec6f63f13c80ae6ece \
+        1b41b97d982520b7364a87a39e2a1ed8 \
+        3451a2e54a12d567bbb1bf2815aedc37 \
+        b92fa50f56a1e06a7f1bf665442d4a73 \
+        ce5935e8063a452913a61e5405b33cb9 \
+        0b7994d1256215201bdfb810a357ffa2 \
+        c9fa9187985880eb320b350bd9024510 \
+        11681ec4554f1f934b25eeba3f558ea7 \
+        dfe5f3f4e85405462f028e3e7a5b5d42 \
+        26570de3ac165280c441fb77ecd68ede \
+        c01022fe0357c10ca1d48b16187f81bd \
+        7ff000f771e742396faed3c83c82fab4 \
+        87b1b7cb12ef4dfe842c212b98263048 \
+        b5305bde14813da51d536a9df564db69 \
+        bdee49940363352f112ccce7ee1f504d \
+        785764aa3ae2b351594278ed45a69aa6 \
+        4debd3be7deef9489df4d04841cbb631 \
+        18dfeab855ade5255a7f1a68b0151b7a \
+        ae1f7ca9b9189b6fa16f8db780fc79f1 \
+        5f153f7135dceb02f88266121c836b4e \
+        95f8af69264003b0fe9bc5e687ec80d3 \
+        7d58a2a23cd19ed8e889afdbeb7986b1 \
+        c6612f34c3ee98ced239da95fbede236 \
+        d2920a948e00e7c077883cebba898847 \
+        89b393356ad4a8a3f69cf168f06c7dcb \
+        20b9f5d97aaf06b0f580f12860b67ba8 \
+        ffbab2186e43af074b619d6d8bfe3566 \
+        eacabd60e755d2a003031643241781dc \
+        ff05fe7b2fc0d772db7a63e5a66ed5ab \
+        d580c0380408c62e04e018eaaf4258af \
+        53c7e5ace75ab04b2468d0547fa332be \
+        0c07198f804f9c9788567f8c061acaec \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        2db26dd3b5201776a36e40217bfdfe26 \
+        49d77531898b3d7846b149c0fb4788c4 \
+        71bf1bf53c8321f7f1cbc13575353d6b \
+        b4c849c8ee20bb24d1dab019f8a020f0 \
+        ef352de59e1b26277213640319c87e88 \
+        18fa61f2d92d4df309c67cb3f3197987 \
+        1d1b2033b4272a22654e55447ae7f404 \
+        8d619139e1dec2be7ecd50cfe3efa2a0 \
+        8ee79b4fe4c43d9ab09f16344612a656 \
+        61f358bf6f442c02189af8a9c50e745a \
+        0f6cf3b35ff80cee7da9243e76c94532 \
+        ddbd5203d6b18f74ea40a4a498cb3b83 \
+        0848bd51d7f2f3a5d66cf18b5bf20c19 \
+        425240df63c3230ac887f4319e3434e5 \
+        fb6241893b457ed69fae5c1ae19920da \
+        bb21a8ff26ec16bc15758b1625bc0f46 \
+        eb7e04508518ed8f29935ec874e1740a \
+        28a4dbc0158bdb2fa806d97dd55fba2e \
+        d81ceb0b3794fb4b01f8f443f00d60df \
+        5b5de6cffe4726037a5ec6d6931c80f3 \
+        8ca0c760be72a54667baeb09fc5a0578 \
+        a0de6eabdeb1320350abcbd7c02df6ac \
+        d443cbf9907b31a0f396fb13489d6cd0 \
+        ae2471729f689287aec9da43f8106a4b \
+        cf92ddce1c266903017a073d826e0a95 \
+        2dc8aacabbc090f8025a4789d4d6d8f0 \
+        6b79a1dbccc9351cbc297cfa3d98d651 \
+        0aa601dab19b62c32def2e7be85d50b3 \
+        aa7024f7b3b6cc9c16f218c076a31ccc \
+        12e4ba5909e1f30b9142932571eaa4da \
+        1be45f99109d447849f4244b58c5a470 \
+        b1713fb3ae03d434680cff5fb4c14144 \
+        ad1239c8377e9764ee2924fadcc73c5f \
+        7fb976dbf9428d88125a556348db0ddb \
+        4fb2e2c0bd34936de027d8d9c04e12d1 \
+        0ba30a94d7b8865c23e86d4d64e5b91e \
+        43396a5f5e082a5225606d57f4927a61 \
+        c46bac043ec3efabb0bf60e59fcd5f35 \
+        c015f53bc14eee587326c0169d35b282 \
+        4c1b9de67d4aaa6d64d556b9f3b00dd5 \
+        12613f90aab930b5317557b1b0a21e30 \
+        60e558c4bb478462efdb5b3a925897dc \
+        d8b1713b722c482c78ceb961cf994d38 \
+        3cbb110e799c18366fd19d05c66df6d7 \
+        f65ea4235b0a880cf5f332e19fc53d80 \
+        7200c175ca23a62b976a0b20f4cda05d \
+        ce6dde2ea2691fdd97632fb8c9b3e042 \
+        07c75fec267864bcbb800ca7709ceae2 \
+        73d4dff694f3acab34c217b4f4943a37 \
+        24171d9c31ec6e5ccb4cb2ab5494d0c0 \
+        bd8a914851fd9e6351082f98b7e7fa84 \
+        a6b32988425a3fcfa02e2330d47715a1 \
+        b778b749081a14d66979a46f353e16e4 \
+        30eb4de1c1a3bd214d7649b891abf444 \
+        5c69337d37e58a380e00eac9ce0373bb \
+        20bc0926b659e86cc5ea66cf928caec9 \
+        0df16f0fae76d411cebf1e67c55070d9 \
+        6a32bab57772c3a1146d599b65ffb0cb \
+        7d76a523677de261dda1b65d29a93c4e \
+        e0c30e3bc29a1b33c71f2823cd5b5365 \
+        33a6273a72fc27d8b78ca1a499ada23d \
+        533608bb3b2587c0aa148dc36cc16429 \
+        7b5f916e5a872e69f4adb563bdb67b77 \
+        639c3431a2f0d289889dd4cf8f1f1222 \
+        a712320c0a3c6440c9a5b85cdd3f0c78 \
+        0358b31bf59c7915bb03f9e66f2d1ea3 \
+        c3d0791d7f9cb5103c004856e165fe0b \
+        ee7a5f842c39bc47c474196e83b0df5f \
+        e30085994bbeb4b7f4895d48216d5476 \
+        a1626b8f4d165b1b60d960862eba4cf0 \
+        e0db6bd215c51fe0bd255fba51a21f24 \
+        08db330bc0fb2b16a6c78c2870196852 \
+        16111f31a29feae4ce4a324b83dc0189 \
+        782ea88d8e5b517b1c9e7d870e20e9e3 \
+        2793ed3e6807d79ff72271baec586531 \
+        e90f2809a34e2bea0bd5c1120475fb36 \
+        4f496143a21775fa7bd22bf329c37f37 \
+        91b60a71d44302a8b05bd398eca56c37 \
+        56a4d4b53f05b81e881428f327bbd19b \
+        1c9a7182c62a3f9ea6f81420f3766f6b \
+        1c4222a2b68bfd02398338fc83f48e6a \
+        66c01e9bd7f3d1463a3da113eb280a1a \
+        3677dde35602658c64bcab434a0d053b \
+        2d7d5aa79ff9ed90aa9a1ab6ce32d2f0 \
+        0643d5949f80b6e187ef39a5f9a325c0 \
+        7bd723f44b24fc491c1923c7a59bc364 \
+        28dd2ad9373e97891cb7ed3444aaa3b7 \
+        24fcbc2986fad09b25c9a4f9aef0a9e4 \
+        fdf3aa5e1f6c33e4f68b0f7b08e1e94e \
+        3b149ee50fdf37d56186810660ea7a63 \
+        223719dc10025228707d8d5aa14e401b \
+        d9a04f4fbf3a21f7ef6be47a007cb611 \
+        853888e375addadf7e85c8499e0745d3 \
+        2d8d8b377d144f5e32b4f65a69eb0b24 \
+        b4a0a98a54439a5a37952c8879187ee3 \
+        8046df86e976ce7ef8954e916f0e7f74 \
+        eb6238cbf278a63e0afc0804cf527c62 \
+        956ace3f4e2b8a6ac55aa74549cc38de \
+        e8b93865e80b67f03df2faa417960b88 \
+        3ed0ebc631b1840f3be21e1ba07fa4ed \
+        07174ad3942b5dba8d02f628a4f56792 \
+        822665dbb2a2d1974965080ab74a89b2 \
+        74d8afce717ff89fb2cb5141f121782b \
+        00f467980f89a77f541dab0e421480e8 \
+        ce622fdb8d18cd1c13ed8fadc5400c10 \
+        d4411367c61d8ef13f479e0df69f100f \
+        22e95901b912671da26457ac33e36a23 \
+        55a4e6bebcb7c5e30cda782b4be9c329 \
+        74001a70c31a649cd14282d0521a5f39 \
+        304b7e874b1432fdb71c1e574b47e0db \
+        a394e97512e40dc3f1a5b3beba31e750 \
+        cf636206d0c3287ce209551fc5b02d88 \
+        ff2007c6fa874e52325ef88f9e46278b \
+        a8014a7c865aa54f305e8cda3ef02019 \
+        ae0a9c293bf6cb72cd62d6b9486356c0 \
+        c9defe80406280bcfce4ecf31c0200b3 \
+        781d4ccf5d04c98fa02af207a9639249 \
+        5a9054761bf275878e3c4076192d5472 \
+        3976bcb8ccfe5f63e4c38209370a0de7 \
+        addb656fd9ba12fac948ba6caf741ff3 \
+        64d9f46e9ba78f68c30c486be3d8b7df \
+        285d82afae7d638437fd71f94cd1923e \
+        f412e121f0941e9e61f75b9f7bfa9ad2 \
+        fdd7cefe256b6bcbbc2ba2344e773496 \
+        7645c62a572f12b67d1b582d7257776e \
+        449c7bb37fc298d2026fbf2855eb8db0 \
+        477e32d53e3f28cdfb368fcdfa0df3da \
+        73d602cc41e3e431bf4fabd129ae1616 \
+        36c7197f00034ff87f3b849dd6b98b6e \
+        a8de006fe0c7e373c560dd51599287a8 \
+        4765ef1452ff61c3942d4fdbb494b774 \
+        cb03f4cb4d4a71fc2b6a41875cc9b005 \
+        d03f75b223b8c2a58c73971ec0227fc0 \
+        4a9c9f7d6e764b4abefee62fe610edab \
+        00a1017b4831ad4073be63ee145f37f1 \
+        7818a75208424a6d05d1d868559f0adf \
+        70b96eca0359f82c818eee7615d6ee21 \
+        4875c5068f17bbcd90afbff582925a0a \
+        a160b14e423954c978ca95aa78ca4210 \
+        5f0470696baaa4e5953bddbf196998f9 \
+        c678a7da0ee4b850ebde0474144a0415 \
+        1cacd081f5383ceb52e338c635b43fae \
+        b21820f2664242498beba7783b32bef4 \
+        1b7a0430abdb6a8b8b2fb9623f7e34f6 \
+        645cc7198206cb7a029adf3557ee7ed4 \
+        9aecd5ff283534a21d7cd51266abfe89 \
+        ebe9be1bcec17d5ad10938d11e6bf1fb \
+        dff68dc5b0704b8123a947f52e31dc8d \
+        63ce54e1fcbbdb45c15146fd082528bb \
+        9897b36a38a4599b557d1bca95f8552a \
+        3888156a4f63cd5b41049736e31cafde \
+        11ad59bd731103e90d688afc5f35271b \
+        d70f66016bb1c2fa0b3ae8d81623521a \
+        588551ab8c39f2325b2825bd6ba99edd \
+        00cf9fc91f46e1c29e71960e1cd76eb0 \
+        a0a5b9061a4064139084bb264eb7803c \
+        40cab34236c8ab6128d287f63d29a49c \
+        e5c5470d1feb14de0d2f8d2ebd7af472 \
+        45e2aaf9c869c2a3c456ffb522ca4c55 \
+        04c5de5f2fcb441ced909a45cff020bd \
+        24d96a72c285ee29e79ea640d1c0391d \
+        2e6f3d2a4c7414137fa48dfd73678840 \
+        c12d182417999fc365f952e701f6071f \
+        7d6d4fc9fad200d6e295f6930e97e022 \
+        428fc5d72716c000ce20267887878be2 \
+        e547b0e754cd61f24f9ef8c9e26fcd95 \
+        86baecce43858faab832d3ddf3bf800f \
+        ceee1159c41351d05f4cf705490867b3 \
+        7090b26bd33a445ed133a483e62d84cb \
+        333b4ba3f64c35b6f89b521e8d64548b \
+        d18d362345c4fe512ef67b738b239fb8 \
+        250acb3063bbdc870cbb54edcd6fff8f \
+        e972ea58ec203bfa6c79c1207852298b \
+        64f9f5c520b25087ba70e4194d6aea9c \
+        e1aaf0d487ef02def77307a74ee35606 \
+        e41541041285d9f05d372cdac02a4bf7 \
+        b3139f7d066250bfaf96b99e913ee75d \
+        4185de0682e5e5f3a9f13285218e59aa \
+        1f1e8b52fa04ca808c0bf41caf93d1f0 \
+        3463b870b51ee10369d6b1a5139ad166 \
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        db96b50050277bf05a3c68534bbb9586 \
+        b9e37d5fc4ad28b612b78ad37816684d \
+        09de9d01e7331ff3da11f58be8bef0df \
+        f4620d6217497ee2c54090cd353ceec4 \
+        110789f2dd21a2ea820ebed976b4b1c2 \
+        b58284cb8ce52b8de07e09f4f8fb9653 \
+        f2797ade0e36f1e5d6be9d11b5076582 \
+        2376de634160158ece40c4bc2ab3eb41 \
+        a369d510325342310c7ab159bd181dae \
+        e1a9b4dbf73164d389950c124e4d6f0c \
+        7ff44db201b805c60b7894e6e51a5580 \
+        7968284877e481b58df1569b68b5dc26 \
+        e8732bb9eec91463ea10020fc16991c1 \
+        cd2efc4af413b9d1380761255c7a22ff \
+        34d06a94727c506c11e4710160e90f32 \
+        3d2bf2e578fe93c538d4f8c5cfddbe9b \
+        5b2c6ccb94c770d0ed85f7a844bf001e \
+        017691b927b405669e1139b054a35f4a \
+        631f9e1bcfe18e3976ef4c893ee13531 \
+        467f51d4cfb646d0c8fecfa008dbf52d \
+        f56c70fbae23f08fb0912284333f7851 \
+        f3dad0f67aa70c6618c1593bd2086c36 \
+        9afb70c460db38399bf95ec015f07435 \
+        d20c2b0f45a62cc15c503ea610706a8f \
+        085ec81e4ced998bb7f1aea30b7a630e \
+        f34ea4d81690ec402b6f0d9e54e8baa4 \
+        ec7e437088dc741e6a0653e553abca4e \
+        e24dfcf625e130a1e6db0ae375a17dd7 \
+        591c68ecc1dded36344429f427bbfabc \
+        8cec8a187df7a7b971009a7693f60140 \
+        2fa0c13b386de68baa17168774b1c5fa \
+        29bbf3d9160d2545d528d0b2d7492333 \
+        47eb7c694d272cf234ddfee18834d143 \
+        11f4eea201dc17b02bf54aae582c3a93 \
+        89f70cb8305108cc51ccde5569760d5b \
+        76fb85a025e6e1e6fda6569acf460505 \
+        589309abba88dd6e8099a95640457f7d \
+        a4a2fb6845bb8ae426053dc7821ff75f \
+        331d07cdd036d528ede2f69c7ff0beb6 \
+        f5a883f6e013c5dcedc0c13d3096c612 \
+        ae2ca148274c581aa6ee8a8e292ca2af \
+        936257597fbe2fd02d954a5db53c687a \
+        073a49c0bbf42567732c431ac924d9d1 \
+        b350c3e0b227a09407205fd823287959 \
+        8248ee0e20e58469a8e5a1742a3a5b70 \
+        6a4f97b7e9ca29b701116862f3ca41c4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="rust16"
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/onefetch/slack-desc b/system/onefetch/slack-desc
new file mode 100644
index 0000000000..60f9e28c95
--- /dev/null
+++ b/system/onefetch/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+onefetch: onefetch (command line Git information tool)
+onefetch:
+onefetch: onefetch is a command line Git information tool that displays project
+onefetch: information and code statistics for a local Git repository. No network
+onefetch: access is required to use onefetch.
+onefetch:
+onefetch:
+onefetch:
+onefetch:
+onefetch: Author: Ossama Hjaji
+onefetch: Homepage: htps://github.com/o2sh/onefetch
diff --git a/system/onerng/onerng.SlackBuild b/system/onerng/onerng.SlackBuild
index 3ca0e283f4..2520767b77 100644
--- a/system/onerng/onerng.SlackBuild
+++ b/system/onerng/onerng.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for OneRNG
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=onerng
-VERSION=${VERSION:-3.6}
+VERSION=${VERSION:-3.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}	
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}	
@@ -80,9 +90,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-# fix the .conf -> .conf.new
-sed -i 's:^\(.*onerngconfSCRIPT_INSTALL.*$(DESTDIR)$(onerngconfdir)/$$f\)\(.*\)$:\1.new\2:' files/Makefile
 make install-strip DESTDIR=$PKG
+mv -v ${PKG}/etc/onerng.conf ${PKG}/etc/onerng.conf.new
 
 mkdir -p ${PKG}/usr/doc/${PRGNAM}-${VERSION}
 cp -a \
@@ -95,4 +104,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/onerng/onerng.info b/system/onerng/onerng.info
index 68960a9200..4551aaf0fc 100644
--- a/system/onerng/onerng.info
+++ b/system/onerng/onerng.info
@@ -1,8 +1,8 @@
 PRGNAM="onerng"
-VERSION="3.6"
+VERSION="3.7"
 HOMEPAGE="http://www.onerng.info"
-DOWNLOAD="https://github.com/OneRNG/onerng.github.io/raw/master/sw/onerng_3.6.orig.tar.gz"
-MD5SUM="f1ffd033c56c9d66425304cef7d50f68"
+DOWNLOAD="https://github.com/OneRNG/onerng.github.io/raw/master/sw/onerng_3.7.orig.tar.gz"
+MD5SUM="7abe6589491788b881e82528f5c80a20"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python-gnupg rng-tools"
diff --git a/system/opam/README b/system/opam/README
index 9257895cd0..3550415378 100644
--- a/system/opam/README
+++ b/system/opam/README
@@ -6,15 +6,16 @@ constraints, and a Git-friendly development workflow.
 
 Managing your OCaml installation can be as simple as:
 
-    opam list -a         # List the available packages
-    opam install lwt     # Install LWT
-    opam update          # Update the package list
-    ...
-    opam upgrade         # Upgrade the installed packages to their latest version
+  opam list -a      # List the available packages
+  opam install lwt  # Install LWT
+  opam update       # Update the package list
+  ...
+  opam upgrade      # Upgrade installed packages to their latest version
 
 
 It has to be initialised. To do it, you can use the following command:
-opam init
+
+  opam init
 
 It is not recommended to run opam as root.
 Apparently it rather installs per-user packages.
diff --git a/system/opam/opam.SlackBuild b/system/opam/opam.SlackBuild
index e7d8270b0d..8bb17c3f7e 100644
--- a/system/opam/opam.SlackBuild
+++ b/system/opam/opam.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for opam
 
 # Copyright 2016-2016  Roberto Metere, Newcastle Upon Tyne, United Kingdom
@@ -21,10 +21,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0,
+# by updating to v2.1.2.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=opam
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-2.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,39 +75,35 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-make lib-ext
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make -j1 lib-ext
+make -j1
+make -j1 DESTDIR=$PKG install
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+strip $PKG/usr/bin/*
+gzip $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS CHANGES CONTRIBUTING.md LICENSE README.md \
       $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/doc/opam-installer $PKG/usr/doc/$PRGNAM-$VERSION/opam-installer
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/opam/opam.info b/system/opam/opam.info
index fd986517c7..6c921dcdc3 100644
--- a/system/opam/opam.info
+++ b/system/opam/opam.info
@@ -1,10 +1,10 @@
 PRGNAM="opam"
-VERSION="2.0.1"
+VERSION="2.1.2"
 HOMEPAGE="https://opam.ocaml.org/"
-DOWNLOAD="https://github.com/ocaml/opam/releases/download/2.0.1/opam-full-2.0.1.tar.gz"
-MD5SUM="24faa0ad049d146dfc3fcbe9cbab5eda"
+DOWNLOAD="https://github.com/ocaml/opam/releases/download/2.1.2/opam-full-2.1.2.tar.gz"
+MD5SUM="801d2244c79d27c414e3306a08c4e564"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ocaml bubblewrap"
+REQUIRES="bubblewrap dune ocaml-findlib"
 MAINTAINER="Roberto Metere"
 EMAIL="roberto@metere.it"
diff --git a/system/open-vm-tools/open-vm-tools.SlackBuild b/system/open-vm-tools/open-vm-tools.SlackBuild
index a294741688..ad8e9e3d13 100644
--- a/system/open-vm-tools/open-vm-tools.SlackBuild
+++ b/system/open-vm-tools/open-vm-tools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for open-vm-tools
 
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=open-vm-tools
-VERSION=${VERSION:-10.2.0_7253323} # Remember to change VERSION - to _ !!!
+VERSION=${VERSION:-11.3.5_18557794} # Remember to change VERSION - to _ !!!
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCVER=$(echo $VERSION | tr _ -)
 
@@ -38,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -89,6 +99,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+sed -i "s|\ -Werror||" configure.ac
+
 autoreconf -i
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -100,7 +112,7 @@ LIBS=-lcrypt \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --without-pam \
+  --with-pam \
   --without-x \
   $VGAUTH_OPTS \
   --build=$ARCH-slackware-linux
@@ -125,9 +137,11 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/open-vm-tools/open-vm-tools.info b/system/open-vm-tools/open-vm-tools.info
index fb9a228e79..e79e276500 100644
--- a/system/open-vm-tools/open-vm-tools.info
+++ b/system/open-vm-tools/open-vm-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="open-vm-tools"
-VERSION="10.2.0_7253323"
+VERSION="11.3.5_18557794"
 HOMEPAGE="https://github.com/vmware/open-vm-tools"
-DOWNLOAD="https://github.com/vmware/open-vm-tools/releases/download/stable-10.2.0/open-vm-tools-10.2.0-7253323.tar.gz"
-MD5SUM="9256c2402640ad19eb79cf49635e01b5"
+DOWNLOAD="https://github.com/vmware/open-vm-tools/releases/download/stable-11.3.5/open-vm-tools-11.3.5-18557794.tar.gz"
+MD5SUM="5ee21a56d5fd7a1838f41e328c061084"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libmspack libdnet"
diff --git a/system/openGLRefToMan/README b/system/openGLRefToMan/README
new file mode 100644
index 0000000000..cacca09bce
--- /dev/null
+++ b/system/openGLRefToMan/README
@@ -0,0 +1,17 @@
+'openGLRefToMan' is a group of shell scripts and corrected
+manpages used for creating readable manpages that will be 
+produced by conversion of DocBook XML sources of official 
+OpenGL API references presented by Khronos Group. 
+
+Patches will be created by using helper scripts and manually 
+corrected manpages which are presented as a part of the 
+sources required for the SlackBuild script.
+
+The user is presented with an option for creation of up-to-date 
+SlackBuild source tarball in scripts/CreateSlackBuildSourceTarball.sh
+of the source tarball instead of using potentially out-dated 
+SlackBuild source tarball. 
+
+After the removal of the package database used by 'whatis' 
+command will be updated automatically for clearance of OpenGL 
+API reference entries.
diff --git a/system/openGLRefToMan/doinst.sh b/system/openGLRefToMan/doinst.sh
new file mode 100644
index 0000000000..9c30d13ecc
--- /dev/null
+++ b/system/openGLRefToMan/doinst.sh
@@ -0,0 +1 @@
+mandb -c     # update index database used by 'whatis'
diff --git a/system/openGLRefToMan/douninst.sh b/system/openGLRefToMan/douninst.sh
new file mode 100644
index 0000000000..9c30d13ecc
--- /dev/null
+++ b/system/openGLRefToMan/douninst.sh
@@ -0,0 +1 @@
+mandb -c     # update index database used by 'whatis'
diff --git a/system/openGLRefToMan/openGLRefToMan.SlackBuild b/system/openGLRefToMan/openGLRefToMan.SlackBuild
new file mode 100644
index 0000000000..235de53051
--- /dev/null
+++ b/system/openGLRefToMan/openGLRefToMan.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# openGLReftoMan.SlackBuild - SlackBuild script for creating OpenGL Ref manpages
+# Copyright © 2022 Necib ÇAPAR <necipcapar@gmail.com>
+
+# This file is part of openGLRefToMan
+
+# openGLRefToMan is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# openGLRefToMan is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=openGLRefToMan
+VERSION=${VERSION:-1.0.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir --parents patches
+scripts/OpenGLprocessRepo.sh OpenGL-Refpages*
+scripts/OpenGLcreateManPatches.sh ./OpenGL-Refpages*/man3 ./corrected_manpages/* ./patches
+scripts/OpenGLpatchManPages.sh OpenGL-Refpages*/man3 patches
+
+mkdir --parents $PKG/usr/man
+cp --archive $TMP/$PRGNAM-$VERSION/OpenGL-Refpages*/man3 $PKG/usr/man
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh >| $PKG/install/doinst.sh
+cat $CWD/douninst.sh >| $PKG/install/douninst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/openGLRefToMan/openGLRefToMan.info b/system/openGLRefToMan/openGLRefToMan.info
new file mode 100644
index 0000000000..cdb2592b47
--- /dev/null
+++ b/system/openGLRefToMan/openGLRefToMan.info
@@ -0,0 +1,10 @@
+PRGNAM="openGLRefToMan"
+VERSION="1.0.0"
+HOMEPAGE="https://github.com/N-Tek/openGLRefToMan"
+DOWNLOAD="https://github.com/N-Tek/openGLRefToMan/releases/download/v1.0.0/openGLRefToMan-1.0.0.tar.gz"
+MD5SUM="b829e8c0669479660fdae933368ffec4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="mathML2dtd docbookMathML1mods docbook-xml5"
+MAINTAINER="Necib ÇAPAR"
+EMAIL="necipcapar@gmail.com"
diff --git a/system/openGLRefToMan/slack-desc b/system/openGLRefToMan/slack-desc
new file mode 100644
index 0000000000..34c4ac43ca
--- /dev/null
+++ b/system/openGLRefToMan/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+openGLRefToMan: openGLRefToMan (converted OpenGL API reference manpages)
+openGLRefToMan:
+openGLRefToMan: converted OpenGL API references in manpage format
+openGLRefToMan:
+openGLRefToMan:
+openGLRefToMan:
+openGLRefToMan:
+openGLRefToMan:
+openGLRefToMan:
+openGLRefToMan:
+openGLRefToMan: https://github.com/N-Tek/openGLRefToMan.git
diff --git a/system/openct/openct.SlackBuild b/system/openct/openct.SlackBuild
index a6d84b2f32..39e625231c 100644
--- a/system/openct/openct.SlackBuild
+++ b/system/openct/openct.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for openct
 
@@ -22,20 +22,30 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=openct
 VERSION=${VERSION:-0.6.20}
 BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -45,8 +55,8 @@ NONPRIV=${NONPRIV:-0}	# disable not-privileged mode (it will be used by root)
 
 DOCFILES="NEWS TODO LGPL-2.1"
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -119,6 +129,7 @@ CXXFLAGS="$SLKCFLAGS" \
 
 make
 make install DESTDIR=$PKG
+rm -f $PKG/usr/lib*/*.la
 
 # copy Slackware-compliant openct daemon (instead of original 'init-script' file)
 mkdir -p $PKG/etc/rc.d
@@ -192,4 +203,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/opendoas/README b/system/opendoas/README
new file mode 100644
index 0000000000..bdee92b29c
--- /dev/null
+++ b/system/opendoas/README
@@ -0,0 +1,68 @@
+This is the "OpenDoas" port of OpenBSD's doas.
+
+The doas utility is a program originally written for OpenBSD that
+allows a user to run a command as though they were another user,
+typically root. doas acts as an alternative to sudo, with simple
+configuration syntax and a smaller code base for ease of security
+auditing.
+
+Please note that running this SlackBuild will install doas with SUID
+root.
+
+To get started, write a configuration file at /etc/doas.conf. As an
+example, including the line:
+
+  permit :wheel as root
+
+will allow all users in the wheel group to act as root with doas.
+Consult the doas.conf(5) man page for further details.
+
+The parameter "keepenv" in /etc/doas.conf allows for opening graphical
+applications with doas:
+
+  permit keepenv gene as root
+
+"exec dbus-launch --exit-with-session" may be required for xinit in
+Slackware 14.2. An alternative is to run "export $(dbus-launch)" after
+starting the X session. As with su, KDE 4 graphical applications may
+fail to open with doas.
+
+Running this SlackBuild without parameters will provide a build of
+OpenDoas with shadow support if PAM is not installed, and with PAM
+support if PAM is installed. Password persistence is disabled by
+default.
+
+To enable timestamp-based password persistence, call the SlackBuild
+with PERSIST=yes:
+
+  PERSIST=yes ./opendoas.SlackBuild
+
+In addition, ensure that the appropriate user or group line in
+/etc/doas.conf includes the "persist" option, as in this example:
+
+  permit persist jane as root
+
+Please note that upstream considers timestamp-based password
+persistence to be "new and potentially dangerous."
+
+For users with PAM installed, enable shadow authentication instead by
+calling the SlackBuild with PAM=no:
+
+  PAM=no ./opendoas.SlackBuild
+
+If /etc/pam.d/other and /etc/pam.d/system-auth are unmodified from the
+state in which they are shipped in -current, doas will run with PAM
+support if so compiled. Otherwise, doas may require a dedicated file at
+/etc/pam.d/doas to use PAM authentication.
+
+To allow OpenDoas to write a new PAM configuration file for doas, call
+the SlackBuild with PAM_FILE=yes:
+
+  PAM_FILE=yes ./opendoas.SlackBuild
+
+Upstream is unlikely to include PAM configuration files in releases of
+OpenDoas beyond 6.8.2.
+
+opendoas has no outside dependencies on Slackware 14.2 or 15.0 and
+adds no users or groups. opendoas conflicts with all other ports of
+doas.
diff --git a/system/opendoas/doinst.sh b/system/opendoas/doinst.sh
new file mode 100644
index 0000000000..97b05239d4
--- /dev/null
+++ b/system/opendoas/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/pam.d/doas.new
diff --git a/system/opendoas/opendoas.SlackBuild b/system/opendoas/opendoas.SlackBuild
new file mode 100644
index 0000000000..7c5dd153c9
--- /dev/null
+++ b/system/opendoas/opendoas.SlackBuild
@@ -0,0 +1,146 @@
+#!/bin/bash
+
+# Slackware build script for opendoas
+
+# Copyright 2021-2022 K. Eugene Carlson  Tsukuba, Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# 20220210 bkw: Modified by SlackBuilds.org, to use the correct github
+# download URL.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=opendoas
+SRCNAM=OpenDoas
+VERSION=${VERSION:-6.8.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+unset TIMESTAMP
+unset SHADOW
+
+# Use PERSIST=yes to enable timestamp-based password persistence. Upstream
+# considers this feature to be "new and potentially dangerous."
+[ ${PERSIST:-no} = yes ] && TIMESTAMP="--with-timestamp"
+
+# Use PAM=no to enable shadow authentication even on systems with PAM
+# installed. If shadow is not set, then doas will compile with PAM support
+# automatically if PAM is installed.
+[ ${PAM:-yes} = no ] && SHADOW="--without-pam"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# Pass in shadow support if PAM is not installed. OpenDoas defaults to PAM
+# authentication otherwise.
+if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
+  SHADOW="--without-pam"
+fi
+
+# Passing BUILD from the command line otherwise causes the build to fail (the
+# configure script uses the variable name).
+env -u BUILD ./configure \
+  --prefix=/usr \
+  $SHADOW \
+  $TIMESTAMP \
+  --mandir=/usr/man
+
+# 20220210 bkw: actually use SLKCFLAGS.
+sed -i "s,-O2,$SLKCFLAGS," GNUmakefile
+
+make
+make install DESTDIR=$PKG
+strip $PKG/usr/bin/*
+gzip -9 $PKG/usr/man/man*/*
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+chmod 4711 $PKG/usr/bin/doas
+
+# If PAM support is enabled, rename the package's PAM file to doas.new.
+if [ -f "$PKG/etc/pam.d/doas" ]; then
+  mv $PKG/etc/pam.d/doas $PKG/etc/pam.d/doas.new
+fi
+
+# Delete the new configuration file and its directory if PAM_FILE=yes was not
+# used. For Slackware 15.0 users, doas can use PAM authentication provided that
+# /etc/pam.d/other and /etc/pam.d/system-auth have not been altered from the
+# state in which they are shipped. Writing new PAM configuration files was
+# deprecated after the current release of OpenDoas. To allow OpenDoas to write
+# a configuration file anyway, use PAM_FILE=yes.
+[ ${PAM_FILE:-no} != yes ] && rm -rf $PKG/etc
+
+if [ -f "$PKG/etc/pam.d/doas.new" ]; then
+  cat $CWD/doinst.sh > $PKG/install/doinst.sh
+fi
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/opendoas/opendoas.info b/system/opendoas/opendoas.info
new file mode 100644
index 0000000000..309e42aa50
--- /dev/null
+++ b/system/opendoas/opendoas.info
@@ -0,0 +1,10 @@
+PRGNAM="opendoas"
+VERSION="6.8.2"
+HOMEPAGE="https://github.com/Duncaen/OpenDoas"
+DOWNLOAD="https://github.com/Duncaen/OpenDoas/archive/v6.8.2/OpenDoas-6.8.2.tar.gz"
+MD5SUM="f31c3ae51307f28df45d4e3445842560"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="%README%"
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/opendoas/slack-desc b/system/opendoas/slack-desc
new file mode 100644
index 0000000000..46fac914ef
--- /dev/null
+++ b/system/opendoas/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+opendoas: opendoas (port of doas from OpenBSD)
+opendoas:
+opendoas: doas is a sudo alternative originally written for OpenBSD. It allows
+opendoas: a user to run a command as a different user, most often root. doas
+opendoas: offers simple configuration syntax; create a config file at
+opendoas: /etc/doas.conf to get started. See doas.conf(5).
+opendoas:
+opendoas:
+opendoas: Author: Ted Unangst
+opendoas: Port author: Duncan Overbruck
+opendoas: https://github.com/Duncaen/OpenDoas
diff --git a/system/openmpi/README b/system/openmpi/README
index 0bb48775c8..6262f9d2db 100644
--- a/system/openmpi/README
+++ b/system/openmpi/README
@@ -5,3 +5,6 @@ industry partners.
 
 Optional dependency:
 PMI=yes|no (default: no), requires slurm
+
+Note: openmpi conflicts with mpich . If you install both on the same
+system, unexpected results may occur.
diff --git a/system/openmpi/openmpi.SlackBuild b/system/openmpi/openmpi.SlackBuild
index a020943e59..538669e57b 100644
--- a/system/openmpi/openmpi.SlackBuild
+++ b/system/openmpi/openmpi.SlackBuild
@@ -1,11 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for Open MPI
 #
 # Copyright 2010  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
-# Copyright 2015-2020 Emmanuel N. Millan, Mendoza, Argentina.
+# Copyright 2015-2024 Emmanuel N. Millan, Mendoza, Argentina.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,12 +25,15 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=openmpi
-VERSION=${VERSION:-4.0.5}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.1.6}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -44,6 +47,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -100,7 +111,7 @@ for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i
 find $PKG/etc -type f -exec mv {} {}.new \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS INSTALL LICENSE NEWS README VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENSE NEWS README VERSION $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -108,4 +119,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/openmpi/openmpi.info b/system/openmpi/openmpi.info
index 4ad02127e9..398e36d1a1 100644
--- a/system/openmpi/openmpi.info
+++ b/system/openmpi/openmpi.info
@@ -1,8 +1,8 @@
 PRGNAM="openmpi"
-VERSION="4.0.5"
+VERSION="4.1.6"
 HOMEPAGE="https://www.open-mpi.org/"
-DOWNLOAD="https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-4.0.5.tar.bz2"
-MD5SUM="d85ad67fb1d5decd78a4bb883874e289"
+DOWNLOAD="https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.6.tar.bz2"
+MD5SUM="c9b1c974cfc23c77c0fbdb965cd58a1c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/openrazer-daemon/README b/system/openrazer-daemon/README
new file mode 100644
index 0000000000..2120058111
--- /dev/null
+++ b/system/openrazer-daemon/README
@@ -0,0 +1,24 @@
+OpenRazer is an entirely open source driver and user-space daemon
+that allows you to manage your Razer peripherals on GNU/Linux.
+OpenRazer consists of a driver, a daemon and a Python library.
+
+In order for OpenRazer to work your user must a member of the
+plugdev group. A system reboot is recommended so the user group
+change takes effect, and to bind the OpenRazer driver.
+You also must load the kernel module (provided with the
+openrazer-kernel) with "modprobe razerkbd".
+
+To have this module load automatically at boot time, add the
+module to /etc/rc.d/rc.modules.local. Sometimes hot plugging your
+device while openrazer-deamon is running is necessary for it to
+recognize your razer device.
+
+OpenRazer is just a backend, it doesn't provide a graphical user
+interface for device configuration.
+For GUI configuration there are three programs available here at SBo:
+
+1) Polychromatic (Most feature rich, best looking, most recommended)
+2) Razergenie (QT5 based GUI)
+3) Razercommander (GTK3 based GUI)
+
+For device compatibility see the projects homepage.
diff --git a/system/openrazer-daemon/doinst.sh b/system/openrazer-daemon/doinst.sh
new file mode 100644
index 0000000000..a25271d80c
--- /dev/null
+++ b/system/openrazer-daemon/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications
+fi
+
+# If other icon themes are installed, then add to/modify this as needed
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/openrazer-daemon/openrazer-daemon.SlackBuild b/system/openrazer-daemon/openrazer-daemon.SlackBuild
new file mode 100644
index 0000000000..b17a529544
--- /dev/null
+++ b/system/openrazer-daemon/openrazer-daemon.SlackBuild
@@ -0,0 +1,128 @@
+#!/bin/bash
+
+# Slackware build script for openrazer-daemon
+
+# Copyright 2021 Matt Dinslage (daedra1980@gmail.com), Springfield, MO
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=openrazer-daemon
+VERSION=${VERSION:-3.8.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM=openrazer
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Fix MANDIR
+sed -i 's,/share/man,/man,g' daemon/Makefile
+
+make python_library_install DESTDIR=$PKG
+make daemon_install DESTDIR=$PKG
+make udev_install DESTDIR=$PKG
+
+# Not a systemd distro
+rm -r $PKG/usr/lib/systemd
+
+# Add scalable icons
+mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps/
+cp logo/*.svg $PKG/usr/share/icons/hicolor/scalable/apps/
+
+# Add application icons
+for i in 16 24 32 48 64 96 128 256; do
+  mkdir -p $PKG/usr/share/icons/hicolor/${i}x${i}/apps
+  convert -background none $PKG/usr/share/icons/hicolor/scalable/apps/openrazer-chroma.svg -resize ${i}x${i} \
+    $PKG/usr/share/icons/hicolor/${i}x${i}/apps/openrazer-chroma.png
+  convert -background none $PKG/usr/share/icons/hicolor/scalable/apps/openrazer-static.svg -resize ${i}x${i} \
+    $PKG/usr/share/icons/hicolor/${i}x${i}/apps/openrazer-static.png
+done
+
+# Add Launcher
+mkdir -p $PKG/usr/share/applications
+cat install_files/desktop/openrazer-daemon.desktop > $PKG/usr/share/applications/openrazer-daemon.desktop
+sed -i 's,/usr/share/pixmaps/python3.xpm,openrazer-chroma,g' \
+  $PKG/usr/share/applications/openrazer-daemon.desktop
+sed -i '10iCategories=Utility;' $PKG/usr/share/applications/openrazer-daemon.desktop
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md LICENSES/GPL-2.0-or-later.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/openrazer-daemon/openrazer-daemon.info b/system/openrazer-daemon/openrazer-daemon.info
new file mode 100644
index 0000000000..c7325e16e8
--- /dev/null
+++ b/system/openrazer-daemon/openrazer-daemon.info
@@ -0,0 +1,10 @@
+PRGNAM="openrazer-daemon"
+VERSION="3.8.0"
+HOMEPAGE="https://openrazer.github.io/"
+DOWNLOAD="https://github.com/openrazer/openrazer/releases/download/v3.8.0/openrazer-3.8.0.tar.xz"
+MD5SUM="fb48c21d672e432163d2b25b5d5c5553"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="setproctitle pyudev python3-numpy python-daemonize openrazer-kernel"
+MAINTAINER="M.Dinslage"
+EMAIL="matthewdinslage@gmail.com"
diff --git a/system/openrazer-daemon/slack-desc b/system/openrazer-daemon/slack-desc
new file mode 100644
index 0000000000..3bdf29d1a4
--- /dev/null
+++ b/system/openrazer-daemon/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                |-----handy-ruler------------------------------------------------------|
+openrazer-daemon: openrazer-daemon (Razer Drivers for Linux)
+openrazer-daemon:
+openrazer-daemon: An entirely open source driver and user-space daemon that allows
+openrazer-daemon: you to manage your Razer peripherals on GNU/Linux.
+openrazer-daemon:
+openrazer-daemon:
+openrazer-daemon:
+openrazer-daemon:
+openrazer-daemon:
+openrazer-daemon:
+openrazer-daemon:
diff --git a/system/openrazer-kernel/README b/system/openrazer-kernel/README
new file mode 100644
index 0000000000..c49c697473
--- /dev/null
+++ b/system/openrazer-kernel/README
@@ -0,0 +1 @@
+This is the kernel-modules needed by the openrazer-deamon package.
diff --git a/system/openrazer-kernel/doinst.sh b/system/openrazer-kernel/doinst.sh
new file mode 100644
index 0000000000..d6854814a0
--- /dev/null
+++ b/system/openrazer-kernel/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x /sbin/depmod ]; then
+  /sbin/depmod -a $KERNEL 1> /dev/null 2> /dev/null
+fi
+
diff --git a/system/openrazer-kernel/openrazer-kernel.SlackBuild b/system/openrazer-kernel/openrazer-kernel.SlackBuild
new file mode 100644
index 0000000000..3451624d02
--- /dev/null
+++ b/system/openrazer-kernel/openrazer-kernel.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# Slackware build script for openrazer-kernel
+
+# Copyright 2022 Matt Dinslage (daedra1980@gmail.com), Springfield, MO
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=openrazer-kernel
+VERSION=${VERSION:-3.8.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM=openrazer
+
+KERNEL=${KERNEL:-$(uname -r)}
+PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make setup_dkms DESTDIR=$PKG KERNELDIR=/lib/modules/$KERNEL/build MODULEDIR=/lib/modules/$KERNEL/kernel/drivers/hid
+
+# Build and install kernel modules
+mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/hid
+make -C $PKG/usr/src/$SRCNAM-driver-$VERSION KERNELDIR=/lib/modules/$KERNEL/build MODULEDIR=/lib/modules/$KERNEL/kernel/drivers/hid
+install -m 0664 $PKG/usr/src/$SRCNAM-driver-$VERSION/driver/*.ko $PKG/lib/modules/$KERNEL/kernel/drivers/hid
+
+# Once the modules are built, we don't need to keep the dkms stuff.
+rm -r $PKG/usr/src
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER
+cp -a \
+  README.md LICENSES/GPL-2.0-or-later.txt \
+  $PKG/usr/doc/$PRGNAM-$PKGVER
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/openrazer-kernel/openrazer-kernel.info b/system/openrazer-kernel/openrazer-kernel.info
new file mode 100644
index 0000000000..95416408d1
--- /dev/null
+++ b/system/openrazer-kernel/openrazer-kernel.info
@@ -0,0 +1,10 @@
+PRGNAM="openrazer-kernel"
+VERSION="3.8.0"
+HOMEPAGE="https://openrazer.github.io/"
+DOWNLOAD="https://github.com/openrazer/openrazer/releases/download/v3.8.0/openrazer-3.8.0.tar.xz"
+MD5SUM="fb48c21d672e432163d2b25b5d5c5553"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="M.Dinslage"
+EMAIL="matthewdinslage@gmail.com"
diff --git a/system/openrazer-kernel/slack-desc b/system/openrazer-kernel/slack-desc
new file mode 100644
index 0000000000..494ea627a4
--- /dev/null
+++ b/system/openrazer-kernel/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                |-----handy-ruler------------------------------------------------------|
+openrazer-kernel: openrazer-kernel (kernel modules for openrazer)
+openrazer-kernel:
+openrazer-kernel: This is the kernel modules needed by openrazer-daemon
+openrazer-kernel:
+openrazer-kernel:
+openrazer-kernel:
+openrazer-kernel:
+openrazer-kernel:
+openrazer-kernel:
+openrazer-kernel:
+openrazer-kernel:
diff --git a/system/openrc-services/doinst.sh b/system/openrc-services/doinst.sh
index 0d935bab1f..58c12240fd 100644
--- a/system/openrc-services/doinst.sh
+++ b/system/openrc-services/doinst.sh
@@ -31,8 +31,15 @@ for file in etc/openrc/local.d/*.new; do
   preserve_perms "${file}"
 done
 
+# Enable some basic services
+[ ! -e "etc/openrc/runlevels/sysinit/udev" ] && ln -s /etc/openrc/init.d/udev "etc/openrc/runlevels/sysinit/udev"
+[ ! -e "etc/openrc/runlevels/sysinit/udev-trigger" ] && ln -s /etc/openrc/init.d/udev-trigger "etc/openrc/runlevels/sysinit/udev-trigger"
+
 # disable udev-postmount
 [ -e "etc/openrc/runlevels/sysinit/udev-postmount" ] && rm -v "etc/openrc/runlevels/sysinit/udev-postmount"
 
 # disable kmod-static-nodes (openrc-0.26.1, 2017-05-14)
 [ -e "etc/openrc/runlevels/sysinit/kmod-static-nodes" ] && rm -v "etc/openrc/runlevels/sysinit/kmod-static-nodes"
+
+# maintain compatibilty with previous xdm script
+ln -sf /usr/bin/startDM "etc/X11/startDM.sh"
diff --git a/system/openrc-services/openrc-services.SlackBuild b/system/openrc-services/openrc-services.SlackBuild
index c9e3b1319d..4373821c98 100644
--- a/system/openrc-services/openrc-services.SlackBuild
+++ b/system/openrc-services/openrc-services.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for openrc-services
 # Based upon https://github.com/manjaro/packages-openrc
 
-# Copyright 2015-2019 Aaditya Bagga <aaditya_gnulinux@zoho.com>
+# Copyright 2015-2019 Aaditya <aaditya_gnulinux@zoho.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=openrc-services
-VERSION=${VERSION:-20190917}
+VERSION=${VERSION:-20210926}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -77,11 +87,6 @@ SYSCONFDIR="$SYSCONFDIR" sh install.sh "$PKG"
 # Install slackware compatibility services
 install -Dm 644 misc/local.d/rcM.start "$PKG/etc/openrc/local.d/rcM.start"
 
-# Enable some basic services
-install -d "$PKG/etc/openrc/runlevels/sysinit"
-ln -sf /etc/openrc/init.d/udev "$PKG/etc/openrc/runlevels/sysinit/udev"
-ln -sf /etc/openrc/init.d/udev-trigger "$PKG/etc/openrc/runlevels/sysinit/udev-trigger"
-
 # Backup config files
 for file in $PKG/etc/openrc/conf.d/*; do
   mv "$file" "${file}.new"
@@ -93,7 +98,7 @@ done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  README.md COPYING \
+  README.md COPYING NEWS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -103,4 +108,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/openrc-services/openrc-services.info b/system/openrc-services/openrc-services.info
index c52dd5ae89..3690f4f11b 100644
--- a/system/openrc-services/openrc-services.info
+++ b/system/openrc-services/openrc-services.info
@@ -1,10 +1,10 @@
 PRGNAM="openrc-services"
-VERSION="20190917"
-HOMEPAGE="https://gitlab.com/aadityabagga/openrc-services"
-DOWNLOAD="https://gitlab.com/aadityabagga/openrc-services/-/archive/20190917/openrc-services-20190917.tar.gz"
-MD5SUM="96aa3c1c9380b67ae61565baf3f123a9"
+VERSION="20210926"
+HOMEPAGE="https://gitlab.com/abchk1234/openrc-services"
+DOWNLOAD="https://gitlab.com/abchk1234/openrc-services/-/archive/20210926/openrc-services-20210926.tar.gz"
+MD5SUM="1cfc9b0e1e993060fcd0609f19cd506c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="openrc"
-MAINTAINER="Aaditya Bagga"
+MAINTAINER="Aaditya"
 EMAIL="aaditya_gnulinux@zoho.com"
diff --git a/system/openrc-settingsd/README b/system/openrc-settingsd/README
new file mode 100644
index 0000000000..491bd273e7
--- /dev/null
+++ b/system/openrc-settingsd/README
@@ -0,0 +1,6 @@
+OpenRC-settingsd provides an implementation of the the hostnamed,
+localed, and timedated D-Bus services for OpenRC-based systems - in
+particular, for typical installations of Gentoo or Slackware Linux.
+
+Just add /etc/rc.d/rc.openrc-settingsd start/stop to your rc.local
+and rc.local_shutdown scripts.
diff --git a/system/openrc-settingsd/doinst.sh b/system/openrc-settingsd/doinst.sh
new file mode 100644
index 0000000000..8595949c24
--- /dev/null
+++ b/system/openrc-settingsd/doinst.sh
@@ -0,0 +1,24 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.openrc-settingsd.new
diff --git a/system/openrc-settingsd/openrc-settingsd.SlackBuild b/system/openrc-settingsd/openrc-settingsd.SlackBuild
new file mode 100644
index 0000000000..4756d72fac
--- /dev/null
+++ b/system/openrc-settingsd/openrc-settingsd.SlackBuild
@@ -0,0 +1,132 @@
+#!/bin/bash
+
+# Slackware build script for openrc-settingsd
+
+# Copyright © 2023 Nathaniel Russell <naterussell83@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=openrc-settingsd
+VERSION=${VERSION:-1.4.0}
+TAG=${TAG:-_SBo}
+BUILD=${BUILD:-1}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PRGNAM-v$VERSION
+tar xvf $CWD/$PRGNAM-v$VERSION.tar.?z || exit 1
+cd $PRGNAM-v$VERSION || exit 1
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dopenrc=disabled \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+install -vDm 0755 $CWD/rc.openrc-settingsd.new -t $PKG/etc/rc.d/
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.*
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README TODO COPYING AUTHORS \
+    $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/openrc-settingsd/openrc-settingsd.info b/system/openrc-settingsd/openrc-settingsd.info
new file mode 100644
index 0000000000..f3a530b76e
--- /dev/null
+++ b/system/openrc-settingsd/openrc-settingsd.info
@@ -0,0 +1,10 @@
+PRGNAM="openrc-settingsd"
+VERSION="1.4.0"
+HOMEPAGE="https://gitlab.com/postmarketOS/openrc-settingsd"
+DOWNLOAD="https://gitlab.com/postmarketOS/openrc-settingsd/-/archive/v1.4.0/openrc-settingsd-v1.4.0.tar.gz"
+MD5SUM="a8b763de04a4e4f00e802a39ffb2a68c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Nathaniel Russell"
+EMAIL="naterussell83@gmail.com"
diff --git a/system/openrc-settingsd/rc.openrc-settingsd.new b/system/openrc-settingsd/rc.openrc-settingsd.new
new file mode 100644
index 0000000000..720739a1c6
--- /dev/null
+++ b/system/openrc-settingsd/rc.openrc-settingsd.new
@@ -0,0 +1,28 @@
+#!/bin/bash
+NAME=openrc-settingsd
+host=$(hostname -s)
+start() {
+echo "Starting Openrc-Settingsd Services: "
+        /usr/libexec/$NAME --syslog > /dev/null 2>&1 &
+}
+
+stop() {
+echo "Stopping Openrc-Settingsd Services: "
+#Find the Process ID for openrc-settingsd running instance
+ps -ef | grep openrc-settingsd | grep -v grep | awk '{print $2}' | xargs kill
+}
+
+restart() {
+  stop
+  sleep 3
+  start
+}
+
+case "$1" in
+    start)   start ;;
+    stop)    stop ;;
+    restart) stop; start ;;
+    *) echo "usage: $0 start|stop|restart" >&2
+       exit 1
+       ;;
+esac
diff --git a/system/openrc-settingsd/slack-desc b/system/openrc-settingsd/slack-desc
new file mode 100644
index 0000000000..1895e3ab72
--- /dev/null
+++ b/system/openrc-settingsd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+openrc-settingsd: openrc-settingsd (D-Bus services for OpenRC-based systems)
+openrc-settingsd:
+openrc-settingsd: OpenRC-settingsd provides an implementation of the the hostnamed,
+openrc-settingsd: localed, and timedated D-Bus services for OpenRC-based systems - in
+openrc-settingsd: particular, for typical installations of Gentoo or Slackware Linux.
+openrc-settingsd:
+openrc-settingsd:
+openrc-settingsd: Homepage: https://gitweb.gentoo.org/proj/openrc-settingsd.git
+openrc-settingsd:
+openrc-settingsd:
+openrc-settingsd:
diff --git a/system/openrc/README b/system/openrc/README
index ff976bf47e..64ea7b3c29 100644
--- a/system/openrc/README
+++ b/system/openrc/README
@@ -1,8 +1,9 @@
-OpenRC is a dependency based service manager that works with the system provided
-init system.
+OpenRC is a dependency based service manager that works with the
+system provided init system.
 
 For installation instructions see README.Slackware.
 
 Services for OpenRC can be found in the openrc-services package.
 
-For more information see http://docs.slackware.com/howtos:general_admin:openrc
+For more information, see:
+http://docs.slackware.com/howtos:general_admin:openrc
diff --git a/system/openrc/openrc.SlackBuild b/system/openrc/openrc.SlackBuild
index 03c759879c..d027124cb1 100644
--- a/system/openrc/openrc.SlackBuild
+++ b/system/openrc/openrc.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for openrc
 # Based upon https://aur.archlinux.org/packages/openrc/
 
-# Copyright 2015-2019 Aaditya Bagga <aaditya_gnulinux@zoho.com>
+# Copyright 2015-2019 Aaditya <aaditya_gnulinux@zoho.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220208 bkw: modified by SlackBuilds.org to fix 15.0 build, and to
+# actually use SLKCFLAGS.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=openrc
-VERSION=${VERSION:-0.42.1}
+VERSION=${VERSION:-0.44.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -83,6 +93,7 @@ MAKEARGS+=(MKTERMCAP=ncurses)
 MAKEARGS+=(MKSYSVINIT=no)
 MAKEARGS+=(MKBASHCOMP=yes)
 MAKEARGS+=(MKZSHCOMP=yes)
+MAKEARGS+=(CFLAGS="$SLKCFLAGS -fcommon")
 #MAKEARGS+=(BRANDING="$(cat /etc/slackware-version)")
 
 make "${MAKEARGS[@]}"
@@ -106,7 +117,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog NEWS.md README.md README.newnet TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog HISTORY.md LICENSE NEWNET.md NEWS.md README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -114,4 +125,4 @@ cat $CWD/doinst.sh >> $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/openrc/openrc.info b/system/openrc/openrc.info
index 13363e8341..0ef05e6d76 100644
--- a/system/openrc/openrc.info
+++ b/system/openrc/openrc.info
@@ -1,10 +1,10 @@
 PRGNAM="openrc"
-VERSION="0.42.1"
+VERSION="0.44.10"
 HOMEPAGE="https://github.com/OpenRC/openrc"
-DOWNLOAD="https://github.com/OpenRC/openrc/archive/0.42.1.tar.gz"
-MD5SUM="1a3de67032d59529460f150e2db859f1"
+DOWNLOAD="https://github.com/OpenRC/openrc/archive/0.44.10/openrc-0.44.10.tar.gz"
+MD5SUM="9e0cd60b1898a3bb1de662d28d105592"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Aaditya Bagga"
+MAINTAINER="Aaditya"
 EMAIL="aaditya_gnulinux@zoho.com"
diff --git a/system/opensc/README b/system/opensc/README
index ccbd4d21d1..4eee6ffb1f 100644
--- a/system/opensc/README
+++ b/system/opensc/README
@@ -1,22 +1,23 @@
 SmartCard utilities/libraries for PKCS#11/15 compatible cards
 
-This package provides a set of libraries and utilities to access smart
-cards. Its main focus is on cards that support cryptographic operations,
-and facilitate their use in security applications such as mail encryption,
-authentication, and digital signature. OpenSC implements the PKCS#11
-API so applications supporting this API such as Mozilla Firefox and
-Thunderbird can use it. OpenSC implements the PKCS#15 standard and aims
-to be compatible with every software that does so, too.
+This package provides a set of libraries and utilities to access
+smart cards. Its main focus is on cards that support cryptographic
+operations, and facilitate their use in security applications such
+as mail encryption, authentication, and digital signature. OpenSC
+implements the PKCS#11 API so applications supporting this API such
+as Mozilla Firefox and Thunderbird can use it. OpenSC implements the
+PKCS#15 standard and aims to be compatible with every software that
+does so, too.
 
-You may need to edit /etc/opensc.conf in order to use a particular backend
-and smartcard.
+You may need to edit /etc/opensc.conf in order to use a particular
+backend and smartcard.
 
 Beware! Smartcards have usually a limited number of times you may try a
 wrong PIN/PUK combination before they become inoperable/permanently
 blocked. You have been warned!
 
-Since version 0.12.0, only one reader subsystem can be used and compiled
-in at the same time.  The PCSC-LITE subsystem is used by default and it is
-suitable for most smartcards.  If you need the OPENCT subsystem instead,
-you have to pass "OPENCT=1" to the script when building and have the
-optional dependency openct installed.
+Since version 0.12.0, only one reader subsystem can be used and
+compiled in at the same time. The PCSC-LITE subsystem is used by
+default and it is suitable for most smartcards. If you need the
+OPENCT subsystem instead, you have to pass "OPENCT=1" to the script
+when building and have the optional dependency openct installed.
diff --git a/system/opensc/doinst.sh b/system/opensc/doinst.sh
index 92ce19f61c..6d8bb11040 100644
--- a/system/opensc/doinst.sh
+++ b/system/opensc/doinst.sh
@@ -12,3 +12,7 @@ config() {
 }
 
 config etc/opensc.conf.new
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/system/opensc/opensc.SlackBuild b/system/opensc/opensc.SlackBuild
index bdabbf092b..8c5a363c4c 100644
--- a/system/opensc/opensc.SlackBuild
+++ b/system/opensc/opensc.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for opensc
 
 # Copyright 2008-2015  LukenShiro, Italy
-# Copyright 2018-2020  Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2018-2023  Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - add update-desktop-database to doinst.sh.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=opensc
-VERSION=${VERSION:-0.20.0}
+VERSION=${VERSION:-0.23.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,13 +42,17 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 DOCFILES="README COPYING NEWS"
-XSL_STYLESHEETS_VER=1.78.1
+XSL_STYLESHEETS_VER=$(export LS_OPTIONS='' ; ls -1 /usr/share/xml/docbook/ | grep xsl-stylesheets- | cut -d- -f3)
 
 # opensc now supports only one reader subsystem (pcsc-lite or openct)
 OPENCT=${OPENCT:-0}	# pcsc-lite is the default, openct disabled
@@ -77,9 +87,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # --enable-nsplugin and --with-pinentry= are no longer supported.
 CFLAGS="$SLKCFLAGS" \
@@ -100,17 +110,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
+rm -f $PKG/usr/lib*/*.la
 
 # Don't clobber the config file
 mv $PKG/etc/opensc.conf $PKG/etc/opensc.conf.new
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
 cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -120,4 +126,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/opensc/opensc.info b/system/opensc/opensc.info
index efff885d86..071b30104b 100644
--- a/system/opensc/opensc.info
+++ b/system/opensc/opensc.info
@@ -1,8 +1,8 @@
 PRGNAM="opensc"
-VERSION="0.20.0"
+VERSION="0.23.0"
 HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki/"
-DOWNLOAD="https://github.com/OpenSC/OpenSC/releases/download/0.20.0/opensc-0.20.0.tar.gz"
-MD5SUM="c291219b6189793430f9d0c40b42b907"
+DOWNLOAD="https://github.com/OpenSC/OpenSC/releases/download/0.23.0/opensc-0.23.0.tar.gz"
+MD5SUM="35c599e673ae9205550974e2dcbe0825"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pcsc-lite"
diff --git a/system/openscap/openscap.SlackBuild b/system/openscap/openscap.SlackBuild
index dc6dcaec92..7bed27d43d 100644
--- a/system/openscap/openscap.SlackBuild
+++ b/system/openscap/openscap.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for openscap
 
@@ -22,26 +22,37 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org: updated for v1.3.6,
+# as the old version wouldn't build on 15.0. This means switching to
+# cmake and adding xmlsec as a dependency.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=openscap
-VERSION=${VERSION:-1.2.9}
+VERSION=${VERSION:-1.3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,31 +76,23 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-./autogen.sh
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
@@ -99,4 +102,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/openscap/openscap.info b/system/openscap/openscap.info
index e21ce42556..fa95589c53 100644
--- a/system/openscap/openscap.info
+++ b/system/openscap/openscap.info
@@ -1,10 +1,10 @@
 PRGNAM="openscap"
-VERSION="1.2.9"
+VERSION="1.3.6"
 HOMEPAGE="https://www.open-scap.org/"
-DOWNLOAD="https://github.com/OpenSCAP/openscap/archive/1.2.9.tar.gz"
-MD5SUM="ba1274f75f82c8e8918aa2f2e2bf103b"
+DOWNLOAD="https://github.com/OpenSCAP/openscap/archive/1.3.6/openscap-1.3.6.tar.gz"
+MD5SUM="1b95ac653cb4487e01ac6bc959885364"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="xmlsec"
 MAINTAINER="Vincent Batts"
 EMAIL="vbatts@hashbangbash.com"
diff --git a/system/openstego/README b/system/openstego/README
index 0879579ef1..ea7e945ef8 100644
--- a/system/openstego/README
+++ b/system/openstego/README
@@ -1,11 +1,13 @@
 openstego (the free steganography solution)
 
-Note: openstego works with openjdk8, if you prefer not to install the
-Oracle jdk. It does NOT work with openjdk7 or older.
-
 OpenStego is a tool implemented in Java for generic steganography,
 with support for password-based encryption of the data.
 
+Note: openstego lists zulu-openjdk11 as a required dependency.
+However, it may also work with other JDK >= 11 packages such as jdk11,
+zulu-openjdk17, OpenJDK11, or OpenJDK17. It will *not* work with jdk,
+openjdk8, nor zulu-openjdk8.
+
 Features:
 
  - OpenStego is written in pure Java and should run on all platforms
diff --git a/system/openstego/doinst.sh b/system/openstego/doinst.sh
index 5fb28930db..65c7e2eeb9 100644
--- a/system/openstego/doinst.sh
+++ b/system/openstego/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/openstego/icons/128.png b/system/openstego/icons/128.png
new file mode 100644
index 0000000000..9a3a97d79f
--- /dev/null
+++ b/system/openstego/icons/128.png
diff --git a/system/openstego/icons/16.png b/system/openstego/icons/16.png
new file mode 100644
index 0000000000..c3485254b0
--- /dev/null
+++ b/system/openstego/icons/16.png
diff --git a/system/openstego/icons/22.png b/system/openstego/icons/22.png
new file mode 100644
index 0000000000..392cdc6762
--- /dev/null
+++ b/system/openstego/icons/22.png
diff --git a/system/openstego/icons/32.png b/system/openstego/icons/32.png
new file mode 100644
index 0000000000..198144fe7b
--- /dev/null
+++ b/system/openstego/icons/32.png
diff --git a/system/openstego/icons/48.png b/system/openstego/icons/48.png
new file mode 100644
index 0000000000..7efacec9d6
--- /dev/null
+++ b/system/openstego/icons/48.png
diff --git a/system/openstego/icons/64.png b/system/openstego/icons/64.png
new file mode 100644
index 0000000000..08201538be
--- /dev/null
+++ b/system/openstego/icons/64.png
diff --git a/system/openstego/icons/96.png b/system/openstego/icons/96.png
new file mode 100644
index 0000000000..886df705d5
--- /dev/null
+++ b/system/openstego/icons/96.png
diff --git a/system/openstego/icons/openstego.svg b/system/openstego/icons/openstego.svg
new file mode 100644
index 0000000000..c0646c4383
--- /dev/null
+++ b/system/openstego/icons/openstego.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" id="openstego" version="1.0">
+  <g transform="matrix(1.453999,0,0,1.453999,-259.6164,-661.5958)">
+    <path id="docBorder"
+        style="fill:#eae6ff;fill-opacity:1;fill-rule:nonzero;stroke:#000881;stroke-width:2.44472575;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+        d="M 218.31065,456.27113 L 251.25118,456.27113 L 265.8171,472.94306 L 265.8171,513.67131 L 218.31065,513.67131 L 218.31065,456.27113 z M 251.23967,456.22792 L 251.23967,472.93014 C 251.23967,472.93014 261.97902,472.93014 265.81902,472.93014"/>
+    <path id="docLine1"
+        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000881;stroke-width:4.13519478;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+        d="M 224.33584,466.70479 L 245.45975,466.70479"/>
+    <path id="docLine2"
+        d="M 224.64714,479.06041 L 258.33499,479.06041"
+        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000881;stroke-width:4.13519478;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+    <path id="docLine3"
+        d="M 224.64714,491.41611 L 258.33499,491.41611"
+        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000881;stroke-width:4.13519478;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+    <path id="docLine4"
+        d="M 224.64714,503.77176 L 258.33498,503.77176"
+        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000881;stroke-width:4.13519478;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+  </g>
+  <g transform="matrix(1.593152,0,0,1.593152,-79.50907,-657.5661)">
+    <rect id="imgBorder"
+        style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#700000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+        width="49.716938"
+        height="49.716938"
+        x="51.657085"
+        y="441.83261"
+        ry="0"/>
+    <path id="imgContent"
+        style="fill:#0b760f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+        d="M 52.337777,478.61802 L 64.760647,459.03654 L 71.782271,470.40643 L 86.365642,450.1933 L 100.40889,467.24813 L 100.40889,490.61957 L 52.337777,490.61957 L 52.337777,478.61802 z "/>
+  </g>
+  <path id="arrow"
+      d="M 49.444682,53.153416 C 42.843541,36.957241 62.167937,29.269184 78.155317,31.304658 L 78.155317,9.4558852 C 33.516292,9.6389542 21.476651,39.195285 22.784779,53.153416 L 22.784779,53.153416 L 8.4294322,53.153416 L 36.11473,74.192915 L 63.800029,53.153416 L 49.444682,53.153416 L 49.444682,53.153416"
+      style="fill:#dd3c00;fill-opacity:1;stroke:none;stroke-width:1.80180204"/>
+</svg>
diff --git a/system/openstego/openstego.SlackBuild b/system/openstego/openstego.SlackBuild
index 928befcd4c..f3438c197a 100644
--- a/system/openstego/openstego.SlackBuild
+++ b/system/openstego/openstego.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for openstego
 
 # Copyright 2012-2014  Fridrich von Stauffenberg <email removed>
-# Copyright 2018 B. Watson <yalhcru@gmail.com>
+# Copyright 2018-2023 B. Watson <urchlay@slackware.uk>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,6 +23,20 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230713 bkw:
+# - update for v0.8.6.
+# - new-style icons.
+# - enable antialiased fonts in wrapper script.
+# - update doinst.sh.
+
+# 20221228 bkw: update for v0.8.5.
+
+# 20220610 bkw:
+# - update for v0.8.4.
+# - requires v11 JDK now, update README note.
+
+# 20210221 bkw: update for v0.8.0.
+
 # 20200708 bkw:
 # - Update for v0.7.4.
 # - Add README note about openjdk8.
@@ -33,14 +47,21 @@
 # - Increase java's allowed memory usage from 512M to 1024M in
 #   openstego.sh. This matches upstream's recommendation.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=openstego
-VERSION=${VERSION:-0.7.4}
+VERSION=${VERSION:-0.8.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -62,9 +83,23 @@ mkdir -p $PKG/usr/bin
 cat $CWD/$PRGNAM.sh > $PKG/usr/bin/$PRGNAM
 chmod 755 $PKG/usr/bin/$PRGNAM
 
+# 20230713 bkw: new-style prescaled and scalable icons. openstego.svg
+# comes from upstream's official .deb package, on the github releases page,
+# and the rest of the icons were made by rendering it with rsvg-convert.
+hicolor=$PKG/usr/share/icons/hicolor
+for i in $CWD/icons/*.png; do
+  px="$( basename $i | cut -d. -f1 )"
+  sz=${px}x${px}
+  mkdir -p $hicolor/$sz/apps
+  cat $i > $hicolor/$sz/apps/$PRGNAM.png
+done
+
+mkdir -p $hicolor/scalable/apps
+cat $CWD/icons/$PRGNAM.svg > $hicolor/scalable/apps/$PRGNAM.svg
+
 mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
@@ -75,4 +110,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/openstego/openstego.info b/system/openstego/openstego.info
index 2ef7e2490f..67659b2067 100644
--- a/system/openstego/openstego.info
+++ b/system/openstego/openstego.info
@@ -1,10 +1,10 @@
 PRGNAM="openstego"
-VERSION="0.7.4"
+VERSION="0.8.6"
 HOMEPAGE="https://www.openstego.com/"
-DOWNLOAD="https://github.com/syvaidya/openstego/releases/download/openstego-0.7.4/openstego-0.7.4.zip"
-MD5SUM="7b3b893d96e1ceb56c313bd89d9c16e2"
+DOWNLOAD="https://github.com/syvaidya/openstego/releases/download/openstego-0.8.6/openstego-0.8.6.zip"
+MD5SUM="2e16eca78a907c4385418b5fa3c3e655"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk11"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/openstego/openstego.png b/system/openstego/openstego.png
deleted file mode 100644
index 8f64ff961d..0000000000
--- a/system/openstego/openstego.png
+++ /dev/null
diff --git a/system/openstego/openstego.sh b/system/openstego/openstego.sh
index 77134c081f..b7006e93f3 100644
--- a/system/openstego/openstego.sh
+++ b/system/openstego/openstego.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec java -Xmx1024m -jar /usr/share/openstego/openstego.jar "$@"
+exec java -Dawt.useSystemAAFontSettings=on -Xmx1024m -jar /usr/share/openstego/openstego.jar "$@"
diff --git a/system/openzfs/README b/system/openzfs/README
new file mode 100644
index 0000000000..da0611b5d6
--- /dev/null
+++ b/system/openzfs/README
@@ -0,0 +1,17 @@
+ZFS is a modern filesystem originally developed for Solaris. It provides
+many functionalities such as snapshots, data compression, data recovery,
+filesystem (snapshot) sending/reveiving, and more.
+
+NOTES
+
+- You'll need the kernel source code to be able to compile this. This
+  package is kernel dependent, so you'll need to recompile it for every
+  new kernel you choose to run.
+
+- Please use KERNEL environment variable if target kernel version
+  differs from that of the build machine, e.g. `export KERNEL=5.15.116`.
+
+- Dracut support is compiled in if dracut is installed at the time of
+  building.
+
+- Openzfs requires i686 on Slackware-x86. i586 will fail to build.
diff --git a/system/zfs-on-linux/doinst.sh b/system/openzfs/doinst.sh
index abc7164225..abc7164225 100644
--- a/system/zfs-on-linux/doinst.sh
+++ b/system/openzfs/doinst.sh
diff --git a/system/openzfs/openzfs.SlackBuild b/system/openzfs/openzfs.SlackBuild
new file mode 100644
index 0000000000..3b56954416
--- /dev/null
+++ b/system/openzfs/openzfs.SlackBuild
@@ -0,0 +1,155 @@
+#!/bin/bash
+
+# Slackware build script for openzfs
+
+# Copyright 2023 Matt Egger <bru.barwal@sdf.org>, USA
+# Copyright 2021-23 Markus Reichelt <slackbuilds@mareichelt.de>, Germany
+# Copyright 2017 Marcin Szychowski <szycha@gmail.com>, Poland
+# Copyright 2016 Kevin Paulus <goarilla@gmail.com>, Belgium
+# Copyright 2013-2014 Petr Hejl - Czech Republic
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Modified by the SlackBuilds.org project
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=openzfs
+SRCNAM=zfs
+VERSION=${VERSION:-2.2.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+KERNEL=${KERNEL:-"$(uname -r)"}
+PKGVER="$(printf %s "${VERSION}_${KERNEL}" | tr - _)"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i586) ARCH=i586 ;;
+    i686) ARCH=i686 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+# add support for dracut if installed
+if [ -f /usr/bin/dracut ]; then
+  DRACUTLIBDIR="--with-dracutdir=/usr/lib${LIBDIRSUFFIX}/dracut"
+else
+  DRACUTLIBDIR="";
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -fr $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./autogen.sh
+
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --localstatedir=/var \
+  --sysconfdir=/etc \
+  --libdir=/lib$LIBDIRSUFFIX \
+  --bindir=/usr/bin \
+  --sbindir=/sbin \
+  --includedir=/usr/include \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-linux="/lib/modules/${KERNEL}/source" \
+  --with-linux-obj="/lib/modules/${KERNEL}/source" \
+  --with-udevdir=/lib/udev \
+  --enable-static=no \
+  $DRACUTLIBDIR \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+# clean up leftovers
+if [ "$ARCH" = "x86_64" ]; then
+  rm -fr $PKG/usr/lib
+elif [ -z "${DRACUTLIBDIR}" ]; then 
+  rm -fr $PKG/usr/lib/dracut
+fi
+rm -fr $PKG/usr/src
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/etc/rc.d/init.d
+rm -fr $PKG/etc/init.d
+install -m 0755 -D $CWD/rc.zfs $PKG/etc/rc.d/rc.zfs.new
+ln -s ../rc.zfs $PKG/etc/rc.d/init.d/zfs
+mkdir -p $PKG/var/lock/zfs
+
+gzip -9 $PKG/usr/man/man*/*
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYRIGHT LICENSE META README.md NEWS NOTICE CODE_OF_CONDUCT.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/openzfs/openzfs.info b/system/openzfs/openzfs.info
new file mode 100644
index 0000000000..d09a5ee281
--- /dev/null
+++ b/system/openzfs/openzfs.info
@@ -0,0 +1,10 @@
+PRGNAM="openzfs"
+VERSION="2.2.3"
+HOMEPAGE="https://openzfs.org"
+DOWNLOAD="https://github.com/openzfs/zfs/releases/download/zfs-2.2.3/zfs-2.2.3.tar.gz"
+MD5SUM="e0f2b72ccd47a5b401cbc9f38b1d9073"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matt Egger"
+EMAIL="bru.barwal@sdf.org"
diff --git a/system/zfs-on-linux/rc.zfs b/system/openzfs/rc.zfs
index 7df2057908..7df2057908 100644
--- a/system/zfs-on-linux/rc.zfs
+++ b/system/openzfs/rc.zfs
diff --git a/system/openzfs/slack-desc b/system/openzfs/slack-desc
new file mode 100644
index 0000000000..3ee4d50ac4
--- /dev/null
+++ b/system/openzfs/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+openzfs: openzfs (ZFS support for Linux)
+openzfs:
+openzfs: ZFS is a combined file system and logical volume manager designed by
+openzfs: Sun Microsystems for Solaris.  It features protection against data
+openzfs: corruption, support for high storage capacities, efficient data
+openzfs: compression, snapshots, copy-on-write clones, continuous integrity
+openzfs: checking and automatic repair, native encryption, block-level data
+openzfs: deduplication, ability to serialize filesystems (snapshots)
+openzfs: e.g. to send/receive them over SSH, and many, many more.
+openzfs:
+openzfs: Homepage: https://openzfs.org
diff --git a/system/oracle-instantclient-basic/README b/system/oracle-instantclient-basic/README
index 7269943f7a..7692fde8de 100644
--- a/system/oracle-instantclient-basic/README
+++ b/system/oracle-instantclient-basic/README
@@ -5,12 +5,3 @@ JDBC-OCI applications.
 
 Oracle-xe and JRE or JDK packages are optional and depends on your
 needs.
-
-You need an Oracle account and you must Agree to Oracle's
-download agreement before this can be downloaded.
-You have to use a web browser to download it.
-
-Ensure that you download the correct RPM
-"Instant Client Package - Basic"
-For x86: oracle-instantclient12.1-basic-12.1.0.2.0-1.i386.rpm
-For x86_64: oracle-instantclient12.1-basic-12.1.0.2.0-1.x86_64.rpm
diff --git a/system/oracle-instantclient-basic/oracle-instantclient-basic.SlackBuild b/system/oracle-instantclient-basic/oracle-instantclient-basic.SlackBuild
index dc37774db2..ccece206d7 100644
--- a/system/oracle-instantclient-basic/oracle-instantclient-basic.SlackBuild
+++ b/system/oracle-instantclient-basic/oracle-instantclient-basic.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for oracle-instantclient-basic
 
@@ -22,38 +22,44 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=oracle-instantclient-basic
-VERSION=${VERSION:-12.1.0.2.0}
+VERSION=${VERSION:-21.5.0.0.0}
+SRCVER=${SRCVER:-21.5.0.0.0-1}
 RELEASE=${RELEASE:-1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-ORAVER="12.1"
+PKGTYPE=${PKGTYPE:-tgz}
+ORAVER="21"
 
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-      i?86) ARCH=i386 ;;
-    x86_64) ARCH=x86_64 ;;
-         *) echo "Architecture not supported"; exit 0;
-  esac
+  ARCH=$( uname -m )
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-
+# 2023-05-16 DW: moved above PRINT_PACKAGE_NAME
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
-  LIBDIRSUFFIX=""
+  echo "$ARCH architecture is unsupported." >/dev/stderr
+  exit 1
 fi
 
-# recreating the name of the RPM
-RPMNAM="$(echo ${PRGNAM} | cut -d '-' -f 1-2)\
-${ORAVER}-$(echo ${PRGNAM} | cut -d '-' -f 3)\
--$VERSION-$RELEASE.$ARCH.rpm"
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
 
+# recreating the name of the RPM
+RPMNAM="$PRGNAM-$VERSION-$RELEASE.$ARCH.rpm"
 set -e
 
 rm -rf $PKG
@@ -71,11 +77,11 @@ if [ "$LIBDIRSUFFIX" = "64" ]; then
     mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
 fi
 
-ORACLE_CLIENT_HOME="/usr/lib${LIBDIRSUFFIX}/oracle/${ORAVER}/\
-client${LIBDIRSUFFIX}"
+# 2023-05-16 DW: I think this is safer on a single line
+ORACLE_CLIENT_HOME="/usr/lib${LIBDIRSUFFIX}/oracle/${ORAVER}/client${LIBDIRSUFFIX}"
 
 # Testing if ORACLE already installed
-if [ ! -z "${ORACLE_HOME}" ]; then
+if [ "$ORACLE_HOME" ]; then
     # make symbolic links to client apps
     mkdir -p $PKG/$ORACLE_HOME/bin
     for app in $(ls $PKG/${ORACLE_CLIENT_HOME}/bin) ; do
@@ -84,18 +90,39 @@ if [ ! -z "${ORACLE_HOME}" ]; then
     done
 fi
 
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
 # Making csh file for profile.d
 mkdir -p $PKG/etc/profile.d/
 cat << EOF > $PKG/etc/profile.d/$PRGNAM.csh
 #!/bin/csh
 setenv ORACLE_CLIENT_HOME ${ORACLE_CLIENT_HOME}
 
-if ( -z "\$ORACLE_HOME" ) then
-    setenv ORACLE_HOME \$ORACLE_CLIENT_HOME
+# 2023-05-16 DW: csh syntax
+if ( ! \$?ORACLE_HOME ) then
+  setenv ORACLE_HOME \$ORACLE_CLIENT_HOME
 endif
 
-setenv PATH \$PATH:\$ORACLE_CLIENT_HOME/bin
-setenv CLASSPATH \$CLASSPATH:\$ORACLE_CLIENT_HOME/lib/ojdbc6.jar
+# 2023-05-16 DW: csh uses a lowercase path array
+set path = ( \$path \$ORACLE_CLIENT_HOME/bin )
+
+# 2023-05-16 DW: will set this, but braces to stop : modifier errors
+setenv PATH \${PATH}:\${ORACLE_CLIENT_HOME}/bin
+
+# 2023-05-16 DW: test if CLASSPATH is set or not to avoid errors
+if ( \$?CLASSPATH ) then
+  setenv CLASSPATH \${CLASSPATH}:\${ORACLE_CLIENT_HOME}/lib/ojdbc6.jar
+else
+  setenv CLASSPATH \${ORACLE_CLIENT_HOME}/lib/ojdbc6.jar
+endif
+
+# 2023-05-16 DW: it seems that this is also needed
+if ( \$?LD_LIBRARY_PATH ) then
+  setenv LD_LIBRARY_PATH \${LD_LIBRARY_PATH}:\${ORACLE_CLIENT_HOME}/lib
+else
+  setenv LD_LIBRARY_PATH \${ORACLE_CLIENT_HOME}/lib
+endif
 EOF
 
 # Making sh file for profile.d
@@ -109,6 +136,13 @@ fi
 
 export PATH=\$PATH:\$ORACLE_CLIENT_HOME/bin
 export CLASSPATH=\$CLASSPATH:\$ORACLE_CLIENT_HOME/lib/ojdbc6.jar
+
+# 2023-05-16 DW: add this here too JIC (untested)
+if [ "\$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$ORACLE_CLIENT_HOME/lib
+else
+  export LD_LIBRARY_PATH=\$ORACLE_CLIENT_HOME/lib
+fi
 EOF
 chmod 755 $PKG/etc/profile.d/*sh
 
@@ -118,16 +152,5 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-# Making doinst.sh file
-cat << EOF > $PKG/install/doinst.sh
-if ! grep $ORACLE_CLIENT_HOME/lib etc/ld.so.conf 1> /dev/null 2> /dev/null ; then
-  echo "$ORACLE_CLIENT_HOME/lib" >> etc/ld.so.conf
-fi
-
-if [ -x /sbin/ldconfig ]; then
-  /sbin/ldconfig 2> /dev/null
-fi
-EOF
-
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/oracle-instantclient-basic/oracle-instantclient-basic.info b/system/oracle-instantclient-basic/oracle-instantclient-basic.info
index 6c2a048ea7..1e9f0f712b 100644
--- a/system/oracle-instantclient-basic/oracle-instantclient-basic.info
+++ b/system/oracle-instantclient-basic/oracle-instantclient-basic.info
@@ -1,10 +1,10 @@
 PRGNAM="oracle-instantclient-basic"
-VERSION="12.1.0.2.0"
+VERSION="21.5.0.0.0"
 HOMEPAGE="https://www.oracle.com/technetwork/database/features/instant-client/index-097480.html"
-DOWNLOAD="http://download.oracle.com/otn/linux/instantclient/121020/oracle-instantclient12.1-basic-12.1.0.2.0-1.i386.rpm"
-MD5SUM="8d20c7c681acd8c51e8444aa0e0d4ae7"
-DOWNLOAD_x86_64="http://download.oracle.com/otn/linux/instantclient/121020/oracle-instantclient12.1-basic-12.1.0.2.0-1.x86_64.rpm"
-MD5SUM_x86_64="2d711cf98c19bd4f291838b4a1ed7b6a"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://download.oracle.com/otn_software/linux/instantclient/215000/oracle-instantclient-basic-21.5.0.0.0-1.x86_64.rpm"
+MD5SUM_x86_64="9dc3ccd3eed52da282070b07bc0a4628"
 REQUIRES=""
 MAINTAINER="DhabyX"
 EMAIL="slack.dhabyx@gmail.com"
diff --git a/system/oracle-instantclient-devel/README b/system/oracle-instantclient-devel/README
index b05c7fec2e..17bc7f0d11 100644
--- a/system/oracle-instantclient-devel/README
+++ b/system/oracle-instantclient-devel/README
@@ -6,12 +6,3 @@ applications against instantclient.
 
 Oracle-xe and JRE or JDK packages are optional and
 depends on your needs.
-
-You need an Oracle account and you must Agree to Oracle's
-download agreement before this can be downloaded.
-You have to use a web browser to download it.
-
-Ensure that you download the correct RPM
-"Instant Client Package - SDK"
-For x86: oracle-instantclient12.1-devel-12.1.0.2.0-1.i386.rpm
-For x86_64: oracle-instantclient12.1-devel-12.1.0.2.0-1.x86_64.rpm
diff --git a/system/oracle-instantclient-devel/oracle-instantclient-devel.SlackBuild b/system/oracle-instantclient-devel/oracle-instantclient-devel.SlackBuild
index ac8980b3aa..ed33477708 100644
--- a/system/oracle-instantclient-devel/oracle-instantclient-devel.SlackBuild
+++ b/system/oracle-instantclient-devel/oracle-instantclient-devel.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for oracle-instantclient-devel
 
@@ -22,37 +22,33 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=oracle-instantclient-devel
-VERSION=${VERSION:-12.1.0.2.0}
+VERSION=${VERSION:-21.5.0.0.0}
 RELEASE=${RELEASE:-1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
-ORAVER="12.1"
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-      i?86) ARCH=i386 ;;
-    x86_64) ARCH=x86_64 ;;
-         *) echo "Architecture not supported"; exit 0;
-  esac
+PKGTYPE=${PKGTYPE:-tgz}
+ORAVER="21"
+# 2023-05-16 DW: this doesn't contain any binaries
+ARCH="noarch"
+SRCARCH="x86_64"
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-else
-  LIBDIRSUFFIX=""
-fi
-
 # recreating the name of the RPM
-RPMNAM="$(echo ${PRGNAM} | cut -d '-' -f 1-2)\
-${ORAVER}-$(echo ${PRGNAM} | cut -d '-' -f 3)\
--$VERSION-$RELEASE.$ARCH.rpm"
+RPMNAM="$PRGNAM-$VERSION-$RELEASE.$SRCARCH.rpm"
 
 set -e
 
@@ -67,17 +63,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-if [ "$LIBDIRSUFFIX" = "64" ]; then
-    mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
-fi
-
-ORACLE_CLIENT_HOME="/usr/lib${LIBDIRSUFFIX}/oracle/${ORAVER}/\
-client${LIBDIRSUFFIX}"
-ORACLE_CLIENT_INCLUDE="/usr/include/oracle/${ORAVER}/client${LIBDIRSUFFIX}"
+# 2023-05-16 DW: keep this because it matches the -basic package
+mv $PKG/usr/lib $PKG/usr/lib64
 
+ORACLE_CLIENT_HOME="/usr/lib64/oracle/${ORAVER}/client64"
+ORACLE_CLIENT_INCLUDE="/usr/include/oracle/${ORAVER}/client64"
 
 # Testing if ORACLE already installed
-if [ -z "${ORACLE_HOME}" ]; then
+if [ -z "$ORACLE_HOME" ]; then
     ORACLE_HOME=$ORACLE_CLIENT_HOME
 fi
 
@@ -86,10 +79,15 @@ mkdir -p $PKG/$ORACLE_HOME
 ln -sf $ORACLE_CLIENT_INCLUDE $PKG/$ORACLE_HOME/include
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+# 2023-05-16 DW: may as well add these here
+cat $PKG/usr/share/oracle/21/client64/doc/SDK_README \
+  > $PKG/usr/doc/$PRGNAM-$VERSION/SDK_README
+cat $PKG/usr/share/oracle/21/client64/doc/SDK_LICENSE \
+  > $PKG/usr/doc/$PRGNAM-$VERSION/SDK_LICENSE
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/oracle-instantclient-devel/oracle-instantclient-devel.info b/system/oracle-instantclient-devel/oracle-instantclient-devel.info
index 997016dbeb..f135ee361d 100644
--- a/system/oracle-instantclient-devel/oracle-instantclient-devel.info
+++ b/system/oracle-instantclient-devel/oracle-instantclient-devel.info
@@ -1,10 +1,10 @@
 PRGNAM="oracle-instantclient-devel"
-VERSION="12.1.0.2.0"
+VERSION="21.5.0.0.0"
 HOMEPAGE="https://www.oracle.com/technetwork/database/features/instant-client/index-097480.html"
-DOWNLOAD="http://download.oracle.com/otn/linux/instantclient/121020/oracle-instantclient12.1-devel-12.1.0.2.0-1.i386.rpm"
-MD5SUM="b909d555074ab3c31c6c5ff8beb889c9"
-DOWNLOAD_x86_64="http://download.oracle.com/otn/linux/instantclient/121020/oracle-instantclient12.1-devel-12.1.0.2.0-1.x86_64.rpm"
-MD5SUM_x86_64="ac5bf56bce1c1521e1ca1984c3374a93"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://download.oracle.com/otn_software/linux/instantclient/215000/oracle-instantclient-devel-21.5.0.0.0-1.x86_64.rpm"
+MD5SUM_x86_64="b22d6e6eaca8a1edff4fbbf37380887f"
 REQUIRES="oracle-instantclient-basic"
 MAINTAINER="DhabyX"
 EMAIL="slack.dhabyx@gmail.com"
diff --git a/system/oracle-xe/10-oracle.xe.conf.new b/system/oracle-xe/10-oracle.xe.conf.new
deleted file mode 100644
index 1d9dd0d8e6..0000000000
--- a/system/oracle-xe/10-oracle.xe.conf.new
+++ /dev/null
@@ -1,8 +0,0 @@
-kernel.sem=250 32000 100 128
-kernel.shmmax=4294967295
-kernel.shmmni=4096
-kernel.shmall=2097152
-fs.file-max=6815744
-net.ipv4.ip_local_port_range=9000 65000
-vm.swappiness=40 
-
diff --git a/system/oracle-xe/README b/system/oracle-xe/README
deleted file mode 100644
index d5100304df..0000000000
--- a/system/oracle-xe/README
+++ /dev/null
@@ -1,14 +0,0 @@
-Oracle Database 11g Express Edition (Oracle Database XE)
-
-Oracle Database Express Edition is an entry-level,
-small-footprint database based on the Oracle Database 11g
-Release 2 code base. It's free to develop, deploy, and
-distribute; fast to download; and simple to administer.
-
-You need accept license before download oracle-xe and
-you have to use a web browser to download it.
-
-Oracle-XE is only available for 64 bits systems.
-
-See README.Slackware for setup, configuration and usage
-hints.
diff --git a/system/oracle-xe/README.Slackware b/system/oracle-xe/README.Slackware
deleted file mode 100644
index f1067059e0..0000000000
--- a/system/oracle-xe/README.Slackware
+++ /dev/null
@@ -1,52 +0,0 @@
-The installation process needs a user and a group previuosly
-configured, *oracle* for the user and *dba* for the group.
-
-You must be run the following commands:
-
-# groupadd -g 329 dba
-# useradd -d /u01/app/oracle -s /bin/bash -u 329 -g 329 oracle
-
-Oracle recomend some system requirements in kernel parameters,
-acording to oracle-xe installation guide at:
-https://docs.oracle.com/cd/E17781_01/install.112/e18802/toc.htm#BABJFAIA
-
-This slackbuild provides an sysctl configurations at
-/etc/sysctl.d/10-oracle.xe.conf; you only need restart or run:
-
-# sysctl --system
-
-After installing you must configure the database:
-
-# /etc/rc.d/rc.oracle-xe configure
-
-Some environment variables need to be configured or exported before
-you start to use Oracle; by default all variables is configured with
-"en_US.UTF-8" but you can change to your locale preferences at:
-
-/etc/profile.d/oracle-env.sh
-
-And you can load with:
-
-# source /etc/profile.d/oracle-env.sh
-
-or logout and login for load all environment variables.
-
-To start and stop the database at boot/shutdown, make sure
-/etc/rc.d/rc.oracle-xe is executable and update the following files:
-
-/etc/rc.d/rc.local
-==================
-# Startup oracle-xe
-if [ -x /etc/rc.d/rc.oracle-xe ]; then
-    /etc/rc.d/rc.oracle-xe start
-fi
-
-/etc/rc.d/rc.local_shutdown
-===========================
-# Stop oracle-xe
-if [ -x /etc/rc.d/rc.oracle-xe ]; then
-    /etc/rc.d/rc.oracle-xe stop
-fi
-
-You can read more detailed instructions at:
-https://docs.oracle.com/cd/E17781_01/install.112/e18802/toc.htm
diff --git a/system/oracle-xe/doinst.sh b/system/oracle-xe/doinst.sh
deleted file mode 100644
index 563eeec10e..0000000000
--- a/system/oracle-xe/doinst.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-VERSION="11.2.0"
-
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    rm $NEW
-  fi
-}
-
-config etc/sysctl.d/10-oracle.xe.conf.new
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if ! grep /u01/app/oracle/product/${VERSION}/xe/lib etc/ld.so.conf 1> /dev/null 2> /dev/null ; then
-  echo "/u01/app/oracle/product/${VERSION}/xe/lib" >> etc/ld.so.conf
-fi
-
-if [ -x /sbin/ldconfig ]; then
-  /sbin/ldconfig 2> /dev/null
-fi
-
-
-# from rpm oracle scripts
-availphymem=`cat /proc/meminfo | grep '^MemTotal' | awk '{print $2}'`
-availphymem=`echo $availphymem / 1024 | bc`
-memory_target=`echo 0.40 \* $availphymem | bc | sed "s/\..*//"`
-
-if [ $memory_target -gt 1024 ];
-then
-  memory_target=`echo 1024 \* 1048576 | bc`
-else
-  memory_target=`echo $memory_target \* 1048576 | bc`
-fi
-
-sed -i "s/%memory_target%/$memory_target/g" u01/app/oracle/product/${VERSION}/xe/config/scripts/init.ora
-sed -i "s/%memory_target%/$memory_target/g" u01/app/oracle/product/${VERSION}/xe/config/scripts/initXETemp.ora
diff --git a/system/oracle-xe/oracle-xe.SlackBuild b/system/oracle-xe/oracle-xe.SlackBuild
deleted file mode 100644
index 94233e2865..0000000000
--- a/system/oracle-xe/oracle-xe.SlackBuild
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for oracle-xe
-
-# Copyright 2015 Dhaby Xiloj <slack.dhabyx@gmail.com>
-# All rights reserved.
-#
-# Some ideas has taked from
-# https://github.com/aclemons/slackbuilds/tree/master/system/oracle-xe-11g
-#   Andrew Clemons, Wellingtong, New Zeland
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=oracle-xe
-VERSION=${VERSION:-11.2.0}
-RELEASE=${RELEASE:-1.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    x86_64) ARCH=x86_64 ;;
-    *) echo "The package for $(uname -m) architecture is not available."; exit 1;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-RPMNAME="${PRGNAM}-${VERSION}-${RELEASE}.x86_64.rpm"
-ZIPNAME="${RPMNAME}.zip"
-
-set -e
-
-# Check if oracle group and user exist
-if [ "$(grep ^oracle /etc/passwd)" = "" -o "$(grep ^dba /etc/group)" = "" ] ; then
-    cat << EOF
-You must have apropiate user and group for oracle-xe.
-    Example:
-        # groupadd -g 329 dba
-        # useradd -d /u01/app/oracle -s /bin/bash -u 329 -g 329 oracle
-EOF
-    exit 1
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rvf $PRGNAM-$VERSION
-
-mkdir $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-unzip $CWD/$ZIPNAME
-cd Disk1
-rpm2cpio < $RPMNAME | cpio -imdv
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# moving everything to proper place
-mv u01 usr $PKG
-mkdir -p $PKG/etc/rc.d
-mv etc/init.d/oracle-xe $PKG/etc/rc.d/rc.oracle-xe
-chmod 644 $PKG/etc/rc.d/rc.oracle-xe
-sed -i 's#/etc/init.d/oracle-xe#/etc/rc.d/rc.oracle-xe#g' $PKG/etc/rc.d/rc.oracle-xe
-
-mkdir -p $PKG/etc/sysctl.d/
-cp $CWD/10-oracle.xe.conf.new $PKG/etc/sysctl.d/
-
-# copy environment files
-mkdir -p $PKG/etc/profile.d
-cp $PKG/u01/app/oracle/product/${VERSION}/xe/bin/oracle_env.sh \
-    $PKG/etc/profile.d/oracle-env.sh
-    echo "export TNS_ADMIN=\$ORACLE_HOME/network/admin" >> $PKG/etc/profile.d/oracle-env.sh
-
-cp $PKG/u01/app/oracle/product/${VERSION}/xe/bin/oracle_env.csh \
-    $PKG/etc/profile.d/oracle-env.csh
-    echo "setenv TNS_ADMIN \$ORACLE_HOME/network/admin" >> $PKG/etc/profile.d/oracle-env.csh
-
-# add oracle jdbc driver to classpath
-mkdir -p $PKG/etc/profile.d/
-cat << EOF > $PKG/etc/profile.d/oracle-jdbc-env.csh
-#!/bin/csh
-setenv CLASSPATH \$CLASSPATH:\$ORACLE_HOME/jdbc/lib/ojdbc6.jar
-EOF
-
-cat << EOF > $PKG/etc/profile.d/oracle-jdbc-env.sh
-#!/bin/sh
-export CLASSPATH=\$CLASSPATH:\$ORACLE_HOME/jdbc/lib/ojdbc6.jar
-EOF
-
-chmod 755 $PKG/etc/profile.d/*
-
-
-# Remove -lipgo and -lsvml from sysliblist as they were not shipped in 11.2XE
-sed -i "s/-lipgo //" $PKG/u01/app/oracle/product/11.2.0/xe/lib/sysliblist
-sed -i "s/ -lsvml//" $PKG/u01/app/oracle/product/11.2.0/xe/lib/sysliblist
-
-# fix bad konsole param
-sed -i "s/konsole -T /konsole -p tabtitle=/" \
-    $PKG/u01/app/oracle/product/11.2.0/xe/config/scripts/runsqlplus.sh
-
-# creating empty dirs for proper oracle configuration
-mkdir -p $PKG/u01/app/oracle/product/${VERSION}/xe/config/log
-mkdir -p $PKG/u01/app/oracle/product/${VERSION}/xe/rdbms/{audiot,log}
-mkdir -p $PKG/u01/app/oracle/product/${VERSION}/xe/network/{trace,log}
-
-# Make symbolic links for some libs
-(
-  cd $PKG/u01/app/oracle/product/${VERSION}/xe/lib
-  ln -s libagtsh.so.1.0 libagtsh.so
-  ln -s libclntsh.so.11.1 libclntsh.so
-  ln -s libocci.so.11.1 libocci.so
-)
-
-# set appropriate permissions for oracle
-chown -R oracle:dba $PKG/u01
-chmod 755 $PKG/u01/app/oracle/product/${VERSION}/xe/config/scripts/*.sh
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/oracle_xe/* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/oracle-xe/oracle-xe.info b/system/oracle-xe/oracle-xe.info
deleted file mode 100644
index 43a659d691..0000000000
--- a/system/oracle-xe/oracle-xe.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="oracle-xe"
-VERSION="11.2.0"
-HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/express-edition/overview/index.html"
-DOWNLOAD="UNSUPPORTED"
-MD5SUM=""
-DOWNLOAD_x86_64="http://download.oracle.com/otn/linux/oracle11g/xe/oracle-xe-11.2.0-1.0.x86_64.rpm.zip"
-MD5SUM_x86_64="dd7881a55569d890241f11cd0eeb7d48"
-REQUIRES=""
-MAINTAINER="DhabyX"
-EMAIL="slack.dhabyx@gmail.com"
diff --git a/system/oracle-xe/slack-desc b/system/oracle-xe/slack-desc
deleted file mode 100644
index 428ace3b07..0000000000
--- a/system/oracle-xe/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-         |-----handy-ruler------------------------------------------------------|
-oracle-xe: oracle-xe (Oracle Database Express Edition)
-oracle-xe:
-oracle-xe: Oracle Database 11g Express Edition (Oracle Database XE) is an
-oracle-xe: entry-level, small-footprint database based on the Oracle Database
-oracle-xe: 11g Release 2 code base.  It's free to develop, deploy, and
-oracle-xe: distribute; fast to download; and simple to administer.
-oracle-xe:
-oracle-xe:
-oracle-xe:
-oracle-xe:
-oracle-xe:
diff --git a/system/osinfo-db-tools/osinfo-db-tools.SlackBuild b/system/osinfo-db-tools/osinfo-db-tools.SlackBuild
index e929584590..bfc9df1476 100644
--- a/system/osinfo-db-tools/osinfo-db-tools.SlackBuild
+++ b/system/osinfo-db-tools/osinfo-db-tools.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for osinfo-db-tools
 
-# Copyright 2016-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2016-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=osinfo-db-tools
-VERSION=${VERSION:-1.8.0}
+VERSION=${VERSION:-1.11.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -83,8 +93,8 @@ cd build
     --mandir=/usr/man \
     --prefix=/usr \
     --sysconfdir=/etc
-  ninja
-  DESTDIR=$PKG ninja install
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
 cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -101,4 +111,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/osinfo-db-tools/osinfo-db-tools.info b/system/osinfo-db-tools/osinfo-db-tools.info
index ca3b2013a9..99dae01bac 100644
--- a/system/osinfo-db-tools/osinfo-db-tools.info
+++ b/system/osinfo-db-tools/osinfo-db-tools.info
@@ -1,10 +1,10 @@
 PRGNAM="osinfo-db-tools"
-VERSION="1.8.0"
+VERSION="1.11.0"
 HOMEPAGE="http://libosinfo.org"
-DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-tools-1.8.0.tar.xz"
-MD5SUM="4a9c1cd3871e1809b44bdb8511cfe2d4"
+DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-tools-1.11.0.tar.xz"
+MD5SUM="8fed1cfc692b6fa1a80f002b0a8447ac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="json-glib meson"
+REQUIRES=""
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/system/osinfo-db/osinfo-db.SlackBuild b/system/osinfo-db/osinfo-db.SlackBuild
index 9acaaa242c..36b70adec7 100644
--- a/system/osinfo-db/osinfo-db.SlackBuild
+++ b/system/osinfo-db/osinfo-db.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for osinfo-db
 
-# Copyright 2016-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2016-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,15 +22,25 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=osinfo-db
-VERSION=${VERSION:-20200813}
-SLVERSION=${SLVERSION:-20190702}
+VERSION=${VERSION:-20231215}
+SLVERSION=${SLVERSION:-20220214}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -56,4 +66,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/osinfo-db/osinfo-db.info b/system/osinfo-db/osinfo-db.info
index 9d327df7ee..4ce4d8ae5b 100644
--- a/system/osinfo-db/osinfo-db.info
+++ b/system/osinfo-db/osinfo-db.info
@@ -1,10 +1,10 @@
 PRGNAM="osinfo-db"
-VERSION="20200813"
+VERSION="20231215"
 HOMEPAGE="http://libosinfo.org"
-DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-20200813.tar.xz \
-          http://ponce.cc/slackware/sources/repo/osinfo-db-slackware-20190702.tar.xz"
-MD5SUM="da055fc0c589a672f926c346367e218a \
-        988b651d5f600eaa42cc1da91c7d765c"
+DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-20231215.tar.xz \
+          https://harrier.slackbuilds.org/misc/osinfo-db-slackware-20220214.tar.xz"
+MD5SUM="45021bc702e722d1f5dd062f4823d160 \
+        65ed4d991bdab6ab00bc34bcbb5d16ff"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="osinfo-db-tools"
diff --git a/system/osquery-bin/osquery-bin.SlackBuild b/system/osquery-bin/osquery-bin.SlackBuild
index e252f9eadd..3f85678ad1 100644
--- a/system/osquery-bin/osquery-bin.SlackBuild
+++ b/system/osquery-bin/osquery-bin.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for osquery-bin
 
-# Copyright 2019-2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2019-2022 Andrew Clemons, Wellington New Zealand
+# Copyright 2022-2024 Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +23,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=osquery-bin
 SRCNAM=${PRGNAM%-bin}
-VERSION=${VERSION:-4.6.0}
+VERSION=${VERSION:-5.12.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+DEBBUILD=${DEBBUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,25 +41,15 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -62,7 +57,9 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
 
 if [ "$ARCH" = "x86_64" ]; then
-  tar xvf $CWD/$SRCNAM-$VERSION"_1.linux_x86_64.tar.gz"
+  ar p "$CWD/$SRCNAM"_"$VERSION-$DEBBUILD.linux_amd64.deb" data.tar.gz | tar xzv
+elif [ "$ARCH" = "aarch64" ]; then
+  ar p "$CWD/$SRCNAM"_"$VERSION-$DEBBUILD.linux_arm64.deb" data.tar.gz | tar xzv
 else
   printf "$ARCH is not supported...\n"
   exit 1
@@ -75,14 +72,31 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-rm -rf .scripts
+if [ "$ARCH" = "aarch64" ] ; then
+  find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+    | cut -f 1 -d : | xargs patchelf --set-interpreter /lib64/ld-linux-aarch64.so.1 2> /dev/null || true
+fi
 
 mkdir etc/rc.d
 mv etc/init.d/osqueryd etc/rc.d/rc.osqueryd.new
 rm -rf etc/init.d
 
-mv usr/local/* usr/
-rm -rf usr/lib usr/local
+rm -rf usr/lib/systemd
+rmdir usr/lib
+
+# make symlinks relative
+(
+  cd "$PKG/usr/bin"
+  for lnk in osqueryctl osqueryd osqueryi ; do
+    rm -rf "$lnk"
+
+    if [ "$lnk" = "osqueryi" ] ; then
+      ln -s "../../opt/osquery/bin/osqueryd" "$lnk"
+    else
+      ln -s "../../opt/osquery/bin/$lnk" "$lnk"
+    fi
+  done
+)
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -92,4 +106,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/osquery-bin/osquery-bin.info b/system/osquery-bin/osquery-bin.info
index b6d8943d6d..c2a3d51277 100644
--- a/system/osquery-bin/osquery-bin.info
+++ b/system/osquery-bin/osquery-bin.info
@@ -1,10 +1,12 @@
 PRGNAM="osquery-bin"
-VERSION="4.6.0"
+VERSION="5.12.1"
 HOMEPAGE="https://osquery.io/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://pkg.osquery.io/linux/osquery-4.6.0_1.linux_x86_64.tar.gz"
-MD5SUM_x86_64="c82b46e404e0c5dd9dc6c712a3fb377c"
+DOWNLOAD_x86_64="https://github.com/osquery/osquery/releases/download/5.12.1/osquery_5.12.1-1.linux_amd64.deb \
+                 https://github.com/osquery/osquery/releases/download/5.12.1/osquery_5.12.1-1.linux_arm64.deb"
+MD5SUM_x86_64="85eace3a95a804a0dae3e99a80961912 \
+               2b907b8053a658ba4cc79eb2d9cd0595"
 REQUIRES=""
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
diff --git a/system/ossec-agent/README b/system/ossec-agent/README
index e16fad6ea6..d6a32d4c09 100644
--- a/system/ossec-agent/README
+++ b/system/ossec-agent/README
@@ -1,6 +1,6 @@
-OSSEC is an Open Source Host-based Intrusion Detection System that performs log
-analysis, file integrity checking, policy monitoring, rootkit detection,
-real-time alerting and active response.
+OSSEC is an Open Source Host-based Intrusion Detection System that
+performs log analysis, file integrity checking, policy monitoring,
+rootkit detection, real-time alerting and active response.
 
 The following build options are available:
 
diff --git a/system/ossec-agent/gcc-fno-common-3.6.0.patch b/system/ossec-agent/gcc-fno-common-3.6.0.patch
new file mode 100644
index 0000000000..e8ed3c66dd
--- /dev/null
+++ b/system/ossec-agent/gcc-fno-common-3.6.0.patch
@@ -0,0 +1,402 @@
+diff --git a/src/addagent/main.c b/src/addagent/main.c
+index 587a8a3d8..ab12f0326 100644
+--- a/src/addagent/main.c
++++ b/src/addagent/main.c
+@@ -17,6 +17,7 @@ static void print_banner(void);
+ static void manage_shutdown(int sig) __attribute__((noreturn));
+ #endif
+ 
++int willchroot;
+ 
+ #if defined(__MINGW32__)
+ static int setenv(const char *name, const char *val, __attribute__((unused)) int overwrite)
+diff --git a/src/addagent/manage_agents.c b/src/addagent/manage_agents.c
+index ac39c1e66..4f9c266ff 100644
+--- a/src/addagent/manage_agents.c
++++ b/src/addagent/manage_agents.c
+@@ -85,6 +85,8 @@ int add_agent(int json_output)
+ 
+     char authfile[257];
+ 
++    extern int willchroot;
++
+     if(willchroot > 0) {
+         snprintf(authfile, 256, "%s", AUTH_FILE);	//XXX
+     } else {
+diff --git a/src/addagent/manage_agents.h b/src/addagent/manage_agents.h
+index 4812dba43..f2962e80b 100644
+--- a/src/addagent/manage_agents.h
++++ b/src/addagent/manage_agents.h
+@@ -147,4 +147,4 @@ extern fpos_t fp_pos;
+ #define GMF_UNKN_ERROR  ARGV0 ": Could not run GetModuleFileName which returned (%ld).\n"
+ 
+ 
+-int willchroot;
++//int willchroot;
+diff --git a/src/addagent/manage_keys.c b/src/addagent/manage_keys.c
+index 146b48326..ffb9a1f21 100644
+--- a/src/addagent/manage_keys.c
++++ b/src/addagent/manage_keys.c
+@@ -336,6 +336,8 @@ int k_bulkload(const char *cmdbulk)
+     char delims[] = ",";
+     char *token = NULL;
+ 
++    extern int willchroot;
++
+     /* Check if we can open the input file */
+     printf("Opening: [%s]\n", cmdbulk);
+     infp = fopen(cmdbulk, "r");
+diff --git a/src/analysisd/analysisd.c b/src/analysisd/analysisd.c
+index a220f4421..0a81971de 100644
+--- a/src/analysisd/analysisd.c
++++ b/src/analysisd/analysisd.c
+@@ -42,7 +42,12 @@
+ #endif
+ 
+ #ifdef SQLITE_ENABLED
+-#include "syscheck-sqlite.h"
++#include <sqlite3.h>
++sqlite3 *conn;
++#endif
++
++#ifdef LIBGEOIP_ENABLED
++GeoIP *geoipdb;
+ #endif
+ 
+ /** Prototypes **/
+diff --git a/src/analysisd/config.h b/src/analysisd/config.h
+index 8d74c756e..976d1942e 100644
+--- a/src/analysisd/config.h
++++ b/src/analysisd/config.h
+@@ -12,6 +12,7 @@
+ 
+ #include "config/config.h"
+ #include "config/global-config.h"
++
+ #ifdef LIBGEOIP_ENABLED
+ #include "GeoIP.h"
+ #endif
+@@ -20,9 +21,11 @@
+ extern long int __crt_ftell; /* Global ftell pointer */
+ extern _Config Config;       /* Global Config structure */
+ 
++/*
+ #ifdef LIBGEOIP_ENABLED
+ GeoIP *geoipdb;
+ #endif
++*/
+ 
+ int GlobalConf(const char *cfgfile);
+ 
+diff --git a/src/analysisd/decoders/geoip.c b/src/analysisd/decoders/geoip.c
+index 464e4bb71..9816b4c81 100644
+--- a/src/analysisd/decoders/geoip.c
++++ b/src/analysisd/decoders/geoip.c
+@@ -30,6 +30,7 @@ char *GetGeoInfobyIP(char *ip_addr)
+     GeoIPRecord *geoiprecord;
+     char *geodata = NULL;
+     char geobuffer[256 +1];
++    extern GeoIP *geoipdb;
+ 
+     if(!geoipdb)
+     {
+diff --git a/src/analysisd/decoders/syscheck.c b/src/analysisd/decoders/syscheck.c
+index a6d675892..30339a00d 100644
+--- a/src/analysisd/decoders/syscheck.c
++++ b/src/analysisd/decoders/syscheck.c
+@@ -16,7 +16,7 @@
+ #include "decoder.h"
+ 
+ #ifdef SQLITE_ENABLED
+-#include "syscheck-sqlite.h"
++#include <sqlite3.h>
+ #endif
+ 
+ typedef struct __sdb {
+diff --git a/src/analysisd/makelists.c b/src/analysisd/makelists.c
+index 06c90db70..dfbe6a4a3 100644
+--- a/src/analysisd/makelists.c
++++ b/src/analysisd/makelists.c
+@@ -32,6 +32,10 @@ time_t c_time;
+ char __shost[512];
+ OSDecoderInfo *NULL_Decoder;
+ 
++#ifdef LIBGEOIP_ENABLED
++GeoIP *geoipdb;
++#endif
++
+ /* print help statement */
+ __attribute__((noreturn))
+ static void help_makelists(void)
+diff --git a/src/analysisd/syscheck-sqlite.h b/src/analysisd/syscheck-sqlite.h
+deleted file mode 100644
+index 526cab26e..000000000
+--- a/src/analysisd/syscheck-sqlite.h
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#ifdef SQLITE_ENABLED
+-#include <sqlite3.h>
+-
+-sqlite3 *conn;
+-#endif
+diff --git a/src/analysisd/testrule.c b/src/analysisd/testrule.c
+index c08fb4885..b1aa928f7 100644
+--- a/src/analysisd/testrule.c
++++ b/src/analysisd/testrule.c
+@@ -83,6 +83,7 @@ int main(int argc, char **argv)
+     memset(prev_month, '\0', 4);
+ 
+ #ifdef LIBGEOIP_ENABLED
++    extern GeoIP *geoipdb;
+     geoipdb = NULL;
+ #endif
+ 
+diff --git a/src/client-agent/agentd.c b/src/client-agent/agentd.c
+index c09cf87d3..67828e79c 100644
+--- a/src/client-agent/agentd.c
++++ b/src/client-agent/agentd.c
+@@ -23,6 +23,8 @@ void AgentdStart(const char *dir, int uid, int gid, const char *user, const char
+     fd_set fdset;
+     struct timeval fdtimeout;
+ 
++    extern agent *agt;
++
+     available_server = 0;
+ 
+     /* Initial random numbers must happen before chroot */
+diff --git a/src/client-agent/agentd.h b/src/client-agent/agentd.h
+index 0246a5457..a362ff9a3 100644
+--- a/src/client-agent/agentd.h
++++ b/src/client-agent/agentd.h
+@@ -81,9 +81,9 @@ void os_agent_cb(int fd, short ev, void *arg);
+ extern time_t available_server;
+ extern int run_foreground;
+ extern keystore keys;
+-extern agent *agt;
++//extern agent *agt;
+ #ifndef WIN32
+-struct imsgbuf server_ibuf;
++//struct imsgbuf server_ibuf;
+ #endif //WIN32
+ 
+ #endif /* __AGENTD_H */
+diff --git a/src/client-agent/event-forward.c b/src/client-agent/event-forward.c
+index 2e81f0c90..22ed0beb9 100644
+--- a/src/client-agent/event-forward.c
++++ b/src/client-agent/event-forward.c
+@@ -19,6 +19,9 @@
+ /* Receive a message locally on the agent and forward it to the manager */
+ void *EventForward(void)
+ {
++
++    extern agent *agt;
++
+     ssize_t recv_b;
+     char msg[OS_MAXSTR + 1];
+ 
+diff --git a/src/client-agent/main.c b/src/client-agent/main.c
+index 5f85cfb73..01c18970c 100644
+--- a/src/client-agent/main.c
++++ b/src/client-agent/main.c
+@@ -16,7 +16,8 @@
+ #define ARGV0 "ossec-agentd"
+ #endif
+ 
+-extern struct imsgbuf server_ibuf;
++//extern struct imsgbuf server_ibuf;
++struct imsgbuf server_ibuf;
+ 
+ 
+ /* Prototypes */
+@@ -112,6 +113,8 @@ int main(int argc, char **argv)
+ 
+     debug1(STARTED_MSG, ARGV0);
+ 
++    extern agent *agt;
++
+     agt = (agent *)calloc(1, sizeof(agent));
+     if (!agt) {
+         ErrorExit(MEM_ERROR, ARGV0, errno, strerror(errno));
+diff --git a/src/client-agent/notify.c b/src/client-agent/notify.c
+index 1b239f26c..93fec325c 100644
+--- a/src/client-agent/notify.c
++++ b/src/client-agent/notify.c
+@@ -68,6 +68,8 @@ void run_notify()
+     os_md5 md5sum;
+     time_t curr_time;
+ 
++    extern agent *agt;
++
+     keep_alive_random[0] = '\0';
+     curr_time = time(0);
+ 
+diff --git a/src/client-agent/receiver-win.c b/src/client-agent/receiver-win.c
+index 859bdf7f9..4ab62ee77 100644
+--- a/src/client-agent/receiver-win.c
++++ b/src/client-agent/receiver-win.c
+@@ -19,6 +19,7 @@
+ /* Receive events from the server */
+ void *receiver_thread(__attribute__((unused)) void *none)
+ {
++    extern agent *agt;
+     int recv_b;
+ 
+     char file[OS_SIZE_1024 + 1];
+diff --git a/src/client-agent/receiver.c b/src/client-agent/receiver.c
+index fde64c282..5286e60dc 100644
+--- a/src/client-agent/receiver.c
++++ b/src/client-agent/receiver.c
+@@ -29,6 +29,8 @@ void *receive_msg()
+     char cleartext[OS_MAXSTR + 1];
+     char *tmp_msg;
+ 
++    extern agent *agt;
++
+     memset(cleartext, '\0', OS_MAXSTR + 1);
+     memset(buffer, '\0', OS_MAXSTR + 1);
+ 
+diff --git a/src/client-agent/sendmsg.c b/src/client-agent/sendmsg.c
+index 454c2e714..3076dfcf9 100644
+--- a/src/client-agent/sendmsg.c
++++ b/src/client-agent/sendmsg.c
+@@ -15,6 +15,9 @@
+ /* Send a message to the server */
+ int send_msg(int agentid, const char *msg)
+ {
++
++    extern agent *agt;
++
+     size_t msg_size;
+     char crypt_msg[OS_MAXSTR + 1];
+ 
+diff --git a/src/client-agent/start_agent.c b/src/client-agent/start_agent.c
+index 51670cee5..f1df43715 100644
+--- a/src/client-agent/start_agent.c
++++ b/src/client-agent/start_agent.c
+@@ -24,6 +24,9 @@ int connect_server(int initial_id)
+ #ifdef WIN32
+     unsigned int attempts = 2;
+ #endif //WIN32
++
++    extern agent *agt;
++
+     int rc = initial_id;
+ 
+     /* Checking if the initial is zero, meaning we have to
+@@ -139,6 +142,8 @@ void start_agent(int is_startup)
+     char cleartext[OS_MAXSTR + 1];
+     char fmsg[OS_MAXSTR + 1];
+ 
++    extern agent *agt;
++
+     memset(msg, '\0', OS_MAXSTR + 2);
+     memset(buffer, '\0', OS_MAXSTR + 1);
+     memset(cleartext, '\0', OS_MAXSTR + 1);
+@@ -241,6 +246,8 @@ void os_agent_cb(int fd, short ev, void *arg) {
+     struct imsg imsg;
+     struct imsgbuf *ibuf = (struct imsgbuf *)arg;
+ 
++    extern agent *agt;
++
+     if (ev & EV_READ) {
+         if ((n = imsg_read(ibuf) == -1 && errno != EAGAIN)) {
+             ErrorExit("%s: ERROR: imsg_read() failed: %s", ARGV0, strerror(errno));
+diff --git a/src/os_net/os_net.c b/src/os_net/os_net.c
+index f18e3be77..756e9fac8 100644
+--- a/src/os_net/os_net.c
++++ b/src/os_net/os_net.c
+@@ -14,7 +14,7 @@
+ #include <errno.h>
+ #include "shared.h"
+ #include "os_net.h"
+-agent *agt;
++agent *os_net_agt;
+ 
+ /* Prototypes */
+ static OSNetInfo *OS_Bindport(char *_port, unsigned int _proto, const char *_ip);
+@@ -346,11 +346,11 @@ int OS_Connect(char *_port, unsigned int protocol, const char *_ip)
+         return(OS_INVALID);
+     }
+ 
+-    if (agt) {
+-        if (agt->lip) {
++    if (os_net_agt) {
++        if (os_net_agt->lip) {
+             memset(&hints, 0, sizeof(struct addrinfo));
+             hints.ai_flags = AI_NUMERICHOST;
+-            s = getaddrinfo(agt->lip, NULL, &hints, &result);
++            s = getaddrinfo(os_net_agt->lip, NULL, &hints, &result);
+             if (s != 0) {
+                 verbose("getaddrinfo: %s", gai_strerror(s));
+             }
+@@ -363,8 +363,8 @@ int OS_Connect(char *_port, unsigned int protocol, const char *_ip)
+     memset(&hints, 0, sizeof(struct addrinfo));
+     /* Allow IPv4 or IPv6 if local_ip isn't specified */
+     hints.ai_family = AF_UNSPEC;
+-    if (agt) {
+-        if (agt->lip) {
++    if (os_net_agt) {
++        if (os_net_agt->lip) {
+             hints.ai_family = local_ai->ai_family;
+         }
+     }
+@@ -398,13 +398,13 @@ int OS_Connect(char *_port, unsigned int protocol, const char *_ip)
+             continue;
+         }
+ 
+-        if (agt) {
+-            if (agt->lip) {
++        if (os_net_agt) {
++            if (os_net_agt->lip) {
+                 if (bind(ossock, local_ai->ai_addr, local_ai->ai_addrlen)) {
+                     verbose("Unable to bind to local address %s.  Ignoring. (%s)",
+-                            agt->lip, strerror(errno));
++                            os_net_agt->lip, strerror(errno));
+                 }
+-                else verbose("Connecting from local address %s", agt->lip);
++                else verbose("Connecting from local address %s", os_net_agt->lip);
+             }
+         }
+ 
+diff --git a/src/os_net/os_net.h b/src/os_net/os_net.h
+index 9b7250928..3aaf00429 100644
+--- a/src/os_net/os_net.h
++++ b/src/os_net/os_net.h
+@@ -13,7 +13,7 @@
+ 
+ #include "headers/shared.h"
+ #include "config/client-config.h"
+-extern agent *agt;
++extern agent *os_net_agt;
+ #ifdef WIN32
+ #ifndef AI_ADDRCONFIG
+ #define AI_ADDRCONFIG   0x0400
+diff --git a/src/win32/win_agent.c b/src/win32/win_agent.c
+index 40a37e621..a2ec784f2 100644
+--- a/src/win32/win_agent.c
++++ b/src/win32/win_agent.c
+@@ -124,6 +124,7 @@ int local_start()
+     WSADATA wsaData;
+     DWORD  threadID;
+     DWORD  threadID2;
++    extern agent *agt;
+ 
+     /* Start agent */
+     agt = (agent *)calloc(1, sizeof(agent));
+@@ -271,6 +272,7 @@ int SendMSG(__attribute__((unused)) int queue, const char *message, const char *
+     char tmpstr[OS_MAXSTR + 2];
+     char crypt_msg[OS_MAXSTR + 2];
+     DWORD dwWaitResult;
++    extern agent *agt;
+ 
+     tmpstr[OS_MAXSTR + 1] = '\0';
+     crypt_msg[OS_MAXSTR + 1] = '\0';
+@@ -468,6 +470,8 @@ void send_win32_info(time_t curr_time)
+     tmp_msg[OS_MAXSTR + 1] = '\0';
+     crypt_msg[OS_MAXSTR + 1] = '\0';
+ 
++    extern agent *agt;
++
+     debug1("%s: DEBUG: Sending keep alive message.", ARGV0);
+ 
+     /* Fix time */
diff --git a/system/ossec-agent/ossec-agent.SlackBuild b/system/ossec-agent/ossec-agent.SlackBuild
index 6d5963a33e..4f0bdae9de 100644
--- a/system/ossec-agent/ossec-agent.SlackBuild
+++ b/system/ossec-agent/ossec-agent.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ossec-agent
 
@@ -24,10 +24,13 @@
 
 # Special thanks to Jason Graham for patches and testing
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ossec-agent
 VERSION=${VERSION:-3.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=ossec-hids
 
@@ -39,7 +42,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -116,6 +126,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p1 < $CWD/gcc-fno-common-3.6.0.patch
+
 # Makefile fixes
 sed -e 's|\(./init/adduser.sh.*\)|#\1|' \
     -e 's|\(DEFINES+=-DDEFAULTDIR=\).*|\1\\"/var/ossec\\"|' \
@@ -163,4 +175,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ossec-agent/ossec-agent.info b/system/ossec-agent/ossec-agent.info
index 10cce74f00..ddef7ce700 100644
--- a/system/ossec-agent/ossec-agent.info
+++ b/system/ossec-agent/ossec-agent.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/ossec/ossec-hids/archive/3.6.0/ossec-hids-3.6.0.tar
 MD5SUM="03fe101f736e834b3804bac8bb4aa980"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pcre2"
+REQUIRES=""
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/system/ossec-local/README b/system/ossec-local/README
index abc215b6eb..0e09a30a42 100644
--- a/system/ossec-local/README
+++ b/system/ossec-local/README
@@ -1,6 +1,6 @@
-OSSEC is an Open Source Host-based Intrusion Detection System that performs log
-analysis, file integrity checking, policy monitoring, rootkit detection,
-real-time alerting and active response.
+OSSEC is an Open Source Host-based Intrusion Detection System that
+performs log analysis, file integrity checking, policy monitoring,
+rootkit detection, real-time alerting and active response.
 
 The following build options are available:
 
diff --git a/system/ossec-local/gcc-fno-common-3.6.0.patch b/system/ossec-local/gcc-fno-common-3.6.0.patch
new file mode 100644
index 0000000000..e8ed3c66dd
--- /dev/null
+++ b/system/ossec-local/gcc-fno-common-3.6.0.patch
@@ -0,0 +1,402 @@
+diff --git a/src/addagent/main.c b/src/addagent/main.c
+index 587a8a3d8..ab12f0326 100644
+--- a/src/addagent/main.c
++++ b/src/addagent/main.c
+@@ -17,6 +17,7 @@ static void print_banner(void);
+ static void manage_shutdown(int sig) __attribute__((noreturn));
+ #endif
+ 
++int willchroot;
+ 
+ #if defined(__MINGW32__)
+ static int setenv(const char *name, const char *val, __attribute__((unused)) int overwrite)
+diff --git a/src/addagent/manage_agents.c b/src/addagent/manage_agents.c
+index ac39c1e66..4f9c266ff 100644
+--- a/src/addagent/manage_agents.c
++++ b/src/addagent/manage_agents.c
+@@ -85,6 +85,8 @@ int add_agent(int json_output)
+ 
+     char authfile[257];
+ 
++    extern int willchroot;
++
+     if(willchroot > 0) {
+         snprintf(authfile, 256, "%s", AUTH_FILE);	//XXX
+     } else {
+diff --git a/src/addagent/manage_agents.h b/src/addagent/manage_agents.h
+index 4812dba43..f2962e80b 100644
+--- a/src/addagent/manage_agents.h
++++ b/src/addagent/manage_agents.h
+@@ -147,4 +147,4 @@ extern fpos_t fp_pos;
+ #define GMF_UNKN_ERROR  ARGV0 ": Could not run GetModuleFileName which returned (%ld).\n"
+ 
+ 
+-int willchroot;
++//int willchroot;
+diff --git a/src/addagent/manage_keys.c b/src/addagent/manage_keys.c
+index 146b48326..ffb9a1f21 100644
+--- a/src/addagent/manage_keys.c
++++ b/src/addagent/manage_keys.c
+@@ -336,6 +336,8 @@ int k_bulkload(const char *cmdbulk)
+     char delims[] = ",";
+     char *token = NULL;
+ 
++    extern int willchroot;
++
+     /* Check if we can open the input file */
+     printf("Opening: [%s]\n", cmdbulk);
+     infp = fopen(cmdbulk, "r");
+diff --git a/src/analysisd/analysisd.c b/src/analysisd/analysisd.c
+index a220f4421..0a81971de 100644
+--- a/src/analysisd/analysisd.c
++++ b/src/analysisd/analysisd.c
+@@ -42,7 +42,12 @@
+ #endif
+ 
+ #ifdef SQLITE_ENABLED
+-#include "syscheck-sqlite.h"
++#include <sqlite3.h>
++sqlite3 *conn;
++#endif
++
++#ifdef LIBGEOIP_ENABLED
++GeoIP *geoipdb;
+ #endif
+ 
+ /** Prototypes **/
+diff --git a/src/analysisd/config.h b/src/analysisd/config.h
+index 8d74c756e..976d1942e 100644
+--- a/src/analysisd/config.h
++++ b/src/analysisd/config.h
+@@ -12,6 +12,7 @@
+ 
+ #include "config/config.h"
+ #include "config/global-config.h"
++
+ #ifdef LIBGEOIP_ENABLED
+ #include "GeoIP.h"
+ #endif
+@@ -20,9 +21,11 @@
+ extern long int __crt_ftell; /* Global ftell pointer */
+ extern _Config Config;       /* Global Config structure */
+ 
++/*
+ #ifdef LIBGEOIP_ENABLED
+ GeoIP *geoipdb;
+ #endif
++*/
+ 
+ int GlobalConf(const char *cfgfile);
+ 
+diff --git a/src/analysisd/decoders/geoip.c b/src/analysisd/decoders/geoip.c
+index 464e4bb71..9816b4c81 100644
+--- a/src/analysisd/decoders/geoip.c
++++ b/src/analysisd/decoders/geoip.c
+@@ -30,6 +30,7 @@ char *GetGeoInfobyIP(char *ip_addr)
+     GeoIPRecord *geoiprecord;
+     char *geodata = NULL;
+     char geobuffer[256 +1];
++    extern GeoIP *geoipdb;
+ 
+     if(!geoipdb)
+     {
+diff --git a/src/analysisd/decoders/syscheck.c b/src/analysisd/decoders/syscheck.c
+index a6d675892..30339a00d 100644
+--- a/src/analysisd/decoders/syscheck.c
++++ b/src/analysisd/decoders/syscheck.c
+@@ -16,7 +16,7 @@
+ #include "decoder.h"
+ 
+ #ifdef SQLITE_ENABLED
+-#include "syscheck-sqlite.h"
++#include <sqlite3.h>
+ #endif
+ 
+ typedef struct __sdb {
+diff --git a/src/analysisd/makelists.c b/src/analysisd/makelists.c
+index 06c90db70..dfbe6a4a3 100644
+--- a/src/analysisd/makelists.c
++++ b/src/analysisd/makelists.c
+@@ -32,6 +32,10 @@ time_t c_time;
+ char __shost[512];
+ OSDecoderInfo *NULL_Decoder;
+ 
++#ifdef LIBGEOIP_ENABLED
++GeoIP *geoipdb;
++#endif
++
+ /* print help statement */
+ __attribute__((noreturn))
+ static void help_makelists(void)
+diff --git a/src/analysisd/syscheck-sqlite.h b/src/analysisd/syscheck-sqlite.h
+deleted file mode 100644
+index 526cab26e..000000000
+--- a/src/analysisd/syscheck-sqlite.h
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#ifdef SQLITE_ENABLED
+-#include <sqlite3.h>
+-
+-sqlite3 *conn;
+-#endif
+diff --git a/src/analysisd/testrule.c b/src/analysisd/testrule.c
+index c08fb4885..b1aa928f7 100644
+--- a/src/analysisd/testrule.c
++++ b/src/analysisd/testrule.c
+@@ -83,6 +83,7 @@ int main(int argc, char **argv)
+     memset(prev_month, '\0', 4);
+ 
+ #ifdef LIBGEOIP_ENABLED
++    extern GeoIP *geoipdb;
+     geoipdb = NULL;
+ #endif
+ 
+diff --git a/src/client-agent/agentd.c b/src/client-agent/agentd.c
+index c09cf87d3..67828e79c 100644
+--- a/src/client-agent/agentd.c
++++ b/src/client-agent/agentd.c
+@@ -23,6 +23,8 @@ void AgentdStart(const char *dir, int uid, int gid, const char *user, const char
+     fd_set fdset;
+     struct timeval fdtimeout;
+ 
++    extern agent *agt;
++
+     available_server = 0;
+ 
+     /* Initial random numbers must happen before chroot */
+diff --git a/src/client-agent/agentd.h b/src/client-agent/agentd.h
+index 0246a5457..a362ff9a3 100644
+--- a/src/client-agent/agentd.h
++++ b/src/client-agent/agentd.h
+@@ -81,9 +81,9 @@ void os_agent_cb(int fd, short ev, void *arg);
+ extern time_t available_server;
+ extern int run_foreground;
+ extern keystore keys;
+-extern agent *agt;
++//extern agent *agt;
+ #ifndef WIN32
+-struct imsgbuf server_ibuf;
++//struct imsgbuf server_ibuf;
+ #endif //WIN32
+ 
+ #endif /* __AGENTD_H */
+diff --git a/src/client-agent/event-forward.c b/src/client-agent/event-forward.c
+index 2e81f0c90..22ed0beb9 100644
+--- a/src/client-agent/event-forward.c
++++ b/src/client-agent/event-forward.c
+@@ -19,6 +19,9 @@
+ /* Receive a message locally on the agent and forward it to the manager */
+ void *EventForward(void)
+ {
++
++    extern agent *agt;
++
+     ssize_t recv_b;
+     char msg[OS_MAXSTR + 1];
+ 
+diff --git a/src/client-agent/main.c b/src/client-agent/main.c
+index 5f85cfb73..01c18970c 100644
+--- a/src/client-agent/main.c
++++ b/src/client-agent/main.c
+@@ -16,7 +16,8 @@
+ #define ARGV0 "ossec-agentd"
+ #endif
+ 
+-extern struct imsgbuf server_ibuf;
++//extern struct imsgbuf server_ibuf;
++struct imsgbuf server_ibuf;
+ 
+ 
+ /* Prototypes */
+@@ -112,6 +113,8 @@ int main(int argc, char **argv)
+ 
+     debug1(STARTED_MSG, ARGV0);
+ 
++    extern agent *agt;
++
+     agt = (agent *)calloc(1, sizeof(agent));
+     if (!agt) {
+         ErrorExit(MEM_ERROR, ARGV0, errno, strerror(errno));
+diff --git a/src/client-agent/notify.c b/src/client-agent/notify.c
+index 1b239f26c..93fec325c 100644
+--- a/src/client-agent/notify.c
++++ b/src/client-agent/notify.c
+@@ -68,6 +68,8 @@ void run_notify()
+     os_md5 md5sum;
+     time_t curr_time;
+ 
++    extern agent *agt;
++
+     keep_alive_random[0] = '\0';
+     curr_time = time(0);
+ 
+diff --git a/src/client-agent/receiver-win.c b/src/client-agent/receiver-win.c
+index 859bdf7f9..4ab62ee77 100644
+--- a/src/client-agent/receiver-win.c
++++ b/src/client-agent/receiver-win.c
+@@ -19,6 +19,7 @@
+ /* Receive events from the server */
+ void *receiver_thread(__attribute__((unused)) void *none)
+ {
++    extern agent *agt;
+     int recv_b;
+ 
+     char file[OS_SIZE_1024 + 1];
+diff --git a/src/client-agent/receiver.c b/src/client-agent/receiver.c
+index fde64c282..5286e60dc 100644
+--- a/src/client-agent/receiver.c
++++ b/src/client-agent/receiver.c
+@@ -29,6 +29,8 @@ void *receive_msg()
+     char cleartext[OS_MAXSTR + 1];
+     char *tmp_msg;
+ 
++    extern agent *agt;
++
+     memset(cleartext, '\0', OS_MAXSTR + 1);
+     memset(buffer, '\0', OS_MAXSTR + 1);
+ 
+diff --git a/src/client-agent/sendmsg.c b/src/client-agent/sendmsg.c
+index 454c2e714..3076dfcf9 100644
+--- a/src/client-agent/sendmsg.c
++++ b/src/client-agent/sendmsg.c
+@@ -15,6 +15,9 @@
+ /* Send a message to the server */
+ int send_msg(int agentid, const char *msg)
+ {
++
++    extern agent *agt;
++
+     size_t msg_size;
+     char crypt_msg[OS_MAXSTR + 1];
+ 
+diff --git a/src/client-agent/start_agent.c b/src/client-agent/start_agent.c
+index 51670cee5..f1df43715 100644
+--- a/src/client-agent/start_agent.c
++++ b/src/client-agent/start_agent.c
+@@ -24,6 +24,9 @@ int connect_server(int initial_id)
+ #ifdef WIN32
+     unsigned int attempts = 2;
+ #endif //WIN32
++
++    extern agent *agt;
++
+     int rc = initial_id;
+ 
+     /* Checking if the initial is zero, meaning we have to
+@@ -139,6 +142,8 @@ void start_agent(int is_startup)
+     char cleartext[OS_MAXSTR + 1];
+     char fmsg[OS_MAXSTR + 1];
+ 
++    extern agent *agt;
++
+     memset(msg, '\0', OS_MAXSTR + 2);
+     memset(buffer, '\0', OS_MAXSTR + 1);
+     memset(cleartext, '\0', OS_MAXSTR + 1);
+@@ -241,6 +246,8 @@ void os_agent_cb(int fd, short ev, void *arg) {
+     struct imsg imsg;
+     struct imsgbuf *ibuf = (struct imsgbuf *)arg;
+ 
++    extern agent *agt;
++
+     if (ev & EV_READ) {
+         if ((n = imsg_read(ibuf) == -1 && errno != EAGAIN)) {
+             ErrorExit("%s: ERROR: imsg_read() failed: %s", ARGV0, strerror(errno));
+diff --git a/src/os_net/os_net.c b/src/os_net/os_net.c
+index f18e3be77..756e9fac8 100644
+--- a/src/os_net/os_net.c
++++ b/src/os_net/os_net.c
+@@ -14,7 +14,7 @@
+ #include <errno.h>
+ #include "shared.h"
+ #include "os_net.h"
+-agent *agt;
++agent *os_net_agt;
+ 
+ /* Prototypes */
+ static OSNetInfo *OS_Bindport(char *_port, unsigned int _proto, const char *_ip);
+@@ -346,11 +346,11 @@ int OS_Connect(char *_port, unsigned int protocol, const char *_ip)
+         return(OS_INVALID);
+     }
+ 
+-    if (agt) {
+-        if (agt->lip) {
++    if (os_net_agt) {
++        if (os_net_agt->lip) {
+             memset(&hints, 0, sizeof(struct addrinfo));
+             hints.ai_flags = AI_NUMERICHOST;
+-            s = getaddrinfo(agt->lip, NULL, &hints, &result);
++            s = getaddrinfo(os_net_agt->lip, NULL, &hints, &result);
+             if (s != 0) {
+                 verbose("getaddrinfo: %s", gai_strerror(s));
+             }
+@@ -363,8 +363,8 @@ int OS_Connect(char *_port, unsigned int protocol, const char *_ip)
+     memset(&hints, 0, sizeof(struct addrinfo));
+     /* Allow IPv4 or IPv6 if local_ip isn't specified */
+     hints.ai_family = AF_UNSPEC;
+-    if (agt) {
+-        if (agt->lip) {
++    if (os_net_agt) {
++        if (os_net_agt->lip) {
+             hints.ai_family = local_ai->ai_family;
+         }
+     }
+@@ -398,13 +398,13 @@ int OS_Connect(char *_port, unsigned int protocol, const char *_ip)
+             continue;
+         }
+ 
+-        if (agt) {
+-            if (agt->lip) {
++        if (os_net_agt) {
++            if (os_net_agt->lip) {
+                 if (bind(ossock, local_ai->ai_addr, local_ai->ai_addrlen)) {
+                     verbose("Unable to bind to local address %s.  Ignoring. (%s)",
+-                            agt->lip, strerror(errno));
++                            os_net_agt->lip, strerror(errno));
+                 }
+-                else verbose("Connecting from local address %s", agt->lip);
++                else verbose("Connecting from local address %s", os_net_agt->lip);
+             }
+         }
+ 
+diff --git a/src/os_net/os_net.h b/src/os_net/os_net.h
+index 9b7250928..3aaf00429 100644
+--- a/src/os_net/os_net.h
++++ b/src/os_net/os_net.h
+@@ -13,7 +13,7 @@
+ 
+ #include "headers/shared.h"
+ #include "config/client-config.h"
+-extern agent *agt;
++extern agent *os_net_agt;
+ #ifdef WIN32
+ #ifndef AI_ADDRCONFIG
+ #define AI_ADDRCONFIG   0x0400
+diff --git a/src/win32/win_agent.c b/src/win32/win_agent.c
+index 40a37e621..a2ec784f2 100644
+--- a/src/win32/win_agent.c
++++ b/src/win32/win_agent.c
+@@ -124,6 +124,7 @@ int local_start()
+     WSADATA wsaData;
+     DWORD  threadID;
+     DWORD  threadID2;
++    extern agent *agt;
+ 
+     /* Start agent */
+     agt = (agent *)calloc(1, sizeof(agent));
+@@ -271,6 +272,7 @@ int SendMSG(__attribute__((unused)) int queue, const char *message, const char *
+     char tmpstr[OS_MAXSTR + 2];
+     char crypt_msg[OS_MAXSTR + 2];
+     DWORD dwWaitResult;
++    extern agent *agt;
+ 
+     tmpstr[OS_MAXSTR + 1] = '\0';
+     crypt_msg[OS_MAXSTR + 1] = '\0';
+@@ -468,6 +470,8 @@ void send_win32_info(time_t curr_time)
+     tmp_msg[OS_MAXSTR + 1] = '\0';
+     crypt_msg[OS_MAXSTR + 1] = '\0';
+ 
++    extern agent *agt;
++
+     debug1("%s: DEBUG: Sending keep alive message.", ARGV0);
+ 
+     /* Fix time */
diff --git a/system/ossec-local/ossec-local.SlackBuild b/system/ossec-local/ossec-local.SlackBuild
index cd43e82965..a4e40d08dd 100644
--- a/system/ossec-local/ossec-local.SlackBuild
+++ b/system/ossec-local/ossec-local.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ossec-local
 
@@ -24,10 +24,13 @@
 
 # Special thanks to Jason Graham for patches and testing
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ossec-local
 VERSION=${VERSION:-3.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=ossec-hids
 
@@ -39,7 +42,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -116,6 +126,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p1 < $CWD/gcc-fno-common-3.6.0.patch
+
 # Makefile fixes
 sed -e 's|\(./init/adduser.sh.*\)|#\1|' \
     -e 's|\(DEFINES+=-DDEFAULTDIR=\).*|\1\\"/var/ossec\\"|' \
@@ -163,4 +175,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ossec-local/ossec-local.info b/system/ossec-local/ossec-local.info
index 8deedf1ab3..f7f43d9f29 100644
--- a/system/ossec-local/ossec-local.info
+++ b/system/ossec-local/ossec-local.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/ossec/ossec-hids/archive/3.6.0/ossec-hids-3.6.0.tar
 MD5SUM="03fe101f736e834b3804bac8bb4aa980"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pcre2"
+REQUIRES=""
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/system/ossec-server/README b/system/ossec-server/README
index 119ee06264..fa55990327 100644
--- a/system/ossec-server/README
+++ b/system/ossec-server/README
@@ -1,6 +1,6 @@
-OSSEC is an Open Source Host-based Intrusion Detection System that performs log
-analysis, file integrity checking, policy monitoring, rootkit detection,
-real-time alerting and active response.
+OSSEC is an Open Source Host-based Intrusion Detection System that
+performs log analysis, file integrity checking, policy monitoring,
+rootkit detection, real-time alerting and active response.
 
 The following build options are available:
 
diff --git a/system/ossec-server/gcc-fno-common-3.6.0.patch b/system/ossec-server/gcc-fno-common-3.6.0.patch
new file mode 100644
index 0000000000..e8ed3c66dd
--- /dev/null
+++ b/system/ossec-server/gcc-fno-common-3.6.0.patch
@@ -0,0 +1,402 @@
+diff --git a/src/addagent/main.c b/src/addagent/main.c
+index 587a8a3d8..ab12f0326 100644
+--- a/src/addagent/main.c
++++ b/src/addagent/main.c
+@@ -17,6 +17,7 @@ static void print_banner(void);
+ static void manage_shutdown(int sig) __attribute__((noreturn));
+ #endif
+ 
++int willchroot;
+ 
+ #if defined(__MINGW32__)
+ static int setenv(const char *name, const char *val, __attribute__((unused)) int overwrite)
+diff --git a/src/addagent/manage_agents.c b/src/addagent/manage_agents.c
+index ac39c1e66..4f9c266ff 100644
+--- a/src/addagent/manage_agents.c
++++ b/src/addagent/manage_agents.c
+@@ -85,6 +85,8 @@ int add_agent(int json_output)
+ 
+     char authfile[257];
+ 
++    extern int willchroot;
++
+     if(willchroot > 0) {
+         snprintf(authfile, 256, "%s", AUTH_FILE);	//XXX
+     } else {
+diff --git a/src/addagent/manage_agents.h b/src/addagent/manage_agents.h
+index 4812dba43..f2962e80b 100644
+--- a/src/addagent/manage_agents.h
++++ b/src/addagent/manage_agents.h
+@@ -147,4 +147,4 @@ extern fpos_t fp_pos;
+ #define GMF_UNKN_ERROR  ARGV0 ": Could not run GetModuleFileName which returned (%ld).\n"
+ 
+ 
+-int willchroot;
++//int willchroot;
+diff --git a/src/addagent/manage_keys.c b/src/addagent/manage_keys.c
+index 146b48326..ffb9a1f21 100644
+--- a/src/addagent/manage_keys.c
++++ b/src/addagent/manage_keys.c
+@@ -336,6 +336,8 @@ int k_bulkload(const char *cmdbulk)
+     char delims[] = ",";
+     char *token = NULL;
+ 
++    extern int willchroot;
++
+     /* Check if we can open the input file */
+     printf("Opening: [%s]\n", cmdbulk);
+     infp = fopen(cmdbulk, "r");
+diff --git a/src/analysisd/analysisd.c b/src/analysisd/analysisd.c
+index a220f4421..0a81971de 100644
+--- a/src/analysisd/analysisd.c
++++ b/src/analysisd/analysisd.c
+@@ -42,7 +42,12 @@
+ #endif
+ 
+ #ifdef SQLITE_ENABLED
+-#include "syscheck-sqlite.h"
++#include <sqlite3.h>
++sqlite3 *conn;
++#endif
++
++#ifdef LIBGEOIP_ENABLED
++GeoIP *geoipdb;
+ #endif
+ 
+ /** Prototypes **/
+diff --git a/src/analysisd/config.h b/src/analysisd/config.h
+index 8d74c756e..976d1942e 100644
+--- a/src/analysisd/config.h
++++ b/src/analysisd/config.h
+@@ -12,6 +12,7 @@
+ 
+ #include "config/config.h"
+ #include "config/global-config.h"
++
+ #ifdef LIBGEOIP_ENABLED
+ #include "GeoIP.h"
+ #endif
+@@ -20,9 +21,11 @@
+ extern long int __crt_ftell; /* Global ftell pointer */
+ extern _Config Config;       /* Global Config structure */
+ 
++/*
+ #ifdef LIBGEOIP_ENABLED
+ GeoIP *geoipdb;
+ #endif
++*/
+ 
+ int GlobalConf(const char *cfgfile);
+ 
+diff --git a/src/analysisd/decoders/geoip.c b/src/analysisd/decoders/geoip.c
+index 464e4bb71..9816b4c81 100644
+--- a/src/analysisd/decoders/geoip.c
++++ b/src/analysisd/decoders/geoip.c
+@@ -30,6 +30,7 @@ char *GetGeoInfobyIP(char *ip_addr)
+     GeoIPRecord *geoiprecord;
+     char *geodata = NULL;
+     char geobuffer[256 +1];
++    extern GeoIP *geoipdb;
+ 
+     if(!geoipdb)
+     {
+diff --git a/src/analysisd/decoders/syscheck.c b/src/analysisd/decoders/syscheck.c
+index a6d675892..30339a00d 100644
+--- a/src/analysisd/decoders/syscheck.c
++++ b/src/analysisd/decoders/syscheck.c
+@@ -16,7 +16,7 @@
+ #include "decoder.h"
+ 
+ #ifdef SQLITE_ENABLED
+-#include "syscheck-sqlite.h"
++#include <sqlite3.h>
+ #endif
+ 
+ typedef struct __sdb {
+diff --git a/src/analysisd/makelists.c b/src/analysisd/makelists.c
+index 06c90db70..dfbe6a4a3 100644
+--- a/src/analysisd/makelists.c
++++ b/src/analysisd/makelists.c
+@@ -32,6 +32,10 @@ time_t c_time;
+ char __shost[512];
+ OSDecoderInfo *NULL_Decoder;
+ 
++#ifdef LIBGEOIP_ENABLED
++GeoIP *geoipdb;
++#endif
++
+ /* print help statement */
+ __attribute__((noreturn))
+ static void help_makelists(void)
+diff --git a/src/analysisd/syscheck-sqlite.h b/src/analysisd/syscheck-sqlite.h
+deleted file mode 100644
+index 526cab26e..000000000
+--- a/src/analysisd/syscheck-sqlite.h
++++ /dev/null
+@@ -1,5 +0,0 @@
+-#ifdef SQLITE_ENABLED
+-#include <sqlite3.h>
+-
+-sqlite3 *conn;
+-#endif
+diff --git a/src/analysisd/testrule.c b/src/analysisd/testrule.c
+index c08fb4885..b1aa928f7 100644
+--- a/src/analysisd/testrule.c
++++ b/src/analysisd/testrule.c
+@@ -83,6 +83,7 @@ int main(int argc, char **argv)
+     memset(prev_month, '\0', 4);
+ 
+ #ifdef LIBGEOIP_ENABLED
++    extern GeoIP *geoipdb;
+     geoipdb = NULL;
+ #endif
+ 
+diff --git a/src/client-agent/agentd.c b/src/client-agent/agentd.c
+index c09cf87d3..67828e79c 100644
+--- a/src/client-agent/agentd.c
++++ b/src/client-agent/agentd.c
+@@ -23,6 +23,8 @@ void AgentdStart(const char *dir, int uid, int gid, const char *user, const char
+     fd_set fdset;
+     struct timeval fdtimeout;
+ 
++    extern agent *agt;
++
+     available_server = 0;
+ 
+     /* Initial random numbers must happen before chroot */
+diff --git a/src/client-agent/agentd.h b/src/client-agent/agentd.h
+index 0246a5457..a362ff9a3 100644
+--- a/src/client-agent/agentd.h
++++ b/src/client-agent/agentd.h
+@@ -81,9 +81,9 @@ void os_agent_cb(int fd, short ev, void *arg);
+ extern time_t available_server;
+ extern int run_foreground;
+ extern keystore keys;
+-extern agent *agt;
++//extern agent *agt;
+ #ifndef WIN32
+-struct imsgbuf server_ibuf;
++//struct imsgbuf server_ibuf;
+ #endif //WIN32
+ 
+ #endif /* __AGENTD_H */
+diff --git a/src/client-agent/event-forward.c b/src/client-agent/event-forward.c
+index 2e81f0c90..22ed0beb9 100644
+--- a/src/client-agent/event-forward.c
++++ b/src/client-agent/event-forward.c
+@@ -19,6 +19,9 @@
+ /* Receive a message locally on the agent and forward it to the manager */
+ void *EventForward(void)
+ {
++
++    extern agent *agt;
++
+     ssize_t recv_b;
+     char msg[OS_MAXSTR + 1];
+ 
+diff --git a/src/client-agent/main.c b/src/client-agent/main.c
+index 5f85cfb73..01c18970c 100644
+--- a/src/client-agent/main.c
++++ b/src/client-agent/main.c
+@@ -16,7 +16,8 @@
+ #define ARGV0 "ossec-agentd"
+ #endif
+ 
+-extern struct imsgbuf server_ibuf;
++//extern struct imsgbuf server_ibuf;
++struct imsgbuf server_ibuf;
+ 
+ 
+ /* Prototypes */
+@@ -112,6 +113,8 @@ int main(int argc, char **argv)
+ 
+     debug1(STARTED_MSG, ARGV0);
+ 
++    extern agent *agt;
++
+     agt = (agent *)calloc(1, sizeof(agent));
+     if (!agt) {
+         ErrorExit(MEM_ERROR, ARGV0, errno, strerror(errno));
+diff --git a/src/client-agent/notify.c b/src/client-agent/notify.c
+index 1b239f26c..93fec325c 100644
+--- a/src/client-agent/notify.c
++++ b/src/client-agent/notify.c
+@@ -68,6 +68,8 @@ void run_notify()
+     os_md5 md5sum;
+     time_t curr_time;
+ 
++    extern agent *agt;
++
+     keep_alive_random[0] = '\0';
+     curr_time = time(0);
+ 
+diff --git a/src/client-agent/receiver-win.c b/src/client-agent/receiver-win.c
+index 859bdf7f9..4ab62ee77 100644
+--- a/src/client-agent/receiver-win.c
++++ b/src/client-agent/receiver-win.c
+@@ -19,6 +19,7 @@
+ /* Receive events from the server */
+ void *receiver_thread(__attribute__((unused)) void *none)
+ {
++    extern agent *agt;
+     int recv_b;
+ 
+     char file[OS_SIZE_1024 + 1];
+diff --git a/src/client-agent/receiver.c b/src/client-agent/receiver.c
+index fde64c282..5286e60dc 100644
+--- a/src/client-agent/receiver.c
++++ b/src/client-agent/receiver.c
+@@ -29,6 +29,8 @@ void *receive_msg()
+     char cleartext[OS_MAXSTR + 1];
+     char *tmp_msg;
+ 
++    extern agent *agt;
++
+     memset(cleartext, '\0', OS_MAXSTR + 1);
+     memset(buffer, '\0', OS_MAXSTR + 1);
+ 
+diff --git a/src/client-agent/sendmsg.c b/src/client-agent/sendmsg.c
+index 454c2e714..3076dfcf9 100644
+--- a/src/client-agent/sendmsg.c
++++ b/src/client-agent/sendmsg.c
+@@ -15,6 +15,9 @@
+ /* Send a message to the server */
+ int send_msg(int agentid, const char *msg)
+ {
++
++    extern agent *agt;
++
+     size_t msg_size;
+     char crypt_msg[OS_MAXSTR + 1];
+ 
+diff --git a/src/client-agent/start_agent.c b/src/client-agent/start_agent.c
+index 51670cee5..f1df43715 100644
+--- a/src/client-agent/start_agent.c
++++ b/src/client-agent/start_agent.c
+@@ -24,6 +24,9 @@ int connect_server(int initial_id)
+ #ifdef WIN32
+     unsigned int attempts = 2;
+ #endif //WIN32
++
++    extern agent *agt;
++
+     int rc = initial_id;
+ 
+     /* Checking if the initial is zero, meaning we have to
+@@ -139,6 +142,8 @@ void start_agent(int is_startup)
+     char cleartext[OS_MAXSTR + 1];
+     char fmsg[OS_MAXSTR + 1];
+ 
++    extern agent *agt;
++
+     memset(msg, '\0', OS_MAXSTR + 2);
+     memset(buffer, '\0', OS_MAXSTR + 1);
+     memset(cleartext, '\0', OS_MAXSTR + 1);
+@@ -241,6 +246,8 @@ void os_agent_cb(int fd, short ev, void *arg) {
+     struct imsg imsg;
+     struct imsgbuf *ibuf = (struct imsgbuf *)arg;
+ 
++    extern agent *agt;
++
+     if (ev & EV_READ) {
+         if ((n = imsg_read(ibuf) == -1 && errno != EAGAIN)) {
+             ErrorExit("%s: ERROR: imsg_read() failed: %s", ARGV0, strerror(errno));
+diff --git a/src/os_net/os_net.c b/src/os_net/os_net.c
+index f18e3be77..756e9fac8 100644
+--- a/src/os_net/os_net.c
++++ b/src/os_net/os_net.c
+@@ -14,7 +14,7 @@
+ #include <errno.h>
+ #include "shared.h"
+ #include "os_net.h"
+-agent *agt;
++agent *os_net_agt;
+ 
+ /* Prototypes */
+ static OSNetInfo *OS_Bindport(char *_port, unsigned int _proto, const char *_ip);
+@@ -346,11 +346,11 @@ int OS_Connect(char *_port, unsigned int protocol, const char *_ip)
+         return(OS_INVALID);
+     }
+ 
+-    if (agt) {
+-        if (agt->lip) {
++    if (os_net_agt) {
++        if (os_net_agt->lip) {
+             memset(&hints, 0, sizeof(struct addrinfo));
+             hints.ai_flags = AI_NUMERICHOST;
+-            s = getaddrinfo(agt->lip, NULL, &hints, &result);
++            s = getaddrinfo(os_net_agt->lip, NULL, &hints, &result);
+             if (s != 0) {
+                 verbose("getaddrinfo: %s", gai_strerror(s));
+             }
+@@ -363,8 +363,8 @@ int OS_Connect(char *_port, unsigned int protocol, const char *_ip)
+     memset(&hints, 0, sizeof(struct addrinfo));
+     /* Allow IPv4 or IPv6 if local_ip isn't specified */
+     hints.ai_family = AF_UNSPEC;
+-    if (agt) {
+-        if (agt->lip) {
++    if (os_net_agt) {
++        if (os_net_agt->lip) {
+             hints.ai_family = local_ai->ai_family;
+         }
+     }
+@@ -398,13 +398,13 @@ int OS_Connect(char *_port, unsigned int protocol, const char *_ip)
+             continue;
+         }
+ 
+-        if (agt) {
+-            if (agt->lip) {
++        if (os_net_agt) {
++            if (os_net_agt->lip) {
+                 if (bind(ossock, local_ai->ai_addr, local_ai->ai_addrlen)) {
+                     verbose("Unable to bind to local address %s.  Ignoring. (%s)",
+-                            agt->lip, strerror(errno));
++                            os_net_agt->lip, strerror(errno));
+                 }
+-                else verbose("Connecting from local address %s", agt->lip);
++                else verbose("Connecting from local address %s", os_net_agt->lip);
+             }
+         }
+ 
+diff --git a/src/os_net/os_net.h b/src/os_net/os_net.h
+index 9b7250928..3aaf00429 100644
+--- a/src/os_net/os_net.h
++++ b/src/os_net/os_net.h
+@@ -13,7 +13,7 @@
+ 
+ #include "headers/shared.h"
+ #include "config/client-config.h"
+-extern agent *agt;
++extern agent *os_net_agt;
+ #ifdef WIN32
+ #ifndef AI_ADDRCONFIG
+ #define AI_ADDRCONFIG   0x0400
+diff --git a/src/win32/win_agent.c b/src/win32/win_agent.c
+index 40a37e621..a2ec784f2 100644
+--- a/src/win32/win_agent.c
++++ b/src/win32/win_agent.c
+@@ -124,6 +124,7 @@ int local_start()
+     WSADATA wsaData;
+     DWORD  threadID;
+     DWORD  threadID2;
++    extern agent *agt;
+ 
+     /* Start agent */
+     agt = (agent *)calloc(1, sizeof(agent));
+@@ -271,6 +272,7 @@ int SendMSG(__attribute__((unused)) int queue, const char *message, const char *
+     char tmpstr[OS_MAXSTR + 2];
+     char crypt_msg[OS_MAXSTR + 2];
+     DWORD dwWaitResult;
++    extern agent *agt;
+ 
+     tmpstr[OS_MAXSTR + 1] = '\0';
+     crypt_msg[OS_MAXSTR + 1] = '\0';
+@@ -468,6 +470,8 @@ void send_win32_info(time_t curr_time)
+     tmp_msg[OS_MAXSTR + 1] = '\0';
+     crypt_msg[OS_MAXSTR + 1] = '\0';
+ 
++    extern agent *agt;
++
+     debug1("%s: DEBUG: Sending keep alive message.", ARGV0);
+ 
+     /* Fix time */
diff --git a/system/ossec-server/ossec-server.SlackBuild b/system/ossec-server/ossec-server.SlackBuild
index 31c9994ab8..e9410aa8fd 100644
--- a/system/ossec-server/ossec-server.SlackBuild
+++ b/system/ossec-server/ossec-server.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ossec-server
 
@@ -24,10 +24,13 @@
 
 # Special thanks to Jason Graham for patches and testing
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ossec-server
 VERSION=${VERSION:-3.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=ossec-hids
 
@@ -39,7 +42,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -116,6 +126,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p1 < $CWD/gcc-fno-common-3.6.0.patch
+
 # Makefile fixes
 sed -e 's|\(./init/adduser.sh.*\)|#\1|' \
     -e 's|\(DEFINES+=-DDEFAULTDIR=\).*|\1\\"/var/ossec\\"|' \
@@ -163,4 +175,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ossec-server/ossec-server.info b/system/ossec-server/ossec-server.info
index 05fc9965df..3104b6392e 100644
--- a/system/ossec-server/ossec-server.info
+++ b/system/ossec-server/ossec-server.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/ossec/ossec-hids/archive/3.6.0/ossec-hids-3.6.0.tar
 MD5SUM="03fe101f736e834b3804bac8bb4aa980"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pcre2"
+REQUIRES=""
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/system/ostree/ostree.SlackBuild b/system/ostree/ostree.SlackBuild
index 6d2f938f35..330fae47c2 100644
--- a/system/ostree/ostree.SlackBuild
+++ b/system/ostree/ostree.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ostree
 
@@ -23,10 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ostree
-VERSION=${VERSION:-2019.6}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2021.3}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -96,8 +106,10 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ostree/ostree.info b/system/ostree/ostree.info
index 6e294b63c5..7dd9ee41b0 100644
--- a/system/ostree/ostree.info
+++ b/system/ostree/ostree.info
@@ -1,8 +1,8 @@
 PRGNAM="ostree"
-VERSION="2019.6"
+VERSION="2021.3"
 HOMEPAGE="https://github.com/ostreedev/ostree/"
-DOWNLOAD="https://github.com/ostreedev/ostree/releases/download/v2019.6/libostree-2019.6.tar.xz"
-MD5SUM="4d00cd2c5bce31b6302c71cbdb2a17eb"
+DOWNLOAD="https://github.com/ostreedev/ostree/releases/download/v2021.3/libostree-2021.3.tar.xz"
+MD5SUM="a70520dc37d9fdc655a7ff76892496fe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/otf-hermit/README b/system/otf-hermit/README
index 65715b0657..3267046863 100644
--- a/system/otf-hermit/README
+++ b/system/otf-hermit/README
@@ -1,4 +1,4 @@
-Hermit is a monospace font designed to be clear, pragmatic and very readable.
-Its creation has been focused on programming. Every glyph was carefully planned
-and calculated, according to defined principles and rules.
-For this reason, Hermit is coherent and regular.
+Hermit is a monospace font designed to be clear, pragmatic and very
+readable. Its creation has been focused on programming. Every glyph
+was carefully planned and calculated, according to defined principles
+and rules. For this reason, Hermit is coherent and regular.
diff --git a/system/otf-hermit/otf-hermit.SlackBuild b/system/otf-hermit/otf-hermit.SlackBuild
index 08681001f3..2739e34eac 100644
--- a/system/otf-hermit/otf-hermit.SlackBuild
+++ b/system/otf-hermit/otf-hermit.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hermit-font
 
@@ -22,15 +22,24 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org: updated for v2.0, as the
+# previous version's download disappeared.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=otf-hermit
-FONTNAM=Hermit
-VERSION=${VERSION:-1.21}
+VERSION=${VERSION:-2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -57,4 +66,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/otf-hermit/otf-hermit.info b/system/otf-hermit/otf-hermit.info
index 8939e4ab64..af624a9f8d 100644
--- a/system/otf-hermit/otf-hermit.info
+++ b/system/otf-hermit/otf-hermit.info
@@ -1,8 +1,8 @@
 PRGNAM="otf-hermit"
-VERSION="1.21"
+VERSION="2.0"
 HOMEPAGE="https://pcaro.es/p/hermit/"
-DOWNLOAD="https://pcaro.es/d/otf-hermit-1.21.tar.gz"
-MD5SUM="95e44bd81eb96f04e129ee019726db9a"
+DOWNLOAD="https://pcaro.es/d/otf-hermit-2.0.tar.gz"
+MD5SUM="62fcc5020889c22077eac5771dd40e7f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/otf-ibm-plex/README b/system/otf-ibm-plex/README
new file mode 100644
index 0000000000..3e5cfeed88
--- /dev/null
+++ b/system/otf-ibm-plex/README
@@ -0,0 +1,3 @@
+ttf-ibm-plex (Open Type Font)
+
+IBM Plex font family.
diff --git a/system/otf-ibm-plex/doinst.sh b/system/otf-ibm-plex/doinst.sh
new file mode 100644
index 0000000000..f0c0523187
--- /dev/null
+++ b/system/otf-ibm-plex/doinst.sh
@@ -0,0 +1,11 @@
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/otf-ibm-plex/otf-ibm-plex.SlackBuild b/system/otf-ibm-plex/otf-ibm-plex.SlackBuild
new file mode 100644
index 0000000000..5dedabddb4
--- /dev/null
+++ b/system/otf-ibm-plex/otf-ibm-plex.SlackBuild
@@ -0,0 +1,72 @@
+#!/bin/bash
+#
+# Slackware build script for ttf-ibm-plex
+#
+# ISC License
+#
+# Copyright (c) 2019, 2020 Lazar Isailovic <etflazar@gmail.com>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=otf-ibm-plex
+VERSION=${VERSION:-6.3.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+unzip $CWD/OpenType.zip
+mv OpenType $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+
+mkdir -p $PKG/usr/share/fonts/OTF
+find . -name "*.otf" -exec cp {} $PKG/usr/share/fonts/OTF/ \;
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a IBM-Plex-Mono/license.txt $PKG/usr/doc/$PRGNAM-$VERSION/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/otf-ibm-plex/otf-ibm-plex.info b/system/otf-ibm-plex/otf-ibm-plex.info
new file mode 100644
index 0000000000..77588e2a10
--- /dev/null
+++ b/system/otf-ibm-plex/otf-ibm-plex.info
@@ -0,0 +1,10 @@
+PRGNAM="otf-ibm-plex"
+VERSION="6.3.0"
+HOMEPAGE="https://github.com/IBM/plex"
+DOWNLOAD="https://github.com/IBM/plex/releases/download/v6.3.0/OpenType.zip"
+MD5SUM="01fce5d42666afb6587f609f38f9ab1a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="JW(Shinichi Abe)"
+EMAIL="shin1.abe@nifty.com"
diff --git a/system/otf-ibm-plex/slack-desc b/system/otf-ibm-plex/slack-desc
new file mode 100644
index 0000000000..f2b64d465f
--- /dev/null
+++ b/system/otf-ibm-plex/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+otf-ibm-plex: otf-ibm-plex (Open Type Font)
+otf-ibm-plex:
+otf-ibm-plex: IBM Plex font family.
+otf-ibm-plex:
+otf-ibm-plex: Homepage: https://github.com/IBM/plex
+otf-ibm-plex:
+otf-ibm-plex:
+otf-ibm-plex:
+otf-ibm-plex:
+otf-ibm-plex:
+otf-ibm-plex:
diff --git a/system/otf2bdf/README b/system/otf2bdf/README
index c7c2b07912..1049682789 100644
--- a/system/otf2bdf/README
+++ b/system/otf2bdf/README
@@ -1,11 +1,12 @@
 otf2bdf (opentype/truetype to bdf font converter)
 
-otf2bdf is a command line utility that uses the FreeType 2 font rendering
-library to generate BDF bitmap fonts from OpenType/TrueType outline fonts
-at different sizes and resolutions. This program is essentially the same
-as the ttf2bdf program except that it uses FreeType 2.*, not FreeType
-1.*, has some bug fixes, and includes a new command line parameter to
-print out the available encoding tables in the font.
+otf2bdf is a command line utility that uses the FreeType 2 font
+rendering library to generate BDF bitmap fonts from OpenType/TrueType
+outline fonts at different sizes and resolutions. This program
+is essentially the same as the ttf2bdf program except that it uses
+FreeType 2.*, not FreeType 1.*, has some bug fixes, and includes a new
+command line parameter to print out the available encoding tables in
+the font.
 
 For best results, the original font should be monospaced.
 
diff --git a/system/otf2bdf/otf2bdf.SlackBuild b/system/otf2bdf/otf2bdf.SlackBuild
index ba9a22dc51..f978f7be98 100644
--- a/system/otf2bdf/otf2bdf.SlackBuild
+++ b/system/otf2bdf/otf2bdf.SlackBuild
@@ -1,15 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for otf2bdf
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=otf2bdf
 VERSION=${VERSION:-3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +22,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,11 +54,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tbz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -82,4 +86,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/otf2bdf/otf2bdf.info b/system/otf2bdf/otf2bdf.info
index eecb7c1950..9de66b1b67 100644
--- a/system/otf2bdf/otf2bdf.info
+++ b/system/otf2bdf/otf2bdf.info
@@ -1,10 +1,10 @@
 PRGNAM="otf2bdf"
 VERSION="3.1"
-HOMEPAGE="http://web.archive.org/web/20171026195930/https://www.math.nmsu.edu/~mleisher/Software/otf2bdf/"
+HOMEPAGE="https://web.archive.org/web/20171026195930/https://www.math.nmsu.edu/~mleisher/Software/otf2bdf/"
 DOWNLOAD="https://slackware.uk/~urchlay/src/otf2bdf-3.1.tbz2"
 MD5SUM="6af09173615f1dd5ae294bbf67ac52c8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/overpass-desktop-fonts/overpass-desktop-fonts.SlackBuild b/system/overpass-desktop-fonts/overpass-desktop-fonts.SlackBuild
index be4c6ea2c4..decb0238a7 100644
--- a/system/overpass-desktop-fonts/overpass-desktop-fonts.SlackBuild
+++ b/system/overpass-desktop-fonts/overpass-desktop-fonts.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware Package Build Script for overpass-desktop-fonts
 # Home Page http://overpassfont.org/
@@ -25,15 +25,25 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-SRCNAM="Overpass"
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="overpass-desktop-fonts"
+SRCNAM="Overpass"
 VERSION=${VERSION:-3.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,4 +77,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/overpass-webfonts/overpass-webfonts.SlackBuild b/system/overpass-webfonts/overpass-webfonts.SlackBuild
index 947cbe70db..f28e128572 100644
--- a/system/overpass-webfonts/overpass-webfonts.SlackBuild
+++ b/system/overpass-webfonts/overpass-webfonts.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware Package Build Script for overpass-webfonts
 # Home Page http://overpassfont.org/
@@ -25,15 +25,25 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-SRCNAM="Overpass"
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="overpass-webfonts"
+SRCNAM="Overpass"
 VERSION=${VERSION:-3.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,4 +77,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ovmf/README b/system/ovmf/README
deleted file mode 100644
index 645102fa83..0000000000
--- a/system/ovmf/README
+++ /dev/null
@@ -1,4 +0,0 @@
-OVMF is an UEFI firmware for qemu.
-
-To enable these in libvirt/virt-manager see the instructions
-in README.SBo
diff --git a/system/ovmf/README.SBo b/system/ovmf/README.SBo
deleted file mode 100644
index 14a2bd4989..0000000000
--- a/system/ovmf/README.SBo
+++ /dev/null
@@ -1,12 +0,0 @@
-To use UEFI in libvirt/qemu add this to /etc/libvirt/qemu.conf:
-nvram = [
-    "/usr/share/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/ovmf-x64/OVMF_VARS-pure-efi.fd",
-    "/usr/share/ovmf-x64/OVMF_CODE-with-csm.fd:/usr/share/ovmf-x64/OVMF_VARS-with-csm.fd",
-    "/usr/share/ovmf-x64/OVMF_CODE-need-smm.fd:/usr/share/ovmf-x64/OVMF_VARS-need-smm.fd",
-    "/usr/share/ovmf-ia32/OVMF_CODE-pure-efi.fd:/usr/share/ovmf-ia32/OVMF_VARS-pure-efi.fd",
-    "/usr/share/ovmf-ia32/OVMF_CODE-with-csm.fd:/usr/share/ovmf-ia32/OVMF_VARS-with-csm.fd",
-    "/usr/share/ovmf-ia32/OVMF_CODE-need-smm.fd:/usr/share/ovmf-ia32/OVMF_VARS-need-smm.fd"
-]
-
-And restart libvirt. Now you should be able to select UEFI firmware in
-virt-manager.
diff --git a/system/ovmf/ovmf.SlackBuild b/system/ovmf/ovmf.SlackBuild
deleted file mode 100644
index 19f398f47b..0000000000
--- a/system/ovmf/ovmf.SlackBuild
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for ovmf
-
-# Copyright 2017 Philip van der Hoeven, Almere, The Netherlands
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=ovmf
-VERSION=${VERSION:-20171116}
-GITCOMMIT=${GITCOMMIT:-b3104.g1195b85787}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-rm -rf $TMP/$PRGNAM
-mkdir -p $TMP/$PRGNAM $PKG $OUTPUT
-cd $TMP/$PRGNAM
-
-RPM32=$CWD/edk2.git-ovmf-ia32-0-$VERSION.$GITCOMMIT.noarch.rpm
-RPM64=$CWD/edk2.git-ovmf-x64-0-$VERSION.$GITCOMMIT.noarch.rpm
-rpm2cpio $RPM32| cpio -idmv
-rpm2cpio $RPM64| cpio -idmv
-
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p $PKG/usr/share
-cp -r usr/share/edk2.git/ovmf-ia32 $PKG/usr/share
-cp -r usr/share/edk2.git/ovmf-x64 $PKG/usr/share
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp usr/share/doc/edk2.git-ovmf-x64/README \
-  $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/ovmf/ovmf.info b/system/ovmf/ovmf.info
deleted file mode 100644
index ecc140ab95..0000000000
--- a/system/ovmf/ovmf.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="ovmf"
-VERSION="20171116"
-HOMEPAGE="https://github.com/tianocore/tianocore.github.io/wiki/OVMF"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/ovmf/edk2.git-ovmf-ia32-0-20171116.b3104.g1195b85787.noarch.rpm \
-        https://sourceforge.net/projects/slackbuildsdirectlinks/files/ovmf/edk2.git-ovmf-x64-0-20171116.b3104.g1195b85787.noarch.rpm"
-MD5SUM="76c7186eeb4b30e08037778add25d68e \
-        057867e4266c37aa40f0ee7437118dbc"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="acpica"
-MAINTAINER="Philip van der Hoeven"
-EMAIL="philip@vd-hoeven.nl"
diff --git a/system/ovmf/slack-desc b/system/ovmf/slack-desc
deleted file mode 100644
index 8f5ccba01a..0000000000
--- a/system/ovmf/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-    |-----handy-ruler------------------------------------------------------|
-ovmf: ovmf (uefi firmware for qemu)
-ovmf:
-ovmf: ovmf is an uefi firmware for qemu
-ovmf:
-ovmf: Homepage: http://www.tianocore.org/ovmf/
-ovmf:
-ovmf:
-ovmf:
-ovmf:
-ovmf:
-ovmf:
diff --git a/system/p7zip/README b/system/p7zip/README
index 9c897a2d16..faacf40f04 100644
--- a/system/p7zip/README
+++ b/system/p7zip/README
@@ -1,5 +1,2 @@
 7-Zip is a well-known file compression utility for windows.
 p7zip is a ported version for linux with nearly the same capabilities.
-
-If you want to build the new GUI, you have to pass GUI=yes to the script:
-this requires an optional dependency, wxPython.
diff --git a/system/p7zip/p7zip.SlackBuild b/system/p7zip/p7zip.SlackBuild
index ec9cbda5ed..cc474caca9 100644
--- a/system/p7zip/p7zip.SlackBuild
+++ b/system/p7zip/p7zip.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for p7zip
 
-# Copyright 2007-2016 Heinz Wiesinger, Amsterdam, Netherlands
+# Copyright 2007-2021 Heinz Wiesinger, Amsterdam, Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,37 +11,47 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=p7zip
-VERSION=${VERSION:-16.02}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-17.04}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -62,9 +72,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}_${VERSION}
-tar xvf $CWD/${PRGNAM}_${VERSION}_src_all.tar.bz2
-cd ${PRGNAM}_${VERSION}
+rm -rf ${PRGNAM}-${VERSION}
+tar xvf $CWD/${PRGNAM}-${VERSION}.tar.gz
+cd ${PRGNAM}-${VERSION}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -73,22 +83,12 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 make all3 \
-  OPTFLAGS="$SLKCFLAGS" \
+  OPTFLAGS="$SLKCFLAGS -std=gnu++14" \
   DEST_HOME=/usr \
   DEST_SHARE_DOC=/usr/doc/$PRGNAM-$VERSION \
   DEST_SHARE=/usr/lib$LIBDIRSUFFIX/p7zip \
   DEST_DIR=$PKG
 
-if ! [ "$GUI" = "no" ]; then
-    sed -i "s|/usr/lib/|/usr/lib$LIBDIRSUFFIX/|g" CPP/7zip/UI/GUI/makefile.depend
-    make 7zG \
-    OPTFLAGS="$SLKCFLAGS" \
-    DEST_HOME=/usr \
-    DEST_SHARE_DOC=/usr/doc/$PRGNAM-$VERSION \
-    DEST_SHARE=/usr/lib$LIBDIRSUFFIX/p7zip \
-    DEST_DIR=$PKG
-fi
-
 make install \
   OPTFLAGS="$SLKCFLAGS" \
   DEST_HOME=/usr \
@@ -105,24 +105,6 @@ mkdir -p $PKG/usr/share/mc/extfs/
 install -m 755 contrib/VirtualFileSystemForMidnightCommander/u7z \
   $PKG/usr/share/mc/extfs/
 
-if ! [ "$GUI" = "no" ]; then
-  # Unfortunately we have to install 7zG by hand
-  install -m 555 $PKG/usr/bin/7z $PKG/usr/bin/7zG
-  sed -i "s|/usr/lib$LIBDIRSUFFIX/p7zip/7z|/usr/lib$LIBDIRSUFFIX/p7zip/7zG|" $PKG/usr/bin/7zG
-
-  install -m 555 bin/7zG $PKG/usr/lib$LIBDIRSUFFIX/p7zip/7zG
-  cp -r GUI/Lang $PKG/usr/lib$LIBDIRSUFFIX/p7zip/Lang
-  find $PKG/usr/lib$LIBDIRSUFFIX/p7zip/Lang -type d -exec chmod 555 {} \;
-  find $PKG/usr/lib$LIBDIRSUFFIX/p7zip/Lang -type f -exec chmod 444 {} \;
-
-  install -m 555 GUI/p7zipForFilemanager  $PKG/usr/bin/p7zipForFilemanager
-
-  install -m 444 -D GUI/p7zip_16_ok.png $PKG/usr/share/icons/hicolor/16x16/apps/p7zip.png
-
-  mkdir -p $PKG/usr/share/kde4/services/ServiceMenus
-  cp GUI/kde4/*.desktop $PKG/usr/share/kde4/services/ServiceMenus/
-fi
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -138,4 +120,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/p7zip/p7zip.info b/system/p7zip/p7zip.info
index d5171839ad..0a45c5a25c 100644
--- a/system/p7zip/p7zip.info
+++ b/system/p7zip/p7zip.info
@@ -1,10 +1,10 @@
 PRGNAM="p7zip"
-VERSION="16.02"
-HOMEPAGE="http://p7zip.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/p7zip/p7zip_16.02_src_all.tar.bz2"
-MD5SUM="a0128d661cfe7cc8c121e73519c54fbf"
+VERSION="17.04"
+HOMEPAGE="https://github.com/p7zip-project/p7zip"
+DOWNLOAD="https://github.com/p7zip-project/p7zip/archive/v17.04/p7zip-17.04.tar.gz"
+MD5SUM="00acfd6be87848231722d2d53f89e4a5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+EMAIL="pprkut@slackbuilds.org"
diff --git a/system/pacemaker/README b/system/pacemaker/README
index 07974d2ac6..c496bd5b9e 100644
--- a/system/pacemaker/README
+++ b/system/pacemaker/README
@@ -1,9 +1,10 @@
 pacemaker (High-Availability cluster resource manager)
 
-Pacemaker is an advanced, scalable High-Availability cluster resource manager.
+Pacemaker is an advanced, scalable High-Availability cluster resource
+manager.
 
-You might also want to install corosync, pacemaker, resource-agents, crmsh,
-fence-agents and eventually cluster-glue.
+You might also want to install corosync, pacemaker, resource-agents,
+crmsh, fence-agents and eventually cluster-glue.
 
 You must have a haclient group and hacluster user to run this script.
 
diff --git a/system/pacemaker/pacemaker.SlackBuild b/system/pacemaker/pacemaker.SlackBuild
index b7a01dcfc1..eeeacbe957 100644
--- a/system/pacemaker/pacemaker.SlackBuild
+++ b/system/pacemaker/pacemaker.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pacemaker
 
@@ -23,11 +23,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pacemaker
-VERSION=${VERSION:-2.0.3}
+VERSION=${VERSION:-2.0.5}
 TARVER="Pacemaker-$(echo $VERSION | tr _ -)"
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -115,8 +125,10 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pacemaker/pacemaker.info b/system/pacemaker/pacemaker.info
index 4ab60618b5..ca4cceefd4 100644
--- a/system/pacemaker/pacemaker.info
+++ b/system/pacemaker/pacemaker.info
@@ -1,8 +1,8 @@
 PRGNAM="pacemaker"
-VERSION="2.0.3"
+VERSION="2.0.5"
 HOMEPAGE="https://wiki.clusterlabs.org/wiki/Pacemaker"
-DOWNLOAD="https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-2.0.3/pacemaker-Pacemaker-2.0.3.tar.gz"
-MD5SUM="4fee89ca3485f3bf27689ad9bd1670cb"
+DOWNLOAD="https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-2.0.5/pacemaker-Pacemaker-2.0.5.tar.gz"
+MD5SUM="c36c8ed401e39ff3e727ba4bf5fcc2e7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="corosync"
diff --git a/system/packagekit/README b/system/packagekit/README
deleted file mode 100644
index e4d3d64b41..0000000000
--- a/system/packagekit/README
+++ /dev/null
@@ -1,6 +0,0 @@
-PackageKit is a system designed to make installing and updating
-software on your computer easier. The primary design goal
-is to unify all the software graphical tools used in different
-distributions, and use some of the latest technology like PolicyKit.
-
-You need bash-completion from extra/ in order to build this package.
diff --git a/system/packagekit/doinst.sh b/system/packagekit/doinst.sh
deleted file mode 100644
index fa9fe022ef..0000000000
--- a/system/packagekit/doinst.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/PackageKit/PackageKit.conf.new
-config etc/PackageKit/Vendor.conf.new
-config etc/PackageKit/CommandNotFound.conf.new
-config etc/PackageKit/Katja.conf.new
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
-
-if [ -e usr/share/glib-2.0/schemas ]; then
-  if [ -x /usr/bin/glib-compile-schemas ]; then
-    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
-  fi
-fi
diff --git a/system/packagekit/packagekit.SlackBuild b/system/packagekit/packagekit.SlackBuild
deleted file mode 100644
index 7527471105..0000000000
--- a/system/packagekit/packagekit.SlackBuild
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/sh
-
-# Slackware Package Build Script for PackageKit
-# Home Page https://www.freedesktop.org/software/PackageKit/
-
-# Copyright (c) 2016, Nishant Limbachia, Hoffman Estates, IL, USA
-# <nishant _AT_ mnspace _DOT_ net>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of script must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM="packagekit"
-VERSION=${VERSION:-1.1.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf PackageKit-$VERSION
-tar xvf $CWD/PackageKit-$VERSION.tar.xz
-cd PackageKit-$VERSION
-chown -R root.root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc \
-  --disable-static \
-  --disable-cron \
-  --disable-schemas-compile \
-  --disable-systemd \
-  --disable-offline-update \
-  --enable-katja \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-
-mv $PKG/etc/PackageKit/CommandNotFound.conf $PKG/etc/PackageKit/CommandNotFound.conf.new
-mv $PKG/etc/PackageKit/PackageKit.conf $PKG/etc/PackageKit/PackageKit.conf.new
-mv $PKG/etc/PackageKit/Vendor.conf $PKG/etc/PackageKit/Vendor.conf.new
-mv $PKG/etc/PackageKit/Katja.conf $PKG/etc/PackageKit/Katja.conf.new
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL MAINTAINERS NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/packagekit/packagekit.info b/system/packagekit/packagekit.info
deleted file mode 100644
index c7f1732d6a..0000000000
--- a/system/packagekit/packagekit.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="packagekit"
-VERSION="1.1.4"
-HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
-DOWNLOAD="https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.1.4.tar.xz"
-MD5SUM="d1a000a33c7c935522af7a01dea012bf"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Nishant Limbachia"
-EMAIL="nishant@mnspace.net"
diff --git a/system/packagekit/slack-desc b/system/packagekit/slack-desc
deleted file mode 100644
index e4cc4859eb..0000000000
--- a/system/packagekit/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-          |-----handy-ruler------------------------------------------------------|
-packagekit: packagekit (installation and updates of packages)
-packagekit:
-packagekit: PackageKit is a system designed to make installing and updating
-packagekit: software on your computer easier. The primary design goal
-packagekit: is to unify all the software graphical tools used in different
-packagekit: distributions, and use some of the latest technology like PolicyKit.
-packagekit:
-packagekit:
-packagekit: Homepage: https://www.freedesktop.org/software/PackageKit/
-packagekit:
-packagekit:
diff --git a/system/pam-gnupg/README b/system/pam-gnupg/README
new file mode 100644
index 0000000000..58b7d1645b
--- /dev/null
+++ b/system/pam-gnupg/README
@@ -0,0 +1,3 @@
+A PAM module that hands over your login password to
+gpg-agent, which can be useful if you are using a
+GnuPG-based password manager like pass.
diff --git a/system/pam-gnupg/pam-gnupg.SlackBuild b/system/pam-gnupg/pam-gnupg.SlackBuild
new file mode 100644
index 0000000000..aae66e92c0
--- /dev/null
+++ b/system/pam-gnupg/pam-gnupg.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+# Slackware build script for pam-gnupg
+
+# Copyright 2022 Julian Grinblat <julian@dotcore.co.il>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=pam-gnupg
+VERSION=${VERSION:-0.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./autogen.sh
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --with-moduledir=/lib64/security \
+  --libexecdir=/usr/libexec
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pam-gnupg/pam-gnupg.info b/system/pam-gnupg/pam-gnupg.info
new file mode 100644
index 0000000000..94c321309f
--- /dev/null
+++ b/system/pam-gnupg/pam-gnupg.info
@@ -0,0 +1,10 @@
+PRGNAM="pam-gnupg"
+VERSION="0.4"
+HOMEPAGE="https://github.com/cruegge/pam-gnupg"
+DOWNLOAD="https://github.com/cruegge/pam-gnupg/archive/v0.4/pam-gnupg-0.4.tar.gz"
+MD5SUM="da47c80552394523369c6f1d086dd4ab"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Julian Grinblat"
+EMAIL="julian@dotcore.co.il"
diff --git a/system/pam-gnupg/slack-desc b/system/pam-gnupg/slack-desc
new file mode 100644
index 0000000000..97c9469dea
--- /dev/null
+++ b/system/pam-gnupg/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+pam-gnupg: pam-gnupg (Unlock GnuPG keys on login)
+pam-gnupg:
+pam-gnupg: A PAM module that hands over your login password to gpg-agent, which
+pam-gnupg: can be useful if you are using a GnuPG-based password manager like
+pam-gnupg: pass.
+pam-gnupg:
+pam-gnupg:
+pam-gnupg:
+pam-gnupg:
+pam-gnupg:
+pam-gnupg: https://github.com/cruegge/pam-gnupg
diff --git a/system/pam_ssh/README b/system/pam_ssh/README
new file mode 100644
index 0000000000..808382afe4
--- /dev/null
+++ b/system/pam_ssh/README
@@ -0,0 +1,6 @@
+The pam_ssh module provides single sign-on behavior for ssh.
+On login, the user types an ssh private key passphrase in place of,
+or in addition to the password. In the pam session phase, an
+ssh-agent process is started and keys are added. For the entire
+session, the user can ssh to other hosts that accept key
+authentication without typing any passwords.
diff --git a/system/pam_ssh/pam_ssh.SlackBuild b/system/pam_ssh/pam_ssh.SlackBuild
new file mode 100644
index 0000000000..c6d872657b
--- /dev/null
+++ b/system/pam_ssh/pam_ssh.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/bash
+
+# Slackware build script for pam_ssh
+
+# Copyright 2022, Alexander Verbovetsky, Moscow (Russia)
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=pam_ssh
+VERSION=${VERSION:-2.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+sed -i 's/^const ge25519 ge25519_base;$/extern const ge25519 ge25519_base;/' \
+  ge25519.h
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --with-pam-dir=/lib${LIBDIRSUFFIX}/security \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+rm -f $PKG/lib${LIBDIRSUFFIX}/security/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pam_ssh/pam_ssh.info b/system/pam_ssh/pam_ssh.info
new file mode 100644
index 0000000000..78752f5417
--- /dev/null
+++ b/system/pam_ssh/pam_ssh.info
@@ -0,0 +1,10 @@
+PRGNAM="pam_ssh"
+VERSION="2.3"
+HOMEPAGE="http://pam-ssh.sourceforge.net"
+DOWNLOAD="https://sourceforge.net/projects/pam-ssh/files/pam_ssh/2.3/pam_ssh-2.3.tar.xz"
+MD5SUM="a46976953119c81f4fc9cf039963ac8a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/system/pam_ssh/slack-desc b/system/pam_ssh/slack-desc
new file mode 100644
index 0000000000..885b4e4756
--- /dev/null
+++ b/system/pam_ssh/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+pam_ssh: pam_ssh (unlock ssh keys on login)
+pam_ssh:
+pam_ssh: The pam_ssh module provides single sign-on behavior for ssh.
+pam_ssh: On login, the user types an ssh private key passphrase in place of,
+pam_ssh: or in addition to the password. In the pam session phase, an
+pam_ssh: ssh-agent process is started and keys are added. For the entire
+pam_ssh: session, the user can ssh to other hosts that accept key
+pam_ssh: authentication without typing any passwords.
+pam_ssh:
+pam_ssh: Homepage: http://pam-ssh.sourceforge.net
+pam_ssh:
diff --git a/system/pam_ssh_agent_auth/README b/system/pam_ssh_agent_auth/README
new file mode 100644
index 0000000000..138f027d4c
--- /dev/null
+++ b/system/pam_ssh_agent_auth/README
@@ -0,0 +1,9 @@
+This module provides authentication via ssh-agent.
+
+It may take 5 arguments, file=/path/to/authorized_keys, debug,
+allow_user_owned_authorized_keys_file,
+authorized_keys_command=/path/to/command and
+authorized_keys_user=username. If an ssh-agent listening at
+SSH_AUTH_SOCK can successfully authenticate that it has the secret key
+for a public key in the specified file, authentication is granted,
+otherwise authentication fails.
diff --git a/system/pam_ssh_agent_auth/pam_ssh_agent_auth.SlackBuild b/system/pam_ssh_agent_auth/pam_ssh_agent_auth.SlackBuild
new file mode 100644
index 0000000000..ad1a8a33a8
--- /dev/null
+++ b/system/pam_ssh_agent_auth/pam_ssh_agent_auth.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/bash
+
+# Slackware build script for pam_ssh_agent_auth
+
+# Copyright 2024 pyllyukko
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=pam_ssh_agent_auth
+VERSION=${VERSION:-0.10.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ED25519_DONNA_COMMIT="8757bd4cd209cb032853ece0ce413f122eef212c"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/ed25519-donna-${ED25519_DONNA_COMMIT}.tar.gz --strip-components=1 -C ed25519-donna/
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libexecdir=/lib${LIBDIRSUFFIX}/security \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --without-openssl-header-check \
+  --build=$ARCH-slackware-linux
+
+sed -i 's/^\(mansubdir=\).*$/\1man/' Makefile
+make
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CONTRIBUTORS LICENSE.OpenSSL OPENSSH_LICENSE README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pam_ssh_agent_auth/pam_ssh_agent_auth.info b/system/pam_ssh_agent_auth/pam_ssh_agent_auth.info
new file mode 100644
index 0000000000..15b1414457
--- /dev/null
+++ b/system/pam_ssh_agent_auth/pam_ssh_agent_auth.info
@@ -0,0 +1,12 @@
+PRGNAM="pam_ssh_agent_auth"
+VERSION="0.10.4"
+HOMEPAGE="https://pamsshagentauth.sourceforge.net/"
+DOWNLOAD="https://github.com/jbeverly/pam_ssh_agent_auth/archive/pam_ssh_agent_auth-0.10.4/pam_ssh_agent_auth-pam_ssh_agent_auth-0.10.4.tar.gz \
+          https://github.com/floodyberry/ed25519-donna/archive/8757bd4cd209cb032853ece0ce413f122eef212c/ed25519-donna-8757bd4cd209cb032853ece0ce413f122eef212c.tar.gz"
+MD5SUM="42f87c6cce9bcf8cfd46ed4605b779f5 \
+        cfeee7be3fce570389db6d662f989469"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="pyllyukko"
+EMAIL="pyllyukko@maimed.org"
diff --git a/system/pam_ssh_agent_auth/slack-desc b/system/pam_ssh_agent_auth/slack-desc
new file mode 100644
index 0000000000..64b30a7c3a
--- /dev/null
+++ b/system/pam_ssh_agent_auth/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+pam_ssh_agent_auth: pam_ssh_agent_auth (PAM module for SSH-agent authentication)
+pam_ssh_agent_auth:
+pam_ssh_agent_auth: This module provides authentication via ssh-agent.
+pam_ssh_agent_auth:
+pam_ssh_agent_auth: If an ssh-agent listening at SSH_AUTH_SOCK can successfully
+pam_ssh_agent_auth: authenticate that it has the secret key for a public key in the
+pam_ssh_agent_auth: specified file, authentication is granted, otherwise authentication
+pam_ssh_agent_auth: fails.
+pam_ssh_agent_auth:
+pam_ssh_agent_auth:
+pam_ssh_agent_auth:
diff --git a/system/parallel/README b/system/parallel/README
deleted file mode 100644
index bbee7b2123..0000000000
--- a/system/parallel/README
+++ /dev/null
@@ -1,9 +0,0 @@
-GNU parallel is a shell tool for executing jobs in parallel using one
-or more computers. A job can be a single command or a small script
-that has to be run for each of the lines in the input. The typical
-input is a list of files, a list of hosts, a list of users, a list of
-URLs, or a list of tables. A job can also be a command that reads
-from a pipe. GNU parallel can then split the input and pipe it into
-commands in parallel.
-
-This package conflicts with misc/moreutils.
diff --git a/system/parallel/parallel.SlackBuild b/system/parallel/parallel.SlackBuild
deleted file mode 100644
index 11043b331e..0000000000
--- a/system/parallel/parallel.SlackBuild
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for "parallel".
-
-# Copyright 2020-2021 CRTS <crts@gmx.net>
-# Copyright 2015-2017 Marcel Saegebarth <marc@mos6581.de>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=parallel
-VERSION=${VERSION:-20210122}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp CITATION COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
-cp $CWD/GNU_Parallel_2018.pdf $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/parallel/parallel.info b/system/parallel/parallel.info
deleted file mode 100644
index b9f5ef28f2..0000000000
--- a/system/parallel/parallel.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="parallel"
-VERSION="20210122"
-HOMEPAGE="http://www.gnu.org/software/parallel/"
-DOWNLOAD="https://ftp.gnu.org/gnu/parallel/parallel-20210122.tar.bz2
-          https://zenodo.org/record/1146014/files/GNU_Parallel_2018.pdf"
-MD5SUM="d7adb3a5cc00bc024eedd5718351cef4
-        e32a78d93e53029d7338eac9f4194924"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="CRTS"
-EMAIL="crts@gmx.net"
diff --git a/system/parallel/slack-desc b/system/parallel/slack-desc
deleted file mode 100644
index 32663235a5..0000000000
--- a/system/parallel/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-        |-----handy-ruler------------------------------------------------------|
-parallel: parallel (Executes jobs in parallel)
-parallel:
-parallel: GNU parallel is a shell tool for executing jobs in parallel using one
-parallel: or more computers. A job can be a single command or a small script
-parallel: that has to be run for each of the lines in the input. The typical
-parallel: input is a list of files, a list of hosts, a list of users, a list of
-parallel: URLs, or a list of tables. A job can also be a command that reads
-parallel: from a pipe. GNU parallel can then split the input and pipe it into
-parallel: commands in parallel.
-parallel:
-parallel: Homepage: http://www.gnu.org/software/parallel/
diff --git a/system/partclone/README b/system/partclone/README
index f1e5f10d2e..cdda602cb7 100644
--- a/system/partclone/README
+++ b/system/partclone/README
@@ -1,6 +1,5 @@
-Partclone is a program similar to the well-known backup
-utility "Partition Image" a.k.a partimage. Partclone
-provides utilities to save and restore used blocks on a
-partition and is designed for higher compatibility of the
-file system by using existing libraries, e.g. e2fslibs is
-used to read and write the ext2 partition.
+Partclone is a program similar to the well-known backup utility
+"Partition Image" a.k.a partimage. Partclone provides utilities to save
+and restore used blocks on a partition and is designed for higher
+compatibility of the file system by using existing libraries, e.g.
+e2fslibs is used to read and write the ext2 partition.
diff --git a/system/partclone/partclone.SlackBuild b/system/partclone/partclone.SlackBuild
index 566d268cd2..1c669f6ba9 100644
--- a/system/partclone/partclone.SlackBuild
+++ b/system/partclone/partclone.SlackBuild
@@ -1,8 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for partclone
-
-# Copyright 2015 Kevin Paulus <goarilla@gmail.com>, Belgium
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,26 +20,37 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# was previously maintained by Kevin Paulus
+
+# 20230803 bkw: Modified by SlackBuilds.org: fix conflict with dpkg.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=partclone
-VERSION=${VERSION:-0.2.80}
+VERSION=${VERSION:-0.3.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -49,6 +58,7 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+  FAILMBR="prebuilt"    # 20230803 bkw: see below.
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -60,14 +70,27 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
+
+# 20230803 bkw: force use of precompiled fail-mbr.bin, if needed.
+# Without this, the build will fail on x86_64 if dpkg happens to be
+# installed, because our gcc isn't biarch as Debian's is. If dpkg
+# *isn't* installed (the normal case), it just uses the prebuilt
+# binary. All this change does is make it always use the prebuilt
+# fail-mbr.bin on x86_64.
+if [ "$FAILMBR" = "prebuilt" ]; then
+  sed -i 's,sh compile-mbr.sh,cp fail-mbr.bin.orig fail-mbr.bin,' \
+         fail-mbr/Makefile.am
+fi
+
+./autogen
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -80,12 +103,16 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
   --enable-extfs \
-  --enable-ntfs \
   --enable-hfsp \
   --enable-fat \
   --enable-exfat \
   --enable-btrfs \
-  --enable-minix
+  --enable-minix \
+  --enable-ncursesw \
+  --enable-xfs \
+  --enable-reiser4
+  #--enable-ufs \
+  #--enable-jfs \
 
 make
 make install DESTDIR=$PKG
@@ -97,11 +124,12 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS AUTHORS COPYING INSTALL NEWS README README.Packages TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ABOUT-NLS AUTHORS btrfs_source.txt ChangeLog COPYING HACKING IMAGE_FORMATS.md NEWS README.md TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/partclone/partclone.info b/system/partclone/partclone.info
index d0de39953d..1d9d9e3fb4 100644
--- a/system/partclone/partclone.info
+++ b/system/partclone/partclone.info
@@ -1,10 +1,10 @@
 PRGNAM="partclone"
-VERSION="0.2.80"
-HOMEPAGE="https://partclone.org"
-DOWNLOAD="https://downloads.sourceforge.net/project/partclone/stable/0.2.80/partclone_0.2.80.orig.tar.gz"
-MD5SUM="82e83d8350714d0834bde59a4a168f8c"
+VERSION="0.3.20"
+HOMEPAGE="https://github.com/Thomas-Tsai/partclone/tags"
+DOWNLOAD="https://github.com/Thomas-Tsai/partclone/archive/0.3.20/partclone-0.3.20.tar.gz"
+MD5SUM="1031222c4550e917a6b2d658e5395566"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Kevin Paulus"
-EMAIL="goarilla@gmail.com"
+REQUIRES="reiser4progs"
+MAINTAINER="Pierre-Philipp Braun"
+EMAIL="pbraun@nethence.com"
diff --git a/system/partclone/slack-desc b/system/partclone/slack-desc
index dc0a8dc022..96afba4aec 100644
--- a/system/partclone/slack-desc
+++ b/system/partclone/slack-desc
@@ -8,12 +8,12 @@
          |-----handy-ruler------------------------------------------------------|
 partclone: partclone (utility to clone various filesystems)
 partclone:
-partclone: Partclone is a program similar to the well-known backup
-partclone: utility "Partition Image" a.k.a partimage. Partclone
-partclone: provides utilities to save and restore used blocks on a
-partclone: partition and is designed for higher compatibility of the
-partclone: file system by using existing libraries, e.g. e2fslibs is
-partclone: used to read and write the ext2 partition.
+partclone: Partclone is a program similar to the well-known backup utility
+partclone: "Partition Image" a.k.a partimage. Partclone provides utilities to
+partclone: save and restore used blocks on a partition and is designed for
+partclone: higher compatibility of the file system by using existing libraries,
+partclone: e.g. e2fslibs is used to read and write the ext2 partition.
+partclone:
+partclone:
 partclone:
-partclone: Project maintainer Thomas Tsai
 partclone:
diff --git a/system/partimage/README b/system/partimage/README
index 21947bca77..c1106b5ba2 100644
--- a/system/partimage/README
+++ b/system/partimage/README
@@ -1,10 +1,11 @@
 partimage (backup system)
 
-Partimage is opensource disk backup software. It saves partitions having
-a supported filesystem on a sector basis to an image file. Although it
-runs under Linux, Windows and most Linux filesystems are supported. The
-image file can be compressed to save disk space and transfer time and
-can be split into multiple files to be copied to CDs or DVDs.
+Partimage is opensource disk backup software. It saves partitions
+having a supported filesystem on a sector basis to an image
+file. Although it runs under Linux, Windows and most Linux filesystems
+are supported. The image file can be compressed to save disk space and
+transfer time and can be split into multiple files to be copied to CDs
+or DVDs.
 
 Partimage has a textmode user interface, plus non-interactive batch
 mode operation. It supports these filesystems: ext2, ext3, reiserfs,
@@ -13,6 +14,6 @@ or btrfs. Users needing a tool like this for ext4 or btrfs are advised
 to try fsarchiver.
 
 The daemon (partimaged) is included, but the SlackBuild author hasn't
-tested it. Read /usr/doc/partimage-0.6.9/README.partimaged and proceed at
-your own risk. One thing not mentioned there is that partimaged requires
-a dedicated user account called partimag.
+tested it. Read /usr/doc/partimage-0.6.9/README.partimaged and proceed
+at your own risk. One thing not mentioned there is that partimaged
+requires a dedicated user account called partimag.
diff --git a/system/partimage/compilefix.diff b/system/partimage/compilefix.diff
index 4c84442046..97871ca870 100644
--- a/system/partimage/compilefix.diff
+++ b/system/partimage/compilefix.diff
@@ -1,6 +1,18 @@
+diff -Naur partimage-0.6.9/configure.ac partimage-0.6.9.patched/configure.ac
+--- partimage-0.6.9/configure.ac	2010-07-25 11:30:52.000000000 -0400
++++ partimage-0.6.9.patched/configure.ac	2021-08-24 12:54:23.661280303 -0400
+@@ -240,7 +240,7 @@
+   AC_CHECKING([ for SSL Library and Header files ... ])
+   AC_SEARCH_HEADERS(rsa.h crypto.h x509.h pem.h ssl.h err.h,
+     $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include,
+-    [  AC_CHECK_LIB(crypto, CRYPTO_lock, [LIBS="$LIBS -lcrypto"],
++    [  AC_CHECK_LIB(crypto, X509_new, [LIBS="$LIBS -lcrypto"],
+         AC_MSG_ERROR([ Required for SSL Crypto Library not found. ])
+       )
+        AC_CHECK_LIB(ssl, SSL_CTX_new,
 diff -Naur partimage-0.6.9/src/client/imagefile.cpp partimage-0.6.9.patched/src/client/imagefile.cpp
 --- partimage-0.6.9/src/client/imagefile.cpp	2010-07-25 11:30:31.000000000 -0400
-+++ partimage-0.6.9.patched/src/client/imagefile.cpp	2016-10-21 13:28:03.035049317 -0400
++++ partimage-0.6.9.patched/src/client/imagefile.cpp	2021-08-24 12:54:00.205282436 -0400
 @@ -783,7 +783,7 @@
    else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
      {
@@ -21,7 +33,7 @@ diff -Naur partimage-0.6.9/src/client/imagefile.cpp partimage-0.6.9.patched/src/
        else
 diff -Naur partimage-0.6.9/src/client/imagefile.h partimage-0.6.9.patched/src/client/imagefile.h
 --- partimage-0.6.9/src/client/imagefile.h	2010-07-25 11:30:31.000000000 -0400
-+++ partimage-0.6.9.patched/src/client/imagefile.h	2016-10-21 13:28:03.036049317 -0400
++++ partimage-0.6.9.patched/src/client/imagefile.h	2021-08-24 12:54:00.205282436 -0400
 @@ -41,7 +41,7 @@
    COptions m_options;
  
@@ -33,7 +45,7 @@ diff -Naur partimage-0.6.9/src/client/imagefile.h partimage-0.6.9.patched/src/cl
    int m_nFdImage;
 diff -Naur partimage-0.6.9/src/client/misc.h partimage-0.6.9.patched/src/client/misc.h
 --- partimage-0.6.9/src/client/misc.h	2010-07-25 11:30:31.000000000 -0400
-+++ partimage-0.6.9.patched/src/client/misc.h	2016-10-21 13:28:09.708049742 -0400
++++ partimage-0.6.9.patched/src/client/misc.h	2021-08-24 12:54:00.206282435 -0400
 @@ -36,7 +36,7 @@
  #endif
  
@@ -43,3 +55,35 @@ diff -Naur partimage-0.6.9/src/client/misc.h partimage-0.6.9.patched/src/client/
  #endif
  
  // =======================================================
+diff -Naur partimage-0.6.9/src/client/netclient.cpp partimage-0.6.9.patched/src/client/netclient.cpp
+--- partimage-0.6.9/src/client/netclient.cpp	2010-07-25 11:30:31.000000000 -0400
++++ partimage-0.6.9.patched/src/client/netclient.cpp	2021-08-24 12:54:23.662280303 -0400
+@@ -43,7 +43,11 @@
+     {
+       showDebug(3, "initializing client ssl\n");
+       SSLeay_add_ssl_algorithms();
+-      meth = SSLv2_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000
++      meth = TLSv1_client_method();
++#else
++      meth = TLS_client_method();
++#endif
+       SSL_load_error_strings();
+       ctx = SSL_CTX_new(meth);
+       if (!ctx)
+diff -Naur partimage-0.6.9/src/server/netserver.cpp partimage-0.6.9.patched/src/server/netserver.cpp
+--- partimage-0.6.9/src/server/netserver.cpp	2010-07-25 11:30:31.000000000 -0400
++++ partimage-0.6.9.patched/src/server/netserver.cpp	2021-08-24 12:54:23.662280303 -0400
+@@ -39,7 +39,11 @@
+     {
+       SSL_load_error_strings();
+       SSLeay_add_ssl_algorithms();
+-      meth = SSLv23_server_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000
++      meth = TLSv1_server_method();
++#else
++      meth = TLS_server_method();
++#endif
+       ctx = SSL_CTX_new(meth);
+       if (!ctx)
+         {
diff --git a/system/partimage/partimage.SlackBuild b/system/partimage/partimage.SlackBuild
index ab1a650d85..70a339b309 100644
--- a/system/partimage/partimage.SlackBuild
+++ b/system/partimage/partimage.SlackBuild
@@ -1,15 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for partimage
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210824 bkw: fix build on -current
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=partimage
 VERSION=${VERSION:-0.6.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +24,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,17 +56,15 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # apply patches from Gentoo ebuild:
 # https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-block/partimage/files
-# my patch is made from their zlib-1.2.5.2 and minor-typo, rolled up into
-# one patch that will apply with -p1.
+# my patch is made from their zlib, minor-typo, and openssl patches,
+# rolled up into one patch that will apply with -p1.
 patch -p1 < $CWD/compilefix.diff
+autoreconf -if
 
 # man pages and partimaged-passwd script came from Debian:
 # http://http.debian.net/debian/pool/main/p/partimage/partimage_0.6.9-3.debian.tar.xz
@@ -93,4 +100,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/partimage/partimage.info b/system/partimage/partimage.info
index db4c7fddbb..a8aa98b57d 100644
--- a/system/partimage/partimage.info
+++ b/system/partimage/partimage.info
@@ -1,10 +1,10 @@
 PRGNAM="partimage"
 VERSION="0.6.9"
-HOMEPAGE="http://www.partimage.org/Main_Page"
-DOWNLOAD="http://downloads.sourceforge.net/project/partimage/stable/0.6.9/partimage-0.6.9.tar.bz2"
+HOMEPAGE="https://www.partimage.org"
+DOWNLOAD="https://gitlab.com/partimage/partimage-sources/uploads/6f5867515e3267bad0e70b75410941f4/partimage-0.6.9.tar.bz2"
 MD5SUM="1bc046fd915c5debbafc85729464e513"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/pass-import/README b/system/pass-import/README
new file mode 100644
index 0000000000..1237cffd0e
--- /dev/null
+++ b/system/pass-import/README
@@ -0,0 +1,6 @@
+pass import is a pass extension for importing data from most existing
+password managers.
+
+python3-pykeepass (optional) provides support for importing passwords
+directly from Keepass databases. For example, with this command:
+pass import keepass file.kdbx
diff --git a/system/pass-import/pass-import.SlackBuild b/system/pass-import/pass-import.SlackBuild
new file mode 100644
index 0000000000..52af66a8f6
--- /dev/null
+++ b/system/pass-import/pass-import.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+# Slackware build script for pass-import
+
+# Copyright 2021-2024 Isaac Yu <isaacyu@protonmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - move man pages to correct directory (/usr/man, not /usr/share/man).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=pass-import
+VERSION=${VERSION:-3.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+python3 setup.py install --root=$PKG
+
+mv $PKG/usr/share/man $PKG/usr/man
+gzip -9 $PKG/usr/man/man*/*
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md CONTRIBUTING.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pass-import/pass-import.info b/system/pass-import/pass-import.info
new file mode 100644
index 0000000000..f125d58455
--- /dev/null
+++ b/system/pass-import/pass-import.info
@@ -0,0 +1,10 @@
+PRGNAM="pass-import"
+VERSION="3.5"
+HOMEPAGE="https://github.com/roddhjav/pass-import"
+DOWNLOAD="https://github.com/roddhjav/pass-import/releases/download/v3.5/pass-import-3.5.tar.gz"
+MD5SUM="6eea4688951ab6c2fab5d3359468962c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="password-store python3-zxcvbn-python"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/pass-import/slack-desc b/system/pass-import/slack-desc
new file mode 100644
index 0000000000..26ffd367e6
--- /dev/null
+++ b/system/pass-import/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+pass-import: pass-import (pass extension)
+pass-import:
+pass-import: pass import is a pass extension for importing data from most existing
+pass-import: password managers.
+pass-import:
+pass-import:
+pass-import:
+pass-import:
+pass-import:
+pass-import:
+pass-import:
diff --git a/system/pass-otp/pass-otp.SlackBuild b/system/pass-otp/pass-otp.SlackBuild
index bf7e2c60c6..dcda279df4 100644
--- a/system/pass-otp/pass-otp.SlackBuild
+++ b/system/pass-otp/pass-otp.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pass-otp
 
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pass-otp
 VERSION=${VERSION:-1.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -62,4 +72,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pass-otp/pass-otp.info b/system/pass-otp/pass-otp.info
index f0170768eb..9978fa264e 100644
--- a/system/pass-otp/pass-otp.info
+++ b/system/pass-otp/pass-otp.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/tadfisher/pass-otp/releases/download/v1.2.0/pass-ot
 MD5SUM="20cfa80273813294014577fead8714ca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="password-store qrencode oath-toolkit"
+REQUIRES="password-store oath-toolkit"
 MAINTAINER="Julian Grinblat"
 EMAIL="julian@dotcore.co.il"
diff --git a/system/passwdqc/README b/system/passwdqc/README
index b1f991eaae..0b5c707b85 100644
--- a/system/passwdqc/README
+++ b/system/passwdqc/README
@@ -8,5 +8,14 @@ pwqcheck and pwqgen are standalone password/passphrase strength
 checking and random passphrase generator programs, respectively,
 which are usable from scripts.
 
+pam_passwdqc is a simple password strength checking module for
+PAM-aware password changing programs, such as passwd(1).
+
 libpasswdqc is the underlying library, which may also be used
 from third-party programs.
+
+To enable pam_passwdqc in Slackware you need to replace any other
+password strength checking PAM modules like pam_pwquality.so in
+/etc/pam.d/system-auth with the following line:
+
+password    requisite     pam_passwdqc.so
diff --git a/system/passwdqc/passwdqc.SlackBuild b/system/passwdqc/passwdqc.SlackBuild
index fdf2f40aa1..2c7dda03ff 100644
--- a/system/passwdqc/passwdqc.SlackBuild
+++ b/system/passwdqc/passwdqc.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for passwdqc
 
 # Written by pyllyukko
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=passwdqc
-VERSION=${VERSION:-1.4.0}
+VERSION=${VERSION:-2.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -17,7 +20,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -51,9 +61,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-make utils
-make install_lib	DESTDIR=$PKG MANDIR=/usr/man SHARED_LIBDIR=/usr/lib${LIBDIRSUFFIX} SHARED_LIBDIR_SUN=/usr/lib${LIBDIRSUFFIX} DEVEL_LIBDIR=/usr/lib${LIBDIRSUFFIX}
-make install_utils	DESTDIR=$PKG MANDIR=/usr/man SHARED_LIBDIR=/usr/lib${LIBDIRSUFFIX} SHARED_LIBDIR_SUN=/usr/lib${LIBDIRSUFFIX} DEVEL_LIBDIR=/usr/lib${LIBDIRSUFFIX}
+make
+make install DESTDIR=$PKG MANDIR=/usr/man SHARED_LIBDIR=/usr/lib${LIBDIRSUFFIX} SHARED_LIBDIR_SUN=/usr/lib${LIBDIRSUFFIX} DEVEL_LIBDIR=/usr/lib${LIBDIRSUFFIX} SECUREDIR=/lib${LIBDIRSUFFIX}/security
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -62,7 +71,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL INTERNALS LICENSE PLATFORMS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES INSTALL INTERNALS LICENSE PLATFORMS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mv $PKG/etc/passwdqc.conf $PKG/etc/passwdqc.conf.new
@@ -72,4 +81,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/passwdqc/passwdqc.info b/system/passwdqc/passwdqc.info
index 869b52d24a..9aa3ff0546 100644
--- a/system/passwdqc/passwdqc.info
+++ b/system/passwdqc/passwdqc.info
@@ -1,8 +1,8 @@
 PRGNAM="passwdqc"
-VERSION="1.4.0"
+VERSION="2.0.3"
 HOMEPAGE="http://www.openwall.com/passwdqc/"
-DOWNLOAD="https://www.openwall.com/passwdqc/passwdqc-1.4.0.tar.gz"
-MD5SUM="204de4ff2e95095272bba1b0cbab1579"
+DOWNLOAD="https://www.openwall.com/passwdqc/passwdqc-2.0.3.tar.gz"
+MD5SUM="fd4d6fff2951256c3c0d013becef1298"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/password-store/README b/system/password-store/README
index 5e346aad15..39159bb957 100644
--- a/system/password-store/README
+++ b/system/password-store/README
@@ -1,21 +1,22 @@
 password-store is a simple password manager which uses GnuPG2 to
 securely encrypt and retrieve passwords.
 
-The pass utility provides a series of commands for manipulating the password
-store, allowing the user to add, remove, edit, synchronize, generate, and
-manipulate passwords.
+The pass utility provides a series of commands for manipulating the
+password store, allowing the user to add, remove, edit, synchronize,
+generate, and manipulate passwords.
 
 By default, bash and zsh completion are installed in
 /usr/share/bash-completion/completions/pass and
-usr/share/zsh/site-functions/_pass.
-Add 'source /path/to/{bash,zsh}/completions' to your .bashrc to enable it.
+/usr/share/zsh/site-functions/_pass.
+Add 'source /path/to/{bash,zsh}/completions' to your .bashrc to enable.
 
 fish completion is optionally included.
 uncomment the lines in the SlackBuild to include it in the package.
 
-This script also include user-contributed scripts to help on migrating from
-third-party applications.
+This script also include user-contributed scripts to help on migrating
+from third-party applications.
 
 Optional dependencies:
 - dmenu (passmenu support)
 - pwgen (generate human-easily memorized password)
+- wl-clipboard (needed to use password-store in wayland)
diff --git a/system/password-store/password-store.SlackBuild b/system/password-store/password-store.SlackBuild
index 38d702f3b6..fb755d72eb 100644
--- a/system/password-store/password-store.SlackBuild
+++ b/system/password-store/password-store.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for password-store
 
 # Copyright 2013 Michael Ren <micron33@gmail.com>
-# Copyright 2017-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2017-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,14 +23,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=password-store
-VERSION=${VERSION:-1.7.3}
+VERSION=${VERSION:-1.7.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,7 +75,7 @@ fi
 
 # Uncomment the two lines below to install the fish completion file.
 #mkdir -p "${PKG}/usr/share/fish/completions"
-#install -m 0644 -v contrib/pass.fish-completion "${PKG}/usr/share/fish/completions/pass.fish"
+#install -m 0644 -v src/completion/pass.fish-completion "${PKG}/usr/share/fish/completions/pass.fish"
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -78,4 +88,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/password-store/password-store.info b/system/password-store/password-store.info
index f637390b54..2c3dadf51f 100644
--- a/system/password-store/password-store.info
+++ b/system/password-store/password-store.info
@@ -1,8 +1,8 @@
 PRGNAM="password-store"
-VERSION="1.7.3"
+VERSION="1.7.4"
 HOMEPAGE="https://www.passwordstore.org/"
-DOWNLOAD="https://git.zx2c4.com/password-store/snapshot/password-store-1.7.3.tar.xz"
-MD5SUM="db2d49af9e666cc5ef6aa1c61ae5c045"
+DOWNLOAD="https://git.zx2c4.com/password-store/snapshot/password-store-1.7.4.tar.xz"
+MD5SUM="56b918982fd80bedba6590059c332c6d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="xclip"
diff --git a/system/passwordsafe/doinst.sh b/system/passwordsafe/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/system/passwordsafe/doinst.sh
+++ b/system/passwordsafe/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/passwordsafe/passwordsafe.SlackBuild b/system/passwordsafe/passwordsafe.SlackBuild
index 97fca757df..c4c43f353f 100644
--- a/system/passwordsafe/passwordsafe.SlackBuild
+++ b/system/passwordsafe/passwordsafe.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for passwordsafe
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=passwordsafe
-VERSION=${VERSION:-1.12.0}
+VERSION=${VERSION:-1.16.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=pwsafe
 
@@ -37,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,9 +74,9 @@ cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p build
 cd build
@@ -80,12 +87,9 @@ cd build
     -DNO_GTEST=ON \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 # Move man pages
 mv $PKG/usr/share/man $PKG/usr/man
 
@@ -98,4 +102,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/passwordsafe/passwordsafe.info b/system/passwordsafe/passwordsafe.info
index 3c38440e3d..8f5b60b962 100644
--- a/system/passwordsafe/passwordsafe.info
+++ b/system/passwordsafe/passwordsafe.info
@@ -1,10 +1,10 @@
 PRGNAM="passwordsafe"
-VERSION="1.12.0"
+VERSION="1.16.0"
 HOMEPAGE="https://pwsafe.org"
-DOWNLOAD="https://github.com/pwsafe/pwsafe/archive/1.12.0/pwsafe-1.12.0.tar.gz"
-MD5SUM="a414d989c449a09cb3a86fa43565c389"
+DOWNLOAD="https://github.com/pwsafe/pwsafe/archive/1.16.0/pwsafe-1.16.0.tar.gz"
+MD5SUM="6a0d858569dfc212b31536148a4f4fea"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="xerces-c wxGTK3 xvkbd qrencode"
+REQUIRES="xerces-c wxGTK3 xvkbd"
 MAINTAINER="rfmae"
 EMAIL="rfmae.git@mailbox.org"
diff --git a/system/patchelf/README b/system/patchelf/README
deleted file mode 100644
index 4286fd37ae..0000000000
--- a/system/patchelf/README
+++ /dev/null
@@ -1,3 +0,0 @@
-PatchELF is a simple utility for modifing existing ELF executables
-and libraries.  It can change the dynamic loader ("ELF interpreter")
-of executables and change the RPATH of executables and libraries.
diff --git a/system/patchelf/patchelf.SlackBuild b/system/patchelf/patchelf.SlackBuild
deleted file mode 100644
index 7ca4ad1081..0000000000
--- a/system/patchelf/patchelf.SlackBuild
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for patchelf
-
-# Copyright 2014 Zhu Qun-Ying
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=patchelf
-VERSION=${VERSION:-0.10}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-set -e
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-autoreconf -isf
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib${LIBDIRSUFFIX} \
-    --mandir=/usr/man \
-    --docdir=/usr/doc/$PRGNAM-$VERSION \
-    --build=$ARCH-slackware-linux
-
-make
-
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-gzip $PKG/usr/man/man1/*
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/patchelf/patchelf.info b/system/patchelf/patchelf.info
deleted file mode 100644
index 2697431fba..0000000000
--- a/system/patchelf/patchelf.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="patchelf"
-VERSION="0.10"
-HOMEPAGE="https://nixos.org/patchelf.html"
-DOWNLOAD="https://nixos.org/releases/patchelf/patchelf-0.10/patchelf-0.10.tar.bz2"
-MD5SUM="6c3f3a06a95705870d129494a6880106"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Zhu Qun-Ying"
-EMAIL="zhu.qunying@gmail.com"
diff --git a/system/patchelf/slack-desc b/system/patchelf/slack-desc
deleted file mode 100644
index 30e2694647..0000000000
--- a/system/patchelf/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-        |-----handy-ruler------------------------------------------------------|
-patchelf: patchelf (A utility for patching ELF binaries)
-patchelf:
-patchelf: PatchELF is a simple utility for modifing existing ELF executables
-patchelf: and libraries.  It can change the dynamic loader ("ELF interpreter")
-patchelf: of executables and change the RPATH of executables and libraries.
-patchelf:
-patchelf:
-patchelf:
-patchelf:
-patchelf: Home page: https://nixos.org/patchelf.html
-patchelf:
diff --git a/system/patool/README b/system/patool/README
index 643ac35964..063d72a9e5 100644
--- a/system/patool/README
+++ b/system/patool/README
@@ -1,18 +1,19 @@
 Patool is a portable archive file manager
 
-Various archive types can be created, extracted, tested, listed, compared,
-searched and repacked with patool.
+Various archive types can be created, extracted, tested, listed,
+compared, searched and repacked with patool.
 
 The advantage of patool is its simplicity in handling archive files
 without having to remember a myriad of programs and options.
 
-The archive format is determined by the file(1) program and as a fallback
-by the archive file extension.
+The archive format is determined by the file(1) program and as a
+fallback by the archive file extension.
 
-patool supports 7z (.7z), ACE (.ace), ADF (.adf), ALZIP (.alz), APE (.ape),
-AR (.a), ARC (.arc), ARJ (.arj), BZIP2 (.bz2), CAB (.cab), COMPRESS (.Z),
-CPIO (.cpio), DEB (.deb), DMS (.dms), FLAC (.flac), GZIP (.gz), LRZIP (.lrz),
-LZH (.lha, .lzh), LZIP (.lz), LZMA (.lzma), LZOP (.lzo), RPM (.rpm),
-RAR (.rar), RZIP (.rz), SHN (.shn), TAR (.tar), XZ (.xz), ZIP (.zip, .jar)
-and ZOO (.zoo) formats. It relies on helper applications to handle those
-archive formats (for example bzip2 for BZIP2 archives).
+patool supports 7z (.7z), ACE (.ace), ADF (.adf), ALZIP (.alz), APE
+(.ape), AR (.a), ARC (.arc), ARJ (.arj), BZIP2 (.bz2), CAB (.cab),
+COMPRESS (.Z), CPIO (.cpio), DEB (.deb), DMS (.dms), FLAC (.flac),
+GZIP (.gz), LRZIP (.lrz), LZH (.lha, .lzh), LZIP (.lz), LZMA (.lzma),
+LZOP (.lzo), RPM (.rpm), RAR (.rar), RZIP (.rz), SHN (.shn), TAR
+(.tar), XZ (.xz), ZIP (.zip, .jar) and ZOO (.zoo) formats. It relies
+on helper applications to handle those archive formats (for example
+bzip2 for BZIP2 archives).
diff --git a/system/patool/patool.SlackBuild b/system/patool/patool.SlackBuild
index acbda88fdd..e493b900a9 100644
--- a/system/patool/patool.SlackBuild
+++ b/system/patool/patool.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for patool
 
-# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2023  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=patool
-VERSION=${VERSION:-1.12}
+VERSION=${VERSION:-1.15.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,10 +79,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# patch to install man page in correct place
-sed -i 's/share\/man/\/usr\/man/' setup.py
+python3 setup.py install --root=$PKG
 
-python setup.py install --root=$PKG
+mkdir -p $PKG/usr/man/man1
+cp doc/$PRGNAM.1 $PKG/usr/man/man1
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -89,4 +99,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/patool/patool.info b/system/patool/patool.info
index d3bbc2c3db..da1e49cf59 100644
--- a/system/patool/patool.info
+++ b/system/patool/patool.info
@@ -1,10 +1,10 @@
 PRGNAM="patool"
-VERSION="1.12"
+VERSION="1.15.0"
 HOMEPAGE="http://wummel.github.io/patool/"
-DOWNLOAD="https://pypi.python.org/packages/source/p/patool/patool-1.12.tar.gz"
-MD5SUM="32a764139a018c6bc497b25630513a33"
+DOWNLOAD="https://files.pythonhosted.org/packages/b7/b1/b32e5646619d5fb3cf57e635f076146e99fb02acfcd6afad78dcda8c9bfc/patool-1.15.0.tar.gz"
+MD5SUM="f637d0d35ad67d7f43444e2f501281bb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/system/pause/README b/system/pause/README
index 034fd18a3c..13ccb9ad4e 100644
--- a/system/pause/README
+++ b/system/pause/README
@@ -2,7 +2,7 @@ pause (don't exit, efficiently)
 
 pause waits to be terminated by a signal.
 
-It can be used when service supervision is used but there is no long-running
-program to supervise.
+It can be used when service supervision is used but there is no
+long-running program to supervise.
 
 pause uses minimal system resources.
diff --git a/system/pause/pause.SlackBuild b/system/pause/pause.SlackBuild
index 47aa41be5d..64eee335ea 100644
--- a/system/pause/pause.SlackBuild
+++ b/system/pause/pause.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pause
 
@@ -16,10 +16,13 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pause
 VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -29,7 +32,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -80,4 +90,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pax-utils/README b/system/pax-utils/README
new file mode 100644
index 0000000000..61ee533183
--- /dev/null
+++ b/system/pax-utils/README
@@ -0,0 +1,9 @@
+pax-utils (security audit tools for ELF binaries)
+
+pax-utils is a small set of utilities for peforming Q/A (mostly
+security) checks on systems (most notably, scanelf). It is focused on
+the ELF format, but does include a Mach-O helper too for OS X systems.
+
+You don't need PaX to use the pax-utils. In fact, the only thing they
+really have in common is that pax-utils was initially written to aid
+in deploying PaX systems.
diff --git a/system/pax-utils/pax-utils.SlackBuild b/system/pax-utils/pax-utils.SlackBuild
new file mode 100644
index 0000000000..d8b732e06c
--- /dev/null
+++ b/system/pax-utils/pax-utils.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/bash
+
+# Slackware build script for pax-utils
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20230507 bkw: BUILD=2, fix shebang in lddtree. No idea how that
+# got past me in the first place...
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=pax-utils
+VERSION=${VERSION:-1.3.7}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+gzip -9 $PKG/usr/man/man*/*
+
+# 20230507 bkw: our /usr/bin/python is still python 2...
+sed -i '1s/python$/python3/' $PKG/usr/bin/lddtree
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a BUGS COPYING README* TODO $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pax-utils/pax-utils.info b/system/pax-utils/pax-utils.info
new file mode 100644
index 0000000000..bfb0950cdf
--- /dev/null
+++ b/system/pax-utils/pax-utils.info
@@ -0,0 +1,10 @@
+PRGNAM="pax-utils"
+VERSION="1.3.7"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities"
+DOWNLOAD="https://github.com/gentoo/pax-utils/archive/v1.3.7/pax-utils-1.3.7.tar.gz"
+MD5SUM="928b04e8f854d0b6041ef550cbc2398a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pyelftools"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/pax-utils/slack-desc b/system/pax-utils/slack-desc
new file mode 100644
index 0000000000..669b6d3348
--- /dev/null
+++ b/system/pax-utils/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+pax-utils: pax-utils (security audit tools for ELF binaries)
+pax-utils:
+pax-utils: pax-utils is a small set of utilities for peforming Q/A (mostly
+pax-utils: security) checks on systems (most notably, scanelf). It is focused on
+pax-utils: the ELF format, but does include a Mach-O helper too for OS X systems.
+pax-utils:
+pax-utils:
+pax-utils:
+pax-utils:
+pax-utils:
+pax-utils:
diff --git a/system/pax/pax.SlackBuild b/system/pax/pax.SlackBuild
index 88d9083792..9ccd1da156 100644
--- a/system/pax/pax.SlackBuild
+++ b/system/pax/pax.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # SlackBuild Script for Pax
 
 # Copyright (c) 2006 Eric Hameleers <alien@sox.homeip.net>
@@ -10,6 +10,9 @@
 # By:        Eric Hameleers <alien@slackware.com>
 # For:       pax
 # Changelog:
+# 20201030:  14/Apr/2021 by Ben Collver <bencollver@gmail.com>
+#            * switch to MirBSD pax
+#            * removed gpl-2.0.txt
 # 3.4-2:     17/Sep/2012 by Willy Sudiarto Raharjo <willysr@slackware-id.org>
 #	     * Fix build on Slackware 14.0
 # 3.4-1:     30/Nov/2008 by Ben Collver <bencollver@gmail.com>
@@ -23,26 +26,36 @@
 #
 # -----------------------------------------------------------------------------
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pax
-VERSION=${VERSION:-3.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20201030}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,44 +73,35 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM
+tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz
+cd $PRGNAM
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+chmod 755 Build.sh
 CFLAGS="$SLKCFLAGS -Wno-error" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+./Build.sh
+
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1
+install -c -s -o root -g bin -m 555 pax $PKG/usr/bin/pax
+install -c -o root -g bin -m 444 mans/pax.1 $PKG/usr/man/man1/pax.1
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README THANKS \
-    $PKG/usr/doc/$PRGNAM-$VERSION
-chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/*
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pax/pax.info b/system/pax/pax.info
index dd95a443b1..f7baf84e6a 100644
--- a/system/pax/pax.info
+++ b/system/pax/pax.info
@@ -1,10 +1,10 @@
 PRGNAM="pax"
-VERSION="3.4"
+VERSION="20201030"
 HOMEPAGE="http://wiki.bash-hackers.org/howto/pax"
-DOWNLOAD="https://downloads.sourceforge.net/project/slackbuildsdirectlinks/pax/pax-3.4.tar.bz2"
-MD5SUM="fbd9023b590b45ac3ade95870702a0d6"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/pax_20201030.orig.tar.gz"
+MD5SUM="87a0a3870ec437c41eb1b406334fe2c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Ben Collver"
-EMAIL="bencollver@gmail.com"
+EMAIL="bencollver@riseup.net"
diff --git a/system/paxctl/paxctl.SlackBuild b/system/paxctl/paxctl.SlackBuild
index 3a4377d534..71d16d5b3e 100644
--- a/system/paxctl/paxctl.SlackBuild
+++ b/system/paxctl/paxctl.SlackBuild
@@ -1,30 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for paxctl
 
 # Copyright 2013 pyllyukko
 # All rights reserved.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=paxctl
 VERSION=${VERSION:-0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,4 +79,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pbzip2/README b/system/pbzip2/README
index 2f2fc0919f..90c2e8c770 100644
--- a/system/pbzip2/README
+++ b/system/pbzip2/README
@@ -1,5 +1,5 @@
 PBZIP2 is a parallel implementation of the bzip2 block-sorting file
-compressor that uses pthreads and achieves near-linear speedup on SMP
-machines. The output of this version is fully compatible with bzip2 v1.0.2
-or newer (ie: anything compressed with pbzip2 can be decompressed with
-bzip2).
+compressor that uses pthreads and achieves near-linear speedup on
+SMP machines. The output of this version is fully compatible with
+bzip2 v1.0.2 or newer (ie: anything compressed with pbzip2 can be
+decompressed with bzip2).
diff --git a/system/pbzip2/pbzip2.SlackBuild b/system/pbzip2/pbzip2.SlackBuild
index 79fb06c882..ac3b6a5a17 100644
--- a/system/pbzip2/pbzip2.SlackBuild
+++ b/system/pbzip2/pbzip2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for PBZIP2
 
@@ -22,10 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pbzip2
 VERSION=${VERSION:-1.1.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -86,4 +96,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pbzx/README b/system/pbzx/README
new file mode 100644
index 0000000000..1bc08f011b
--- /dev/null
+++ b/system/pbzx/README
@@ -0,0 +1,6 @@
+pbzx stream parser
+
+This is a fork of PHPdev32's implementation of the pbzx stream parser
+program. Pbzx is a format employed in later versions of OSX disk images
+(starting with 10.10) to encode payload data in .pkg files. Pbzx unpacks
+.pkg files and outputs to stdout to be unpacked with cpio.
diff --git a/system/pbzx/pbzx.SlackBuild b/system/pbzx/pbzx.SlackBuild
new file mode 100644
index 0000000000..b99c841869
--- /dev/null
+++ b/system/pbzx/pbzx.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/bash
+
+# Slackware build script for <pbzx>
+
+# Copyright 2023 Petar Petrov slackalaxy.com
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=pbzx
+VERSION=${VERSION:-1.0.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+gcc $SLKCFLAGS -llzma -lxar -I /usr/include pbzx.c -o pbzx
+install -D -m 755 pbzx $PKG/usr/bin/pbzx
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md LICENSE \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pbzx/pbzx.info b/system/pbzx/pbzx.info
new file mode 100644
index 0000000000..6bbbdbae16
--- /dev/null
+++ b/system/pbzx/pbzx.info
@@ -0,0 +1,10 @@
+PRGNAM="pbzx"
+VERSION="1.0.2"
+HOMEPAGE="https://github.com/NiklasRosenstein/pbzx"
+DOWNLOAD="https://github.com/NiklasRosenstein/pbzx/archive/v1.0.2/pbzx-1.0.2.tar.gz"
+MD5SUM="37c384e2912b3c607e7fc26e88d8efea"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="xar"
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.com"
diff --git a/system/pbzx/slack-desc b/system/pbzx/slack-desc
new file mode 100644
index 0000000000..ac95fd419f
--- /dev/null
+++ b/system/pbzx/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+pbzx: pbzx (pbzx stream parser)
+pbzx:
+pbzx: A fork of PHPdev32's implementation of the pbzx stream parser
+pbzx: program. Pbzx is a format employed in later versions of OSX
+pbzx: disk images (starting with 10.10) to encode payload data in
+pbzx: .pkg files. 
+pbzx:
+pbzx: https://github.com/NiklasRosenstein/pbzx
+pbzx:
+pbzx:
+pbzx:
diff --git a/system/pce/pce.SlackBuild b/system/pce/pce.SlackBuild
index c7cfb212d7..963bcd3e99 100644
--- a/system/pce/pce.SlackBuild
+++ b/system/pce/pce.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pce
 
-# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2022  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,12 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org, to fix the build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pce
-VERSION=${VERSION:-20160308.72f1e10}
+VERSION=${VERSION:-20220220_991c55d9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-SRCVER=$(echo $VERSION | tr . -)
+SRCVER=$(echo $VERSION | tr _ -)
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,10 +76,11 @@ cd $PRGNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
+SLKCFLAGS+=" -fcommon"
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -85,11 +95,8 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+strip $PKG/usr/bin/*
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING NEWS README doc/* $PKG/usr/doc/$PRGNAM-$VERSION
@@ -100,4 +107,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pce/pce.info b/system/pce/pce.info
index bf7fe4f53b..f12c6711e2 100644
--- a/system/pce/pce.info
+++ b/system/pce/pce.info
@@ -1,8 +1,8 @@
 PRGNAM="pce"
-VERSION="20160308.72f1e10"
+VERSION="20220220_991c55d9"
 HOMEPAGE="http://www.hampa.ch/pce"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/pce-20160308-72f1e10.tar.gz"
-MD5SUM="2dfdf4f23bbd6da0b20911af6b11d971"
+DOWNLOAD="http://www.hampa.ch/pub/pce/pre/pce-20220220-991c55d9/pce-20220220-991c55d9.tar.gz"
+MD5SUM="022482f057e959bb3a1314f1cc52fd49"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/pcem-roms/README b/system/pcem-roms/README
new file mode 100644
index 0000000000..d648d9fe0f
--- /dev/null
+++ b/system/pcem-roms/README
@@ -0,0 +1,23 @@
+pcem-roms (rom file collection for PCem)
+
+pcem-roms is a collection of rom files that can be used with the PCem
+emulator. Once installed, the files will be in /usr/share/pcem/roms,
+ready to be used by PCem.
+
+These files are all proprietary (excluding xtide), and the archive comes
+from upstream without a license. Granted, none of the roms in the
+collection could be described as "recent" by any stretch of the
+imagination.
+
+Some files for the mach64g were included at the time PCem 17 was
+released, but have since been removed from the upstream GitHub
+repository. They are mostly Windows 3.1 and Windows 95 drivers and other
+Windows utilities. Although these files will not be installed by
+default, use EXTRAS=yes to include them.
+
+Two rom files are known to be missing from the collection:
+
+  Hyundai Super 16T
+    super16t_v1.12ta.bin
+  Hyundai Super 16TE
+    super16te_v2.00id.bin
diff --git a/system/pcem-roms/pcem-roms.SlackBuild b/system/pcem-roms/pcem-roms.SlackBuild
new file mode 100644
index 0000000000..550e526ef9
--- /dev/null
+++ b/system/pcem-roms/pcem-roms.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+# Slackware build script for pcem-roms
+
+# K. Eugene Carlson (kvngncrlsn@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=pcem-roms
+SRCNAM=PCem-ROMs
+VERSION=${VERSION:-17.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+ARCH=noarch
+PKGTYPE=${PKGTYPE:-tgz}
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+# A missing rom for the Commodore PC-10
+mkdir cbm_pc10
+cp $CWD/cbm-pc10c-bios-v4.41-318085-08.bin cbm_pc10
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/share/pcem/roms
+cp -ar ./* $PKG/usr/share/pcem/roms
+
+cd $PKG/usr/share/pcem/roms
+
+# Extra files for the mach64g (mostly Windows 3.1/95 drivers and utilities)
+# were included in the archive at the time of release, but have since been
+# removed. These will not be installed by default. To install them anyway, set
+# EXTRAS=yes.
+if [ ! ${EXTRAS:-no} = yes ]; then
+  rm -r mach64g/Drivers\ \&\ Utils
+fi
+
+# Getting rid of extraneous text files.
+find . -name roms.txt -delete
+
+# Other cleanup
+rm -r kmxc02/3ctm005\ \(broken\).bin ne1000/url.txt xtide/serdrive.exe \
+      pb_1300sx pb_l300sx/pb_l300sx.zip gd5434 gd5430/pci.bin1 \
+      europc/50146\ char\ d1.0\ euro.u16 super286tr/hyundai_award286.bin \
+      amic206.bin t1000/t1000font.bin vs440fx/BIOSCS1.REC \
+      mach64g/bios.bin pb570/gd5430.bin1 infowaym/gd5434.bin
+
+# Capitalization fixes
+mv bull_micral_45/EVEN.FIL bull_micral_45/even.fil
+mv bull_micral_45/ODD.FIL bull_micral_45/odd.fil
+mv spc4200p/U8.01 spc4200p/u8.01
+mv spc4620p/31005H.U8 spc4620p/31005h.u8
+mv spc4620p/31005H.U10 spc4620p/31005h.u10
+mv spc6033p/phoenix.BIN spc6033p/phoenix.bin
+mv pb410a/pb410a.080337.4abf.u25.bin pb410a/PB410A.080337.4ABF.U25.bin
+mv zappa/1006BS0_.BIO zappa/1006bs0_.bio
+mv zappa/1006BS0_.BI1 zappa/1006bs0_.bi1
+mv pb520r/1009BC0R.BIO pb520r/1009bc0r.bio
+mv pb520r/1009BC0R.BI1 pb520r/1009bc0r.bi1
+mv pb570/1007BY0R.BIO pb570/1007by0r.bio
+mv pb570/1007BY0R.BI1 pb570/1007by0r.bi1
+mv p55tvp4/TV5I0204.AWD p55tvp4/tv5i0204.awd
+mv p55t2p4/0207_J2.BIN p55t2p4/0207_j2.bin
+mv oti037/BIOS.BIN oti037/bios.bin
+mv BlasterPCI.rom blasterpci.rom
+mv Pci_sg.rom pci_sg.rom
+
+cd $TMP/$SRCNAM-$VERSION
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.sw
+mv $PKG/usr/share/pcem/roms/{CONTRIBUTING.md,README.md} \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+# Well, at least one part of this collection is licensed!
+mv $PKG/usr/share/pcem/roms/xtide/license.txt $PKG/usr/doc/$PRGNAM-$VERSION/xtide-license.txt
+mv $PKG/usr/share/pcem/roms/xtide/readme.txt $PKG/usr/doc/$PRGNAM-$VERSION/xtide-readme.txt
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pcem-roms/pcem-roms.info b/system/pcem-roms/pcem-roms.info
new file mode 100644
index 0000000000..2c5bff191c
--- /dev/null
+++ b/system/pcem-roms/pcem-roms.info
@@ -0,0 +1,12 @@
+PRGNAM="pcem-roms"
+VERSION="17.0"
+HOMEPAGE="https://github.com/BaRRaKudaRain/PCem-ROMs"
+DOWNLOAD="https://github.com/BaRRaKudaRain/PCem-ROMs/archive/refs/tags/v17.0/PCem-ROMs-17.0.tar.gz \
+          http://www.zimmers.net/anonftp/pub/cbm-pc/firmware/pc10/cbm-pc10c-bios-v4.41-318085-08.bin"
+MD5SUM="1de3c5fd08ab4b2b0cf353bc189d619b \
+        598a1adee2a9ddaa5b0d4b73190ff990"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/pcem-roms/slack-desc b/system/pcem-roms/slack-desc
new file mode 100644
index 0000000000..2fa4c7699e
--- /dev/null
+++ b/system/pcem-roms/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+pcem-roms: pcem-roms (rom files for the pcem emulator)
+pcem-roms:
+pcem-roms: pcem-roms contains a collection of rom files for the pcem emulator,
+pcem-roms: sorted appropriately in /usr/share/pcem/roms.
+pcem-roms:
+pcem-roms: The roms in this package are old, but they are also proprietary. The
+pcem-roms: upstream repository provides them without a license.
+pcem-roms:
+pcem-roms:
+pcem-roms:
+pcem-roms:
diff --git a/system/pcem/README b/system/pcem/README
new file mode 100644
index 0000000000..021168ceff
--- /dev/null
+++ b/system/pcem/README
@@ -0,0 +1,72 @@
+PCem (low-level emulator for 1980s-1990s IBM compatibles)
+
+PCem is capable of emulating a wide array of IBM-compatible computers
+from the 1980s through the late 1990s.
+
+PCem is, for the most part, a single-threaded process, and some CPU
+frequency governors may fail to reach high enough frequencies for
+acceptable performance in emulating the higher-end models. If the
+program is unexpectedly slow, consider setting the CPU frequency
+governor to "performance" or "schedutil" mode temporarily.
+
+Required: wxGTK3
+
+  ____________
+  | Building |
+  ------------
+
+Aside from BUILD and VERSION, the following options are available when
+calling pcem.SlackBuild:
+
+  ALSA=yes    # Use ALSA for MIDI output
+  NETWORKING=no    # Disable network connectivity
+  PCAP=no    # Disable PCAP networking (no effect without networking)
+  PLUGINS=yes    # Build the plugin engine
+
+This SlackBuild follows upstream in applying -O3 optimizations.
+
+  _____________
+  | Rom Files |
+  -------------
+
+Rom files for individual models are required for emulation. These files
+are not included in the PCem source. Once the roms have been acquired,
+they should be placed in /usr/share/pcem or in the $HOME/.pcem directory
+for the running user:
+
+  /usr/share/pcem/roms
+  $HOME/.pcem/roms
+
+The system-wide directory is supplied by the PCem package, and the user
+directory is created when running PCem for the first time. The internal
+structure of the roms directory is non-trivial. See "README.md" after
+installation for a list of compatible guests, the necessary location of
+each rom file and technical specifications.
+
+A "pcem-roms" collection is available, but please bear in mind that
+although the roms within are ancient, they are also proprietary and
+provided without a license. The collection provides a large number of
+usable rom files in their proper positions within the roms directory
+tree.
+
+  _________________________
+  | Configuration and Use |
+  -------------------------
+
+A variety of guest-specific settings are available through the GUI menu,
+incuding the CPU to emulate, storage devices, peripherals, etc.
+
+PCem can be configured on a per-user basis by modifying
+$HOME/.pcem/pcem.cfg. This file is generated automatically at the first
+run.
+
+Keyboard shortcuts are not configurable:
+
+  Ctrl + Alt + PgDn - toggle fullscreen
+    (enter fullscreen: mouse capture on; leave: mouse capture off)
+  Ctrl + End  - leave mouse capture in windowed mode
+  Ctrl + Alt + PgUp - screenshot to $HOME/.pcem/screenshots
+
+To make changes to a running session (insert disks, etc.), or to create
+blank disk images, right-click the screen area outside of fullscreen
+mode and/or mouse capture.
diff --git a/system/pcem/pcem.SlackBuild b/system/pcem/pcem.SlackBuild
new file mode 100644
index 0000000000..36d31c9aba
--- /dev/null
+++ b/system/pcem/pcem.SlackBuild
@@ -0,0 +1,160 @@
+#!/bin/bash
+
+# Slackware build script for pcem
+
+# Copyright 2022-2023 K. Eugene Carlson  Tsukuba, Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=pcem
+VERSION=${VERSION:-b8ad941.20230304}
+SRCVERSION=${SRCVERSION:-b8ad9416bc1d3acd8b384a83b753ddf2282bd091}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# Use ALSA=yes to output MIDI with ALSA.
+unset USE_ALSA
+[ ${ALSA:-no} = yes ] && USE_ALSA="-DUSE_ALSA=ON"
+
+# Use NETWORKING=no to disable networking.
+USE_NETWORKING="-DUSE_NETWORKING=ON"
+[ ${NETWORKING:-yes} = no ] && USE_NETWORKING="-DUSE_NETWORKING=OFF"
+
+# Use PCAP=no to disable PCAP networking. Has no effect unless networking is
+# turned on.
+unset NO_PCAP
+[ ${PCAP:-yes} = no ] && NO_PCAP="-DUSE_PCAP_NETWORKING=OFF"
+
+# Use PLUGINS=yes to build the plugin engine.
+unset USE_PLUGINS
+[ ${PLUGINS:-no} = yes ] && USE_PLUGINS="-DPLUGIN_ENGINE=ON"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O3 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O3 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  # -fPIC causes the dynamic recompiler to crash
+  SLKCFLAGS="-O3"
+  LIBDIRSUFFIX=64
+else
+  SLKCFLAGS="-O3"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$SRCVERSION
+unzip $CWD/$PRGNAM-$SRCVERSION.zip
+cd $PRGNAM-$SRCVERSION
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir build
+cd build
+cmake -G "Ninja" \
+  -DwxWidgets_CONFIG_OPTIONS="--version=3.0" \
+  -DCMAKE_C_FLAGS_RELEASE="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS" \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DPCEM_LIB_DIR=/usr/lib$LIBDIRSUFFIX \
+  $USE_ALSA \
+  $USE_NETWORKING \
+  $NO_PCAP \
+  $USE_PLUGINS \
+  ..
+ninja
+DESTDIR=$PKG ninja install/strip
+cd ..
+
+# Use a wrapper script to create a symlink to the system roms collection
+# (available with pcem-roms on SBo).
+mv $PKG/usr/bin/pcem $PKG/usr/bin/PCem
+cat << EOF >> $PKG/usr/bin/pcem
+#!/bin/bash
+
+[ ! -d \$HOME/.pcem ] && mkdir \$HOME/.pcem
+[ ! -d \$HOME/.pcem/roms ] && ln -s /usr/share/pcem/roms \$HOME/.pcem/roms
+PCem
+EOF
+chmod 0755 $PKG/usr/bin/pcem
+
+mkdir -p $PKG/usr/man/man1
+mv $PKG/usr/share/man/man1/pcem.man/pcem.man.1 $PKG/usr/man/man1/pcem.1
+rm -r $PKG/usr/share/man
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+# The text files saying "roms go here" aren't really necessary.
+find $PKG/usr/share/pcem/roms -name roms.txt -delete
+rm -f $PKG/usr/share/pcem/configs/configs.txt
+# File included in error.
+rm -f $PKG/usr/share/pcem/roms/mda.rom
+
+# Make the plugins directory, if appropriate
+[ ${PLUGINS:-no} = yes ] && mkdir $PKG/usr/share/pcem/plugins
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  TESTED.md \
+  README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat COPYING > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.sw
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pcem/pcem.info b/system/pcem/pcem.info
new file mode 100644
index 0000000000..61629c38fa
--- /dev/null
+++ b/system/pcem/pcem.info
@@ -0,0 +1,10 @@
+PRGNAM="pcem"
+VERSION="b8ad941.20230304"
+HOMEPAGE="https://pcem-emulator.co.uk/"
+DOWNLOAD="https://github.com/sarah-walker-pcem/pcem/archive/b8ad9416bc1d3acd8b384a83b753ddf2282bd091/pcem-b8ad9416bc1d3acd8b384a83b753ddf2282bd091.zip"
+MD5SUM="5df65f15b4db312cedcfadabede4001f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="wxGTK3"
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/pcem/slack-desc b/system/pcem/slack-desc
new file mode 100644
index 0000000000..0e353faeec
--- /dev/null
+++ b/system/pcem/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+pcem: pcem (low-level emulator for IBM compatibles)
+pcem:
+pcem: pcem is an emulator for IBM compatibles from the 1980s through late
+pcem: 1990s.
+pcem:
+pcem: pcem will not operate without an appropriate collection of roms.
+pcem:
+pcem:
+pcem: Author: Sarah Walker
+pcem: Maintainer: Michael Manley
+pcem: https://pcem-emulator.co.uk
diff --git a/system/pcf2bdf/README b/system/pcf2bdf/README
index d7871d3a39..3bb682ae5f 100644
--- a/system/pcf2bdf/README
+++ b/system/pcf2bdf/README
@@ -1,5 +1,5 @@
 pcf2bdf (convert X fonts from PCF to BDF)
 
-Pcf2bdf is a font de-compiler. It converts X fonts from Portable Compiled
-Format (PCF) to Bitmap Distribution Format (BDF). It can also accept a
-compressed/gzipped PCF file as input.
+Pcf2bdf is a font de-compiler. It converts X fonts from Portable
+Compiled Format (PCF) to Bitmap Distribution Format (BDF). It can also
+accept a compressed/gzipped PCF file as input.
diff --git a/system/pcf2bdf/pcf2bdf.SlackBuild b/system/pcf2bdf/pcf2bdf.SlackBuild
index 7dc231f4a0..9c10a7f109 100644
--- a/system/pcf2bdf/pcf2bdf.SlackBuild
+++ b/system/pcf2bdf/pcf2bdf.SlackBuild
@@ -1,15 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pcf2bdf
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pcf2bdf
-VERSION=${VERSION:-1.06}
+VERSION=${VERSION:-1.07}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +22,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,4 +76,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pcf2bdf/pcf2bdf.info b/system/pcf2bdf/pcf2bdf.info
index 43243ad4b4..940b4a60a3 100644
--- a/system/pcf2bdf/pcf2bdf.info
+++ b/system/pcf2bdf/pcf2bdf.info
@@ -1,10 +1,10 @@
 PRGNAM="pcf2bdf"
-VERSION="1.06"
+VERSION="1.07"
 HOMEPAGE="https://github.com/ganaware/pcf2bdf/"
-DOWNLOAD="https://github.com/ganaware/pcf2bdf/archive/1.06/pcf2bdf-1.06.tar.gz"
-MD5SUM="7cbdf32d1df7b084dc9549c8ba5f916c"
+DOWNLOAD="https://github.com/ganaware/pcf2bdf/archive/1.07/pcf2bdf-1.07.tar.gz"
+MD5SUM="467f9b6b21a550c9d6d51ba00040b807"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/pcmanfm-qt/README b/system/pcmanfm-qt/README
new file mode 100644
index 0000000000..0d9a885e7d
--- /dev/null
+++ b/system/pcmanfm-qt/README
@@ -0,0 +1 @@
+PCManFM-Qt is the Qt port of PCManFM, the file manager of LXDE.
diff --git a/system/pcmanfm-qt/doinst.sh b/system/pcmanfm-qt/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/system/pcmanfm-qt/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/pcmanfm-qt/pcmanfm-qt.SlackBuild b/system/pcmanfm-qt/pcmanfm-qt.SlackBuild
new file mode 100644
index 0000000000..da1b217f41
--- /dev/null
+++ b/system/pcmanfm-qt/pcmanfm-qt.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/bash
+
+# Slackware build script for pcmanfm-qt
+
+# Copyright 2022-2024 Isaac Yu <isaacyu@protonmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=pcmanfm-qt
+VERSION=${VERSION:-1.4.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+sed -i '/^Categories/s,FileManager;,X-&,' $PKG/usr/share/applications/*desktop
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mv $PKG/usr/share/man $PKG/usr/
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pcmanfm-qt/pcmanfm-qt.info b/system/pcmanfm-qt/pcmanfm-qt.info
new file mode 100644
index 0000000000..038045f152
--- /dev/null
+++ b/system/pcmanfm-qt/pcmanfm-qt.info
@@ -0,0 +1,10 @@
+PRGNAM="pcmanfm-qt"
+VERSION="1.4.1"
+HOMEPAGE="https://github.com/lxqt/pcmanfm-qt"
+DOWNLOAD="https://github.com/lxqt/pcmanfm-qt/releases/download/1.4.1/pcmanfm-qt-1.4.1.tar.xz"
+MD5SUM="91dfd38d6726ee3ef855beee5a41f8f3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libfm-qt"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/pcmanfm-qt/slack-desc b/system/pcmanfm-qt/slack-desc
new file mode 100644
index 0000000000..f3019f7945
--- /dev/null
+++ b/system/pcmanfm-qt/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+pcmanfm-qt: pcmanfm-qt (PCMan File Manager)
+pcmanfm-qt:
+pcmanfm-qt: PCManFM-Qt is the Qt port of PCManFM, the file manager of LXDE.
+pcmanfm-qt:
+pcmanfm-qt:
+pcmanfm-qt:
+pcmanfm-qt:
+pcmanfm-qt:
+pcmanfm-qt:
+pcmanfm-qt:
+pcmanfm-qt:
diff --git a/system/pcmanfm/patches/0001-avoid-undefined-isdigit-behaviour.patch b/system/pcmanfm/patches/0001-avoid-undefined-isdigit-behaviour.patch
deleted file mode 100644
index ad9a022db9..0000000000
--- a/system/pcmanfm/patches/0001-avoid-undefined-isdigit-behaviour.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0619a81f358d85568d990fc78c67e121e55f1c05 Mon Sep 17 00:00:00 2001
-From: Michael Weghorn <m.weghorn@posteo.de>
-Date: Thu, 27 Dec 2018 11:56:09 +0100
-Subject: [PATCH] Avoid undefined 'isdigit()' behaviour
-
-As the C11 standard says in section 7.4, 1),
-the 'isdigit()' function is only well-defined
-under this precondition:
-
-> The header <ctype.h> declares several functions
-> useful for classifying and mapping characters.
-> In all cases the argument is an int, the value of
-> which shall be representable as an unsigned char or
-> shall equal the value of the macro EOF. If the argument
-> has any other value, the behavior is undefined.
-
-Therefore avoid to use the 'isdigit()' function here,
-since the Gdk key codes and thus the 'keyval'
-member from the 'GdkEventKey' do not always fulfill
-this requirement and the behaviour is thus undefined.
----
- NEWS           | 5 +++++
- src/main-win.c | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/NEWS b/NEWS
-index d2e6caa..c5b2285 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,3 +1,8 @@
-+Changes on 1.3.2 since 1.3.1:
-+
-+* Fixed case when some keyboard shortcuts stopped working: Alt+Home, Alt+Up.
-+
-+
- Changes on 1.3.1 since 1.3.0:
- 
- * Allowed bigger sizes of icons and thumbnails as 256*256 appears to be small
-diff --git a/src/main-win.c b/src/main-win.c
-index 3907dba..49fc53b 100644
---- a/src/main-win.c
-+++ b/src/main-win.c
-@@ -2465,7 +2465,7 @@ static gboolean on_key_press_event(GtkWidget* w, GdkEventKey* evt)
- 
-     if(modifier == GDK_MOD1_MASK) /* Alt */
-     {
--        if(isdigit(evt->keyval)) /* Alt + 0 ~ 9, nth tab */
-+        if(evt->keyval >= '0' && evt->keyval <= '9') /* Alt + 0 ~ 9, nth tab */
-         {
-             int n;
-             if(evt->keyval == '0')
--- 
-2.1.4
-
diff --git a/system/pcmanfm/pcmanfm.SlackBuild b/system/pcmanfm/pcmanfm.SlackBuild
index 2785dd5496..e919aa3934 100644
--- a/system/pcmanfm/pcmanfm.SlackBuild
+++ b/system/pcmanfm/pcmanfm.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for PCMan File Manager (PCManFM)
 
 # Copyright 2006-2009 Chess Griffin <chess@chessgriffin.com>
 # Copyright 2010 Chris Abela <chris.abela@maltats.com>
-# Copyright 2011-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2011-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,17 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix doc permissions.
+# - remove empty/useless files from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pcmanfm
-VERSION=${VERSION:-1.3.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.3.2}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +44,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -61,7 +72,7 @@ case "$GTK" in
   *) gtk="--with-gtk=2" ;;
 esac
 
-DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
+DOCS="AUTHORS COPYING NEWS README TODO"
 
 set -e
 
@@ -71,14 +82,12 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
+chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Apply upstream patches
-for i in $CWD/patches/* ; do patch -p1 < $i ; done
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 sh autogen.sh || true
 
@@ -96,12 +105,10 @@ CXXFLAGS="$SLKCFLAGS" \
 
 make
 make install-strip DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+install -m0644 $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -109,4 +116,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pcmanfm/pcmanfm.info b/system/pcmanfm/pcmanfm.info
index 7cb89e0763..d3546b675e 100644
--- a/system/pcmanfm/pcmanfm.info
+++ b/system/pcmanfm/pcmanfm.info
@@ -1,8 +1,8 @@
 PRGNAM="pcmanfm"
-VERSION="1.3.1"
+VERSION="1.3.2"
 HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-DOWNLOAD="https://downloads.sf.net/pcmanfm/pcmanfm-1.3.1.tar.xz"
-MD5SUM="d32ad2c9c7c52bff2004bbc120b53420"
+DOWNLOAD="https://downloads.sf.net/pcmanfm/pcmanfm-1.3.2.tar.xz"
+MD5SUM="ef7c4417d2697ef138d175db7aeae15a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libfm"
diff --git a/system/pcp/README b/system/pcp/README
new file mode 100644
index 0000000000..2aa98c8110
--- /dev/null
+++ b/system/pcp/README
@@ -0,0 +1,24 @@
+RedHat Performance Co-Pilot is a distributed monitoring solution.
+
+Essentially it is a turbocharged sysstat, with support for much
+more sources of data than the sysstat originally provided.
+
+1. Build and running requires a dedicated user add one like this:
+
+groupadd -r -g 377 pcp
+useradd -r -u 377 -g 377 -m -d /var/lib/pcp/tmp -s /bin/false \
+  pcp
+
+2. PCP conflicts with dstat, because it install (seemingly compatible)
+binary with the same name.
+
+3. Optional deps not on SBo: qt3d (for qt5)
+
+4. Optional deps on SBo: libvirt-python, qt6(with qt3d), tsocks
+
+5. This SlackBuild uses Slackware's SysV-Init support, in that
+it installs the service files into /etc/rc.d/init.d/
+If you need to enable any of them, you can add symlinks to them
+in /etc/rc.d/rc$i.d, where $i is the runlevel, or you can call them
+directly from rc.local.
+
diff --git a/system/pcp/doinst.sh b/system/pcp/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/system/pcp/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/pcp/pcp.SlackBuild b/system/pcp/pcp.SlackBuild
new file mode 100644
index 0000000000..d4cae53601
--- /dev/null
+++ b/system/pcp/pcp.SlackBuild
@@ -0,0 +1,140 @@
+#!/bin/bash
+
+# Slackware build script for pcp
+
+# Copyright 2023 Lockywolf
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=pcp
+VERSION=${VERSION:-6.0.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --exec-prefix=/usr/ \
+  --mandir=/usr/man \
+  --with-rcdir=/etc/rc.d \
+  --with-rundir=/run/pcp \
+  --with-tmpdir=/var/tmp \
+  --with-logdir=/var/log/pcp \
+  --with-qt \
+  --build=$ARCH-slackware-linux
+
+make
+make DIST_ROOT="$PKG" NO_CHOWN=true install_pcp
+
+mkdir -p "$PKG"/usr/doc/$PRGNAM-$VERSION
+mv "$PKG"/usr/share/doc/* "$PKG"/usr/doc/$PRGNAM-$VERSION/
+rmdir "$PKG"/usr/share/doc
+
+find "$PKG"/usr/share/icons/ -type d -empty -delete || true
+
+install -D -m644 "$CWD"/sysuser.conf "$PKG"/usr/lib${LIBDIRSUFFIX}/sysusers.d/pcp.conf
+install -D -m644 "$CWD"/tmpfile.conf "$PKG"/usr/lib${LIBDIRSUFFIX}/tmpfiles.d/pcp.conf
+
+
+rm -rf "$PKG"/{var/lib/pcp/testsuite,run,var/tmp}
+
+
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find "$PKG/usr/man/man3/" -type f -not -name '*.gz' -exec gzip -9 {} \;
+
+install -m644 -d "$PKG"/etc/rc.d/init.d
+mv "$PKG"/etc/rc.d/{pcp,pmcd,pmie,pmlogger,pmproxy} "$PKG"/etc/rc.d/init.d/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+CHANGELOG CONTRIBUTING.md  COPYING README.github  README.md      \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pcp/pcp.info b/system/pcp/pcp.info
new file mode 100644
index 0000000000..16297525cc
--- /dev/null
+++ b/system/pcp/pcp.info
@@ -0,0 +1,10 @@
+PRGNAM="pcp"
+VERSION="6.0.4"
+HOMEPAGE="https://pcp.io"
+DOWNLOAD="https://github.com/performancecopilot/pcp/archive/6.0.4/pcp-6.0.4.tar.gz"
+MD5SUM="080191e19678546a293f65428ca43003"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="avahi libwww-perl perl-xml-libxml perl-File-Slurp jsonpointer perl-yaml perl-JSON python3-psycopg2 perl-Net-SNMP python3-openpyxl"
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.pcp_2023-06-16@lockywolf.net"
diff --git a/system/pcp/slack-desc b/system/pcp/slack-desc
new file mode 100644
index 0000000000..14980c36e9
--- /dev/null
+++ b/system/pcp/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+pcp: pcp (RedHat Performance Co-Pilot)
+pcp:
+pcp: pcp is a monitoring tool from RedHat, which supports a plethora of
+pcp: data sources and sinks.
+pcp:
+pcp:
+pcp:
+pcp:
+pcp:
+pcp:
+pcp:
diff --git a/system/pcp/sysuser.conf b/system/pcp/sysuser.conf
new file mode 100644
index 0000000000..6483ff09a9
--- /dev/null
+++ b/system/pcp/sysuser.conf
@@ -0,0 +1 @@
+u pcp - "Performance Co-Pilot" /var/lib/pcp
diff --git a/system/pcp/tmpfile.conf b/system/pcp/tmpfile.conf
new file mode 100644
index 0000000000..ba8e202ff8
--- /dev/null
+++ b/system/pcp/tmpfile.conf
@@ -0,0 +1,7 @@
+d /etc/pcp/nssdb 775 pcp pcp
+d /run/pcp 775 pcp pcp
+Z /var/log/pcp 775 pcp pcp
+Z /var/lib/pcp/config/pmie 775 pcp pcp
+Z /var/lib/pcp/config/pmlogger 775 pcp pcp
+Z /var/lib/pcp/config/pmda 775 pcp pcp
+Z /var/lib/pcp/tmp 775 pcp pcp
diff --git a/system/pcsc-lite/README b/system/pcsc-lite/README
index 46b47574a7..758de4cdc6 100644
--- a/system/pcsc-lite/README
+++ b/system/pcsc-lite/README
@@ -1,14 +1,14 @@
-PC/SC-lite is a middleware to access a smart card using SCard API (PC/SC)
-Its purpose is to provide a Windows(R) SCard interface in a very small
-form factor for communicating to smart cards and readers.
+PC/SC-lite is a middleware to access a smart card using SCard API
+(PC/SC) Its purpose is to provide a Windows(R) SCard interface in a
+very small form factor for communicating to smart cards and readers.
 
 Compiling with "DEBUGATR=1 ./pcsc-lite.SlackBuild" enables ATR parsing
 debug output messages.
 
 On-demand power on (auto power off) feature for an inserted card is
 disabled, now. If you want it re-enabled, so the card is powered off
-after a few seconds of inactivity (upstream's default since version 1.6.5)
-you can compile with "AUTOPOFF=1 ./pcsc-lite.SlackBuild".
+after a few seconds of inactivity (upstream's default since version
+1.6.5) you can compile with "AUTOPOFF=1 ./pcsc-lite.SlackBuild".
 
 pcsc-lite no longer uses (deprecated) libhal for smart-card reader's
 detection. By default libudev is used now.
diff --git a/system/pcsc-lite/pcsc-lite.SlackBuild b/system/pcsc-lite/pcsc-lite.SlackBuild
index e6617f8930..57529c30e7 100644
--- a/system/pcsc-lite/pcsc-lite.SlackBuild
+++ b/system/pcsc-lite/pcsc-lite.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pcsc-lite
 
 # Copyright 2007-2015  LukenShiro, Italy
-# Copyright 2020  Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2020-2023  Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,17 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230801 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - handle user and group detection better.
+# - get rid of generic GNU INSTALL from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pcsc-lite
-VERSION=${VERSION:-1.8.26}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.9.9}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -44,12 +55,12 @@ OUTPUT=${OUTPUT:-/tmp}
 # Bail out if user or group isn't valid on your system
 # For slackbuilds.org, assigned pcscd uid/gid are 257/257
 # See http://slackbuilds.org/uid_gid.txt
-if ! grep ^pcscd: /etc/group 2>&1 > /dev/null; then
-    echo "  You must have a \"pcscd\" group to run this script."
+# 20230801 bkw: grepping /etc/passwd and /etc/group may fail if e.g. NIS
+# or LDAP is in use; always use getent. Also, print both messages (for user
+# and group) if either doesn't exist.
+if ! getent group pcscd &>/dev/null || ! getent passwd pcscd &>/dev/null; then
+    echo "  You must have a \"pcscd\" user and group to run this script."
     echo "    # groupadd -g 257 pcscd"
-    exit 1
-elif ! grep ^pcscd: /etc/passwd 2>&1 > /dev/null; then
-    echo "  You must have a \"pcscd\" user to run this script."
     echo "    # useradd -u 257 -g pcscd -d /var/run/pcscd -s /bin/false pcscd"
     exit 1
 fi
@@ -60,7 +71,7 @@ DEBUGATR=${DEBUGATR:-0}
 AUTOPOFF=${AUTOPOFF:-0}		# disabled by default
 
 # README and README.DAEMON are not useful and partly outdated.
-DOCFILES="SECURITY ChangeLog* COPYING HELP NEWS TODO AUTHORS INSTALL"
+DOCFILES="SECURITY ChangeLog* COPYING HELP NEWS TODO AUTHORS"
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -87,9 +98,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
 # ATR (answer to reset) debug parsing output
 case "$DEBUGATR" in
@@ -158,9 +169,11 @@ cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 # remove README.DAEMON, automatically installed by doc/Makefile.
 rm -f $PKG/usr/doc/$PRGNAM-$VERSION/README.DAEMON
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pcsc-lite/pcsc-lite.info b/system/pcsc-lite/pcsc-lite.info
index fcc3cd640d..46c90a501e 100644
--- a/system/pcsc-lite/pcsc-lite.info
+++ b/system/pcsc-lite/pcsc-lite.info
@@ -1,8 +1,8 @@
 PRGNAM="pcsc-lite"
-VERSION="1.8.26"
+VERSION="1.9.9"
 HOMEPAGE="https://pcsclite.apdu.fr/"
-DOWNLOAD="https://pcsclite.apdu.fr/files/pcsc-lite-1.8.26.tar.bz2"
-MD5SUM="9d36882998449daceec267c68a21ff0d"
+DOWNLOAD="https://pcsclite.apdu.fr/files/pcsc-lite-1.9.9.tar.bz2"
+MD5SUM="23db832115db702e902baccf21da13aa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/pcsc-perl/pcsc-perl.SlackBuild b/system/pcsc-perl/pcsc-perl.SlackBuild
index 7e57bc66ba..f65ba385d4 100644
--- a/system/pcsc-perl/pcsc-perl.SlackBuild
+++ b/system/pcsc-perl/pcsc-perl.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pcsc-perl
 
@@ -23,10 +23,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - actually strip shared library.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pcsc-perl
 VERSION=${VERSION:-1.4.14}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,9 +77,9 @@ cd $PRGNAM-$VERSION
 chown -R root.root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
+  -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 perl Makefile.PL \
   PREFIX=/usr \
@@ -81,14 +91,14 @@ make install INSTALLDIRS=vendor DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Strip this package's sole binary, whereever it might be
-find $PKG -name "PCSC.so" -exec strip --strip-uneeded $PKG 2> /dev/null {} \;
+find $PKG -name "PCSC.so" -exec strip $PKG {} \;
 
 # Compress the stuff in the sole man directory
 gzip -9 $PKG/usr/man/man3/*
@@ -100,4 +110,4 @@ find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f
 find $PKG -depth -type d -empty -exec rm -rf {} \;
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-${BUILD}$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pcsc-tools/README b/system/pcsc-tools/README
index 1318d30ca3..3e549dd6db 100644
--- a/system/pcsc-tools/README
+++ b/system/pcsc-tools/README
@@ -1,5 +1,5 @@
-pcsc-tools provides some utilities that allow you to mess with your smart
-card reader, or to test a PC/SC driver.
+pcsc-tools provides some utilities that allow you to mess with your
+smart card reader, or to test a PC/SC driver.
 
 ATR_analysis - analyze a smart card "Answer to Reset" message
 pcsc_scan - query the status of a smart card reader using pcsc-lite
diff --git a/system/pcsc-tools/pcsc-tools.SlackBuild b/system/pcsc-tools/pcsc-tools.SlackBuild
index 4d9565d014..906ca3df01 100644
--- a/system/pcsc-tools/pcsc-tools.SlackBuild
+++ b/system/pcsc-tools/pcsc-tools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pcsc-tools
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pcsc-tools
-VERSION=${VERSION:-1.4.27}
+VERSION=${VERSION:-1.5.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,13 +38,15 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="LICENCE README Changelog"
-
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -62,7 +67,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -71,24 +76,37 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Make sure that the man pages go to the right place
-sed -i -e's|/share/man|/man|' Makefile
-
-# Use our wanted CFLAGS, in addition to those in the Makefile
-sed -i -e"s/-O2/$SLKCFLAGS/" Makefile
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG/usr
+make install DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Strip pcsc_scan
-find $PKG -name "pcsc_scan" -exec strip --strip-uneeded $PKG 2> /dev/null {} \;
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+    Changelog README \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pcsc-tools/pcsc-tools.info b/system/pcsc-tools/pcsc-tools.info
index a8d16d2f9e..aa3d170d09 100644
--- a/system/pcsc-tools/pcsc-tools.info
+++ b/system/pcsc-tools/pcsc-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="pcsc-tools"
-VERSION="1.4.27"
+VERSION="1.5.8"
 HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/pcsc-tools-1.4.27.tar.gz"
-MD5SUM="8ed881400d89f89cba13e4d70f524fb3"
+DOWNLOAD="http://distfiles.macports.org/pcsc-tools/pcsc-tools-1.5.8.tar.bz2"
+MD5SUM="4320fbe189780d483aa82def4e7e329e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="pcsc-perl perl-gtk2"
diff --git a/system/pdfgrep/pdfgrep.SlackBuild b/system/pdfgrep/pdfgrep.SlackBuild
index 05578aaada..3ae3dded58 100644
--- a/system/pdfgrep/pdfgrep.SlackBuild
+++ b/system/pdfgrep/pdfgrep.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pdfgrep
 
-# Copyright 2014-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pdfgrep
-VERSION=${VERSION:-2.1.2}
+VERSION=${VERSION:-2.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -97,4 +104,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pdfgrep/pdfgrep.info b/system/pdfgrep/pdfgrep.info
index 4b9c44115d..4cbddf90e8 100644
--- a/system/pdfgrep/pdfgrep.info
+++ b/system/pdfgrep/pdfgrep.info
@@ -1,8 +1,8 @@
 PRGNAM="pdfgrep"
-VERSION="2.1.2"
+VERSION="2.2.0"
 HOMEPAGE="https://pdfgrep.org/"
-DOWNLOAD="https://pdfgrep.org/download/pdfgrep-2.1.2.tar.gz"
-MD5SUM="d66b1da66f427f68fa3b99d077806583"
+DOWNLOAD="https://pdfgrep.org/download/pdfgrep-2.2.0.tar.gz"
+MD5SUM="f74b5505e71e8bad576285c6bd1790d9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/pdksh/pdksh.SlackBuild b/system/pdksh/pdksh.SlackBuild
index fb850081aa..a3bd7faa1a 100644
--- a/system/pdksh/pdksh.SlackBuild
+++ b/system/pdksh/pdksh.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pdksh
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pdksh
 VERSION=${VERSION:-5.2.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -102,4 +112,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pdsh/pdsh.SlackBuild b/system/pdsh/pdsh.SlackBuild
index 850677e65d..af30bc8f90 100644
--- a/system/pdsh/pdsh.SlackBuild
+++ b/system/pdsh/pdsh.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "pdsh".
 
@@ -24,10 +24,13 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pdsh
 VERSION=${VERSION:-2.31}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -101,4 +111,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/percol/README b/system/percol/README
new file mode 100644
index 0000000000..dc01b66453
--- /dev/null
+++ b/system/percol/README
@@ -0,0 +1,18 @@
+percol (interactive selection for UNIX pipes)
+
+An interactive grep tool in your terminal. Percol does the following:
+
+1. receives input lines from stdin or a file, 2. lists the input
+lines, 3. waits for your input that filters/selects the line(s),
+4. and finally outputs the selected line(s) to stdout.
+
+Since percol just filters the input and outputs the result to
+stdout, it can be used in command-chains with | in your shell (UNIX
+philosophy!).
+
+Package includes command completion for zsh, plus a /etc/percol.zsh
+script that adds extra functionality (see the comments at the top of
+the script for instructions on using it).
+
+There is no man page; run "percol --help" for a list of options, and
+read /usr/doc/percol-$VERSION/README.md for key bindings and examples.
diff --git a/system/percol/percol.SlackBuild b/system/percol/percol.SlackBuild
new file mode 100644
index 0000000000..d6ece702ef
--- /dev/null
+++ b/system/percol/percol.SlackBuild
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+# Slackware build script for percol
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=percol
+VERSION=${VERSION:-0.2.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# No native code here, no need for CFLAGS. Sadly, this can't be NOARCH
+# because it keeps python modules in /usr/lib(64)?/python3.9/...
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# this actually works with either python2 or 3, better to use 3.
+python3 setup.py install --root=$PKG
+
+# include zsh completion and script in package
+mkdir -p $PKG/usr/share/zsh/site-functions/ $PKG/etc
+cp -a tools/zsh/_percol $PKG/usr/share/zsh/site-functions/
+cat tools/zsh/percol.zsh > $PKG/etc/percol.zsh
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/percol/percol.info b/system/percol/percol.info
new file mode 100644
index 0000000000..0e758384ef
--- /dev/null
+++ b/system/percol/percol.info
@@ -0,0 +1,10 @@
+PRGNAM="percol"
+VERSION="0.2.1"
+HOMEPAGE="https://github.com/mooz/percol/"
+DOWNLOAD="https://github.com/mooz/percol/archive/v0.2.1/percol-0.2.1.tar.gz"
+MD5SUM="b00f9c6cce4e8596d50db5ae28f2510a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/percol/slack-desc b/system/percol/slack-desc
new file mode 100644
index 0000000000..8895b04d21
--- /dev/null
+++ b/system/percol/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+percol: percol (interactive selection for UNIX pipes)
+percol:
+percol: An interactive grep tool in your terminal. Percol does the following:
+percol:
+percol: 1. receives input lines from stdin or a file, 2. lists the input
+percol: lines, 3. waits for your input that filters/selects the line(s),
+percol: 4. and finally outputs the selected line(s) to stdout.
+percol:
+percol: Since percol just filters the input and outputs the result to
+percol: stdout, it can be used in command-chains with | in your shell (UNIX
+percol: philosophy!).
diff --git a/system/percona-toolkit/README b/system/percona-toolkit/README
index a547b595d5..f24fb2c504 100644
--- a/system/percona-toolkit/README
+++ b/system/percona-toolkit/README
@@ -1,6 +1,6 @@
-Percona Toolkit is a collection of advanced command-line tools used by Percona
-support staff to perform a variety of MySQL and system tasks that are too
-difficult or complex to perform manually, including:
+Percona Toolkit is a collection of advanced command-line tools used by
+Percona support staff to perform a variety of MySQL and system tasks
+that are too difficult or complex to perform manually, including:
 
 - Verify master and replica data consistency
 - Efficiently archive rows
@@ -9,5 +9,5 @@ difficult or complex to perform manually, including:
 - Analyze queries from logs and tcpdump
 - Collect vital system information when problems occur
 
-Percona Toolkit is derived from Maatkit and Aspersa, two of the best-known
-utility toolkits for MySQL server administration.
+Percona Toolkit is derived from Maatkit and Aspersa, two of the
+best-known utility toolkits for MySQL server administration.
diff --git a/system/percona-toolkit/percona-toolkit.SlackBuild b/system/percona-toolkit/percona-toolkit.SlackBuild
index b0f8727539..e322fc83a3 100644
--- a/system/percona-toolkit/percona-toolkit.SlackBuild
+++ b/system/percona-toolkit/percona-toolkit.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for percona-toolkit
 
-# Copyright 2012-2014 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2012-2022 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,24 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=percona-toolkit
-VERSION=${VERSION:-2.2.12}
+VERSION=${VERSION:-3.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH="noarch"
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -62,7 +72,7 @@ find $PKG -depth -type d -empty -exec rm -rf {} \;
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changelog COPYING INSTALL MANIFEST README \
+cp -a Changelog CONTRIBUTE.md CONTRIBUTING.md COPYING INSTALL MANIFEST README.md \
  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -70,4 +80,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/percona-toolkit/percona-toolkit.info b/system/percona-toolkit/percona-toolkit.info
index b2fc579c66..df825a14b0 100644
--- a/system/percona-toolkit/percona-toolkit.info
+++ b/system/percona-toolkit/percona-toolkit.info
@@ -1,10 +1,10 @@
 PRGNAM="percona-toolkit"
-VERSION="2.2.12"
+VERSION="3.3.1"
 HOMEPAGE="http://www.percona.com/software/percona-toolkit/"
-DOWNLOAD="http://www.percona.com/downloads/percona-toolkit/2.2.12/tarball/percona-toolkit-2.2.12.tar.gz"
-MD5SUM="7c39b06b97ebab97ae5d3c78d1186258"
+DOWNLOAD="https://downloads.percona.com/downloads/percona-toolkit/3.3.1/source/tarball/percona-toolkit-3.3.1.tar.gz"
+MD5SUM="c32521e6a43671db41cb0a9685876831"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+EMAIL="pprkut@slackbuilds.org"
diff --git a/system/percona-xtrabackup/README b/system/percona-xtrabackup/README
deleted file mode 100644
index 05cb5de107..0000000000
--- a/system/percona-xtrabackup/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Percona XtraBackup is OpenSource online (non-blockable) backup
-solution for InnoDB and XtraDB engines.
diff --git a/system/percona-xtrabackup/percona-xtrabackup.SlackBuild b/system/percona-xtrabackup/percona-xtrabackup.SlackBuild
deleted file mode 100644
index 3127baaa7c..0000000000
--- a/system/percona-xtrabackup/percona-xtrabackup.SlackBuild
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for percona-xtrabackup
-
-# Copyright 2012-2013 Heinz Wiesinger, Amsterdam, The Netherlands
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=percona-xtrabackup
-VERSION=${VERSION:-2.1.5}
-PERCONA_VERSION=${PERCONA_VERSION:-5.5.31-rel30.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-rm -rf Percona-Server-$PERCONA_VERSION
-tar xvf $PRGNAM-$VERSION/Percona-Server-$PERCONA_VERSION.tar.gz
-cd Percona-Server-$PERCONA_VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Apply xtrabackup patch
-patch -p1 -i ../$PRGNAM-$VERSION/patches/xtradb55.patch
-
-LIBS="-lrt" \
-cmake \
-  -DCMAKE_C_FLAGS="$SLKCFLAGS -I$TMP/$PRGNAM-$VERSION/src" \
-  -DCMAKE_CXX_FLAGS="$SLKCFLAGS -I$TMP/$PRGNAM-$VERSION/src" \
-  -DENABLED_LOCAL_INFILE=ON \
-  -DWITH_INNOBASE_STORAGE_ENGINE=ON \
-  -DWITH_PARTITION_STORAGE_ENGINE=ON \
-  -DWITH_ZLIB=bundled \
-  -DWITH_EXTRA_CHARSETS=all \
-  -DENABLE_DTRACE=OFF \
-  .
-
-for i in include zlib strings mysys dbug extra storage/innobase; do
-  make -C $i
-done
-
-cd $TMP/$PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# build internal libarchive
-cd src/libarchive
-  cmake \
-    -DCMAKE_C_FLAGS="$SLKCFLAGS" \
-    -DENABLE_CPIO=OFF \
-    -DENABLE_OPENSSL=OFF \
-    -DENABLE_TAR=OFF \
-    -DENABLE_TEST=OFF \
-    .
-
-  make
-cd -
-
-# build xtrabackup
-cd src
-  LIBS="-lrt" \
-  CFLAGS="$SLKCFLAGS" \
-  make \
-    MYSQL_ROOT_DIR="$TMP/Percona-Server-$PERCONA_VERSION" \
-    clean
-
-  LIBS="-lrt" \
-  CFLAGS="$SLKCFLAGS" \
-  make \
-    MYSQL_ROOT_DIR="$TMP/Percona-Server-$PERCONA_VERSION" \
-    XTRABACKUP_VERSION=$VERSION \
-    xtradb55
-cd -
-
-mkdir -p $PKG/usr/{bin,man/man1}
-install -m 755 src/xtrabackup_55 $PKG/usr/bin/xtrabackup
-install -m 755 src/xbstream $PKG/usr/bin/
-install -m 755 src/xbcrypt $PKG/usr/bin/
-install -m 755 innobackupex $PKG/usr/bin/
-install -m 644 doc/xtrabackup.1 $PKG/usr/man/man1/
-
-# Fix xtrabackup usage in innobackupex
-sed -i "s/xtrabackup_55/xtrabackup/g" $PKG/usr/bin/innobackupex
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a BUILD.txt COPYING REVNO VERSION \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/percona-xtrabackup/percona-xtrabackup.info b/system/percona-xtrabackup/percona-xtrabackup.info
deleted file mode 100644
index e2b8be656b..0000000000
--- a/system/percona-xtrabackup/percona-xtrabackup.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="percona-xtrabackup"
-VERSION="2.1.5"
-HOMEPAGE="http://www.percona.com/software/percona-xtrabackup"
-DOWNLOAD="http://www.percona.com/downloads/XtraBackup/XtraBackup-2.1.5/source/percona-xtrabackup-2.1.5.tar.gz"
-MD5SUM="8782d736ecf7f0a702a8c053c4f9cdb8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
diff --git a/system/percona-xtrabackup/slack-desc b/system/percona-xtrabackup/slack-desc
deleted file mode 100644
index 4ed2d118e3..0000000000
--- a/system/percona-xtrabackup/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-                  |-----handy-ruler------------------------------------------------------|
-percona-xtrabackup: percona-xtrabackup (Online backup for MySQL / InnoDB)
-percona-xtrabackup:
-percona-xtrabackup: Percona XtraBackup is OpenSource online (non-blockable) backup
-percona-xtrabackup: solution for InnoDB and XtraDB engines.
-percona-xtrabackup:
-percona-xtrabackup: Homepage: http://www.percona.com/software/percona-xtrabackup
-percona-xtrabackup:
-percona-xtrabackup:
-percona-xtrabackup:
-percona-xtrabackup:
-percona-xtrabackup:
diff --git a/system/pev/pev.SlackBuild b/system/pev/pev.SlackBuild
index 0987d7a8d1..c6c1554c4f 100644
--- a/system/pev/pev.SlackBuild
+++ b/system/pev/pev.SlackBuild
@@ -1,28 +1,38 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pev (http://pev.sourceforge.net/)
 # Written by Diogo Leal (diogo@diogoleal.com)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pev
 VERSION=${VERSION:-0.40}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -67,4 +77,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pgadmin3/README b/system/pgadmin3/README
deleted file mode 100644
index 9d72a74a55..0000000000
--- a/system/pgadmin3/README
+++ /dev/null
@@ -1,17 +0,0 @@
-pgAdmin III is the most popular and feature rich Open Source
-administration and development platform for PostgreSQL, the most
-advanced Open Source database in the world. The application may be used
-on Linux, FreeBSD Solaris, Mac OSX and Windows platforms to manage
-PostgreSQL 7.3 and above running on any platform, as well as commercial
-versions of PostgreSQL such as Mammoth PostgreSQL, EnterpriseDB Postgres
-Plus Advanced Server, Greenplum Database and Bizgres.
-
-pgAdmin III is designed to answer the needs of all users, from writing
-simple SQL queries to developing complex databases. The graphical
-interface supports all PostgreSQL features and makes administration
-easy. The application also includes a syntax highlighting SQL editor, a
-server-side code editor, an SQL/batch/shell job scheduling agent,
-support for the Slony-I replication engine and much more. Server
-connection may be made using TCP/IP or Unix Domain Sockets (on *nix
-platforms), and may be SSL encrypted for security. No additional drivers
-are required to communicate with the database server.
diff --git a/system/pgadmin3/doinst.sh b/system/pgadmin3/doinst.sh
deleted file mode 100644
index 4e8ba7071d..0000000000
--- a/system/pgadmin3/doinst.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/system/pgadmin3/pgadmin3.SlackBuild b/system/pgadmin3/pgadmin3.SlackBuild
deleted file mode 100644
index 82af2f2f23..0000000000
--- a/system/pgadmin3/pgadmin3.SlackBuild
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for pgAdmin
-# Written by Iskar Enev (<iskar.enev[@]gmail.com>)
-# Modified by slakmagik <slakmagik@gmail.com>
-# Modified by Mario Preksavec <mario@slackware.hr>
-
-PRGNAM=pgadmin3
-VERSION=${VERSION:-1.22.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
-
-make
-make DESTDIR=$PKG install
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# add the range of pgAdmin3 images - only one can be used in the desktop file
-# but the default might not be the one people would want
-mkdir -p $PKG/usr/share/pixmaps
-cp -a pgadmin/include/images/pgAdmin3* $PKG/usr/share/pixmaps
-
-mkdir -p  $PKG/usr/share/applications
-sed '/^Icon=/s/pgadmin3/pixmaps/' \
-  pkg/pgadmin3.desktop > $PKG/usr/share/applications/pgadmin3.desktop
-
-# as with so many packages, --docdir is present but ignored
-mkdir -p $PKG/usr/doc
-ln -s ../share/pgadmin3/docs $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a BUGS CHANGELOG DEVELOPERS INSTALL LICENSE README TODO $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/pgadmin3/pgadmin3.info b/system/pgadmin3/pgadmin3.info
deleted file mode 100644
index a343ce71d7..0000000000
--- a/system/pgadmin3/pgadmin3.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="pgadmin3"
-VERSION="1.22.1"
-HOMEPAGE="https://www.pgadmin.org/"
-DOWNLOAD="https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v1.22.1/src/pgadmin3-1.22.1.tar.gz"
-MD5SUM="fe56418e9efcd291f5c1f81708d005fe"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="postgresql wxPython"
-MAINTAINER="slakmagik"
-EMAIL="slakmagik@gmail.com"
diff --git a/system/pgadmin3/slack-desc b/system/pgadmin3/slack-desc
deleted file mode 100644
index 050de331af..0000000000
--- a/system/pgadmin3/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-        |-----handy-ruler------------------------------------------------------|
-pgadmin3: pgadmin3 (PostgreSQL design and management interface)
-pgadmin3:
-pgadmin3: pgAdmin III is the most popular and feature rich Open Source
-pgadmin3: administration and development platform for PostgreSQL, the most
-pgadmin3: advanced Open Source database in the world.
-pgadmin3:
-pgadmin3:
-pgadmin3:
-pgadmin3:
-pgadmin3:
-pgadmin3:
diff --git a/system/pgbadger/pgbadger.SlackBuild b/system/pgbadger/pgbadger.SlackBuild
index 78aa537472..c2044c7148 100644
--- a/system/pgbadger/pgbadger.SlackBuild
+++ b/system/pgbadger/pgbadger.SlackBuild
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pgbadger
 
+# Copyright 2022 Yth | Pont-en-Royans, France | yth@ythogtha.org
 # Copyright 2013-2017 Audrius Kažukauskas <audrius@neutrino.lt>
 # All rights reserved.
 #
@@ -22,14 +23,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pgbadger
-VERSION=${VERSION:-9.2}
+VERSION=${VERSION:-12.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,4 +83,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pgbadger/pgbadger.info b/system/pgbadger/pgbadger.info
index e065086207..8fa6b7cca2 100644
--- a/system/pgbadger/pgbadger.info
+++ b/system/pgbadger/pgbadger.info
@@ -1,10 +1,10 @@
 PRGNAM="pgbadger"
-VERSION="9.2"
-HOMEPAGE="https://dalibo.github.io/pgbadger/"
-DOWNLOAD="https://github.com/dalibo/pgbadger/archive/v9.2/pgbadger-9.2.tar.gz"
-MD5SUM="89d133cecb2ecb9cf9be31d415933151"
+VERSION="12.4"
+HOMEPAGE="https://pgbadger.darold.net/"
+DOWNLOAD="https://github.com/darold/pgbadger/archive/v12.4/pgbadger-12.4.tar.gz"
+MD5SUM="d09facc144818b98904d7d95a7a2b7df"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Audrius Kažukauskas"
-EMAIL="audrius@neutrino.lt"
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/system/pgbadger/slack-desc b/system/pgbadger/slack-desc
index 6d1aa12269..e9dc9a278a 100644
--- a/system/pgbadger/slack-desc
+++ b/system/pgbadger/slack-desc
@@ -14,6 +14,6 @@ pgbadger: pgBadger is able to autodetect log file format (syslog, stderr or
 pgbadger: csvlog).  It is designed to parse huge log files as well as gzip
 pgbadger: compressed files.
 pgbadger:
-pgbadger: Homepage: https://dalibo.github.io/pgbadger/
+pgbadger:
 pgbadger:
 pgbadger:
diff --git a/system/pgsanity/pgsanity.SlackBuild b/system/pgsanity/pgsanity.SlackBuild
index f87a75db4e..d5cf99e8ac 100644
--- a/system/pgsanity/pgsanity.SlackBuild
+++ b/system/pgsanity/pgsanity.SlackBuild
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pgsanity
 
+# Copyright 2022 Yth | Pont-en-Royans, France | yth@ythogtha.org
 # Copyright 2014-2017 Audrius Kažukauskas <audrius@neutrino.lt>
 # All rights reserved.
 #
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pgsanity
-VERSION=${VERSION:-0.2.8}
+VERSION=${VERSION:-0.2.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,7 +66,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
@@ -65,4 +76,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pgsanity/pgsanity.info b/system/pgsanity/pgsanity.info
index 1195208049..60a22da011 100644
--- a/system/pgsanity/pgsanity.info
+++ b/system/pgsanity/pgsanity.info
@@ -1,10 +1,10 @@
 PRGNAM="pgsanity"
-VERSION="0.2.8"
+VERSION="0.2.9"
 HOMEPAGE="https://github.com/markdrago/pgsanity"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pgsanity/pgsanity-0.2.8.tar.gz"
-MD5SUM="3378c2ec677bd0efc4b69ce395a9bd9f"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pgsanity/pgsanity-0.2.9.tar.gz"
+MD5SUM="6ac9b910b867c1a40e003f0939cfda88"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="postgresql"
-MAINTAINER="Audrius Kažukauskas"
-EMAIL="audrius@neutrino.lt"
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/system/ph/ph.SlackBuild b/system/ph/ph.SlackBuild
index 5d2ffe6077..3e87a71323 100644
--- a/system/ph/ph.SlackBuild
+++ b/system/ph/ph.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ph
 #
@@ -22,13 +22,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ph
 VERSION=${VERSION:-1.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -76,4 +86,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ph/ph.info b/system/ph/ph.info
index 25ee1ce7fc..38611bb13c 100644
--- a/system/ph/ph.info
+++ b/system/ph/ph.info
@@ -1,10 +1,10 @@
 PRGNAM="ph"
 VERSION="1.1.0"
 HOMEPAGE="http://tty1.uk/slackbuilds/noversion/ph"
-DOWNLOAD="http://git.tty1.uk/cgit.cgi/ph/snapshot/ph-1.1.0.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/ph-1.1.0.tar.gz"
 MD5SUM="916cad4a723485a54d4213e5dc46ad7f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dave Woodfall"
+MAINTAINER="D Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/system/phoronix-test-suite/phoronix-test-suite.SlackBuild b/system/phoronix-test-suite/phoronix-test-suite.SlackBuild
index c9d4e8de56..e2e4194d5f 100644
--- a/system/phoronix-test-suite/phoronix-test-suite.SlackBuild
+++ b/system/phoronix-test-suite/phoronix-test-suite.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for phoronix-test-suite
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=phoronix-test-suite
-VERSION=${VERSION:-10.2.0}
+VERSION=${VERSION:-10.8.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -100,4 +110,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/phoronix-test-suite/phoronix-test-suite.info b/system/phoronix-test-suite/phoronix-test-suite.info
index 4f8593abe5..853dfa357a 100644
--- a/system/phoronix-test-suite/phoronix-test-suite.info
+++ b/system/phoronix-test-suite/phoronix-test-suite.info
@@ -1,8 +1,8 @@
 PRGNAM="phoronix-test-suite"
-VERSION="10.2.1"
+VERSION="10.8.4"
 HOMEPAGE="https://phoronix-test-suite.com/"
-DOWNLOAD="https://www.phoronix-test-suite.com/releases/phoronix-test-suite-10.2.1.tar.gz"
-MD5SUM="f645421636791f09678686796f936bae"
+DOWNLOAD="https://www.phoronix-test-suite.com/releases/phoronix-test-suite-10.8.4.tar.gz"
+MD5SUM="0f12bef264d14bc80a2e43463141aab4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/phpsysinfo/README b/system/phpsysinfo/README
index 5edd3bb20d..c3acd80c12 100644
--- a/system/phpsysinfo/README
+++ b/system/phpsysinfo/README
@@ -1 +1,2 @@
-A customizable PHP script that displays information about your system nicely.
+A customizable PHP script that displays information about your system
+nicely.
diff --git a/system/phpsysinfo/phpsysinfo.SlackBuild b/system/phpsysinfo/phpsysinfo.SlackBuild
index c40bce188c..55e88c9477 100644
--- a/system/phpsysinfo/phpsysinfo.SlackBuild
+++ b/system/phpsysinfo/phpsysinfo.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for phpsysinfo
 
@@ -22,16 +22,26 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=phpsysinfo
 VERSION=${VERSION:-3.2.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
 DOCROOT=${DOCROOT:-/srv/httpd/htdocs}
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,4 +77,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 sed -e"s|@PATH@|$(echo $DOCROOT | cut -c2-)/$PRGNAM/$PRGNAM.ini.new|" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/physlock/physlock.SlackBuild b/system/physlock/physlock.SlackBuild
index a5084e762d..6c1def3c67 100644
--- a/system/physlock/physlock.SlackBuild
+++ b/system/physlock/physlock.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for physlock
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=physlock
 VERSION=${VERSION:-0.4.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -91,4 +101,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/physlock/physlock.info b/system/physlock/physlock.info
index 2b1e647b51..3cc7276be5 100644
--- a/system/physlock/physlock.info
+++ b/system/physlock/physlock.info
@@ -1,7 +1,7 @@
 PRGNAM="physlock"
 VERSION="0.4.5"
 HOMEPAGE="https://github.com/muennich/physlock"
-DOWNLOAD="https://github.com/muennich/physlock/archive/v0.4.5.tar.gz"
+DOWNLOAD="https://github.com/muennich/physlock/archive/v0.4.5/physlock-0.4.5.tar.gz"
 MD5SUM="5b39391638375c680599779aeee65569"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/picocom/README b/system/picocom/README
index 83703c03cd..a65e7aa771 100644
--- a/system/picocom/README
+++ b/system/picocom/README
@@ -1,21 +1,21 @@
-picocom is a minimal dumb-terminal emulation program.  It is, in principle,
-very much like minicom, only it's pico instead of mini!
+picocom is a minimal dumb-terminal emulation program. It is, in
+principle, very much like minicom, only it's pico instead of mini!
 
-Picocom was designed to serve as a simple, manual, modem configuration,
-testing, and debugging tool.  It has also served (quite well) as a low-tech
-"terminal-window" to allow operator
- intervention in PPP connection scripts (something like the ms-windows
- "open terminal window before / after dialing" feature).
-It could also prove useful in many other similar tasks.
+Picocom was designed to serve as a simple, manual, modem
+configuration, testing, and debugging tool. It has also served (quite
+well) as a low-tech "terminal-window" to allow operator intervention
+in PPP connection scripts (something like the ms-windows "open
+terminal window before / after dialing" feature). It could also prove
+useful in many other similar tasks.
 
-Picocom is ideal for embedded systems since its memory footprint is minimal
-(less than 20K, when stripped).
+Picocom is ideal for embedded systems since its memory footprint is
+minimal (less than 20K, when stripped).
 
-Apart from being a handy little tool, picocom source distribution includes
-a simple, easy to use, and thoroughly documented
- terminal-management library, which could serve other projects as well.
-This library hides the termios(3) calls, and provides a less complex and
-safer (though certainly less feature-rich) interface.
+Apart from being a handy little tool, the picocom source
+distribution includes a simple, easy to use, and thoroughly documented
+terminal-management library, which could serve other projects as well.
+This library hides the termios(3) calls, and provides a less complex
+and safer (though certainly less feature-rich) interface.
 
 Picocom runs on Linux, and with minor modifications it could run on any
 Unix system with the termios(3) library.
diff --git a/system/picocom/picocom.SlackBuild b/system/picocom/picocom.SlackBuild
index c244029193..87889ef4bb 100644
--- a/system/picocom/picocom.SlackBuild
+++ b/system/picocom/picocom.SlackBuild
@@ -1,14 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for picocom
 
 # Written by Asaf, Lingnu.com (asaf@lingnu.com)
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=picocom
 VERSION=${VERSION:-3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -18,7 +21,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,4 +79,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pigz/README b/system/pigz/README
index 9ffe321dfa..75fea952ad 100644
--- a/system/pigz/README
+++ b/system/pigz/README
@@ -1,4 +1,6 @@
-pigz, which stands for Parallel Implementation of GZip, is a fully functional
-replacement for gzip that utilizes multiple processors and CPU cores when
-compressing data. pigz was written by Mark Adler, and uses zlib and pthread
-libraries.
+pigz (Parallel Implementation of GZip)
+
+pigz, which stands for Parallel Implementation of GZip, is a fully
+functional replacement for gzip that utilizes multiple processors and
+CPU cores when compressing data. pigz was written by Mark Adler, and
+uses zlib and pthread libraries.
diff --git a/system/pigz/pigz.SlackBuild b/system/pigz/pigz.SlackBuild
index 6668f4c69b..0c835d5b30 100644
--- a/system/pigz/pigz.SlackBuild
+++ b/system/pigz/pigz.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pigz
 
@@ -26,10 +26,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220212 bkw: Modified by SlackBuilds.org: updated for v2.7.
+# Note: it looks like upstream removes the old source tarballs from their
+# site when they release a new version. So I hosted the source elsewhere.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pigz
-VERSION=${VERSION:-2.4}
+VERSION=${VERSION:-2.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -39,7 +46,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,25 +80,22 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # append our SLKCFLAGS to CFLAGS in the Makefile:
 sed -i "/^CFLAGS=/s/$/\ $SLKCFLAGS/" Makefile
 make
 
-install -D -m 0755 pigz $PKG/usr/bin/pigz
+install -D -s -m 0755 pigz $PKG/usr/bin/pigz
+install -D -s -m 0755 pigz $PKG/usr/bin/pigz
 install -D -m 0644 pigz.1 $PKG/usr/man/man1/pigz.1
+gzip $PKG/usr/man/man*/*
+
 # don't install pigz binary as unpigz, make a symlink instead:
 ( cd $PKG/usr/bin ; ln -sf pigz unpigz )
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README pigz.pdf $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -96,4 +104,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pigz/pigz.info b/system/pigz/pigz.info
index 6734070493..1a6852fae7 100644
--- a/system/pigz/pigz.info
+++ b/system/pigz/pigz.info
@@ -1,8 +1,8 @@
 PRGNAM="pigz"
-VERSION="2.4"
+VERSION="2.7"
 HOMEPAGE="https://www.zlib.net/pigz/"
-DOWNLOAD="https://www.zlib.net/pigz/pigz-2.4.tar.gz"
-MD5SUM="def2f6e19d9d8231445adc1349d346df"
+DOWNLOAD="https://slackware.uk/~urchlay/src/pigz-2.7.tar.gz"
+MD5SUM="2d084221ba829d29f344305845a313f3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/pipemeter/README b/system/pipemeter/README
index 1173296b8b..14e4b22829 100644
--- a/system/pipemeter/README
+++ b/system/pipemeter/README
@@ -1 +1,4 @@
-pipemeter copies its input to output with progress bar and/or speed indicator.
+pipemeter (I/O pipe with progress and speed indicators)
+
+pipemeter copies its standard input to its standard output with a
+progress bar and/or speed indicator.
diff --git a/system/pipemeter/pipemeter.SlackBuild b/system/pipemeter/pipemeter.SlackBuild
index c030d95b10..b315b57767 100644
--- a/system/pipemeter/pipemeter.SlackBuild
+++ b/system/pipemeter/pipemeter.SlackBuild
@@ -1,15 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pipemeter
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20221228 bkw: BUILD=2, fix bad man page permissions.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pipemeter
-VERSION=${VERSION:-1.1.3}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.1.5}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +24,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -41,13 +50,10 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wl,-s" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
@@ -56,13 +62,11 @@ CFLAGS="$SLKCFLAGS" \
 
 make
 
-# 'make install' doesn't create these for us:
-mkdir -p $PKG/usr/bin $PKG/usr/man/man1
-# ...but it does strip the pipemeter binary.
-make install PREFIX=$PKG/usr
+make install DESTDIR=$PKG
 
-cp pipecp $PKG/usr/bin
-gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+cp -a pipecp $PKG/usr/bin
+chmod 644 $PKG/usr/man/man?/*.?
+gzip -9 $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp README LICENSE Changelog $PKG/usr/doc/$PRGNAM-$VERSION
@@ -72,4 +76,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pipemeter/pipemeter.info b/system/pipemeter/pipemeter.info
index f0269a1e60..544032a5ae 100644
--- a/system/pipemeter/pipemeter.info
+++ b/system/pipemeter/pipemeter.info
@@ -1,10 +1,10 @@
 PRGNAM="pipemeter"
-VERSION="1.1.3"
-HOMEPAGE="http://spamaps.org/pipemeter.php"
-DOWNLOAD="http://spamaps.org/files/pipemeter/pipemeter-1.1.3.tar.gz"
-MD5SUM="55cf189d3d1de92bbc2bc7d3396e20b1"
+VERSION="1.1.5"
+HOMEPAGE="https://launchpad.net/pipemeter"
+DOWNLOAD="https://launchpad.net/pipemeter/trunk/1.1.5/+download/pipemeter-1.1.5.tar.gz"
+MD5SUM="3900d8a848eaed2e9f5bfd6af0491173"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/pipemeter/slack-desc b/system/pipemeter/slack-desc
index fd67d919dc..24af4102be 100644
--- a/system/pipemeter/slack-desc
+++ b/system/pipemeter/slack-desc
@@ -8,8 +8,8 @@
          |-----handy-ruler------------------------------------------------------|
 pipemeter: pipemeter (I/O pipe with progress and speed indicators)
 pipemeter:
-pipemeter: pipemeter copies its input to output with progress bar and/or speed
-pipemeter: indicators.
+pipemeter: pipemeter copies its standard input to its standard output with a
+pipemeter: progress bar and/or speed indicator.
 pipemeter:
 pipemeter:
 pipemeter:
diff --git a/system/piper/README b/system/piper/README
new file mode 100644
index 0000000000..e0c95a70af
--- /dev/null
+++ b/system/piper/README
@@ -0,0 +1,6 @@
+Piper is a GTK+ application to configure gaming mice. Piper is merely
+a graphical frontend to the ratbagd DBus daemon.
+
+This SlackBuild disables build tests by default. To enable build tests
+(flake8 additionally required), pass TESTS=yes to the SlackBuild:
+TESTS=yes ./piper.SlackBuild
diff --git a/system/piper/doinst.sh b/system/piper/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/system/piper/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/piper/piper.SlackBuild b/system/piper/piper.SlackBuild
new file mode 100644
index 0000000000..fdf25ee439
--- /dev/null
+++ b/system/piper/piper.SlackBuild
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+# Slackware build script for piper
+
+# Copyright 2021-2022 Isaac Yu <isaacyu@protonmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# 20220426 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - add doinst.sh, since we have .desktop and /usr/share/icons.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=piper
+VERSION=${VERSION:-0.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# Enable or disable tests
+if [ ${TESTS:-no} = yes ]; then
+	ENABLE_TESTS=true
+else
+	ENABLE_TESTS=false
+fi
+
+mkdir -p build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --prefix /usr \
+    --mandir /usr/man \
+    --libdir /usr/lib${LIBDIRSUFFIX} \
+    -Dtests=$ENABLE_TESTS
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+# Compress man files
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/piper/piper.info b/system/piper/piper.info
new file mode 100644
index 0000000000..4585b657b4
--- /dev/null
+++ b/system/piper/piper.info
@@ -0,0 +1,10 @@
+PRGNAM="piper"
+VERSION="0.7"
+HOMEPAGE="https://github.com/libratbag/piper"
+DOWNLOAD="https://github.com/libratbag/piper/archive/0.7/piper-0.7.tar.gz"
+MD5SUM="110c9cd1097d96ce9f6eeb0cd036e1b6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libratbag python3-lxml"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/piper/slack-desc b/system/piper/slack-desc
new file mode 100644
index 0000000000..8563ef5024
--- /dev/null
+++ b/system/piper/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+piper: piper (configure gaming mice)
+piper:
+piper: Piper is a GTK+ application to configure gaming mice. Piper is merely
+piper: a graphical frontend to the ratbagd DBus daemon.
+piper:
+piper:
+piper:
+piper:
+piper:
+piper:
+piper:
diff --git a/system/pis/README b/system/pis/README
new file mode 100644
index 0000000000..af0a751aca
--- /dev/null
+++ b/system/pis/README
@@ -0,0 +1,44 @@
+Slackware Post-Install Scripts (PIS)
+
+'Let the Slackers be a little bit lazy. ;)'
+
+Slackware Post-Installation Scripts (PIS) are a set of shell scripts
+for automating the most tedious Slackware version 15.0 post-
+installation configuration tasks. With PIS you can: set system locale
+(language, country and character encoding); configure login mode (GUI
+or CLI); add new users and set the 'sudo' admin support; set 'Huge'
+and 'Generic' kernels to boot manager; configure different package
+managers; and more!
+
+Important Notes
+===============
+
+To perform the system settings, PIS scripts will modify some
+important system files by using command line tools, such as the stream
+editor 'sed', so bypassing the use of the conventional tools.
+
+So, if you want to feel more secure in using the PIS scripts, it would
+be interesting to back up the following files, in case you need to
+restore manually the respective settings:
+
+ * To set the system locale (language and country):
+   /etc/profile.d/lang.sh
+   /etc/profile.d/lang.csh
+
+ * To set the command line keymap (keyboard character encoding):
+   /etc/rc.d/rc.keymap
+  
+ * To select the login mode (GUI or CLI):
+   /etc/inittab
+
+ * To add different kernels types/versions to boot manager Elilo:
+   /boot/efi/EFI/Slackware/elilo.conf
+ 
+ * To enable the administrative group 'wheel':
+   /etc/sudoers
+ 
+ * To set the default desktop/window manager for the X environment:
+   /etc/X11/xinit/xinitrc
+
+ * To set the main mirror of the slackpkg package manager:
+   /etc/slackpkg/mirrors
diff --git a/system/pis/pis.SlackBuild b/system/pis/pis.SlackBuild
new file mode 100644
index 0000000000..2e970d50bb
--- /dev/null
+++ b/system/pis/pis.SlackBuild
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+# Slackware build script for pis
+# Copyright 2023 Guilherme Esmeraldo - Crato/CE - Brazil
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=pis
+VERSION=${VERSION:-0.2}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar zxvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+chmod 755 pis*
+chmod 644 manpage/$PRGNAM.1 doc/README
+
+mkdir -p $PKG/sbin
+cp pis* $PKG/sbin
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp doc/README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/usr/man/man1
+gzip -9 -c manpage/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pis/pis.info b/system/pis/pis.info
new file mode 100644
index 0000000000..fe156f23d3
--- /dev/null
+++ b/system/pis/pis.info
@@ -0,0 +1,10 @@
+PRGNAM="pis"
+VERSION="0.2"
+HOMEPAGE="https://slackscripts.com/"
+DOWNLOAD="https://slackscripts.com/archives/pis-0.2.tar.gz"
+MD5SUM="fc33ac35f1d3b4c4e65364776657242b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Guilherme Esmeraldo"
+EMAIL="guilherme@slackscripts.com"
diff --git a/system/pis/slack-desc b/system/pis/slack-desc
new file mode 100644
index 0000000000..7fca741422
--- /dev/null
+++ b/system/pis/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+pis: pis (Slackware Post-Install Scripts)
+pis:
+pis: Slackware Post-Installation Scripts (PIS) are a set of shell scripts
+pis: for automating the most tedious Slackware version 15.0 post-install 
+pis: configuration tasks.
+pis:
+pis:         'Let the Slackers be a little bit lazy. ;)'
+pis:
+pis: Copyright (c) 2022 Guilherme Esmeraldo <http://www.slackscripts.com>
+pis: License GPLv3+ <https://gnu.org/licenses/gpl.html>             
+pis:
diff --git a/system/pixma/05_ipp.diff b/system/pixma/05_ipp.diff
new file mode 100644
index 0000000000..2919a3fa40
--- /dev/null
+++ b/system/pixma/05_ipp.diff
@@ -0,0 +1,124 @@
+--- cngpij/cngpij/bjcups.c.orig	2013-07-17 11:33:45.000000000 +1000
++++ cngpij/cngpij/bjcups.c	2022-03-06 11:35:54.874000000 +1000
+@@ -698,8 +698,8 @@
+ 	else {
+ 		pRequest = ippNew();
+ 		
+-		pRequest->request.op.operation_id = CUPS_GET_PRINTERS;
+-		pRequest->request.op.request_id   = 1;
++		ippSetOperation(pRequest, CUPS_GET_PRINTERS);
++		ippSetRequestId(pRequest, 1);
+ 		
+ 		pLanguage = bjcupsLangDefault();	// cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
+ 		
+@@ -708,29 +708,29 @@
+ 		ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, NULL);
+ 		
+ 		if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
+-			if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {
++			if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
+ 				fputs("ERROR: IPP ERROR\n", stderr);
+ 				goto onErr;
+ 			}
+ 			else {
+-				pAttribute = pResponse->attrs;
++				pAttribute = ippFirstAttribute(pResponse);
+ 
+ 				while (pAttribute != NULL) {
+-					while (pAttribute != NULL && pAttribute->group_tag != IPP_TAG_PRINTER) {
+-						pAttribute = pAttribute->next;
++					while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) {
++						pAttribute = ippNextAttribute(pResponse);
+ 					}
+ 					if (pAttribute == NULL) {
+ 						break;
+ 					}
+ 					
+-					while (pAttribute != NULL && pAttribute->group_tag == IPP_TAG_PRINTER) {
+-						if (strcmp(pAttribute->name, "printer-name") == 0 && pAttribute->value_tag == IPP_TAG_NAME) {
+-							pPrinter = pAttribute->values[0].string.text;
++					while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_PRINTER) {
++						if (strcmp(ippGetName(pAttribute), "printer-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) {
++							pPrinter = ippGetString(pAttribute, 0, NULL);
+ 						}
+-						if (strcmp(pAttribute->name, "device-uri") == 0 && pAttribute->value_tag == IPP_TAG_URI) {
+-							pDUri = pAttribute->values[0].string.text;
++						if (strcmp(ippGetName(pAttribute), "device-uri") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_URI) {
++							pDUri = ippGetString(pAttribute, 0, NULL);
+ 						}
+-						pAttribute = pAttribute->next;
++						pAttribute = ippNextAttribute(pResponse);
+ 					}
+ 
+ 					if (strcasecmp(pDestName, pPrinter) == 0) {
+@@ -739,7 +739,7 @@
+ 					}
+ 					
+ 					if (pAttribute != NULL)
+-						 pAttribute = pAttribute->next;
++						pAttribute = ippNextAttribute(pResponse);
+ 				}
+ 			}
+ 			
+--- cngpijmnt/src/main.c.orig	2022-03-06 11:44:22.748000000 +1000
++++ cngpijmnt/src/main.c	2022-03-06 12:01:18.331000000 +1000
+@@ -322,8 +322,8 @@
+ 	else {
+ 		pRequest = ippNew();
+ 		
+-		pRequest->request.op.operation_id = CUPS_GET_PRINTERS;
+-		pRequest->request.op.request_id   = 1;
++		ippSetOperation(pRequest, CUPS_GET_PRINTERS);
++		ippSetRequestId(pRequest, 1);
+ 		
+ 		pLanguage = bjcupsLangDefault();	// cupsLangDefault() -> bjcupsLangDefault() for cups-1.1.19
+ 		
+@@ -332,29 +332,29 @@
+ 		ippAddString(pRequest, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, NULL);
+ 		
+ 		if ((pResponse = cupsDoRequest(pHTTP, pRequest, "/")) != NULL) {
+-			if (pResponse->request.status.status_code > IPP_OK_CONFLICT) {
++			if (ippGetStatusCode(pResponse) > IPP_OK_CONFLICT) {
+ 				fputs("ERROR: IPP ERROR\n", stderr);
+ 				goto onErr;
+ 			}
+ 			else {
+-				pAttribute = pResponse->attrs;
++				pAttribute = ippFirstAttribute(pResponse);
+ 
+ 				while (pAttribute != NULL) {
+-					while (pAttribute != NULL && pAttribute->group_tag != IPP_TAG_PRINTER) {
+-						pAttribute = pAttribute->next;
++					while (pAttribute != NULL && ippGetGroupTag(pAttribute) != IPP_TAG_PRINTER) {
++						pAttribute = ippNextAttribute(pResponse);
+ 					}
+ 					if (pAttribute == NULL) {
+ 						break;
+ 					}
+ 					
+-					while (pAttribute != NULL && pAttribute->group_tag == IPP_TAG_PRINTER) {
+-						if (strcmp(pAttribute->name, "printer-name") == 0 && pAttribute->value_tag == IPP_TAG_NAME) {
+-							pPrinter = pAttribute->values[0].string.text;
++					while (pAttribute != NULL && ippGetGroupTag(pAttribute) == IPP_TAG_PRINTER) {
++						if (strcmp(ippGetName(pAttribute), "printer-name") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_NAME) {
++							pPrinter = ippGetString(pAttribute, 0, NULL);
+ 						}
+-						if (strcmp(pAttribute->name, "device-uri") == 0 && pAttribute->value_tag == IPP_TAG_URI) {
+-							pDUri = pAttribute->values[0].string.text;
++						if (strcmp(ippGetName(pAttribute), "device-uri") == 0 && ippGetValueTag(pAttribute) == IPP_TAG_URI) {
++							pDUri = ippGetString(pAttribute, 0, NULL);
+ 						}
+-						pAttribute = pAttribute->next;
++						pAttribute = ippNextAttribute(pResponse);
+ 					}
+ 
+ 					if (strcasecmp(pDestName, pPrinter) == 0) {
+@@ -363,7 +363,7 @@
+ 					}
+ 					
+ 					if (pAttribute != NULL)
+-						 pAttribute = pAttribute->next;
++						pAttribute = ippNextAttribute(pResponse);
+ 				}
+ 			}
+ 			
diff --git a/system/pixma/README b/system/pixma/README
index ae3198c72d..17fffd8988 100644
--- a/system/pixma/README
+++ b/system/pixma/README
@@ -1,30 +1,30 @@
 Driver & PPD files for Canon PIXMA printers.
 
-By default, this SlackBuild supports all the following Canon PIXMA printer
-families:
-	cnijfilter-mg2500-429
-	cnijfilter-mg2400-428
-	cnijfilter-mg3500-427
-	cnijfilter-mg5500-426
-	cnijfilter-mg6400-425
-	cnijfilter-mg6500-424
-	cnijfilter-mg7100-423
-	cnijfilter-p200-430
-
-Support for only certain printers may be built by specifying one/some of the
-listed printer families in the MODELS environment variable.
+By default, this SlackBuild supports all the following Canon PIXMA
+printer families:
+   cnijfilter-mg2500-429
+   cnijfilter-mg2400-428
+   cnijfilter-mg3500-427
+   cnijfilter-mg5500-426
+   cnijfilter-mg6400-425
+   cnijfilter-mg6500-424
+   cnijfilter-mg7100-423
+   cnijfilter-p200-430
+
+Support for only certain printers may be built by specifying one/some
+of the listed printer families in the MODELS environment variable.
 
 For example to support only the MG2522 printer, run:
     MODELS="cnijfilter-mg2500-429" sh pixma.SlackBuild
 
 To support both the MG2522 and MG7164 printers, run:
-    MODELS="cnijfilter-mg2500-429 cnijfilter-mg7100-423" sh pixma.SlackBuild
+    MODELS="cnijfilter-mg2500-429 cnijfilter-mg7100-423" \
+    sh pixma.SlackBuild
 
 To support all available printers, don't specify any MODELS; just run:
     sh pixma.SlackBuild
 
-
-NB. see also SBo system/cnijfilter2 SlackBuild for support of related Canon
-printers. It supports MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300,
-iB4000, MB5000, MB5300, iP110, E450, MX490 and E480 series.
-
+NB. see also SBo system/cnijfilter2 SlackBuild for support of related
+Canon printers. It supports MG7500, MG6700, MG6600, MG5600, MG2900,
+MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490 and E480
+series.
diff --git a/system/pixma/pixma.SlackBuild b/system/pixma/pixma.SlackBuild
index 1770fffead..48e3ed14fa 100644
--- a/system/pixma/pixma.SlackBuild
+++ b/system/pixma/pixma.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pixma
 
-# Copyright 2019 Christoph Willing  Brisbane, Australia
+# Copyright 2019-2022 Christoph Willing  Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230515 bkw: Modified by SlackBuilds.org, BUILD=4:
+# revert PKG= to template, fix permissions in doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pixma
 VERSION=${VERSION:-4.00.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=cnijfilter-source
 SRCVERSION=${SRCVERSION:-4.00-1}
@@ -38,23 +44,32 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$SRCNAM
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
+  BUILD_LIBDIRSUFFIX=32
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
+  BUILD_LIBDIRSUFFIX=32
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+  BUILD_LIBDIRSUFFIX=64
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
+  echo "$ARCH not supported"
+  exit 1
 fi
 
 PRINTER_PKG_PROGRAM="ppd cnijfilter"
@@ -83,10 +98,14 @@ cd $SRCNAM-$SRCVERSION
 patch -p0 < $CWD/00_IPP_PRIVATE_STRUCTURES.diff
 patch -p0 < $CWD/04_ppd_h.diff
 
+# SL15.0
+patch -p0 < $CWD/05_ipp.diff
+sed -i -e "/sys\/sysctl.h/d" cnijnpr/src/cnijnpr.c
+
 # Correct cups directory location
-sed -i -e "s/lib\/cups/lib$LIBDIRSUFFIX\/cups/" cnijbe/src/Makefile.am
-sed -i -e "s/lib\/cups/lib$LIBDIRSUFFIX\/cups/" backend/src/Makefile.am
-sed -i -e "s/lib\/cups/lib$LIBDIRSUFFIX\/cups/" backendnet/backend/Makefile.am
+sed -i -e "s:lib/cups:lib$LIBDIRSUFFIX/cups:" cnijbe/src/Makefile.am
+sed -i -e "s:lib/cups:lib$LIBDIRSUFFIX/cups:" backend/src/Makefile.am
+sed -i -e "s:lib/cups:lib$LIBDIRSUFFIX/cups:" backendnet/backend/Makefile.am
 
 chown -R root:root .
 find -L . \
@@ -102,10 +121,10 @@ find -L . \
 (cd ./cngpijmnt; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin )
 (cd ./pstocanonij; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --libdir=/usr/lib$LIBDIRSUFFIX --enable-progpath=/usr/bin )
 (cd ./backend; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin )
-(cd ./backendnet; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin LDFLAGS="-L../../com/libs_bin$LIBDIRSUFFIX" )
+(cd ./backendnet; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin LDFLAGS="-L../../com/libs_bin$BUILD_LIBDIRSUFFIX" )
 (cd ./cmdtocanonij; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --libdir=/usr/lib$LIBDIRSUFFIX )
 (cd ./cnijbe; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin )
-(cd ./lgmon2; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin LDFLAGS="-L../../com/libs_bin$LIBDIRSUFFIX" )
+(cd ./lgmon2; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin LDFLAGS="-L../../com/libs_bin$BUILD_LIBDIRSUFFIX" )
 
 (cd ./ppd; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-ppdpath=/usr/share/ppd --program-suffix=CN_IJ_MODEL )
 (cd ./cnijfilter; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-libpath=/usr/lib$LIBDIRSUFFIX/bjlib --enable-binpath=/usr/bin --program-suffix=CN_IJ_MODEL )
@@ -129,12 +148,12 @@ for pkg in $PRINTER_DEPEND_PKG ; do
     popd
   done
   mkdir -p ${PKG}/usr/lib${LIBDIRSUFFIX}
-  install -m 755 ${model_num}/libs_bin${LIBDIRSUFFIX}/libcnbpcmcm${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/
-  install -m 755 ${model_num}/libs_bin${LIBDIRSUFFIX}/libcnbpcnclapi${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/
-  install -m 755 ${model_num}/libs_bin${LIBDIRSUFFIX}/libcnbpcnclbjcmd${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/
-  install -m 755 ${model_num}/libs_bin${LIBDIRSUFFIX}/libcnbpcnclui${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/
-  install -m 755 ${model_num}/libs_bin${LIBDIRSUFFIX}/libcnbpess${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/
-  install -m 755 ${model_num}/libs_bin${LIBDIRSUFFIX}/libcnbpo${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/
+  install -m 755 ${model_num}/libs_bin${BUILD_LIBDIRSUFFIX}/libcnbpcmcm${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/
+  install -m 755 ${model_num}/libs_bin${BUILD_LIBDIRSUFFIX}/libcnbpcnclapi${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/
+  install -m 755 ${model_num}/libs_bin${BUILD_LIBDIRSUFFIX}/libcnbpcnclbjcmd${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/
+  install -m 755 ${model_num}/libs_bin${BUILD_LIBDIRSUFFIX}/libcnbpcnclui${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/
+  install -m 755 ${model_num}/libs_bin${BUILD_LIBDIRSUFFIX}/libcnbpess${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/
+  install -m 755 ${model_num}/libs_bin${BUILD_LIBDIRSUFFIX}/libcnbpo${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/
   mkdir -p ${PKG}/usr/lib${LIBDIRSUFFIX}/bjlib
   install -m 644 ${model_num}/database/cif${model_name}.conf ${PKG}/usr/lib${LIBDIRSUFFIX}/bjlib
   install -m 644 ${model_num}/database/cnb_${model_num}0.tbl ${PKG}/usr/lib${LIBDIRSUFFIX}/bjlib
@@ -156,8 +175,8 @@ done
 ( cd ./cnijbe; make clean; make; make install DESTDIR=$PKG )
 ( cd ./lgmon2; make clean; make; make install DESTDIR=$PKG )
 
-install -m 755 com/libs_bin${LIBDIRSUFFIX}/libcnnet.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/
-install -m 755 com/libs_bin${LIBDIRSUFFIX}/libcnbpcnclapicom.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/
+install -m 755 com/libs_bin${BUILD_LIBDIRSUFFIX}/libcnnet.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/
+install -m 755 com/libs_bin${BUILD_LIBDIRSUFFIX}/libcnbpcnclapicom.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/
 install -m 644 -o lp -g lp com/ini/cnnet.ini ${PKG}/usr/lib${LIBDIRSUFFIX}/bjlib/ || true
 
 mkdir -p $PKG/etc/udev/rules.d
@@ -167,6 +186,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+chmod 644 LICENSE-cnijfilter-4*.txt
 cp -a LICENSE-cnijfilter-4*.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -174,4 +194,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pixma/pixma.info b/system/pixma/pixma.info
index faff1ae9ba..5f3207f559 100644
--- a/system/pixma/pixma.info
+++ b/system/pixma/pixma.info
@@ -1,6 +1,6 @@
 PRGNAM="pixma"
 VERSION="4.00.1"
-HOMEPAGE="https://www.canon-wireless.com/2018/11/canon-pixma-mg2522-driver-download.html"
+HOMEPAGE="https://www.usa.canon.com/internet/portal/us/home/support/details/printers/support-inkjet-printer/mg-series/pixma-mg2522/pixma-mg2522"
 DOWNLOAD="http://gdlp01.c-wss.com/gds/5/0100005515/01/cnijfilter-source-4.00-1.tar.gz"
 MD5SUM="52e625dfa42459ead1929c07900b8e44"
 DOWNLOAD_x86_64=""
diff --git a/system/plan9port/README b/system/plan9port/README
index 2029535263..ef9bbe3922 100644
--- a/system/plan9port/README
+++ b/system/plan9port/README
@@ -4,20 +4,21 @@ Plan 9 from User Space (aka plan9port) is a port of many Plan 9 programs
 from their native Plan 9 environment to Unix-like operating systems.
 
 Sources:
-The source from the info file is not hosted by github as plan9port doesn't tag
-releases. You can download the zipped master branch from github if you don't
-want to use the mirrored sources:
+The source from the info file is not hosted by github as plan9port
+doesn't tag releases. You can download the zipped master branch from
+github if you don't want to use the mirrored sources:
 https://github.com/9fans/plan9port/archive/master.zip
-There may be differences in the checksum as it is the development branch.
+There may be differences in the checksum as it is the development
+branch.
 
 Notes on using rc with uxterm from Eric Lindblad,
 Tested with Slackware 14.0 with Danish and English keyboards settings.
 
-Ctrl-i	tab
+Ctrl-i   tab
 
-Ctrl-u	delete line back to prompt
+Ctrl-u   delete line back to prompt
 
-Ctrl-w	delete word to left of cursor
+Ctrl-w   delete word to left of cursor
 
 Ctrl-Bksp backspace, or open Menu and uncheck BackArrow Key (BS/Del)
-	  then Bksp will work independently but Ctrl-Bksp will not work
+     then Bksp will work independently but Ctrl-Bksp will not work
diff --git a/system/plan9port/plan9port.SlackBuild b/system/plan9port/plan9port.SlackBuild
index 4038cf29ff..3a24bb5b16 100644
--- a/system/plan9port/plan9port.SlackBuild
+++ b/system/plan9port/plan9port.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for plan9port
 
@@ -25,11 +25,13 @@
 
 # 2012-10-23: added some changes to reflect the usage of nightly tarballs
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=plan9port
-VERSION=${VERSION:-20190501}
+VERSION=${VERSION:-20211019_d0d4408}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-COMMIT="3197719090b3fd0a038767f7e8e15e771b1515be"
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -39,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -49,9 +58,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG/opt $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-${COMMIT}
-unzip $CWD/${COMMIT} || unzip $CWD/plan9port-${COMMIT}.zip
-cd $PRGNAM-${COMMIT}
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -63,7 +72,7 @@ find -L . \
 PLAN9_TARGET=/opt/plan9 ./INSTALL
 
 cd $TMP
-mv $PRGNAM-${COMMIT} $PKG/opt/plan9
+mv $PRGNAM-$VERSION $PKG/opt/plan9
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -79,11 +88,11 @@ install -D -m 0755 $CWD/xinitrc.rio $PKG/etc/X11/xinit/xinitrc.rio
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cd $PKG/opt/plan9
-mv CHANGES CONTRIBUTORS INSTALL LICENSE README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
+mv CHANGES CONTRIBUTORS INSTALL LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/plan9port/plan9port.info b/system/plan9port/plan9port.info
index eab8312767..ef54207e7b 100644
--- a/system/plan9port/plan9port.info
+++ b/system/plan9port/plan9port.info
@@ -1,8 +1,8 @@
 PRGNAM="plan9port"
-VERSION="20190501"
+VERSION="20211019_d0d4408"
 HOMEPAGE="https://9fans.github.io/plan9port/"
-DOWNLOAD="https://rbn.im/files/sources/plan9port/20190501/master.zip"
-MD5SUM="3ca89a88e239f732a33d329a9fdb6f9d"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/plan9port-20211019_d0d4408.tar.xz"
+MD5SUM="5d3c159812e6dd3f97651b18e0fc6c5a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/pledge/README b/system/pledge/README
new file mode 100644
index 0000000000..03786d47c8
--- /dev/null
+++ b/system/pledge/README
@@ -0,0 +1,17 @@
+pledge (OpenBSD command and syscall implementation for Linux)
+
+pledge is a port of OpenBSD's syscall to Linux by Justine Tunney.
+This script builds a shared library (to be injected via LD_PRELOAD)
+and a command line utility to restrict program execution privileges
+and limit parameters such as maximum niceness, cpu time, virtual
+memory, file descriptors, child processes, and individual file sizes.
+
+For more info, see: https://justine.lol/pledge/
+                    https://github.com/jart/pledge
+
+NOTES:
+* pledge doesn't support 32-bit x86
+* pledge help is available via the -h option
+* to run pledge at glibc executable load time:
+  strace -vff bash -c \
+    '_PLEDGE=4194303,0 LD_PRELOAD=/usr/lib64/pledge/sandbox.so ls'
diff --git a/system/pledge/pledge.SlackBuild b/system/pledge/pledge.SlackBuild
new file mode 100644
index 0000000000..d7b4ea6c9f
--- /dev/null
+++ b/system/pledge/pledge.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/bash
+
+# Slackware build script for pledge
+
+# Original author 2023 Juan M. Lasca <email removed>
+# Modified and now maintained by B. Watson <urchlay@slackware.uk>
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20240221 bkw: BUILD=2
+# - Take over maintenance
+# - Relicense as WTFPL (per mailing list)
+# - Fix minor grammar/spelling issues in README and slack-desc
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=pledge
+VERSION=${VERSION:-20230908_8693ebe}
+COMMIT=8693ebe15a30bd4235165ad72a469da29ca067cf
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$COMMIT
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
+cd $PRGNAM-$COMMIT
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+make CFLAGS="$SLKCFLAGS"
+
+LIB=$PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
+mkdir -p $LIB $PKG/usr/bin
+install -s -m0755 o/pledge o/sandbox.so $LIB
+ln -s ../lib$LIBDIRSUFFIX/$PRGNAM/pledge $PKG/usr/bin
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README.md LICENSE $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pledge/pledge.info b/system/pledge/pledge.info
new file mode 100644
index 0000000000..0ff564b850
--- /dev/null
+++ b/system/pledge/pledge.info
@@ -0,0 +1,10 @@
+PRGNAM="pledge"
+VERSION="20230908_8693ebe"
+HOMEPAGE="https://justine.lol/pledge/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/jart/pledge/archive/8693ebe/pledge-8693ebe15a30bd4235165ad72a469da29ca067cf.tar.gz"
+MD5SUM_x86_64="f0414cbb1c6553c891afb8bae61595a3"
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/pledge/slack-desc b/system/pledge/slack-desc
new file mode 100644
index 0000000000..2cb8b45ddf
--- /dev/null
+++ b/system/pledge/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+pledge: pledge (OpenBSD command and syscall implementation for Linux)
+pledge:
+pledge: pledge is a port of OpenBSD's syscall to Linux by Justine Tunney.
+pledge: This script builds a shared library (to be injected via LD_PRELOAD)
+pledge: and a command line utility to restrict program execution privileges
+pledge: and limit parameters such as maximum niceness, cpu time, virtual
+pledge: memory, file descriptors, child processes, and individual file sizes.
+pledge:
+pledge: For more info, see: https://justine.lol/pledge/
+pledge:                     https://github.com/jart/pledge
+pledge:
diff --git a/system/plocate/README b/system/plocate/README
new file mode 100644
index 0000000000..632d1975dc
--- /dev/null
+++ b/system/plocate/README
@@ -0,0 +1,12 @@
+plocate (a much faster locate)
+
+plocate is a locate based on posting lists. Compared to mlocate,
+it is much faster, and its index is much smaller. updatedb speed is
+similar (or you can convert mlocate's index to plocate format using
+plocate-build). It supports most mlocate options; see --help or the
+man page for more information.
+
+This replaces Slackware's mlocate. Technically, there's no conflict,
+but it's redundant to have both plocate and mlocate installed, so you
+should 'removepkg mlocate' before installing this (and add mlocate to
+/etc/slackpkg/blacklist).
diff --git a/system/plocate/cron.sh b/system/plocate/cron.sh
new file mode 100644
index 0000000000..9897c60ea3
--- /dev/null
+++ b/system/plocate/cron.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+nodevs=$(< /proc/filesystems awk '$1 == "nodev" && $2 != "rootfs" && $2 != "zfs" { print $2 }')
+ionice -c3 nice -n 19 /usr/sbin/plocate-updatedb -f "$nodevs"
diff --git a/system/plocate/doinst.sh b/system/plocate/doinst.sh
new file mode 100644
index 0000000000..1ef6f52f26
--- /dev/null
+++ b/system/plocate/doinst.sh
@@ -0,0 +1,25 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    rm $NEW
+  fi
+}
+
+config etc/updatedb.conf.new
+
+# If there's no locate link, take over:
+if [ ! -r usr/bin/locate ]; then
+  ( cd usr/bin ; ln -sf plocate locate )
+fi
+
+# same for these man pages
+if [ ! -r usr/man/man5/updatedb.conf.5.gz ]; then
+  ( cd usr/man/man5 ; ln -sf plocate-updatedb.conf.5.gz updatedb.conf.5.gz )
+fi
+
+if [ ! -r usr/man/man1/locate.1.gz ]; then
+  ( cd usr/man/man1 ; ln -sf plocate.1.gz locate.1.gz )
+fi
diff --git a/system/plocate/plocate.SlackBuild b/system/plocate/plocate.SlackBuild
new file mode 100644
index 0000000000..f39660de75
--- /dev/null
+++ b/system/plocate/plocate.SlackBuild
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+# Slackware build script for plocate
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20240217 bkw: update for v1.1.22.
+# 20230706 bkw: update for v1.1.19.
+# 20230214 bkw: update for v1.1.18.
+# 20221228 bkw: update for v1.1.17.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=plocate
+VERSION=${VERSION:-1.1.22}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# doubleplusungood ref systemd.
+sed -i.bak '/systemd\.timer/s,.*,.BR crond (8)\njob,' updatedb.8.in
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true \
+    -Dlocategroup=slocate \
+    -Dupdatedb_progname=$PRGNAM-updatedb
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+gzip -9 $PKG/usr/man/man*/*.*
+mv $PKG/usr/man/man5/updatedb.conf.5.gz $PKG/usr/man/man5/$PRGNAM-updatedb.conf.5.gz
+
+# change the permissions to match Slackware's mlocate.
+chown root:slocate $PKG/var/lib/$PRGNAM
+chmod 750 $PKG/var/lib/$PRGNAM
+chmod 2711 $PKG/usr/bin/$PRGNAM
+
+# do not install upstream's cron script. it doesn't actually run plocate's
+# updatedb; it converts mlocate's database into plocate format, meaning
+# mlocate would still have to be installed and be run from cron. upstream
+# expects plocate's updatedb to be run from systemd, which we scorn, so
+# include our own cron script.
+mkdir -p $PKG/etc/cron.daily
+install -oroot -groot -m0755 $CWD/cron.sh $PKG/etc/cron.daily/$PRGNAM
+
+# this updatedb.conf is identical to the one in Slackware's mlocate.
+install -oroot -groot -m0755 $CWD/updatedb.conf $PKG/etc/updatedb.conf.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/plocate/plocate.info b/system/plocate/plocate.info
new file mode 100644
index 0000000000..0d22eb34c2
--- /dev/null
+++ b/system/plocate/plocate.info
@@ -0,0 +1,10 @@
+PRGNAM="plocate"
+VERSION="1.1.22"
+HOMEPAGE="https://plocate.sesse.net/"
+DOWNLOAD="https://plocate.sesse.net/download/plocate-1.1.22.tar.gz"
+MD5SUM="ddb9b972e5c90e7e63157c5b71840bc6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/plocate/slack-desc b/system/plocate/slack-desc
new file mode 100644
index 0000000000..ce5ef09e4e
--- /dev/null
+++ b/system/plocate/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+plocate: plocate (a much faster locate)
+plocate:
+plocate: plocate is a locate based on posting lists. Compared to mlocate,
+plocate: it is much faster, and its index is much smaller. updatedb speed is
+plocate: similar (or you can convert mlocate's index to plocate format using
+plocate: plocate-build). It supports most mlocate options; see --help or the
+plocate: man page for more information.
+plocate:
+plocate:
+plocate:
+plocate:
diff --git a/system/mlocate/updatedb.conf.new b/system/plocate/updatedb.conf
index 542cd7c679..542cd7c679 100644
--- a/system/mlocate/updatedb.conf.new
+++ b/system/plocate/updatedb.conf
diff --git a/system/plymouth/plymouth.SlackBuild b/system/plymouth/plymouth.SlackBuild
index 68224347a9..cb617cc1e1 100644
--- a/system/plymouth/plymouth.SlackBuild
+++ b/system/plymouth/plymouth.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for plymouth
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=plymouth
 VERSION=${VERSION:-0.9.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -97,8 +107,10 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 cp -a  AUTHORS COPYING INSTALL ChangeLog NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pmdk/README b/system/pmdk/README
new file mode 100644
index 0000000000..4235e3782f
--- /dev/null
+++ b/system/pmdk/README
@@ -0,0 +1,4 @@
+The Persistent Memory Development Kit (PMDK) is a
+collection of libraries and tools for System Administrators
+and Application Developers to simplify managing and
+accessing persistent memory devices.
diff --git a/system/pmdk/changelog b/system/pmdk/changelog
new file mode 100644
index 0000000000..d6a76854dc
--- /dev/null
+++ b/system/pmdk/changelog
@@ -0,0 +1,20 @@
+Changelog for pmdk SlackBuild Script
+--------------------------------------------------------------------
+
+03/09/2022:
+
+Added to slackbuilds.org
+
+18/02/2023:
+
+pmdk slackbuild script fixed by B.Watson
+
+15/05/2023:
+
+Updated to version 1.13.0
+From this build onwards it will only build 
+on x86_64 platform only.
+
+19/02/2024:
+
+Updated to version 1.13.1
diff --git a/system/pmdk/pmdk.SlackBuild b/system/pmdk/pmdk.SlackBuild
new file mode 100644
index 0000000000..aaaf5c1c17
--- /dev/null
+++ b/system/pmdk/pmdk.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/bash
+
+# Slackware build script for pmdk
+
+# Copyright 2022-2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=pmdk
+VERSION=${VERSION:-1.13.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+sys_arch=${sys_arch:-$(uname -m)}
+
+case "$sys_arch" in
+	x86_64) export ARCH=x86_64 ;;
+	     *) echo "This program will not build on $sys_arch platform" && exit 1 ;;
+esac
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-march=x86-64 -mtune=generic -pipe -O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  echo "This program will not build in this $sys_arch platform" && exit 1
+fi
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+rm -rf $PKG
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+
+make -C src
+make -C utils
+make -C src LIB_PREFIX=lib${LIBDIRSUFFIX} HEADERS_DESTDIR=/usr/include  prefix=/usr PREFIX=/usr install DESTDIR=$PKG
+make -C doc all
+make -C doc install DESTDIR=$PKG/usr/man/
+
+# Don't ship .la files:
+rm -rvf $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+# Remove static libs
+
+rm -rvf $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.a
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded --remove-section=.comment --remove-section=.note 2> /dev/null || true
+
+mv -v $PKG/usr/etc  $PKG/etc
+mv -v $PKG/usr/man/usr/local/share/man/*  $PKG/usr/man/
+rm -rvf $PKG/usr/man/usr
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog LICENSE README.md VERSION CODING_STYLE.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pmdk/pmdk.info b/system/pmdk/pmdk.info
new file mode 100644
index 0000000000..e47e04893f
--- /dev/null
+++ b/system/pmdk/pmdk.info
@@ -0,0 +1,10 @@
+PRGNAM="pmdk"
+VERSION="1.13.1"
+HOMEPAGE="https://pmem.io/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/pmem/pmdk/archive/1.13.1/pmdk-1.13.1.tar.gz"
+MD5SUM_x86_64="e40ebc84f4001331f2351f4e84f0c775"
+REQUIRES="pandoc-bin"
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/pmdk/slack-desc b/system/pmdk/slack-desc
new file mode 100644
index 0000000000..2461e02fb2
--- /dev/null
+++ b/system/pmdk/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+pmdk: pmdk (Persistent Memory Development Kit)
+pmdk:
+pmdk: PMDK is a collection of libraries and tools for system
+pmdk: administrators and application developers to simplify
+pmdk: managing and accessing persistent memory devices.
+pmdk:
+pmdk:
+pmdk: Homepage:https://pmem.io
+pmdk:
+pmdk:
+pmdk:
diff --git a/system/pmount/pmount.SlackBuild b/system/pmount/pmount.SlackBuild
index 4d43ae8e68..b3d2e2638d 100644
--- a/system/pmount/pmount.SlackBuild
+++ b/system/pmount/pmount.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pmount
 
@@ -26,26 +26,36 @@
 # Contains modifications by Robby Workman  <rworkman@slackbuilds.org>
 # No additional license terms added.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pmount
 VERSION=${VERSION:-0.9.23}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -113,4 +123,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/podman/README b/system/podman/README
index f7d3cfec14..67056d1aff 100644
--- a/system/podman/README
+++ b/system/podman/README
@@ -1,18 +1,23 @@
 podman - for running OCI-based containers in Pods
 
-libpod provides a library for applications looking to use the Container Pod
-concept popularized by Kubernetes. libpod also contains a tool called podman
-for managing Pods, Containers, and Container Images.
+libpod provides a library for applications looking to use the
+Container Pod concept popularized by Kubernetes. libpod also contains
+a tool called podman for managing Pods, Containers, and Container
+Images.
 
 At a high level, the scope of libpod and podman is the following:
-* Support multiple image formats including the existing Docker/OCI image formats.
-* Support for multiple means to download images including trust & image verification.
-* Container image management (managing image layers, overlay filesystems, etc).
+* Support multiple image formats including the existing Docker/OCI
+  image formats.
+* Support for multiple means to download images including trust & image
+  verification.
+* Container image management (managing image layers, overlay
+  filesystems, etc).
 * Full management of container lifecycle
 * Support for pods to manage groups of containers together
 * Resource isolation of containers and pods.
 
-These container runtimes can run as non-root, but require sub-uid/gid mappings
+These container runtimes can run as non-root, but require sub-uid/gid
+mappings.
 
 To run podman as a user:
 
diff --git a/system/podman/doinst.sh b/system/podman/doinst.sh
index b93a3a48a2..397a9bcc2d 100644
--- a/system/podman/doinst.sh
+++ b/system/podman/doinst.sh
@@ -11,8 +11,6 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config etc/containers/libpod.conf.new
 config etc/containers/registries.conf.new
 config etc/containers/mounts.conf.new
-config etc/containers/seccomp.json.new
 config etc/containers/policy.json.new
diff --git a/system/podman/podman.SlackBuild b/system/podman/podman.SlackBuild
index 7a727b07f3..7c9769985b 100644
--- a/system/podman/podman.SlackBuild
+++ b/system/podman/podman.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for podman
 
@@ -23,12 +23,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=podman
 REPONAME=libpod
-VERSION=${VERSION:-1.6.2}
-GIT_COMMIT="f3ffda1e08f19e9a6a88484136b5eed76533f21a"
+VERSION=${VERSION:-4.7.2}
+GIT_COMMIT="750b4c3a7c31f6573350f0b3f1b787f26e0fe1e3"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 # The domain part of the go package name, usually the hosting platform
 DOMAIN=github.com
@@ -43,19 +46,20 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
+if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
-  LIBDIRSUFFIX=""
+  echo "This script is only available for x86_64"
+  exit 1
 fi
 
 set -e
@@ -66,7 +70,7 @@ cd $TMP
 rm -rf $REPONAME-$VERSION
 mkdir -p $REPONAME-$VERSION/src/$DOMAIN/$ORG
 cd $REPONAME-$VERSION/src/$DOMAIN/$ORG
-tar xvf $CWD/$REPONAME-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 mv $PRGNAM-$VERSION $REPONAME
 cd $REPONAME
 chown -R root:root .
@@ -100,14 +104,9 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 mkdir -p $PKG/etc/containers/secrets
 
-# use upstream's default seccomp policy
-cp seccomp.json $PKG/etc/containers/seccomp.json.new
-# use upstream config, but default to cgroupfs
-cat libpod.conf | sed 's/^cgroup_manager = "systemd"/cgroup_manager = "cgroupfs"/g' > $PKG/etc/containers/libpod.conf.new
-
 cp $CWD/registries.conf $PKG/etc/containers/registries.conf.new
 cp $CWD/mounts.conf $PKG/etc/containers/mounts.conf.new
 cp $CWD/policy.json $PKG/etc/containers/policy.json.new
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/podman/podman.info b/system/podman/podman.info
index 725e924d15..d6ddc3ada4 100644
--- a/system/podman/podman.info
+++ b/system/podman/podman.info
@@ -1,10 +1,10 @@
 PRGNAM="podman"
-VERSION="1.6.2"
+VERSION="4.7.2"
 HOMEPAGE="https://github.com/containers/libpod"
-DOWNLOAD="https://github.com/containers/libpod/archive/v1.6.2/libpod-1.6.2.tar.gz"
-MD5SUM="bf43121bc45b19404d8bcfaf87e5046d"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/containers/libpod/archive/v4.7.2/podman-4.7.2.tar.gz"
+MD5SUM_x86_64="4b78f4b222e5d6e9eaaf3c74ef91e973"
 REQUIRES="cni-plugins conmon runc go-md2man slirp4netns"
 MAINTAINER="Vincent Batts"
 EMAIL="vbatts@hashbangbash.com"
diff --git a/system/polychromatic/README b/system/polychromatic/README
new file mode 100644
index 0000000000..bd37f89272
--- /dev/null
+++ b/system/polychromatic/README
@@ -0,0 +1,9 @@
+Polychromatic is a vendor agnostic front-end for managing lighting,
+RGB effects and some special functionality for keyboards, mice,
+keypads and just about any other gaming peripheral on your GNU/Linux
+system. The software aims to make it easy to create and co-ordinate
+lighting effects that work across all compatible hardware, even if
+you switch to another brand also supported by Polychromatic.
+
+Currently the only supported backend for polychromatic is openrazer.
+
diff --git a/system/polychromatic/doinst.sh b/system/polychromatic/doinst.sh
new file mode 100644
index 0000000000..a993650058
--- /dev/null
+++ b/system/polychromatic/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+# If other icon themes are installed, then add to/modify this as needed
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/polychromatic/polychromatic.SlackBuild b/system/polychromatic/polychromatic.SlackBuild
new file mode 100644
index 0000000000..b342a056f7
--- /dev/null
+++ b/system/polychromatic/polychromatic.SlackBuild
@@ -0,0 +1,138 @@
+#!/bin/bash
+
+# Slackware build script for polychromatic
+
+# Copyright 2021, Matt Dinslage, Springfield, MO
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=polychromatic
+VERSION=${VERSION:-0.8.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+# Move application launcher to applications. This way we keep all
+# the razer apps in the same category.
+sed -i 's,Categories=Settings;HardwareSettings;,Categories=Utility;,g' \
+ $PKG/usr/share/applications/polychromatic.desktop
+
+# Mate desktop has an issue with polychromatic tray icons not being
+# sized properly. They're displayed at their native size.  Use this
+# as a workaround.  This issue does not affect KDE or XFce.
+if [ -f /usr/bin/mate-about ] ; then
+  for dir in $(ls $PKG/usr/share/$PRGNAM/img) ; do
+    mkdir -p $TMP/$dir
+      for i in $(ls $PKG/usr/share/$PRGNAM/img/$dir | grep svg | rev | cut -c5- | rev) ; do
+        rsvg-convert -a -w 24 -h 24 -f svg $PKG/usr/share/$PRGNAM/img/$dir/$i.svg -o $TMP/$dir/$i.svg
+        rm $PKG/usr/share/$PRGNAM/img/$dir/$i.svg
+        cp $TMP/$dir/$i.svg $PKG/usr/share/$PRGNAM/img/$dir/$i.svg
+      done
+    rm -r $TMP/$dir
+  done
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CHANGELOG LICENSE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/polychromatic/polychromatic.info b/system/polychromatic/polychromatic.info
new file mode 100644
index 0000000000..67cd3906da
--- /dev/null
+++ b/system/polychromatic/polychromatic.info
@@ -0,0 +1,10 @@
+PRGNAM="polychromatic"
+VERSION="0.8.3"
+HOMEPAGE="https://polychromatic.app/"
+DOWNLOAD="https://github.com/polychromatic/polychromatic/archive/v0.8.3/polychromatic-0.8.3.tar.gz"
+MD5SUM="30a83bb6ac020c3c30d82fd59cfab0c9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="openrazer-daemon colorama python-colour python3-PyQtWebEngine"
+MAINTAINER="M.Dinslage"
+EMAIL="daedra1980@gmail.com"
diff --git a/system/polychromatic/slack-desc b/system/polychromatic/slack-desc
new file mode 100644
index 0000000000..9fd750a46e
--- /dev/null
+++ b/system/polychromatic/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+             |-----handy-ruler------------------------------------------------------|
+polychromatic: polychromatic (GUI frontend for openrazer)
+polychromatic:
+polychromatic: Polychromatic is a vendor agnostic front-end for managing lighting,
+polychromatic: RGB effects and some special functionality for keyboards, mice,
+polychromatic: keypads and just about any other gaming peripheral on your GNU/Linux
+polychromatic: system. The software aims to make it easy to create and co-ordinate
+polychromatic: lighting effects that work across all compatible hardware, even if
+polychromatic: you switch to another brand also supported by Polychromatic.
+polychromatic:
+polychromatic:
+polychromatic:
diff --git a/system/polyglotman/polyglotman.SlackBuild b/system/polyglotman/polyglotman.SlackBuild
index aceee5fd4a..12ca18ac16 100644
--- a/system/polyglotman/polyglotman.SlackBuild
+++ b/system/polyglotman/polyglotman.SlackBuild
@@ -1,15 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for polyglotman
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=polyglotman
 VERSION=${VERSION:-3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +22,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -51,11 +58,8 @@ rm -rf $TARNAM-$VERSION
 tar xvf $CWD/$TARNAM-$VERSION.tar.gz
 cd $TARNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 make CFLAGS="$SLKCFLAGS"
 mkdir -p $PKG/usr/bin $PKG/usr/man/man1
@@ -71,4 +75,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/polyglotman/polyglotman.info b/system/polyglotman/polyglotman.info
index 2fbdbbb355..d241b3b78a 100644
--- a/system/polyglotman/polyglotman.info
+++ b/system/polyglotman/polyglotman.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/pommed-light/pommed-light.SlackBuild b/system/pommed-light/pommed-light.SlackBuild
index 9280aea1d1..bd3d18649c 100644
--- a/system/pommed-light/pommed-light.SlackBuild
+++ b/system/pommed-light/pommed-light.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pommed-light
 
-# Copyright 2014 Zhu Qun-Ying
+# Copyright 2014-2023 Zhu Qun-Ying
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2: strip binary.
+# 20220210 bkw: Modified by SlackBuilds.org to fix the build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pommed-light
-VERSION=${VERSION:-1.51lw}
+VERSION=${VERSION:-1.52lw}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +43,11 @@ fi
 
 set -e
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,14 +74,14 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-make EXTRA_CFLAGS="$SLKCFLAGS"
+make EXTRA_CFLAGS="$SLKCFLAGS -fcommon"
 
 mkdir -p $PKG/usr/sbin
-install -m755 pommed/pommed $PKG/usr/sbin
+install -s -m755 pommed/pommed $PKG/usr/sbin
 mkdir -p $PKG/usr/man/man1
 gzip -c pommed.1 > $PKG/usr/man/man1/pommed.1.gz
 
@@ -84,7 +94,7 @@ cp pommed.conf.mactel $PKG/etc/pommed.conf.new
 install -m644 pommed.init $PKG/etc/rc.d/rc.pommed
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp README.md INSTALL COPYING AUTHORS ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp README.md COPYING AUTHORS ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -92,4 +102,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pommed-light/pommed-light.info b/system/pommed-light/pommed-light.info
index 4339319be2..7bdb3d34f3 100644
--- a/system/pommed-light/pommed-light.info
+++ b/system/pommed-light/pommed-light.info
@@ -1,8 +1,8 @@
 PRGNAM="pommed-light"
-VERSION="1.51lw"
+VERSION="1.52lw"
 HOMEPAGE="https://github.com/bytbox/pommed-light"
-DOWNLOAD="https://github.com/bytbox/pommed-light/archive/v1.51lw/pommed-light-1.51lw.tar.gz"
-MD5SUM="b7d99af66237cc676e51473dddcc58e5"
+DOWNLOAD="https://github.com/bytbox/pommed-light/archive/v1.52lw/pommed-light-1.52lw.tar.gz"
+MD5SUM="341bf5de70e96ee326be4b892b6f0cb4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="confuse"
diff --git a/system/porg/README b/system/porg/README
index 41544f0401..3cf024eeb4 100644
--- a/system/porg/README
+++ b/system/porg/README
@@ -1,5 +1,5 @@
-Porg (formerly known as paco), is a program to aid management of software
-packages installed from source code.
+Porg (formerly known as paco), is a program to aid management of
+software packages installed from source code.
 
 After the installation of such packages, one is usually left with
 having no idea of what it was installed and where it all went, making
diff --git a/system/porg/porg.SlackBuild b/system/porg/porg.SlackBuild
index a2f4ca1ad5..94c66933ba 100644
--- a/system/porg/porg.SlackBuild
+++ b/system/porg/porg.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for porg
 
-# Written by Jostein Berntsen <jbernts@broadpark.no>
+# Written by Jostein Berntsen <jvbernts@online.no>
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=porg
 VERSION=${VERSION:-0.10}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -17,7 +20,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -83,9 +93,11 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mv $PKG/usr/share/porg/faq.txt $PKG/usr/doc/$PRGNAM-$VERSION
 rm -rf $PKG/usr/share/$PRGNAM
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/porg/porg.info b/system/porg/porg.info
index 57d779505d..6efa7e1524 100644
--- a/system/porg/porg.info
+++ b/system/porg/porg.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/system/posh/posh.SlackBuild b/system/posh/posh.SlackBuild
index 62f1c8dcd6..207b632368 100644
--- a/system/posh/posh.SlackBuild
+++ b/system/posh/posh.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for posh
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=posh
 VERSION=${VERSION:-0.14.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -100,4 +110,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/posixovl/README b/system/posixovl/README
index d9e3021b45..926de96504 100644
--- a/system/posixovl/README
+++ b/system/posixovl/README
@@ -1,12 +1,14 @@
 POSIX Overlay Filesystem (posixovl)
 
-A FUSE (filesystem in userspace) filesystem that provides POSIX functionality -
-UNIX-style permissions, ownership, special files - for filesystems that do not
-have such, e.g. vfat. It is a modern equivalent of the UMSDOS fs.
+A FUSE (filesystem in userspace) filesystem that provides POSIX
+functionality - UNIX-style permissions, ownership, special files -
+for filesystems that do not have such, e.g. vfat. It is a modern
+equivalent of the UMSDOS fs.
 
-It provides a filesystem view that supports various POSIX operations while using
-an otherwise incapable lower filesystem. Filesystems of various degrees of
-POSIXness can be utilitzed. VFAT is a common  denominator  when it comes to
-cross-compatibility, though NTFS — its features are unused in Linux — would be
-another possibility. Secondly, potent native POSIX-style filesystems can also
+It provides a filesystem view that supports various POSIX operations
+while using an otherwise incapable lower filesystem. Filesystems
+of various degrees of POSIXness can be utilitzed. VFAT is a
+common denominator when it comes to cross-compatibility, though
+NTFS -- its features are unused in Linux -- would be another
+possibility. Secondly, potent native POSIX-style filesystems can also
 be used, though the actual use of doing that remains to be discovered.
diff --git a/system/posixovl/posixovl.SlackBuild b/system/posixovl/posixovl.SlackBuild
index ee179ca48e..be8ae05e66 100644
--- a/system/posixovl/posixovl.SlackBuild
+++ b/system/posixovl/posixovl.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash -e
 #
 # Slackware build script for posixovl
 #
@@ -22,12 +22,20 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-set -e
+# 20220212 bkw: Modified by SlackBuilds.org: upstream moved from
+# sourceforge to github, so update the URLs. The old .tar.xz tarball
+# is gone from sourceforge. The new .tar.gz one from github has a
+# different md5sum, but its contents are identical (except that the
+# top-level directory now has the version number in it). Also, fix
+# compliation on 15.0 and stop installing the install instructions.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=posixovl
 VERSION=${VERSION:-1.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +45,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,18 +72,18 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-mv $PRGNAM $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod 644 *
 
-./autogen.sh
+# 20220212 bkw: include file moved on 15.0.
+sed -i 's,attr/xattr.h,linux/xattr.h,g' *
+
+sh ./autogen.sh
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -82,20 +94,17 @@ find -L . \
   --build=$ARCH-slackware-linux
 
 make
-make install PREFIX=/usr DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip PREFIX=/usr DESTDIR=$PKG
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# 20220212 bkw: really, the man page ought to be in section 8, or else
+# the binary ought to be in /usr/bin. but leave it as-is...
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp INSTALL.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/posixovl/posixovl.info b/system/posixovl/posixovl.info
index 9aaa1b8ba0..56a5df96f6 100644
--- a/system/posixovl/posixovl.info
+++ b/system/posixovl/posixovl.info
@@ -1,8 +1,8 @@
 PRGNAM="posixovl"
 VERSION="1.2"
-HOMEPAGE="https://posixovl.sourceforge.io/"
-DOWNLOAD="https://downloads.sourceforge.net/project/posixovl/posixovl/1.2/posixovl-1.2.tar.xz"
-MD5SUM="02630aba4478f661ec6a247338a3d54e"
+HOMEPAGE="https://github.com/Tomas-M/posixovl/"
+DOWNLOAD="https://github.com/Tomas-M/posixovl/archive/v1.2/posixovl-1.2.tar.gz"
+MD5SUM="2c7da0654100db41429ec046e945c502"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/posixovl/slack-desc b/system/posixovl/slack-desc
index df81acbaaa..03527feadb 100644
--- a/system/posixovl/slack-desc
+++ b/system/posixovl/slack-desc
@@ -11,9 +11,9 @@ posixovl:
 posixovl: posixovl provides a filesystem view that supports various POSIX
 posixovl: operations while using an otherwise incapable lower filesystem.
 posixovl: Filesystems of various degrees of POSIXness can be utilitzed. VFAT
-posixovl: is a common  denominator  when it comes to cross-compatibility,
+posixovl: is a common denominator when it comes to cross-compatibility,
 posixovl: though NTFS - its features are unused in Linux - would be another
 posixovl: possibility. Secondly, potent native POSIX-style filesystems can
-posixovl: also  be used, though the actual use of doing that remains to be
+posixovl: also be used, though the actual use of doing that remains to be
 posixovl: discovered.
 posixovl:
diff --git a/system/postgresql/README.SBo b/system/postgresql/README.SBo
index d4b48e11d7..89e1424750 100644
--- a/system/postgresql/README.SBo
+++ b/system/postgresql/README.SBo
@@ -1,14 +1,14 @@
 Before you can run postgresql you'll need to create the
 database files in /var/lib/pgsql. The following should do
 the trick.
-	# su postgres -c "initdb -D /var/lib/pgsql/10.2/data --locale=en_US.UTF-8 -A md5 -W"
+	# su postgres -c "initdb -D /var/lib/pgsql/14/data --locale=en_US.UTF-8 -A md5 -W"
 
 Additionally, a logrotation script and init script are included.
 For production level log file handling please read
-http://www.postgresql.org/docs/10.2/interactive/logfile-maintenance.html
+https://www.postgresql.org/docs/14/logfile-maintenance.html
 
-In order to start postgresql at boot and stop it properly at shutdown, 
-make sure rc.postgresql is executable and add the following lines to 
+In order to start postgresql at boot and stop it properly at shutdown,
+make sure rc.postgresql is executable and add the following lines to
 the following files:
 
 	/etc/rc.d/rc.local
@@ -28,20 +28,18 @@ the following files:
 Additionally, rc.postgresql script has additional modes for stop/restart:
   force-stop|force-restart (i.e. pg_ctl 'fast' mode)
   unclean-stop|unclean-restart (i.e. pg_ctl 'immediate' mode)
-See http://www.postgresql.org/docs/10.2/static/app-pg-ctl.html
+See https://www.postgresql.org/docs/14/app-pg-ctl.html
 
 From PostgreSQL 9.3 we support in place database upgrades using pg_upgrade:
-  http://www.postgresql.org/docs/10.2/static/pgupgrade.html
+  https://www.postgresql.org/docs/14/pgupgrade.html
 
-A few hints for PostgreSQL 9.6 -> 10.2 upgrade:
-  - Don't remove old PostgreSQL 9.6.x package
-  - Install PostgreSQL 10.2.x, note that binaries are in
-    '/usr/lib64/postgresql/10.2/bin'
+A few hints for PostgreSQL 10.x -> 14.x upgrade:
+  - Don't remove old PostgreSQL 10.x package
+  - Install PostgreSQL 14.x, note that binaries are in
+    '/usr/lib64/postgresql/14/bin'
   - Follow regular pg_upgrade docs
   - Remove old package when transition is over, or read comments in
     rc.postgresql  if you want to run multiple PostgreSQL versions in parallel
-  - Check the /usr/bin for stale symlinks for old binaries_
-    e.g. in v10.0 pg_xlogdump got renamed to pg_waldump.
 
 This script builds postgresql with some useful extension modules from
 the contrib directory, see PG_EXTENSIONS in SlackBuild file.
@@ -51,14 +49,3 @@ To build PostgreSQL with all extensions, use the following command:
 
 Please note that in order to actually use extension, you must execute
 'CREATE EXTENSION [ IF NOT EXISTS ] extension_name' for each extension.
-
-OpenLDAP Notes
-
-With OpenLDAP versions 2.4.24 through 2.4.31, inclusive, each backend
-process that loads libpq (via WAL receiver, dblink, or postgres_fdw) and
-also uses LDAP will crash on exit.
-
-The LDAP wont be enabled (regardless of '--with-ldap' flag in slackbuild)
-for affected OpenLDAP versions, so we've removed that build flag alltogether.
-
-(OpenLDAP 2.4.31 is the version included in Slackware 14.1)
diff --git a/system/postgresql/postgresql.SlackBuild b/system/postgresql/postgresql.SlackBuild
index 0c043fa2bc..f405f0e0ce 100644
--- a/system/postgresql/postgresql.SlackBuild
+++ b/system/postgresql/postgresql.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for PostgreSQL
 #
@@ -24,12 +24,18 @@
 
 # Modified by the SlackBuilds.org Project
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - strip pg_config binary (install-strip misses that one).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=postgresql
-VERSION=${VERSION:-10.10}
+VERSION=${VERSION:-14.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-PG_VERSION=${PG_VERSION:-10.10}
+PG_VERSION=${PG_VERSION:-14}
 PG_PORT=${PG_PORT:-5432}
 PG_UID=${PG_UID:-209}
 PG_GID=${PG_GID:-209}
@@ -42,7 +48,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -51,11 +61,11 @@ OUTPUT=${OUTPUT:-/tmp}
 # For slackbuilds.org, assigned postgres uid/gid are 209/209
 # See http://slackbuilds.org/uid_gid.txt
 # Other popular choice is 26/26
-if ! grep ^postgres: /etc/group 2>&1 > /dev/null; then
+if ! grep ^postgres: /etc/group > /dev/null 2>&1 ; then
   echo "  You must have a postgres group to run this script."
   echo "    # groupadd -g $PG_GID postgres"
   exit 1
-elif ! grep ^postgres: /etc/passwd 2>&1 > /dev/null; then
+elif ! grep ^postgres: /etc/passwd > /dev/null 2>&1 ; then
   echo "  You must have a postgres user to run this script."
   echo "    # useradd -u $PG_UID -g $PG_GID -d /var/lib/pgsql postgres"
   exit 1
@@ -97,6 +107,7 @@ find -L . \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
+PYTHON="/usr/bin/python3" \
 ./configure \
   --prefix=/usr/lib${LIBDIRSUFFIX}/$PRGNAM/$PG_VERSION \
   --sysconfdir=/etc/$PRGNAM/$PG_VERSION \
@@ -120,6 +131,9 @@ make
 make install-strip DESTDIR=$PKG
 make install-docs DESTDIR=$PKG
 
+# 20220414 bkw: this one binary wasn't getting stripped...
+strip $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/$PG_VERSION/bin/pg_config
+
 # create symlinks to shared library for other programs to link against
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}
   for i in $(ls $PRGNAM/$PG_VERSION/lib/lib*.so*) ; do ln -sf $i ; done
@@ -132,7 +146,7 @@ make install-docs DESTDIR=$PKG
 )
 
 # Some interesting additional modules:
-#   http://www.postgresql.org/docs/10.2/static/contrib.html
+#   https://www.postgresql.org/docs/14/contrib.html
 #
 # adminpack - helper extension for pgAdmin
 # pgcrypto - extension for some business applications
@@ -142,7 +156,7 @@ make install-docs DESTDIR=$PKG
 
 PG_EXTENSIONS=${PG_EXTENSIONS:-"adminpack pgcrypto ltree xml2 postgres_fdw file_fdw hstore citext"}
 
-if [ "x$PG_EXTENSIONS" = "xALL" ];then
+if [ "$PG_EXTENSIONS" = "ALL" ];then
   cd $TMP/$PRGNAM-$VERSION/contrib
   make all
   make install-strip DESTDIR=$PKG
@@ -202,4 +216,4 @@ sed -e "s%@PG_VERSION@%$PG_VERSION%" \
   $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/postgresql/postgresql.info b/system/postgresql/postgresql.info
index cb379a5c22..1eacb7229a 100644
--- a/system/postgresql/postgresql.info
+++ b/system/postgresql/postgresql.info
@@ -1,8 +1,8 @@
 PRGNAM="postgresql"
-VERSION="10.10"
+VERSION="14.9"
 HOMEPAGE="https://www.postgresql.org"
-DOWNLOAD="https://ftp.postgresql.org/pub/source/v10.10/postgresql-10.10.tar.gz"
-MD5SUM="e4cc4587fb830065f9386e16a949019e"
+DOWNLOAD="https://ftp.postgresql.org/pub/source/v14.9/postgresql-14.9.tar.gz"
+MD5SUM="08c55c0025f598151b4107844c55b14d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/postgresql/rc.postgresql.new b/system/postgresql/rc.postgresql.new
index 243ba527bb..28a3205306 100644
--- a/system/postgresql/rc.postgresql.new
+++ b/system/postgresql/rc.postgresql.new
@@ -30,7 +30,7 @@
 # Since version 9.3 this startup script can run multiple PostgreSQL
 # versions on different ports and with different data dirs.
 # 
-# e.g. PG_VERSION=10.2 PG_PORT=6432 /etc/rc.d/rc.@PRGNAM@ start
+# e.g. PG_VERSION=14 PG_PORT=6432 /etc/rc.d/rc.@PRGNAM@ start
 
 PG_VERSION=${PG_VERSION:-@PG_VERSION@}
 PG_PORT=${PG_PORT:-@PG_PORT@}
@@ -43,7 +43,7 @@ PIDFILE=$DATADIR/postmaster.pid
 
 # oom-killer score
 #
-# http://www.postgresql.org/docs/10.2/static/kernel-resources.html#LINUX-MEMORY-OVERCOMMIT
+# https://www.postgresql.org/docs/14/kernel-resources.html#LINUX-MEMORY-OVERCOMMIT
 PG_OOM_ADJUST_FILE=/proc/self/oom_score_adj
 PG_MASTER_OOM_SCORE_ADJ=-1000
 PG_CHILD_OOM_SCORE_ADJ=0
diff --git a/system/powerkit/powerkit.SlackBuild b/system/powerkit/powerkit.SlackBuild
index 287dffbf57..b0c02eadd4 100644
--- a/system/powerkit/powerkit.SlackBuild
+++ b/system/powerkit/powerkit.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for powerkit <https://github.com/rodlie/powerkit>
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=powerkit
 VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 QMAKE=${QMAKE:-qmake}
 
 if [ -z "$ARCH" ]; then
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -106,4 +116,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/powerline-fonts/README b/system/powerline-fonts/README
new file mode 100644
index 0000000000..5af0f52294
--- /dev/null
+++ b/system/powerline-fonts/README
@@ -0,0 +1,4 @@
+This package contains fonts for Powerline, a statusline plugin for vim.
+
+For the Powerline plugin, please download powerline-status from
+SlackBuilds.org.
diff --git a/system/powerline-fonts/doinst.sh b/system/powerline-fonts/doinst.sh
new file mode 100644
index 0000000000..67a9f6f9cf
--- /dev/null
+++ b/system/powerline-fonts/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/powerline-fonts/powerline-fonts.SlackBuild b/system/powerline-fonts/powerline-fonts.SlackBuild
new file mode 100644
index 0000000000..bd021d6b60
--- /dev/null
+++ b/system/powerline-fonts/powerline-fonts.SlackBuild
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+# Slackware build script for powerline-status
+
+# Copyright 2023 Isaac Yu <isaacyu@protonmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#  Adapted from Dimitris Zlatinidis' powerline-status SlackBuild
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=powerline-fonts
+VERSION=${VERSION:-2.8.3}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM=powerline
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p "$PKG/etc/fonts/conf.d" "$PKG/usr/share/fonts/OTF" "$PKG/etc/fonts/conf.avail"
+cp -r "font/PowerlineSymbols.otf" "$PKG/usr/share/fonts/OTF/PowerlineSymbols.otf"
+cp -r "font/10-powerline-symbols.conf" "$PKG/etc/fonts/conf.avail/10-powerline-symbols.conf"
+ln -s "../conf.avail/10-powerline-symbols.conf" "$PKG/etc/fonts/conf.d/10-powerline-symbols.conf"
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/powerline-fonts/powerline-fonts.info b/system/powerline-fonts/powerline-fonts.info
new file mode 100644
index 0000000000..dad4bd5286
--- /dev/null
+++ b/system/powerline-fonts/powerline-fonts.info
@@ -0,0 +1,10 @@
+PRGNAM="powerline-fonts"
+VERSION="2.8.3"
+HOMEPAGE="https://github.com/powerline/powerline"
+DOWNLOAD="https://github.com/powerline/powerline/archive/2.8.3/powerline-2.8.3.tar.gz"
+MD5SUM="d524df603bf7144cc2ccd5dcbfc5e982"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/powerline-fonts/slack-desc b/system/powerline-fonts/slack-desc
new file mode 100644
index 0000000000..b9f7f2487a
--- /dev/null
+++ b/system/powerline-fonts/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+powerline-fonts: powerline-fonts (Fonts from Powerline)
+powerline-fonts:
+powerline-fonts: This package contains fonts for Powerline, a statusline plugin for
+powerline-fonts: vim.
+powerline-fonts:
+powerline-fonts: Homepage: https://github.com/powerline/powerline
+powerline-fonts:
+powerline-fonts:
+powerline-fonts:
+powerline-fonts:
+powerline-fonts:
diff --git a/system/powerline-status/README b/system/powerline-status/README
index f2f6f0f86b..bf44e92102 100644
--- a/system/powerline-status/README
+++ b/system/powerline-status/README
@@ -1,5 +1,3 @@
 Powerline is a statusline plugin for vim, and provides statuslines
 and prompts for several other applications, including zsh, bash,
 tmux, IPython, Awesome, i3 and Qtile.
-
-Optional dependency: python3
diff --git a/system/powerline-status/powerline-status.SlackBuild b/system/powerline-status/powerline-status.SlackBuild
index edc99f6570..551a4ef38e 100644
--- a/system/powerline-status/powerline-status.SlackBuild
+++ b/system/powerline-status/powerline-status.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for powerline-status
 
-# Copyright 2016-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2016-2023  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=powerline-status
-VERSION=${VERSION:-2.7}
-BUILD=${BUILD:-2}
+SRCNAM=powerline
+VERSION=${VERSION:-2.8.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,9 +70,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,22 +80,17 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
-
-# Python 3 support.
-if $(python3 -c 'import sys' 2>/dev/null); then
-  python3 setup.py install --root=$PKG
-fi
+python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/powerline-status/powerline-status.info b/system/powerline-status/powerline-status.info
index 0e158ec0ed..d5f58af093 100644
--- a/system/powerline-status/powerline-status.info
+++ b/system/powerline-status/powerline-status.info
@@ -1,10 +1,10 @@
 PRGNAM="powerline-status"
-VERSION="2.7"
+VERSION="2.8.3"
 HOMEPAGE="https://github.com/powerline/powerline"
-DOWNLOAD="https://files.pythonhosted.org/packages/9c/30/8bd3c62642778af9ad813a526c6ff7dd2f98144d6580ad6fab94ca389265/powerline-status-2.7.tar.gz"
-MD5SUM="395f9d4cded34b47c0cf054ea9456d63"
+DOWNLOAD="https://github.com/powerline/powerline/archive/2.8.3/powerline-2.8.3.tar.gz"
+MD5SUM="d524df603bf7144cc2ccd5dcbfc5e982"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/system/powernowd/README b/system/powernowd/README
index 2db8eef6bc..a918803294 100644
--- a/system/powernowd/README
+++ b/system/powernowd/README
@@ -1,57 +1,11 @@
-Overview:
 This is a very simple program that will adjust the speed of your CPU
-depending on system load.  It works as a client of the CPUFreq driver.
-It is designed for use with CPU's supporting AMD's PowerNow power management
-scheme, as it's algorithm works better if there are more then two CPU
-speeds available.  (aka, ARM, AMD K6/K7, Via C3, and Crusoe as opposed to
-traditional Intel and Ultrasparc).
+depending on system load.
 
-This program is essentially a simple client to the CPUFreq sysfs interface.
-This means that you -need- to be running Linux v2.5 or later that includes
-the sysfs interface.  This daemon will -not- work with the CPUFreq driver
-interface included in Linux v2.4.  Feel free to write your own daemon
-to support that if you like; you can even use this as a starting point.
-If there's enough clamoring for it, then maybe I'll whip up something.
-You also need a CPU that supports frequency scaling and supports the CPUFreq
-interface.  This code has been tested on various AMD and PPC processors
+It is designed for use with CPU's supporting AMD's PowerNow power
+management scheme, as it's algorithm works better if there are more then
+two CPU speeds available.  (aka, ARM, AMD K6/K7, Via C3, and Crusoe as
+opposed to traditional Intel and Ultrasparc).
 
-I have been running this daemon on my AMD laptop for over 2 years with no
-problems to report, and it's nice that my laptop remains cool unless I'm
-really doing something intensive, like watching DivX movies, without me
-having to manually intervene and set the speed. I just recently bought an
-Apple iBook G3, and powernowd-0.80 worked flawlessly on it right out of
-the box.
-
-
-Features:
-
-This daemon's goal is simplicity and speed.  It doesn't try and make
-too many decisions for you.  That's its beauty, but it may not be what
-everyone's looking for. Some of the features this daemon has:
-
-One, simple heuristic to determine CPU load: "user + sys" time.
-Ignore "niced" programs (setiathome, itself, etc). In my mind this is
-consistent with what is meant when someone 'nice's a program to begin
-with. (configurable in v0.85+) Designed for CPU's that support more
-then two speed states, but works well with anything.  Very fast, low
-overhead /proc/stat gathering (method stolen from procps).  Supports SMP
-Will automatically switch to 'userspace' governor.  Care taken to make
-the code non-root exploitable (but please audit for yourself first!)
-Frequency step size is configurable (default to 100MHz/step) 4 different
-behavioral modes to choose from (SINE, AGGRESSIVE, PASSIVE, LEAPS),
-which determine the behavior when the load changes. Configurable from the
-command line.  Written in C for speed and simplicity.  Logging to stdout
-or syslog Configurable Polling frequency in milliseconds (defaults to 1s)
-Configurable highwater/lowwater marks for CPU usage. (defaults 80/20%)
-
-Many similar daemons use other methods to determine what speed to use,
-such as battery status, AC status, temperature, fan status, etc. They all
-have their place.  I however feel that in the grand scheme of things none
-of the above matters. When I'm not using my CPU, I don't care if it's
-running at a slower speed. When I -am- using my CPU, I only need it to
-be fast enough to handle the task at hand without hiccuping. And when I'm
-taxing my CPU, I want it running full speed. That's all this daemon does,
-monitor CPU load and adjust the speed accordingly.  Since in all reality
-my CPU is idle 99% of the time (or playing mp3's which it can easily do
-at it's lowest speed rating), this by definition leads to low power usage,
-low temperatures, low speed fans, and better battery life.
+This program is essentially a simple client to the CPUFreq sysfs
+interface.  This means that you -need- to be running Linux v2.5 or later
+that includes the sysfs interface.
diff --git a/system/powernowd/powernowd.SlackBuild b/system/powernowd/powernowd.SlackBuild
index c5d7cb8831..5de69f2196 100644
--- a/system/powernowd/powernowd.SlackBuild
+++ b/system/powernowd/powernowd.SlackBuild
@@ -1,13 +1,34 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for powernowd
 
-# Written by David Woodfall <dave@slackbuilds.org>
+# Copyright 2022 Dave Woodfall <dave@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=powernowd
 VERSION=${VERSION:-1.00}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -17,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -51,17 +79,18 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-sed -i "s%-O2%$SLKCFLAGS%" Makefile
+# gnu90 finds the inline function inside the enum.  Using static also seems
+# to work.
+sed -i "s%-O2%-std=gnu90 $SLKCFLAGS%" Makefile
 sed -i "s%/usr/sbin%$PKG/usr/sbin%" Makefile
 
 make
 make install
 
 # Remove trailing whitespace at the same time
-cat powernowd.init | sed "s%\s*$%%" > $PKG/etc/rc.d/rc.powernowd.new
+sed "s,[[:space:]]\+$,," powernowd.init > $PKG/etc/rc.d/rc.powernowd.new
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+strip --strip-unneeded $PKG/usr/sbin/powernowd
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -74,4 +103,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/powernowd/powernowd.info b/system/powernowd/powernowd.info
index bed5c35b49..fcdd3a91ad 100644
--- a/system/powernowd/powernowd.info
+++ b/system/powernowd/powernowd.info
@@ -6,5 +6,5 @@ MD5SUM="abc48b690d104e9e71a85400ba19d799"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
+MAINTAINER="D Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/system/powerpanel/powerpanel.SlackBuild b/system/powerpanel/powerpanel.SlackBuild
index ae11ec630c..b4b5524bc7 100644
--- a/system/powerpanel/powerpanel.SlackBuild
+++ b/system/powerpanel/powerpanel.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for powerpanel
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=powerpanel
 VERSION=${VERSION:-1.3.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -43,7 +46,14 @@ else
   printf "$ARCH is not supported.\n"; exit 1
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -132,4 +142,4 @@ find $PKG/etc -type f -exec mv {} {}.new \;
 )
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/powershell/doinst.sh b/system/powershell/doinst.sh
deleted file mode 100644
index 4b87024f0b..0000000000
--- a/system/powershell/doinst.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-chmod +x /opt/microsoft/powershell/pwsh
-ln -s /opt/microsoft/powershell/pwsh /usr/bin/pwsh
diff --git a/system/powershell/powershell.SlackBuild b/system/powershell/powershell.SlackBuild
index 9232ac2e5e..630b66e764 100644
--- a/system/powershell/powershell.SlackBuild
+++ b/system/powershell/powershell.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for powershell.
 #
-# Copyright 2019 Reza Talebi, Shahin Shahr, Iran.
+# Copyright 2022 Reza Talebi, Shahin Shahr, Iran.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,38 +22,39 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=powershell
-VERSION=${VERSION:-7.0.3}
+VERSION=${VERSION:-7.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+  ARCH=$( uname -m )
+fi
+
+if [ "$ARCH" = "x86_64" ]; then
+  ARCHITECTURE="x64"
+else
+  echo "Package for $ARCH architecture is not available."
+  exit 1
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-
 set -e
 
-if [ "$( uname -m )" = "x86_64" ]; then
-  ARCH="x86_64"
-  ARCHITECTURE="x64"
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  BITS="amd64"
-else
-  echo "Package for $(uname -m) architecture is not available."
-  exit 1
-fi
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -64,12 +65,14 @@ mkdir -p opt/microsoft/powershell
 tar -zxf $CWD/$PRGNAM-${VERSION}-linux-${ARCHITECTURE}.tar.gz -C opt/microsoft/powershell
 chown -R root:root opt/microsoft/powershell
 
+mkdir -p usr/bin/
+ln -s /opt/microsoft/powershell/pwsh usr/bin/pwsh
+
 mkdir -p usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg --linkadd y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/powershell/powershell.info b/system/powershell/powershell.info
index 948c90ce57..7f175f5d77 100644
--- a/system/powershell/powershell.info
+++ b/system/powershell/powershell.info
@@ -1,10 +1,10 @@
 PRGNAM="powershell"
-VERSION="7.0.3"
+VERSION="7.4.1"
 HOMEPAGE="https://www.microsoft.com/powershell/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/PowerShell/PowerShell/releases/download/v7.0.3/powershell-7.0.3-linux-x64.tar.gz"
-MD5SUM_x86_64="742db1551728c88d6277653d34db56b4"
+DOWNLOAD_x86_64="https://github.com/PowerShell/PowerShell/releases/download/v7.4.1/powershell-7.4.1-linux-x64.tar.gz"
+MD5SUM_x86_64="3d78dde9590500d829cff628ebc9a2ca"
 REQUIRES=""
 MAINTAINER="Reza Talebi"
 EMAIL="reza.talebi.73@outlook.com"
diff --git a/system/prelink/prelink.SlackBuild b/system/prelink/prelink.SlackBuild
index b40fc77c8f..764b6975eb 100644
--- a/system/prelink/prelink.SlackBuild
+++ b/system/prelink/prelink.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build package for prelink
 
@@ -22,26 +22,36 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=prelink
 VERSION=${VERSION:-20130503}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -105,4 +115,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/preload/preload.SlackBuild b/system/preload/preload.SlackBuild
index 3dc7c9bb7d..180fe18f54 100644
--- a/system/preload/preload.SlackBuild
+++ b/system/preload/preload.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for preload
 
@@ -22,26 +22,36 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=preload
 VERSION=${VERSION:-0.6.4}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -116,4 +126,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/procinfo-ng/README b/system/procinfo-ng/README
index 610e2b5f82..ed9564557d 100644
--- a/system/procinfo-ng/README
+++ b/system/procinfo-ng/README
@@ -1,4 +1,4 @@
-Procinfo-NG is a complete rewrite of the old system monitoring app procinfo.
-The goal is to make more readable (and reusable) code and to restore broken
-functionality. Procinfo was written for Linux 1.2, and updated through 2.2.
-Procinfo-NG is for 2.6 (and works with 3.x).
+Procinfo-NG is a complete rewrite of the old system monitoring app
+procinfo.  The goal is to make more readable (and reusable) code and
+to restore broken functionality. Procinfo was written for Linux 1.2,
+and updated through 2.2. Procinfo-NG is for 2.6 (and works with 3.x).
diff --git a/system/procinfo-ng/procinfo-ng.SlackBuild b/system/procinfo-ng/procinfo-ng.SlackBuild
index 7d5a78c1da..6172785721 100644
--- a/system/procinfo-ng/procinfo-ng.SlackBuild
+++ b/system/procinfo-ng/procinfo-ng.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for procinfo-ng
 
@@ -20,26 +20,36 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=procinfo-ng
 VERSION=${VERSION:-2.0.304}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -101,4 +111,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/procs/README b/system/procs/README
new file mode 100644
index 0000000000..7acb27e6a5
--- /dev/null
+++ b/system/procs/README
@@ -0,0 +1,15 @@
+Procs is a replacement for ps written in Rust.
+
+Features:
+
+•Colored and human-readable output
+•Automatic theme detection based on terminal background
+•Multi-column keyword search
+•Some additional information which are not supported by ps
+•TCP/UDP port
+•Read/Write throughput
+•Docker container name
+•More memory information
+•Pager support
+•Watch mode (like top)
+•Tree view
diff --git a/system/procs/procs.SlackBuild b/system/procs/procs.SlackBuild
new file mode 100644
index 0000000000..ae62c3537b
--- /dev/null
+++ b/system/procs/procs.SlackBuild
@@ -0,0 +1,160 @@
+#!/bin/bash
+
+# Slackware build script for procs
+
+# Copyright 2022 Damian Perticone, Berisso, Argentina
+# All rights reserved.
+# Thanks to Andrew Clemons for the source and md5sum script!
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=procs
+VERSION=${VERSION:-0.12.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+
+  if [ "$ARCH" = "i586" ]; then
+    if rustc -Vv | grep host | grep i686 > /dev/null ; then
+      ARCH=i686
+    fi
+  fi
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+  CARGOTARGET="--target i586-unknown-linux-gnu"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+  CARGOTARGET="--target i686-unknown-linux-gnu"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  CARGOTARGET="--target x86_64-unknown-linux-gnu"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+  CARGOTARGET=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+# build offline
+# configuration tells cargo to use the configured directory
+# for dependencies intead of downloading from crates.io
+mkdir .cargo
+cat << EOF >> .cargo/config
+[source.crates-io]
+registry = 'https://github.com/rust-lang/crates.io-index'
+replace-with = 'vendored-sources'
+
+[source.vendored-sources]
+directory = '$(pwd)/vendor'
+EOF
+
+# deps and versions come from Cargo.lock
+mkdir vendor
+(
+  cd vendor
+
+  grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
+    sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
+    awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \
+    grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do
+
+    ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
+    dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
+
+    tar xvf $CWD/$dep-$ver.crate
+
+    touch $dep-$ver/.cargo-ok
+
+    # generate checksum
+    {
+      printf "{\n"
+      printf '    "files": {\n'
+
+      (
+        cd $dep-$ver
+        find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/'
+      ) | sed '$ s/,$//'
+
+      printf "    },\n"
+      printf '    "package": "'
+
+      sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
+
+      printf "}\n"
+    } > $dep-$ver/.cargo-checksum.json
+  done
+)
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CARGO_HOME=.cargo \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+cargo build --release $CARGOTARGET
+
+mkdir -p $PKG/usr/bin
+
+find target -name $PRGNAM -exec install -m 755 {} $PKG/usr/bin/$PRGNAM \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/procs/procs.info b/system/procs/procs.info
new file mode 100644
index 0000000000..e514235d5e
--- /dev/null
+++ b/system/procs/procs.info
@@ -0,0 +1,464 @@
+PRGNAM="procs"
+VERSION="0.12.3"
+HOMEPAGE="https://github.com/dalance/procs"
+DOWNLOAD="https://github.com/dalance/procs/archive/v0.12.3/procs-0.12.3.tar.gz \
+          https://static.crates.io/crates/addr2line/addr2line-0.17.0.crate \
+          https://static.crates.io/crates/adler/adler-1.0.2.crate \
+          https://static.crates.io/crates/anyhow/anyhow-1.0.57.crate \
+          https://static.crates.io/crates/arrayref/arrayref-0.3.6.crate \
+          https://static.crates.io/crates/arrayvec/arrayvec-0.5.2.crate \
+          https://static.crates.io/crates/async-channel/async-channel-1.6.1.crate \
+          https://static.crates.io/crates/async-executor/async-executor-1.4.1.crate \
+          https://static.crates.io/crates/async-global-executor/async-global-executor-2.0.4.crate \
+          https://static.crates.io/crates/async-io/async-io-1.6.0.crate \
+          https://static.crates.io/crates/async-lock/async-lock-2.5.0.crate \
+          https://static.crates.io/crates/async-mutex/async-mutex-1.4.0.crate \
+          https://static.crates.io/crates/async-std/async-std-1.11.0.crate \
+          https://static.crates.io/crates/async-task/async-task-4.2.0.crate \
+          https://static.crates.io/crates/atomic-waker/atomic-waker-1.0.0.crate \
+          https://static.crates.io/crates/atty/atty-0.2.14.crate \
+          https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \
+          https://static.crates.io/crates/backtrace-sys/backtrace-sys-0.1.23.crate \
+          https://static.crates.io/crates/backtrace/backtrace-0.3.65.crate \
+          https://static.crates.io/crates/base64/base64-0.13.0.crate \
+          https://static.crates.io/crates/base64/base64-0.9.3.crate \
+          https://static.crates.io/crates/bindgen/bindgen-0.59.2.crate \
+          https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \
+          https://static.crates.io/crates/blake2b_simd/blake2b_simd-0.5.11.crate \
+          https://static.crates.io/crates/blocking/blocking-1.2.0.crate \
+          https://static.crates.io/crates/bumpalo/bumpalo-3.9.1.crate \
+          https://static.crates.io/crates/byte-unit/byte-unit-4.0.14.crate \
+          https://static.crates.io/crates/byteorder/byteorder-1.4.3.crate \
+          https://static.crates.io/crates/bytes/bytes-0.5.6.crate \
+          https://static.crates.io/crates/bytes/bytes-1.1.0.crate \
+          https://static.crates.io/crates/cache-padded/cache-padded-1.2.0.crate \
+          https://static.crates.io/crates/cc/cc-1.0.73.crate \
+          https://static.crates.io/crates/cexpr/cexpr-0.6.0.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-0.1.10.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://static.crates.io/crates/chrono/chrono-0.4.19.crate \
+          https://static.crates.io/crates/clang-sys/clang-sys-1.3.1.crate \
+          https://static.crates.io/crates/clap/clap-3.1.18.crate \
+          https://static.crates.io/crates/clap_complete/clap_complete-3.1.4.crate \
+          https://static.crates.io/crates/clap_derive/clap_derive-3.1.18.crate \
+          https://static.crates.io/crates/clap_lex/clap_lex-0.2.0.crate \
+          https://static.crates.io/crates/concurrent-queue/concurrent-queue-1.2.2.crate \
+          https://static.crates.io/crates/console/console-0.15.0.crate \
+          https://static.crates.io/crates/constant_time_eq/constant_time_eq-0.1.5.crate \
+          https://static.crates.io/crates/crc32fast/crc32fast-1.3.2.crate \
+          https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.8.crate \
+          https://static.crates.io/crates/crossterm/crossterm-0.19.0.crate \
+          https://static.crates.io/crates/crossterm_winapi/crossterm_winapi-0.7.0.crate \
+          https://static.crates.io/crates/ctor/ctor-0.1.22.crate \
+          https://static.crates.io/crates/directories/directories-4.0.1.crate \
+          https://static.crates.io/crates/dirs-sys/dirs-sys-0.3.7.crate \
+          https://static.crates.io/crates/dirs/dirs-1.0.5.crate \
+          https://static.crates.io/crates/dockworker/dockworker-0.0.23.crate \
+          https://static.crates.io/crates/either/either-1.6.1.crate \
+          https://static.crates.io/crates/encode_unicode/encode_unicode-0.3.6.crate \
+          https://static.crates.io/crates/errno-dragonfly/errno-dragonfly-0.1.2.crate \
+          https://static.crates.io/crates/errno/errno-0.2.8.crate \
+          https://static.crates.io/crates/event-listener/event-listener-2.5.2.crate \
+          https://static.crates.io/crates/failure/failure-0.1.8.crate \
+          https://static.crates.io/crates/failure_derive/failure_derive-0.1.8.crate \
+          https://static.crates.io/crates/fastrand/fastrand-1.7.0.crate \
+          https://static.crates.io/crates/filetime/filetime-0.2.16.crate \
+          https://static.crates.io/crates/flate2/flate2-1.0.23.crate \
+          https://static.crates.io/crates/fnv/fnv-1.0.7.crate \
+          https://static.crates.io/crates/form_urlencoded/form_urlencoded-1.0.1.crate \
+          https://static.crates.io/crates/fuchsia-zircon-sys/fuchsia-zircon-sys-0.3.3.crate \
+          https://static.crates.io/crates/fuchsia-zircon/fuchsia-zircon-0.3.3.crate \
+          https://static.crates.io/crates/futures-channel/futures-channel-0.3.21.crate \
+          https://static.crates.io/crates/futures-core/futures-core-0.3.21.crate \
+          https://static.crates.io/crates/futures-executor/futures-executor-0.3.21.crate \
+          https://static.crates.io/crates/futures-io/futures-io-0.3.21.crate \
+          https://static.crates.io/crates/futures-lite/futures-lite-1.12.0.crate \
+          https://static.crates.io/crates/futures-macro/futures-macro-0.3.21.crate \
+          https://static.crates.io/crates/futures-sink/futures-sink-0.3.21.crate \
+          https://static.crates.io/crates/futures-task/futures-task-0.3.21.crate \
+          https://static.crates.io/crates/futures-util/futures-util-0.3.21.crate \
+          https://static.crates.io/crates/futures/futures-0.3.21.crate \
+          https://static.crates.io/crates/getch/getch-0.3.1.crate \
+          https://static.crates.io/crates/getrandom/getrandom-0.1.16.crate \
+          https://static.crates.io/crates/getrandom/getrandom-0.2.6.crate \
+          https://static.crates.io/crates/gimli/gimli-0.26.1.crate \
+          https://static.crates.io/crates/glob/glob-0.3.0.crate \
+          https://static.crates.io/crates/gloo-timers/gloo-timers-0.2.4.crate \
+          https://static.crates.io/crates/h2/h2-0.2.7.crate \
+          https://static.crates.io/crates/hashbrown/hashbrown-0.11.2.crate \
+          https://static.crates.io/crates/heck/heck-0.4.0.crate \
+          https://static.crates.io/crates/hermit-abi/hermit-abi-0.1.19.crate \
+          https://static.crates.io/crates/hex/hex-0.4.3.crate \
+          https://static.crates.io/crates/http-body/http-body-0.3.1.crate \
+          https://static.crates.io/crates/http/http-0.2.7.crate \
+          https://static.crates.io/crates/httparse/httparse-1.7.1.crate \
+          https://static.crates.io/crates/httpdate/httpdate-0.3.2.crate \
+          https://static.crates.io/crates/hyper/hyper-0.13.10.crate \
+          https://static.crates.io/crates/hyperlocal/hyperlocal-0.7.0.crate \
+          https://static.crates.io/crates/idna/idna-0.2.3.crate \
+          https://static.crates.io/crates/indexmap/indexmap-1.8.1.crate \
+          https://static.crates.io/crates/instant/instant-0.1.12.crate \
+          https://static.crates.io/crates/iovec/iovec-0.1.4.crate \
+          https://static.crates.io/crates/itoa/itoa-0.4.8.crate \
+          https://static.crates.io/crates/itoa/itoa-1.0.1.crate \
+          https://static.crates.io/crates/js-sys/js-sys-0.3.57.crate \
+          https://static.crates.io/crates/kernel32-sys/kernel32-sys-0.2.2.crate \
+          https://static.crates.io/crates/kv-log-macro/kv-log-macro-1.0.7.crate \
+          https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \
+          https://static.crates.io/crates/lazycell/lazycell-1.3.0.crate \
+          https://static.crates.io/crates/libc/libc-0.2.126.crate \
+          https://static.crates.io/crates/libloading/libloading-0.7.3.crate \
+          https://static.crates.io/crates/libproc/libproc-0.12.0.crate \
+          https://static.crates.io/crates/lock_api/lock_api-0.4.7.crate \
+          https://static.crates.io/crates/log/log-0.4.17.crate \
+          https://static.crates.io/crates/matches/matches-0.1.9.crate \
+          https://static.crates.io/crates/memchr/memchr-2.5.0.crate \
+          https://static.crates.io/crates/mime/mime-0.3.16.crate \
+          https://static.crates.io/crates/minimal-lexical/minimal-lexical-0.2.1.crate \
+          https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.5.1.crate \
+          https://static.crates.io/crates/mio-named-pipes/mio-named-pipes-0.1.7.crate \
+          https://static.crates.io/crates/mio-uds/mio-uds-0.6.8.crate \
+          https://static.crates.io/crates/mio/mio-0.6.23.crate \
+          https://static.crates.io/crates/mio/mio-0.7.14.crate \
+          https://static.crates.io/crates/miow/miow-0.2.2.crate \
+          https://static.crates.io/crates/miow/miow-0.3.7.crate \
+          https://static.crates.io/crates/named_pipe/named_pipe-0.2.4.crate \
+          https://static.crates.io/crates/net2/net2-0.2.37.crate \
+          https://static.crates.io/crates/nix/nix-0.15.0.crate \
+          https://static.crates.io/crates/nom/nom-7.1.1.crate \
+          https://static.crates.io/crates/ntapi/ntapi-0.3.7.crate \
+          https://static.crates.io/crates/num-integer/num-integer-0.1.45.crate \
+          https://static.crates.io/crates/num-traits/num-traits-0.2.15.crate \
+          https://static.crates.io/crates/num_cpus/num_cpus-1.13.1.crate \
+          https://static.crates.io/crates/object/object-0.28.3.crate \
+          https://static.crates.io/crates/once_cell/once_cell-1.10.0.crate \
+          https://static.crates.io/crates/os_str_bytes/os_str_bytes-6.0.0.crate \
+          https://static.crates.io/crates/pager/pager-0.16.0.crate \
+          https://static.crates.io/crates/parking/parking-2.0.0.crate \
+          https://static.crates.io/crates/parking_lot/parking_lot-0.11.2.crate \
+          https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.8.5.crate \
+          https://static.crates.io/crates/peeking_take_while/peeking_take_while-0.1.2.crate \
+          https://static.crates.io/crates/percent-encoding/percent-encoding-2.1.0.crate \
+          https://static.crates.io/crates/pin-project-internal/pin-project-internal-0.4.29.crate \
+          https://static.crates.io/crates/pin-project-internal/pin-project-internal-1.0.10.crate \
+          https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.1.12.crate \
+          https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.9.crate \
+          https://static.crates.io/crates/pin-project/pin-project-0.4.29.crate \
+          https://static.crates.io/crates/pin-project/pin-project-1.0.10.crate \
+          https://static.crates.io/crates/pin-utils/pin-utils-0.1.0.crate \
+          https://static.crates.io/crates/polling/polling-2.2.0.crate \
+          https://static.crates.io/crates/proc-macro-error-attr/proc-macro-error-attr-1.0.4.crate \
+          https://static.crates.io/crates/proc-macro-error/proc-macro-error-1.0.4.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.37.crate \
+          https://static.crates.io/crates/procfs/procfs-0.12.0.crate \
+          https://static.crates.io/crates/quote/quote-1.0.18.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.1.57.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.2.13.crate \
+          https://static.crates.io/crates/redox_users/redox_users-0.3.5.crate \
+          https://static.crates.io/crates/redox_users/redox_users-0.4.3.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.25.crate \
+          https://static.crates.io/crates/regex/regex-1.5.5.crate \
+          https://static.crates.io/crates/rust-argon2/rust-argon2-0.8.3.crate \
+          https://static.crates.io/crates/rustc-demangle/rustc-demangle-0.1.21.crate \
+          https://static.crates.io/crates/rustc-hash/rustc-hash-1.1.0.crate \
+          https://static.crates.io/crates/ryu/ryu-1.0.9.crate \
+          https://static.crates.io/crates/safemem/safemem-0.3.3.crate \
+          https://static.crates.io/crates/scopeguard/scopeguard-1.1.0.crate \
+          https://static.crates.io/crates/serde/serde-1.0.137.crate \
+          https://static.crates.io/crates/serde_derive/serde_derive-1.0.137.crate \
+          https://static.crates.io/crates/serde_json/serde_json-1.0.81.crate \
+          https://static.crates.io/crates/shlex/shlex-1.1.0.crate \
+          https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.4.0.crate \
+          https://static.crates.io/crates/signal-hook/signal-hook-0.1.17.crate \
+          https://static.crates.io/crates/slab/slab-0.4.6.crate \
+          https://static.crates.io/crates/smallvec/smallvec-1.8.0.crate \
+          https://static.crates.io/crates/socket2/socket2-0.3.19.crate \
+          https://static.crates.io/crates/socket2/socket2-0.4.4.crate \
+          https://static.crates.io/crates/strsim/strsim-0.10.0.crate \
+          https://static.crates.io/crates/syn/syn-1.0.92.crate \
+          https://static.crates.io/crates/synstructure/synstructure-0.12.6.crate \
+          https://static.crates.io/crates/tar/tar-0.4.38.crate \
+          https://static.crates.io/crates/termbg/termbg-0.4.1.crate \
+          https://static.crates.io/crates/termcolor/termcolor-1.1.3.crate \
+          https://static.crates.io/crates/terminal_size/terminal_size-0.1.17.crate \
+          https://static.crates.io/crates/termios/termios-0.3.3.crate \
+          https://static.crates.io/crates/textwrap/textwrap-0.15.0.crate \
+          https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.31.crate \
+          https://static.crates.io/crates/thiserror/thiserror-1.0.31.crate \
+          https://static.crates.io/crates/time/time-0.1.43.crate \
+          https://static.crates.io/crates/tinyvec/tinyvec-1.6.0.crate \
+          https://static.crates.io/crates/tinyvec_macros/tinyvec_macros-0.1.0.crate \
+          https://static.crates.io/crates/tokio-macros/tokio-macros-0.2.6.crate \
+          https://static.crates.io/crates/tokio-util/tokio-util-0.3.1.crate \
+          https://static.crates.io/crates/tokio/tokio-0.2.25.crate \
+          https://static.crates.io/crates/toml/toml-0.5.9.crate \
+          https://static.crates.io/crates/tower-service/tower-service-0.3.1.crate \
+          https://static.crates.io/crates/tracing-core/tracing-core-0.1.26.crate \
+          https://static.crates.io/crates/tracing-futures/tracing-futures-0.2.5.crate \
+          https://static.crates.io/crates/tracing/tracing-0.1.34.crate \
+          https://static.crates.io/crates/try-lock/try-lock-0.2.3.crate \
+          https://static.crates.io/crates/unicode-bidi/unicode-bidi-0.3.8.crate \
+          https://static.crates.io/crates/unicode-normalization/unicode-normalization-0.1.19.crate \
+          https://static.crates.io/crates/unicode-width/unicode-width-0.1.9.crate \
+          https://static.crates.io/crates/unicode-xid/unicode-xid-0.2.3.crate \
+          https://static.crates.io/crates/unix_socket/unix_socket-0.5.0.crate \
+          https://static.crates.io/crates/url/url-2.2.2.crate \
+          https://static.crates.io/crates/users/users-0.11.0.crate \
+          https://static.crates.io/crates/utf8-width/utf8-width-0.1.6.crate \
+          https://static.crates.io/crates/value-bag/value-bag-1.0.0-alpha.9.crate \
+          https://static.crates.io/crates/version_check/version_check-0.9.4.crate \
+          https://static.crates.io/crates/void/void-1.0.2.crate \
+          https://static.crates.io/crates/waker-fn/waker-fn-1.1.0.crate \
+          https://static.crates.io/crates/want/want-0.3.0.crate \
+          https://static.crates.io/crates/wasi/wasi-0.10.2+wasi-snapshot-preview1.crate \
+          https://static.crates.io/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \
+          https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.80.crate \
+          https://static.crates.io/crates/wasm-bindgen-futures/wasm-bindgen-futures-0.4.30.crate \
+          https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.80.crate \
+          https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.80.crate \
+          https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.80.crate \
+          https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.80.crate \
+          https://static.crates.io/crates/web-sys/web-sys-0.3.57.crate \
+          https://static.crates.io/crates/wepoll-ffi/wepoll-ffi-0.1.2.crate \
+          https://static.crates.io/crates/which/which-4.2.5.crate \
+          https://static.crates.io/crates/winapi-build/winapi-build-0.1.1.crate \
+          https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi-util/winapi-util-0.1.5.crate \
+          https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi/winapi-0.2.8.crate \
+          https://static.crates.io/crates/winapi/winapi-0.3.9.crate \
+          https://static.crates.io/crates/ws2_32-sys/ws2_32-sys-0.2.1.crate \
+          https://static.crates.io/crates/xattr/xattr-0.2.3.crate"
+MD5SUM="0dbe57ebeec2545fd8740943c1473e81 \
+        c4c6ae55973b5054bf10f574fe49317f \
+        669215548c64019c08c92b2c1afd3deb \
+        4c46dab8a64a68b20b8851a356e19462 \
+        6ff474dd60c839a9c788844b7a42c72c \
+        c83252f91435a921e7e4434956010344 \
+        218d9b779b991e39e2e3fd2f299a9864 \
+        50806ccba0af9b3fdd3e37c6b651059c \
+        9190c7612f89510ece2fc2230391bd63 \
+        8588bed0c242a7e964ac4cf236dbccd2 \
+        f3b6de508f03f6d12010b154160b13ee \
+        6a5fb43167d44652c51e3ceb9c2b8c23 \
+        86c7b9710710ae14417e9fd56756dfc6 \
+        f0fee7ed35cbf0f8bd5f78161bf80960 \
+        6a2f7b82f00aaf8f9124cbae817980ac \
+        142cb4b9a653e56e56311f0c883b8582 \
+        05d77ef52e90ad161fdd41b252420467 \
+        3306fff6c087afc6ec2bab3ef67bf863 \
+        b47959c03cf9213e50a15ab86090c9d9 \
+        80a2c27647a6acb1890a3a7de8fded72 \
+        496ce53f8d4d95bf19e48bb2f31e4a7e \
+        51cef6d77ce79c186bcd69779376c03b \
+        a295edb6953237ebbdfa8e731229f9a3 \
+        8dcd8db8f0e4971b7c9b13c273ab8b10 \
+        c23fa18e9e7f214f091b14fc65be7b8b \
+        79173170388e20507a241b355ef521e3 \
+        521a0ebe9e522a6db814023622bc4712 \
+        1e704be5ddde9d6b5383ef1035309f91 \
+        d123f33f646e37ca5b825ea6eb2dd150 \
+        df3ac16302a9dd29508eda92aa402a9b \
+        ca7e295f50617a33e02283d3ef93ff99 \
+        8e3a4d0980acef2c4e74485a45de29a9 \
+        10b68ba1e7093d889e9198dcd0ea2a3e \
+        882dbbc613a93f64c3709b0a2bd0d6dc \
+        74634128440dbc3766bda76fdf0aaa05 \
+        1581b390d17f6e73a43ffc8a7b009e57 \
+        ad93a9f51606d9d5eba5c8c057a14f14 \
+        a7d2140f1c0165b6282e435d2082854b \
+        247d9e1dcbed99a06945fbdb227c1e14 \
+        e261dbba69aee631aba1860b218f2e18 \
+        35e379582134753cca7735abca4cb92f \
+        f637bf20fac185ee2687bb2a08325e59 \
+        7496180b753f8729ac92e0a491ff94cc \
+        ec9751a4c0d35e7313e52ddb7147376b \
+        a9d6492a1bd21d93dbc27c32eabd0c70 \
+        8d21be2fa5f912232d6c441e8dd78cb1 \
+        a9973359fdc9eb26f6eafad46fb57cef \
+        f80ce4e5614e6f1af167ccbc578eed0e \
+        7f41743a48a304cf5b932ea321dab0c9 \
+        43a06fc27e2bc54b4b06c4eeda880895 \
+        4c21da37e71a52f26c8c5490f3ec4837 \
+        f9f233221c0202b616d6957925c41ac8 \
+        65faac555154a1984507a1ab21f04992 \
+        b4e2b229c362ad0dd313ff631816d5db \
+        95a243b2d7c30018a643e218b3c5d693 \
+        fc65414dcac661c46f2cfad7722304f9 \
+        0854e3c796252e12dbfc40ad1fe82ae6 \
+        782fd3cac41045c0d89d69b90012d8b7 \
+        e0f2cb8a84777de3cf3ab813b96f42f6 \
+        2fe508e60645a30eeed34748e278bd3b \
+        e08921c68133df2e254fe723b368bae3 \
+        3e035319a0279a829b8737ed01e718af \
+        f68a6d098298ffa9b317919120783339 \
+        8dab3b3ec00dc56cffde0b0c410d47b5 \
+        7ee8703970c3fa6a2e37893de742824b \
+        54cfab480b7a5f7302eadf44129d3f4b \
+        dd7c80c2d04d2e9ceba82826cf69764d \
+        5d404b52af03b999e7fb74fbe16d3bd0 \
+        8aa040d9c661f68ebb67d5b71813473b \
+        1e0ad6e5cdab371cabd218748fee9b6d \
+        74d9ab54981e8f02e7eb683ac0a8a6b9 \
+        3763e6c936b1accbd2e9a7c8118793e0 \
+        750ca4b374c5cd501a612a841f7362a9 \
+        a46bd303e3155f7975b167af12435e5e \
+        1ab2952ce15d2f9cfe279821274133eb \
+        8071e8e030bee77619611dbb4e508864 \
+        bece18dd831ac2ce1e26e92271e6d832 \
+        3defcd4fab9ffa0de754eceb9d9c3c41 \
+        15d3113e5507c411419fa64f6b9d5349 \
+        8a9e0a43625da8d29c57e742c4d3d385 \
+        ac4775c8640cd2c698e1639e7cd6e788 \
+        e7c07242a95ee1df865efe9534e10a34 \
+        52b7c854accccb07820ba28d816f2290 \
+        548c3b21d8b9113b39d2eb43bd311b4f \
+        62b3edf8c2db7fccb1a6a41134b84e62 \
+        4fd75413081a400a1c230f0700732611 \
+        0b7994d1256215201bdfb810a357ffa2 \
+        1d3e530a3410fc95a6987d70f84a6332 \
+        0181369fc9db8aa137e427c1f4559b4f \
+        faae9d595fd99faa52abe8e1059b01e9 \
+        c1784ff333f8e33380c087208e1b42ff \
+        76a32998a25cedabfc01b591b5aff211 \
+        8857dd32823a0548e09c8dbdb3194f5e \
+        6061824b2f3d499ea40a3b87cc5b64aa \
+        f50aaf5171cbc0327f8d18a4ec7405fb \
+        2db2b6694ada626b1a2c328e99ad971a \
+        5f153f7135dceb02f88266121c836b4e \
+        f1c40b9836035b69e464df711a1d2950 \
+        06e7dbde9932c6a9bac63d9288670678 \
+        5c98b89b530b563b6e5f6e1b631c4b35 \
+        d49632aacbe5b25a24e411e7a037cc0d \
+        9d033cc2daa6924420a4a89e6705773f \
+        e155c3d45440413eec6db44f68a21b69 \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        23cc9e52c52465f5b225e62ab7cc3457 \
+        c58d450f13e76e4a034fde8f20710266 \
+        a087f8a5947ecf4e734ac9cfe695469c \
+        f059b407bade1c2c3cecb3301f50b511 \
+        1c1e406fe68d3223a6c58e9c1987b6ce \
+        b31bf94ffe7e0f2ada93afae1076eaeb \
+        5ac809692422b722eaded90be3c4d9c2 \
+        94b8bf179385ff071bdc33b58bf047c0 \
+        a362e890dd0dfe51ecd95a4a1be6e28c \
+        8b708bc4b33c5e1683467444c9ed41b0 \
+        2d3c4e7f37ed77be4f9f204a60e6d26a \
+        149e92d5fe1d4adde8dadfa37badf19a \
+        10e28d0be14899dcbad91142a228fb35 \
+        257e573f323c639630b31f147671b627 \
+        84c0c029460fffc209296b914a16e4c8 \
+        1fbbe598255c0addb31bdfbe3e76420d \
+        4604959975c2154a14f6b5e97444e2c8 \
+        1b38e640e5e7cd5eb82d6bf470159965 \
+        ff6c054468eab826f0dab7cc9a3fe557 \
+        65f04bfaccdc2156621ab8e6a22da1e9 \
+        b4f83cacd53b7dc0d12ba582d27cbc1a \
+        0650ea82267b13e7dcf3841ac2624a86 \
+        073b4c53e303ccf2a807dfce7f5e986a \
+        a0de6eabdeb1320350abcbd7c02df6ac \
+        c5e50e299295e662ad19c58428d6e085 \
+        c9731b4b0555159dea0e8a0411133ba3 \
+        0a56079b59a262a80e33d13e6604cc4e \
+        8ee1436104d86d91d56bafc3b0322e4f \
+        5bc8849bd44262f0461d8fd998a81942 \
+        205459def23510e8815562e73a65c898 \
+        12e4ba5909e1f30b9142932571eaa4da \
+        233dee08f26c9cbe78f29b66c0c20ccd \
+        7e264bc8f23a45ad680668cb5e57d9fd \
+        f490982aceabdbd515348f63e638a782 \
+        facb585b95200395e50795719da25a0b \
+        8ff78776b6140283bd558ad74554cb16 \
+        906a9bf2f259cb64c75fabc264443186 \
+        ce6dde2ea2691fdd97632fb8c9b3e042 \
+        b383135826da89036c9c28cc134ec685 \
+        228eb40a277a6dda01626b6e9287ee66 \
+        07c75fec267864bcbb800ca7709ceae2 \
+        1d827ececfe381f71248b88ec399f359 \
+        7d76a523677de261dda1b65d29a93c4e \
+        6a32bab57772c3a1146d599b65ffb0cb \
+        11034ad82271b27907c7f970374864ef \
+        4fc610c7df6c6d3efaeaaff2bee0d649 \
+        0fa01f3988219987a04c09dae3933d94 \
+        3cc3a4bd5861ca93d7c0d19129334703 \
+        2e69b77050ab91b1d0bb941e843a05cb \
+        870008bba2e68db4988c31e511fbd9c4 \
+        2793ed3e6807d79ff72271baec586531 \
+        82401c70623ccc1bfc0bcb5c3b0ac8b7 \
+        6b5c7401117316735435311bf551515b \
+        29e548496d699fbd888e4a65ec2d1488 \
+        6eb014e73f66bc13226e0ef6d815d375 \
+        7b1261ea730a9314bc9bcdf4a379bf98 \
+        7fe15f165a1812b23e5b1980aa364de2 \
+        994b165f971ecfc09dc13fca8d394691 \
+        b4a0a98a54439a5a37952c8879187ee3 \
+        31553e8c2d0d2f2e7474cc48a03337d8 \
+        3d3fef13feb53a62c0f434a092f526bf \
+        78187fa5db3eb2eeba6d865363ad1a40 \
+        0bfb08b9dd5df72ba5ed7d74dd5fe6eb \
+        21b43d5721b3a9c16059acb691f4314d \
+        f5cb2d644e1a5c3cbb9255aa214db9ad \
+        be6b7845e52831416901caba0b97a360 \
+        6249245cf12427da0a4f37bc3d294ff4 \
+        eb856691e9d7a2321a31ef22decaae0d \
+        f8839491f88f7a15ac8a5bdd787de442 \
+        82d98dc87dc8503400aa095f5aa70f13 \
+        8b3ee9107af33d280d42485282f7c4a6 \
+        8f6b6cc71be0473b79c65abfea592c07 \
+        7645c62a572f12b67d1b582d7257776e \
+        8b1f4e9f11db96b1f593d1df7cf473a2 \
+        40ce77bc7803d0ff8734f6a11c4e8814 \
+        d3266efa0f541bfaca6541e17c1a0457 \
+        de58bff8ca81ad6e4401cf69d6b1ad23 \
+        7bfb933cd096d342c9d6f77f5d3c4b94 \
+        ac76b35d8c76c7fa25c73b8863d5d055 \
+        a8ae09f39c6e68744ca70bf8db61df71 \
+        9d66208e00715217a8c1f2e40efe4a0c \
+        5f0470696baaa4e5953bddbf196998f9 \
+        7bfcad253aff26bc26c5e3521f3ba891 \
+        2c8f1fe04919c09e705eccb13a2aa583 \
+        bf41c63b7f486045605d856c0658d31b \
+        1c63947b82fb656602a15cff8cc7c360 \
+        b02f8aae39609bfe759838fbe0616c1a \
+        519bfbdd19531f1d7b775bfa7ce4ee80 \
+        69e69b855333b1e7f3dd36f0eff7b99b \
+        f601f89fde92362c93611ef2358e1bc1 \
+        c1354e5b35b7dc25b94e7d1433257ec7 \
+        e876964c7b83db85fb7897bee7ad0f45 \
+        bd0cd532c61dac2087ecd7e0fef0d011 \
+        10291d9a0022076bc0827250816d3476 \
+        a42cc2834b2150027d7b427558a87803 \
+        763a3a6901bbb11a6998d29867d39b3c \
+        9cc0ef2af16b402a7ce22a21ce8dd054 \
+        eb721c4d9e5dba8f93e9de0a80036ec3 \
+        d4c929fc9daf131daef04ee7eaa91fd4 \
+        86baecce43858faab832d3ddf3bf800f \
+        6e71c4d256f4d02355b5b722e7d481be \
+        d18d362345c4fe512ef67b738b239fb8 \
+        689203efc084fc0f1d1f74f5d354ae75 \
+        274f9bcda1e4afd4a290329eff9267ad \
+        e334c03160b1e0989c2a71ca55f631fc \
+        a061ad1db3e0d839725b037ff8be84e7 \
+        6e23e0eee42b1ba9ec61a6db7ec2dc08 \
+        eff162a9eb73d8bf43ab38431a1825f6 \
+        3886b2a97dc68f123f790972e92e900c \
+        7c1938786f5fe1da4fb3dbe5ebbcaeeb \
+        5a95cd15fe52d43a8ef355d65417549a \
+        1a1754a2a84a7511aea0bb45eccc5fa0 \
+        2c5bacb773fb313b9b6b497cb9962aa7 \
+        79bdafabe100289aa1c70c05a34232f8 \
+        20cfa8aba7521c8767344b06c39479f7 \
+        c8fa57829efc7efdfe176f19715582e5 \
+        c900e7dbce808ff8ced375077b17a163 \
+        db96b50050277bf05a3c68534bbb9586 \
+        b9e37d5fc4ad28b612b78ad37816684d \
+        09de9d01e7331ff3da11f58be8bef0df \
+        b44489eb4799c4fabac3fceb48de54f7 \
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        38346bab0933c9eb1e36d22fe4220ba7 \
+        8479d907dcb0e97f59f2d01336bbd1ae"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Damian Perticone"
+EMAIL="mjolnirdam@gmail.com"
diff --git a/system/procs/slack-desc b/system/procs/slack-desc
new file mode 100644
index 0000000000..bb40bc5890
--- /dev/null
+++ b/system/procs/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+procs: procs (replacement of 'ps' written in Rust)
+procs:
+procs: Procs is a replacement of ps written in rust
+procs:
+procs: Home: https://github.com/dalance/procs
+procs:
+procs:
+procs:
+procs:
+procs:
+procs:
diff --git a/system/profile-cleaner/profile-cleaner.SlackBuild b/system/profile-cleaner/profile-cleaner.SlackBuild
index 6980ce44cd..b8d606bed5 100644
--- a/system/profile-cleaner/profile-cleaner.SlackBuild
+++ b/system/profile-cleaner/profile-cleaner.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "profile-cleaner".
 
@@ -24,13 +24,24 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20240331 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - install zsh function to /usr/share/zsh, not /usr/zsh.
+# - remove INSTALL from doc dir (no useful info for package users).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=profile-cleaner
 VERSION=${VERSION:-2.35}
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -46,20 +57,21 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
+
+sed -i '/MANDIR/s#/share##g' Makefile
 
-sed -i 's#/share##g' Makefile
 make
 make install DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/profile-cleaner/profile-cleaner.info b/system/profile-cleaner/profile-cleaner.info
index caaa2d2191..f3ec9839bd 100644
--- a/system/profile-cleaner/profile-cleaner.info
+++ b/system/profile-cleaner/profile-cleaner.info
@@ -1,10 +1,10 @@
 PRGNAM="profile-cleaner"
 VERSION="2.35"
 HOMEPAGE="https://github.com/graysky2/profile-cleaner/"
-DOWNLOAD="https://github.com/graysky2/profile-cleaner/archive/v2.35.tar.gz"
+DOWNLOAD="https://github.com/graysky2/profile-cleaner/archive/v2.35/profile-cleaner-2.35.tar.gz"
 MD5SUM="023544be8d6514e9534d63db1115a7ca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="parallel"
+REQUIRES=""
 MAINTAINER="Marcel Saegebarth"
 EMAIL="marc@mos6581.de"
diff --git a/system/profile-sync-daemon/profile-sync-daemon.SlackBuild b/system/profile-sync-daemon/profile-sync-daemon.SlackBuild
index 2dc4c4517f..3308611b01 100644
--- a/system/profile-sync-daemon/profile-sync-daemon.SlackBuild
+++ b/system/profile-sync-daemon/profile-sync-daemon.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "profile-sync-daemon".
 
@@ -24,13 +24,24 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20240331 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - install zsh function to /usr/share/zsh, not /usr/zsh.
+# - remove INSTALL from doc dir (no useful info for package users).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=profile-sync-daemon
 VERSION=${VERSION:-5.74.1}
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -46,11 +57,11 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
-sed -i 's#/share##g' Makefile
+sed -i '/MANDIR/s#/share##g' Makefile
 make
 make install-bin install-man install-cron DESTDIR=$PKG
 
@@ -59,7 +70,7 @@ install -D -m 0644 $TMP/$PRGNAM-$VERSION/common/psd.conf $PKG/etc/psd.conf.new
 install -D -m 0644 $CWD/rc.psd $PKG/etc/rc.d/rc.psd.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a GPL-2 INSTALL LICENCE MIT README.md VERSION_4_WARNING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a GPL-2 LICENCE MIT README.md VERSION_4_WARNING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir $PKG/install
@@ -67,4 +78,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/profile-sync-daemon/profile-sync-daemon.info b/system/profile-sync-daemon/profile-sync-daemon.info
index f0e7fd3a70..ca329a8856 100644
--- a/system/profile-sync-daemon/profile-sync-daemon.info
+++ b/system/profile-sync-daemon/profile-sync-daemon.info
@@ -1,7 +1,7 @@
 PRGNAM="profile-sync-daemon"
 VERSION="5.74.1"
 HOMEPAGE="https://github.com/graysky2/profile-sync-daemon/"
-DOWNLOAD="https://github.com/graysky2/profile-sync-daemon/archive/v5.74.1.tar.gz"
+DOWNLOAD="https://github.com/graysky2/profile-sync-daemon/archive/v5.74.1/profile-sync-daemon-5.74.1.tar.gz"
 MD5SUM="59888840bf6cf102a81a6fbe50ff86e6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/progress/progress.SlackBuild b/system/progress/progress.SlackBuild
index 3266673bcb..eea7119604 100644
--- a/system/progress/progress.SlackBuild
+++ b/system/progress/progress.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for progress
 
-# Copyright 2016-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2016-2022  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=progress
-VERSION=${VERSION:-0.14}
+VERSION=${VERSION:-0.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,17 +79,16 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-sed -i -e "s/\/usr\/local/\/usr/" -e "s/\/share\/man/\/man/" Makefile
+sed -i -e 's/usr\/local/usr/' -e 's/share\/man/man/' Makefile
 
-make
 make install DESTDIR=$PKG
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l  ) ; do ln -s $( readlink $i  ).gz $i.gz ; rm $i ; done
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -88,4 +97,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/progress/progress.info b/system/progress/progress.info
index 7f524ebd74..29c496d03a 100644
--- a/system/progress/progress.info
+++ b/system/progress/progress.info
@@ -1,8 +1,8 @@
 PRGNAM="progress"
-VERSION="0.14"
+VERSION="0.16"
 HOMEPAGE="https://github.com/Xfennec/progress"
-DOWNLOAD="https://github.com/Xfennec/progress/archive/v0.14/progress-0.14.tar.gz"
-MD5SUM="37103cc9ac32a6e8a2286c56ec5a10c2"
+DOWNLOAD="https://github.com/Xfennec/progress/archive/v0.16/progress-0.16.tar.gz"
+MD5SUM="8759713cc1745cde50d3a1ec8ae0bc06"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/prometheus/prometheus.SlackBuild b/system/prometheus/prometheus.SlackBuild
index a0cb4c4263..97cc74954f 100644
--- a/system/prometheus/prometheus.SlackBuild
+++ b/system/prometheus/prometheus.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Prometheus
 
-# Copyright 2017-2020 Ebben Aries <slackbuilds@dscp.org>
+# Copyright 2017-2024 Ebben Aries <slackbuilds@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=prometheus
-VERSION=${VERSION:-2.24.1}
+VERSION=${VERSION:-2.51.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -46,7 +49,14 @@ elif ! getent passwd $PRGNAM; then
 	exit 1
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -103,4 +113,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/prometheus/prometheus.info b/system/prometheus/prometheus.info
index 7dccb136af..594936a452 100644
--- a/system/prometheus/prometheus.info
+++ b/system/prometheus/prometheus.info
@@ -1,10 +1,10 @@
 PRGNAM="prometheus"
-VERSION="2.24.1"
+VERSION="2.51.1"
 HOMEPAGE="https://prometheus.io"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/prometheus/prometheus/releases/download/v2.24.1/prometheus-2.24.1.linux-amd64.tar.gz"
-MD5SUM_x86_64="da32d4573cee35d9305539267c4a84bf"
+DOWNLOAD_x86_64="https://github.com/prometheus/prometheus/releases/download/v2.51.1/prometheus-2.51.1.linux-amd64.tar.gz"
+MD5SUM_x86_64="ba67aa6f4b383c3839bc82d477948828"
 REQUIRES=""
 MAINTAINER="Ebben Aries"
 EMAIL="slackbuilds@dscp.org"
diff --git a/system/prometheus/slack-desc b/system/prometheus/slack-desc
index 30bd4f1c35..ca2456e914 100644
--- a/system/prometheus/slack-desc
+++ b/system/prometheus/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
-prometheus: Prometheus (An Open-Source Monitoring and Alerting Toolkit)
+prometheus: prometheus (An Open-Source Monitoring and Alerting Toolkit)
 prometheus:
 prometheus: Prometheus is an open-source systems monitoring and alerting toolkit
 prometheus: originally built at SoundCloud.
diff --git a/system/pspg/pspg.SlackBuild b/system/pspg/pspg.SlackBuild
index 4ec4d2b978..435e24d395 100644
--- a/system/pspg/pspg.SlackBuild
+++ b/system/pspg/pspg.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pspg
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pspg
-VERSION=${VERSION:-4.0.0}
+VERSION=${VERSION:-5.0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -90,4 +100,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pspg/pspg.info b/system/pspg/pspg.info
index 978e4123a5..fc4aaf7f1c 100644
--- a/system/pspg/pspg.info
+++ b/system/pspg/pspg.info
@@ -1,8 +1,8 @@
 PRGNAM="pspg"
-VERSION="4.0.0"
+VERSION="5.0.5"
 HOMEPAGE="https://github.com/okbob/pspg"
-DOWNLOAD="https://github.com/okbob/pspg/archive/4.0.0/pspg-4.0.0.tar.gz"
-MD5SUM="05bee8a0945ccf67b5b07277f1debe44"
+DOWNLOAD="https://github.com/okbob/pspg/archive/5.0.5/pspg-5.0.5.tar.gz"
+MD5SUM="3d5dbb43f756e386b0e50e91593ae9b0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/pstate-frequency/pstate-frequency.SlackBuild b/system/pstate-frequency/pstate-frequency.SlackBuild
index a541b98df9..d1fad49950 100644
--- a/system/pstate-frequency/pstate-frequency.SlackBuild
+++ b/system/pstate-frequency/pstate-frequency.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pstate-frequency
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pstate-frequency
 VERSION=${VERSION:-3.10.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -42,7 +45,14 @@ WITH_SYSTEMD_UNIT=${WITH_SYSTEMD_UNIT:-no}
 WITH_UDEV_RULE=${WITH_UDEV_RULE:-no}
 UDEV_RULE_DIR=${UDEV_RULE_DIR:-/lib/udev/rules.d/} # not used when WITH_UDEV_RULE=no
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -119,4 +129,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/psuinfo/psuinfo.SlackBuild b/system/psuinfo/psuinfo.SlackBuild
index 23cb95e2fb..8a31ef1dfb 100644
--- a/system/psuinfo/psuinfo.SlackBuild
+++ b/system/psuinfo/psuinfo.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for psuinfo
 
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=psuinfo
 VERSION=${VERSION:-1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,4 +77,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/psuinfo/psuinfo.info b/system/psuinfo/psuinfo.info
index 54fcce6768..8a8c5a47f1 100644
--- a/system/psuinfo/psuinfo.info
+++ b/system/psuinfo/psuinfo.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/nwg-piotr/psuinfo/archive/v1.1/psuinfo-1.1.tar.gz"
 MD5SUM="ddbcfab6a6a9111fe3ea9e57186e9833"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="psutil python3"
+REQUIRES="python3-psutil"
 MAINTAINER="Leo C."
 EMAIL="leoc@gmx.com"
diff --git a/system/ptop/README b/system/ptop/README
index 0c77c64933..0a5d74e0fa 100644
--- a/system/ptop/README
+++ b/system/ptop/README
@@ -1,5 +1,7 @@
-An awesome task manager written in python. A more awesome top like
-thing in your terminal !
+ptop (top-like system monitor)
 
-NOTE:
-This package conflict with fpc as both install ptop binary in /usr/bin/.
+An awesome task manager written in python. A more awesome top-like
+thing in your terminal!
+
+The executable is called "ptop.py", because there's already a "ptop"
+in the fpc package. This way there's no conflict.
diff --git a/system/ptop/ptop.SlackBuild b/system/ptop/ptop.SlackBuild
index ee53525ac4..6733429556 100644
--- a/system/ptop/ptop.SlackBuild
+++ b/system/ptop/ptop.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ptop
 
@@ -22,10 +22,18 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220212 bkw: Modified by SlackBuilds.org for Slackware 15.0:
+# - resolve conflict with fpc.
+# - add missing huepy dependency.
+# - stop installing documentation directly to $PKG/usr.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ptop
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,30 +72,39 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# Delete argparse standard Python library from requires. 
-# ptop work with argparse minimal version.
-sed -i "19d" setup.py
+# apparently we don't need argparse as a dependency.
+sed -i '/argparse/d' setup.py
 
 python setup.py install --root=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# 20220212 bkw: the plan was to rename the script to ptop.py, to
+# avoid conflicting with fpc. unfortunately it refuses to run under
+# another name (ImportError: No module named main), so this elaborate
+# circumlocution is required. it results in a shell script that has
+# a .py filename (confusing I supppose), but works fine.
+mkdir -p $PKG/usr/libexec/$PRGNAM
+mv $PKG/usr/bin/$PRGNAM $PKG/usr/libexec/$PRGNAM
+
+cat <<EOF > $PKG/usr/bin/$PRGNAM.py
+#!/bin/sh
+exec /usr/libexec/$PRGNAM/$PRGNAM "\$@"
+EOF
+
+chmod +x $PKG/usr/bin/$PRGNAM.py
 
+# 20220212 bkw: what a mess. the docs are installed directly to $PKG/usr.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.md LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/[A-Z]* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ptop/ptop.info b/system/ptop/ptop.info
index 3508b75450..30a12d4e2c 100644
--- a/system/ptop/ptop.info
+++ b/system/ptop/ptop.info
@@ -1,10 +1,10 @@
 PRGNAM="ptop"
-VERSION="1.0.0"
+VERSION="1.0"
 HOMEPAGE="https://github.com/darxtrix/ptop"
-DOWNLOAD="https://github.com/darxtrix/ptop/archive/v1.0.0.tar.gz"
-MD5SUM="16a12031e6bc5191f389755e475b82a8"
+DOWNLOAD="https://github.com/darxtrix/ptop/archive/v1.0/ptop-1.0.tar.gz"
+MD5SUM="2a4eee636aea33aad88872aa296514f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="npyscreen psutil drawille"
+REQUIRES="npyscreen python2-psutil drawille huepy"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/system/ptop/slack-desc b/system/ptop/slack-desc
index 13b940e7c0..845d2044a4 100644
--- a/system/ptop/slack-desc
+++ b/system/ptop/slack-desc
@@ -6,10 +6,10 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-ptop: ptop (task manager)
+ptop: ptop (top-like system monitor)
 ptop:
-ptop: An awesome task manager written in python. A more awesome top like
-ptop: thing in your terminal !
+ptop: An awesome task manager written in python. A more awesome top-like
+ptop: thing in your terminal!
 ptop:
 ptop: Homepage: https://github.com/darxtrix/ptop
 ptop:
diff --git a/system/pucrunch/README b/system/pucrunch/README
index 355830462f..6efe3b695a 100644
--- a/system/pucrunch/README
+++ b/system/pucrunch/README
@@ -8,5 +8,5 @@ in decompression.
 The compressor can compress/decompress files for C64 (-c64), VIC20
 (-c20), C16/+4 (-c16), or for standalone decompressor (-c0).
 
-Assembly sources for example decompressors (for Commodore 64 and Nintendo
-GameBoy) are included.
+Assembly sources for example decompressors for Commodore 64 and Nintendo
+GameBoy are included.
diff --git a/system/pucrunch/pucrunch.SlackBuild b/system/pucrunch/pucrunch.SlackBuild
index 2c207fd79b..1879ec2df5 100644
--- a/system/pucrunch/pucrunch.SlackBuild
+++ b/system/pucrunch/pucrunch.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pucrunch
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
@@ -11,10 +11,13 @@
 # by downloading all the individual files. The version number is the
 # 'Last Updated' date on the homepage.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pucrunch
 VERSION=${VERSION:-20081122}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -24,7 +27,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -52,11 +59,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 sed -i "s,-O,$SLKCFLAGS," Makefile
 make
@@ -83,4 +87,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pucrunch/pucrunch.info b/system/pucrunch/pucrunch.info
index d7adcce7e5..8650e32edc 100644
--- a/system/pucrunch/pucrunch.info
+++ b/system/pucrunch/pucrunch.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/pv/pv.SlackBuild b/system/pv/pv.SlackBuild
index 56a75f260d..c2547522f0 100644
--- a/system/pv/pv.SlackBuild
+++ b/system/pv/pv.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for pv
 #
@@ -24,10 +24,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pv
-VERSION=${VERSION:-1.6.6}
+VERSION=${VERSION:-1.8.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,13 +40,18 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="COPYING INSTALL NEWS PACKAGE TODO VERSION"
-
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
@@ -58,7 +66,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -85,12 +93,13 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-( cd $TMP/$PRGNAM-$VERSION/doc
-  cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION )
+mv $PKG/usr/share/doc/pv/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -f $PKG/usr/doc/$PRGNAM-$VERSION/INSTALL
+rmdir $PKG/usr/share/doc/pv $PKG/usr/share/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pv/pv.info b/system/pv/pv.info
index d31dee7b01..38715744eb 100644
--- a/system/pv/pv.info
+++ b/system/pv/pv.info
@@ -1,8 +1,8 @@
 PRGNAM="pv"
-VERSION="1.6.6"
+VERSION="1.8.5"
 HOMEPAGE="https://www.ivarch.com/programs/pv.shtml"
-DOWNLOAD="https://www.ivarch.com/programs/sources/pv-1.6.6.tar.bz2"
-MD5SUM="ff3564fddcc2b9bd4a9c1d143aba4b4c"
+DOWNLOAD="https://codeberg.org/a-j-wood/pv/releases/download/v1.8.5/pv-1.8.5.tar.gz"
+MD5SUM="45136fe0da3bb866d4f1e70e8644a0b0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/pw/README b/system/pw/README
new file mode 100644
index 0000000000..8cc1060c51
--- /dev/null
+++ b/system/pw/README
@@ -0,0 +1,10 @@
+pw (view data passing through a pipe)
+
+pw stands for Pipe Watch, a utility that continuously reads lines
+of text from a pipe or pipe-like source, passes them through a FIFO
+buffer, and maintains a display based on occasionally sampling the
+contents of the FIFO buffer, with useful features such as triggering
+and filtering.
+
+pw can monitor anything that produces textual output. tail -f
+/var/logfile, tcpdump, strace, ...
diff --git a/system/pw/pw.SlackBuild b/system/pw/pw.SlackBuild
new file mode 100644
index 0000000000..03b6673e18
--- /dev/null
+++ b/system/pw/pw.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# Slackware build script for pw
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=pw
+VERSION=${VERSION:-2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown root:root *
+chmod 644 *
+
+make CFLAGS="$SLKCFLAGS"
+mkdir -p $PKG/usr/{bin,man/man{1,5}}
+install -s pw $PKG/usr/bin/pw
+gzip -9c < pw.1 > $PKG/usr/man/man1/pw.1.gz
+gzip -9c < pw-relnotes.5 > $PKG/usr/man/man5/pw-relnotes.5.gz
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README.md $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pw/pw.info b/system/pw/pw.info
new file mode 100644
index 0000000000..68c5da282e
--- /dev/null
+++ b/system/pw/pw.info
@@ -0,0 +1,10 @@
+PRGNAM="pw"
+VERSION="2"
+HOMEPAGE="https://www.kylheku.com/cgit/pw/"
+DOWNLOAD="https://www.kylheku.com/cgit/pw/snapshot/pw-2.tar.bz2"
+MD5SUM="17569567f3979471e7b55b33aebcd93a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/pw/slack-desc b/system/pw/slack-desc
new file mode 100644
index 0000000000..c99435a81d
--- /dev/null
+++ b/system/pw/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+  |-----handy-ruler------------------------------------------------------|
+pw: pw (view data passing through a pipe)
+pw:
+pw: pw stands for Pipe Watch, a utility that continuously reads lines
+pw: of text from a pipe or pipe-like source, passes them through a FIFO
+pw: buffer, and maintains a display based on occasionally sampling the
+pw: contents of the FIFO buffer, with useful features such as triggering
+pw: and filtering.
+pw:
+pw: pw can monitor anything that produces textual output. tail -f
+pw: /var/logfile, tcpdump, strace, ...
+pw:
diff --git a/system/pwgen/README b/system/pwgen/README
index c22befe4b8..c5775b281e 100644
--- a/system/pwgen/README
+++ b/system/pwgen/README
@@ -1,2 +1,2 @@
-Pwgen is a small, GPL'ed password generator which creates passwords which 
-can be easily memorized by a human.
+Pwgen is a small, GPL'ed password generator which creates passwords
+which can be easily memorized by a human.
diff --git a/system/pwgen/pwgen.SlackBuild b/system/pwgen/pwgen.SlackBuild
index f767667817..c770d6060f 100644
--- a/system/pwgen/pwgen.SlackBuild
+++ b/system/pwgen/pwgen.SlackBuild
@@ -1,38 +1,35 @@
-#!/bin/sh
+#!/bin/bash
 
-# A slackbuild script for pwgen
+# Slackware build script for pwgen
 
-# Copyright (c) 2007, Timothy Pollard
+# Copyright 2007  Timothy Pollard
+# Copyright 2022  Johannes Schoepfer, Germany
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
 #
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by the SlackBuilds.org project
-# No additional license terms added
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=pwgen
-VERSION=${VERSION:-2.07}
+VERSION=${VERSION:-2.08}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -42,7 +39,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -96,11 +97,11 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
+cp debian/{changelog,copyright} $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pwgen/pwgen.info b/system/pwgen/pwgen.info
index a6f58832a9..bfcfefaac4 100644
--- a/system/pwgen/pwgen.info
+++ b/system/pwgen/pwgen.info
@@ -1,10 +1,10 @@
 PRGNAM="pwgen"
-VERSION="2.07"
-HOMEPAGE="https://sourceforge.net/projects/pwgen/"
-DOWNLOAD="https://downloads.sourceforge.net/pwgen/pwgen-2.07.tar.gz"
-MD5SUM="910b1008cdd86445e9e01305d21ee4c5"
+VERSION="2.08"
+HOMEPAGE="https://github.com/tytso/pwgen"
+DOWNLOAD="https://downloads.sourceforge.net/pwgen/pwgen-2.08.tar.gz"
+MD5SUM="6cfba450ac6ff72d11e88a6b0b049165"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Timothy Pollard"
-EMAIL="sbo@timp.com.au"
+MAINTAINER="Johannes Schoepfer"
+EMAIL="slackbuilds@schoepfer.info"
diff --git a/system/pwgen/slack-desc b/system/pwgen/slack-desc
index 2b2d256d48..9e19b8b600 100644
--- a/system/pwgen/slack-desc
+++ b/system/pwgen/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
      |-----handy-ruler------------------------------------------------------|
-pwgen: pwgen (A small tool to generate semi-random passwords)
+pwgen: pwgen (semi-random password generator)
 pwgen:
 pwgen: Pwgen is a small, GPL'ed password generator which creates passwords
 pwgen: which can be easily memorized by a human.
 pwgen:
 pwgen: Note: The passwords generated by this program aren't as secure as
-pwgen: fully random passwords, but they are certainly better than
-pwgen: "password1" or similar :-).
+pwgen: fully random passwords.
+pwgen:
+pwgen: https://github.com/tytso/pwgen
 pwgen:
-pwgen: https://sourceforge.net/projects/pwgen/
 pwgen:
diff --git a/system/pwman/README b/system/pwman/README
index 7f4ec3cf94..662a098d8b 100644
--- a/system/pwman/README
+++ b/system/pwman/README
@@ -1,18 +1,21 @@
 PWman (An NCurses password management program)
 
-PWMan is a password manager which uses gpg encryption to safeguard your data.
-It provides a simple and easy to use command line (NCurses) interface to 
-manage, store, search and retrieve your passwords.
+PWMan is a password manager which uses gpg encryption to safeguard
+your data. It provides a simple and easy to use command line
+(NCurses) interface to manage, store, search and retrieve your
+passwords.
 
 The look and feel is based on Jaakko Heinonen's abook.
 
 BEFORE USING PWMAN
 
-While compilation does not directly require it, usage relies on Gnu Privacy 
-Guard (gpg) being installed. You will need to specify a GnuPG ID the
-first time a user runs pwman, so this must be set up beforehand.
+While compilation does not directly require it, usage relies on
+Gnu Privacy Guard (gpg) being installed. You will need to specify
+a GnuPG ID the first time a user runs pwman, so this must be set up
+beforehand.
 
-There is more information on the gpg manpage, but you can probably just run
+There is more information on the gpg manpage, but you can probably
+just run:
 
  % gpg --gen-key
 
diff --git a/system/pwman/pwman.SlackBuild b/system/pwman/pwman.SlackBuild
index a057496866..b8f19d1537 100644
--- a/system/pwman/pwman.SlackBuild
+++ b/system/pwman/pwman.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
@@ -20,11 +20,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org to fix the build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=pwman
 VERSION=${VERSION:-0.4.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -68,11 +76,11 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
+  -exec chmod 755 {} \+ -o \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
+  -exec chmod 644 {} \+
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -80,10 +88,7 @@ CFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make 
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -110,4 +115,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pwsafe/README b/system/pwsafe/README
index 4ca9f59485..0a25ed6cee 100644
--- a/system/pwsafe/README
+++ b/system/pwsafe/README
@@ -1,3 +1,4 @@
-pwsafe is a unix commandline program that manages encrypted password databases.
-It can be used as a pure command-line operation or can interact with X11
-selection & clipboard. It is compatible with CounterPane's PasswordSafe.
+pwsafe is a unix commandline program that manages encrypted password
+databases. It can be used as a pure command-line operation or
+can interact with X11 selection & clipboard. It is compatible with
+CounterPane's PasswordSafe.
diff --git a/system/pwsafe/pwsafe.SlackBuild b/system/pwsafe/pwsafe.SlackBuild
index ed9a528fd5..d8fc14e0fc 100644
--- a/system/pwsafe/pwsafe.SlackBuild
+++ b/system/pwsafe/pwsafe.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pwsafe
 # Written by Tom Fitzhenry <tom@fitzhenry.name> 2007/08/22
 # Modified by Robby Workman  20071025
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pwsafe
 VERSION=${VERSION:-0.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -17,7 +20,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -82,4 +92,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pyarchey/pyarchey.SlackBuild b/system/pyarchey/pyarchey.SlackBuild
index fec36e33d2..13c31d3a21 100644
--- a/system/pyarchey/pyarchey.SlackBuild
+++ b/system/pyarchey/pyarchey.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pyarchey
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pyarchey
 VERSION=${VERSION:-0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -83,4 +93,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pyarchey/pyarchey.info b/system/pyarchey/pyarchey.info
index d818a8e6af..e455eabcb3 100644
--- a/system/pyarchey/pyarchey.info
+++ b/system/pyarchey/pyarchey.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://pypi.python.org/packages/b5/92/f14e25f1aac20ec32870954697375e3
 MD5SUM="b953c5e1d135fafbb8ea1096b25e23bb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="psutil"
+REQUIRES="python2-psutil"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/system/pycp/pycp.SlackBuild b/system/pycp/pycp.SlackBuild
index ef909d2738..7142d69ceb 100644
--- a/system/pycp/pycp.SlackBuild
+++ b/system/pycp/pycp.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for pycp.
 #
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pycp
 VERSION=${VERSION:-8.0.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -74,4 +84,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pymux/README b/system/pymux/README
deleted file mode 100644
index 89a3c6f5fa..0000000000
--- a/system/pymux/README
+++ /dev/null
@@ -1 +0,0 @@
-A terminal multiplexer (like tmux) in Python
diff --git a/system/pymux/pymux.SlackBuild b/system/pymux/pymux.SlackBuild
deleted file mode 100644
index 5bac6c66fb..0000000000
--- a/system/pymux/pymux.SlackBuild
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for pymux
-
-# Copyright 2016-2017  Dimitris Zlatanidis  Orestiada, Greece
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=pymux
-VERSION=${VERSION:-0.14}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.rst PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/pymux/pymux.info b/system/pymux/pymux.info
deleted file mode 100644
index 13d7bcd0a5..0000000000
--- a/system/pymux/pymux.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="pymux"
-VERSION="0.14"
-HOMEPAGE="https://github.com/jonathanslenders/pymux"
-DOWNLOAD="https://pypi.python.org/packages/27/3c/8b1a9c7e765a72a0c0fbb21c606dddea84d704d4fa1d4a68ef953ba85196/pymux-0.14.tar.gz"
-MD5SUM="e82f13c59f3e1189c8c624e269dd1ef0"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="prompt_toolkit pyte docopt"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/system/pymux/slack-desc b/system/pymux/slack-desc
deleted file mode 100644
index 7113135114..0000000000
--- a/system/pymux/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-     |-----handy-ruler------------------------------------------------------|
-pymux: pymux (Python terminal multiplexer)
-pymux:
-pymux: A terminal multiplexer (like tmux) in Python
-pymux:
-pymux: Homepage: https://github.com/jonathanslenders/pymux
-pymux:
-pymux:
-pymux:
-pymux:
-pymux:
-pymux:
diff --git a/system/python-urwid/README b/system/python-urwid/README
new file mode 100644
index 0000000000..3adc50eeca
--- /dev/null
+++ b/system/python-urwid/README
@@ -0,0 +1,4 @@
+Urwid is a console user interface library for Python. It is released
+under the GNU Lesser General Public License and includes many
+(too many to list) features useful for text console application
+developers.  Urwid was written by Ian Ward.
diff --git a/system/python-urwid/python-urwid.SlackBuild b/system/python-urwid/python-urwid.SlackBuild
new file mode 100644
index 0000000000..3d3bfff38c
--- /dev/null
+++ b/system/python-urwid/python-urwid.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/bash
+
+# Slackware build script for python-urwid
+# Copyright 2017- Dave Woodfall <dave@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# 20220425 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - strip libraries.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=python-urwid
+SRCNAM=urwid
+VERSION=${VERSION:-2.1.2}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+python2 setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.rst docs examples $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/python-urwid/python-urwid.info b/system/python-urwid/python-urwid.info
new file mode 100644
index 0000000000..712a90dd13
--- /dev/null
+++ b/system/python-urwid/python-urwid.info
@@ -0,0 +1,10 @@
+PRGNAM="python-urwid"
+VERSION="2.1.2"
+HOMEPAGE="http://urwid.org"
+DOWNLOAD="https://pypi.org/packages/source/u/urwid/urwid-2.1.2.tar.gz"
+MD5SUM="f7f4e6bed9ba38965dbd619520f39287"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="D Woodfall"
+EMAIL="dave@slackbuilds.org"
diff --git a/system/python-urwid/slack-desc b/system/python-urwid/slack-desc
new file mode 100644
index 0000000000..9fbeab90cb
--- /dev/null
+++ b/system/python-urwid/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+python-urwid: python-urwid (python console UI module)
+python-urwid:
+python-urwid: Urwid is a console user interface library for Python. It is released
+python-urwid: under the GNU Lesser General Public License and includes many
+python-urwid: (too many to list) features useful for text console application
+python-urwid: developers.
+python-urwid:
+python-urwid: Urwid was written by Ian Ward.
+python-urwid:
+python-urwid: More info at: http://urwid.org
+python-urwid:
diff --git a/system/python3-docker-compose/README b/system/python3-docker-compose/README
new file mode 100644
index 0000000000..103c009508
--- /dev/null
+++ b/system/python3-docker-compose/README
@@ -0,0 +1,7 @@
+Compose is a tool for defining and running multi-container Docker
+applications.  With Compose, you use a Compose file to configure your
+application's services.  Then, using a single command, you create
+and start all the services from your configuration.
+
+Compose is great for development, testing, and staging environments,
+as well as CI workflows.
diff --git a/system/python3-docker-compose/python3-docker-compose.SlackBuild b/system/python3-docker-compose/python3-docker-compose.SlackBuild
new file mode 100644
index 0000000000..316cf7ee6d
--- /dev/null
+++ b/system/python3-docker-compose/python3-docker-compose.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+# Slackware build script for python3-docker-compose
+
+# Copyright 2022  fourtysixandtwo <fourtysixandtwo@sliderr.net>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=python3-docker-compose
+SRCNAM=${PRGNAM#python3-*}
+VERSION=${VERSION:-1.29.2}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Remove upper bound on requires.
+sed -i "s/, < .*',$/',/" setup.py
+
+python3 setup.py install --root=$PKG
+
+# Completion.
+install -D -m 0644 contrib/completion/bash/docker-compose \
+  $PKG/usr/share/bash-completion/completions/docker-compose
+install -D -m 0644 contrib/completion/zsh/_docker-compose \
+  $PKG/usr/share/zsh/site-functions/_docker-compose
+install -D -m 0644 contrib/completion/fish/docker-compose.fish \
+  $PKG/usr/share/fish/vendor_completions.d/docker-compose.fish
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/python3-docker-compose/python3-docker-compose.info b/system/python3-docker-compose/python3-docker-compose.info
new file mode 100644
index 0000000000..d50916cb3e
--- /dev/null
+++ b/system/python3-docker-compose/python3-docker-compose.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-docker-compose"
+VERSION="1.29.2"
+HOMEPAGE="https://docs.docker.com/compose/"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/d/docker-compose/docker-compose-1.29.2.tar.gz"
+MD5SUM="95accbca655abf086a61b94d6c3d94ca"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3-docopt python3-jsonschema python3-docker python3-dockerpty python3-texttable python3-dotenv"
+MAINTAINER="fourtysixandtwo"
+EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/system/python3-docker-compose/slack-desc b/system/python3-docker-compose/slack-desc
new file mode 100644
index 0000000000..bc2c7d5f11
--- /dev/null
+++ b/system/python3-docker-compose/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                      |-----handy-ruler------------------------------------------------------|
+python3-docker-compose: python3-docker-compose (multi-container orchestration for docker)
+python3-docker-compose:
+python3-docker-compose: Compose is a tool for defining and running multi-container Docker
+python3-docker-compose: applications.  With Compose, you use a Compose file to configure your
+python3-docker-compose: application's services.  Then, using a single command, you create and
+python3-docker-compose: start all the services from your configuration.
+python3-docker-compose:
+python3-docker-compose: Homepage: https://docs.docker.com/compose/
+python3-docker-compose:
+python3-docker-compose:
+python3-docker-compose:
diff --git a/system/python3-nvidia-ml-py/README b/system/python3-nvidia-ml-py/README
new file mode 100644
index 0000000000..cd088ab039
--- /dev/null
+++ b/system/python3-nvidia-ml-py/README
@@ -0,0 +1,21 @@
+pyNVML
+
+Python bindings to the NVIDIA Management Library
+Provides a Python interface to GPU management and monitoring functions.
+
+This is a wrapper around the NVML library. For information about the
+NVML library, see the NVML developer page
+http://developer.nvidia.com/nvidia-management-library-nvml
+
+Download the latest package from:
+http://pypi.python.org/pypi/nvidia-ml-py/
+
+
+The nvml header file contains function documentation that is relevant to
+this wrapper. The header file is distributed with.
+https://developer.nvidia.com/gpu-deployment-kit
+
+The main difference is this library handles allocating structs and
+passing pointers to the functions, before returning the desired value.
+Non-success return codes are raised as exceptions as described in the
+section below.
diff --git a/system/python3-nvidia-ml-py/python3-nvidia-ml-py.SlackBuild b/system/python3-nvidia-ml-py/python3-nvidia-ml-py.SlackBuild
new file mode 100644
index 0000000000..56701e8ea9
--- /dev/null
+++ b/system/python3-nvidia-ml-py/python3-nvidia-ml-py.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+# Slackware build script for python3-nvidia-ml-py
+
+# Copyright 2023, Lockywolf
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=python3-nvidia-ml-py
+TARNAM=nvidia-ml-py
+VERSION=${VERSION:-12.535.133}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $TARNAM-$VERSION
+tar xvf $CWD/$TARNAM-$VERSION.tar.gz
+cd $TARNAM-$VERSION
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
+
+python3 setup.py install --root=$PKG
+
+## If your application only has a pyproject.toml:
+
+#python3 -m build --wheel --no-isolation
+
+#python3 -m installer --destdir "$PKG" dist/*.whl
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/lib${LIBDIRSUFFIX}/python3.9/site-packages/example.py $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/python3-nvidia-ml-py/python3-nvidia-ml-py.info b/system/python3-nvidia-ml-py/python3-nvidia-ml-py.info
new file mode 100644
index 0000000000..4f8abf8b63
--- /dev/null
+++ b/system/python3-nvidia-ml-py/python3-nvidia-ml-py.info
@@ -0,0 +1,10 @@
+PRGNAM="python3-nvidia-ml-py"
+VERSION="12.535.133"
+HOMEPAGE="https://pypi.org/project/nvidia-ml-py/"
+DOWNLOAD="https://files.pythonhosted.org/packages/c9/f5/35d8002a4a9532c58fa304046de2d9b8be18183c341c517ac48f2bce907a/nvidia-ml-py-12.535.133.tar.gz"
+MD5SUM="64e3bc3b8718767771d5d366a3109cba"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.nvidia-ml-py_2023-11-28@lockywolf.net"
diff --git a/system/python3-nvidia-ml-py/slack-desc b/system/python3-nvidia-ml-py/slack-desc
new file mode 100644
index 0000000000..8de51ef212
--- /dev/null
+++ b/system/python3-nvidia-ml-py/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+python3-nvidia-ml-py: python3-nvidia-ml-py (bindings to the NVIDIA Management Library)
+python3-nvidia-ml-py:
+python3-nvidia-ml-py: Provides a Python interface to GPU management and monitoring
+python3-nvidia-ml-py: functions. This is a wrapper around the NVML library. For
+python3-nvidia-ml-py: information about the NVML library, see the NVML developer page
+python3-nvidia-ml-py: http://developer.nvidia.com/nvidia-management-library-nvml
+python3-nvidia-ml-py:
+python3-nvidia-ml-py:
+python3-nvidia-ml-py:
+python3-nvidia-ml-py:
+python3-nvidia-ml-py:
diff --git a/system/python3-urwid/README b/system/python3-urwid/README
deleted file mode 100644
index 8a347c7acb..0000000000
--- a/system/python3-urwid/README
+++ /dev/null
@@ -1,8 +0,0 @@
-python3-urwid -- urwid for python3
-
-Urwid is a console user interface library for Python. It is released
-under the GNU Lesser General Public License and includes many
-(too many to list) features useful for text console application
-developers.  Urwid was written by Ian Ward.
-
-python3-urwid does not clash with the Slackware 14.2 urwid package.
diff --git a/system/python3-urwid/python3-urwid.SlackBuild b/system/python3-urwid/python3-urwid.SlackBuild
deleted file mode 100644
index 94695a76fe..0000000000
--- a/system/python3-urwid/python3-urwid.SlackBuild
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for python3-urwid
-# Copyright 2017 David Woodfall <dave@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=python3-urwid
-SRCNAM=urwid
-VERSION=${VERSION:-2.0.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python3 setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/python3-urwid/python3-urwid.info b/system/python3-urwid/python3-urwid.info
deleted file mode 100644
index f883fa3cc8..0000000000
--- a/system/python3-urwid/python3-urwid.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-urwid"
-VERSION="2.0.1"
-HOMEPAGE="http://urwid.org"
-DOWNLOAD="https://pypi.org/packages/source/u/urwid/urwid-2.0.1.tar.gz"
-MD5SUM="c70a7016fa1ad2c2a979dbebd4de78c2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3"
-MAINTAINER="David Woodfall"
-EMAIL="dave@slackbuilds.org"
diff --git a/system/python3-urwid/slack-desc b/system/python3-urwid/slack-desc
deleted file mode 100644
index 11f891b093..0000000000
--- a/system/python3-urwid/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-             |-----handy-ruler------------------------------------------------------|
-python3-urwid: python3-urwid (python3 console UI module)
-python3-urwid:
-python3-urwid: Urwid is a console user interface library for Python. It is released
-python3-urwid: under the GNU Lesser General Public License and includes many
-python3-urwid: (too many to list) features useful for text console application
-python3-urwid: developers.
-python3-urwid:
-python3-urwid: Urwid was written by Ian Ward.
-python3-urwid:
-python3-urwid: More info at: http://urwid.org
-python3-urwid:
diff --git a/system/pytrash/pytrash.SlackBuild b/system/pytrash/pytrash.SlackBuild
index f39bc84d71..3fa9b0cbe3 100644
--- a/system/pytrash/pytrash.SlackBuild
+++ b/system/pytrash/pytrash.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for pytrash
 #
@@ -27,10 +27,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=pytrash
-VERSION=${VERSION:-1.1.4}
+VERSION=${VERSION:-1.1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -40,7 +43,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -74,7 +84,11 @@ mkdir -p $PKG/usr/bin
 install --mode=755 src/$PRGNAM $PKG/usr/bin
 
 cp -R etc $PKG
-chmod 755 $PKG/etc/bash_completion.d/$PRGNAM-bash-complition.sh
+
+mkdir -p $PKG/usr/share/bash-completion/completions
+mv $PKG/etc/bash_completion.d/$PRGNAM-bash-complition.sh \
+   $PKG/usr/share/bash-completion/completions/$PRGNAM
+rm -rf $PKG/etc/bash_completion.d
 
 # python libs
 PY3VER="$(python3 -c 'import sys; ver = sys.version_info; \
@@ -93,11 +107,11 @@ DOCS=$PKG/usr/doc/$PRGNAM-$VERSION
 mkdir -p $DOCS
 cat $CWD/$PRGNAM.SlackBuild > $DOCS/$PRGNAM.SlackBuild
 cat $CWD/README > $DOCS/README
-cp -a AUTHORS ChangeLog.txt INSTALL LICENSE README.md requirements.txt $DOCS
+cp -a AUTHORS ChangeLog.txt INSTALL LICENSE README.md $DOCS
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # make the package
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/pytrash/pytrash.info b/system/pytrash/pytrash.info
index 52f87d15fd..439a8ecf97 100644
--- a/system/pytrash/pytrash.info
+++ b/system/pytrash/pytrash.info
@@ -1,10 +1,10 @@
 PRGNAM="pytrash"
-VERSION="1.1.4"
+VERSION="1.1.5"
 HOMEPAGE="https://github.com/MyRequiem/pytrash"
-DOWNLOAD="https://github.com/MyRequiem/pytrash/archive/1.1.4/pytrash-1.1.4.tar.gz"
-MD5SUM="4752cb6a3e71922fe4c3df7f2eecaf90"
+DOWNLOAD="https://github.com/MyRequiem/pytrash/archive/1.1.5/pytrash-1.1.5.tar.gz"
+MD5SUM="ed9fdfa5c50984d0bb1e245f9887a96e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
+REQUIRES=""
 MAINTAINER="Vladimir MyRequiem"
 EMAIL="mrvladislavovich@gmail.com"
diff --git a/system/qControlCenter/qControlCenter.SlackBuild b/system/qControlCenter/qControlCenter.SlackBuild
index 6b0eb81a6b..bbfdde8cde 100644
--- a/system/qControlCenter/qControlCenter.SlackBuild
+++ b/system/qControlCenter/qControlCenter.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # This script creates a Slackware package for qControlCenter
 
 # Copyright 2016 Didier Spaier, Paris, France
@@ -21,14 +21,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=qControlCenter
 VERSION=${VERSION:-0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH="noarch"
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,4 +75,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/qControlCenter/qControlCenter.info b/system/qControlCenter/qControlCenter.info
index 6d0f29feec..9e41781177 100644
--- a/system/qControlCenter/qControlCenter.info
+++ b/system/qControlCenter/qControlCenter.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/DidierSpaier/qControlCenter/archive/v0.2/qControlCe
 MD5SUM="110e6abc5c242a9b6f0bab76ef3fa2e4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pyxdg"
+REQUIRES=""
 MAINTAINER="Didier Spaier"
 EMAIL="didier~at~slint~dot~fr"
diff --git a/system/qdirstat/README b/system/qdirstat/README
index 836b12ddd5..d389462155 100644
--- a/system/qdirstat/README
+++ b/system/qdirstat/README
@@ -1,15 +1,20 @@
 QDirStat is a graphical application to show where your disk space has
 gone and to help you to clean it up.
 
-This is a Qt-only port of the old Qt3/KDE3-based KDirStat, now based on
-the latest Qt 5. It does not need any KDE libs or infrastructure. It
-runs on every X11-based desktop on Linux, BSD and other Unix-like systems.
+This is a Qt-only port of the old Qt3/KDE3-based KDirStat,
+now based on the latest Qt 5. It does not need any KDE libs or
+infrastructure. It runs on every X11-based desktop on Linux, BSD and
+other Unix-like systems.
 
-QDirStat has a number of new features compared to KDirStat. To name a few:
+QDirStat has a number of new features compared to KDirStat. To name
+a few:
 
  * Multi-selection in both the tree and the treemap.
  * Unlimited number of user-defined cleanup actions.
- * Properly show errors of cleanup actions (and their output, if desired).
- * File categories (MIME types) and their treemap color are now configurable.
+ * Properly show errors of cleanup actions (and their output, if
+   desired).
+ * File categories (MIME types) and their treemap color are now
+   configurable.
  * Exclude rules for directories are easily configurable.
- * Desktop-agnostic; no longer relies on KDE or any other specific desktop.
+ * Desktop-agnostic; no longer relies on KDE or any other specific
+   desktop.
diff --git a/system/qdirstat/qdirstat.SlackBuild b/system/qdirstat/qdirstat.SlackBuild
index c650048ca5..1c25f797d6 100644
--- a/system/qdirstat/qdirstat.SlackBuild
+++ b/system/qdirstat/qdirstat.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for qdirstat
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=qdirstat
-VERSION=${VERSION:-1.6.1}
+VERSION=${VERSION:-1.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -90,4 +100,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/qdirstat/qdirstat.info b/system/qdirstat/qdirstat.info
index b4f7a61f78..f45605d015 100644
--- a/system/qdirstat/qdirstat.info
+++ b/system/qdirstat/qdirstat.info
@@ -1,10 +1,10 @@
 PRGNAM="qdirstat"
-VERSION="1.6.1"
+VERSION="1.7.1"
 HOMEPAGE="https://github.com/shundhammer/qdirstat/"
-DOWNLOAD="https://github.com/shundhammer/qdirstat/archive/1.6.1/qdirstat-1.6.1.tar.gz"
-MD5SUM="4cdf3cea0a9c0e7cedbf2ce01cf632ea"
+DOWNLOAD="https://github.com/shundhammer/qdirstat/archive/1.7.1/qdirstat-1.7.1.tar.gz"
+MD5SUM="551b48dcb8006727166d5b167a2af675"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5"
+REQUIRES=""
 MAINTAINER="Alan Aversa"
 EMAIL="alan.aveNOrsaSP@AMcox.net (remove NO and SPAM)"
diff --git a/system/qemu-guest-agent/qemu-guest-agent.SlackBuild b/system/qemu-guest-agent/qemu-guest-agent.SlackBuild
index bfe556db18..0e558d434b 100644
--- a/system/qemu-guest-agent/qemu-guest-agent.SlackBuild
+++ b/system/qemu-guest-agent/qemu-guest-agent.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for qemu-guest-agent
 
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=qemu-guest-agent
 SRCNAM=qemu
 VERSION=${VERSION:-2.12.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -104,4 +114,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/qemu/README b/system/qemu/README
index a7d678fa8d..1c9b196e0c 100644
--- a/system/qemu/README
+++ b/system/qemu/README
@@ -9,10 +9,12 @@ the kvm-kmod modules and executing the guest code directly on the host
 CPU.  Slackware provides pre-built 32/64 bit x86 kvm-kmod modules or you
 can build different versions with the kvm-kmod package.
 
-By default, this script builds only the x86 and arm emulation targets
-for qemu; if you prefer to build all supported targets, do this:
+By default, this script builds all emulation targets for qemu; if you
+prefer to build specific target(s), do this:
 
-  TARGETS=all ./qemu.SlackBuild
+  TARGETS=arm-softmmu,arm-linux-user,armeb-linux-user ./qemu.SlackBuild
+
+(Refer to qemu documentation for available emulation targets.)
 
 Disable vnc support via:
 
@@ -39,20 +41,20 @@ your processor) prior to launching qemu-system-ARCH with kvm enabled.
 For older/unmaintained qemu frontends, this build also creates a symlink
 to qemu-system-ARCH at /usr/bin/qemu-kvm.
 
-libiscsi, libcacard, spice, usbredir, virglrenderer,
-device-tree-compiler, libnfs, snappy, glusterfs and vde2 are optional
-dependencies.
+libslirp (user mode networking), libcacard, spice, usbredir,
+virglrenderer, libnfs, snappy, device-tree-compiler, glusterfs, and vde2
+are optional dependencies.
+
+To enable user mode networking, install libslirp (availale on SBO), then
+compile qemu:
 
-NOTE:
-To compile with virglrenderer, you will need to upgrade to
-mesa-12.0.0 or higher.
+SLIRP=yes ./qemu.SlackBuild
 
-Sphinx is optional but required in order for any of the documentation to be
-built. 
+libiscsi (to access iSCSI targets directly) is optional dependency,
+and will be picked up, if present, during the compilation.
 
-libseccomp (to use libvirt) and libiscsi (to access iSCSI targets
-directly) are optional dependencies, and will be picked up, if
-present, during the compilation.
+sphinx-rtd-theme and Sphinx (both on SBo) are  optional but required in
+order for any of the documentation to be built.
 
 If you wish to emulate ARM, you will want device-tree-compiler.
 
@@ -60,5 +62,6 @@ NOTES:
   This version breaks some backward compatibility with earlier versions.
   Consult the official changelogs for details.
 
-  SDL 1.2 support is deprecated, SDL 2.0 should be used instead.
-  Python 3.x can be used to build QEMU.
+  If there are problems after upgrading with missing or wrong versioned
+  libraries please try uninstalling any previous versions before
+  rebuilding a new one.
diff --git a/system/qemu/doinst.sh b/system/qemu/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/system/qemu/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild
index 57a43b834a..73604dc9e3 100644
--- a/system/qemu/qemu.SlackBuild
+++ b/system/qemu/qemu.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for qemu
 
 # Copyright 2009, 2010  Andrew Brouwers <abrouwers@gmail.com>
-# Copyright 2013-2018  Edward Koenig, Vancouver, USA <kingbeowulf@gmail.com>
+# Copyright 2013-2024  Edward W. Koenig, Vancouver, USA <kingbeowulf@linuxgalaxy.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,51 +23,20 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Changelog
-# 1.0   27-FEB-2013     New SBo maintainer
-# 1.0   07-MAR-2013     updated to 1.4, includes qemu-kvm; thanks to
-#                       rworkman and ponce for script ideas.
-# 1.1   28-MAR-2013     fix missing docs per C. Willing and
-#                       add missing --libdir (patched in qemu-trivial upstream)
-# 1.2   22-SEP-2013     updated to 1.6
-# 1.3   03-NOV-2013     updated to 1.6.1
-# 1.4   28-APR-2014     updated to 2.0.0 (thanks Callum Davies <calrogman@gmail.com>), added useful options,
-#                       clean ups, libusb version check.
-# 1.4a  04-MAY-2014     fixed typos thanks to sandb0y
-# 1.5   10-AUG-2014     updated to new version, watch for legacy "gotchas"
-# 1.6   18-NOV-2014     updated version, last of the 2.1 series, changed defaults per SBo list
-# 1.6a  23-NOV-2014     added overlooked AUDIODRIVERS switch per SBo list
-# 1.7   01-JAN-2015     updated to 2.2.0 ; build and link static libusb option (rw, tm, SBo list)
-# 1.8   27-APR-2015     updated to version 2.3.0
-# 1.9   14-MAY-2015     patched for "Venom" CVE-2015-3456 http://git.qemu.org/?p=qemu.git;a=commitdiff;h=e907746266721f305d67bc0718795fedee2e824c
-# 2.0   11-JUL-2015     patched for Heap-based buffer overflow in the PCNET controller CVE-2015-3209 http://git.qemu.org/?p=qemu.git;a=commitdiff;h=9f7c594c006289ad41169b854d70f5da6e400a2a
-# 2.1   27-JUL-2015     patched for heap overflow flaw while processing certain ATAPI commands CVE-2015-5154 http://git.qemu.org/?p=qemu.git;a=commitdiff;h=e40db4c6d391419c0039fe274c74df32a6ca1a28;hp=f793d97e454a56d17e404004867985622ca1a63b
-# 3.0   05-SEP-2015     uprgraded to new version
-# 3.1   13-DEC-2015     uprgraded to new version, minor clean ups
-# 3.1   02-SEP-2016     upgraded.
-# 3.2   15-OCT-2016     upgraded to 2.7 release
-# 3.3   26-JAN-2017     upgraded to 2.8 release
-# 4.0   28-JAN-2017	add bridge-helper option, README additions/cosmetics (thanks to Andrzej T.)
-# 4.1   01-APR-2017	no foolin': various bug and CVE updates re: ponce https://lists.nongnu.org/archive/html/qemu-devel/2017-03/msg06332.html
-# 4.2   05-JUN-2017	version update to 2.9 release
-# 4.3	06-JAN-2018	version update to 2.10.x release
-# 4.4	17-Feb-2018	version update to 2.11.x release, Spectre/Meltdown mitigation
-# 4.5   03-Jun-2018     version update to 2.12.0 release, note new deps: sdl2, gtk+3
-# 5.0   14-Dec-2018	version update to 3.1.0 release, note minimum dependency versions on release notes
-# 6.0   14-JUL-2019	version update to 4.0.0 release, note minimum dependency versions on release notes, doc fixes
-# 6.1   19-AUG-2019	version update
-# 6.2   16-Nov-2020     version update, 14.2 final release.
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=qemu
-VERSION=${VERSION:-4.1.1}
+VERSION=${VERSION:-8.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 KVMGROUP=${KVMGROUP:-users}
-TARGETS=${TARGETS:-some}
+TARGETS=${TARGETS:-all}
 VNC_ENABLE=${VNC_ENABLE:-yes}
 AUDIODRIVERS=${AUDIODRIVERS:-pa,alsa,oss,sdl}
 BRIDGE_HELPER_SETUID=${BRIDGE_HELPER_SETUID:-no}
+SLIRP=${SLIRP:-=no}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -77,7 +46,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -102,6 +75,9 @@ fi
 # Needed to build man pages if built after plain "su"
 export PATH=$PATH:/usr/share/texmf/bin
 
+# Autodetect liburing support
+uring="dis" ; if pkg-config --exists liburing ; then uring="en" ; fi
+
 set -e
 
 rm -rf $PKG
@@ -113,9 +89,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} + || true
 
 # Remove double CFLAGS
 sed -i "s|^\ \ CFLAGS=\"-O2\ |  CFLAGS=\"|" configure
@@ -125,7 +101,7 @@ sed -i "s|^\ \ CFLAGS=\"-O2\ |  CFLAGS=\"|" configure
 if [ "$TARGETS" = "all" ]; then
   targets=""
 else
-  targets="--target-list=i386-softmmu,x86_64-softmmu,i386-linux-user,x86_64-linux-user,arm-softmmu,arm-linux-user,armeb-linux-user"
+  targets="--target-list=$TARGETS"
 fi
 
 # To omit VNC capability, use VNC_ENABLE=no
@@ -135,6 +111,13 @@ else
   with_vnc="--disable-vnc"
 fi
 
+# To enable user mode networking use SLIRP=yes
+if [ "$SLIRP" = "yes" ]; then
+  with_slirp="--enable-slirp"
+else
+  with_slirp=""
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -149,20 +132,20 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-debug-info \
   --enable-virtfs \
   --enable-sdl \
-  --enable-jemalloc \
+  --enable-malloc=jemalloc \
+  --enable-fdt=auto \
   --enable-nettle \
+  --${uring}able-linux-io-uring \
   --audio-drv-list=${AUDIODRIVERS} \
+  $with_slirp \
   $with_vnc \
   $targets
 
-# Make these first; otherwise make won't run in parallel.
-make config-all-devices.mak config-all-disas.mak
-
 make V=1
 make install DESTDIR=$PKG
 
 # Remove empty /var
-rm -rf $PKG/var/run
+rm -rf $PKG/var
 
 # install some udev rules for /dev/kvm
 # Note: no udev rules for usb pasthrough when running qemu as non-root on linux hosts. See Section 2.11.2
@@ -191,12 +174,13 @@ fi
 
 # Add docs to the proper location
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changelog COPYING* CODING_STYLE HACKING LICENSE MAINTAINERS README docs/* \
+cp -a COPYING* LICENSE MAINTAINERS README.rst docs/* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info
index ff582deea0..7e9f20f028 100644
--- a/system/qemu/qemu.info
+++ b/system/qemu/qemu.info
@@ -1,10 +1,10 @@
 PRGNAM="qemu"
-VERSION="4.1.1"
+VERSION="8.2.2"
 HOMEPAGE="https://www.qemu.org"
-DOWNLOAD="https://download.qemu.org/qemu-4.1.1.tar.xz"
-MD5SUM="53879f792ef2675c6c5e6cbf5cc1ac6c"
+DOWNLOAD="https://download.qemu.org/qemu-8.2.2.tar.xz"
+MD5SUM="e43091262671c1728b09522932b75b1d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL2"
+REQUIRES=""
 MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
+EMAIL="kingbeowulf@linuxgalaxy.org"
diff --git a/system/qingy/README b/system/qingy/README
deleted file mode 100644
index c87bed232c..0000000000
--- a/system/qingy/README
+++ /dev/null
@@ -1,34 +0,0 @@
-qingy (Framebuffer getty replacement)
-
-qingy is a replacement of getty.
-Written in C, it uses DirectFB to provide a fast, nice GUI
-without the overhead of the X Window System.
-It allows the user to log in and start the session of his choice
-(text console, gnome, kde, wmaker, ...).
-
-This SlackBuild compiles qingy without its screensaver feature because
-it caused qingy to crash immediately upon startup and render the terminal
-unusable.
-
-To use qingy as a replacement for agetty, simply edit your /etc/inittab
-and change the console login lines from:
-
-  c1:12345:respawn:/sbin/agetty --noclear 38400 tty1 linux
-  c2:12345:respawn:/sbin/agetty 38400 tty2 linux
-  c3:12345:respawn:/sbin/agetty 38400 tty3 linux
-  c4:12345:respawn:/sbin/agetty 38400 tty4 linux
-  c5:12345:respawn:/sbin/agetty 38400 tty5 linux
-  c6:12345:respawn:/sbin/agetty 38400 tty6 linux
-
-to
-
-  c1:12345:respawn:/sbin/qingy tty1
-  c2:12345:respawn:/sbin/qingy tty2
-  c3:12345:respawn:/sbin/qingy tty3
-  c4:12345:respawn:/sbin/qingy tty4
-  c5:12345:respawn:/sbin/qingy tty5
-  c6:12345:respawn:/sbin/qingy tty6
-
-It would be wise to leave agetty on at least one console until you're
-sure that qingy is working correctly for you.
-
diff --git a/system/qingy/qingy.SlackBuild b/system/qingy/qingy.SlackBuild
deleted file mode 100644
index d8138f4645..0000000000
--- a/system/qingy/qingy.SlackBuild
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for qingy
-
-# Copyright 2012 Erik Falor <ewfalor@gmail.com> USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=qingy
-VERSION=${VERSION:-1.0.0}
-BUILD=${BUILD:-3}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  SLKLDFLAGS="-L/usr/X11R6/lib64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="$SLKLDFLAGS" \
-./configure \
-  --prefix=/usr \
-  --exec-prefix=/ \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux \
-  --disable-optimizations \
-  --disable-screen-savers \
-  --enable-static=no
-
-make
-make install-strip DESTDIR=$PKG
-
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*.info*
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/qingy/qingy.info b/system/qingy/qingy.info
deleted file mode 100644
index 69480ae131..0000000000
--- a/system/qingy/qingy.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="qingy"
-VERSION="1.0.0"
-HOMEPAGE="http://qingy.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/qingy/files/qingy/qingy%201.0.0/qingy-1.0.0.tar.bz2"
-MD5SUM="1e0912655e240adfd0ce5ced30bbc685"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="DirectFB"
-MAINTAINER="Erik Falor"
-EMAIL="ewfalor@gmail.com"
diff --git a/system/qingy/slack-desc b/system/qingy/slack-desc
deleted file mode 100644
index fe34e6762f..0000000000
--- a/system/qingy/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-     |-----handy-ruler------------------------------------------------------|
-qingy: qingy (Framebuffer getty replacement)
-qingy:
-qingy: qingy is a replacement of getty.
-qingy: Written in C, it uses DirectFB to provide a fast, nice GUI
-qingy: without the overhead of the X Window System.
-qingy: It allows the user to log in and start the session of his choice
-qingy: (text console, gnome, kde, wmaker, ...).
-qingy:
-qingy:
-qingy:
-qingy:
diff --git a/system/qingy_0.3_themepack/README b/system/qingy_0.3_themepack/README
deleted file mode 100644
index cffb898071..0000000000
--- a/system/qingy_0.3_themepack/README
+++ /dev/null
@@ -1,13 +0,0 @@
-qingy_0.3_themepack (Themes for the qingy login manager)
-
-Themes for the qingy DirectFB login manager.
-
-This package includes the following themes:
-
-    ComputerRoom  frag        matrix
-    aquaish       gentoo      vendetta
-    biohazard     gentoo_box  vendetta2
-    casablanca    kitten      vendetta3
-    fireplace     lambretta
-              
-Specify a setting by editing the "theme" setting in /etc/qingy/settings. 
diff --git a/system/qingy_0.3_themepack/qingy_0.3_themepack.SlackBuild b/system/qingy_0.3_themepack/qingy_0.3_themepack.SlackBuild
deleted file mode 100644
index e0ae30972f..0000000000
--- a/system/qingy_0.3_themepack/qingy_0.3_themepack.SlackBuild
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for qingy_0.3_themepack
-
-# Copyright 2012 Erik Falor <ewfalor@gmail.com> USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=qingy_0.3_themepack
-VERSION=${VERSION:-1.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_$VERSION.tar.bz2
-mv ${PRGNAM}_$VERSION $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Move the files in the archive into the package's directory
-THEMEDIR=$PKG/usr/share/qingy/themes
-mkdir -p $THEMEDIR
-for D in *; do
-  if [ -d $D ]; then
-    mv $D $THEMEDIR
-  fi
-done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/qingy_0.3_themepack/qingy_0.3_themepack.info b/system/qingy_0.3_themepack/qingy_0.3_themepack.info
deleted file mode 100644
index 0caf42702e..0000000000
--- a/system/qingy_0.3_themepack/qingy_0.3_themepack.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="qingy_0.3_themepack"
-VERSION="1.0"
-HOMEPAGE="http://qingy.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/qingy/files/qingy%20themes/themepack%20for%20qingy%200.3xx/qingy_0.3_themepack_1.0.tar.bz2"
-MD5SUM="578413ba5861c667674b6d65976a0370"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="qingy"
-MAINTAINER="Erik Falor"
-EMAIL="ewfalor@gmail.com"
diff --git a/system/qingy_0.3_themepack/slack-desc b/system/qingy_0.3_themepack/slack-desc
deleted file mode 100644
index 405475609b..0000000000
--- a/system/qingy_0.3_themepack/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-                   |-----handy-ruler------------------------------------------------------|
-qingy_0.3_themepack: qingy_0.3_themepack (Themes for the qingy login manager)
-qingy_0.3_themepack:
-qingy_0.3_themepack: Themes for the qingy DirectFB login manager.
-qingy_0.3_themepack:
-qingy_0.3_themepack:
-qingy_0.3_themepack:
-qingy_0.3_themepack:
-qingy_0.3_themepack:
-qingy_0.3_themepack:
-qingy_0.3_themepack:
-qingy_0.3_themepack:
diff --git a/system/qjoypad/README b/system/qjoypad/README
index 166daa2993..3ffb07f063 100644
--- a/system/qjoypad/README
+++ b/system/qjoypad/README
@@ -4,5 +4,5 @@ program with your game controller. It also lets you play games with
 your gamepad/joystick that otherwise don't have joystick/gamepad
 support.
 
-When launching qjoypad an icon will be placed in your system tray.  
+When launching qjoypad, an icon will be placed in your system tray.  
 Clicking on that icon will open the configuration GUI.
diff --git a/system/qjoypad/qjoypad.SlackBuild b/system/qjoypad/qjoypad.SlackBuild
index fe597ce673..66210b6335 100644
--- a/system/qjoypad/qjoypad.SlackBuild
+++ b/system/qjoypad/qjoypad.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for qjoypad
 
-# Copyright 2018 Matt Dinslage (daedra1980@gmail.com), Springfield, MO, USA
+# Copyright 2021 Matt Dinslage (daedra1980@gmail.com), Springfield, MO, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=qjoypad
-VERSION=${VERSION:-4.2.1}
+VERSION=${VERSION:-4.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,7 +79,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir build
+mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
@@ -79,10 +89,13 @@ cd build
     -DMAN_INSTALL_DIR=/usr/man \
     -DCMAKE_BUILD_TYPE=Release ..
 
-  make VERBOSE=1
-  make install VERBOSE=1 DESTDIR=$PKG
+  make
+  make install DESTDIR=$PKG
 cd ..
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -95,4 +108,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/qjoypad/qjoypad.info b/system/qjoypad/qjoypad.info
index ee4089fc10..b57db3f2c8 100644
--- a/system/qjoypad/qjoypad.info
+++ b/system/qjoypad/qjoypad.info
@@ -1,8 +1,8 @@
 PRGNAM="qjoypad"
-VERSION="4.2.1"
+VERSION="4.3.1"
 HOMEPAGE="https://github.com/panzi/qjoypad/"
-DOWNLOAD="https://github.com/panzi/qjoypad/archive/v4.2.1/qjoypad-4.2.1.tar.gz"
-MD5SUM="f48b92b313c4fc36ce04bda392a69d31"
+DOWNLOAD="https://github.com/panzi/qjoypad/archive/v4.3.1/qjoypad-4.3.1.tar.gz"
+MD5SUM="2aa11e6882696c85187ea5012cbd4aa4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/qjoypad/slack-desc b/system/qjoypad/slack-desc
index 6aed21e630..1b5f8c3cdd 100644
--- a/system/qjoypad/slack-desc
+++ b/system/qjoypad/slack-desc
@@ -1,17 +1,17 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
 qjoypad: qjoypad (convert gamepad buttons to keystrokes)
 qjoypad:
 qjoypad: qjoypad takes input from a gamepad or joystick and translates
 qjoypad: it into key strokes or mouse actions, letting you control any
-qjoypad: X-Windows program with your game controller. It also lets you play
-qjoypad: games with your gamepad/joystick that otherwise don't have
+qjoypad: X-Windows program with your game controller. It also lets you
+qjoypad: play games with your gamepad/joystick that otherwise don't have
 qjoypad: joystick/gamepad support.
 qjoypad:
 qjoypad:
diff --git a/system/qps/doinst.sh b/system/qps/doinst.sh
index 5fb28930db..65c7e2eeb9 100644
--- a/system/qps/doinst.sh
+++ b/system/qps/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/qps/qps.SlackBuild b/system/qps/qps.SlackBuild
index 42ff6009f2..f319f324ca 100644
--- a/system/qps/qps.SlackBuild
+++ b/system/qps/qps.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for qps
 
 # Copyright 2011-2017 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2022-2023 Isaac Yu <isaacyu@protonmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=qps
-VERSION=${VERSION:-20160713_7e679db}
+VERSION=${VERSION:-2.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +39,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,13 +62,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,26 +77,27 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mkdir -p build
+mkdir build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  install -D -m 0755 src/$PRGNAM $PKG/usr/bin/$PRGNAM
-  install -D -m 0644 src/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-  install -D -m 0644 ../icon/icon.xpm $PKG/usr/share/pixmaps/$PRGNAM.xpm
+  make install DESTDIR=$PKG
 cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/man/man1
-gzip -9c qps.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+mv $PKG/usr/share/man $PKG/usr
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/share/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG COPYING LICENSE.QPL README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -96,4 +105,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/qps/qps.info b/system/qps/qps.info
index fcc8604235..f86d887096 100644
--- a/system/qps/qps.info
+++ b/system/qps/qps.info
@@ -1,10 +1,10 @@
 PRGNAM="qps"
-VERSION="20160713_7e679db"
-HOMEPAGE="https://github.com/QtDesktop/qps"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/qps-20160713_7e679db.tar.xz"
-MD5SUM="d85ea5af2c57c28f93e9b22d8228e506"
+VERSION="2.7.0"
+HOMEPAGE="https://github.com/lxqt/qps"
+DOWNLOAD="https://github.com/lxqt/qps/releases/download/2.7.0/qps-2.7.0.tar.xz"
+MD5SUM="e5e33db8d827a9b6f58e735e2b689c72"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5"
-MAINTAINER="Matteo Bernardini"
-EMAIL="ponce@slackbuilds.org"
+REQUIRES="liblxqt"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/qstardict/doinst.sh b/system/qstardict/doinst.sh
index 5fb28930db..65c7e2eeb9 100644
--- a/system/qstardict/doinst.sh
+++ b/system/qstardict/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/qstardict/gcc4.4.patch b/system/qstardict/gcc4.4.patch
deleted file mode 100644
index db4b3157a7..0000000000
--- a/system/qstardict/gcc4.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- trunk/plugins/stardict/dictziplib.cpp       2009/07/10 15:01:40     446
-+++ trunk/plugins/stardict/dictziplib.cpp       2009/08/06 07:32:12     447
-@@ -305,7 +305,7 @@
- 
- #ifdef Q_OS_UNIX
-     if (stat(fname.c_str(), &sb) || !S_ISREG(sb.st_mode))
--#elif def Q_OS_WIN32
-+#elif defined(Q_OS_WIN32)
-     if (_stat(fname.c_str(), &sb) || !(sb.stMode & _S_IFREG))
- #endif
-     {
- 
diff --git a/system/qstardict/qstardict-1.0.1-glib_includes.patch b/system/qstardict/qstardict-1.0.1-glib_includes.patch
deleted file mode 100644
index fd6e993b92..0000000000
--- a/system/qstardict/qstardict-1.0.1-glib_includes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: plugins/stardict/stardict.cpp
-===================================================================
---- plugins/stardict/stardict.cpp.orig
-+++ plugins/stardict/stardict.cpp
-@@ -28,8 +28,7 @@
- #include <QFile>
- #include <QSettings>
- #include <QStack>
--#include <glib/gmem.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include "lib.h"
- #include "file.hpp"
- #include "settingsdialog.h"
diff --git a/system/qstardict/qstardict.SlackBuild b/system/qstardict/qstardict.SlackBuild
index 063d72760f..46a4e1c887 100644
--- a/system/qstardict/qstardict.SlackBuild
+++ b/system/qstardict/qstardict.SlackBuild
@@ -1,32 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for qstardict
 
 # Written by grissiom chaos.proton@gmail.com
 # Modified by Branko Grubic <branko.grubic@gmail.com>
 
+# 20220210 bkw: Modified by SlackBuilds.org: use correct download link.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=qstardict
-VERSION=${VERSION:-1.0.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-BUILD_PLASMOID=${BUILD_PLASMOID:-"yes"}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -41,50 +48,24 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Patch for glib > 2.30.x
-# http://sourceforge.net/tracker/?func=detail&aid=3471473&group_id=200786&atid=974933
-patch -p0 < $CWD/qstardict-1.0.1-glib_includes.patch
-
-# qstardict only have "stardict" and "web" plugins enabled by default.
-# Actually there are swac and multitran plugins in addition.
-# Uncomment the following line to get full plugins.
-# enabled_plugins="stardict web swac multitran"
-
-qmake QMAKE_CXXFLAGS="$SLKCFLAGS" \
-      PLUGINS_DIR=/usr/lib${LIBDIRSUFFIX}/qstardict/plugins \
-      DOCS_DIR=/usr/doc/$PRGNAM-$VERSION \
-      ENABLED_PLUGINS=$enabled_plugins
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
+qmake-qt5 ENABLED_PLUGINS="stardict swac web" \
+  LIB_DIR=/usr/lib$LIBDIRSUFFIX DOCS_DIR=/usr/doc/$PRGNAM-$VERSION
 make
 make install INSTALL_ROOT=$PKG
 
-if [ "$BUILD_PLASMOID" = "yes" ]; then
-  mkdir kdeplasma/build
-  cd kdeplasma/build
-    # Fix the plugin path or LIB_INSTALL_DIR will have no effect...
-    ( cd ../dataengine ; sed -i -e '4d' -e 's.//..' config.h.cmake )
-    cmake -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-          -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
-          -DCMAKE_INSTALL_PREFIX=/usr ..
-    make
-    make install DESTDIR=$PKG
-  cd -
-fi
-
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -92,4 +73,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/qstardict/qstardict.info b/system/qstardict/qstardict.info
index 35317dadb0..712f079612 100644
--- a/system/qstardict/qstardict.info
+++ b/system/qstardict/qstardict.info
@@ -1,8 +1,8 @@
 PRGNAM="qstardict"
-VERSION="1.0.1"
+VERSION="1.3"
 HOMEPAGE="http://qstardict.ylsoftware.com/index.php"
-DOWNLOAD="http://qstardict.ylsoftware.com/files/qstardict-1.0.1.tar.bz2"
-MD5SUM="4e058439edad45103a9f5c74d2a381e5"
+DOWNLOAD="https://github.com/a-rodin/qstardict/archive/qstardict-1.3/qstardict-qstardict-1.3.tar.gz"
+MD5SUM="761600b1c0dbb33b1025a073c72851da"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/qterminal/doinst.sh b/system/qterminal/doinst.sh
index 5fb28930db..3e5691a052 100644
--- a/system/qterminal/doinst.sh
+++ b/system/qterminal/doinst.sh
@@ -1,3 +1,9 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/qterminal/qterminal.SlackBuild b/system/qterminal/qterminal.SlackBuild
index f939c03e7a..0d2384e2a8 100644
--- a/system/qterminal/qterminal.SlackBuild
+++ b/system/qterminal/qterminal.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for qterminal
 
-# Copyright 2011-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2011-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - add gtk-update-icon-cache to doinst.sh.
+# - silence desktop-file-validate warnings.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=qterminal
-VERSION=${VERSION:-0.14.1}
+VERSION=${VERSION:-1.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -62,14 +73,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p build
 cd build
@@ -79,11 +90,11 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# 20220413 bkw: desktop-file-validate warnings.
+sed -i '/^Comment/d' $PKG/usr/share/applications/$PRGNAM.desktop || exit 1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
@@ -94,4 +105,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/qterminal/qterminal.info b/system/qterminal/qterminal.info
index cf48e2f5a5..956ffadf02 100644
--- a/system/qterminal/qterminal.info
+++ b/system/qterminal/qterminal.info
@@ -1,8 +1,8 @@
 PRGNAM="qterminal"
-VERSION="0.14.1"
+VERSION="1.4.0"
 HOMEPAGE="https://github.com/lxde/qterminal"
-DOWNLOAD="https://github.com/lxde/qterminal/releases/download/0.14.1/qterminal-0.14.1.tar.xz"
-MD5SUM="8b2e83a5a0daf8cd9a1b770f9e719a7d"
+DOWNLOAD="https://github.com/lxde/qterminal/releases/download/1.4.0/qterminal-1.4.0.tar.xz"
+MD5SUM="8d8f85dc99fc074c27eed09630951e09"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qtermwidget"
diff --git a/system/qtfm/qtfm.SlackBuild b/system/qtfm/qtfm.SlackBuild
index f651ab3978..66b249589d 100644
--- a/system/qtfm/qtfm.SlackBuild
+++ b/system/qtfm/qtfm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for QtFM
 
@@ -24,10 +24,13 @@
 
 # Modified by Ole-André Rodlie, <ole.andre.rodlie@gmail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=qtfm
 VERSION=${VERSION:-6.1.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -103,4 +113,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/qtgzmanager/README b/system/qtgzmanager/README
index 13c8fb6d7f..49eaab7450 100644
--- a/system/qtgzmanager/README
+++ b/system/qtgzmanager/README
@@ -1 +1,2 @@
-QTGZManager is a powerful tool to manage Slackware Linux TGZ/TXZ packages.
+QTGZManager is a powerful tool to manage Slackware Linux TGZ/TXZ
+packages.
diff --git a/system/qtgzmanager/doinst.sh b/system/qtgzmanager/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/system/qtgzmanager/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/system/qtgzmanager/qtgzmanager.SlackBuild b/system/qtgzmanager/qtgzmanager.SlackBuild
index 7f13058153..f33163798e 100644
--- a/system/qtgzmanager/qtgzmanager.SlackBuild
+++ b/system/qtgzmanager/qtgzmanager.SlackBuild
@@ -1,13 +1,22 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for qtgzmanager
 # Written by Alexandre Albuquerque Arnt <aaarnt@gmail.com>
 # Based on http://slackbuilds.org/template.SlackBuild
 
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - add doinst.sh (update-desktop-database is needed).
+# - silence desktop-file-validate warnings.
+
+# 20220210 bkw: Modified by SlackBuilds.org, to fix the build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=qtgzmanager
 VERSION=${VERSION:-1.0.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -17,7 +26,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -44,24 +57,28 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
+
+# 20220413 bkw: desktop-file-validate warnings.
+sed -i -e '/^Encoding/d' -e '/^Cat/s,Application;,,' $PRGNAM.desktop
 
-qmake \
+# 20220210 bkw: ordered comparison...
+sed -i 's,>= 0),),' src/unixcommand.cpp
+
+# 20220210 bkw: this is a qt4 app, use qmake-qt4.
+qmake-qt4 \
   QMAKE_LIBS="$SLKCFLAGS" \
   QMAKE_CFLAGS="$SLKCFLAGS" \
   QMAKE_CXXFLAGS="$SLKCFLAGS"
 make
 
 mkdir -p $PKG/usr/bin
-cp -a bin/qtgzmanager $PKG/usr/bin
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+install -m0755 -s bin/qtgzmanager $PKG/usr/bin
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a copying INSTALL LICENSE THANKS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a copying LICENSE THANKS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/usr/share/applications/
@@ -72,6 +89,7 @@ cp -a resources/images/QTGZ.png $PKG/usr/share/pixmaps
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/qtgzmanager/qtgzmanager.info b/system/qtgzmanager/qtgzmanager.info
index a3bbc9b31b..e13f2afbfd 100644
--- a/system/qtgzmanager/qtgzmanager.info
+++ b/system/qtgzmanager/qtgzmanager.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://downloads.sourceforge.net/jtgzmanager/qtgzmanager-1.0.3-src.ta
 MD5SUM="6dad7e2603972b8cadaba2d319d01916"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt4"
 MAINTAINER="Alexandre Albuquerque Arnt"
 EMAIL="aaarnt@gmail.com"
diff --git a/system/qtxdg-tools/README b/system/qtxdg-tools/README
new file mode 100644
index 0000000000..421011db5b
--- /dev/null
+++ b/system/qtxdg-tools/README
@@ -0,0 +1,3 @@
+qtxdg-tools contains user tools for libqtxdg (e.x. qtxdg-mat, a CLI MIME
+tool for handling file associations and opening file with their default
+applications).
diff --git a/system/qtxdg-tools/qtxdg-tools.SlackBuild b/system/qtxdg-tools/qtxdg-tools.SlackBuild
new file mode 100644
index 0000000000..65b1cf51bd
--- /dev/null
+++ b/system/qtxdg-tools/qtxdg-tools.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+# Slackware build script for qtxdg-tools
+
+# Copyright 2022-2023 Isaac Yu <isaacyu@protonmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=qtxdg-tools
+VERSION=${VERSION:-3.11.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/qtxdg-tools/qtxdg-tools.info b/system/qtxdg-tools/qtxdg-tools.info
new file mode 100644
index 0000000000..732d5ea019
--- /dev/null
+++ b/system/qtxdg-tools/qtxdg-tools.info
@@ -0,0 +1,10 @@
+PRGNAM="qtxdg-tools"
+VERSION="3.11.0"
+HOMEPAGE="https://github.com/lxqt/qtxdg-tools"
+DOWNLOAD="https://github.com/lxqt/qtxdg-tools/releases/download/3.11.0/qtxdg-tools-3.11.0.tar.xz"
+MD5SUM="4898d657bd4a92f7b738df78866297ac"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libqtxdg"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/qtxdg-tools/slack-desc b/system/qtxdg-tools/slack-desc
new file mode 100644
index 0000000000..27e024db84
--- /dev/null
+++ b/system/qtxdg-tools/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+qtxdg-tools: qtxdg-tools (libqtxdg user tools)
+qtxdg-tools:
+qtxdg-tools: qtxdg-tools contains user tools for libqtxdg.
+qtxdg-tools:
+qtxdg-tools:
+qtxdg-tools:
+qtxdg-tools:
+qtxdg-tools:
+qtxdg-tools:
+qtxdg-tools:
+qtxdg-tools:
diff --git a/system/quake-par/quake-par.SlackBuild b/system/quake-par/quake-par.SlackBuild
index 84d0fd6958..4578667996 100644
--- a/system/quake-par/quake-par.SlackBuild
+++ b/system/quake-par/quake-par.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for quake-par
 
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=quake-par
 SRCNAME=par
 VERSION=${VERSION:-0.03.01}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -109,4 +119,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/quotatool/quotatool.SlackBuild b/system/quotatool/quotatool.SlackBuild
index 8cebf97ef2..a6dcf87a29 100644
--- a/system/quotatool/quotatool.SlackBuild
+++ b/system/quotatool/quotatool.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for quotatool
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=quotatool
 VERSION=${VERSION:-1.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -97,4 +107,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/qxkb/qxkb.SlackBuild b/system/qxkb/qxkb.SlackBuild
index 0d7c61db12..a97bc86830 100644
--- a/system/qxkb/qxkb.SlackBuild
+++ b/system/qxkb/qxkb.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for qxkb
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=qxkb
 VERSION=${VERSION:-20150305_d7474a0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -95,4 +105,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/qxkb/qxkb.info b/system/qxkb/qxkb.info
index fc40f960c7..77f38c9a14 100644
--- a/system/qxkb/qxkb.info
+++ b/system/qxkb/qxkb.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://ponce.cc/slackware/sources/repo/qxkb-20150305_d7474a0.tar.xz"
 MD5SUM="4d77775daa03174baf44df086fd69ec1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5"
+REQUIRES=""
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
diff --git a/system/rEFInd/README b/system/rEFInd/README
index 2909b3d5d2..511203d350 100644
--- a/system/rEFInd/README
+++ b/system/rEFInd/README
@@ -8,6 +8,3 @@ EFI-compatible OSes, including Linux, provide boot loaders that rEFInd
 can detect and launch. rEFInd can launch Linux EFI boot loaders such
 as ELILO, GRUB Legacy, GRUB 2, and 3.3.0 and later kernels with EFI
 stub support.
-
-This package is optionally depends on python3 if you want to run the
-refind-mkdefault script, otherwise you don't need python3.
diff --git a/system/rEFInd/rEFInd.SlackBuild b/system/rEFInd/rEFInd.SlackBuild
index 90f28c4eb8..e9f1743a2f 100644
--- a/system/rEFInd/rEFInd.SlackBuild
+++ b/system/rEFInd/rEFInd.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for refind
 
-# Copyright 2020 Zhu Qun-Ying All rights reserved.
+# Copyright 2020-2023 Zhu Qun-Ying All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -21,11 +21,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rEFInd
 SRCNAME=refind
-VERSION=${VERSION:-0.12.0}
+VERSION=${VERSION:-0.14.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -40,7 +43,14 @@ if [ "$ARCH" != "x86_64" ] && [ "$ARCH" != "i586" ] && [ "$ARCH" != "i686" ]; th
     exit
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -62,7 +72,8 @@ else
     REFIND_SUFFIX=ia32
 fi
 sed -i '/^EFICRT0/ s/$/\/gnuefi/' Make.common
-make all_gnuefi
+
+make -j1 all_gnuefi
 REFIND_SHARE_DIR=$PKG/usr/share/$PRGNAM-$VERSION
 mkdir -p $PKG/usr/sbin
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -88,12 +99,15 @@ cp mkrlconf mvrefind mountesp $PKG/usr/sbin
 )
 cp -a docs/* *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 
+find $PKG/usr/doc -type d -exec chmod 0755 {} \;
+
 # include a slackware banner made by me, including the svg version
 cp $CWD/slackware-banner.* $REFIND_SHARE_DIR/banners
 
 mkdir -p $PKG/usr/man/man8
 mv $PKG/usr/doc/$PRGNAM-$VERSION/man/*.8 $PKG/usr/man/man8
 rmdir $PKG/usr/doc/$PRGNAM-$VERSION/man
+find $PKG/usr/man -type f -exec chmod 0644 {} \;
 gzip $PKG/usr/man/man8/*
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -102,4 +116,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rEFInd/rEFInd.info b/system/rEFInd/rEFInd.info
index cddd2f4e79..6195fc138a 100644
--- a/system/rEFInd/rEFInd.info
+++ b/system/rEFInd/rEFInd.info
@@ -1,8 +1,8 @@
 PRGNAM="rEFInd"
-VERSION="0.12.0"
+VERSION="0.14.0.2"
 HOMEPAGE="http://www.rodsbooks.com/refind/index.html"
-DOWNLOAD="https://sourceforge.net/projects/refind/files/0.12.0/refind-src-0.12.0.tar.gz"
-MD5SUM="673088f61ccd60535a3b2c0d607e4a7e"
+DOWNLOAD="http://sourceforge.net/projects/refind/files/0.14.0.2/refind-src-0.14.0.2.tar.gz"
+MD5SUM="a458eae2fff7fc07333760e7485ca3dd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/rabbitmq-server/rabbitmq-server.SlackBuild b/system/rabbitmq-server/rabbitmq-server.SlackBuild
index be0659042e..dad1b60622 100644
--- a/system/rabbitmq-server/rabbitmq-server.SlackBuild
+++ b/system/rabbitmq-server/rabbitmq-server.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for RabbitMQ Server
 
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - remove empty files (cruft) from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rabbitmq-server
-VERSION=${VERSION:-3.6.10}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.8.14}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 RABBITMQ_USER=${RABBITMQ_USER:-rabbitmq}
 RABBITMQ_UID=${RABBITMQ_UID:-319}
@@ -58,7 +64,14 @@ elif ! grep -q "^$RABBITMQ_GROUP:" /etc/group; then
   bailout
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -80,9 +93,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 make
 make docs
@@ -110,7 +123,7 @@ chown -R $RABBITMQ_USER:$RABBITMQ_GROUP $PKG/var/{lib,log}/rabbitmq
 
 install -dm 750 ${PKG}/etc/rabbitmq
 install -m 644 $CWD/rabbitmq-env.conf $PKG/etc/rabbitmq/rabbitmq-env.conf.new
-install -m 644 deps/rabbit/docs/rabbitmq.config.example ${PKG}/etc/rabbitmq/
+install -m 644 deps/rabbit/docs/rabbitmq.conf.example ${PKG}/etc/rabbitmq/
 chown -R $RABBITMQ_USER:$RABBITMQ_GROUP $PKG/etc/rabbitmq
 
 mkdir -p ${PKG}/etc/rc.d
@@ -130,6 +143,9 @@ while read file
 do
   install -m 644 $file $PKG/usr/doc/$PRGNAM-$VERSION/${file/deps\//}
 done
+
+find $PKG/usr/doc/$PRGNAM-$VERSION -depth -empty | xargs rm -rf
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -137,4 +153,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rabbitmq-server/rabbitmq-server.info b/system/rabbitmq-server/rabbitmq-server.info
index ec61fb5464..d7a393db86 100644
--- a/system/rabbitmq-server/rabbitmq-server.info
+++ b/system/rabbitmq-server/rabbitmq-server.info
@@ -1,10 +1,10 @@
 PRGNAM="rabbitmq-server"
-VERSION="3.6.10"
+VERSION="3.8.14"
 HOMEPAGE="https://www.rabbitmq.com/"
-DOWNLOAD="https://www.rabbitmq.com/releases/rabbitmq-server/v3.6.10/rabbitmq-server-3.6.10.tar.xz"
-MD5SUM="3b2e7514a016a81859443723f6be514b"
+DOWNLOAD="https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.8.14/rabbitmq-server-3.8.14.tar.xz"
+MD5SUM="b79184aec51c4b90a4d3a282c59b3fa9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="erlang-otp"
+REQUIRES="elixir"
 MAINTAINER="Andre Barboza"
 EMAIL="bmg.andre@gmail.com"
diff --git a/system/radeon-profile/README b/system/radeon-profile/README
new file mode 100644
index 0000000000..6c169d14bd
--- /dev/null
+++ b/system/radeon-profile/README
@@ -0,0 +1,4 @@
+ radeon-profile (read current clocks of ATi Radeon cards)
+
+Simple application to read current clocks of ATi Radeon 
+cards (xf86-video-ati, xf86-video-amdgpu).
diff --git a/system/radeon-profile/radeon-profile.SlackBuild b/system/radeon-profile/radeon-profile.SlackBuild
new file mode 100644
index 0000000000..3f99750c8d
--- /dev/null
+++ b/system/radeon-profile/radeon-profile.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+# Slackware build script for radeon-profile
+
+# Copyright 2022
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=radeon-profile
+VERSION=${VERSION:-20200824}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+
+cd radeon-profile
+qmake-qt5
+make
+cd target
+mkdir -p $PKG/usr/bin
+cp radeon-profile $PKG/usr/bin
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/radeon-profile/radeon-profile.info b/system/radeon-profile/radeon-profile.info
new file mode 100644
index 0000000000..b3be3d9216
--- /dev/null
+++ b/system/radeon-profile/radeon-profile.info
@@ -0,0 +1,10 @@
+PRGNAM="radeon-profile"
+VERSION="20200824"
+HOMEPAGE="https://github.com/marazmista/radeon-profile"
+DOWNLOAD="https://github.com/marazmista/radeon-profile/archive/refs/tags/20200824/radeon-profile-20200824.tar.gz"
+MD5SUM="2c625167846dfdb6c77e419a3469c9bb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matthew Miller"
+EMAIL="mattallmill@gmail.com"
diff --git a/system/radeon-profile/slack-desc b/system/radeon-profile/slack-desc
new file mode 100644
index 0000000000..f4e58c9539
--- /dev/null
+++ b/system/radeon-profile/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+radeon-profile: radeon-profile (read current clocks of ATi Radeon cards)
+radeon-profile:
+radeon-profile: Simple application to read current clocks of ATi Radeon 
+radeon-profile: cards (xf86-video-ati, xf86-video-amdgpu).
+radeon-profile:
+radeon-profile:
+radeon-profile:
+radeon-profile:
+radeon-profile:
+radeon-profile: Homepage: https://github.com/marazmista/radeon-profile
+radeon-profile:
diff --git a/system/radeontop/README b/system/radeontop/README
index c023fbd4a3..ed497d0e13 100644
--- a/system/radeontop/README
+++ b/system/radeontop/README
@@ -1,5 +1,5 @@
-Radeon cards monitoring utilty for viewing GPU utilization, show both
-for the total activity percent and individual blocks.
+radeontop is a monitoring utilty for viewing Radeon GPU utilization,
+showing both the total activity percentage and individual blocks.
 
-R600 and more recent cards are supported. Works with both the open
-drivers and AMD Catalyst.
+R600 and more recent cards are supported. radeontop works with both the
+open drivers and AMD Catalyst.
diff --git a/system/radeontop/git.patch b/system/radeontop/git.patch
deleted file mode 100644
index e3fbfc5042..0000000000
--- a/system/radeontop/git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c7518550fc8b0e62f1c7ea96495eec621bc395ef Mon Sep 17 00:00:00 2001
-From: orbea <orbea@fredslev.dk>
-Date: Sun, 9 Dec 2018 13:42:49 -0800
-Subject: [PATCH] getver.sh: Only use git if its a git repo.
-
----
- getver.sh | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/getver.sh b/getver.sh
-index 7bb1889..45261dd 100755
---- a/getver.sh
-+++ b/getver.sh
-@@ -2,7 +2,9 @@
- 
- ver=unknown
- 
--[ -n "`which git`" ] && ver=`git describe`
-+if [ -n "`which git`" ] && git rev-parse HEAD 2>/dev/null; then
-+  ver=`git describe`
-+fi
- 
- cat > include/version.h << EOF
- #ifndef VER_H
diff --git a/system/radeontop/man.patch b/system/radeontop/man.patch
deleted file mode 100644
index b9f26245a9..0000000000
--- a/system/radeontop/man.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From dfbff6274ce25814a4357a8a788c404425cecb69 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@fredslev.dk>
-Date: Sat, 1 Dec 2018 07:43:12 -0800
-Subject: [PATCH] Makefile: Add MANDIR.
-
-Not all Linux distros install manpages to $(PREFIX)/share/man.
-For example Slackware installs manpages to /usr/man/.
----
- Makefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 6010bc9..4cb7093 100644
---- a/Makefile
-+++ b/Makefile
-@@ -13,6 +13,7 @@
- PREFIX ?= /usr
- INSTALL ?= install
- LIBDIR ?= lib
-+MANDIR ?= share/man
- 
- nls ?= 1
- xcb ?= 1
-@@ -103,7 +104,7 @@ install: all
- ifeq ($(xcb), 1)
- 	$(INSTALL) -D -m755 $(xcblib) $(DESTDIR)/$(PREFIX)/$(LIBDIR)/$(xcblib)
- endif
--	$(INSTALL) -D -m644 radeontop.1 $(DESTDIR)/$(PREFIX)/share/man/man1/radeontop.1
-+	$(INSTALL) -D -m644 radeontop.1 $(DESTDIR)/$(PREFIX)/$(MANDIR)/man1/radeontop.1
- ifeq ($(nls), 1)
- 	$(MAKE) -C translations install PREFIX=$(PREFIX)
- endif
diff --git a/system/radeontop/radeontop.SlackBuild b/system/radeontop/radeontop.SlackBuild
index 15718a8317..0d1d2b2878 100644
--- a/system/radeontop/radeontop.SlackBuild
+++ b/system/radeontop/radeontop.SlackBuild
@@ -1,8 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for radeontop
 
 # Copyright 2018 Hunter Sezen California, USA
+# Copyright 2023 K. Eugene Carlson Tsukuba, JP
+#
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +24,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=radeontop
-VERSION=${VERSION:-1.1}
+VERSION=${VERSION:-1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,19 +84,10 @@ find -L . \
 # Include the correct version number.
 sed -i "s/ver=unknown/ver=$VERSION/" ./getver.sh
 
-# Makefile: Add MANDIR.
-# https://github.com/clbr/radeontop/commit/dfbff6274ce25814a4357a8a788c404425cecb69
-# https://github.com/clbr/radeontop/pull/79
-patch -p1 < $CWD/man.patch
-
-# getver.sh: Only use git if its a git repo.
-# https://github.com/clbr/radeontop/commit/c7518550fc8b0e62f1c7ea96495eec621bc395ef
-# https://github.com/clbr/radeontop/pull/80
-patch -p1 < $CWD/git.patch
-
 CFLAGS="$SLKCFLAGS" \
 make amdgpu=1
 
+# BINDIR no longer needed
 make install \
   PREFIX=/usr \
   LIBDIR=lib${LIBDIRSUFFIX} \
@@ -105,4 +108,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/radeontop/radeontop.info b/system/radeontop/radeontop.info
index 8652cbfc76..45de516e9b 100644
--- a/system/radeontop/radeontop.info
+++ b/system/radeontop/radeontop.info
@@ -1,10 +1,10 @@
 PRGNAM="radeontop"
-VERSION="1.1"
+VERSION="1.4"
 HOMEPAGE="https://github.com/clbr/radeontop"
-DOWNLOAD="https://github.com/clbr/radeontop/archive/v1.1/radeontop-1.1.tar.gz"
-MD5SUM="51bbca383b72855ff1c6d4e7d1f4f657"
+DOWNLOAD="https://github.com/clbr/radeontop/archive/v1.4/radeontop-1.4.tar.gz"
+MD5SUM="a6402ee26ebcdc4177725a1299a11a0d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/radeontop/slack-desc b/system/radeontop/slack-desc
index 96b4e6623e..00449f7c7e 100644
--- a/system/radeontop/slack-desc
+++ b/system/radeontop/slack-desc
@@ -8,8 +8,8 @@
          |-----handy-ruler------------------------------------------------------|
 radeontop: radeontop (Radeon cards monitoring utility)
 radeontop:
-radeontop: Radeon cards monitoring utilty for viewing GPU utilization, show both
-radeontop: for the total activity percent and individual blocks.
+radeontop: Monitoring utilty for viewing Radeon GPU utilization, showing both
+radeontop: the total activity percentage and individual blocks.
 radeontop:
 radeontop: Homepage: https://github.com/clbr/radeontop
 radeontop:
diff --git a/system/ranger/README b/system/ranger/README
index 545d99c70c..2cb7273005 100644
--- a/system/ranger/README
+++ b/system/ranger/README
@@ -1,24 +1,18 @@
 ranger (a curses file manager that uses vi/vim bindings)
 
-A multi-column display allows viewing in a tree-like manner. You can preview
-the content of the selected file or directory, copy or move files around with
-the VIM-like commands dd and yy, execute predefined applications when opening a
-file, etc.
+A multi-column display allows viewing in a tree-like manner. You can
+preview the content of the selected file or directory, copy or move
+files around with the VIM-like commands dd and yy, execute predefined
+applications when opening a file, etc.
 
-Everything is fully customizable and written in Python (2.7 and 3.1 compatible)
-using curses for the text-based user interface.
+Everything is fully customizable and written in Python (2.7 and 3.1
+compatible) using curses for the text-based user interface.
 
 Optional Helpers:
 
 w3m (for inline display of images)
 atool (for listing files inside archives in the preview pane)
-highlight or (python3-)Pygments (for coloured previews)
+highlight (for coloured previews)
 
 (Note that highlight is used by default. Pygments requires editing the
 preview script 'scope.sh')
-
-Options:
-
-To build for python3, use:
-
-PYTHON3=yes ./ranger.SlackBuild
diff --git a/system/ranger/ranger.SlackBuild b/system/ranger/ranger.SlackBuild
index a016f269c6..75db40fdff 100644
--- a/system/ranger/ranger.SlackBuild
+++ b/system/ranger/ranger.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ranger
 
@@ -23,10 +23,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ranger
 VERSION=${VERSION:-1.9.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -70,20 +80,17 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-[ "$PYTHON3" = "yes" ] && PY=3
-PYVER=$(python$PY -V 2>&1 | sed -nr "s,.* ([0-9]\.[0-9]).*,\1,p")
-
 # Fix some incorrect paths in man page
 sed -i "
   s,doc/configs,/usr/doc/$PRGNAM-$VERSION/config,
-  s,usr/share/doc/ranger/config,usr/lib64/python$PYVER/site-packages/ranger/config,
+  s,usr/share/doc/ranger/config,usr/lib64/python3/site-packages/ranger/config,
   s,\\\\fIexamples,\\\\fI/usr/doc-$PRGNAM-$VERSION/examples,
   s,They are usually installed to,,
   0,/\\\\&\\\\fI\/usr\/share\/doc\/ranger\/examples\\\\fR./s,,,
   s,/usr/share/doc/ranger/examples/,/usr/doc-$PRGNAM-$VERSION/examples,
   " doc/ranger.1
 
-python$PY setup.py install -O1 --root=$PKG
+python3 setup.py install -O1 --root=$PKG
 
 mv $PKG/usr/share/man $PKG/usr
 
@@ -103,4 +110,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rar/rar.SlackBuild b/system/rar/rar.SlackBuild
index ebf1574027..7e4d692908 100644
--- a/system/rar/rar.SlackBuild
+++ b/system/rar/rar.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rar
 
@@ -6,18 +6,40 @@
 # Modified by Ozan Türkyılmaz <ozan.turkyilmaz@gmail.com>
 # Modified by Mario Preksavec <mario@slackware.hr>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rar
 VERSION=${VERSION:-5.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# 2023-05-17 DW: move all the ARCH stuff above PRINT_PACKAGE_NAME
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
 
-case "$( uname -m )" in
-  i?86) ARCH=i386 ;;
-  arm*) ARCH=arm ;;
-     *) ARCH=$( uname -m ) ;;
-esac
+if [ "$ARCH" = "x86_64" ]; then
+   LIBDIRSUFFIX="64"
+   x64FIX="x64-"
+elif [[ $ARCH =~ i?86 ]]; then
+   LIBDIRSUFFIX=""
+else
+   printf "\n$ARCH is not supported...\n\n" ; exit 1
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -27,16 +49,6 @@ UNRAR=${UNRAR:-no} # disabled by default since unrar is available on SBo
 
 set -e
 
-if [ "$ARCH" = "x86_64" ]; then
-   LIBDIRSUFFIX="64"
-   x64FIX="x64-"
-elif [ "$ARCH" = "i386" ]; then
-   ARCH=i386
-   LIBDIRSUFFIX=""
-else
-   printf "\n$ARCH is not supported...\n\n" ; exit 1
-fi
-
 rm -rf $TMP/$PRGNAM $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -76,4 +88,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rar2fs/README b/system/rar2fs/README
index 8ec2947baa..8d78a7c226 100644
--- a/system/rar2fs/README
+++ b/system/rar2fs/README
@@ -1,4 +1,4 @@
-rar2fs is a FUSE based file system that can mount a source RAR archive/volume
-or a directory containing any number of RAR archives and read the contents as
-regular files on-the-fly. Non-archived files located in the source directory
-are handled transparently.
+rar2fs is a FUSE based file system that can mount a source RAR
+archive/volume or a directory containing any number of RAR archives
+and read the contents as regular files on-the-fly. Non-archived files
+located in the source directory are handled transparently.
diff --git a/system/rar2fs/rar2fs.SlackBuild b/system/rar2fs/rar2fs.SlackBuild
index d58f7dc9ba..e6a834f2be 100644
--- a/system/rar2fs/rar2fs.SlackBuild
+++ b/system/rar2fs/rar2fs.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rar2fs
 
-# Copyright 2011, 2015, 2016, 2017  Mario Preksavec, Zagreb, Croatia
+# Copyright 2011, 2024  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2: strip binaries.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rar2fs
-VERSION=${VERSION:-1.26.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.29.6}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,9 +74,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -81,18 +90,18 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-install -D -m 755 mkr2i $PKG/usr/bin/mkr2i
-install -D -m 755 rar2fs $PKG/usr/bin/rar2fs
+install -s -D -m 755 src/mkr2i $PKG/usr/bin/mkr2i
+install -s -D -m 755 src/rar2fs $PKG/usr/bin/rar2fs
 
-install -D -m 644 rar2fs.1 $PKG/usr/man/man1/rar2fs.1
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+gzip -9 man/rar2fs.1
+install -D -m 644 man/rar2fs.1.gz $PKG/usr/man/man1/rar2fs.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rar2fs/rar2fs.info b/system/rar2fs/rar2fs.info
index adff04cbcb..9991acaecd 100644
--- a/system/rar2fs/rar2fs.info
+++ b/system/rar2fs/rar2fs.info
@@ -1,8 +1,8 @@
 PRGNAM="rar2fs"
-VERSION="1.26.0"
+VERSION="1.29.6"
 HOMEPAGE="https://github.com/hasse69/rar2fs"
-DOWNLOAD="https://github.com/hasse69/rar2fs/releases/download/v1.26.0/rar2fs-1.26.0.tar.gz"
-MD5SUM="30acf457c7ecec179b1cdcfbbe601410"
+DOWNLOAD="https://github.com/hasse69/rar2fs/releases/download/v1.29.6/rar2fs-1.29.6.tar.gz"
+MD5SUM="3e698f3b21e2ecfec39d74596c0e129a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="unrar"
diff --git a/system/rasdaemon/README b/system/rasdaemon/README
new file mode 100644
index 0000000000..0505197eba
--- /dev/null
+++ b/system/rasdaemon/README
@@ -0,0 +1,28 @@
+Rasdaemon is a RAS (Reliability, Availability and Serviceability)
+logging tool. It records memory errors, using the EDAC tracing
+events. EDAC is a Linux kernel subsystem with handles detection of
+ECC errors from memory controllers for most chipsets on i386 and
+x86_64 architectures. EDAC drivers for other architectures like
+arm also exists.
+
+In order to use rasdaemon, you must have mounted a debugfs
+filesystem.
+
+  sudo mount -t debugfs none /sys/kernel/debug
+
+You can add this to fstab:
+
+  debugfs    /sys/kernel/debug      debugfs  defaults  0 0
+
+To have rasdaemon start and stop with your host,
+add to /etc/rc.d/rc.local:
+
+  if [ -x /etc/rc.d/rc.rasdaemon ]; then
+    /etc/rc.d/rc.rasdaemon start
+  fi
+
+and to /etc/rc.d/rc.local_shutdown (creating it if needed):
+
+  if [ -x /etc/rc.d/rc.rasdaemon ]; then
+    /etc/rc.d/rc.rasdaemon stop
+  fi
diff --git a/system/rasdaemon/doinst.sh b/system/rasdaemon/doinst.sh
new file mode 100644
index 0000000000..fed69ff21c
--- /dev/null
+++ b/system/rasdaemon/doinst.sh
@@ -0,0 +1,25 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.rasdaemon.new
diff --git a/system/rasdaemon/fix-old-automake.patch b/system/rasdaemon/fix-old-automake.patch
new file mode 100644
index 0000000000..47c90be62b
--- /dev/null
+++ b/system/rasdaemon/fix-old-automake.patch
@@ -0,0 +1,12 @@
+diff --color -Naur ./rasdaemon-0.8.0/configure.ac ./rasdaemon-0.8.0-patched/configure.ac
+--- ./rasdaemon-0.8.0/configure.ac	2023-02-18 18:02:41.000000000 +0900
++++ ./rasdaemon-0.8.0-patched/configure.ac	2023-04-10 14:53:22.668527535 +0900
+@@ -3,7 +3,7 @@
+ AC_CANONICAL_TARGET
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_HEADERS([config.h])
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([foreign])
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ LT_INIT
diff --git a/system/rasdaemon/rasdaemon.SlackBuild b/system/rasdaemon/rasdaemon.SlackBuild
new file mode 100644
index 0000000000..1d552dde19
--- /dev/null
+++ b/system/rasdaemon/rasdaemon.SlackBuild
@@ -0,0 +1,127 @@
+#!/bin/bash
+
+# Slackware Package Build Script for rasdaemon
+# Home Page https://github.com/mchehab/rasdaemon
+
+# Copyright (c) 2023, Julian Grinblat (julian _AT_ mnspace _DOT_ net)
+# All rights reserved.
+
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of script must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=rasdaemon
+VERSION=${VERSION:-0.8.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -fr $TMP/$PRGNAM-$VERSION $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
+chown -R root.root .
+find -L . \
+  \( -perm 664 -o -perm 666 -o -perm 600 -o -perm 440 -o -perm 444 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+find -L . \
+  \( -perm 777 -o -perm 755 -o -perm 711 -o -perm 700 -o -perm 555 -o -perm 511 -o -perm 500 \) \
+  -exec chmod 755 {} \;
+
+patch -p2 < $CWD/fix-old-automake.patch
+
+autoreconf -vfi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sbindir=/usr/bin \
+  --sysconfdir=/etc \
+  --with-sysconfdefdir=/etc/sysconfig \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --disable-static \
+  --enable-shared \
+  --enable-sqlite3 \
+  --enable-aer \
+  --enable-mce \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+install -D -m 0644 $CWD/rc.rasdaemon $PKG/etc/rc.d/rc.rasdaemon.new
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a AUTHORS COPYING ChangeLog NEWS README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
+
+### strip binaries
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+)
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rasdaemon/rasdaemon.info b/system/rasdaemon/rasdaemon.info
new file mode 100644
index 0000000000..caed6b3017
--- /dev/null
+++ b/system/rasdaemon/rasdaemon.info
@@ -0,0 +1,10 @@
+PRGNAM="rasdaemon"
+VERSION="0.8.0"
+HOMEPAGE="https://github.com/mchehab/rasdaemon"
+DOWNLOAD="https://www.infradead.org/~mchehab/rasdaemon/rasdaemon-0.8.0.tar.bz2"
+MD5SUM="3784a8049aef41365e2b7c1c9bd082b3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libtraceevent perl-DBD-SQLite"
+MAINTAINER="Julian Grinblat"
+EMAIL="julian@dotcore.co.il"
diff --git a/system/rasdaemon/rc.rasdaemon b/system/rasdaemon/rc.rasdaemon
new file mode 100644
index 0000000000..b06c345dd4
--- /dev/null
+++ b/system/rasdaemon/rc.rasdaemon
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# Rasdaemon startup script for Slackware Linux
+
+BASE=rasdaemon
+
+UNSHARE=/usr/bin/unshare
+RASDAEMON=/usr/bin/${BASE}
+
+# Check if rasdaemon is present.
+if [ ! -x ${RASDAEMON} ]; then
+  echo "${RASDAEMON} not present or not executable"
+  exit 1
+fi
+
+rasdaemon_start() {
+  echo "Starting ${BASE} ..."
+
+  ${RASDAEMON} -r
+  ${RASDAEMON} --enable
+}
+
+rasdaemon_stop() {
+  echo -n "Stopping ${BASE} ..."
+  ${RASDAEMON} --disable
+  echo " done"
+}
+
+rasdaemon_restart() {
+  rasdaemon_stop
+  sleep 1
+  rasdaemon_start
+}
+
+rasdaemon_status() {
+  pid=$(pidof ${BASE})
+  if [ ! -z "${pid}" ] && ps -o cmd $pid | grep -q ${BASE} ; then
+    echo "Status of ${BASE}: running"
+  else
+    echo "Status of ${BASE}: stopped"
+  fi
+}
+
+case "$1" in
+  'start')
+    rasdaemon_start
+    ;;
+  'stop')
+    rasdaemon_stop
+    ;;
+  'restart')
+    rasdaemon_restart
+    ;;
+  'status')
+    rasdaemon_status
+    ;;
+  *)
+    echo "Usage: $0 {start|stop|restart|status}"
+esac
+
+exit 0
diff --git a/system/rasdaemon/slack-desc b/system/rasdaemon/slack-desc
new file mode 100644
index 0000000000..7956bc506c
--- /dev/null
+++ b/system/rasdaemon/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+rasdaemon: rasdaemon (RAS logging tool)
+rasdaemon:
+rasdaemon: Rasdaemon is a RAS (Reliability, Availability and Serviceability)
+rasdaemon: logging tool. It records memory errors, using the EDAC tracing
+rasdaemon: events.
+rasdaemon:
+rasdaemon: Home Page https://github.com/mchehab/rasdaemon
+rasdaemon:
+rasdaemon:
+rasdaemon:
+rasdaemon:
diff --git a/system/razerCommander/README b/system/razerCommander/README
new file mode 100644
index 0000000000..166bd5dabd
--- /dev/null
+++ b/system/razerCommander/README
@@ -0,0 +1 @@
+GUI Razer device manager for Linux using GTK3
diff --git a/system/razerCommander/doinst.sh b/system/razerCommander/doinst.sh
new file mode 100644
index 0000000000..5934a15ab1
--- /dev/null
+++ b/system/razerCommander/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/razerCommander/razerCommander.SlackBuild b/system/razerCommander/razerCommander.SlackBuild
new file mode 100644
index 0000000000..7bc465ce5b
--- /dev/null
+++ b/system/razerCommander/razerCommander.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# Slackware build script for razerCommander
+
+# Copyright 2020 Matt Dinslage (daedra1980@gmail.com), Springfield, MO, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# 20220426 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - update icon cache in doinst.sh.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=razerCommander
+VERSION=${VERSION:-1.2.1.2}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc
+  ninja
+  DESTDIR=$PKG ninja install
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/razerCommander/razerCommander.info b/system/razerCommander/razerCommander.info
new file mode 100644
index 0000000000..60d3db23ff
--- /dev/null
+++ b/system/razerCommander/razerCommander.info
@@ -0,0 +1,10 @@
+PRGNAM="razerCommander"
+VERSION="1.2.1.2"
+HOMEPAGE="https://github.com/GabMus/razerCommander"
+DOWNLOAD="https://github.com/GabMus/razerCommander/archive/1.2.1.2/razerCommander-1.2.1.2.tar.gz"
+MD5SUM="d1e4ca908f95d26e952c62fa126f7357"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="openrazer-daemon"
+MAINTAINER="M.Dinslage"
+EMAIL="daedra1980@gmail.com"
diff --git a/system/razerCommander/slack-desc b/system/razerCommander/slack-desc
new file mode 100644
index 0000000000..2b2f152d44
--- /dev/null
+++ b/system/razerCommander/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+              |-----handy-ruler------------------------------------------------------|
+razerCommander: razerCommander (Razer device manager)
+razerCommander:
+razerCommander: GUI Razer device manager for Linux using GTK3
+razerCommander:
+razerCommander:
+razerCommander:
+razerCommander:
+razerCommander:
+razerCommander:
+razerCommander:
+razerCommander:
diff --git a/system/razergenie/README b/system/razergenie/README
new file mode 100644
index 0000000000..aee3ab4193
--- /dev/null
+++ b/system/razergenie/README
@@ -0,0 +1 @@
+Qt GUI for configuring your Razer devices under GNU/Linux.
diff --git a/system/razergenie/doinst.sh b/system/razergenie/doinst.sh
new file mode 100644
index 0000000000..392c12adb9
--- /dev/null
+++ b/system/razergenie/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications
+fi
+
diff --git a/system/razergenie/razergenie.SlackBuild b/system/razergenie/razergenie.SlackBuild
new file mode 100644
index 0000000000..1ec9e5ff4e
--- /dev/null
+++ b/system/razergenie/razergenie.SlackBuild
@@ -0,0 +1,132 @@
+#!/bin/bash
+
+# Slackware build script for razergenie
+
+# Copyright 2020 Matt Dinslage (daedra1980@gmail.com), Springfield, MO, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=razergenie
+VERSION=${VERSION:-1.1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM=RazerGenie
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+tar -xvf $CWD/libopenrazer-0.2.0.tar.gz --one-top-level=subprojects/libopenrazer --strip-components=1
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc
+  ninja
+  DESTDIR=$PKG ninja install
+cd ../
+
+mkdir subprojects/libopenrazer/build
+cd subprojects/libopenrazer/build
+meson ..
+ninja
+cd ../../../
+
+# we have to manually install this required library
+install -Dm755 subprojects/libopenrazer/build/libopenrazer.so.0.2.0 \
+$PKG/usr/lib${LIBDIRSUFFIX}/libopenrazer.so.0.1.0
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Icon is the same as the one in the openrazer package, no need to have two
+rm -r $PKG/usr/share/icons
+
+# Fix icon and tweak application launcher
+sed -i 's,xyz.z3ntu.razergenie,openrazer-static,g' $PKG/usr/share/applications/xyz.z3ntu.razergenie.desktop
+sed -i 's,Categories=Settings;HardwareSettings;,Categories=Utility;,g' $PKG/usr/share/applications/xyz.z3ntu.razergenie.desktop
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE.md README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/razergenie/razergenie.info b/system/razergenie/razergenie.info
new file mode 100644
index 0000000000..ad23241048
--- /dev/null
+++ b/system/razergenie/razergenie.info
@@ -0,0 +1,12 @@
+PRGNAM="razergenie"
+VERSION="1.1.0"
+HOMEPAGE="https://github.com/z3ntu/RazerGenie"
+DOWNLOAD="https://github.com/z3ntu/RazerGenie/archive/v1.1.0/RazerGenie-1.1.0.tar.gz \
+          https://github.com/z3ntu/libopenrazer/archive/v0.2.0/libopenrazer-0.2.0.tar.gz"
+MD5SUM="48b8588ecd180a8b1dad0cd44d41d938 \
+        e30ba6e2008af2d323eb963a2e660b6a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="openrazer-daemon"
+MAINTAINER="M.Dinslage"
+EMAIL="daedra1980@gmail.com"
diff --git a/system/razergenie/slack-desc b/system/razergenie/slack-desc
new file mode 100644
index 0000000000..0a759b9fc1
--- /dev/null
+++ b/system/razergenie/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+          |-----handy-ruler------------------------------------------------------|
+razergenie: razergenie (Razer device configuration tool)
+razergenie:
+razergenie: Qt application for configuring your Razer devices under GNU/Linux.
+razergenie:
+razergenie:
+razergenie:
+razergenie:
+razergenie:
+razergenie:
+razergenie:
+razergenie:
diff --git a/system/rdiff-backup/README b/system/rdiff-backup/README
index fc58cd77c0..0d5c202d04 100644
--- a/system/rdiff-backup/README
+++ b/system/rdiff-backup/README
@@ -1,13 +1,20 @@
-rdiff-backup backs up one directory to another, possibly over a
-network. The target directory ends up a copy of the source directory,
-but extra reverse diffs are stored in a special subdirectory of that
-target directory, so you can still recover files lost some time
-ago. The idea is to combine the best features of a mirror and an
-incremental backup. rdiff-backup also preserves subdirectories, hard
-links, dev files, permissions, uid/gid ownership, modification times,
-extended attributes, acls, and resource forks. Also, rdiff-backup
-can operate in a bandwidth efficient manner over a pipe, like
-rsync. Thus you can use rdiff-backup and ssh to securely back a
-hard drive up to a remote location, and only the differences will
-be transmitted. Finally, rdiff-backup is easy to use and settings
-have sensical defaults.
+rdiff-backup is a simple backup tool which can be used locally and
+remotely, on Linux and Windows, and even cross-platform between both.
+Users have reported using it successfully on FreeBSD and MacOS X.
+
+Beside its ease of use, one of the main advantages of rdiff-backup is
+that it does use the same efficient protocol as rsync to transfer and
+store data. Because rdiff-backup only stores the differences from the
+previous backup to the next one (a so called reverse incremental
+backup), the latest backup is always a full backup, making it easiest
+and fastest to restore the most recent backups, combining the space
+advantages of incremental backups while keeping the speed advantages
+of full backups (at least for recent ones).
+
+If the optional (runtime) dependencies pylibacl and pyxattr are
+installed, rdiff-backup will support Access Control Lists and Extended
+Attributes provided the file system(s) also support these features.
+
+IMPORTANT: rdiff-backup 2.x is wire-incompatible with versions 1.x, for
+local backups there's no problem but if you backup remotely you have to
+use the same version of rdiff-backup in the client and server.
diff --git a/system/rdiff-backup/rdiff-backup.SlackBuild b/system/rdiff-backup/rdiff-backup.SlackBuild
index 02fe2055a6..1177f47818 100644
--- a/system/rdiff-backup/rdiff-backup.SlackBuild
+++ b/system/rdiff-backup/rdiff-backup.SlackBuild
@@ -1,6 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rdiff-backup
+# Copyright 2022-2023  Eugene Wissner, Mannheim, Germany
+#
 # Copyright (C) 2007 paul wisehart wise@lupulin.net
 # All rights reserved.
 #
@@ -23,20 +25,30 @@
 
 # Modified by the SlackBuilds.org project
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rdiff-backup
-VERSION=${VERSION:-1.2.8}
+VERSION=${VERSION:-2.2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,7 +67,7 @@ find -L . \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 sed -i 's|share/man/|man/|g' setup.py  || exit 1
-python setup.py install --prefix=/usr --root=$PKG  || exit 1
+python3 setup.py install --prefix=/usr --root=$PKG  || exit 1
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -66,13 +78,13 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 )
 
 mkdir -p $PKG/usr/doc
-mv $PKG/usr/share/doc/$PRGNAM-$VERSION $PKG/usr/doc
+mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a examples.html $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-rm -rf $PKG/usr/share
+rm -rf $PKG/usr/share/doc
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rdiff-backup/rdiff-backup.info b/system/rdiff-backup/rdiff-backup.info
index fe58d9070b..94e35800cc 100644
--- a/system/rdiff-backup/rdiff-backup.info
+++ b/system/rdiff-backup/rdiff-backup.info
@@ -1,10 +1,10 @@
 PRGNAM="rdiff-backup"
-VERSION="1.2.8"
-HOMEPAGE="http://rdiff-backup.nongnu.org/"
-DOWNLOAD="http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-1.2.8.tar.gz"
-MD5SUM="1a94dc537fcf74d6a3a80bd27808e77b"
+VERSION="2.2.6"
+HOMEPAGE="https://rdiff-backup.net/"
+DOWNLOAD="https://download.dlackware.com/hosted-sources/rdiff-backup/rdiff-backup-2.2.6.tar.gz"
+MD5SUM="cc055b501f004c1828664755ae039c28"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="librsync"
-MAINTAINER="Ricardo J. Barberis"
-EMAIL="ricardo.barberis@gmail.com"
+MAINTAINER="Eugene Wissner"
+EMAIL="belka@caraus.de"
diff --git a/system/rdup/rdup.SlackBuild b/system/rdup/rdup.SlackBuild
index b28b84fc97..3fb0bfa2fb 100644
--- a/system/rdup/rdup.SlackBuild
+++ b/system/rdup/rdup.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rdup
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rdup
 VERSION=${VERSION:-1.1.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -101,4 +111,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/read-edid/README b/system/read-edid/README
index d0b7063947..421c48a98c 100644
--- a/system/read-edid/README
+++ b/system/read-edid/README
@@ -6,11 +6,12 @@ the EDID from a monitor. It should work with most monitors made since
 the video card supports the standard read commands (most do).
 
 read-edid is a set of two tools: get-edid, which gets the raw edid
-information from the monitor, and parse-edid, which turns the raw binary
-information into an xorg.conf-compatible Monitor section.
+information from the monitor, and parse-edid, which turns the raw
+binary information into an xorg.conf-compatible Monitor section.
 
 Modern Linux kernels also make the EDID data available in
-/sys/class/drm/card*-*/edid, so the get-edid command might not be needed.
+/sys/class/drm/card*-*/edid, so the get-edid command might not be
+needed.
 
 See also system/edid-decode, which gives more detail than parse-edid,
 but doesn't format its output as an xorg.conf-compatible snippet.
diff --git a/system/read-edid/gcc10fix.diff b/system/read-edid/gcc10fix.diff
new file mode 100644
index 0000000000..da52af6a69
--- /dev/null
+++ b/system/read-edid/gcc10fix.diff
@@ -0,0 +1,24 @@
+diff -Naur read-edid-3.0.2/get-edid/classic.c read-edid-3.0.2.patched/get-edid/classic.c
+--- read-edid-3.0.2/get-edid/classic.c	2015-04-28 21:08:34.000000000 -0400
++++ read-edid-3.0.2.patched/get-edid/classic.c	2021-08-24 03:34:15.182335445 -0400
+@@ -26,7 +26,7 @@
+ #define dosmemput(buffer,length,offset) memcpy(offset,buffer,length)
+ 
+ #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); }
+-int quiet;
++extern int quiet;
+ 
+ real_ptr far_ptr_to_real_ptr( uint32 farptr )
+ {
+diff -Naur read-edid-3.0.2/get-edid/i2c.c read-edid-3.0.2.patched/get-edid/i2c.c
+--- read-edid-3.0.2/get-edid/i2c.c	2014-11-21 06:52:13.000000000 -0500
++++ read-edid-3.0.2.patched/get-edid/i2c.c	2021-08-24 03:34:21.390334880 -0400
+@@ -15,7 +15,7 @@
+ 
+ //Ideas (but not too much actual code) taken from i2c-tools. Thanks guys.
+ 
+-int quiet;
++extern int quiet;
+ 
+ #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); }
+ 
diff --git a/system/read-edid/read-edid.SlackBuild b/system/read-edid/read-edid.SlackBuild
index 0d8369e95f..6f4465bee2 100644
--- a/system/read-edid/read-edid.SlackBuild
+++ b/system/read-edid/read-edid.SlackBuild
@@ -1,11 +1,13 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for read-edid
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210824 bkw: BUILD=2, fix build on -current
+
 # 20190108 bkw:
 # - update README: mention the /sys/class/drm stuff and edid-decode.
 # - fix README and slack-desc formatting.
@@ -14,10 +16,13 @@
 
 # 20150505 bkw: update for v3.0.2 (COPYING => LICENSE too)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=read-edid
 VERSION=${VERSION:-3.0.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -27,7 +32,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -58,6 +67,9 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+# make all but one declaration of 'int quiet' an extern
+patch -p1 < $CWD/gcc10fix.diff
+
 mkdir -p build
 cd build
   cmake \
@@ -83,4 +95,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/read-edid/read-edid.info b/system/read-edid/read-edid.info
index e149e7e4d0..a8284097ae 100644
--- a/system/read-edid/read-edid.info
+++ b/system/read-edid/read-edid.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/readpe/README b/system/readpe/README
new file mode 100644
index 0000000000..19a01c9dfa
--- /dev/null
+++ b/system/readpe/README
@@ -0,0 +1,7 @@
+readpe - PE Utils
+
+Open source, full-featured, multiplatform command line toolkit to work
+with and analyze PE (Portable Executables) binaries.
+
+NOTE: readpe is formerly known as pev and thus the replacement.  Please
+uninstall pev prior to installation of readpe
diff --git a/system/readpe/readpe.SlackBuild b/system/readpe/readpe.SlackBuild
new file mode 100644
index 0000000000..dd36510809
--- /dev/null
+++ b/system/readpe/readpe.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/bash
+
+# Slackware build script for readpe
+
+# Copyright 2023-2024 Ebben Aries <slackbuilds@dscp.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=readpe
+VERSION=${VERSION:-20240131_3c4163e}
+GITHASH=${GITHASH:-3c4163e30896c9a22e996815d5e0f7876b3fc64f}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$GITHASH
+mkdir $PRGNAM-$GITHASH
+tar xvf $CWD/$PRGNAM-$GITHASH.tar.gz
+cd $PRGNAM-$GITHASH
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+sed -i "s|/usr/local|/usr|" src/Makefile
+sed -i "s|/usr/local|/usr|" lib/libpe/Makefile
+sed -i "s|lib$|lib${LIBDIRSUFFIX}|" src/Makefile
+sed -i "s|lib$|lib${LIBDIRSUFFIX}|" lib/libpe/Makefile
+
+make CFLAGS="$SLKCFLAGS" || exit 1
+make install DESTDIR=$PKG prefix="/usr" libdir="/usr/lib${LIBDIRSUFFIX}" mandir="/usr/man" || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+# Don't ship static library:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.a
+
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \+
+for i in $( find $PKG/usr/man -type l ) ; do
+  ln -s $( readlink $i ).gz $i.gz
+  rm $i
+done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/readpe/readpe.info b/system/readpe/readpe.info
new file mode 100644
index 0000000000..dbc828f761
--- /dev/null
+++ b/system/readpe/readpe.info
@@ -0,0 +1,10 @@
+PRGNAM="readpe"
+VERSION="20240131_3c4163e"
+HOMEPAGE="https://github.com/mentebinaria/readpe"
+DOWNLOAD="https://github.com/mentebinaria/readpe/archive/3c4163e/readpe-3c4163e30896c9a22e996815d5e0f7876b3fc64f.tar.gz"
+MD5SUM="85f1fa2212a7d996efbab4fe2d5e238b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Ebben Aries"
+EMAIL="slackbuilds@dscp.org"
diff --git a/system/readpe/slack-desc b/system/readpe/slack-desc
new file mode 100644
index 0000000000..2d24c85e02
--- /dev/null
+++ b/system/readpe/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+readpe: readpe (PE Utils)
+readpe:
+readpe: Open source, full-featured, multiplatform command line toolkit to work
+readpe: with and analyze PE (Portable Executables) binaries.
+readpe:
+readpe: Website: https://sourceforge.net/projects/pev/
+readpe:
+readpe:
+readpe:
+readpe:
+readpe:
diff --git a/system/realtek-bt/README b/system/realtek-bt/README
new file mode 100644
index 0000000000..c253ed6d88
--- /dev/null
+++ b/system/realtek-bt/README
@@ -0,0 +1,10 @@
+Driver for realtek based usb bluetooth adapters such as Orico. Once
+this driver is installed, the adapter should be used with a
+bluetooth manager such as blueman-manager which is a standard
+Slackware package.
+
+You'll need to recompile and reinstall this package each time you
+update your kernel.
+
+You need to reboot your machine after you install/uninstall this
+package.
diff --git a/system/realtek-bt/install/doinst.sh b/system/realtek-bt/install/doinst.sh
new file mode 100644
index 0000000000..daba69ac9c
--- /dev/null
+++ b/system/realtek-bt/install/doinst.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+DRV_DIR=/lib/modules/`uname -r`/kernel/drivers/bluetooth
+
+if lsmod | grep "^btusb " -q; then
+  rmmod btusb
+fi
+mv $DRV_DIR/btusb.ko $DRV_DIR/btusb_bak
+if lsmod | grep "^rtk_btusb " -q; then
+  rmmod rtk_btusb
+fi
+depmod -a `uname -r`
+echo "Driver installed, please reboot your system."
+
diff --git a/system/realtek-bt/install/douninst.sh b/system/realtek-bt/install/douninst.sh
new file mode 100644
index 0000000000..b5e43ade08
--- /dev/null
+++ b/system/realtek-bt/install/douninst.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+DRV_DIR=/lib/modules/$(uname -r)/kernel/drivers/bluetooth
+
+mv -n $DRV_DIR/btusb_bak $DRV_DIR/btusb.ko
+if lsmod | grep "^rtk_btusb " -q; then
+  rmmod rtk_btusb
+fi
+depmod -a $(uname -r)
+echo "Driver uninstalled, please reboot your system."
diff --git a/system/realtek-bt/realtek-bt.SlackBuild b/system/realtek-bt/realtek-bt.SlackBuild
new file mode 100644
index 0000000000..1515e9b99c
--- /dev/null
+++ b/system/realtek-bt/realtek-bt.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# Slackware build script for a driver for realtek based usb bluetooth
+# adapters.
+
+# Copyright 2023 Strahil Yordanov, Sofia, Bulgaria
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=realtek-bt
+VERSION=${VERSION:-20201202}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+TMP=${TMP:-/tmp/SBo}
+BUILD_DIR=$TMP/$PRGNAM
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm; echo "Unsupported arch $ARCH"; exit 1;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+BASE_DIR=20201202_LINUX_BT_DRIVER/usb/
+SRC_DIR=bluetooth_usb_driver
+DRV_DIR=lib/modules/$(uname -r)/kernel/drivers/bluetooth
+
+set -e
+
+rm -rf $BUILD_DIR $PKG
+mkdir -p $TMP $BUILD_DIR $PKG $OUTPUT
+
+cd $BUILD_DIR
+7z x $CWD/mpow_BH519A_driver+for+Linux.7z
+cd $BASE_DIR
+make -C $SRC_DIR
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+cd $PKG
+
+mkdir -p $DRV_DIR
+cp $BUILD_DIR/$BASE_DIR/$SRC_DIR/rtk_btusb.ko $DRV_DIR
+cp -r $CWD/install .
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/realtek-bt/realtek-bt.info b/system/realtek-bt/realtek-bt.info
new file mode 100644
index 0000000000..572dc32fa7
--- /dev/null
+++ b/system/realtek-bt/realtek-bt.info
@@ -0,0 +1,10 @@
+PRGNAM="realtek-bt"
+VERSION="20201202"
+HOMEPAGE="https://github.com/mkopa/Linux-Driver-USB-Bluetooth-5.0-ORICO-BTA-508"
+DOWNLOAD="https://master.dl.sourceforge.net/project/realtek-bt/mpow_BH519A_driver+for+Linux.7z"
+MD5SUM="994ad1d6f6bd1e63190dfef7f64bbb34"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="p7zip"
+MAINTAINER="Strahil Yordanov"
+EMAIL="strahilski@yahoo.com"
diff --git a/system/realtek-bt/slack-desc b/system/realtek-bt/slack-desc
new file mode 100644
index 0000000000..cbd8da7a77
--- /dev/null
+++ b/system/realtek-bt/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+realtek-bt: realtek-bt (Driver for realtek based usb bluetooth adapters)
+realtek-bt:
+realtek-bt: Driver for realtek based usb bluetooth adapters such as Orico. Once
+realtek-bt: this driver is installed, the adapter should be used with a
+realtek-bt: bluetooth manager such as blueman-manager which is a standard
+realtek-bt: Slackware package.
+realtek-bt:
+realtek-bt: You need to reboot your machine after you install/uninstall this
+realtek-bt: package.
+realtek-bt:
+realtek-bt:
diff --git a/system/rear/README b/system/rear/README
index 9aece9cde1..090d9dc7c0 100644
--- a/system/rear/README
+++ b/system/rear/README
@@ -1,10 +1,10 @@
 rear (bare metal disaster recovery and system migration tool)
 
-Relax-and-Recover is the leading Open Source bare metal disaster recovery
-and system migration solution. It is a modular framework with many
-ready-to-go workflows for common situations.
+Relax-and-Recover is the leading Open Source bare metal disaster
+recovery and system migration solution. It is a modular framework with
+many ready-to-go workflows for common situations.
 
-Relax-and-Recover produces a bootable image. This image can repartition the
-system. Once that is done it initiates a restore from backup. Restores to
-different hardware are possible. Relax-and-Recover can therefore be used as a
-migration tool as well.
+Relax-and-Recover produces a bootable image. This image can
+repartition the system. Once that is done it initiates a restore from
+backup. Restores to different hardware are possible. Relax-and-Recover
+can therefore be used as a migration tool as well.
diff --git a/system/rear/rear.SlackBuild b/system/rear/rear.SlackBuild
index 4d12cf0835..96e3eac852 100644
--- a/system/rear/rear.SlackBuild
+++ b/system/rear/rear.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rear
 
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rear
 VERSION=${VERSION:-2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -70,4 +80,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/recoverdm/README b/system/recoverdm/README
index 64837ab8e9..9755c0b72b 100644
--- a/system/recoverdm/README
+++ b/system/recoverdm/README
@@ -1,13 +1,15 @@
-This program will help you recover disks with bad sectors. You can recover
-files as well complete devices.
+This program will help you recover disks with bad sectors. You can
+recover files as well complete devices.
 
-In case if finds sectors which simply cannot be recoverd, it writes an empty
-sector to the outputfile and continues. If you're recovering a CD or a DVD and
-the program cannot read the sector in "normal mode", then the program will try
-to read the sector in "RAW mode" (without error-checking etc.).
+In case if finds sectors which simply cannot be recoverd, it writes an
+empty sector to the outputfile and continues. If you're recovering a
+CD or a DVD and the program cannot read the sector in "normal mode",
+then the program will try to read the sector in "RAW mode" (without
+error-checking etc.).
 
-This toolkit also has a utility called 'mergebad': mergebad merges multiple
-images into one. This can be usefull when you have, for example, multiple CD's
-with the same data which are all damaged. In such case, you can then first use
-recoverdm to retrieve the data from the damaged CD's into image-files and then
-combine them into one image with mergebad.
+This toolkit also has a utility called 'mergebad': mergebad merges
+multiple images into one. This can be usefull when you have, for
+example, multiple CDs with the same data which are all damaged. In
+such case, you can then first use recoverdm to retrieve the data from
+the damaged CD's into image-files and then combine them into one image
+with mergebad.
diff --git a/system/recoverdm/recoverdm.SlackBuild b/system/recoverdm/recoverdm.SlackBuild
index 10fb724131..148742a987 100644
--- a/system/recoverdm/recoverdm.SlackBuild
+++ b/system/recoverdm/recoverdm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2010  Binh Nguyen <binhvng@gmail.com>
 # All rights reserved.
@@ -20,20 +20,30 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=recoverdm
 VERSION=${VERSION:-0.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -70,4 +80,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/recoverdm/recoverdm.info b/system/recoverdm/recoverdm.info
index 03aca2fd32..5e6329fee7 100644
--- a/system/recoverdm/recoverdm.info
+++ b/system/recoverdm/recoverdm.info
@@ -1,7 +1,7 @@
 PRGNAM="recoverdm"
 VERSION="0.20"
 HOMEPAGE="http://www.vanheusden.com/recoverdm/"
-DOWNLOAD="http://www.vanheusden.com/recoverdm/recoverdm-0.20.tgz"
+DOWNLOAD="http://attic-distfiles.pld-linux.org/distfiles/by-md5/9/d/9da9ea7d44f8f94984715eb2ff1ecab4/recoverdm-0.20.tgz"
 MD5SUM="9da9ea7d44f8f94984715eb2ff1ecab4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/recoverjpeg/recoverjpeg.SlackBuild b/system/recoverjpeg/recoverjpeg.SlackBuild
index 00f24be48b..3f5c2fcad7 100644
--- a/system/recoverjpeg/recoverjpeg.SlackBuild
+++ b/system/recoverjpeg/recoverjpeg.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for recoverjpeg
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=recoverjpeg
 VERSION=${VERSION:-2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -97,4 +107,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/redict/README b/system/redict/README
new file mode 100644
index 0000000000..21e9808fc4
--- /dev/null
+++ b/system/redict/README
@@ -0,0 +1,23 @@
+Redict is an advanced key-value store.
+It is similar to memcached but the dataset is not volatile, and values
+can be strings, exactly like in memcached, but also lists, sets, and
+ordered sets.
+These data types can be manipulated with atomic operations to push/pop
+elements, add/remove elements, perform server side union, intersection,
+difference between sets, and so forth.
+Redict supports different kinds of sorting abilities.
+
+Redict is a fork of Redis after licence went proprietary.
+
+Default port for starting the instance can be set with
+REDICT_PORT=16379
+Defaults remains the Redis port at 6379, hence making it incompatible
+out-of-the-package with a parallel Redis instance running.
+
+redict-cli is (for now) fully compatible with redis-cli, and defaults
+to redis port 6379.
+
+Default directory and files are setup with redict name:
+/var/lib/redict for data
+/var/log/redict for logs
+/etc/rc.d/rc.redict for RC script
diff --git a/system/redict/doinst.sh b/system/redict/doinst.sh
new file mode 100644
index 0000000000..ff94589414
--- /dev/null
+++ b/system/redict/doinst.sh
@@ -0,0 +1,28 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+config etc/redict/redict.conf.new
+config etc/redict/sentinel.conf.new
+config etc/logrotate.d/redict.new
+preserve_perms etc/rc.d/rc.redict.new
diff --git a/system/redict/rc.redict.new b/system/redict/rc.redict.new
new file mode 100644
index 0000000000..9d1642d6ec
--- /dev/null
+++ b/system/redict/rc.redict.new
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# Redict startup script for Slackware Linux
+
+PORT=6379
+SERV=/usr/bin/redict-server
+CLI=/usr/bin/redict-cli
+PIDFILE=/var/run/redict_${PORT}.pid
+CONF=/etc/redict/redict.conf
+
+redict_start() {
+  if [ ! -r $CONF ]; then
+    echo "$CONF does not appear to exist.  Abort."
+    exit 1
+  fi
+
+  if [ -s $PIDFILE ]; then
+    echo "Redict appears to be already running?"
+    exit 1
+  fi
+
+  echo "Starting Redict server..."
+  $SERV $CONF
+}
+
+redict_stop() {
+  if [ ! -s $PIDFILE ]; then
+    echo "$PIDFILE does not exist or is empty."
+    exit 1
+  fi
+
+  PID=$(cat $PIDFILE)
+  echo -n "Stopping Redict server..."
+  $CLI -p $PORT shutdown
+  while [ -d /proc/$PID ]; do
+    sleep 1
+    echo -n "."
+  done
+  echo " done"
+}
+
+redict_restart() {
+  redict_stop
+  sleep 3
+  redict_start
+}
+
+case "$1" in
+  start)
+    redict_start
+    ;;
+  stop)
+    redict_stop
+    ;;
+  restart)
+    redict_restart
+    ;;
+  *)
+    echo "Usage: $0 {start|stop|restart}"
+    exit 1
+esac
diff --git a/system/redict/redict.SlackBuild b/system/redict/redict.SlackBuild
new file mode 100644
index 0000000000..55ed027832
--- /dev/null
+++ b/system/redict/redict.SlackBuild
@@ -0,0 +1,140 @@
+#!/bin/bash
+
+# Slackware build script for redict
+
+# Copyright 2024 Yth | Pont-en-Royans, France | yth@ythogtha.org
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=redict
+VERSION=${VERSION:-7.3.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Use our CFLAGS.
+sed -i "s|-O3||" deps/Makefile deps/hiredict/Makefile
+
+# No ./configure necessary.
+#
+# http://lists.slackbuilds.org/pipermail/slackbuilds-users/2013-January/010042.html
+( unset ARCH ; CFLAGS="$SLKCFLAGS" make )
+make install PREFIX=$PKG/usr
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Use sample config and set some sane defaults.
+install -D -m 0644 redict.conf $PKG/etc/redict/redict.conf.new
+sed -i \
+  -e 's|^daemonize no|daemonize yes|' \
+  -e 's|^dir \.|dir /var/lib/redict|' \
+  -e 's|^logfile ""|logfile /var/log/redict/redict.log|' \
+  $PKG/etc/redict/redict.conf.new
+install -D -m 0644 sentinel.conf $PKG/etc/redict/sentinel.conf.new
+
+# Create data directory.
+mkdir -p $PKG/var/lib/redict
+chmod 0700 $PKG/var/lib/redict
+
+# Create log directory.
+mkdir -p $PKG/var/log/redict
+
+# Install init script.
+mkdir -p $PKG/etc/rc.d
+cat $CWD/rc.redict.new > $PKG/etc/rc.d/rc.redict.new
+
+# Install logrotate script.
+mkdir -p $PKG/etc/logrotate.d
+cat $CWD/redict.logrotate > $PKG/etc/logrotate.d/redict.new
+
+# Specify default port number
+if [ ! -z "$REDICT_PORT" ]; then
+ sed -i 's/6379/'$REDICT_PORT'/' $PKG/etc/rc.d/rc.redict.new
+ sed -i 's/6379/'$REDICT_PORT'/' $PKG/etc/redict/redict.conf.new
+ sed -i 's/default is '$REDICT_PORT'/default is 6379/' $PKG/etc/valkey/redict.conf.new
+ sed -i 's/6379/'$REDICT_PORT'/' $PKG/etc/redict/sentinel.conf.new
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CONTRIBUTING* README* CODE_OF_CONDUCT* SECURITY* TLS* LICENSES/ \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/redict/redict.info b/system/redict/redict.info
new file mode 100644
index 0000000000..23b037820e
--- /dev/null
+++ b/system/redict/redict.info
@@ -0,0 +1,10 @@
+PRGNAM="redict"
+VERSION="7.3.0"
+HOMEPAGE="https://redict.io/"
+DOWNLOAD="https://codeberg.org/redict/redict/archive/7.3.0.tar.gz"
+MD5SUM="0ea62d90b1642e7dd683aeda034036eb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/system/redict/redict.logrotate b/system/redict/redict.logrotate
new file mode 100644
index 0000000000..edf55b6b02
--- /dev/null
+++ b/system/redict/redict.logrotate
@@ -0,0 +1,9 @@
+/var/log/redict/redict.log {
+    daily
+    rotate 7
+    copytruncate
+    delaycompress
+    compress
+    notifempty
+    missingok
+}
diff --git a/system/redict/slack-desc b/system/redict/slack-desc
new file mode 100644
index 0000000000..ad605c3218
--- /dev/null
+++ b/system/redict/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+redict: redict (Key-Value Store)
+redict:
+redict: Redict is an advanced key-value store.  It is similar to memcached but
+redict: the dataset is not volatile, and values can be strings, exactly like
+redict: in memcached, but also lists, sets, and ordered sets.  These data
+redict: types can be manipulated with atomic operations to push/pop elements,
+redict: add/remove elements, perform server side union, intersection,
+redict: Records are organized in hash table, B+ tree, or a fixed-length array.
+redict: Redict supports different kinds of sorting abilities.
+redict:
+redict: Homepage: https://redict.io/
diff --git a/system/redis-py/redis-py.SlackBuild b/system/redis-py/redis-py.SlackBuild
index dc0d003cc7..f7c4368973 100644
--- a/system/redis-py/redis-py.SlackBuild
+++ b/system/redis-py/redis-py.SlackBuild
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for redis-py
 
+# Copyright 2022 Yth | Pont-en-Royans, France | yth@ythogtha.org
 # Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=redis-py
-VERSION=${VERSION:-2.10.5}
+VERSION=${VERSION:-5.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -49,6 +60,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -69,17 +83,17 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES LICENSE README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/redis-py/redis-py.info b/system/redis-py/redis-py.info
index 932647ceaa..eac44c73b8 100644
--- a/system/redis-py/redis-py.info
+++ b/system/redis-py/redis-py.info
@@ -1,10 +1,10 @@
 PRGNAM="redis-py"
-VERSION="2.10.5"
+VERSION="5.0.3"
 HOMEPAGE="https://github.com/andymccurdy/redis-py"
-DOWNLOAD="https://github.com/andymccurdy/redis-py/archive/2.10.5.tar.gz"
-MD5SUM="0bd17cf92f1078f5bc0a4863d90fedeb"
+DOWNLOAD="https://github.com/andymccurdy/redis-py/archive/v5.0.3/redis-py-5.0.3.tar.gz"
+MD5SUM="63e2b3e83cf316b50ea4d1da2061b6f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="redis"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/system/redis/redis.SlackBuild b/system/redis/redis.SlackBuild
index 57ad891afe..1045eebe69 100644
--- a/system/redis/redis.SlackBuild
+++ b/system/redis/redis.SlackBuild
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for redis
 
+# Copyright 2022 Yth | Pont-en-Royans, France | yth@ythogtha.org
 # Copyright 2010 Kuroi Kenshi <kuroi_kenshi96@yahoo.com>
 # Copyright 2012-2018 Audrius Kažukauskas <audrius@neutrino.lt>
 # All rights reserved.
@@ -23,10 +24,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=redis
-VERSION=${VERSION:-4.0.9}
+VERSION=${VERSION:-7.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -50,6 +61,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -108,7 +122,7 @@ cat $CWD/redis.logrotate > $PKG/etc/logrotate.d/redis.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  00-RELEASENOTES BUGS CONTRIBUTING COPYING MANIFESTO README.md \
+  *RELEASENOTES* BUGS* CONTRIBUTING* COPYING* MANIFESTO* README* CODE_OF_CONDUCT* SECURITY* TLS* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -117,4 +131,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/redis/redis.info b/system/redis/redis.info
index b63da6d7ba..c5a41e3483 100644
--- a/system/redis/redis.info
+++ b/system/redis/redis.info
@@ -1,10 +1,10 @@
 PRGNAM="redis"
-VERSION="4.0.9"
+VERSION="7.2.4"
 HOMEPAGE="https://redis.io/"
-DOWNLOAD="http://download.redis.io/releases/redis-4.0.9.tar.gz"
-MD5SUM="23e34838590c028e2d5b3037dbbef335"
+DOWNLOAD="https://download.redis.io/releases/redis-7.2.4.tar.gz"
+MD5SUM="5ec126130d702828d98fed8e0c71fc1d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Audrius Kažukauskas"
-EMAIL="audrius@neutrino.lt"
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/system/refind-bin/README b/system/refind-bin/README
new file mode 100644
index 0000000000..e0a0f59854
--- /dev/null
+++ b/system/refind-bin/README
@@ -0,0 +1,15 @@
+rEFInd (An EFI boot manager utility)
+
+A graphical boot manager for EFI- and UEFI-based computers, such as all
+Intel-based Macs and recent (most 2011 and later) PCs. rEFInd presents
+a boot menu showing all the EFI boot loaders on the EFI-accessible
+partitions, and optionally BIOS-bootable partitions on Macs.
+EFI-compatible OSes, including Linux, provide boot loaders that rEFInd
+can detect and launch. rEFInd can launch Linux EFI boot loaders such
+as ELILO, GRUB Legacy, GRUB 2, and 3.3.0 and later kernels with EFI
+stub support.
+
+This script does not build the boot manager from source, instead it
+repackages the official binary as a Slackware package.
+
+There is an another Sbo script "rEFInd", which builds from source.
diff --git a/system/refind-bin/refind-bin.SlackBuild b/system/refind-bin/refind-bin.SlackBuild
new file mode 100644
index 0000000000..465f5fcf90
--- /dev/null
+++ b/system/refind-bin/refind-bin.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+# Slackware build script for refind
+
+# Copyright 2014-2023 Zhu Qun-Ying
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=refind-bin
+SRCNAM=refind
+VERSION=${VERSION:-0.14.0.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ "$ARCH" != "x86_64" ] && [ "$ARCH" != "i586" ] && [ "$ARCH" != "i686" ]; then
+    echo "Platform $ARCH not supported."
+    exit
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-bin-$VERSION
+unzip $CWD/$SRCNAM-bin-${VERSION}.zip
+cd $SRCNAM-bin-$VERSION
+chown -R root:root .
+
+REFIND_SHARE_DIR=$PKG/usr/share/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/sbin
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $REFIND_SHARE_DIR
+
+# copy keys
+cp -ra keys refind refind-install refind-mkdefault fonts banners $REFIND_SHARE_DIR
+cp mkrlconf mvrefind mountesp $PKG/usr/sbin
+cp -a docs/* *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+
+(cd $PKG/usr/sbin
+ ln -sf /usr/share/$PRGNAM-$VERSION/refind-install
+ ln -sf /usr/share/$PRGNAM-$VERSION/refind-mkdefault)
+
+AA64_PKG="$REFIND_SHARE_DIR/refind/drivers_aa64 \
+         $REFIND_SHARE_DIR/refind/tools_aa64 \
+	 $REFIND_SHARE_DIR/refind/refind_aa64.efi"
+# remove unnecessary packages
+if [ "$ARCH" = "x86_64" ]; then
+    rm -rf $REFIND_SHARE_DIR/refind/drivers_ia32 \
+	$REFIND_SHARE_DIR/refind/tools_ia32 \
+	$REFIND_SHARE_DIR/refind/refind_ia32.efi \
+	$AA64_PKG
+else
+    rm -rf $REFIND_SHARE_DIR/refind/drivers_x64 \
+	$REFIND_SHARE_DIR/refind/tools_x64 \
+	$REFIND_SHARE_DIR/refind/refind_x64.efi \
+	$AA64_PKG
+fi
+
+find $PKG/usr/doc -type d -exec chmod 0755 {} \;
+
+# include a slackware banner made by me, including the svg version
+cp $CWD/slackware-banner.* $REFIND_SHARE_DIR/banners
+
+mkdir -p $PKG/usr/man/man8
+mv $PKG/usr/doc/$PRGNAM-$VERSION/man/*.8 $PKG/usr/man/man8
+rmdir $PKG/usr/doc/$PRGNAM-$VERSION/man
+find $PKG/usr/man -type f -exec chmod 0644 {} \;
+gzip $PKG/usr/man/man8/*
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/refind-bin/refind-bin.info b/system/refind-bin/refind-bin.info
new file mode 100644
index 0000000000..d78996371c
--- /dev/null
+++ b/system/refind-bin/refind-bin.info
@@ -0,0 +1,10 @@
+PRGNAM="refind-bin"
+VERSION="0.14.0.2"
+HOMEPAGE="https://www.rodsbooks.com/refind"
+DOWNLOAD="https://sourceforge.net/projects/refind/files/0.14.0.2/refind-bin-0.14.0.2.zip"
+MD5SUM="541ad974824eec978f953bdee349bd5c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Zhu Qun-Ying"
+EMAIL="zhu.qunying@gmail.com"
diff --git a/system/refind-bin/slack-desc b/system/refind-bin/slack-desc
new file mode 100644
index 0000000000..56aad68dfa
--- /dev/null
+++ b/system/refind-bin/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+refind-bin: refind-bin (An EFI boot manager utility)
+refind-bin:
+refind-bin: A graphical boot manager for EFI and UEFI-based computers, such as all
+refind-bin: Intel-based Macs and recent (most 2011 and later) PCs. rEFInd presents
+refind-bin: a boot menu showing all the EFI boot loaders on the EFI-accessible
+refind-bin: partitions, and optionally BIOS-bootable partitions on Macs.
+refind-bin: EFI-compatible OSes, including Linux, provide boot loaders that rEFInd
+refind-bin: can detect and launch. rEFInd can launch Linux EFI boot loaders such
+refind-bin: as ELILO, GRUB Legacy, GRUB 2, and 3.3.0 and later kernels with EFI
+refind-bin: stub support.
+refind-bin: Home page: http://www.rodsbooks.com/refind/
diff --git a/system/refind/slackware-banner.png b/system/refind-bin/slackware-banner.png
index 3458904c3d..3458904c3d 100644
--- a/system/refind/slackware-banner.png
+++ b/system/refind-bin/slackware-banner.png
diff --git a/system/refind/slackware-banner.svg b/system/refind-bin/slackware-banner.svg
index 78baf4d4d0..78baf4d4d0 100644
--- a/system/refind/slackware-banner.svg
+++ b/system/refind-bin/slackware-banner.svg
diff --git a/system/refind/README b/system/refind/README
deleted file mode 100644
index 5a347d4823..0000000000
--- a/system/refind/README
+++ /dev/null
@@ -1,18 +0,0 @@
-rEFInd (An EFI boot manager utility)
-
-A graphical boot manager for EFI- and UEFI-based computers, such as all
-Intel-based Macs and recent (most 2011 and later) PCs. rEFInd presents
-a boot menu showing all the EFI boot loaders on the EFI-accessible
-partitions, and optionally BIOS-bootable partitions on Macs.
-EFI-compatible OSes, including Linux, provide boot loaders that rEFInd
-can detect and launch. rEFInd can launch Linux EFI boot loaders such
-as ELILO, GRUB Legacy, GRUB 2, and 3.3.0 and later kernels with EFI
-stub support.
-
-This script does not build the boot manager from source, in stead it uses
-the pre-build binary then convert to Slackware's.
-
-This package is optionally depends on python3 if you want to run the
-refind-mkdefault script, otherwise you don't need python3.
-
-There is an another Sbo script "rEFInd", which builds from source.
diff --git a/system/refind/refind.SlackBuild b/system/refind/refind.SlackBuild
deleted file mode 100644
index b8c892ed95..0000000000
--- a/system/refind/refind.SlackBuild
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for refind
-
-# Copyright 2014-2020 Zhu Qun-Ying
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=refind
-VERSION=${VERSION:-0.12.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ "$ARCH" != "x86_64" ] && [ "$ARCH" != "i586" ] && [ "$ARCH" != "i686" ]; then
-    echo "Platform $ARCH not supported."
-    exit
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-bin-$VERSION
-unzip $CWD/$PRGNAM-bin-${VERSION}.zip
-cd $PRGNAM-bin-$VERSION
-chown -R root:root .
-
-REFIND_SHARE_DIR=$PKG/usr/share/$PRGNAM-$VERSION
-mkdir -p $PKG/usr/sbin
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mkdir -p $REFIND_SHARE_DIR
-
-# copy keys
-cp -ra keys refind refind-install refind-mkdefault fonts banners $REFIND_SHARE_DIR
-cp mkrlconf mvrefind mountesp $PKG/usr/sbin
-cp -a docs/* *.txt $PKG/usr/doc/$PRGNAM-$VERSION
-
-(cd $PKG/usr/sbin
- ln -sf /usr/share/refind-$VERSION/refind-install
- ln -sf /usr/share/refind-$VERSION/refind-mkdefault)
-
-AA64_PKG="$REFIND_SHARE_DIR/refind/drivers_aa64 \
-         $REFIND_SHARE_DIR/refind/tools_aa64 \
-	 $REFIND_SHARE_DIR/refind/refind_aa64.efi"
-# remove unnecessary packages
-if [ "$ARCH" = "x86_64" ]; then
-    rm -rf $REFIND_SHARE_DIR/refind/drivers_ia32 \
-	$REFIND_SHARE_DIR/refind/tools_ia32 \
-	$REFIND_SHARE_DIR/refind/refind_ia32.efi \
-	$AA64_PKG
-else
-    rm -rf $REFIND_SHARE_DIR/refind/drivers_x64 \
-	$REFIND_SHARE_DIR/refind/tools_x64 \
-	$REFIND_SHARE_DIR/refind/refind_x64.efi \
-	$AA64_PKG
-fi
-# include a slackware banner made by me, including the svg version
-cp $CWD/slackware-banner.* $REFIND_SHARE_DIR/banners
-
-mkdir -p $PKG/usr/man/man8
-mv $PKG/usr/doc/$PRGNAM-$VERSION/man/*.8 $PKG/usr/man/man8
-rmdir $PKG/usr/doc/$PRGNAM-$VERSION/man
-gzip $PKG/usr/man/man8/*
-
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/refind/refind.info b/system/refind/refind.info
deleted file mode 100644
index ead99133aa..0000000000
--- a/system/refind/refind.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="refind"
-VERSION="0.12.0"
-HOMEPAGE="http://www.rodsbooks.com/refind/index.html"
-DOWNLOAD="http://sourceforge.net/projects/refind/files/0.12.0/refind-bin-0.12.0.zip"
-MD5SUM="b44285cf65a9c61065761cb699532b8a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Zhu Qun-Ying"
-EMAIL="zhu.qunying@gmail.com"
diff --git a/system/refind/slack-desc b/system/refind/slack-desc
deleted file mode 100644
index c716bba875..0000000000
--- a/system/refind/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-      |-----handy-ruler------------------------------------------------------|
-refind: refind (An EFI boot manager utility)
-refind:
-refind: A graphical boot manager for EFI and UEFI-based computers, such as all
-refind: Intel-based Macs and recent (most 2011 and later) PCs. rEFInd presents
-refind: a boot menu showing all the EFI boot loaders on the EFI-accessible
-refind: partitions, and optionally BIOS-bootable partitions on Macs.
-refind: EFI-compatible OSes, including Linux, provide boot loaders that rEFInd
-refind: can detect and launch. rEFInd can launch Linux EFI boot loaders such
-refind: as ELILO, GRUB Legacy, GRUB 2, and 3.3.0 and later kernels with EFI
-refind: stub support.
-refind: Home page: http://www.rodsbooks.com/refind/
diff --git a/system/regionset/regionset.SlackBuild b/system/regionset/regionset.SlackBuild
index a43b7764bd..d9890be234 100644
--- a/system/regionset/regionset.SlackBuild
+++ b/system/regionset/regionset.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for regionset
 
@@ -22,10 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=regionset
 VERSION=${VERSION:-0.2}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -78,4 +88,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/regionset/regionset.info b/system/regionset/regionset.info
index f9792ed4ae..189651a4da 100644
--- a/system/regionset/regionset.info
+++ b/system/regionset/regionset.info
@@ -6,5 +6,5 @@ MD5SUM="a908ba16ca948512df22250f3d500073"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
+MAINTAINER="D Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/system/reiser4progs/fix_libreiser4_linking.diff b/system/reiser4progs/fix_libreiser4_linking.diff
deleted file mode 100644
index 748c3da21c..0000000000
--- a/system/reiser4progs/fix_libreiser4_linking.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur reiser4progs-1.1.0/libreiser4/profile.c reiser4progs-1.1.0.patched/libreiser4/profile.c
---- reiser4progs-1.1.0/libreiser4/profile.c	2015-08-23 13:13:59.000000000 -0400
-+++ reiser4progs-1.1.0.patched/libreiser4/profile.c	2017-02-14 16:48:03.318110246 -0500
-@@ -5,7 +5,8 @@
- 
- 
- #include <reiser4/libreiser4.h>
--#include <misc/misc.h>
-+#include <stdlib.h>
-+#include <errno.h>
- 
- /* All default plugin ids. This is used for getting plugin id if it cannot be
-    obtained by usual way (get from disk structures, etc.). All these may be
-@@ -332,6 +333,7 @@
- 	reiser4_plug_t *plug;
- 	long long int val;
- 	uint8_t i;
-+	char *error;
- 	
- 	aal_assert("umka-924", slot != NULL);
- 	aal_assert("umka-923", name != NULL);
-@@ -354,7 +356,8 @@
- 	}
- 	
- 	if (defprof.pid[i].id.type == PARAM_PLUG_TYPE)  {
--		if ((val = misc_str2long((char *)name, 10)) == INVAL_DIG) {
-+		val = strtol((char *)name, &error, 10);
-+		if (errno == ERANGE || *error) {
- 			aal_error("Invalid value \"%s\" is provided for the "
- 				  "profile slot \"%s\".", (char *)name,
- 				  defprof.pid[i].name);
diff --git a/system/reiser4progs/reiser4progs.SlackBuild b/system/reiser4progs/reiser4progs.SlackBuild
index 32714ac9b5..bf0a93fc8f 100644
--- a/system/reiser4progs/reiser4progs.SlackBuild
+++ b/system/reiser4progs/reiser4progs.SlackBuild
@@ -1,11 +1,19 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for reiser4progs
 
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - get rid of static libraries.
+# - don't install the install instructions (useless for the user
+#   of a binary package).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=reiser4progs
-VERSION=${VERSION:-1.2.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.2.2}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -15,7 +23,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -46,15 +58,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# 20170214 bkw: Fix unresolved symbol errors when trying to link with
-# -lreiser4. This doesn't affect reiser4progs itself, but allows other
-# programs (in particular, partclone) to link with its library. Patched
-# code originally came from the partclone maintainer.
-patch -p1 < $CWD/fix_libreiser4_linking.diff
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -65,26 +71,23 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-libminimal \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS BUGS COPYING CREDITS CUSTOM_INSTALL_README ChangeLog \
-  INSTALL INSTALL_README NEWS README THANKS TODO \
+cp -a AUTHORS BUGS COPYING CREDITS ChangeLog \
+  README THANKS TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/reiser4progs/reiser4progs.info b/system/reiser4progs/reiser4progs.info
index 6ce1610ece..2ce82924dc 100644
--- a/system/reiser4progs/reiser4progs.info
+++ b/system/reiser4progs/reiser4progs.info
@@ -1,8 +1,8 @@
 PRGNAM="reiser4progs"
-VERSION="1.2.1"
-HOMEPAGE="https://sourceforge.net/projects/reiser4/"
-DOWNLOAD="https://sourceforge.net/projects/reiser4/files/reiser4-utils/reiser4progs/reiser4progs-1.2.1.tar.gz"
-MD5SUM="5c3af8644a4ab291fd59ccff6539a1ed"
+VERSION="1.2.2"
+HOMEPAGE="https://sourceforge.net/projects/reiser4/files/reiser4-utils/reiser4progs/"
+DOWNLOAD="https://sourceforge.net/projects/reiser4/files/reiser4-utils/reiser4progs/reiser4progs-1.2.2.tar.gz"
+MD5SUM="339a52a45688dbc128aaf30b9dc6c15d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libaal"
diff --git a/system/rename.pl/README b/system/rename.pl/README
new file mode 100644
index 0000000000..119b57a21c
--- /dev/null
+++ b/system/rename.pl/README
@@ -0,0 +1,10 @@
+rename.pl (rename multiple files, perl style)
+
+Rename.pl renames the filenames supplied according to the rule
+specified as the first argument. The argument is a Perl expression
+which is expected to modify the $_ string for at least some of the
+filenames specified.
+
+This replaces the system/perl-rename that was formerly available.
+
+See also: system/rename (Python version), system/mmv.
diff --git a/system/rename.pl/rename.pl.SlackBuild b/system/rename.pl/rename.pl.SlackBuild
new file mode 100644
index 0000000000..6888606c81
--- /dev/null
+++ b/system/rename.pl/rename.pl.SlackBuild
@@ -0,0 +1,134 @@
+#!/bin/bash
+
+# Slackware build script for rename.pl
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# This replaces the former perl-rename from the SBo repo. The
+# maintainer of perl-rename asked me to take over the build, and I
+# decided I like the name "rename.pl" better. Also, the old one was in
+# the perl/ category, implying it was a perl library. It's not. Just
+# because an application is *written* in perl, doesn't mean it should
+# be in the perl/ category (same goes for python/, people).
+
+# This is a completely new SlackBuild (shares no code with
+# perl-rename.SlackBuild).
+
+# This is the "classic" rename, that used to ship with the perl source
+# ages ago. It's also the same "rename" as Debian used to ship. I'm
+# aware of the existence of https://metacpan.org/release/File-Rename
+# but it's not the same: it's missing a lot of options (--no-stdin,
+# -i, -l, -v, and all the options relating to backups). It also
+# added some new options that do look useful (-0, -d, -e, -E), but it
+# doesn't look like a good tradeoff to me.
+
+# There's also a completely different rename.pl here:
+# https://github.com/kugland/rename.pl
+# ...which AUR ships at version 2.0.0, so repology keeps telling me
+# this is outdated. Wish there were a way to fix that.
+
+# Since the name "rename" conflicts with util-linux, I've named this
+# rename.pl, and gone to some trouble to make sure its documentation
+# refers to rename.pl consistently (particularly the example commands,
+# which wouldn't work if you copy/pasted them as-is).
+
+# This version of rename is still actively maintained, as of 20230226.
+
+# 20230905 bkw: updated for v1.14, tweak man page, add shell completions.
+# 20221228 bkw: updated for v1.12, fix PKGTYPE assignment.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=rename.pl
+VERSION=${VERSION:-1.14}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM=rename
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+chmod 644 bin/* *
+chmod 755 . bin
+
+# rename => rename.pl in embedded docs. Tricky because the word
+# "rename" is also used as a normal verb and shouldn't be changed in
+# that case. Also fix typos in embedded docs, and clean up the
+# shell completion.
+sed -i \
+  -e '/^rename - renames/s,rename,rename.pl,' \
+  -e '/^  *rename /s,rename,rename.pl,' \
+  -e 's,rename prompts,rename.pl prompts,g' \
+  -e 's,<rename>,<rename.pl>,g' \
+  -e '/make sure rename doesn.t/s,rename,B<rename.pl>,' \
+  -e 's,Us it,Use it,' \
+  -e 's,mv prompts,<rename.pl> prompts,' \
+  -e 's,fo details,for details,' \
+  -e 's,insted,instead,' \
+  -e 's,wheter,whether,' \
+  -e 's,reame,rename,' \
+  -e 's,<-no-stdin>,<--no-stdin>,' \
+  -e 's,I<rename\.pl>,B<rename.pl>,' \
+  -e 's, <rename\.pl>, B<rename.pl>,' \
+  -e 's,destionation,destination,' \
+  -e 's,_comp_rename,_comp_rename_pl,' \
+  -e '/comp/s,rename;,rename.pl;,' \
+  bin/$SRCNAM.PL
+
+perl Makefile.PL
+make
+
+# Generated man page still calls itself RENAME. Also, fix the
+# version info.
+sed -i -e '/^\./s,\<RENAME\>,&.PL,' \
+       -e '/^\.TH/s,"perl v5[^"]*","rename.pl-'$VERSION'",' \
+       blib/man1/$SRCNAM.1
+
+# This really is just a perl script and a man page. 'make install'
+# creates lib(64) dirs and a perllocal.pod that we don't need.
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1
+install -m0755 bin/$SRCNAM $PKG/usr/bin/$PRGNAM
+gzip -9c < blib/man1/$SRCNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+# 20230905 bkw: go ahead and include shell completions in the pkg.
+# Thanks to TommyC on libera IRC for assistance with the zsh stuff.
+ZSHDIR=$PKG/usr/share/zsh/site-functions
+BASHDIR=$PKG/usr/share/bash-completion/completions
+mkdir -p $ZSHDIR $BASHDIR
+
+echo "#compdef $PRGNAM" > $ZSHDIR/_$PRGNAM
+./bin/$SRCNAM --shell-completion=zsh >> $ZSHDIR/_$PRGNAM
+
+mkdir -p $PKG/usr/share/bash-completion/completions
+./bin/$SRCNAM --shell-completion=bash > $BASHDIR/$PRGNAM
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rename.pl/rename.pl.info b/system/rename.pl/rename.pl.info
new file mode 100644
index 0000000000..a9bb4d1b68
--- /dev/null
+++ b/system/rename.pl/rename.pl.info
@@ -0,0 +1,10 @@
+PRGNAM="rename.pl"
+VERSION="1.14"
+HOMEPAGE="https://metacpan.org/pod/release/PEDERST/rename-1.14/bin/rename.PL"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/P/PE/PEDERST/rename-1.14.tar.gz"
+MD5SUM="89882a8672a77ac5efd0e0eefae2d270"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/rename.pl/slack-desc b/system/rename.pl/slack-desc
new file mode 100644
index 0000000000..9ed163d164
--- /dev/null
+++ b/system/rename.pl/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+rename.pl: rename.pl (rename multiple files, perl style)
+rename.pl:
+rename.pl: Rename.pl renames the filenames supplied according to the rule
+rename.pl: specified as the first argument. The argument is a Perl expression
+rename.pl: which is expected to modify the $_ string for at least some of the
+rename.pl: filenames specified.
+rename.pl:
+rename.pl:
+rename.pl:
+rename.pl:
+rename.pl:
diff --git a/system/rename/README b/system/rename/README
index cd1c582ac5..ab95054da8 100644
--- a/system/rename/README
+++ b/system/rename/README
@@ -1,5 +1,5 @@
-Renames files using regular expression matching. This enables elegant handling
-of multiple renames using a single command.
+Renames files using regular expression matching. This enables elegant
+handling of multiple renames using a single command.
 
-Note: This program runs as a 'pyrename' instead of 'rename' to avoid conflict
-with the rename from the util-linux.
+Note: This program runs as a 'pyrename' instead of 'rename' to avoid
+conflict with rename from util-linux.
diff --git a/system/rename/rename.SlackBuild b/system/rename/rename.SlackBuild
index addbd8b357..94bfa4f3c8 100644
--- a/system/rename/rename.SlackBuild
+++ b/system/rename/rename.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rename
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rename
 VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -85,4 +95,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/renameutils/README b/system/renameutils/README
new file mode 100644
index 0000000000..624511e213
--- /dev/null
+++ b/system/renameutils/README
@@ -0,0 +1,6 @@
+renameutils (programs to make renaming of files easier)
+
+The file renaming utilities (renameutils for short) are a set
+of programs designed to make renaming of files faster and less
+cumbersome. The file renaming utilities consists of five programs:
+qmv, qcp, imv, icp and deurlname.
diff --git a/system/renameutils/patches/install-exec-local-fix.patch b/system/renameutils/patches/install-exec-local-fix.patch
new file mode 100644
index 0000000000..7aee3e4c89
--- /dev/null
+++ b/system/renameutils/patches/install-exec-local-fix.patch
@@ -0,0 +1,27 @@
+Description: Fix typo in install target of Makefile
+Forwarded: emailed
+Author: Francois Marier <francois@debian.org>
+Last-Update: 2012-05-06
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -49,7 +49,7 @@ all-local:
+ 	@[ -f icp ] || (echo $(LN_S) icmd icp ; $(LN_S) icmd icp)
+ 
+ install-exec-local:
+-	$(mkdir_p) $(DESTDIR)($bindir)
++	$(mkdir_p) $(DESTDIR)$(bindir)
+ 	@[ -f $(DESTDIR)$(bindir)/qmv ] || (echo $(LN_S) qcmd $(DESTDIR)$(bindir)/qmv ; $(LN_S) qcmd $(DESTDIR)$(bindir)/qmv)
+ 	@[ -f $(DESTDIR)$(bindir)/qcp ] || (echo $(LN_S) qcmd $(DESTDIR)$(bindir)/qcp ; $(LN_S) qcmd $(DESTDIR)$(bindir)/qcp)
+ 	@[ -f $(DESTDIR)$(bindir)/imv ] || (echo $(LN_S) icmd $(DESTDIR)$(bindir)/imv ; $(LN_S) icmd $(DESTDIR)$(bindir)/imv)
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -1577,7 +1577,7 @@ all-local:
+ 	@[ -f icp ] || (echo $(LN_S) icmd icp ; $(LN_S) icmd icp)
+ 
+ install-exec-local:
+-	$(mkdir_p) $(DESTDIR)($bindir)
++	$(mkdir_p) $(DESTDIR)$(bindir)
+ 	@[ -f $(DESTDIR)$(bindir)/qmv ] || (echo $(LN_S) qcmd $(DESTDIR)$(bindir)/qmv ; $(LN_S) qcmd $(DESTDIR)$(bindir)/qmv)
+ 	@[ -f $(DESTDIR)$(bindir)/qcp ] || (echo $(LN_S) qcmd $(DESTDIR)$(bindir)/qcp ; $(LN_S) qcmd $(DESTDIR)$(bindir)/qcp)
+ 	@[ -f $(DESTDIR)$(bindir)/imv ] || (echo $(LN_S) icmd $(DESTDIR)$(bindir)/imv ; $(LN_S) icmd $(DESTDIR)$(bindir)/imv)
diff --git a/system/renameutils/patches/typo_fix.patch b/system/renameutils/patches/typo_fix.patch
new file mode 100644
index 0000000000..63e55f244e
--- /dev/null
+++ b/system/renameutils/patches/typo_fix.patch
@@ -0,0 +1,64 @@
+Description: Fix typo in error message
+Forwarded: emailed
+Author: Francois Marier <francois@debian.org>
+Last-Update: 2018-05-10
+
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -722,7 +722,7 @@ msgstr "Variable accessible en écriture seulement\n"
+ #: src/common/error.c:104
+ #, c-format
+ msgid ""
+-"An internal error has occured. Please report this error by sending the\n"
++"An internal error has occurred. Please report this error by sending the\n"
+ "output below to %s.\n"
+ "\n"
+ "Program: %s\n"
+diff --git a/po/renameutils.pot b/po/renameutils.pot
+index 9c0c9c5..c3e3ea4 100644
+--- a/po/renameutils.pot
++++ b/po/renameutils.pot
+@@ -581,7 +581,7 @@ msgstr ""
+ #: src/common/error.c:104
+ #, c-format
+ msgid ""
+-"An internal error has occured. Please report this error by sending the\n"
++"An internal error has occurred. Please report this error by sending the\n"
+ "output below to %s.\n"
+ "\n"
+ "Program: %s\n"
+diff --git a/po/sv.po b/po/sv.po
+index e44f1f8..784c410 100644
+--- a/po/sv.po
++++ b/po/sv.po
+@@ -705,7 +705,7 @@ msgstr "Skriv-enbart-variabel\n"
+ #: src/common/error.c:104
+ #, c-format
+ msgid ""
+-"An internal error has occured. Please report this error by sending the\n"
++"An internal error has occurred. Please report this error by sending the\n"
+ "output below to %s.\n"
+ "\n"
+ "Program: %s\n"
+diff --git a/src/common/error.c b/src/common/error.c
+index 72ac9b5..d6544e3 100644
+--- a/src/common/error.c
++++ b/src/common/error.c
+@@ -87,7 +87,7 @@ free_error(void)
+ 
+ /**
+  * This function should be called when an internal error has
+- * occured. It will display a more verbose message, asking
++ * occurred. It will display a more verbose message, asking
+  * the user to mail the program author.
+  *
+  * @param msg
+@@ -102,7 +102,7 @@ internal_error(const char *msg, ...)
+ 	if (program_termination_hook != NULL)
+ 		program_termination_hook();
+ 	fprintf(stderr, _("\
+-An internal error has occured. Please report this error by sending the\n\
++An internal error has occurred. Please report this error by sending the\n\
+ output below to %s.\n\
+ \n\
+ Program: %s\n\
diff --git a/system/renameutils/renameutils.SlackBuild b/system/renameutils/renameutils.SlackBuild
new file mode 100644
index 0000000000..25e486b354
--- /dev/null
+++ b/system/renameutils/renameutils.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/bash
+
+# Slackware build script for renameutils
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=renameutils
+VERSION=${VERSION:-0.12.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# Patches from Debian, with thanks. These came from their 0.12.0-11.
+patch -p1 < $CWD/patches/install-exec-local-fix.patch
+patch -p1 < $CWD/patches/typo_fix.patch
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+# Really do need the cumbersome template code, there are symlinked man pages.
+find $PKG/usr/man -type f -exec gzip -9 {} +
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING ChangeLog NEWS README TODO $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/renameutils/renameutils.info b/system/renameutils/renameutils.info
new file mode 100644
index 0000000000..a73a50c828
--- /dev/null
+++ b/system/renameutils/renameutils.info
@@ -0,0 +1,10 @@
+PRGNAM="renameutils"
+VERSION="0.12.0"
+HOMEPAGE="https://www.nongnu.org/renameutils/"
+DOWNLOAD="http://download.savannah.gnu.org/releases/renameutils/renameutils-0.12.0.tar.gz"
+MD5SUM="a859898a25589e3b19ac8f78ddabb606"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/renameutils/slack-desc b/system/renameutils/slack-desc
new file mode 100644
index 0000000000..36456665aa
--- /dev/null
+++ b/system/renameutils/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+renameutils: renameutils (programs to make renaming of files easier)
+renameutils:
+renameutils: The file renaming utilities (renameutils for short) are a set
+renameutils: of programs designed to make renaming of files faster and less
+renameutils: cumbersome. The file renaming utilities consists of five programs:
+renameutils: qmv, qcp, imv, icp and deurlname.
+renameutils:
+renameutils:
+renameutils:
+renameutils:
+renameutils:
diff --git a/system/repeat/repeat.SlackBuild b/system/repeat/repeat.SlackBuild
index 52778d8b03..c92020349d 100644
--- a/system/repeat/repeat.SlackBuild
+++ b/system/repeat/repeat.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for repeat
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=repeat
 VERSION=${VERSION:-0.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -82,4 +92,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/reprepro/reprepro.SlackBuild b/system/reprepro/reprepro.SlackBuild
index b7bbdf802a..33e975014f 100644
--- a/system/reprepro/reprepro.SlackBuild
+++ b/system/reprepro/reprepro.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for reprepro
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=reprepro
 VERSION=${VERSION:-5.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=$PRGNAM-$PRGNAM
 
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -84,7 +94,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-make $NUMJOBS
+make
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -101,4 +111,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/reptyr/reptyr.SlackBuild b/system/reptyr/reptyr.SlackBuild
index 532699761d..63dc56659a 100644
--- a/system/reptyr/reptyr.SlackBuild
+++ b/system/reptyr/reptyr.SlackBuild
@@ -1,21 +1,26 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for reptyr
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230711 bkw: updated for v0.10.0
+# 20221228 bkw: updated for v0.9.0
 # 20201103 bkw: updated for v0.8.0
 # 20191128 bkw: updated for v0.7.0
 # 20170621 bkw: get rid of -Werror (-current needs this)
 # 20170302 bkw: use long-format github URL
 # 20150505 bkw: updated for v0.6.2
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=reptyr
-VERSION=${VERSION:-0.8.0}
+VERSION=${VERSION:-0.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -25,7 +30,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,7 +69,7 @@ make PREFIX=/usr CFLAGS="$SLKCFLAGS"
 strip $PRGNAM
 make install PREFIX=/usr DESTDIR=$PKG
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+find $PKG/usr/man -type f -exec gzip -9 {} +
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING ChangeLog NOTES README.md $PKG/usr/doc/$PRGNAM-$VERSION
@@ -70,4 +79,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/reptyr/reptyr.info b/system/reptyr/reptyr.info
index 844cb53c3e..982e0ffab3 100644
--- a/system/reptyr/reptyr.info
+++ b/system/reptyr/reptyr.info
@@ -1,10 +1,10 @@
 PRGNAM="reptyr"
-VERSION="0.8.0"
+VERSION="0.10.0"
 HOMEPAGE="https://github.com/nelhage/reptyr"
-DOWNLOAD="https://github.com/nelhage/reptyr/archive/reptyr-0.8.0/reptyr-reptyr-0.8.0.tar.gz"
-MD5SUM="f682c73ebf2f0fc2fa577e84ba991e97"
+DOWNLOAD="https://github.com/nelhage/reptyr/archive/reptyr-0.10.0/reptyr-reptyr-0.10.0.tar.gz"
+MD5SUM="6418ef71c4352350edbf3274330896ee"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/resource-agents/README b/system/resource-agents/README
index 1a3187e18b..0db741d0f4 100644
--- a/system/resource-agents/README
+++ b/system/resource-agents/README
@@ -5,5 +5,5 @@ Combined repository of OCF agents from the RHCS and Linux-HA projects
 You might also want to install cluster-glue, heartbeat, resource-agents,
 fence-agents.
 
-Define OCF_ROOT and eventually OCF_RESKEY_<param> if you need to test the
-resource executables manually.
+Define OCF_ROOT and eventually OCF_RESKEY_<param> if you need to test
+the resource executables manually.
diff --git a/system/resource-agents/resource-agents.SlackBuild b/system/resource-agents/resource-agents.SlackBuild
index e25b48105e..cfab5d284e 100644
--- a/system/resource-agents/resource-agents.SlackBuild
+++ b/system/resource-agents/resource-agents.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for resource-agents
 
@@ -22,10 +22,20 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220209 bkw: Modified by SlackBuilds.org: add --disable-fatal-warnings
+# to fix the build on 15.0.
+
+# Note: this still isn't perfect: running the SlackBuild results in
+# /run/resource-agents and /run/resource-agents/tomcat_tomcatstate
+# getting created (that's the real /run, not under $PKG).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=resource-agents
 VERSION=${VERSION:-4.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +45,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -81,6 +98,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-dependency-tracking \
+  --disable-fatal-warnings \
   --build=$ARCH-slackware-linux
 
 make
@@ -102,4 +120,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/restic/restic.SlackBuild b/system/restic/restic.SlackBuild
index 18a06b43b7..ed900103da 100644
--- a/system/restic/restic.SlackBuild
+++ b/system/restic/restic.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for restic
 
-# Copyright 2020-2021 Ebben Aries <slackbuilds@dscp.org>
+# Copyright 2020-2024 Ebben Aries <slackbuilds@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=restic
-VERSION=${VERSION:-0.12.0}
+VERSION=${VERSION:-0.16.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,6 +82,18 @@ find -L . \
 mkdir -p $PKG/usr/bin
 install -D -m 0755 $PRGNAM $PKG/usr/bin/$PRGNAM
 
+mkdir -p $PKG/usr/man/man1
+$PKG/usr/bin/$PRGNAM generate --man $PKG/usr/man/man1/
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/share/bash-completion/completions
+$PKG/usr/bin/$PRGNAM generate --bash-completion $PKG/usr/share/bash-completion/completions/restic
+
+mkdir -p $PKG/usr/share/zsh/site-functions
+$PKG/usr/bin/$PRGNAM generate --zsh-completion $PKG/usr/share/zsh/site-functions/_restic
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -79,4 +101,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/restic/restic.info b/system/restic/restic.info
index 2a720df865..b06fa05034 100644
--- a/system/restic/restic.info
+++ b/system/restic/restic.info
@@ -1,10 +1,10 @@
 PRGNAM="restic"
-VERSION="0.12.0"
+VERSION="0.16.4"
 HOMEPAGE="https://restic.net/"
-DOWNLOAD="https://github.com/restic/restic/releases/download/v0.12.0/restic_0.12.0_linux_386.bz2"
-MD5SUM="ff4c35d9f4dbddf248e03b1994d7e27c"
-DOWNLOAD_x86_64="https://github.com/restic/restic/releases/download/v0.12.0/restic_0.12.0_linux_amd64.bz2"
-MD5SUM_x86_64="ed501c292a7b6dac355cc8f867699bc2"
+DOWNLOAD="https://github.com/restic/restic/releases/download/v0.16.4/restic_0.16.4_linux_386.bz2"
+MD5SUM="e34bd1e2f68d17581ff15d51c8c5815b"
+DOWNLOAD_x86_64="https://github.com/restic/restic/releases/download/v0.16.4/restic_0.16.4_linux_amd64.bz2"
+MD5SUM_x86_64="692682f4bd62353d36a9d450d0b76138"
 REQUIRES=""
 MAINTAINER="Ebben Aries"
 EMAIL="slackbuilds@dscp.org"
diff --git a/system/restic/slack-desc b/system/restic/slack-desc
index b0125b8a08..b4ba94f4e4 100644
--- a/system/restic/slack-desc
+++ b/system/restic/slack-desc
@@ -5,7 +5,7 @@
 # You must make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
 
-        |-----handy-ruler------------------------------------------------------|
+      |-----handy-ruler------------------------------------------------------|
 restic: restic (Modern backup program to backup your files)
 restic:
 restic: restic is a backup program that is fast, efficient and secure. It
diff --git a/system/rewise/README b/system/rewise/README
new file mode 100644
index 0000000000..2b2d17e0c6
--- /dev/null
+++ b/system/rewise/README
@@ -0,0 +1,5 @@
+The aim of this project is to extract assests from old game
+installers made with WISE installer without executing the PE
+[.exe] files, so they can be used with free software implementation
+of the game engine.Rewise tries to focus on old game installers
+[1999-2003] in the form of PE executables.
diff --git a/system/rewise/rewise.SlackBuild b/system/rewise/rewise.SlackBuild
new file mode 100644
index 0000000000..abf2e02d5d
--- /dev/null
+++ b/system/rewise/rewise.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# Slackware build script for rewise
+
+# Copyright 2023 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=rewise
+VERSION=${VERSION:-0.1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+    *) ARCH=$( uname -m ) ;;
+esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}"  ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-march=i586 -mtune=i686 -pipe -O2 -fPIC"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-march=i686 -mtune=i686 -pipe -O2 -fPIC"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-march=x86-64 -mtune=native -pipe -O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+ echo "This would build only on x86 and x86_64 architecture now exiting ...." && exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/REWise-v$VERSION.tar.gz
+cd $PRGNAM
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/bin
+mkdir -pv $PKG/usr/man/man1
+
+CFLAGS="$SLKCFLAGS" make
+
+install -Dvm0755 rewise -t  $PKG/usr/bin/
+install -Dvm0644 rewise.1 -t $PKG/usr/man/man1/
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rewise/rewise.info b/system/rewise/rewise.info
new file mode 100644
index 0000000000..e67f99bec2
--- /dev/null
+++ b/system/rewise/rewise.info
@@ -0,0 +1,10 @@
+PRGNAM="rewise"
+VERSION="0.1.0"
+HOMEPAGE="https://notabug.org/CYBERDEViL/REWise"
+DOWNLOAD="https://notabug.org/CYBERDEViL/REWise/archive/v0.1.0.tar.gz"
+MD5SUM="4a016459207d1218142b40ac093bffad"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/rewise/slack-desc b/system/rewise/slack-desc
new file mode 100644
index 0000000000..ed9a063c8a
--- /dev/null
+++ b/system/rewise/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+rewise: rewise (Reverse Engineering WISE)
+rewise:
+rewise: The aim of this project is to extract assests from old game
+rewise: installers made with WISE installer without executing the PE
+rewise: [.exe] files, so they can be used with free software implementation
+rewise: of the game engine.Rewise tries to focus on old game installers
+rewise: [1999-2003] in the form of PE executables.
+rewise:
+rewise: Homepage:https://notabug.org/CYBERDEViL/REWise
+rewise:
+rewise:
diff --git a/system/rfdump/02_configure.in-preserve-CFLAGS.patch b/system/rfdump/02_configure.in-preserve-CFLAGS.patch
new file mode 100644
index 0000000000..1de2ed2d69
--- /dev/null
+++ b/system/rfdump/02_configure.in-preserve-CFLAGS.patch
@@ -0,0 +1,44 @@
+From: Lukas Schwaighofer <lukas@schwaighofer.name>
+Date: Thu, 20 Apr 2017 23:26:01 +0200
+Subject: configure.in: preserve CFLAGS
+Forwarded: https://lists.alioth.debian.org/pipermail/pkg-security-team/Week-of-Mon-20170417/001267.html
+
+This patch fixes two problems with configure.in:
+* The [ and ] characters, which are part of the perl command, get
+  removed by m4/autoconf processing.  The patch replaces them by @<:@
+  and @:>@ so the perl snippet ends up correctly in the configure script
+* Do not remove `-g` if it was explicitly included in the CFLAGS given
+  to configure (the user knows best).  Instead only remove `-g` from the
+  default CFLAGS.
+---
+ configure.in | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+--- a/configure.in
++++ b/configure.in
+@@ -4,6 +4,8 @@
+ AM_INIT_AUTOMAKE([1.9 foreign])
+ AM_CONFIG_HEADER(config.h)
+ 
++# remove -g from the default flags
++: ${CFLAGS="-O2"}
+ AC_PROG_CC
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
+@@ -27,15 +29,10 @@
+ AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging], enable_debug=yes, enable_debug=no)
+ if test "x$enable_debug" = "xyes"; then
+          # remove -O flags from CFLAGS
+-         CFLAGS=`perl -e '$ARGV[0]=~s/-O\d?//g;print $ARGV[0]' -- "$CFLAGS"`
++         CFLAGS=`perl -e '$ARGV@<:@0@:>@=~s/-O\d?//g;print $ARGV@<:@0@:>@' -- "$CFLAGS"`
+          # add debug parameters
+          CFLAGS="$CFLAGS -g -DDEBUG -DDOJDEBUG"
+          AC_MSG_RESULT(yes)
+-else
+-         # remove -g flags from CFLAGS
+-         CFLAGS=`perl -e '$ARGV[0]=~s/-g//g;print $ARGV[0]' -- "$CFLAGS"`
+-         CFLAGS="$CFLAGS -O2"
+-         AC_MSG_RESULT(no)
+ fi
+ 
+ # produce Makefiles
diff --git a/system/rfdump/rfdump.SlackBuild b/system/rfdump/rfdump.SlackBuild
index 67c3fadc6c..a2ba52462a 100644
--- a/system/rfdump/rfdump.SlackBuild
+++ b/system/rfdump/rfdump.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rfdump
 
-# Copyright 2017 Ebben Aries, Colorado, USA
+# Copyright 2017 Ebben Aries <slackbuilds@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org, to fix the build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rfdump
 VERSION=${VERSION:-1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,14 +74,17 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20220210 bkw: make the configure script actually use CFLAGS from
+# the env (patch comes from Debian).
+patch -p1 < $CWD/02_configure.in-preserve-CFLAGS.patch
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
+LDFLAGS="-lexpat" \
 ./configure \
-  LDFLAGS="-lexpat" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -82,10 +94,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
@@ -96,4 +105,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rfdump/rfdump.info b/system/rfdump/rfdump.info
index 4390e11b68..ea5e6e4260 100644
--- a/system/rfdump/rfdump.info
+++ b/system/rfdump/rfdump.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Ebben Aries"
-EMAIL="e@dscp.org"
+EMAIL="slackbuilds@dscp.org"
diff --git a/system/rhash/README b/system/rhash/README
index 976151ea0b..aeeb25f2b9 100644
--- a/system/rhash/README
+++ b/system/rhash/README
@@ -1,6 +1,9 @@
-RHash (Recursive Hasher) is a console utility for computing and verifying
-hash sums of files. Supports lots of algorithms.
+RHash (Recursive Hasher) is a console utility for computing and
+verifying hash sums of files. Supports lots of algorithms.
 
 Notes:
-If you want to build with NO OpenSSL support, pass OPENSSL=no to the script.
+
+If you want to build with NO OpenSSL support, pass OPENSSL=no to the
+script.
+
 If you need static libraries, pass STATICLIB=yes to the script.
diff --git a/system/rhash/rhash.SlackBuild b/system/rhash/rhash.SlackBuild
index 24d4602337..1bd0e38990 100644
--- a/system/rhash/rhash.SlackBuild
+++ b/system/rhash/rhash.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2014-2021 S. S. Bolokanar, Bulgaria <sbolokanov@abv.bg>
+# Copyright 2014-2021 S. S. Bolokanar, Bulgaria <bolokanar@bulgars.org>
 #                     С. С. Болоканаръ, България
 # All rights reserved.
 #
@@ -29,16 +29,23 @@
 #    10.3.2015 - made quiet the clean up, script actually broke on last update…
 #      3 Мартъ 1878 – възстановѧване на Българиѧ, 3 Мартъ 1918 (40 г. по–късно) – победа надъ Русиѧ
 
+# 20220210 bkw: Modified by SlackBuilds.org, fix parallel builds.
+# 20220222 bkw: Modified by SlackBuilds.org, always build static lib, BUILD=2.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rhash
-VERSION=${VERSION:-1.4.1}
+VERSION=${VERSION:-1.4.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 # Shall we compile with OpenSSL support?
 OPENSSL=${OPENSSL:-yes}
 
 # Shall we install static libraries?
-STATICLIB=${STATICLIB:-no}
+# 20220222 bkw: yes, because lgogdownloader requires it.
+STATICLIB=yes
 
 if [ "$OPENSSL" != "yes" ]; then
   ENABLEOSSL="--disable-openssl"
@@ -48,22 +55,28 @@ if [ "$STATICLIB" = "yes" ]; then
   ENABLESTATICLIB="--enable-lib-static"
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -m32 -march=i486 -mtune=i686"
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -87,15 +100,9 @@ cd RHash-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-if [ "$STATICLIB" = "yes" ]; then
-  echo "+=============================+"
-  echo "| STATIC LIBRARY ACTIVATED!!! |"
-  echo "+=============================+"
-fi
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # enable-gettext - internationalization support
 ./configure \
@@ -109,7 +116,12 @@ fi
   --extra-cflags="${SLKCFLAGS} ${OPTCFLAGS}" \
   --extra-ldflags="${OPTLDFLAGS}"
 
+# 20220210 bkw: trying to do the build and install in one go
+# with a single "make install" command breaks parallel builds
+# and only saves 4 keystrokes for the script author. bad tradeoff.
+make
 make DESTDIR=$PKG install install-gmo install-lib-so-link
+
 # Don't clobber the default config
 mv -v $PKG/etc/rhashrc $PKG/etc/rhashrc.new
 
@@ -126,4 +138,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rhash/rhash.info b/system/rhash/rhash.info
index 1e86e18c74..ad840604d1 100644
--- a/system/rhash/rhash.info
+++ b/system/rhash/rhash.info
@@ -1,10 +1,10 @@
 PRGNAM="rhash"
-VERSION="1.4.1"
+VERSION="1.4.4"
 HOMEPAGE="https://github.com/rhash/RHash/"
-DOWNLOAD="https://github.com/rhash/RHash/archive/v1.4.1/RHash-1.4.1.tar.gz"
-MD5SUM="5059d052270e92302dbb08de3f6d7fee"
+DOWNLOAD="https://github.com/rhash/RHash/archive/v1.4.4/RHash-1.4.4.tar.gz"
+MD5SUM="85384cefd616b6371cc95b9d89ffca28"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="S. S. Bolokanar"
-EMAIL="sbolokanov@abv.bg"
+EMAIL="bolokanar@bulgars.org"
diff --git a/system/rhvoice/README b/system/rhvoice/README
new file mode 100644
index 0000000000..4025b886e1
--- /dev/null
+++ b/system/rhvoice/README
@@ -0,0 +1,28 @@
+RHVoice is a free and open-source speech synthesizer.
+
+RHVoice uses statistical parametric synthesis. It relies on existing
+open-source speech technologies (mainly HTS and related software).
+
+Voices are built from recordings of natural speech. They have small
+footprints, because only statistical models are stored on users'
+computers. And though the voices lack the naturalness of the
+synthesizers which generate speech by combining segments of the
+recordings themselves, they are still very intelligible and resemble
+the speakers who recorded the source material.
+
+Supported languages
+Initially, RHVoice could speak only Russian. Now it also supports:
+
+American and Scottish English
+Brazilian Portuguese
+Esperanto
+Georgian
+Ukrainian
+Kyrgyz
+Tatar
+Macedonian
+Albanian
+Polish
+
+RHVoice can be used via speech-dispatcher.
+
diff --git a/system/rhvoice/rhvoice.SlackBuild b/system/rhvoice/rhvoice.SlackBuild
new file mode 100644
index 0000000000..3367fb9174
--- /dev/null
+++ b/system/rhvoice/rhvoice.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+# Slackware build script for RHVoice
+
+# Copyright 2023, Lockywolf
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=rhvoice
+VERSION=${VERSION:-1.8.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
+
+
+scons install DESTDIR="${PKG}" prefix="/usr" sysconfdir="/etc" libdir="/usr/lib$LIBDIRSUFFIX" \
+	      CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCXXFLAGS" \
+	      $MAKEFLAGS
+
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md doc \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rhvoice/rhvoice.info b/system/rhvoice/rhvoice.info
new file mode 100644
index 0000000000..62fc81faee
--- /dev/null
+++ b/system/rhvoice/rhvoice.info
@@ -0,0 +1,10 @@
+PRGNAM="rhvoice"
+VERSION="1.8.0"
+HOMEPAGE="https://rhvoice.org/"
+DOWNLOAD="https://github.com/RHVoice/RHVoice/releases/download/1.8.0/rhvoice-1.8.0.tar.gz"
+MD5SUM="2fefde6250b85370d2e023fbcc57449f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="tclap"
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.rhvoice_2023-10-25@lockywolf.net"
diff --git a/system/rhvoice/slack-desc b/system/rhvoice/slack-desc
new file mode 100644
index 0000000000..1303920b97
--- /dev/null
+++ b/system/rhvoice/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+rhvoice: rhvoice (statistical parametric speech synthesis)
+rhvoice:
+rhvoice: RHVoice is a free and open-source speech synthesizer.
+rhvoice:
+rhvoice: RHVoice uses statistical parametric synthesis. It relies on existing
+rhvoice: open-source speech technologies (mainly HTS and related software).
+rhvoice:
+rhvoice: It supports: Russian, American and Scottish English,Brazilian
+rhvoice: Portuguese Esperanto Georgian Ukrainian Kyrgyz Tatar Macedonian
+rhvoice: Albanian Polish
+rhvoice:
diff --git a/system/ripgrep/ripgrep.SlackBuild b/system/ripgrep/ripgrep.SlackBuild
index 3e469f5fd7..387a36fa8d 100644
--- a/system/ripgrep/ripgrep.SlackBuild
+++ b/system/ripgrep/ripgrep.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ripgrep
 
-# Copyright 2017-2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-2021 Andrew Clemons, Wellington New Zealand
+# Copyright 2023-2024 Andrew Clemons, Toyko Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ripgrep
-VERSION=${VERSION:-12.1.1}
+BINNAM=rg
+VERSION=${VERSION:-14.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -41,27 +46,35 @@ if [ -z "$ARCH" ]; then
   fi
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
   LIBDIRSUFFIX=""
-  CARGOTARGET="--target i586-unknown-linux-gnu"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
   LIBDIRSUFFIX=""
-  CARGOTARGET="--target i686-unknown-linux-gnu"
-elif [ "$ARCH" = "x86_64" ]; then
+elif [ "$ARCH" = "x86_64" ] ; then
   SLKCFLAGS="-O2 -fPIC"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ] ; then
+  SLKCFLAGS="-O2 -fPIC"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
   LIBDIRSUFFIX="64"
-  CARGOTARGET="--target x86_64-unknown-linux-gnu"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
   CARGOTARGET=""
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -75,9 +88,8 @@ cd $PRGNAM-$VERSION
 
 # build offline
 # configuration tells cargo to use the configured directory
-# for dependencies intead of downloading from crates.io
-mkdir .cargo
-cat << EOF >> .cargo/config
+# for dependencies instead of downloading from crates.io
+cat << EOF > .cargo/config
 [source.crates-io]
 registry = 'https://github.com/rust-lang/crates.io-index'
 replace-with = 'vendored-sources'
@@ -130,22 +142,34 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
+rm -f .cargo/config.toml
+sed -i 's/debug = "none"/debug = 0/g' Cargo.toml
+
+CARGO_HOME=.cargo \
+PCRE2_SYS_STATIC=0 \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-cargo build --release $CARGOTARGET
+cargo build --features 'pcre2' --release $CARGOTARGET
 
 mkdir -p $PKG/usr/bin/
 
-find target -name rg -exec install -m 755 {} $PKG/usr/bin/rg \;
+find target -name $BINNAM -exec install -m 755 {} $PKG/usr/bin/$BINNAM \;
 
 mkdir -p $PKG/usr/share/bash-completion/completions/
-find target -name rg.bash -exec install -m644 {} $PKG/usr/share/bash-completion/completions/rg \;
+$PKG/usr/bin/$BINNAM --generate complete-bash > $PKG/usr/share/bash-completion/completions/$BINNAM
 
 mkdir -p $PKG/usr/share/zsh/site-functions/
-find target -name _rg.ps1 -exec install -m644 {} $PKG/usr/share/zsh/site-functions/_rg \;
+$PKG/usr/bin/$BINNAM --generate complete-zsh > $PKG/usr/share/zsh/site-functions/_$BINNAM
 
 mkdir -p $PKG/usr/man/man1
-find target -name rg.1 -exec install -m644 {} $PKG/usr/man/man1/rg.1 \;
+$PKG/usr/bin/$BINNAM --generate man > $PKG/usr/man/man1/$BINNAM.1
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -154,11 +178,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG.md COPYING FAQ.md GUIDE.md LICENSE-MIT README.md RELEASE-CHECKLIST.md UNLICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md COPYING FAQ.md GUIDE.md LICENSE-MIT README.md UNLICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ripgrep/ripgrep.info b/system/ripgrep/ripgrep.info
index 8ffbd6693e..97a553d53e 100644
--- a/system/ripgrep/ripgrep.info
+++ b/system/ripgrep/ripgrep.info
@@ -1,120 +1,104 @@
 PRGNAM="ripgrep"
-VERSION="12.1.1"
+VERSION="14.1.0"
 HOMEPAGE="https://github.com/BurntSushi/ripgrep"
-DOWNLOAD="https://github.com/BurntSushi/ripgrep/archive/12.1.1/ripgrep-12.1.1.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.12.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bstr/bstr-0.2.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bytecount/bytecount-0.6.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.54.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.4.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding_rs/encoding_rs-0.8.23.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding_rs_io/encoding_rs_io-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fs_extra/fs_extra-1.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/glob/glob-0.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.13.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/jemalloc-sys/jemalloc-sys-0.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/jemallocator/jemallocator-0.3.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.71.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/maybe-uninit/maybe-uninit-2.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memmap/memmap-0.7.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/packed_simd/packed_simd-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pcre2-sys/pcre2-sys-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pcre2/pcre2-0.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-automata/regex-automata-0.1.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.18.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.3.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.110.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.110.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.53.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.27.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.3.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.8.crate"
-MD5SUM="d3190853d47d51ad077a65aadbf55448 \
-        abc51f82118d86e83165ba87e2521e96 \
-        142cb4b9a653e56e56311f0c883b8582 \
-        7c6515c4b7f4c7723a3c6d1f07acc261 \
-        468f237829e960715055da5d484681b9 \
-        6799c26a7eacaf8e58d3e45c6c5add89 \
-        d25e25d08adce75c63f3969191141f28 \
-        fe9c56d3d43021538850fcad8404bdad \
-        e502e6c6b0dca9c1ae2d99e92b26f645 \
-        720e6fb5478963221c58e4ef0fc44356 \
-        882dbbc613a93f64c3709b0a2bd0d6dc \
-        42af3a1e965585d80dcc1e0324fda6eb \
-        e9d5377e649441c6984e17b9679f2773 \
-        ff67cf2eb9668167782b8012d3b48e7b \
-        cba3538d5dac64d269dda867ba6c5011 \
+DOWNLOAD="https://github.com/BurntSushi/ripgrep/archive/14.1.0/ripgrep-14.1.0.tar.gz \
+          https://static.crates.io/crates/aho-corasick/aho-corasick-1.1.2.crate \
+          https://static.crates.io/crates/anyhow/anyhow-1.0.79.crate \
+          https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \
+          https://static.crates.io/crates/bstr/bstr-1.9.0.crate \
+          https://static.crates.io/crates/cc/cc-1.0.83.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.10.crate \
+          https://static.crates.io/crates/crossbeam-deque/crossbeam-deque-0.8.4.crate \
+          https://static.crates.io/crates/crossbeam-epoch/crossbeam-epoch-0.9.17.crate \
+          https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.18.crate \
+          https://static.crates.io/crates/encoding_rs/encoding_rs-0.8.33.crate \
+          https://static.crates.io/crates/encoding_rs_io/encoding_rs_io-0.1.7.crate \
+          https://static.crates.io/crates/glob/glob-0.3.1.crate \
+          https://static.crates.io/crates/itoa/itoa-1.0.10.crate \
+          https://static.crates.io/crates/jemalloc-sys/jemalloc-sys-0.5.4%2B5.3.0-patched.crate \
+          https://static.crates.io/crates/jemallocator/jemallocator-0.5.4.crate \
+          https://static.crates.io/crates/jobserver/jobserver-0.1.27.crate \
+          https://static.crates.io/crates/lexopt/lexopt-0.3.0.crate \
+          https://static.crates.io/crates/libc/libc-0.2.151.crate \
+          https://static.crates.io/crates/libm/libm-0.2.8.crate \
+          https://static.crates.io/crates/log/log-0.4.20.crate \
+          https://static.crates.io/crates/memchr/memchr-2.7.1.crate \
+          https://static.crates.io/crates/memmap2/memmap2-0.9.3.crate \
+          https://static.crates.io/crates/num-traits/num-traits-0.2.17.crate \
+          https://static.crates.io/crates/packed_simd/packed_simd-0.3.9.crate \
+          https://static.crates.io/crates/pcre2-sys/pcre2-sys-0.2.8.crate \
+          https://static.crates.io/crates/pcre2/pcre2-0.2.6.crate \
+          https://static.crates.io/crates/pkg-config/pkg-config-0.3.28.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.76.crate \
+          https://static.crates.io/crates/quote/quote-1.0.35.crate \
+          https://static.crates.io/crates/regex-automata/regex-automata-0.4.3.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.2.crate \
+          https://static.crates.io/crates/regex/regex-1.10.2.crate \
+          https://static.crates.io/crates/ryu/ryu-1.0.16.crate \
+          https://static.crates.io/crates/same-file/same-file-1.0.6.crate \
+          https://static.crates.io/crates/serde/serde-1.0.195.crate \
+          https://static.crates.io/crates/serde_derive/serde_derive-1.0.195.crate \
+          https://static.crates.io/crates/serde_json/serde_json-1.0.111.crate \
+          https://static.crates.io/crates/syn/syn-2.0.48.crate \
+          https://static.crates.io/crates/termcolor/termcolor-1.4.0.crate \
+          https://static.crates.io/crates/textwrap/textwrap-0.16.0.crate \
+          https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.12.crate \
+          https://static.crates.io/crates/walkdir/walkdir-2.4.0.crate \
+          https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi-util/winapi-util-0.1.6.crate \
+          https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi/winapi-0.3.9.crate"
+MD5SUM="ad6b5631a459fd20c257ca20a7eeaf73 \
+        95e5f8d0b7ab37171b8d3118542ba06a \
+        707d92b6f4d9920a0b25f69f5291c826 \
+        05d77ef52e90ad161fdd41b252420467 \
+        20f5631bb8dce73c1388fd70feb9192a \
+        9241fa90ea8b17c00010be46c9aa1ac5 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        11452e33fe5f4dfe6f36f2d266a5d343 \
+        b016421fcd102c907c2128bbf84e9eb5 \
+        934ead533868173745d11af922bc2e42 \
+        4e040f3b7359531ac7134679ea9afcdc \
+        5f9a3a8b7213c055342b2f423a213b3a \
         98dd664015c5a6c5e1d3cfb8dce1c4ff \
-        8dab3b3ec00dc56cffde0b0c410d47b5 \
-        8b98db48d2cecf5843b75e2f668c58fa \
-        e7c07242a95ee1df865efe9534e10a34 \
-        be4d52524ec8485abc40efba317b1e4c \
-        493f4bd45cf2a6c3963f66f58884f622 \
-        85dae509b4cda41fa820b3ad3b302479 \
-        9f10bcc7b3ab24a0cdbaa0addc65b88d \
-        fba3b040a55c01be7376d3dd5c4d4920 \
-        0a258dcd990afe3d83e0c103edd7f095 \
-        61e508ca2eee543023c5e1ba777e5ede \
-        b5cf10e268e8a3bee2de8a734104245e \
-        124ec4f35274a0e9c1a4ef3dc0958643 \
-        bdb38691302aeb63500e053919f5f0f7 \
-        c36d452e37c73b1e99f40bae18cddfdb \
-        9551c939b35e3eb367843e03d71ba155 \
-        2cc140411a55694fa07baa857a720af2 \
-        244c87ebce1ce19de9283d14e218618d \
-        d6f8f8aba0bdb5edb2dc41705b9d1144 \
-        e0941025a0c5ed64fa8837efd892ecce \
-        ef0afe60eee17cc47bc3cb6f88b843a6 \
-        3b298ba1d0e5e75b14765b2c48d52b13 \
-        24118e5657591c6f208dbb1d77fbc482 \
-        eee136546e9f4735577dd20f45727c69 \
-        44d95c1ed46baee736c9420ad1de3228 \
+        2d6d28ec311884da69bcaf320ada8ad5 \
+        0403f58e42c94609207c40a310cfe78a \
+        8a1180efc4ebeaecbf8e8e094bcb2659 \
+        77b8d4657c9c6ff1050c760a3c868a30 \
+        9aaf13d622cd02548feaaca35687da9c \
+        d71093319a2c1efa90475bd45d34fab3 \
+        181cb83a57d327b26ebc21db41b28480 \
+        23fb13a7f6fb7b25a42d71c3bcaa5d7c \
+        8ee79b4fe4c43d9ab09f16344612a656 \
+        f8cc1978aae22df3e656d12810cdf994 \
+        8c7d4897baee5e346d2184d46422ec49 \
+        512bcd4470f351b2049adeb39cfcdec4 \
+        c7a2b67d4aa820dd7d82287a9571e116 \
+        348414ebfdc035bf41b32089bf3a87ca \
+        336599cb0fc90cf3dd7d608344aab097 \
+        76c281577ef136b9484166302e37c9bd \
+        43e3e8b01023835d05b82befc379769d \
+        0358b31bf59c7915bb03f9e66f2d1ea3 \
+        4f496143a21775fa7bd22bf329c37f37 \
+        91b60a71d44302a8b05bd398eca56c37 \
+        e90f2809a34e2bea0bd5c1120475fb36 \
+        ca664d757b2c95424cf3465e412cce90 \
         2d8d8b377d144f5e32b4f65a69eb0b24 \
-        3879349fe374e764e24f37ce40ac9824 \
-        9b7d58f6341fb619ff2190481ce13b84 \
-        ce76f5430cd6d2ab76d0d86ecb8a4f4d \
-        781d4ccf5d04c98fa02af207a9639249 \
-        6fcb4505d0da4df3c5747dc23afe6622 \
-        62e883807a65ebe1ba9d0e555d703339 \
-        a8de006fe0c7e373c560dd51599287a8 \
-        a5dd75e77c7324f5c1d2d372c990d0a7 \
-        0f65fd26370e1fd67c8e8812cabea574 \
-        e628ca8adb2b572bffb210f014656b6f \
-        1092a4a24e80f8856efc71af51a06114 \
+        b06eef93ebb5e19add49130759742f85 \
+        76d424197546cc4f652f78d47cf3f6d6 \
+        a46d4413032296761522d91b24bd759b \
+        5651bc86f3df47d241d2ae58dc4b89a5 \
+        ef18ac44cda944777e03597466ec4b82 \
+        9c4f3ba15578559f5c511cfc2620d0c5 \
+        ca65153603a1a7240bbd9d2ce19f2d67 \
+        96481ed810273371ed8b87f062a0dcda \
         db96b50050277bf05a3c68534bbb9586 \
-        b9e37d5fc4ad28b612b78ad37816684d \
+        306c0281447d1876e8220007b7a7e053 \
         09de9d01e7331ff3da11f58be8bef0df \
-        ce68e06a2cd4f180747cf169fc388a95"
+        0498c4a11448bfc35dc7bb2caa64c753"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="rust16"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
diff --git a/system/rkhunter/README b/system/rkhunter/README
index 2b3e9f83c9..75a0f56284 100644
--- a/system/rkhunter/README
+++ b/system/rkhunter/README
@@ -1,4 +1,4 @@
-RKHunter is a scanning tool that scans for rootkits, backdoors, and local 
-exploits by running tests like MD5 hash comparison, known rootkit files, 
-incorrect permissions on binaries, suspect strings in LKM and LKD modules, 
-and hidden files.
+RKHunter is a scanning tool that scans for rootkits, backdoors,
+and local exploits by running tests like MD5 hash comparison, known
+rootkit files, incorrect permissions on binaries, suspect strings in
+LKM and LKD modules, and hidden files.
diff --git a/system/rkhunter/rkhunter.SlackBuild b/system/rkhunter/rkhunter.SlackBuild
index 07f9300a41..999340ebbf 100644
--- a/system/rkhunter/rkhunter.SlackBuild
+++ b/system/rkhunter/rkhunter.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Rootkit Hunter
 
@@ -6,10 +6,13 @@
 # Was maintained by Mr. B-o-B <mr dot chew dot baka at gmail dot com>
 # Currently maintained by Gerardo Zamudio <gerardo.zamudio@linux.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rkhunter
 VERSION=${VERSION:-1.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,13 +22,20 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -71,4 +81,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rmw/README b/system/rmw/README
index d51625f973..fce58aa8e2 100644
--- a/system/rmw/README
+++ b/system/rmw/README
@@ -1,6 +1,7 @@
-rmw (ReMove to Waste) is a safe-remove utility for the command line.
-Its goal is to conform to the FreeDesktop.org Trash specification and
-therefore be compatible with KDE, GNOME, XFCE, and others. Desktop
-integration is optional however, and by default, rmw will only use a
-unique features is the ability to purge files from your Waste/Trash
-directories after x number of days.
+rmw (ReMove to Waste) is a trashcan/recycle bin utility for the command
+line. It can move and restore files to and from directories specified in
+a configuration file, and can also be integrated with your regular
+desktop trash folder (if your desktop environment uses the
+FreeDesktop.org Trash specification). One of the unique features of rmw
+is the ability to purge items from your waste (or trash) directories
+after x number of days.
diff --git a/system/rmw/README.Slackware b/system/rmw/README.Slackware
deleted file mode 100644
index a93201f522..0000000000
--- a/system/rmw/README.Slackware
+++ /dev/null
@@ -1,186 +0,0 @@
-# rmw-0.7.05
-
-## Description
-
-rmw (ReMove to Waste) is a safe-remove utility for the command line.
-Its goal is to conform to [the FreeDesktop.org Trash
-specification](https://specifications.freedesktop.org/trash-spec/trashspec-latest.html)
-and therefore be compatible with KDE, GNOME, XFCE, and others. Desktop
-integration is optional however, and by default, rmw will only use a
-waste folder separated from your desktop trash. One of its unique
-features is the ability to purge files from your Waste/Trash
-directories after x number of days.
-
-Web site: <https://remove-to-waste.info/>
-
-## Build Status
-
-* [![Build Status](https://travis-ci.org/theimpossibleastronaut/rmw.svg?branch=master)](https://travis-ci.org/theimpossibleastronaut/rmw)
-* [![Build Status](https://semaphoreci.com/api/v1/andy5995/rmw-3/branches/master/badge.svg)](https://semaphoreci.com/andy5995/rmw-3)
-
-## Screenshots
-
-![rmw usage output](https://remove-to-waste.info/images/Screenshot_2020-04-11.png)
-
-[More Screenshots](https://remove-to-waste.info/screenshots.html)
-
-## Contact / Support
-
-* [Bug Reports and Feature Requests](https://github.com/theimpossibleastronaut/rmw/blob/master/CONTRIBUTING.md#bug-reports-and-feature-requests)
-* [General Help, Support, Discussion](https://remove-to-waste.info/#support)
-
-## Required libraries
-
-* libncursesw (ncurses-devel on some systems, such as CentOS)
-* gettext (or use --disable-nls if you only need English language support)
-
-If you are building from source, you will need the libncursesw(5 or
-6)-dev package from your operating system distribution. On some systems
-just the ncurses packages is needed, and it's often already installed.
-
-## Compiling
-
-### As a normal user:
-
-Use `../configure --help` to view available compile-time options.
-
-    mkdir build
-    cd build
-    ../configure
-    make
-
-### Installing without superuser privileges
-
-If you would like to install rmw without superuser privileges, use a prefix
-that you have write access to. Example:
-
-    ../configure --prefix=$HOME/usr
-    make
-    make install
-
-The rmw binary will be installed to `$HOME/usr/bin` and documentation to
-`$HOME/usr/doc`.
-
-### If configure fails
-
-On **OSX**, ncursesw isn't provided by default but can be installed
-using `brew install ncurses`. Then precede `./configure` with
-`PKG_CONFIG_PATH="/usr/local/opt/ncurses/lib/pkgconfig"` Example:
-
-    PKG_CONFIG_PATH="/usr/local/opt/ncurses/lib/pkgconfig" ../configure
-
-If you can't use [brew](https://brew.sh/), or install libncursesw or
-libmenuw some other way, rmw will use `ncurses` but you may experience
-[this minor
-bug](https://github.com/theimpossibleastronaut/rmw/issues/205).
-
-Note: rmw was built on **Windows** 2 years ago using Cygwin but it
-didn't use the proper directories. We have no Windows developers
-working on this project and are hoping that some will join soon!. As
-stated in the description, the goal of this project is a
-"cross-platform" utility; so getting rmw to work on Windows is
-still on the TODO list.
-
-## Uninstall / Cleaning up
-
-* make uninstall (uninstalls the program if installed with 'make install`)
-* make distclean (removes files in the build directory created by
-`configure` and 'make')
-
-## Usage
-```
-== First-time use ==
-
-After rmw is installed, running `rmw` will create a configuration file
-(rmwrc) in $HOME/.config (or $XDG_CONFIG_HOME). Edit the file as
-desired.
-
-== Configuration File ==
-
-Documentation explaining the configuration can be found in your config
-file.
-
-Waste folders will be created automatically; e.g. if '$HOME/.local/share/Waste'
-is uncommented in the config file, these 3 directories will be created:
-$HOME/.local/share/Waste
-$HOME/.local/share/Waste/files
-$HOME/.local/share/Waste/info
-
-If one of the WASTE folders is on removable media, then the user has the
-option of appending ',removable'.
-
-If a folder has ',removable' appended to it, rmw will not try to create
-it; it must be initially created manually. If  the folder exists when
-rmw is run, it will be used; if not, it will be skipped. Once you
-create "example_waste", rmw will automatically create
-example_waste/info and example_waste/files
-
-    e.g.: WASTE=/mnt/sda10000/example_waste, removable
-
-== Features and Options ==
-
-Usage: rmw [OPTION]... FILE...
-ReMove the FILE(s) to a WASTE directory listed in configuration file
-
-   or: rmw -s
-   or: rmw -u
-   or: rmw -z FILE...
-Restore FILE(s) from a WASTE directory
-
--h, --help
--c, --config filename     use an alternate configuration
--l, --list                list waste directories
--g, --purge               run purge even if it's been run today
--o, --orphaned            check for orphaned files (maintenance)
--f, --force               allow purge to run
--e, --empty               completely empty (purge) all waste folders
--r, -R, --recursive       option used for compatibility with rm
-                          (recursive operation is enabled by default)
--v, --verbose             increase output messages
--w, --warranty            display warranty
--V, --version             display version and license information
-
-
-    ===] Restoring [===
-
--z, --restore <wildcard filename(s) pattern> (e.g. ~/.local/share/Waste/files/foo*)
--s, --select              select files from list to restore
--u, --undo-last           undo last ReMove
-
-== Purging ==
-
-If purging is 'on', rmw will permanently delete files from the folders
-specified in the configuration file after 'x' number of days. Purging can be
-disabled by using 'purge_after = 0' in configuration file. rmw will only check
-once per day if it's time to purge (use -g to check more often).
-
-The time of the last automatic purge check is stored in `purge-time`,
-located in $HOME/.local/share/rmw (or $XDG_DATA_HOME/rmw).
-
-== -e, --empty ==
-
-Completely empty (purge) all waste folders
-
-== -u, --undo ==
-
-Restores files that were last rmw'ed. No arguments for `-u` are
-necessary. The list of files that were last rmw'ed is stored in `mrl`, located in
-$HOME/.local/share/rmw (or $XDG_DATA_HOME/rmw).
-
-== -z, --restore ==
-
-To restore a file, or multiple files, specify the path to them in the
-<WASTE>/files folder (wildcards ok).
-e.g. 'rmw -z ~/.local/share/Waste/files/foo*'
-
-== -f, --force ==
-
-A change from previous versions, purge is allowed to run without the '-f'
-option. If you'd rather require the use of '-f', you can add the line
-'force_required' in your configuration file.
-
-rmw will refuse to purge directories if they contain non-writable
-subdirectories. You can use -f 2 times if you ever see a message that tells
-you "permission denied; directory still contains files" (e.g. rwm -gff).
-
-```
diff --git a/system/rmw/rmw.SlackBuild b/system/rmw/rmw.SlackBuild
index 3bccaeea52..8b99c45f2c 100644
--- a/system/rmw/rmw.SlackBuild
+++ b/system/rmw/rmw.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for rmw
 #
-# Copyright 2019-2020 / Andy Alt / United States
+# Copyright 2019-2024 / Andy Alt / United States
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rmw
-VERSION=${VERSION:-0.7.05}
+VERSION=${VERSION:-0.9.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,7 +70,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,23 +79,21 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --mandir=/usr/man \
-  --localedir=/usr/share/locale \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-
-#
-# rmw no longer searches for a system-wide config file
-#
-#mkdir -p $PKG/etc
-#cat rmwrc > $PKG/etc/rmwrc.new
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    -Dstrip=true \
+    -Db_sanitize=none \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --localedir=/usr/share/locale \
+    -Ddocdir=/usr/doc/$PRGNAM-$VERSION
+  ninja
+  DESTDIR=$PKG ninja install
+cd ..
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -97,4 +105,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rmw/rmw.info b/system/rmw/rmw.info
index 241e3d7800..4db0e99b00 100644
--- a/system/rmw/rmw.info
+++ b/system/rmw/rmw.info
@@ -1,10 +1,10 @@
 PRGNAM="rmw"
-VERSION="0.7.05"
-HOMEPAGE="https://remove-to-waste.info/"
-DOWNLOAD="https://github.com/theimpossibleastronaut/rmw/releases/download/v0.7.05/rmw-0.7.05.tar.gz"
-MD5SUM="adaa3ce4f4e10203e772d5d80c4a0b5a"
+VERSION="0.9.2"
+HOMEPAGE="https://theimpossibleastronaut.github.io/rmw-website/"
+DOWNLOAD="https://github.com/theimpossibleastronaut/rmw/releases/download/v0.9.2/rmw-0.9.2.tar.xz"
+MD5SUM="1dd4923ca5011061559c54f76eb55de0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Andy Alt"
-EMAIL="andy400-dev@yahoo.com"
+EMAIL="arch_stanton5995@proton.me"
diff --git a/system/rmw/slack-desc b/system/rmw/slack-desc
index ad3af3da9d..8b6a4cfdb3 100644
--- a/system/rmw/slack-desc
+++ b/system/rmw/slack-desc
@@ -8,12 +8,12 @@
    |-----handy-ruler------------------------------------------------------|
 rmw: rmw (command line trash can/recycle bin)
 rmw:
-rmw: rmw (ReMove to Waste) is a safe-remove utility for the command line.
-rmw: Its goal is to conform to the FreeDesktop.org Trash specification and
-rmw: therefore be compatible with KDE, GNOME, XFCE, and others. Desktop
-rmw: integration is optional however, and by default, rmw will only use a
-rmw: waste folder separated from your desktop trash. One of its unique
-rmw: features is the ability to purge files from your Waste/Trash
+rmw: rmw (ReMove to Waste) is a trashcan/recycle bin utility for the
+rmw: command line. It can move and restore files to and from directories
+rmw: specified in a configuration file, and can also be integrated with
+rmw: your regular desktop trash folder (if your desktop environment uses
+rmw: the FreeDesktop.org Trash specification). One of the unique features
+rmw: of rmw is the ability to purge items from your waste (or trash)
 rmw: directories after x number of days.
 rmw:
-rmw: Homepage: https://remove-to-waste.info/
+rmw: Homepage: https://theimpossibleastronaut.github.io/rmw-website/
diff --git a/system/rndaddentropy/rndaddentropy.SlackBuild b/system/rndaddentropy/rndaddentropy.SlackBuild
index 98044b56bf..56f22d13fa 100644
--- a/system/rndaddentropy/rndaddentropy.SlackBuild
+++ b/system/rndaddentropy/rndaddentropy.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rndaddentropy
 
@@ -22,11 +22,14 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rndaddentropy
 SRCNAM=twuewand
 VERSION=${VERSION:-3.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -95,4 +105,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rng-tools/README b/system/rng-tools/README
index 23ddcc51d7..f809f329ff 100644
--- a/system/rng-tools/README
+++ b/system/rng-tools/README
@@ -1,7 +1,8 @@
 rng-tools provide rngd and rngtest.
 
-rngd supplies data from a hardware RNG to the kernel's entropy pool. To ensure
-sufficient randomness, rngd verifies the RNGs data using FIPS 140-1 / 140-2
-randomness tests, before passing them to the kernel.
+rngd supplies data from a hardware RNG to the kernel's entropy
+pool. To ensure sufficient randomness, rngd verifies the RNGs data
+using FIPS 140-1 / 140-2 randomness tests, before passing them to the
+kernel.
 
 rngtest is a standalone tool for running the FIPS tests over data.
diff --git a/system/rng-tools/rng-tools.SlackBuild b/system/rng-tools/rng-tools.SlackBuild
index 32f19e3c4b..05ca2cd18e 100644
--- a/system/rng-tools/rng-tools.SlackBuild
+++ b/system/rng-tools/rng-tools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rng-tools
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rng-tools
 VERSION=${VERSION:-5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -94,5 +104,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
 
diff --git a/system/routersploit/README b/system/routersploit/README
index 427ac153ff..2e17a42fa5 100644
--- a/system/routersploit/README
+++ b/system/routersploit/README
@@ -6,5 +6,3 @@ It consists of various modules that aid penetration testing operations:
 exploits - modules that take advantage of identified vulnerabilities
 creds - modules designed to test credentials against network services
 scanners - modules that check if a target is vulnerable to any exploit
-
-Optional dependency: python3
diff --git a/system/routersploit/routersploit.SlackBuild b/system/routersploit/routersploit.SlackBuild
index 61938785da..777062880e 100644
--- a/system/routersploit/routersploit.SlackBuild
+++ b/system/routersploit/routersploit.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for routersploit
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=routersploit
 VERSION=${VERSION:-2.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -88,4 +98,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/routersploit/routersploit.info b/system/routersploit/routersploit.info
index f06bc5ff16..8bf4a63904 100644
--- a/system/routersploit/routersploit.info
+++ b/system/routersploit/routersploit.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/reverse-shell/routersploit/archive/v2.2.1/routerspl
 MD5SUM="62143935b564edbdd1703f6caa531296"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-requests paramiko BeautifulSoup4 pysnmp"
+REQUIRES="python2-paramiko BeautifulSoup4 python2-BeautifulSoup4 pysnmp"
 MAINTAINER="Fernando Lopez Jr."
 EMAIL="fernando.lopezjr@gmail.com"
diff --git a/system/rover/rover.SlackBuild b/system/rover/rover.SlackBuild
index f28e3c0d33..9b0d558b34 100644
--- a/system/rover/rover.SlackBuild
+++ b/system/rover/rover.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rover
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rover
 VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -93,4 +103,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rox-filer/rox-filer.SlackBuild b/system/rox-filer/rox-filer.SlackBuild
index b5ae022667..c75df0c7b6 100644
--- a/system/rox-filer/rox-filer.SlackBuild
+++ b/system/rox-filer/rox-filer.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rox-filer
 # Written by slakmagik <slakmagik@gmail.com>
 # Released under the WTFPL
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rox-filer
 VERSION=${VERSION:-2.11}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -17,7 +20,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -44,6 +54,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
+patch -p0 < $CWD/session_auto_respawn.diff
 chown -R root:root .
 find -L . \
   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -119,4 +130,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rox-filer/session_auto_respawn.diff b/system/rox-filer/session_auto_respawn.diff
new file mode 100644
index 0000000000..0ade6b556b
--- /dev/null
+++ b/system/rox-filer/session_auto_respawn.diff
@@ -0,0 +1,11 @@
+--- ROX-Filer/src/session.h~	2011-10-09 16:31:59.000000000 +0200
++++ ROX-Filer/src/session.h	2020-12-17 11:11:19.302291214 +0100
+@@ -10,7 +10,7 @@
+ #include <gtk/gtk.h>
+ #include <X11/SM/SMlib.h>
+ 
+-gboolean session_auto_respawn;
++extern gboolean session_auto_respawn;
+ 
+ void session_init(const gchar *client_id);
+ 
diff --git a/system/roxterm/README b/system/roxterm/README
deleted file mode 100644
index 77fb842ba6..0000000000
--- a/system/roxterm/README
+++ /dev/null
@@ -1,8 +0,0 @@
-ROXTerm is a terminal emulator intended to provide similar features
-to gnome-terminal, based on the same VTE library, but with a smaller
-footprint and quicker start-up time. It achieves this by not using
-the Gnome libraries and by using a separate applet to provide the
-configuration GUI. It can be used as a ROX application, as the name
-implies, or in any other X environment.
-
-Optional dependency: po4a
diff --git a/system/roxterm/README.Slackware b/system/roxterm/README.Slackware
deleted file mode 100644
index 9b2463553d..0000000000
--- a/system/roxterm/README.Slackware
+++ /dev/null
@@ -1,10 +0,0 @@
-ROXTerm uses the "session" bus, which should be started along with your
-desktop environment. Current versions of ROX, GNOME, XFCE, and KDE session
-managers all launch D-BUS. If you use some other session/desktop/window
-manager which doesn't launch D-BUS you can start it by inserting something
-like this near the start of your .xinitrc or .xsession:
-
-  if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-    eval `dbus-launch --sh-syntax --exit-with-session`
-    export DBUS_SESSION_BUS_ADDRESS
-  fi
diff --git a/system/roxterm/roxterm.SlackBuild b/system/roxterm/roxterm.SlackBuild
deleted file mode 100644
index e9aca0f814..0000000000
--- a/system/roxterm/roxterm.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for ROXTerm
-#
-# Copyright 2009-2015  Erik W. Hanson, Minneapolis, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=roxterm
-VERSION=${VERSION:-2.9.7}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -eu
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-export CFLAGS="$SLKCFLAGS -g -Wall -I. -I${CWD} -D_GNU_SOURCE -DHAVE_CONFIG_H"
-export LIBS="-L/usr/lib${LIBDIRSUFFIX}"
-export MAITCHFLAGS="CFLAGS=$CFLAGS;LIBS=$LIBS"
-
-./mscript.py configure \
-  --no-lock \
-  --prefix=/usr \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --mandir=/usr/man \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-
-./mscript.py build --no-lock
-./mscript.py install --no-lock --destdir=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/roxterm/roxterm.info b/system/roxterm/roxterm.info
deleted file mode 100644
index 7a9c1bb1a2..0000000000
--- a/system/roxterm/roxterm.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="roxterm"
-VERSION="2.9.7"
-HOMEPAGE="http://roxterm.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/roxterm/roxterm-2.9.7.tar.bz2"
-MD5SUM="496b5ddc078cede502f168dadef46cb6"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
diff --git a/system/roxterm/slack-desc b/system/roxterm/slack-desc
deleted file mode 100644
index 6472e2ab0c..0000000000
--- a/system/roxterm/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-roxterm: roxterm (VTE based Terminal Emulator)
-roxterm:
-roxterm: ROXTerm is a terminal emulator intended to provide similar features
-roxterm: to gnome-terminal, based on the same VTE library, but with a smaller
-roxterm: footprint and quicker start-up time. It achieves this by not using
-roxterm: the Gnome libraries and by using a separate applet to provide the
-roxterm: configuration GUI. It can be used as a ROX application, as the name
-roxterm: implies, or in any other X environment.
-roxterm:
-roxterm: http://roxterm.sourceforge.net/
-roxterm:
diff --git a/system/rsyslog/README b/system/rsyslog/README
index 52f70523ee..89601b1dac 100644
--- a/system/rsyslog/README
+++ b/system/rsyslog/README
@@ -19,5 +19,3 @@ PGSQL=yes|no (default: no), requires postgresql
 RELP=yes|no (default: no), requires librelp
 LIBDBI=yes|no (default: no), requires libdbi
 GNUTLS=yes|no (default: no), requires gnutls
-
-NOTE: docutils is only needed at compile time - not needed for runtime.
diff --git a/system/rsyslog/README.SLACKWARE b/system/rsyslog/README.SLACKWARE
index b4bdd4ae4d..0eb1f04ccb 100644
--- a/system/rsyslog/README.SLACKWARE
+++ b/system/rsyslog/README.SLACKWARE
@@ -21,3 +21,6 @@ proper format, which was converted from sysklogd's syslog.conf.
 /etc/rc.d/rc.rsyslogd is written to emulate syslogd.  To prevent rc.inet1
 from attempting to run rc.syslog again, rc.syslogd will copy/remove the
 /var/run/syslogd.pid file on successful start/stop invocations.
+
+Be aware that xscanimage, xcam and xscanimage from the sane package depend
+from sysklogd and therefore will not work after replacement with rsyslog.
diff --git a/system/rsyslog/rsyslog.SlackBuild b/system/rsyslog/rsyslog.SlackBuild
index 907527f5ae..011377525b 100644
--- a/system/rsyslog/rsyslog.SlackBuild
+++ b/system/rsyslog/rsyslog.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rsyslog
 
-# Copyright (c) 2019, Christophe Trussardi, Paris, France
+# Copyright (c) 2024, Christophe Trussardi, Paris, France
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -21,10 +21,13 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rsyslog
-VERSION=${VERSION:-8.2001.0}
+VERSION=${VERSION:-8.2312.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,7 +37,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -58,6 +65,7 @@ fi
 [ "${LIBDBI:-no}" = "no" ] || libdbi_option="--enable-libdbi"
 [ "${GNUTLS:-no}" = "no" ] || gnutls_option="--enable-gnutls"
 [ "${RELP:-no}" = "no" ] || relp_option="--enable-relp"
+[ "${LIBLOGGING:-no}" = "no" ] || liblogging_option="--enable-liblogging-stdlog"
 
 set -e
 
@@ -85,7 +93,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-generate-man-pages \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  $mysql_option $pgsql_option $libdbi_option $gnutls_option $relp_option
+  $mysql_option $pgsql_option $libdbi_option $gnutls_option $relp_option $liblogging_option
 
 make
 make install-strip DESTDIR=$PKG
@@ -109,7 +117,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README \
+  AUTHORS COPYING COPYING.LESSER ChangeLog NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 chmod -R 0644 $PKG/usr/doc/$PRGNAM-$VERSION/*
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -120,4 +128,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rsyslog/rsyslog.info b/system/rsyslog/rsyslog.info
index 174f7d97fd..4eac458a50 100644
--- a/system/rsyslog/rsyslog.info
+++ b/system/rsyslog/rsyslog.info
@@ -1,10 +1,10 @@
 PRGNAM="rsyslog"
-VERSION="8.2001.0"
+VERSION="8.2312.0"
 HOMEPAGE="https://www.rsyslog.com/"
-DOWNLOAD="https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2001.0.tar.gz"
-MD5SUM="4dc7bd26d3e6e8fbeff9e0bd203077be"
+DOWNLOAD="https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2312.0.tar.gz"
+MD5SUM="632381aead68840967c74fbb564436cc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="%README% docutils libee libestr libfastjson liblogging"
+REQUIRES="%README% libestr libfastjson"
 MAINTAINER="Christophe Trussardi"
 EMAIL="chris@teria.org"
diff --git a/system/rtirq/README b/system/rtirq/README
index 17f6b1cd99..1774f4bec8 100644
--- a/system/rtirq/README
+++ b/system/rtirq/README
@@ -3,7 +3,7 @@ rtirq (set priorities on kernel IRQ threads)
 The rtirq script is a bash script written by Rui Nuno Capela which works
 in conjunction with the IRQ threading facility of the Linux kernel. The
 script takes advantage of the fact that the kernel can use threads for
-IRQs management, and as such these threads (like any other thread running
+IRQ management, and as such these threads (like any other thread running
 on your system) can be given maximum priority in an effort to minimize
 the latency of audio peripherals.
 
diff --git a/system/rtirq/git2tarxz.sh b/system/rtirq/git2tarxz.sh
new file mode 100644
index 0000000000..a3d2335440
--- /dev/null
+++ b/system/rtirq/git2tarxz.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create
+# a tarball of. With no arg, HEAD is used.
+
+PRGNAM=rtirq
+CLONE_URL=https://github.com/rncbc/rtirq
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/system/rtirq/rtirq.SlackBuild b/system/rtirq/rtirq.SlackBuild
index 606dfb5653..7a886b673b 100644
--- a/system/rtirq/rtirq.SlackBuild
+++ b/system/rtirq/rtirq.SlackBuild
@@ -1,11 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rtirq
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210824 bkw:
+# - updated for version 20210530_acf01e7 (add git hash to VERSION)
+# - use github homepage
+# - fix minor typo in README and slack-desc
+
 # 20150512 bkw:
 # - updated for version 20150216
 
@@ -13,14 +18,21 @@
 # - updated for version 20140413
 # - host source on my server, because upstream doesn't keep old versions
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rtirq
-VERSION=${VERSION:-20150216}
+VERSION=${VERSION:-20210530_acf01e7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -31,25 +43,26 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 mkdir -p $PKG/etc/rc.d
 install -m0644 $PRGNAM.conf $PKG/etc/$PRGNAM.conf.new
 install -m0755 $PRGNAM.sh $PKG/etc/rc.d/rc.$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+if [ -e README.md ]; then
+  sed -i 's,do sp ,do so ,' README.md
+  cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION
+fi
 
 # get rid of DOS line endings on LICENSE
 sed 's/\r//' LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
 
-cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README_SBo.txt
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -57,4 +70,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rtirq/rtirq.info b/system/rtirq/rtirq.info
index 70b90d606b..9368f8abc8 100644
--- a/system/rtirq/rtirq.info
+++ b/system/rtirq/rtirq.info
@@ -1,10 +1,10 @@
 PRGNAM="rtirq"
-VERSION="20150216"
-HOMEPAGE="https://alsa.opensrc.org/Rtirq"
-DOWNLOAD="https://slackware.uk/~urchlay/src/rtirq-20150216.tar.gz"
-MD5SUM="59e8b012c16b1e879ce8648f537400c5"
+VERSION="20210530_acf01e7"
+HOMEPAGE="https://github.com/rncbc/rtirq"
+DOWNLOAD="https://slackware.uk/~urchlay/src/rtirq-20210530_acf01e7.tar.xz"
+MD5SUM="14d9c4b6ec1ba8fe4abd70c4315eea04"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/rtirq/slack-desc b/system/rtirq/slack-desc
index f2b598cef9..82136b7a92 100644
--- a/system/rtirq/slack-desc
+++ b/system/rtirq/slack-desc
@@ -11,7 +11,7 @@ rtirq:
 rtirq: The rtirq script is a bash script written by Rui Nuno Capela which
 rtirq: works in conjunction with the IRQ threading facility of the Linux
 rtirq: kernel. The script takes advantage of the fact that the kernel can
-rtirq: use threads for IRQs management, and as such these threads (like any
+rtirq: use threads for IRQ management, and as such these threads (like any
 rtirq: other thread running on your system) can be given maximum priority
 rtirq: in an effort to minimize the latency of audio peripherals.
 rtirq:
diff --git a/system/rtkit/README b/system/rtkit/README
new file mode 100644
index 0000000000..8954c286e7
--- /dev/null
+++ b/system/rtkit/README
@@ -0,0 +1,12 @@
+rtkit is a dbus service needed for pipewire to apply for a realtime
+priority.
+
+It needs a separate user to run.
+
+  groupadd -g 378 rtkit
+  useradd -u 378 -s /bin/false -d /var/lib/rtkit \
+    -g rtkit rtkit
+
+In principle, pipewire may function without this service, but it
+helps to placate some error messages present on Slackware 15.0
+default setup.
diff --git a/system/rtkit/rtkit.SlackBuild b/system/rtkit/rtkit.SlackBuild
new file mode 100644
index 0000000000..98a89df5e8
--- /dev/null
+++ b/system/rtkit/rtkit.SlackBuild
@@ -0,0 +1,131 @@
+#!/bin/bash
+
+# Slackware build script for rtkit
+
+# Copyright 2023, Lockywolf
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=rtkit
+VERSION=${VERSION:-0.13}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+MUID=${MUID:-378}
+MGID=${MGID:-378}
+
+if ! getent group rtkit 2>&1 > /dev/null; then
+  echo "  You must have an rtkit group to run this script."
+  echo "    # groupadd -g $MGID rtkit"
+  exit 1
+elif ! getent passwd rtkit 2>&1 > /dev/null; then
+  echo "  You must have a rtkit user to run this script."
+  echo "    # useradd -u $MUID -g $MGID -d /var/lib/rtkit rtkit"
+  exit 1
+fi
+
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.*z
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README    LICENSE      \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rtkit/rtkit.info b/system/rtkit/rtkit.info
new file mode 100644
index 0000000000..0633e86d6a
--- /dev/null
+++ b/system/rtkit/rtkit.info
@@ -0,0 +1,10 @@
+PRGNAM="rtkit"
+VERSION="0.13"
+HOMEPAGE="https://github.com/heftig/rtkit/"
+DOWNLOAD="https://github.com/heftig/rtkit/releases/download/v0.13/rtkit-0.13.tar.xz"
+MD5SUM="90939b9886d1998fa5b15f6109bfd1ae"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.rtkit_2023-11-16@lockywolf.net"
diff --git a/system/rtkit/slack-desc b/system/rtkit/slack-desc
new file mode 100644
index 0000000000..abdf2cd161
--- /dev/null
+++ b/system/rtkit/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+rtkit: rtkit (dbus service to assign realtime priority to processes)
+rtkit:
+rtkit: RealtimeKit is a D-Bus system service that changes the
+rtkit: scheduling policy of user processes/threads to SCHED_RR
+rtkit: (i.e. realtime scheduling mode) on request. It is intended to
+rtkit: be used as a secure mechanism to allow real-time scheduling to
+rtkit: be used by normal user processes.
+rtkit:
+rtkit:
+rtkit:
+rtkit:
diff --git a/system/run-one/run-one.SlackBuild b/system/run-one/run-one.SlackBuild
index 81f65ff3c7..39111671fb 100644
--- a/system/run-one/run-one.SlackBuild
+++ b/system/run-one/run-one.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for run-one
 
@@ -23,14 +23,24 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=run-one
 VERSION=${VERSION:-1.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -84,5 +94,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
 
diff --git a/system/runc/runc.SlackBuild b/system/runc/runc.SlackBuild
index 4352b4126f..edb65e6779 100644
--- a/system/runc/runc.SlackBuild
+++ b/system/runc/runc.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for runc
 
@@ -23,11 +23,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220415 bkw: Modified by SlackBuilds.org, BUILD=2: strip binary.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=runc
-VERSION=${VERSION:-1.0.0_rc92}
-GITHASH=${GITHASH:-ff819c7e9184c13b7c2607fe6c30ae19403a7aff}
+VERSION=${VERSION:-1.1.12}
+GITHASH=${GITHASH:-51d5e94601ceffbbd85688df1c928ecccbfa4685}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCVER=$(echo $VERSION | tr _ -)
 
@@ -39,7 +44,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,9 +64,9 @@ cd $PRGNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Do not try to get git commit hash, we're not inside git repository.
 sed -i '/^COMMIT/d' Makefile
@@ -67,6 +76,7 @@ make \
   COMMIT=$GITHASH
 make install BINDIR=$PKG/usr/bin
 make install-bash PREFIX=$PKG/usr
+strip $PKG/usr/bin/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE MAINTAINERS NOTICE README.md $PKG/usr/doc/$PRGNAM-$VERSION
@@ -76,4 +86,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/runc/runc.info b/system/runc/runc.info
index a43ca11b09..2e49926a1d 100644
--- a/system/runc/runc.info
+++ b/system/runc/runc.info
@@ -1,10 +1,10 @@
 PRGNAM="runc"
-VERSION="1.0.0_rc92"
+VERSION="1.1.12"
 HOMEPAGE="https://github.com/opencontainers/runc"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/opencontainers/runc/archive/v1.0.0-rc92/runc-1.0.0-rc92.tar.gz"
-MD5SUM_x86_64="7c4dcdf8d481c8d25b88af3f40846a4b"
-REQUIRES="google-go-lang libseccomp"
+DOWNLOAD_x86_64="https://github.com/opencontainers/runc/archive/v1.1.12/runc-1.1.12.tar.gz"
+MD5SUM_x86_64="e77fb3f6d3070da60f58688bde3e7583"
+REQUIRES="google-go-lang"
 MAINTAINER="Audrius Kažukauskas"
 EMAIL="audrius@neutrino.lt"
diff --git a/system/runit-services/README b/system/runit-services/README
index 680f20aa40..d37b22ad77 100644
--- a/system/runit-services/README
+++ b/system/runit-services/README
@@ -5,11 +5,10 @@ The services are installed in /etc/sv.
 To enable a service, simply symlink it to your service directory, ie,
 /service or /var/service.
 
-The default service directory is assumed to be /service.
-If its different, RUNITSVDIR can be set while executing the Slackbuild, ie:
+The default service directory is assumed to be /service. If its
+different, RUNITSVDIR can be set while executing the Slackbuild, ie:
 
 # RUNITSVDIR=/var/service ./runit-services.Slackbuild
 
 Service logging is done via runit's svlogd or via syslog as applicable.
 tai64nlocal from daemontools is recommended for checking log timestamps.
-
diff --git a/system/runit-services/runit-services.SlackBuild b/system/runit-services/runit-services.SlackBuild
index b44e068d80..c6bc07af9a 100644
--- a/system/runit-services/runit-services.SlackBuild
+++ b/system/runit-services/runit-services.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for runit-services
 
-# Copyright 2019 Aaditya Bagga <aaditya_gnulinux@zoho.com>
+# Copyright 2019 Aaditya <aaditya_gnulinux@zoho.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,24 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=runit-services
 VERSION=${VERSION:-20191026}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -71,4 +81,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/runit-services/runit-services.info b/system/runit-services/runit-services.info
index 2707d2feae..eeb05a3233 100644
--- a/system/runit-services/runit-services.info
+++ b/system/runit-services/runit-services.info
@@ -1,10 +1,10 @@
 PRGNAM="runit-services"
 VERSION="20191026"
-HOMEPAGE="https://github.com/aadityabagga/runit-services"
-DOWNLOAD="https://github.com/aadityabagga/runit-services/archive/20191026/runit-services-20191026.tar.gz"
+HOMEPAGE="https://github.com/abchk1234/runit-services"
+DOWNLOAD="https://github.com/abchk1234/runit-services/archive/20191026/runit-services-20191026.tar.gz"
 MD5SUM="385c9b879b56aadd61d54d6e9b8dac9f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="runit pause"
-MAINTAINER="Aaditya Bagga"
+MAINTAINER="Aaditya"
 EMAIL="aaditya_gnulinux@zoho.com"
diff --git a/system/runit/README b/system/runit/README
index a48d34bcc1..2633b85669 100644
--- a/system/runit/README
+++ b/system/runit/README
@@ -1,22 +1,22 @@
 runit (a UNIX init scheme with service supervision)
 
-A cross-platform Unix init scheme with service supervision, a replacement for
-sysvinit, and other init schemes.
+A cross-platform Unix init scheme with service supervision, a
+replacement for sysvinit, and other init schemes.
 
-runit can replace init or its service supervision can be used with traditional
-init.  runit is compatible with djb's daemontools.
+runit can replace init or its service supervision can be used with
+traditional init. runit is compatible with djb's daemontools.
 
-By default, this slackbuild sets-up a basic configuration to replace init with
-runit. To disable this, pass CONFIG=no to the script.
+By default, this slackbuild sets-up a basic configuration to replace
+init with runit. To disable this, pass CONFIG=no to the script.
 
 To use runit with init, just call it
   /sbin/runsvdir-start &
 
-To replace init with runit, reboot and enter init=/sbin/runit-init in the Lilo
-prompt.
+To replace init with runit, reboot and enter init=/sbin/runit-init in
+the Lilo prompt.
 
-Alternatively, if you do not have a multi boot system, you may append this line
-in /etc/lilo.conf
+Alternatively, if you do not have a multi boot system, you may append
+this line in /etc/lilo.conf
 
 E.g:
   append="vt.default_utf8=0 init=/sbin/runit-init"
@@ -27,27 +27,27 @@ Then run lilo:
 Or just replace /sbin/init with /sbin/runit-init
   # mv /sbin/init /sbin/init.sysv
   # cp /sbin/runit-init /sbin/init
-Be warned that if you had booted with the original init, the system may refuse
-to reboot, therefore boot from runit-init first.
+Be warned that if you had booted with the original init, the system may
+refuse to reboot, therefore boot from runit-init first.
 
-To migrate a service to runit, switch it off and disable it as usual, place
-an initialisation script called run under a suitably named directory under
-/etc/sv/ and symlink it to /service.
+To migrate a service to runit, switch it off and disable it as usual,
+place an initialisation script called run under a suitably named
+directory under /etc/sv/ and symlink it to /service.
 
 E.g.:
   # /etc/rc.d/rc.networkmanager stop
   # chmod -x /etc/rc.d/rc.networkmanager
   # mkdir /etc/sv/networkmanager/
 
-Write a script to start the service in /etc/sv/networkmanager/run such as
-  #!/bin/sh
-  exec NetworkManager -n > /dev/null 2>&1
+Write a script to start the service in /etc/sv/networkmanager/run
+such as:
+  #!/bin/sh exec NetworkManager -n > /dev/null 2>&1
 
 Give it executable permission:
   # chmod +x  /etc/sv/networkmanager/run
 
-Link it to /service and NetworkManager will start in a few seconds and enabled
-under current runlevel
+Link it to /service and NetworkManager will start in a few seconds and
+enabled under current runlevel
   # ln -s /etc/sv/networkmanager /service
 
 Hint:
@@ -56,5 +56,5 @@ To Reboot:
 To Halt:
   # runit-init 0
 
-A /usr/sbin/shutdown shell script has been included with the configuration
-files if you enabled them.
+A /usr/sbin/shutdown shell script has been included with the
+configuration files if you enabled them.
diff --git a/system/runit/runit.SlackBuild b/system/runit/runit.SlackBuild
index f9b9be5823..fe79f7b33d 100644
--- a/system/runit/runit.SlackBuild
+++ b/system/runit/runit.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 # slackware package build script for runit
 
 # written by David Miller dave at frop dot net
 # 2018, updated by Chris Abela, Malta, <kristofru@gmail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=runit
 VERSION=${VERSION:-2.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +22,14 @@ fi
 
 set -e
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -89,4 +99,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rush/README b/system/rush/README
index 33e117d04c..7a9e39d44c 100644
--- a/system/rush/README
+++ b/system/rush/README
@@ -1,11 +1,11 @@
-GNU rush is a Restricted User Shell, designed for sites providing limited
-remote access to their resources, e.g. scp, sftp, or access to VCS
-repositories over ssh.  Accounts of the users that are allowed remote
-access to the machine are configured to use /sbin/rush as the login
-shell.
+GNU rush is a Restricted User Shell, designed for sites providing
+limited remote access to their resources, e.g. scp, sftp, or access
+to VCS repositories over ssh. Accounts of the users that are allowed
+remote access to the machine are configured to use /sbin/rush as the
+login shell.
 
 Using a flexible configuration file, GNU rush gives administrators
-complete control over the commands that users are allowed to run and their
-possible arguments.  It also makes it possible to run commands in chrooted
-environments, limit usage of system resources, and do various other
-administrative tasks.
+complete control over the commands that users are allowed to run and
+their possible arguments. It also makes it possible to run commands
+in chrooted environments, limit usage of system resources, and do
+various other administrative tasks.
diff --git a/system/rush/rush.SlackBuild b/system/rush/rush.SlackBuild
index c6ee742e96..748c2c3de3 100644
--- a/system/rush/rush.SlackBuild
+++ b/system/rush/rush.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rush
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rush
 VERSION=${VERSION:-2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -93,4 +103,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cd $PKG
 mv etc/rush.rc etc/rush.rc.new
 
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rxvt-unicode/README b/system/rxvt-unicode/README
deleted file mode 100644
index 8b1c84db04..0000000000
--- a/system/rxvt-unicode/README
+++ /dev/null
@@ -1,8 +0,0 @@
-rxvt-unicode is an enhanced version of the rxvt terminal emulator.  It has
-full unicode and Xft support, does font antialiasing and italics, and has
-the same transparency capabilities as ATerm.  It can be extended using Perl.
-
-The slackbuild uses environment variable called CONFIG_PERL to control
-whether the embedded perl interpreter will be built. Setting to anything
-other than YES during the build will disable it, which will result in a
-much leaner package.
diff --git a/system/rxvt-unicode/rxvt-unicode.SlackBuild b/system/rxvt-unicode/rxvt-unicode.SlackBuild
deleted file mode 100644
index 5a955c787b..0000000000
--- a/system/rxvt-unicode/rxvt-unicode.SlackBuild
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for rxvt-unicode
-
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Currently maintained by Jason Graham (jgraha8@gmail.com)
-# Updates by Kevin Paulus, aka "goarilla" (goarilla@gmail.com)
-# Previously maintained by LEVAI Daniel, 2010-2014
-# Initial SlackBuild written by Dugan Chen (dugan_c@fastmail.fm)
-
-PRGNAM=rxvt-unicode
-VERSION=${VERSION:-9.22}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Option to enable/disable the embedded perl interpreter
-CONFIG_PERL=${CONFIG_PERL:-YES}
-
-if [ "${CONFIG_PERL}" == 'YES' ];then
-	_PERL_OPT='--enable-perl'
-else
-	_PERL_OPT='--disable-perl'
-fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --enable-everything \
-  --enable-unicode3 \
-  --enable-combining \
-  --enable-xft \
-  --enable-font-styles \
-  --enable-transparency \
-  --enable-fading \
-  --enable-frills \
-  --enable-pixbuf \
-  --enable-rxvt-scroll \
-  --enable-next-scroll \
-  --enable-xterm-scroll \
-  ${_PERL_OPT} \
-  --enable-xim \
-  --enable-iso14755 \
-  --enable-keepscrolling \
-  --enable-selectionscrolling \
-  --enable-mousewheel \
-  --enable-slipwheeling \
-  --enable-smart-resize \
-  --enable-text-blink \
-  --enable-pointer-blank \
-  --enable-utmp \
-  --enable-wtmp \
-  --enable-lastlog \
-  --enable-256-color \
-  --build=$ARCH-slackware-linux
-
-make
-
-mkdir -p $PKG/usr/share/terminfo
-TERMINFO=$PKG/usr/share/terminfo make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object"  | grep ELF | \
-  cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/share/pixmaps/
-cp $CWD/urxvt.xpm $PKG/usr/share/pixmaps/urxvt.xpm
-
-mkdir -p $PKG/usr/share/applications
-cp $CWD/rxvt-unicode.desktop $PKG/usr/share/applications/rxvt-unicode.desktop
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING Changes INSTALL README.FAQ $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-
-# Fix usr/bin/urxvt permissions to enable writing to utmp and wtmp files
-#
-version="$(echo "$VERSION" |sed -e 's/[^0-9]//g')"
-if [ "$version" -le 922 ]; then
-  # standalone
-  chgrp utmp usr/bin/urxvt
-  chmod 2755 usr/bin/urxvt
-  # client
-  chgrp utmp usr/bin/urxvtc
-  chmod 2755 usr/bin/urxvtc
-  # server
-  chgrp utmp usr/bin/urxvtd
-  chmod 2755 usr/bin/urxvtd
-fi
-
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/rxvt-unicode/rxvt-unicode.desktop b/system/rxvt-unicode/rxvt-unicode.desktop
deleted file mode 100644
index 7622918703..0000000000
--- a/system/rxvt-unicode/rxvt-unicode.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=urxvt
-Comment=An unicode capable rxvt clone
-Exec=urxvt
-Icon=utilities-terminal
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
diff --git a/system/rxvt-unicode/rxvt-unicode.info b/system/rxvt-unicode/rxvt-unicode.info
deleted file mode 100644
index d02aee8160..0000000000
--- a/system/rxvt-unicode/rxvt-unicode.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="rxvt-unicode"
-VERSION="9.22"
-HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
-DOWNLOAD="http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.22.tar.bz2"
-MD5SUM="93782dec27494eb079467dacf6e48185"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Jason Graham"
-EMAIL="jgraha8@gmail.com"
diff --git a/system/rxvt-unicode/slack-desc b/system/rxvt-unicode/slack-desc
deleted file mode 100644
index 2f428ddfd9..0000000000
--- a/system/rxvt-unicode/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-            |-----handy-ruler------------------------------------------------------|
-rxvt-unicode: rxvt-unicode (enhanced version of rxvt)
-rxvt-unicode:
-rxvt-unicode: This project is an enhanced version of the rxvt terminal
-rxvt-unicode: emulator.  It has full unicode and Xft support, does font
-rxvt-unicode: antialiasing and italics, and has the same transparency
-rxvt-unicode: capabilities as ATerm.  It can be extended using Perl.
-rxvt-unicode:
-rxvt-unicode: Visit the rxvt-unicode project online:
-rxvt-unicode: http://software.schmorp.de/pkg/rxvt-unicode/
-rxvt-unicode:
-rxvt-unicode:
diff --git a/system/rxvt-unicode/urxvt.xpm b/system/rxvt-unicode/urxvt.xpm
deleted file mode 100644
index c7b6a2db7e..0000000000
--- a/system/rxvt-unicode/urxvt.xpm
+++ /dev/null
@@ -1,141 +0,0 @@
-/* XPM */
-static char * urxvt_32x32_xpm[] = {
-"32 32 106 2",
-"  	c None",
-". 	c #E7E7E7",
-"+ 	c #E7E3DE",
-"@ 	c #E7DFDE",
-"# 	c #29417B",
-"$ 	c #5A719C",
-"% 	c #294173",
-"& 	c #08246B",
-"* 	c #18387B",
-"= 	c #294D8C",
-"- 	c #395D9C",
-"; 	c #526DAD",
-"> 	c #6382BD",
-", 	c #7392C6",
-"' 	c #84A6DE",
-") 	c #9CBAE7",
-"! 	c #B5CFF7",
-"~ 	c #CEDBEF",
-"{ 	c #ADBECE",
-"] 	c #94B2D6",
-"^ 	c #CEDFEF",
-"/ 	c #ADBED6",
-"( 	c #C6D3DE",
-"_ 	c #52658C",
-": 	c #7371F7",
-"< 	c #394573",
-"[ 	c #B5D3F7",
-"} 	c #D6D3CE",
-"| 	c #A5A6A5",
-"1 	c #A59E9C",
-"2 	c #6B6963",
-"3 	c #B5B2AD",
-"4 	c #8496AD",
-"5 	c #CEC7C6",
-"6 	c #9CA6AD",
-"7 	c #C6C7C6",
-"8 	c #525D6B",
-"9 	c #294584",
-"0 	c #8C96BD",
-"a 	c #8C9EC6",
-"b 	c #425D9C",
-"c 	c #7392CE",
-"d 	c #8CA6DE",
-"e 	c #ADAAA5",
-"f 	c #A5A29C",
-"g 	c #211C18",
-"h 	c #C6BEBD",
-"i 	c #52618C",
-"j 	c #B5B6B5",
-"k 	c #52596B",
-"l 	c #847D7B",
-"m 	c #002063",
-"n 	c #001C52",
-"o 	c #001C5A",
-"p 	c #ADC7EF",
-"q 	c #94A2B5",
-"r 	c #8C9EAD",
-"s 	c #8CAAC6",
-"t 	c #9CAABD",
-"u 	c #8C9EB5",
-"v 	c #F7F7F7",
-"w 	c #DEDBDE",
-"x 	c #848284",
-"y 	c #8C8A8C",
-"z 	c #8C8E8C",
-"A 	c #D6D7D6",
-"B 	c #FFFFFF",
-"C 	c #E7E3E7",
-"D 	c #DEDFDE",
-"E 	c #949294",
-"F 	c #ADAAAD",
-"G 	c #EFEFEF",
-"H 	c #CECFCE",
-"I 	c #BDBEBD",
-"J 	c #4A4D4A",
-"K 	c #B5B2B5",
-"L 	c #9C9E9C",
-"M 	c #7B7D7B",
-"N 	c #393C39",
-"O 	c #9C9A9C",
-"P 	c #848684",
-"Q 	c #313031",
-"R 	c #636563",
-"S 	c #292C29",
-"T 	c #F7F3F7",
-"U 	c #949694",
-"V 	c #5A595A",
-"W 	c #EFEBEF",
-"X 	c #737173",
-"Y 	c #000000",
-"Z 	c #ADAEAD",
-"` 	c #BDBABD",
-" .	c #D6D7FF",
-"..	c #5A59FF",
-"+.	c #CECFFF",
-"@.	c #B5B2FF",
-"#.	c #DEDBFF",
-"$.	c #A5A2A5",
-"%.	c #C6C3C6",
-"&.	c #ADA6AD",
-"*.	c #7371FF",
-"=.	c #6B6DFF",
-"-.	c #5A5D5A",
-";.	c #BDB6BD",
-">.	c #CECBC6",
-",.	c #BDBAB5",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-". + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ",
-"@ # $ $ $ % & * = - ; > , ' ) ! ~ ~ ~ ~ { ~ ~ ~ ~ ] ^ ~ ~ ~ / ( ",
-"@ _ : : : < & * = - ; > , ' ) [ } } } } | 1 2 2 3 4 @ 1 5 1 6 ( ",
-"@ _ 7 7 7 8 9 0 a b ; > c d ) [ } } } } | e } } e 4 @ f g h 6 ( ",
-"@ i j j j k & * = - ; > , ' ) [ } 2 l } | e 1 1 3 4 @ 1 5 1 6 ( ",
-"@ m n n n o & * = - ; > , ' ) p q q q q r q q q q s t q q q u ( ",
-"@ v v v v v v v v v v v v v v v v v v v v v v v v v v w x y z A ",
-"@ B B B B B B B B B B B B B B B B B C B B B B B B B B D E F | + ",
-"@ B D G H H B H B B H G D B B w G I J I I B B B B B B D F K L + ",
-"@ B M J z N B z O H P B Q v B R B O N O O B B B B B B D M y L + ",
-"@ B M I B B B B J S T B L K I z B B R B B B B B B B B D P U F + ",
-"@ B M I B B B C J V H B T V J W B B R B B B B B B B B D P U F + ",
-"@ B M I B B B V G G J G B X M B B B X S N B B B B B B D P U F + ",
-"@ B B B B B B B B B B B B B B B B B B B B B B B B B B D P U F + ",
-"@ B B B B B B B B B B B B B B B . H H H H C B B B B B D P U F + ",
-"@ B B B B B B B B B B B B B B B M Y Y Y Y R B B B B B D P U F + ",
-"@ B B B B B B v B B B B B B B B M Y Y Y Y R B B B B B D P U F + ",
-"@ B B B B B B J L B B B B B B B M Y Y Y Y R B B B B B D O Z ` + ",
-"@  .....+.@.#.B K R $.B B B B B M Y Y Y Y R B B B B B D %.%.&.+ ",
-"@ +.B B *.=.B B L -.H B B B B B M Y Y Y Y R B B B B B D %.K L + ",
-"@ B B B B B B R K B B B B B B B M Y Y Y Y R B B B B B D %.K L + ",
-"@ B B B B B B B B B B B B B B B M Y Y Y Y R B B B B B D ;.O O + ",
-"@ B B B B B B B B B B B B B B B O Q Q Q Q P B B B B B D $.F F + ",
-"@ B B B B B B B B B B B B B B B B B B B B B B B B B B D | K L + ",
-"@ B B B B B B B B B B B B B B B B B B B B B B B B B B D O Z j + ",
-"H >.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.7 >.>.>.,.",
-"                                                                ",
-"                                                                ",
-"                                                                "};
diff --git a/system/rxvt/README b/system/rxvt/README
new file mode 100644
index 0000000000..08c8d87ecb
--- /dev/null
+++ b/system/rxvt/README
@@ -0,0 +1,12 @@
+rxvt (terminal emulator)
+
+rxvt is a color vt102 terminal emulator intended as an xterm
+replacement for users who do not require features such as Tektronix
+4014 emulation and toolkit-style configurability. As a result, rxvt
+uses much less memory -- a significant advantage on a machine serving
+many X sessions. Also included is rclock, an analog clock for X.
+
+rxvt was in Slackware up through 14.2; it was replaced with
+rxvt-unicode in 15.0. Some people still prefer the original rxvt, so
+here it is. Be aware that it's no longer maintained upstream. Also,
+be aware that rxvt doesn't support Unicode.
diff --git a/system/rxvt/doinst.sh b/system/rxvt/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/system/rxvt/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/rxvt/rxvt-integer-overflow-fix.diff b/system/rxvt/rxvt-integer-overflow-fix.diff
new file mode 100644
index 0000000000..edb13856ed
--- /dev/null
+++ b/system/rxvt/rxvt-integer-overflow-fix.diff
@@ -0,0 +1,11 @@
+--- rxvt-2.7.10/src/command.c	2003-03-26 07:01:23.000000000 +0100
++++ rxvt-2.7.10-patched/src/command.c	2017-04-27 12:06:05.682072274 +0200
+@@ -2096,7 +2096,7 @@
+     i = ch - CSI_ICH;
+     ndef = get_byte_array_bit(csi_defaults, i);
+     for (p = 0; p < nargs; p++)
+-	if (arg[p] == -1)
++	if (arg[p] < 0 || arg[p] > 30000)
+ 	    arg[p] = ndef;
+ 
+ #ifdef DEBUG_CMD
diff --git a/system/rxvt/rxvt-logo.png b/system/rxvt/rxvt-logo.png
new file mode 100644
index 0000000000..7e5f792670
--- /dev/null
+++ b/system/rxvt/rxvt-logo.png
diff --git a/system/rxvt/rxvt.SlackBuild b/system/rxvt/rxvt.SlackBuild
new file mode 100644
index 0000000000..1e2873648b
--- /dev/null
+++ b/system/rxvt/rxvt.SlackBuild
@@ -0,0 +1,139 @@
+#!/bin/bash
+
+# Slackware build script for rxvt
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# This is loosely based on Pat Volkerding's rxvt from Slackware 14.2's
+# patches/ (same ./configure options and patches). Since his last BUILD
+# was 5, I'm submitting this with BUILD=6 to start out with.
+
+# The original upstream site is long gone. I was gonna link to an
+# archive.org copy of it for the screenshots in the HTML doc, but
+# the screenshot (the only one) isn't archived. So the docs have dead
+# links, *shrug*.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=rxvt
+VERSION=${VERSION:-2.7.10}
+BUILD=${BUILD:-6}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# Patches came from:
+# https://ftp.slackware.com/pub/slackware/slackware-14.2/patches/source/rxvt/
+# ...though I gunzipped them since SBo prefers that.
+patch -p1 < $CWD/rxvt-integer-overflow-fix.diff
+patch -p1 < $CWD/rxvt.utempter.diff
+
+# Same configure options as Pat used:
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --enable-languages \
+  --enable-utmp \
+  --enable-wtmp \
+  --enable-xpm-background \
+  --enable-transparency \
+  --enable-menubar \
+  --enable-graphics \
+  --enable-rxvt-scroll \
+  --enable-next-scroll \
+  --enable-xterm-scroll \
+  --enable-xim \
+  --enable-frills \
+  --enable-linespace \
+  --enable-24bit \
+  --enable-keepscrolling \
+  --enable-mousewheel \
+  --enable-slipwheeling \
+  --enable-xgetdefault \
+  --enable-old-selection \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+strip $PKG/usr/bin/*
+gzip -9 $PKG/usr/man/man*/*
+
+# Cleanup on aisle six: empty dirs and a duplicate binary.
+rmdir $PKG/usr/lib $PKG/usr/include
+rm -rf $PKG/usr/bin/$PRGNAM-$VERSION
+
+# Note to self: do not include the terminfo entry, even though it's
+# present in the source. Slackware's already got it, in the ncurses
+# package.
+
+# Pat's package didn't include an icon or a .desktop. rxvt-logo.png
+# came from upstream's web site, and the .desktop is a modified version
+# of the one from rxvt-unicode.
+APPS=$PKG/usr/share/applications
+ICONS=$PKG/usr/share/icons/hicolor/32x32/apps
+PMAPS=$PKG/usr/share/pixmaps
+
+mkdir -p $APPS $ICONS $PMAPS
+cat $CWD/$PRGNAM.desktop > $APPS/$PRGNAM.desktop
+cat $CWD/rxvt-logo.png > $ICONS/$PRGNAM.png
+ln -s ../icons/hicolor/32x32/apps/$PRGNAM.png $PMAPS/$PRGNAM.png
+
+# Here we differ from Pat's package: not going to include the entire
+# contents of doc/, since some of it's YODL source for the HTML, and there
+# are Makefiles...
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+chmod 644 doc/menu/*
+cp -a ChangeLog \
+      *.lsm \
+      doc/{etc/*.ad,menu,BUGS,FAQ,README.*,TODO,*.{txt,html,seq}} \
+      rclock/*.html $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/rxvt/rxvt.desktop b/system/rxvt/rxvt.desktop
new file mode 100644
index 0000000000..b41cf3089d
--- /dev/null
+++ b/system/rxvt/rxvt.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=rxvt
+Comment=Classic X terminal emulator
+Exec=rxvt
+Icon=rxvt
+Terminal=false
+Type=Application
+Categories=System;TerminalEmulator;
diff --git a/system/rxvt/rxvt.info b/system/rxvt/rxvt.info
new file mode 100644
index 0000000000..31e1a216f4
--- /dev/null
+++ b/system/rxvt/rxvt.info
@@ -0,0 +1,10 @@
+PRGNAM="rxvt"
+VERSION="2.7.10"
+HOMEPAGE="https://rxvt.sourceforge.net/"
+DOWNLOAD="https://downloads.sourceforge.net/project/rxvt/rxvt-dev/2.7.10/rxvt-2.7.10.tar.gz"
+MD5SUM="302c5c455e64047b02d1ef19ff749141"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/rxvt/rxvt.utempter.diff b/system/rxvt/rxvt.utempter.diff
new file mode 100644
index 0000000000..54e06f7af0
--- /dev/null
+++ b/system/rxvt/rxvt.utempter.diff
@@ -0,0 +1,277 @@
+--- ./src/logging.c.orig	2002-12-15 16:33:04.000000000 -0800
++++ ./src/logging.c	2003-06-07 21:08:52.000000000 -0700
+@@ -60,157 +60,7 @@
+ void
+ rxvt_makeutent(rxvt_t *r, const char *pty, const char *hostname)
+ {
+-#ifdef HAVE_STRUCT_UTMP
+-    struct utmp    *ut = &(r->h->ut);
+-#endif
+-#ifdef HAVE_STRUCT_UTMPX
+-    struct utmpx   *utx = &(r->h->utx);
+-#endif
+-#ifdef HAVE_UTMP_PID
+-    int             i;
+-#endif
+-    char            ut_id[5];
+-    struct passwd  *pwent = getpwuid(getuid());
+-
+-    if (!STRNCMP(pty, "/dev/", 5))
+-	pty += 5;		/* skip /dev/ prefix */
+-
+-    if (!STRNCMP(pty, "pty", 3) || !STRNCMP(pty, "tty", 3)) {
+-	STRNCPY(ut_id, (pty + 3), sizeof(ut_id));
+-    }
+-#ifdef HAVE_UTMP_PID
+-    else if (sscanf(pty, "pts/%d", &i) == 1)
+-	sprintf(ut_id, "vt%02x", (i & 0xff));	/* sysv naming */
+-#endif
+-    else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) {
+-	rxvt_print_error("can't parse tty name \"%s\"", pty);
+-	return;
+-    }
+-
+-#ifdef HAVE_STRUCT_UTMP
+-    MEMSET(ut, 0, sizeof(struct utmp));
+-# ifdef HAVE_UTMP_PID
+-    setutent();
+-    STRNCPY(ut->ut_id, ut_id, sizeof(ut->ut_id));
+-    ut->ut_type = DEAD_PROCESS;
+-    getutid(ut);		/* position to entry in utmp file */
+-    STRNCPY(r->h->ut_id, ut_id, sizeof(r->h->ut_id));
+-# endif
+-#endif
+-
+-#ifdef HAVE_STRUCT_UTMPX
+-    MEMSET(utx, 0, sizeof(struct utmpx));
+-    setutxent();
+-    STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id));
+-    utx->ut_type = DEAD_PROCESS;
+-    getutxid(utx);		/* position to entry in utmp file */
+-    STRNCPY(r->h->ut_id, ut_id, sizeof(r->h->ut_id));
+-#endif
+-
+-#ifdef HAVE_STRUCT_UTMP
+-    STRNCPY(ut->ut_line, pty, sizeof(ut->ut_line));
+-    ut->ut_time = time(NULL);
+-# ifdef HAVE_UTMP_PID
+-    STRNCPY(ut->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
+-	    sizeof(ut->ut_user));
+-    STRNCPY(ut->ut_id, ut_id, sizeof(ut->ut_id));
+-    ut->ut_time = time(NULL);
+-    ut->ut_pid = r->h->cmd_pid;
+-#  ifdef HAVE_UTMP_HOST
+-    STRNCPY(ut->ut_host, hostname, sizeof(ut->ut_host));
+-#  endif
+-    ut->ut_type = USER_PROCESS;
+-    pututline(ut);
+-    endutent();			/* close the file */
+-    r->h->utmp_pos = -1;
+-# else
+-    STRNCPY(ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
+-	    sizeof(ut->ut_name));
+-#  ifdef HAVE_UTMP_HOST
+-    STRNCPY(ut->ut_host, hostname, sizeof(ut->ut_host));
+-#  endif
+-# endif
+-#endif
+-
+-#ifdef HAVE_STRUCT_UTMPX
+-    STRNCPY(utx->ut_line, pty, sizeof(utx->ut_line));
+-    STRNCPY(utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
+-	    sizeof(utx->ut_user));
+-    STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id));
+-    utx->ut_session = getsid(0);
+-    utx->ut_tv.tv_sec = time(NULL);
+-    utx->ut_tv.tv_usec = 0;
+-    utx->ut_pid = r->h->cmd_pid;
+-# ifdef HAVE_UTMPX_HOST
+-    STRNCPY(utx->ut_host, hostname, sizeof(utx->ut_host));
+-#  if 0
+-    {
+-	char           *colon;
+-
+-	if ((colon = STRRCHR(ut->ut_host, ':')) != NULL)
+-	    *colon = '\0';
+-    }
+-#  endif
+-# endif
+-    utx->ut_type = USER_PROCESS;
+-    pututxline(utx);
+-    endutxent();		/* close the file */
+-    r->h->utmp_pos = -1;
+-#endif
+-
+-#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
+-    {
+-	int             i;
+-# ifdef HAVE_TTYSLOT
+-	i = ttyslot();
+-	if (rxvt_write_bsd_utmp(i, ut))
+-	    r->h->utmp_pos = i;
+-# else
+-	FILE           *fd0;
+-
+-	if ((fd0 = fopen(TTYTAB_FILENAME, "r")) != NULL) {
+-	    char            buf[256], name[256];
+-
+-	    buf[sizeof(buf) - 1] = '\0';
+-	    for (i = 1; (fgets(buf, sizeof(buf) - 1, fd0) != NULL);) {
+-		if (*buf == '#' || sscanf(buf, "%s", name) != 1)
+-		    continue;
+-		if (!STRCMP(ut->ut_line, name)) {
+-		    if (!rxvt_write_bsd_utmp(i, ut))
+-			i = 0;
+-		    r->h->utmp_pos = i;
+-		    fclose(fd0);
+-		    break;
+-		}
+-		i++;
+-	    }
+-	    fclose(fd0);
+-	}
+-# endif
+-    }
+-#endif
+-
+-#ifdef WTMP_SUPPORT
+-# ifdef WTMP_ONLY_ON_LOGIN
+-    if (r->Options & Opt_loginShell)
+-# endif
+-    {
+-# ifdef HAVE_STRUCT_UTMP
+-#  ifdef HAVE_UPDWTMP
+-	updwtmp(RXVT_WTMP_FILE, ut);
+-#  else
+-	rxvt_update_wtmp(RXVT_WTMP_FILE, ut);
+-#  endif
+-# endif
+-# ifdef HAVE_STRUCT_UTMPX
+-	updwtmpx(RXVT_WTMPX_FILE, utx);
+-# endif
+-    }
+-#endif
+-#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
+-    if (r->Options & Opt_loginShell)
+-	rxvt_update_lastlog(RXVT_LASTLOG_FILE, pty, hostname);
+-#endif
++	addToUtmp(pty, NULL, r->cmd_fd);
+ }
+ 
+ /* ------------------------------------------------------------------------- */
+@@ -221,85 +71,7 @@
+ void
+ rxvt_cleanutent(rxvt_t *r)
+ {
+-#ifdef HAVE_STRUCT_UTMP
+-    struct utmp    *tmput, *ut = &(r->h->ut);
+-#endif
+-#ifdef HAVE_STRUCT_UTMPX
+-    struct utmpx   *tmputx, *utx = &(r->h->utx);
+-#endif
+-
+-#ifdef HAVE_STRUCT_UTMP
+-# ifdef HAVE_UTMP_PID
+-    MEMSET(ut, 0, sizeof(struct utmp));
+-    setutent();
+-    STRNCPY(ut->ut_id, r->h->ut_id, sizeof(ut->ut_id));
+-    ut->ut_type = USER_PROCESS;
+-    if ((tmput = getutid(ut)))	/* position to entry in utmp file */
+-	ut = tmput;
+-    ut->ut_type = DEAD_PROCESS;
+-# else 
+-    MEMSET(ut->ut_name, 0, sizeof(ut->ut_name));
+-#  ifdef HAVE_UTMP_HOST
+-    MEMSET(ut->ut_host, 0, sizeof(ut->ut_host));
+-#  endif
+-# endif
+-    ut->ut_time = time(NULL);
+-#endif
+-
+-#ifdef HAVE_STRUCT_UTMPX
+-    MEMSET(utx, 0, sizeof(struct utmpx));
+-    setutxent();
+-    STRNCPY(utx->ut_id, r->h->ut_id, sizeof(utx->ut_id));
+-    utx->ut_type = USER_PROCESS;
+-    if ((tmputx = getutxid(utx)))	/* position to entry in utmp file */
+-	utx = tmputx;
+-    utx->ut_type = DEAD_PROCESS;
+-    utx->ut_session = getsid(0);
+-    utx->ut_tv.tv_sec = time(NULL);
+-    utx->ut_tv.tv_usec = 0;
+-#endif
+-
+-    /*
+-     * Write ending wtmp entry
+-     */
+-#ifdef WTMP_SUPPORT
+-# ifdef WTMP_ONLY_ON_LOGIN
+-    if (r->Options & Opt_loginShell)
+-# endif
+-    {
+-# ifdef HAVE_STRUCT_UTMP
+-#  ifdef HAVE_UPDWTMP
+-	updwtmp(RXVT_WTMP_FILE, ut);
+-#  else
+-	rxvt_update_wtmp(RXVT_WTMP_FILE, ut);
+-#  endif
+-# endif
+-# ifdef HAVE_STRUCT_UTMPX
+-	updwtmpx(RXVT_WTMPX_FILE, utx);
+-# endif
+-    }
+-#endif
+-
+-    /*
+-     * Write utmp entry
+-     */
+-#ifdef HAVE_STRUCT_UTMP
+-# ifdef HAVE_UTMP_PID
+-    if (ut->ut_pid == r->h->cmd_pid)
+-	pututline(ut);
+-    endutent();
+-# else
+-    if (r->h->utmp_pos > 0) {
+-	MEMSET(ut, 0, sizeof(struct utmp));
+-	rxvt_write_bsd_utmp(r->h->utmp_pos, ut);
+-    }
+-# endif
+-#endif
+-#ifdef HAVE_STRUCT_UTMPX
+-    if (utx->ut_pid == r->h->cmd_pid)
+-	pututxline(utx);
+-    endutxent();
+-#endif
++	removeFromUtmp();
+ }
+ 
+ /* ------------------------------------------------------------------------- */
+--- ./src/init.c.orig	2002-12-03 21:21:39.000000000 -0800
++++ ./src/init.c	2003-06-07 21:09:26.000000000 -0700
+@@ -858,6 +858,7 @@
+ 	rxvt_print_error("aborting");
+ 	exit(EXIT_FAILURE);
+     }
++    rxvt_privileged_utmp(r, SAVE);
+ }
+ 
+ /*----------------------------------------------------------------------*/
+@@ -1364,7 +1365,6 @@
+ #endif
+     r->num_fds++;		/* counts from 0 */
+ 
+-    rxvt_privileged_utmp(r, SAVE);
+     return cfd;
+ }
+ 
+--- ./autoconf/Make.common.in.orig	2001-11-29 19:22:56.000000000 -0800
++++ ./autoconf/Make.common.in	2003-06-07 21:08:52.000000000 -0700
+@@ -68,7 +68,7 @@
+ 
+ LIBTOOL = @LIBTOOL@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEBUG) $(DINCLUDE) $(XINC) -I$(basedir) -I$(srcdir) -I.
+-LINK = $(CC) $(CFLAGS) $(LDFLAGS)
++LINK = $(CC) $(CFLAGS) $(LDFLAGS) -lutempter -lutil
+ 
+ # End of common section of the Makefile
+ #-------------------------------------------------------------------------
diff --git a/system/rxvt/slack-desc b/system/rxvt/slack-desc
new file mode 100644
index 0000000000..3ccbd2c348
--- /dev/null
+++ b/system/rxvt/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+    |-----handy-ruler------------------------------------------------------|
+rxvt: rxvt (terminal emulator)
+rxvt:
+rxvt: rxvt is a color vt102 terminal emulator intended as an xterm
+rxvt: replacement for users who do not require features such as Tektronix
+rxvt: 4014 emulation and toolkit-style configurability. As a result, rxvt
+rxvt: uses much less memory -- a significant advantage on a machine serving
+rxvt: many X sessions. Also included is rclock, an analog clock for X.
+rxvt:
+rxvt:
+rxvt:
+rxvt:
diff --git a/system/s3fs-fuse/s3fs-fuse.SlackBuild b/system/s3fs-fuse/s3fs-fuse.SlackBuild
index 337c442b71..b459b03228 100644
--- a/system/s3fs-fuse/s3fs-fuse.SlackBuild
+++ b/system/s3fs-fuse/s3fs-fuse.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for s3fs-fuse
 
-# Copyright 2020-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2020-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=s3fs-fuse
-VERSION=${VERSION:-1.88}
+VERSION=${VERSION:-1.94}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,7 +61,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e	
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -91,11 +98,11 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL *.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog *.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/s3fs-fuse/s3fs-fuse.info b/system/s3fs-fuse/s3fs-fuse.info
index 85be11ff8b..54aba2fe4d 100644
--- a/system/s3fs-fuse/s3fs-fuse.info
+++ b/system/s3fs-fuse/s3fs-fuse.info
@@ -1,8 +1,8 @@
 PRGNAM="s3fs-fuse"
-VERSION="1.88"
+VERSION="1.94"
 HOMEPAGE="https://github.com/s3fs-fuse/s3fs-fuse"
-DOWNLOAD="https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.88/s3fs-fuse-1.88.tar.gz"
-MD5SUM="5142658b463d675e19151a18d14d7f47"
+DOWNLOAD="https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.94/s3fs-fuse-1.94.tar.gz"
+MD5SUM="a2f8a678874c3c5553f2bea064fbdff7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="awscli"
diff --git a/system/s3ql/README b/system/s3ql/README
index 7d8155d709..07c8125d2f 100644
--- a/system/s3ql/README
+++ b/system/s3ql/README
@@ -4,16 +4,14 @@ effectively provides a hard disk of dynamic, infinite capacity that
 can be accessed from any computer with internet access running
 Linux, FreeBSD or OS-X.
 
-S3QL is a standard conforming, full featured UNIX file system that is
-conceptually indistinguishable from any local file system. Furthermore,
-S3QL has additional features like compression, encryption, data
-de-duplication, immutable trees and snapshotting which make it especially
-suitable for online backup and archival.
+S3QL is a standard conforming, full featured UNIX file system
+that is conceptually indistinguishable from any local file
+system. Furthermore, S3QL has additional features like compression,
+encryption, data de-duplication, immutable trees and snapshotting
+which make it especially suitable for online backup and archival.
 
 S3QL is designed to favor simplicity and elegance over performance and
-feature-creep. Care has been taken to make the source code as readable and
-serviceable as possible. Solid error detection and error handling have
-been included from the very first line, and S3QL comes with extensive
-automated test cases for all its components.
-
-NOTE: Make sure to build llfuse AFTER python3 to add Python 3 support.
+feature-creep. Care has been taken to make the source code as readable
+and serviceable as possible. Solid error detection and error handling
+have been included from the very first line, and S3QL comes with
+extensive automated test cases for all its components.
diff --git a/system/s3ql/s3ql.SlackBuild b/system/s3ql/s3ql.SlackBuild
index a97dbe2c27..c111c2125c 100644
--- a/system/s3ql/s3ql.SlackBuild
+++ b/system/s3ql/s3ql.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for "s3ql".
 
@@ -24,10 +24,13 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=s3ql
 VERSION=${VERSION:-2.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -73,7 +83,7 @@ find -L . \
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-python3 setup.py install --root $PKG --optimize=1
+python3 setup.py build_cython install --root $PKG --optimize=1
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -93,4 +103,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/s3ql/s3ql.info b/system/s3ql/s3ql.info
index ec2e87d718..c44b62cd6d 100644
--- a/system/s3ql/s3ql.info
+++ b/system/s3ql/s3ql.info
@@ -1,10 +1,10 @@
 PRGNAM="s3ql"
 VERSION="2.21"
-HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
-DOWNLOAD="https://bitbucket.org/nikratio/s3ql/downloads/s3ql-2.21.tar.bz2"
+HOMEPAGE="https://github.com/s3ql/s3ql/"
+DOWNLOAD="http://distcache.FreeBSD.org/ports-distfiles/s3ql-2.21.tar.bz2"
 MD5SUM="8d7f00e6af7013261288a94ac93f8bc1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-dugong python3-defusedxml python3-pycrypto python-requests llfuse apsw"
+REQUIRES="python3-dugong python3-defusedxml python3-pycrypto llfuse apsw"
 MAINTAINER="Marcel Saegebarth"
 EMAIL="marc@mos6581.de"
diff --git a/system/s3ql/slack-desc b/system/s3ql/slack-desc
index d3596a022e..516f06381b 100644
--- a/system/s3ql/slack-desc
+++ b/system/s3ql/slack-desc
@@ -13,7 +13,7 @@ s3ql: services like Google Storage, Amazon S3, or OpenStack. S3QL
 s3ql: effectively provides a hard disk of dynamic, infinite capacity that
 s3ql: can be accessed from any computer with internet access.
 s3ql:
-s3ql: Homepage: https://bitbucket.org/nikratio/s3ql/
+s3ql: Homepage: https://github.com/s3ql/s3ql/
 s3ql:
 s3ql:
 s3ql:
diff --git a/system/s6-linux-init/README b/system/s6-linux-init/README
index 21fdbd752a..1b0669f679 100644
--- a/system/s6-linux-init/README
+++ b/system/s6-linux-init/README
@@ -4,7 +4,6 @@ init system, including a /sbin/init binary, on a Linux kernel.
 The resulting architecture follows the Unix philosophy (one job -> one
 tool) as closely as possible, and is fully dedicated to the s6 way of
 managing a system:
-
 - s6-svscan runs as process 1 for the whole machine lifetime.
 - Every daemon is supervised.
 - No logs are ever lost.
@@ -13,7 +12,6 @@ managing a system:
 
 Nevertheless, the architecture is fully compliant with various empirical
 and historical specifications. For instance, it provides:
-
 - utmp management compatible with sysvinit,
 - runlevel management, with a configurable default, overridable from the
   kernel command line,
@@ -25,29 +23,42 @@ nsss (https://skarnet.org/software/nsss/) (not available at SBo)
 utmps (https://skarnet.org/software/utmps/) (not available at SBo)
 
 NOTE:
-s6-linux-init has some skeleton files that will be used to build the
+s6-linux-init has some skeleton files that will be used to build a
 complete s6-based init system. These files will be placed under
 /etc/s6-linux-init/skel by default. You can change this by passing
-SKEL_DIR=/path/to/directory environment variable to the SlackBuild
+SKEL_DIR=/path/to/directory environment variable to this SlackBuild
 script like below:
 
     SKEL_DIR=/path/to/directory ./s6-linux-init.SlackBuild
 
-The init system created by s6-linux-init will need an early boot tmpfs
-in order to work properly. By default, s6-linux-init will assume that
+The s6-based init system created by s6-linux-init needs an early boot
+tmpfs to work properly. By default, the created init system assumes that
 this tmpfs will be mounted on /run. You can change this by passing
 TMPFS_DIR=/path/to/directory to the script like below:
 
     TMPFS_DIR=/path/to/directory ./s6-linux-init.SlackBuild
 
-Upstream recommends building skarnet.org softwares with static libraries
-as most of skarnet.org softwares are small enough that using shared
-libraries are generally not worth using. Therefore, by default, shared
-libraries are not built and binaries are linked against the static
-versions of the skarnet.org libraries.
+At some point in boot time, an instance of s6-svscan will become PID 1,
+using $TMPFS_DIR/service as its scan directory by default. This can be
+altered by passing SCAN_DIR=path/to/directory to the script, changing
+the scan directory to $TMPFS_DIR/path/to/directory. For example, if you
+want to change the scan directory to /run/s6/service, you can pass
+SCAN_DIR=s6/service to the script like below:
+
+    SCAN_DIR=s6/service ./s6-linux-init.SlackBuild
 
-If you want to also build the shared libraries, pass BUILD_SHARED=yes
-to the script like below:
+Note that we don't use absolute path for SCAN_DIR here, since it is
+relative to $TMPFS_DIR, which defaults to /run (as mentioned
+previously).
+
+Upstream recommends building skarnet.org software with static libraries,
+as most of skarnet.org software are small enough that shared libraries
+are generally not worth using. Therefore, by default, shared libraries
+are not built and binaries are linked against the static versions of the
+skarnet.org libraries.
+
+If you want to also build the shared libraries, pass BUILD_SHARED=yes to
+the script like below:
 
     BUILD_SHARED=yes ./s6-linux-init.SlackBuild
 
@@ -57,8 +68,10 @@ libraries and not the static ones, you can do something like:
 
     BUILD_SHARED=yes BUILD_STATIC=no ./s6-linux-init.SlackBuild
 
-If you just want to build and use skarnet.org softwares, building only
+If you just want to build and use skarnet.org software, building only
 the static libraries should be sufficient.
 
 If you want the binaries to be linked against the shared versions of the
-skarnet.org libraries, pass LINK_SHARED=yes to the script.
+skarnet.org libraries, pass LINK_SHARED=yes to the script, i.e.,
+
+    LINK_SHARED=yes ./s6-linux-init.SlackBuild
diff --git a/system/s6-linux-init/s6-linux-init.SlackBuild b/system/s6-linux-init/s6-linux-init.SlackBuild
index 87c3f53414..77ff74dd25 100644
--- a/system/s6-linux-init/s6-linux-init.SlackBuild
+++ b/system/s6-linux-init/s6-linux-init.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for s6-linux-init
 
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix doc permissions.
+# - remove useless INSTALL from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=s6-linux-init
-VERSION=${VERSION:-1.0.6.0}
+VERSION=${VERSION:-1.1.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,37 +65,38 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# By default, only static libraries are built. If you need to build the shared libraries, just pass
-# BUILD_SHARED=yes to this script
+# By default, only static libraries are built. If you want to also build the
+# shared libraries, just pass BUILD_SHARED=yes to this script.
 BUILD_STATIC=${BUILD_STATIC:-yes}
 BUILD_SHARED=${BUILD_SHARED:-no}
-
-if [ "$BUILD_STATIC" = "no" ]; then
-		LIBS_CONF="--disable-static"
-fi
-
-if [ "$BUILD_SHARED" = "yes" ]; then
-		LIBS_CONF="--enable-shared $LIBS_CONF"
-fi
-
-# By default, all binaries are linked against the static versions of the skarnet.org libraries
-# Pass LINK_SHARED=yes to link the binaries against the shared versions of the skarnet.org libraries
-# Also, if you only built the shared versions of the skarnet.org libraries, the binaries will be
-# linked against shared libraries automatically, as though LINK_SHARED=yes is passed to this script
+[ "$BUILD_STATIC" = "no" ] && LIBS_CONF="--disable-static"
+[ "$BUILD_SHARED" = "yes" ] && LIBS_CONF="--enable-shared $LIBS_CONF"
+
+# By default, all binaries are linked against the static versions of the
+# skarnet.org libraries. Pass LINK_SHARED=yes to link the binaries against the
+# shared versions of the skarnet.org libraries. If you only built the shared
+# versions of the skarnet.org libraries, the binaries will be linked against
+# shared libraries automatically, as though LINK_SHARED=yes is passed to this
+# script.
 LINK_SHARED=${LINK_SHARED:-no}
+[ "$LINK_SHARED" = "yes" ] && LIBS_CONF="--disable-allstatic $LIBS_CONF"
 
-if [ "$LINK_SHARED" = "yes" ]; then
-		LIBS_CONF="--disable-allstatic $LIBS_CONF"
-fi
-
-# By default, all the skeleton files from s6-linux-init are placed under /etc/s6-linux-init/skel
-# Pass SKEL_DIR=/path/to/directory to this script if you want to place it somewhere else
+# By default, all skeleton files from s6-linux-init are placed under
+# /etc/s6-linux-init/skel. Pass SKEL_DIR=/path/to/directory to this script if
+# you want to place them somewhere else.
 SKEL_DIR=${SKEL_DIR:-/etc/s6-linux-init/skel}
 
-# By default, s6-linux-init will assume that the initial tmpfs is mounted on /run
-# Pass TMPFS_DIR=/path/to/directory to this script if you want to change it
+# By default, a s6-based init system created by s6-linux-init assumes that the
+# initial tmpfs will be mounted on /run. Pass TMPFS_DIR=/path/to/directory to
+# this script if you want to change it.
 TMPFS_DIR=${TMPFS_DIR:-/run}
 
+# By default, the PID 1 s6-svscan will use $TMPFS_DIR/service as its scan
+# directory. Pass SCAN_DIR=path/to/directory to this script if you want to
+# change it. Note that $SCAN_DIR will be relative to $TMPFS_DIR, so the final
+# path will be $TMPFS_DIR/$SCAN_DIR.
+SCAN_DIR=${SCAN_DIR:-service}
+
 set -e
 
 rm -rf $PKG
@@ -96,9 +108,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -110,6 +122,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --includedir=/usr/include \
   --skeldir=${SKEL_DIR} \
   --tmpfsdir=${TMPFS_DIR} \
+  --scandir=${SCAN_DIR} \
   --with-sysdeps=/usr/lib${LIBDIRSUFFIX}/skalibs/sysdeps \
   --with-lib=/usr/lib${LIBDIRSUFFIX}/skalibs \
   --with-lib=/usr/lib${LIBDIRSUFFIX}/execline \
@@ -120,12 +133,17 @@ make
 make strip
 make install DESTDIR=$PKG
 
+# 20220413 bkw: how annoying is this? "chmod 0755" doesn't actually
+# remove the setgid bit. why upstream thinks it's a good idea to have
+# setgid doc directories, I'll never know (and never care).
+chmod a-s doc
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README doc $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README doc $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/s6-linux-init/s6-linux-init.info b/system/s6-linux-init/s6-linux-init.info
index 7b883a74f9..df267ce6fd 100644
--- a/system/s6-linux-init/s6-linux-init.info
+++ b/system/s6-linux-init/s6-linux-init.info
@@ -1,8 +1,8 @@
 PRGNAM="s6-linux-init"
-VERSION="1.0.6.0"
+VERSION="1.1.2.0"
 HOMEPAGE="https://skarnet.org/software/s6-linux-init/"
-DOWNLOAD="https://skarnet.org/software/s6-linux-init/s6-linux-init-1.0.6.0.tar.gz"
-MD5SUM="74c60725b76911584b1af4ad141c0fe9"
+DOWNLOAD="https://skarnet.org/software/s6-linux-init/s6-linux-init-1.1.2.0.tar.gz"
+MD5SUM="872b2a839330c4f2893db8f15482fa77"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="s6"
diff --git a/system/s6-rc/README b/system/s6-rc/README
index fcc650f1d7..b6c9809096 100644
--- a/system/s6-rc/README
+++ b/system/s6-rc/README
@@ -8,23 +8,23 @@ controlled environment.
 NOTE:
 s6-rc has a "live directory" where it puts some internal files that are
 needed at runtime, which defaults to /run/s6-rc. This can be changed to
-other directory by passing LIVE_DIR=/path/to/directory environment
-variable to the SlackBuild script like below:
+another directory by passing LIVE_DIR=/path/to/directory environment
+variable to this SlackBuild script like below:
 
     LIVE_DIR=/path/to/directory ./s6-rc.SlackBuild
 
-Make sure /path/to/directory is readable and writable by s6-rc or it
+Make sure /path/to/directory is readable and writable by s6-rc, or it
 will not work correctly. A good recommendation is to put the live
-directory inside a RAM filesystem (e.g. tmpfs).
+directory inside a RAM filesystem (e.g., tmpfs).
 
-Upstream recommends building skarnet.org softwares with static libraries
-as most of skarnet.org softwares are small enough that using shared
-libraries are generally not worth using. Therefore, by default, shared
-libraries are not built and binaries are linked against the static
-versions of the skarnet.org libraries.
+Upstream recommends building skarnet.org software with static libraries,
+as most of skarnet.org software are small enough that shared libraries
+are generally not worth using. Therefore, by default, shared libraries
+are not built and binaries are linked against the static versions of the
+skarnet.org libraries.
 
 If you want to also build the shared libraries, pass BUILD_SHARED=yes to
-the SlackBuild script like below:
+the script like below:
 
     BUILD_SHARED=yes ./s6-rc.SlackBuild
 
@@ -34,8 +34,10 @@ libraries and not the static ones, you can do something like:
 
     BUILD_SHARED=yes BUILD_STATIC=no ./s6-rc.SlackBuild
 
-If you just want to build and use skarnet.org softwares, building only
+If you just want to build and use skarnet.org software, building only
 the static libraries should be sufficient.
 
 If you want the binaries to be linked against the shared versions of the
-skarnet.org libraries, pass LINK_SHARED=yes to the script.
+skarnet.org libraries, pass LINK_SHARED=yes to the script, i.e.,
+
+    LINK_SHARED=yes ./s6-rc.SlackBuild
diff --git a/system/s6-rc/s6-rc.SlackBuild b/system/s6-rc/s6-rc.SlackBuild
index 8a472ef5c1..a2b55021de 100644
--- a/system/s6-rc/s6-rc.SlackBuild
+++ b/system/s6-rc/s6-rc.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for s6-rc
 
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220414 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix doc permissions
+# Note: ignore sbopkglint complaints about empty files in the doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=s6-rc
-VERSION=${VERSION:-0.5.2.1}
+VERSION=${VERSION:-0.5.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,22 +65,25 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# By default, only static libraries are built. If you need to build the shared libraries, just pass
-# BUILD_SHARED=yes to this script
+# By default, only static libraries are built. If you want to also build the
+# shared libraries, just pass BUILD_SHARED=yes to this script.
 BUILD_STATIC=${BUILD_STATIC:-yes}
 BUILD_SHARED=${BUILD_SHARED:-no}
 [ "$BUILD_STATIC" = "no" ] && LIBS_CONF="--disable-static"
 [ "$BUILD_SHARED" = "yes" ] && LIBS_CONF="--enable-shared $LIBS_CONF"
 
-# By default, all binaries are linked against the static versions of the skarnet.org libraries
-# Pass LINK_SHARED=yes to link the binaries against the shared versions of the skarnet.org libraries
-# Also, if you only built the shared versions of the skarnet.org libraries, the binaries will be
-# linked against shared libraries automatically, as though LINK_SHARED=yes is passed to this script
+# By default, all binaries are linked against the static versions of the
+# skarnet.org libraries. Pass LINK_SHARED=yes to link the binaries against the
+# shared versions of the skarnet.org libraries. If you only built the shared
+# versions of the skarnet.org libraries, the binaries will be linked against
+# shared libraries automatically, as though LINK_SHARED=yes is passed to this
+# script.
 LINK_SHARED=${LINK_SHARED:-no}
 [ "$LINK_SHARED" = "yes" ] && LIBS_CONF="--disable-allstatic $LIBS_CONF"
 
-# /run/s6-rc is the default live directory, pass LIVE_DIR=/path/to/directory to this script to change it
-# make sure /path/to/directory is readable and writable by s6-rc or it will not work correctly
+# The default s6-rc live directory is /run/s6-rc. Pass
+# LIVE_DIR=/path/to/directory to this script to change it (make sure
+# /path/to/directory is readable and writable by s6-rc).
 LIVE_DIR=${LIVE_DIR:-/run/s6-rc}
 
 set -e
@@ -83,9 +97,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -106,12 +120,15 @@ make
 make strip
 make install DESTDIR=$PKG
 
+# 20220414 bkw: wtf, sticky and setgid dirs in doc.
+# 20220615 mumahendras3: remove sticky and setgid bits from examples too
+chmod -R -t,a-s doc examples
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README doc examples $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README doc examples $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/s6-rc/s6-rc.info b/system/s6-rc/s6-rc.info
index d5fa325138..0e785d043d 100644
--- a/system/s6-rc/s6-rc.info
+++ b/system/s6-rc/s6-rc.info
@@ -1,8 +1,8 @@
 PRGNAM="s6-rc"
-VERSION="0.5.2.1"
+VERSION="0.5.4.2"
 HOMEPAGE="https://skarnet.org/software/s6-rc/"
-DOWNLOAD="https://skarnet.org/software/s6-rc/s6-rc-0.5.2.1.tar.gz"
-MD5SUM="0fbee215343fda8ccdfcc4c9817d18ff"
+DOWNLOAD="https://skarnet.org/software/s6-rc/s6-rc-0.5.4.2.tar.gz"
+MD5SUM="c3c36ab55d340e4146d459b9abcc766a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="s6"
diff --git a/system/s6/README b/system/s6/README
index 2c7ec758e3..b7b7c8d67b 100644
--- a/system/s6/README
+++ b/system/s6/README
@@ -1,15 +1,13 @@
 s6 is a small suite of programs for UNIX, designed to allow process
-supervision (a.k.a service supervision), in the line of daemontools
-and runit, as well as various operations on processes and daemons. It
-is meant to be a toolbox for low-level process and service
-administration, providing different sets of independent tools that can
-be used within or without the framework, and that can be assembled
-together to achieve powerful functionality with a very small amount of
-code.
+supervision (a.k.a service supervision), in the line of daemontools and
+runit, as well as various operations on processes and daemons. It is
+meant to be a toolbox for low-level process and service administration,
+providing different sets of independent tools that can be used within or
+without the framework, and that can be assembled together to achieve
+powerful functionality with a very small amount of code.
 
 Examples of things you can do by assembling together several programs
 provided by s6 - besides process supervision:
-
 - syslogd functionality, using much less resources than the traditional
   syslogd.
 - Reliable service readiness notification, which is the basis for
@@ -21,14 +19,14 @@ provided by s6 - besides process supervision:
   without having to switch to any specific init system.
 
 NOTE:
-Upstream recommends building skarnet.org softwares with static libraries
-as most of skarnet.org softwares are small enough that using shared
-libraries are generally not worth using. Therefore, by default, shared
-libraries are not built and binaries are linked against the static
-versions of the skarnet.org libraries.
+Upstream recommends building skarnet.org software with static libraries,
+as most of skarnet.org software are small enough that shared libraries
+are generally not worth using. Therefore, by default, shared libraries
+are not built and binaries are linked against the static versions of the
+skarnet.org libraries.
 
 If you want to also build the shared libraries, pass BUILD_SHARED=yes
-environment variable to the SlackBuild script like below:
+environment variable to this SlackBuild script like below:
 
     BUILD_SHARED=yes ./s6.SlackBuild
 
@@ -38,8 +36,10 @@ libraries and not the static ones, you can do something like:
 
     BUILD_SHARED=yes BUILD_STATIC=no ./s6.SlackBuild
 
-If you just want to build and use skarnet.org softwares, building only
+If you just want to build and use skarnet.org software, building only
 the static libraries should be sufficient.
 
 If you want the binaries to be linked against the shared versions of the
-skarnet.org libraries, pass LINK_SHARED=yes to the script.
+skarnet.org libraries, pass LINK_SHARED=yes to the script, i.e.,
+
+    LINK_SHARED=yes ./s6.SlackBuild
diff --git a/system/s6/README.Slackware b/system/s6/README.Slackware
index 5842f3888d..2034e10e98 100644
--- a/system/s6/README.Slackware
+++ b/system/s6/README.Slackware
@@ -4,7 +4,7 @@ init system:
 I added the following to my /etc/inittab:
 
     # S6
-    sv:12345:respawn:/bin/s6-svscanboot
+    sv:12345:respawn:/sbin/s6-svscanboot
 
 Then did a 'telinit q' to start it.
 
@@ -15,7 +15,7 @@ Note that the default s6-svscanboot provided disables polling
 
 where /service is a directory that contains all the services that
 s6 will supervise. You can change it to other places such as
-/etc/service, /var/service, etc. and edit the provided
-/bin/s6-svscanboot script to change the scan directory to the new
+/etc/service, /var/service, etc., and edit the provided
+/sbin/s6-svscanboot script to change the scan directory to the new
 service directory (i.e. change /service in the script to the new service
 directory).
diff --git a/system/s6/s6.SlackBuild b/system/s6/s6.SlackBuild
index b410f0fe57..a644b72fdd 100644
--- a/system/s6/s6.SlackBuild
+++ b/system/s6/s6.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for s6
 
@@ -23,10 +23,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=2: fix doc permissions.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=s6
-VERSION=${VERSION:-2.10.0.1}
+VERSION=${VERSION:-2.12.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,28 +64,21 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# By default, only static libraries are built. If you need to build the shared libraries, just pass
-# BUILD_SHARED=yes to this script
+# By default, only static libraries are built. If you want to also build the
+# shared libraries, just pass BUILD_SHARED=yes to this script.
 BUILD_STATIC=${BUILD_STATIC:-yes}
 BUILD_SHARED=${BUILD_SHARED:-no}
-
-if [ "$BUILD_STATIC" = "no" ]; then
-		LIBS_CONF="--disable-static"
-fi
-
-if [ "$BUILD_SHARED" = "yes" ]; then
-		LIBS_CONF="--enable-shared $LIBS_CONF"
-fi
-
-# By default, all binaries are linked against the static versions of the skarnet.org libraries
-# Pass LINK_SHARED=yes to link the binaries against the shared versions of the skarnet.org libraries
-# Also, if you only built the shared versions of the skarnet.org libraries, the binaries will be
-# linked against shared libraries automatically, as though LINK_SHARED=yes is passed to this script
+[ "$BUILD_STATIC" = "no" ] && LIBS_CONF="--disable-static"
+[ "$BUILD_SHARED" = "yes" ] && LIBS_CONF="--enable-shared $LIBS_CONF"
+
+# By default, all binaries are linked against the static versions of the
+# skarnet.org libraries. Pass LINK_SHARED=yes to link the binaries against the
+# shared versions of the skarnet.org libraries. If you only built the shared
+# versions of the skarnet.org libraries, the binaries will be linked against
+# shared libraries automatically, as though LINK_SHARED=yes is passed to this
+# script.
 LINK_SHARED=${LINK_SHARED:-no}
-
-if [ "$LINK_SHARED" = "yes" ]; then
-		LIBS_CONF="--disable-allstatic $LIBS_CONF"
-fi
+[ "$LINK_SHARED" = "yes" ] && LIBS_CONF="--disable-allstatic $LIBS_CONF"
 
 set -e
 
@@ -89,9 +91,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -110,17 +112,21 @@ make
 make strip
 make install DESTDIR=$PKG
 
-# Promote s6-svscanboot to /bin for users that want to use s6
-# alongside the system's default init system
-install examples/s6-svscanboot $PKG/bin
-sed -i 's|command|bin|g' $PKG/bin/s6-svscanboot
+# Move root-only programs to /sbin
+mkdir $PKG/sbin
+mv $PKG/bin/s6-{set,apply}uidgid $PKG/sbin
+
+# Promote s6-svscanboot to /sbin for users that want to use s6 alongside
+# Slackware's default init system
+install examples/s6-svscanboot $PKG/sbin
 
+chmod -R -t examples
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README doc examples $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README doc examples $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/s6/s6.info b/system/s6/s6.info
index a0bc8d4347..5d6a2f186d 100644
--- a/system/s6/s6.info
+++ b/system/s6/s6.info
@@ -1,10 +1,10 @@
 PRGNAM="s6"
-VERSION="2.10.0.1"
+VERSION="2.12.0.3"
 HOMEPAGE="https://skarnet.org/software/s6/"
-DOWNLOAD="https://skarnet.org/software/s6/s6-2.10.0.1.tar.gz"
-MD5SUM="acc7c5cc1f100bd09e7efac7a30b06f4"
+DOWNLOAD="https://skarnet.org/software/s6/s6-2.12.0.3.tar.gz"
+MD5SUM="0af573a178274c16d1a22f2c0de51695"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="skalibs execline"
+REQUIRES="execline"
 MAINTAINER="Muhammad Mahendra Subrata"
 EMAIL="mumahendras3@gmail.com"
diff --git a/system/safecopy/safecopy.SlackBuild b/system/safecopy/safecopy.SlackBuild
index 306f2e5255..da130b1512 100644
--- a/system/safecopy/safecopy.SlackBuild
+++ b/system/safecopy/safecopy.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware Package Build Script for safecopy
 # Home Page http://safecopy.sourceforge.net/
@@ -25,26 +25,36 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="safecopy"
 VERSION=${VERSION:-1.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -98,4 +108,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sahel-font/README b/system/sahel-font/README
new file mode 100644
index 0000000000..29e5f0a98d
--- /dev/null
+++ b/system/sahel-font/README
@@ -0,0 +1,7 @@
+Sahel-Font
+
+A Persian (Farsi) Font with variable version.
+Made by Saber Rastikerdar (RIP)
+
+Usage for web:
+https://github.com/rastikerdar/sahel-font/blob/master/README_EN.md
diff --git a/system/sahel-font/doinst.sh b/system/sahel-font/doinst.sh
new file mode 100644
index 0000000000..24224f5ab3
--- /dev/null
+++ b/system/sahel-font/doinst.sh
@@ -0,0 +1,15 @@
+# Update the fonts indexes.
+
+if [ -x /usr/bin/mkfontdir ]; then
+   cd /usr/share/fonts/TTF
+   mkfontdir .
+fi
+
+if [ -x /usr/bin/mkfontscale ]; then
+   cd /usr/share/fonts/TTF
+   mkfontscale .
+fi
+
+if [ -x /usr/bin/fc-cache ]; then
+   fc-cache -f -v
+fi
diff --git a/system/sahel-font/douninst.sh b/system/sahel-font/douninst.sh
new file mode 100644
index 0000000000..e9fb7a6ddc
--- /dev/null
+++ b/system/sahel-font/douninst.sh
@@ -0,0 +1,19 @@
+# douninst.sh
+#
+# uninstall script for Slackware >= 15.0
+
+# Update the fonts indexes.
+
+if [ -x /usr/bin/mkfontdir ]; then
+   cd /usr/share/fonts/TTF
+   mkfontdir .
+fi
+
+if [ -x /usr/bin/mkfontscale ]; then
+   cd /usr/share/fonts/TTF
+   mkfontscale .
+fi
+
+if [ -x /usr/bin/fc-cache ]; then
+   fc-cache -f -v
+fi
diff --git a/system/sahel-font/sahel-font.SlackBuild b/system/sahel-font/sahel-font.SlackBuild
new file mode 100644
index 0000000000..64b4c521a7
--- /dev/null
+++ b/system/sahel-font/sahel-font.SlackBuild
@@ -0,0 +1,86 @@
+#!/bin/bash
+
+# Slackware build script for sahel-font
+
+# Copyright 2023 Yousha Aleayoub Iran
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+# Prepare package details.
+PRGNAM=sahel-font
+VERSION=${VERSION:-3.4.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+# Prepare source files.
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+unzip -d sahel-font $CWD/sahel-font-v3.4.0.zip
+mv sahel-font $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+
+# Change user owner and permissions.
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Main operations.
+mkdir -p $PKG/usr/share/fonts/TTF
+find . -name "*.ttf" -exec cp {} $PKG/usr/share/fonts/TTF/ \;
+
+# Copy document/manual files.
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a CHANGELOG.md $PKG/usr/doc/$PRGNAM-$VERSION/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Make setup scripts.
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/douninst.sh > $PKG/install/douninst.sh
+
+# Build final package file.
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sahel-font/sahel-font.info b/system/sahel-font/sahel-font.info
new file mode 100644
index 0000000000..f7781a1e08
--- /dev/null
+++ b/system/sahel-font/sahel-font.info
@@ -0,0 +1,10 @@
+PRGNAM="sahel-font"
+VERSION="3.4.0"
+HOMEPAGE="https://github.com/rastikerdar/sahel-font/"
+DOWNLOAD="https://github.com/rastikerdar/sahel-font/releases/download/v3.4.0/sahel-font-v3.4.0.zip"
+MD5SUM="38e0f82a32f252577f0edc7728567385"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Yousha Aleayoub"
+EMAIL="yousha.a@hotmail.com"
diff --git a/system/sahel-font/slack-desc b/system/sahel-font/slack-desc
new file mode 100644
index 0000000000..58fdfa0d59
--- /dev/null
+++ b/system/sahel-font/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+sahel-font: sahel-font (Persian Font)
+sahel-font:
+sahel-font: A Persian (Farsi) Font with variable version.
+sahel-font: Made by Saber Rastikerdar (RIP)
+sahel-font: Homepage: https://github.com/rastikerdar/sahel-font
+sahel-font:
+sahel-font:
+sahel-font:
+sahel-font:
+sahel-font:
+sahel-font:
diff --git a/system/sakura/README b/system/sakura/README
index 0aeaec3004..401f6fcd7a 100644
--- a/system/sakura/README
+++ b/system/sakura/README
@@ -1,5 +1,3 @@
-Sakura is a terminal emulator based on GTK and libvte. It has few
-dependencies, so there's no need of a full GNOME desktop installed to
-have a powerful terminal emulator. Sakura uses a GTK notebook to provide
-tabbed terminals in one window and has a contextual menu for
-configuration; it was designed without a menubar. No more or less.
+Sakura is a simple gtk and vte based terminal emulator. It uses tabs
+to provide several terminals in one window and allows to change
+configuration options via a contextual menu. No more no less.
diff --git a/system/sakura/sakura.SlackBuild b/system/sakura/sakura.SlackBuild
index 2dfe64a3bb..f499fbf5c0 100644
--- a/system/sakura/sakura.SlackBuild
+++ b/system/sakura/sakura.SlackBuild
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sakura
-# Written by Erik Hanson  erik@slackbuilds.org
-# Updated by Kristaps Esterlins <esterlinsh[at]gmail.com>
-# Updated by Eugene Wissner <eugen@flevum.de>
+# Copyright 2022 Andrew Payne <phalange@komputermatrix.com>
 # Copyright 2017 Donald Cooley South Haven, IN USA
+# Updated by Eugene Wissner <eugen@flevum.de>
+# Updated by Kristaps Esterlins <esterlinsh[at]gmail.com>
+# Written by Erik Hanson  erik@slackbuilds.org
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +25,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sakura
-VERSION=${VERSION:-3.5.0}
+SRCNAM=SAKURA_3_8_7
+VERSION=${VERSION:-3.8.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +42,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -58,8 +70,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$SRCNAM.tar.gz
+cd $PRGNAM-$SRCNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -67,8 +79,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-#  -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -DNDEBUG" \
-
 mkdir -p build
 cd build
   cmake \
@@ -88,7 +98,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS GPL INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -96,4 +106,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sakura/sakura.info b/system/sakura/sakura.info
index 32ff384d7c..22455e3f10 100644
--- a/system/sakura/sakura.info
+++ b/system/sakura/sakura.info
@@ -1,10 +1,10 @@
 PRGNAM="sakura"
-VERSION="3.5.0"
+VERSION="3.8.7"
 HOMEPAGE="http://www.pleyades.net/david/projects/sakura"
-DOWNLOAD="https://launchpad.net/sakura/trunk/3.5.0/+download/sakura-3.5.0.tar.bz2"
-MD5SUM="5ac5229d2c9eb65bf42062ea41fec9c9"
+DOWNLOAD="https://github.com/dabisu/sakura/archive/refs/tags/SAKURA_3_8_7/sakura-SAKURA_3_8_7.tar.gz"
+MD5SUM="442e50535e73984a6d07fdb01601c571"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="vte3"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+REQUIRES=""
+MAINTAINER="Andrew Payne"
+EMAIL="phalange@komputermatrix.com"
diff --git a/system/sakura/slack-desc b/system/sakura/slack-desc
index 17dabcefbd..e14e2823db 100644
--- a/system/sakura/slack-desc
+++ b/system/sakura/slack-desc
@@ -8,12 +8,12 @@
       |-----handy-ruler------------------------------------------------------|
 sakura: sakura (a terminal emulator)
 sakura:
-sakura: Sakura is a terminal emulator based on GTK and libvte. It has few
-sakura: dependencies, so there's no need of a full GNOME desktop installed to
-sakura: have a powerful terminal emulator. Sakura uses a GTK notebook to
-sakura: provide tabbed terminals in one window and has a contextual menu for
-sakura: configuration; it was designed without a menubar. No more or less.
+sakura: Sakura is a simple gtk and vte based terminal emulator.
+sakura:
+sakura:
+sakura:
 sakura:
 sakura:
 sakura:
 sakura: http://www.pleyades.net/david/projects/sakura
+sakura:
diff --git a/system/saleae-logic/README b/system/saleae-logic/README
index e681467141..cffe359343 100644
--- a/system/saleae-logic/README
+++ b/system/saleae-logic/README
@@ -1,8 +1,9 @@
 The Saleae Logic Analyzer is a powerful tool capable of capturing
-multiple signals from a digital circuit and displaying that information
-in the form of timing diagrams.
+multiple signals from a digital circuit and displaying that
+information in the form of timing diagrams.
 
-Saleae's Logic software can help you decode a variety of digital protocols,
-including UART, SPI, I2C, 1-Wire, I2S, CAN, USB, and many more.
+Saleae's Logic software can help you decode a variety of digital
+protocols, including UART, SPI, I2C, 1-Wire, I2S, CAN, USB, and many
+more.
 
 These features can make debugging your embedded designs much simpler.
diff --git a/system/saleae-logic/saleae-logic.SlackBuild b/system/saleae-logic/saleae-logic.SlackBuild
index 28af6cb3a4..f60420688e 100644
--- a/system/saleae-logic/saleae-logic.SlackBuild
+++ b/system/saleae-logic/saleae-logic.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for saleae logic analyzer
 
@@ -22,15 +22,25 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=saleae-logic
 VERSION=${VERSION:-1.2.18}
 SRCNAME="Logic 1.2.18 (64-bit)"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=x86_64
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -116,4 +126,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/salt/README b/system/salt/README
deleted file mode 100644
index de96dc0bf1..0000000000
--- a/system/salt/README
+++ /dev/null
@@ -1,50 +0,0 @@
-SaltStack or Salt is a Python-based open source configuration
-management and remote execution engine.
-
-This SlackBuild packages both the master and the minion.
-
-Note: at this time, the pkg and service modules are not available
-(unimplemented) in minions running Slackware.
-
-Optional dependencies include:
-  python-ldap
-  GitPython
-  Mako
-  libvirt
-  pyOpenSSL
-  CherryPy
-  pymongo
-  python-keyring
-  MySQL-python
-  redis-py
-  python-gnupg
-
-You must configure your master and your minions correctly before using
-salt. For configuration details, please see:
-
-  https://docs.saltstack.com/en/latest/ref/configuration/index.html
-
-To start the salt daemons automatically on your systems, you can add the
-following lines to /etc/rc.d/rc.local, and then on each system enable
-only the daemons you actually want, by making the rc scripts executable.
-
-  if [ -x /etc/rc.d/rc.salt-master ]; then
-    /etc/rc.d/rc.salt-master start
-  fi
-  if [ -x /etc/rc.d/rc.salt-minion ]; then
-    /etc/rc.d/rc.salt-minion start
-  fi
-  if [ -x /etc/rc.d/rc.salt-syndic ]; then
-    /etc/rc.d/rc.salt-syndic start
-  fi
-
-On a master, you should enable the salt-master daemon:
-
-  chmod +x /etc/rc.d/rc.salt-master
-
-On a minion, you should enable the salt-minion daemon:
-
-  chmod +x /etc/rc.d/rc.salt-minion
-
-You probably won't want to enable the salt-syndic daemon unless you have
-configured a complex topology.
diff --git a/system/salt/doinst.sh b/system/salt/doinst.sh
deleted file mode 100644
index 7af961a5ca..0000000000
--- a/system/salt/doinst.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-preserve_perms etc/rc.d/rc.salt-master.new
-preserve_perms etc/rc.d/rc.salt-minion.new
-preserve_perms etc/rc.d/rc.salt-syndic.new
diff --git a/system/salt/rc.salt-master.new b/system/salt/rc.salt-master.new
deleted file mode 100644
index d4c851f5a5..0000000000
--- a/system/salt/rc.salt-master.new
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-# Start/stop/restart salt master
-
-PIDFILE=/var/run/salt-master.pid
-LOGFILE=/var/log/salt/master
-# LOGLEVEL: One of: all, garbage, trace, debug, info, warning, error, quiet
-LOGLEVEL=warning
-
-# Start salt-master:
-salt_master_start() {
-  if [ -x /usr/bin/salt-master ]; then
-    echo "Starting salt-master daemon:  /usr/bin/salt-master"
-    /usr/bin/salt-master -d \
-      --pid-file=$PIDFILE \
-      --log-file=$LOGFILE \
-      --log-file-level=$LOGLEVEL
-  fi
-}
-
-# Stop salt-master:
-salt_master_stop() {
-  if [ -s $PIDFILE ] ; then
-    kill $(cat $PIDFILE)
-  else
-    killall salt-master
-  fi
-  rm -f $PIDFILE
-}
-
-# Restart salt-master:
-salt_master_restart() {
-  salt_master_stop
-  sleep 1
-  salt_master_start
-}
-
-case "$1" in
-'start')
-  salt_master_start
-  ;;
-'stop')
-  salt_master_stop
-  ;;
-'restart')
-  salt_master_restart
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-esac
diff --git a/system/salt/rc.salt-minion.new b/system/salt/rc.salt-minion.new
deleted file mode 100644
index f699a12f25..0000000000
--- a/system/salt/rc.salt-minion.new
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-# Start/stop/restart salt minion
-
-PIDFILE=/var/run/salt-minion.pid
-LOGFILE=/var/log/salt/minion
-# LOGLEVEL: One of: all, garbage, trace, debug, info, warning, error, quiet
-LOGLEVEL=warning
-
-# Start salt-minion:
-salt_minion_start() {
-  if [ -x /usr/bin/salt-minion ]; then
-    echo "Starting salt-minion daemon:  /usr/bin/salt-minion"
-    /usr/bin/salt-minion -d \
-      --pid-file=$PIDFILE \
-      --log-file=$LOGFILE \
-      --log-file-level=$LOGLEVEL
-  fi
-}
-
-# Stop salt-minion:
-salt_minion_stop() {
-  if [ -s $PIDFILE ] ; then
-    kill $(cat $PIDFILE)
-  else
-    killall salt-minion
-  fi
-  rm -f $PIDFILE
-}
-
-# Restart salt-minion:
-salt_minion_restart() {
-  salt_minion_stop
-  sleep 1
-  salt_minion_start
-}
-
-case "$1" in
-'start')
-  salt_minion_start
-  ;;
-'stop')
-  salt_minion_stop
-  ;;
-'restart')
-  salt_minion_restart
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-esac
diff --git a/system/salt/rc.salt-syndic.new b/system/salt/rc.salt-syndic.new
deleted file mode 100644
index c8986e21a2..0000000000
--- a/system/salt/rc.salt-syndic.new
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-# Start/stop/restart salt syndic
-
-PIDFILE=/var/run/salt-syndic.pid
-LOGFILE=/var/log/salt/syndic
-# LOGLEVEL: One of: all, garbage, trace, debug, info, warning, error, quiet
-LOGLEVEL=warning
-
-# Start salt-syndic:
-salt_syndic_start() {
-  if [ -x /usr/bin/salt-syndic ]; then
-    echo "Starting salt-syndic daemon:  /usr/bin/salt-syndic"
-    /usr/bin/salt-syndic -d \
-      --pid-file=$PIDFILE \
-      --log-file=$LOGFILE \
-      --log-file-level=$LOGLEVEL
-  fi
-}
-
-# Stop salt-syndic:
-salt_syndic_stop() {
-  if [ -s $PIDFILE ] ; then
-    kill $(cat $PIDFILE)
-  else
-    killall salt-syndic
-  fi
-  rm -f $PIDFILE
-}
-
-# Restart salt-syndic:
-salt_syndic_restart() {
-  salt_syndic_stop
-  sleep 1
-  salt_syndic_start
-}
-
-case "$1" in
-'start')
-  salt_syndic_start
-  ;;
-'stop')
-  salt_syndic_stop
-  ;;
-'restart')
-  salt_syndic_restart
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-esac
diff --git a/system/salt/salt.SlackBuild b/system/salt/salt.SlackBuild
deleted file mode 100644
index d4f286b88b..0000000000
--- a/system/salt/salt.SlackBuild
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for salt aka saltstack
-
-# Copyright 2016 David Spencer, Baildon, West Yorkshire, U.K.
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=salt
-VERSION=${VERSION:-2018.3.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/etc/$PRGNAM
-cp -a conf/* $PKG/etc/$PRGNAM
-
-mkdir -p $PKG/etc/rc.d
-cp $CWD/rc.* $PKG/etc/rc.d
-
-mv $PKG/usr/share/man $PKG/usr/man
-rmdir --ignore-fail-on-non-empty $PKG/usr/share
-cp -a doc/man/salt.1 $PKG/usr/man/man1/
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS HACKING.rst LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-
-for i in $( find etc/$PRGNAM -type f ) ; do
-  mv $i $i.new
-  echo "config $i.new" >> $PKG/install/doinst.sh
-done
-
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/salt/salt.info b/system/salt/salt.info
deleted file mode 100644
index 16ed078146..0000000000
--- a/system/salt/salt.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="salt"
-VERSION="2018.3.3"
-HOMEPAGE="https://saltstack.com/community/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/s/salt/salt-2018.3.3.tar.gz"
-MD5SUM="13ba421e4bea1f33617b30b1116a9d32"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="msgpack-python PyYAML Jinja2 MarkupSafe python-requests singledispatch tornado futures zeromq pyzmq pycrypto"
-MAINTAINER="David Spencer"
-EMAIL="baildon.research@googlemail.com"
diff --git a/system/salt/slack-desc b/system/salt/slack-desc
deleted file mode 100644
index 0698d964a9..0000000000
--- a/system/salt/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-    |-----handy-ruler------------------------------------------------------|
-salt: salt (configuration management engine)
-salt:
-salt: SaltStack or Salt is a Python-based open source configuration
-salt: management and remote execution engine.
-salt:
-salt: Note: at this time, the pkg and service modules are not available
-salt:       (unimplemented) in minions running Slackware.
-salt:
-salt: Homepage: https://saltstack.com/community/
-salt:
-salt:
diff --git a/system/samhain/README b/system/samhain/README
index 5a6ec41f88..02a3e34454 100644
--- a/system/samhain/README
+++ b/system/samhain/README
@@ -3,8 +3,9 @@ provides file integrity checking and logfile monitoring/analysis, as
 well as rootkit detection, port monitoring, detection of rogue SUID
 executables, and hidden processes.
 
-It has been designed to monitor multiple hosts with potentially different
-operating systems, providing centralized logging and maintenance,
-although it can also be used as standalone application on a single host.
+It has been designed to monitor multiple hosts with potentially
+different operating systems, providing centralized logging and
+maintenance, although it can also be used as standalone application on
+a single host.
 
 See README.SLACKWARE for setup and configuration information.
diff --git a/system/samhain/samhain.SlackBuild b/system/samhain/samhain.SlackBuild
index c87a5b3e7c..6e1481b687 100644
--- a/system/samhain/samhain.SlackBuild
+++ b/system/samhain/samhain.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for samhain
 
@@ -22,26 +22,36 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org: updated to latest version
+# because the old version wouldn't build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=samhain
-VERSION=${VERSION:-4.2.4}
+VERSION=${VERSION:-4.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -87,7 +97,7 @@ make install DESTDIR=$PKG
 mv $PKG/etc/samhainrc $PKG/etc/samhainrc.new
 
 # No need for /var/log and /var/run directories here
-rmdir $PKG/var/log $PKG/var/run
+rm -rf $PKG/var/log $PKG/var/run
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
@@ -104,4 +114,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/samhain/samhain.info b/system/samhain/samhain.info
index 230fc87f9a..cc157e95cb 100644
--- a/system/samhain/samhain.info
+++ b/system/samhain/samhain.info
@@ -1,8 +1,8 @@
 PRGNAM="samhain"
-VERSION="4.2.4"
+VERSION="4.4.6"
 HOMEPAGE="http://www.la-samhna.de/"
-DOWNLOAD="http://www.la-samhna.de/archive/samhain_signed-4.2.4.tar.gz"
-MD5SUM="08863fad583acc7293ef29b4528c837e"
+DOWNLOAD="http://www.la-samhna.de/archive/samhain_signed-4.4.6.tar.gz"
+MD5SUM="d04db91f2d169c39e7649a17615083e1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/samsung-mfp-drivers/samsung-mfp-drivers.SlackBuild b/system/samsung-mfp-drivers/samsung-mfp-drivers.SlackBuild
index 7aba46f955..5ba42e6008 100644
--- a/system/samsung-mfp-drivers/samsung-mfp-drivers.SlackBuild
+++ b/system/samsung-mfp-drivers/samsung-mfp-drivers.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for samsung-mfp-drivers
 
-# Copyright 2014  Robby Workman, Northport, Alabama, USA
+# Copyright 2014,2021  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,38 +22,46 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=samsung-mfp-drivers
 VERSION=${VERSION:-1.00.39}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# uld_V1.00.39_01.17.tar.gz
 
 TARNAM="uld_V${VERSION}_01.17"
 SRCNAM="uld"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i386 ;;
-    arm*) ARCH=arm ;;
+    i?86) ARCH=i586 ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+if [[ $ARCH = i?86 ]]; then
+  SRCARCH=i386
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+  SRCARCH="x86_64"
 else
-  SLKCFLAGS="-O2"
+  SRCARCH=i386
   LIBDIRSUFFIX=""
 fi
 
@@ -73,12 +81,14 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/bin
-cp -a $ARCH/smfpnetdiscovery $ARCH/usbresetter $PKG/usr/bin
+cp -a $SRCARCH/smfpnetdiscovery $SRCARCH/usbresetter $PKG/usr/bin
 
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/sane $PKG/usr/lib${LIBDIRSUFFIX}/cups/filter/
-cp -a $ARCH/libscmssc.so $PKG/usr/lib${LIBDIRSUFFIX}
-cp -a $ARCH/libsane-smfp.so* $PKG/usr/lib${LIBDIRSUFFIX}/sane
-cp -a $ARCH/rastertospl $ARCH/pstosecps $PKG/usr/lib${LIBDIRSUFFIX}/cups/filter/
+cp -a $SRCARCH/libscmssc.so $PKG/usr/lib${LIBDIRSUFFIX}
+cp -a $SRCARCH/libsane-smfp.so* $PKG/usr/lib${LIBDIRSUFFIX}/sane
+cp -a \
+  $SRCARCH/rastertospl $SRCARCH/pstosecps \
+  $PKG/usr/lib${LIBDIRSUFFIX}/cups/filter/
 
 mkdir -p $PKG/usr/share
 cp -a noarch/share/locale $PKG/usr/share
@@ -108,7 +118,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a noarch/license/* $PKG/usr/doc/$PRGNAM-$VERSION
+install -m 0644 noarch/license/* -t $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/README.pdfprinterrors > $PKG/usr/doc/$PRGNAM-$VERSION/README.pdfprinterrors
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -117,4 +127,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/samsung-mfp-drivers/samsung-mfp-drivers.info b/system/samsung-mfp-drivers/samsung-mfp-drivers.info
index 8cf67a618f..8595a05cdf 100644
--- a/system/samsung-mfp-drivers/samsung-mfp-drivers.info
+++ b/system/samsung-mfp-drivers/samsung-mfp-drivers.info
@@ -1,10 +1,10 @@
 PRGNAM="samsung-mfp-drivers"
 VERSION="1.00.39"
-HOMEPAGE="https://www.samsung.com/us/support/"
+HOMEPAGE="http://www.samsungdrivers.net/samsung-ml-2955nd-driver/"
 DOWNLOAD="https://ftp.hp.com/pub/softlib/software13/printers/SS/SL-C4010ND/uld_V1.00.39_01.17.tar.gz"
 MD5SUM="1c5a88bc07785b17e8ecc899149327ee"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Robby Workman"
-EMAIL="rworkman@slackbuilds.org"
+MAINTAINER="Philip van der Hoeven"
+EMAIL="philip@vd-hoeven.nl"
diff --git a/system/sandbox/sandbox.SlackBuild b/system/sandbox/sandbox.SlackBuild
index e1c592ca8f..9c5cc396e5 100644
--- a/system/sandbox/sandbox.SlackBuild
+++ b/system/sandbox/sandbox.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sandbox
 
-# Copyright 2018-2020 Hunter Sezen California, USA
+# Copyright 2018-2021 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sandbox
-VERSION=${VERSION:-2.20}
+VERSION=${VERSION:-2.23}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -97,4 +107,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sandbox/sandbox.info b/system/sandbox/sandbox.info
index 7ea79a2f57..0b459185c2 100644
--- a/system/sandbox/sandbox.info
+++ b/system/sandbox/sandbox.info
@@ -1,8 +1,8 @@
 PRGNAM="sandbox"
-VERSION="2.20"
+VERSION="2.23"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
-DOWNLOAD="https://gitweb.gentoo.org/proj/sandbox.git/snapshot/sandbox-2.20.tar.bz2"
-MD5SUM="9f0fc6baae17190fdd78cda967936e80"
+DOWNLOAD="https://gitweb.gentoo.org/proj/sandbox.git/snapshot/sandbox-2.23.tar.bz2"
+MD5SUM="e7db0100a885b52129bb98871ab6ccf0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/sandy/README b/system/sandy/README
index 8146b5e8ed..f74a2a4bd3 100644
--- a/system/sandy/README
+++ b/system/sandy/README
@@ -15,14 +15,14 @@ Features / Non-features
 - Very simple commands read from a named pipe
 - Very basic, regex-based syntax colouring
 - Xterm-like mouse support
-- X11 integration is achieved through external tools such as xsel and dmenu
+- X11 integration via external tools such as xsel and dmenu
 - Lacks many text processing facilities that can be easily achieved by
   piping text through an external command
 
-If you want to customize the compile-time config, place your config.h in
-the same directory as the SlackBuild script. To get the default config.h,
-extract it from the source tarball (it's called config.def.h there,
-just rename it).
+If you want to customize the compile-time config, place your config.h
+in the same directory as the SlackBuild script. To get the default
+config.h, extract it from the source tarball (it's called config.def.h
+there, just rename it).
 
 Optional dependencies: If xsel and/or dmenu are installed, sandy uses
 them at runtime for X11 integration.
diff --git a/system/sandy/sandy.SlackBuild b/system/sandy/sandy.SlackBuild
index aa6a35c3b7..3350742aa7 100644
--- a/system/sandy/sandy.SlackBuild
+++ b/system/sandy/sandy.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sandy
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
@@ -16,10 +16,13 @@
 # - update for latest git (20140727, 3 days newer than last update!)
 # - *really* fix homepage in .info file
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sandy
 VERSION=${VERSION:-0.4_20140727}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -29,7 +32,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -57,11 +64,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # just in case...
 sed -i "s,\<lib\>,lib$LIBDIRSUFFIX,g" config.mk
@@ -83,4 +87,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sandy/sandy.info b/system/sandy/sandy.info
index 629649b220..e82946cba3 100644
--- a/system/sandy/sandy.info
+++ b/system/sandy/sandy.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dmenu xsel"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/sane-airscan/README b/system/sane-airscan/README
new file mode 100644
index 0000000000..6053c805cb
--- /dev/null
+++ b/system/sane-airscan/README
@@ -0,0 +1,26 @@
+sane-airscan -- SANE backend for AirScan (eSCL) and WSD document
+scanners.
+
+Similar to how most modern network printers support "driverless"
+printing,
+using the universal vendor-neutral printing protocol, many modern
+network scanners and MFPs support "driverless" scanning.
+
+Driverless scanning comes in two flavors:
+
+- Apple AirScan or AirPrint scanning (official protocol name is eSCL)
+- Microsoft WSD, or WS-Scan (term WSD means "Web Services for Devices)
+
+This backend implements both protocols, choosing automatically between
+them.
+It was successfully tested with many devices from Brother, Canon, Dell,
+Kyocera, Lexmark, Epson, HP, OKI, Panasonic, Pantum, Ricoh, Samsung
+and Xerox both in WSD and eSCL modes.
+
+For eSCL devices, Apple maintains a comprehensive list of compatible
+devices, but please note, this list contains not only scanners and MFP,
+but pure printers as well.
+
+This backend doesn't require to install and doesn't conflict with
+vendor-provided proprietary software like ScanGear from Canon, HPLIP
+from HP and so on.
diff --git a/system/sane-airscan/doinst.sh b/system/sane-airscan/doinst.sh
new file mode 100644
index 0000000000..1b543f2577
--- /dev/null
+++ b/system/sane-airscan/doinst.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+if [ -d /usr/lib64/sane ]; then
+  cd /usr/lib64/sane
+  ln -vsf libsane-airscan.so.1 libsane-airscan.so
+else
+  cd /usr/lib/sane
+  ln -vsf libsane-airscan.so.1 libsane-airscan.so
+fi
diff --git a/system/sane-airscan/sane-airscan.SlackBuild b/system/sane-airscan/sane-airscan.SlackBuild
new file mode 100644
index 0000000000..201aa7074e
--- /dev/null
+++ b/system/sane-airscan/sane-airscan.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+# Copyright 2022 marav, Paris, FR
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=sane-airscan
+VERSION=${VERSION:-0.99.29}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i586 ;;
+    arm*) export ARCH=arm ;;
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
+set -e
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+
+make
+make install DESTDIR=$PKG
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mv $PKG/usr/share/man $PKG/usr/
+rm -rf $PKG/usr/share
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+rm -f /usr/lib${LIBDIRSUFFIX}/libsane.la
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING FUZZER.md LICENSE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sane-airscan/sane-airscan.info b/system/sane-airscan/sane-airscan.info
new file mode 100644
index 0000000000..ee1af8fe63
--- /dev/null
+++ b/system/sane-airscan/sane-airscan.info
@@ -0,0 +1,10 @@
+PRGNAM="sane-airscan"
+VERSION="0.99.29"
+HOMEPAGE="https://github.com/alexpevzner/sane-airscan/"
+DOWNLOAD="https://github.com/alexpevzner/sane-airscan/archive/refs/tags/0.99.29/sane-airscan-0.99.29.tar.gz"
+MD5SUM="334dd401ea75556ecec6d982087d58d6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="avahi"
+MAINTAINER="marav"
+EMAIL="marav8@free.fr"
diff --git a/system/sane-airscan/slack-desc b/system/sane-airscan/slack-desc
new file mode 100644
index 0000000000..745e795244
--- /dev/null
+++ b/system/sane-airscan/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
+# leave one space after the ':'.
+
+            |-----handy-ruler------------------------------------------------------|
+sane-airscan: sane-airscan (Scanner Access Now Easy)
+sane-airscan:
+sane-airscan: Scanner Access Now Easy - universal driver for
+sane-airscan: eSCL (Apple AirScan) and WSD
+sane-airscan:
+sane-airscan:
+sane-airscan:
+sane-airscan: Homepage: https://github.com/alexpevzner/sane-airscan
+sane-airscan:
+sane-airscan:
+sane-airscan:
diff --git a/system/sanlock/sanlock.SlackBuild b/system/sanlock/sanlock.SlackBuild
index 522d5552e6..383a810e43 100644
--- a/system/sanlock/sanlock.SlackBuild
+++ b/system/sanlock/sanlock.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sanlock
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sanlock
 VERSION=${VERSION:-3.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -128,4 +138,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sanlock/sanlock.info b/system/sanlock/sanlock.info
index 864a393d5f..a74e729279 100644
--- a/system/sanlock/sanlock.info
+++ b/system/sanlock/sanlock.info
@@ -2,7 +2,7 @@ PRGNAM="sanlock"
 VERSION="3.7.1"
 HOMEPAGE="https://pagure.io/sanlock"
 DOWNLOAD="https://pagure.io/sanlock/archive/sanlock-3.7.1/sanlock-sanlock-3.7.1.tar.gz"
-MD5SUM="d78996fcdc6965c238a7a33ba1a2d10e"
+MD5SUM="0e061a446d038fc25c57aeb60630b953"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/sanoid/README b/system/sanoid/README
new file mode 100644
index 0000000000..b620a57bfb
--- /dev/null
+++ b/system/sanoid/README
@@ -0,0 +1,48 @@
+Policy-driven snapshot management and replication tools. Using ZFS for
+underlying next-gen storage. Primarily intended for Linux, but BSD use
+is supported and reasonably frequently tested.
+
+You can use sanoid to create, automatically thin, and monitor
+snapshots and pool health from a single eminently human-readable TOML
+config file at /etc/sanoid/sanoid.conf.
+
+DEPENDENCIES
+
+SANOID depends on the Perl module Config::IniFiles and will not
+operate without it. Config::IniFiles may be installed from CPAN,
+though the project strongly recommends using your distribution's
+repositories instead.
+
+SYNCOID depends on ssh, pv, gzip, lzop, and mbuffer. It can run with
+reduced functionality in the absence of any or all of the above. SSH
+is only required for remote synchronization.
+
+CRON
+
+If you use cron there is the need to ensure that only one instance of
+sanoid is run at any time (or else there will be funny error messages
+about missing snapshots, ...). It's also good practice to separate
+the snapshot taking and pruning so the later won't block the former
+in case of long running pruning operations. Following is the
+recommend setup for a standard install:
+
+*/15 * * * * root flock -n /var/run/sanoid/cron-take.lock -c \
+  "TZ=UTC sanoid --take-snapshots"
+*/15 * * * * root flock -n /var/run/sanoid/cron-prune.lock -c \
+  "sanoid --prune-snapshots"
+
+Adapt the timer interval to the lowest configured snapshot interval.
+
+CONFIGURATION
+
+SANOID won't do anything useful unless you tell it how to handle your
+ZFS datasets in `/etc/sanoid/sanoid.conf`.
+
+Take a look at the files `sanoid.defaults.conf` and `sanoid.conf` for
+all possible configuration options.
+
+Also have a look at the README.md for a simpler suggestion for
+`sanoid.conf`.
+
+SYNCOID is a command line utility that doesn't require any
+configuration, with all of its switches set at runtime.
diff --git a/system/sanoid/doinst.sh b/system/sanoid/doinst.sh
new file mode 100644
index 0000000000..f117ed7e99
--- /dev/null
+++ b/system/sanoid/doinst.sh
@@ -0,0 +1,19 @@
+# $RCSfile: doinst.sh,v $
+# $Revision: 1.9 $
+# $Date: 2023-05-11 07:58:15+01 $
+# DW
+
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/sanoid/sanoid.conf.new
diff --git a/system/sanoid/sanoid.SlackBuild b/system/sanoid/sanoid.SlackBuild
new file mode 100644
index 0000000000..ab1315aec7
--- /dev/null
+++ b/system/sanoid/sanoid.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Slackware build script for sanoid
+
+# Copyright 2023 Matt Egger USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=sanoid
+VERSION=${VERSION:-2.2.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/etc/sanoid
+cp -a sanoid.defaults.conf $PKG/etc/sanoid/sanoid.defaults.conf
+cp -a sanoid.conf $PKG/etc/sanoid/sanoid.conf.new
+mkdir -p $PKG/usr/bin
+cp -a sanoid syncoid findoid sleepymutex $PKG/usr/bin
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELIST README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/usr/share/$PRGNAM
+echo "* * * * * /usr/bin/sanoid --cron" > $PKG/usr/share/$PRGNAM/sanoid.cron
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sanoid/sanoid.info b/system/sanoid/sanoid.info
new file mode 100644
index 0000000000..d01b4b3184
--- /dev/null
+++ b/system/sanoid/sanoid.info
@@ -0,0 +1,10 @@
+PRGNAM="sanoid"
+VERSION="2.2.0"
+HOMEPAGE="https://github.com/jimsalterjrs/sanoid"
+DOWNLOAD="https://github.com/jimsalterjrs/sanoid/archive/v2.2.0/sanoid-2.2.0.tar.gz"
+MD5SUM="d525ca629960a02611a2f5dc15f6652a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="%README% openzfs perl-Config-IniFiles perl-Capture-Tiny"
+MAINTAINER="Matt Egger"
+EMAIL="bru.barwal@sdf.org"
diff --git a/system/sanoid/slack-desc b/system/sanoid/slack-desc
new file mode 100644
index 0000000000..a7da7c6f83
--- /dev/null
+++ b/system/sanoid/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+sanoid: sanoid (policy-driven snapshot management tool for ZFS filesystems)
+sanoid:
+sanoid: Policy-driven snapshot management and replication tools. Using ZFS for
+sanoid: underlying next-gen storage. Primarily intended for Linux, but BSD use
+sanoid: is supported and reasonably frequently tested.
+sanoid:
+sanoid: You can use sanoid to create, automatically thin, and monitor
+sanoid: snapshots and pool health from a single eminently human-readable TOML
+sanoid: config file at /etc/sanoid/sanoid.conf.
+sanoid:
+sanoid: https://github.com/jimsalterjrs/sanoid
diff --git a/system/sarasa-gothic/README b/system/sarasa-gothic/README
new file mode 100644
index 0000000000..af61a5e0db
--- /dev/null
+++ b/system/sarasa-gothic/README
@@ -0,0 +1,19 @@
+sarasa-gothic (CJK programming fonts)
+
+sarasa-gothic is a collection of attractive CJK programming fonts based
+on Iosevka and Source Han Sans:
+
+  Sarasa Gothic
+  Sarasa UI
+  Sarasa Term (Slab)
+  Sarasa Mono (Slab)
+  Sarasa Fixed (Slab)
+
+Fonts are included for the following character sets:
+
+  CL (classical orthography)
+  SC (Simplified Chinese)
+  TC (Traditional Chinese - Taiwan)
+  HC (Traditional Chinese - Hong Kong)
+  J  (Japanese)
+  K  (Korean)
diff --git a/system/sarasa-gothic/SARASA-LICENSE b/system/sarasa-gothic/SARASA-LICENSE
new file mode 100644
index 0000000000..30b333c393
--- /dev/null
+++ b/system/sarasa-gothic/SARASA-LICENSE
@@ -0,0 +1,113 @@
+Copyright (c) 2015-2022, Renzhi Li (aka. Belleve Invis, belleve@typeof.net).
+Portions Copyright (c) 2016-2020 The Inter Project Authors.
+Portions Copyright (c) 2014, 2015 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'.
+Portions Copyright (c) 2012 Google Inc.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+--------------------------
+
+
+SIL Open Font License v1.1
+====================================================
+
+
+Preamble
+----------
+
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+
+Definitions
+-------------
+
+`"Font Software"` refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+`"Reserved Font Name"` refers to any names specified as such after the
+copyright statement(s).
+
+`"Original Version"` refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+`"Modified Version"` refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+`"Author"` refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+
+Permission & Conditions
+------------------------
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1. Neither the Font Software nor any of its individual components,
+   in Original or Modified Versions, may be sold by itself.
+
+2. Original or Modified Versions of the Font Software may be bundled,
+   redistributed and/or sold with any software, provided that each copy
+   contains the above copyright notice and this license. These can be
+   included either as stand-alone text files, human-readable headers or
+   in the appropriate machine-readable metadata fields within text or
+   binary files as long as those fields can be easily viewed by the user.
+
+3. No Modified Version of the Font Software may use the Reserved Font
+   Name(s) unless explicit written permission is granted by the corresponding
+   Copyright Holder. This restriction only applies to the primary font name as
+   presented to the users.
+
+4. The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+   Software shall not be used to promote, endorse or advertise any
+   Modified Version, except to acknowledge the contribution(s) of the
+   Copyright Holder(s) and the Author(s) or with their explicit written
+   permission.
+
+5. The Font Software, modified or unmodified, in part or in whole,
+   must be distributed entirely under this license, and must not be
+   distributed under any other license. The requirement for fonts to
+   remain under this license does not apply to any document created
+   using the Font Software.
+
+
+
+Termination
+-----------
+
+This license becomes null and void if any of the above conditions are
+not met.
+
+
+    DISCLAIMER
+
+    THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+    OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+    COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+    DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+    OTHER DEALINGS IN THE FONT SOFTWARE.
\ No newline at end of file
diff --git a/system/sarasa-gothic/doinst.sh b/system/sarasa-gothic/doinst.sh
new file mode 100644
index 0000000000..e0811da7df
--- /dev/null
+++ b/system/sarasa-gothic/doinst.sh
@@ -0,0 +1,11 @@
+# Update the X font indices:
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/sarasa-gothic/sarasa-gothic.SlackBuild b/system/sarasa-gothic/sarasa-gothic.SlackBuild
new file mode 100644
index 0000000000..f917dd79d9
--- /dev/null
+++ b/system/sarasa-gothic/sarasa-gothic.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/bash
+#
+# Slackware build script for sarasa-gothic
+#
+# Copyright 2022-2024 K. Eugene Carlson  Tsukuba, Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=sarasa-gothic
+SRCNAM=Sarasa-TTC
+VERSION=${VERSION:-1.0.9}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+unzip $CWD/$SRCNAM-$VERSION.zip
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/share/fonts/TTF
+install -m 644 * $PKG/usr/share/fonts/TTF/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/SARASA-LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sarasa-gothic/sarasa-gothic.info b/system/sarasa-gothic/sarasa-gothic.info
new file mode 100644
index 0000000000..c6e7c40e19
--- /dev/null
+++ b/system/sarasa-gothic/sarasa-gothic.info
@@ -0,0 +1,10 @@
+PRGNAM="sarasa-gothic"
+VERSION="1.0.9"
+HOMEPAGE="https://github.com/be5invis/Sarasa-Gothic"
+DOWNLOAD="https://github.com/be5invis/Sarasa-Gothic/releases/download/v1.0.9/Sarasa-TTC-1.0.9.zip"
+MD5SUM="e10dd4b30aa48991a60026a226bac85c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/sarasa-gothic/slack-desc b/system/sarasa-gothic/slack-desc
new file mode 100644
index 0000000000..d7583e8c0a
--- /dev/null
+++ b/system/sarasa-gothic/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+sarasa-gothic: sarasa-gothic (CJK programming fonts)
+sarasa-gothic:
+sarasa-gothic: sarasa-gothic is a collection of attractive CJK programming fonts
+sarasa-gothic: based on Iosevka and Source Han Sans.
+sarasa-gothic:
+sarasa-gothic:
+sarasa-gothic:
+sarasa-gothic:
+sarasa-gothic:
+sarasa-gothic: Author: Renzhi Li (aka Belleve Invis)
+sarasa-gothic: Homepage: https://github.com/be5invis/Sarasa-Gothic
diff --git a/system/sargon/README b/system/sargon/README
index 1b3fbb636b..4b86f28c67 100644
--- a/system/sargon/README
+++ b/system/sargon/README
@@ -6,3 +6,7 @@ can be visible to containers via bind or volume mechanism, what memory
 limits to apply, etc.
 
 User privileges are kept in LDAP.
+
+Warning: This SlackBuild requires network access when it runs, meaning
+it downloads files from the Internet with root access. You should
+decide for yourself whether or not you think this is a good idea.
diff --git a/system/sargon/sargon.SlackBuild b/system/sargon/sargon.SlackBuild
index f5a648a05e..2234b47f69 100644
--- a/system/sargon/sargon.SlackBuild
+++ b/system/sargon/sargon.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sargon
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sargon
 VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -48,6 +58,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+patch -p1 -i $CWD/d6487688ab7ef2a9d47cb9f67cdedc0c498ff3d3.patch
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -61,7 +72,8 @@ if [ -x /etc/profile.d/go.sh ]; then
 fi
 
 # Build the project
-go mod init sargon
+go mod tidy
+go mod download
 go build
 
 # Create installation filesystem
@@ -90,4 +102,4 @@ cp $CWD/doinst.sh $PKG/install/doinst.sh
 cp $CWD/slack-desc $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sargon/sargon.info b/system/sargon/sargon.info
index 9532b7a0a6..adfcba10a9 100644
--- a/system/sargon/sargon.info
+++ b/system/sargon/sargon.info
@@ -1,8 +1,10 @@
 PRGNAM="sargon"
 VERSION="1.0"
 HOMEPAGE="https://github.com/graygnuorg/sargon"
-DOWNLOAD="https://github.com/graygnuorg/sargon/archive/v1.0/sargon-1.0.tar.gz"
-MD5SUM="158b725c02b4bdf377d2b08790f2a770"
+DOWNLOAD="https://github.com/graygnuorg/sargon/archive/v1.0/sargon-1.0.tar.gz \
+          https://github.com/graygnuorg/sargon/commit/d6487688ab7ef2a9d47cb9f67cdedc0c498ff3d3.patch"
+MD5SUM="158b725c02b4bdf377d2b08790f2a770 \
+        703a3e5ae6f79ccd579e74cf7151c39f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="google-go-lang"
diff --git a/system/sbbdep/README b/system/sbbdep/README
index bcd70ff5cd..18460a62a0 100644
--- a/system/sbbdep/README
+++ b/system/sbbdep/README
@@ -2,11 +2,13 @@ sbbdep (Slack Build Binary Dependencies)
 The tool for exploring binary runtime dependencies
 on Slackware and Slackware based systems.
 
-sbbdep uses sqlite3 for storing information.
-Per default, sbbdep builds with an own version of sqlite and links statically
-against it. This can be changed.
-If this is done, sbbdep will need the sqlite3 package, which comes per default
-with Slackware, and will link against the shared sqlite3.so library from the
-system.
-If you want to activate this, pass the following option to the Slackbuild.
-USE_INTERNAL_SQLITE3=0
+sbbdep uses sqlite3 for storing information. Per default, sbbdep
+builds with an own version of sqlite and links statically against
+it. This can be changed.
+
+If this is done, sbbdep will need the sqlite3 package, which comes per
+default with Slackware, and will link against the shared sqlite3.so
+library from the system.
+
+If you want to activate this, pass the following option to the
+Slackbuild: USE_INTERNAL_SQLITE3=0
diff --git a/system/sbbdep/gcc11.patch b/system/sbbdep/gcc11.patch
new file mode 100644
index 0000000000..0211711e83
--- /dev/null
+++ b/system/sbbdep/gcc11.patch
@@ -0,0 +1,11 @@
+--- libsl3/src/sl3/value.cpp	2017-08-05 14:01:24.000000000 -0400
++++ libsl3/src/sl3/value.cpp.new	2022-01-19 21:38:19.648276809 -0500
+@@ -10,6 +10,8 @@
+ #include <sl3/value.hpp>
+ 
+ #include <algorithm>
++#include <stdexcept>
++#include <limits>
+ #include <climits>
+ #include <cmath>
+ #include <iomanip>
diff --git a/system/sbbdep/sbbdep.SlackBuild b/system/sbbdep/sbbdep.SlackBuild
index 0d5a5f5489..8ccbf189bb 100644
--- a/system/sbbdep/sbbdep.SlackBuild
+++ b/system/sbbdep/sbbdep.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sbbdep
 
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sbbdep
 VERSION=${VERSION:-0.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 # option to use USE_INTERNAL_SQLITE3
 # 0 or OFF use system sqlite3
@@ -42,7 +45,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -76,6 +86,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Fix issue with gcc 11+
+patch -p0 < $CWD/gcc11.patch
 
 mkdir -p build
 cd build
@@ -99,4 +111,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sbo-create/README b/system/sbo-create/README
new file mode 100644
index 0000000000..2751ec3d80
--- /dev/null
+++ b/system/sbo-create/README
@@ -0,0 +1,16 @@
+sbo-create it's a tool that creates easy, fast and safe SlackBuilds
+file scripts.
+
+Features
+
+- Preloaded SlackBuilds templates.
+- Checking for already SlackBuilds in the repository and the 
+  distribution.
+- Autocorrect the quote marks for the .info file.
+- Auto-importing the SlackBuild script name.
+- Auto-importing the text from the slack-desc file into the README.
+- Auto-importing the maintainer data to the .SlackBuild script.
+- Auto-importing the version to the .SlackBuild script.
+- Auto-importing and checking the checksum signature to the .info
+  file.
+- Auto-create all the necessary files for your SlackBuild package.
diff --git a/system/sbo-create/sbo-create.SlackBuild b/system/sbo-create/sbo-create.SlackBuild
new file mode 100644
index 0000000000..792431bb35
--- /dev/null
+++ b/system/sbo-create/sbo-create.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/bash
+
+# Slackware build script for sbo-create
+
+# Copyright 2022-2024 Dimitris Zlatanidis Orestiada, Greece
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=sbo-create
+VERSION=${VERSION:-2.0.8}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 -m build --wheel --no-isolation
+python3 -m installer --destdir "$PKG" dist/*.whl
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sbo-create/sbo-create.info b/system/sbo-create/sbo-create.info
new file mode 100644
index 0000000000..5e578081f4
--- /dev/null
+++ b/system/sbo-create/sbo-create.info
@@ -0,0 +1,10 @@
+PRGNAM="sbo-create"
+VERSION="2.0.8"
+HOMEPAGE="https://dslackw.gitlab.io/sbo-create"
+DOWNLOAD="https://gitlab.com/dslackw/sbo-create/-/archive/2.0.8/sbo-create-2.0.8.tar.gz"
+MD5SUM="4c1850264794c14880e9ccd2133de224"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="python3-build python3-pythondialog"
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="dslackw@gmail.com"
diff --git a/system/sbo-create/slack-desc b/system/sbo-create/slack-desc
new file mode 100644
index 0000000000..30f5ba7092
--- /dev/null
+++ b/system/sbo-create/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+sbo-create: sbo-create (Tool that creates SlackBuilds)
+sbo-create:
+sbo-create: sbo-create it's a tool that creates easy, fast and safe SlackBuilds
+sbo-create: file scripts.
+sbo-create:
+sbo-create: Homepage: https://dslackw.gitlab.io/sbo-create
+sbo-create:
+sbo-create:
+sbo-create:
+sbo-create:
+sbo-create:
diff --git a/system/sbo-maintainer-tools/README b/system/sbo-maintainer-tools/README
new file mode 100644
index 0000000000..a8e6655a5b
--- /dev/null
+++ b/system/sbo-maintainer-tools/README
@@ -0,0 +1,10 @@
+sbo-maintainer-tools (sbolint and sbopkglint for SBo maintainers)
+
+These are "lint" tools to make life easier for SlackBuilds.org
+maintainers and admins:
+
+sbolint: checks your SlackBuild, README, .info file, and slack-desc.
+sbopkglint: checks your package, after it's built.
+sbofixinfo: attempts to fix common problems with SBo .info files.
+pre-commit-sbolint: git hook you should use, that automatically calls
+sbolint and stops you from committing bad code.
diff --git a/system/sbo-maintainer-tools/sbo-maintainer-tools.SlackBuild b/system/sbo-maintainer-tools/sbo-maintainer-tools.SlackBuild
new file mode 100644
index 0000000000..91670ac96e
--- /dev/null
+++ b/system/sbo-maintainer-tools/sbo-maintainer-tools.SlackBuild
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+# Slackware build script for sbo-maintainer-tools
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20230701 bkw: update for v0.9.0.
+# 20230609 bkw: update for v0.8.2.
+# 20230526 bkw: update for v0.8.1.
+# 20230519 bkw: update for v0.8.0.
+# 20230328 bkw: update for v0.7.0.
+# 20230304 bkw: update for v0.6.3.
+# 20230221 bkw: update for v0.6.2.
+# 20230214 bkw: update for v0.6.1.
+# 20230204 bkw: update for v0.6.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=sbo-maintainer-tools
+VERSION=${VERSION:-0.9.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+make install PREFIX=/usr DESTDIR=$PKG
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sbo-maintainer-tools/sbo-maintainer-tools.info b/system/sbo-maintainer-tools/sbo-maintainer-tools.info
new file mode 100644
index 0000000000..03839ad120
--- /dev/null
+++ b/system/sbo-maintainer-tools/sbo-maintainer-tools.info
@@ -0,0 +1,10 @@
+PRGNAM="sbo-maintainer-tools"
+VERSION="0.9.0"
+HOMEPAGE="https://slackware.uk/~urchlay/repos/sbo-maintainer-tools"
+DOWNLOAD="https://slackware.uk/~urchlay/src/sbo-maintainer-tools-0.9.0.tar.gz"
+MD5SUM="d3aaf7c555b761996a4325602660c1f3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/sbo-maintainer-tools/slack-desc b/system/sbo-maintainer-tools/slack-desc
new file mode 100644
index 0000000000..82d1f178a3
--- /dev/null
+++ b/system/sbo-maintainer-tools/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+sbo-maintainer-tools: sbo-maintainer-tools (sbolint and sbopkglint for SBo maintainers)
+sbo-maintainer-tools:
+sbo-maintainer-tools: These are "lint" tools to make life easier for SlackBuilds.org
+sbo-maintainer-tools: maintainers and admins:
+sbo-maintainer-tools:
+sbo-maintainer-tools: sbolint: checks your SlackBuild, README, .info file, and slack-desc.
+sbo-maintainer-tools: sbopkglint: checks your package, after it's built.
+sbo-maintainer-tools: sbofixinfo: attempts to fix common problems with SBo .info files.
+sbo-maintainer-tools: pre-commit-sbolint: git hook you should use, that automatically calls
+sbo-maintainer-tools: sbolint and stops you from committing bad code.
+sbo-maintainer-tools:
diff --git a/system/sbotools/README b/system/sbotools/README
index 4440eedd30..35a9657997 100644
--- a/system/sbotools/README
+++ b/system/sbotools/README
@@ -5,12 +5,14 @@ interface to slackbuilds.org. Its features include requirement handling
 and the ability to handle 32-bit and compat32 builds on multilib
 x86_64 systems.
 
-There are man pages for each of the sbo* commands, and more documentation,
-as well as online versions of the man pages, can be found at
+There are man pages for each of the sbo* commands, and more
+documentation, as well as online versions of the man pages, can be
+found at:
 http://pink-mist.github.io/sbotools/documentation/
 
-sbotools bundles the required Perl module Sort::Versions with it. This does
-not interfere with a copy installed from the CPAN, or from slackbuilds.org.
+sbotools bundles the required Perl module Sort::Versions with it. This
+does not interfere with a copy installed from the CPAN, or from
+slackbuilds.org.
 
 sbotools is written and maintained by d4wnr4z0r, xocel, and pink_mist;
 we can be contacted in #sbotools on freenode.
diff --git a/system/sbotools/sbotools.SlackBuild b/system/sbotools/sbotools.SlackBuild
index e09fd42338..35c7599d2f 100644
--- a/system/sbotools/sbotools.SlackBuild
+++ b/system/sbotools/sbotools.SlackBuild
@@ -1,17 +1,29 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for <sbotools>
 # Written by Jacob Pipkin <j@dawnrazor.net>
 # Licensed under the WTFPL <http://sam.zoy.org/wtfpl/COPYING>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sbotools
 VERSION=${VERSION:-2.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=$PRGNAM
 
-CWD=$(pwd)
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -73,4 +85,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-noarch-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sboui/README b/system/sboui/README
index bd84518b26..b963914a3b 100644
--- a/system/sboui/README
+++ b/system/sboui/README
@@ -1,33 +1,32 @@
-sboui is a package management tool for SlackBuilds.org (SBo). It features an
-ncurses user interface that combines the user-friendliness typically found in a
-GUI with the efficiency, light weight, and portability of a text interface. It
-can function as a stand-alone package manager or serve as a front-end to sbopkg,
-sbotools, or custom package managers. Its main features include forward and
-inverse dependency resolution, blacklisting, storing build options for scripts,
-a menu bar, full mouse and keyboard support, and more.
+sboui is a package management tool for SlackBuilds.org (SBo). It
+features an ncurses user interface that combines the user-friendliness
+typically found in a GUI with the efficiency, light weight, and
+portability of a text interface. It can function as a stand-alone
+package manager or serve as a front-end to sbopkg, sbotools,
+or custom package managers. Its main features include forward and
+inverse dependency resolution, blacklisting, storing build options for
+scripts, a menu bar, full mouse and keyboard support, and more.
 
 Optional dependencies (see build options for more information):
 
-python-requests (for system tray notifier)
 psutil (for system tray notifier)
 gksu, ktsuss (instead of kdesu to launch from the desktop)
-ninja (to build with ninja instead of make)
 
 Build options:
 
-INSTALL_SYSTRAY_NOTIFIER=yes|no (default no): install a cronjob to sync the
-  local repository hourly and display a system tray notification when SBo
-  package updates are available. To use the system tray notifier, add
-  sboui-update-notifier as a startup application for your desktop environment or
-  window manager. If this is enabled, python-requests and psutil become
-  dependencies.
+INSTALL_SYSTRAY_NOTIFIER=yes|no (default no): install a cronjob to sync
+  the local repository hourly and display a system tray notification
+  when SBo package updates are available. To use the system tray
+  notifier, add sboui-update-notifier as a startup application for
+  your desktop environment or window manager. If this is enabled,
+  psutil becomes a dependency.
 
-GRAPHICAL_SU=kdesu|gksu|ktsuss (default kdesu): change the graphical su command
-  for launching sboui from the .desktop file and system tray notifier. gksu or
-  ktsuss becomes a dependency if selected here.
+GRAPHICAL_SU=kdesu|gksu|ktsuss (default kdesu): change the graphical su
+  command for launching sboui from the .desktop file and system tray
+  notifier. gksu or ktsuss becomes a dependency if selected here.
 
-TERMINAL_EMULATOR=(user choice; default xterm) set the terminal emulator to run
-  sboui via the .desktop file and system tray notifier.
+TERMINAL_EMULATOR=(user choice; default xterm) set the terminal emulator
+  to run sboui via the .desktop file and system tray notifier.
 
-USE_NINJA=yes|no (default no): use ninja instead of GNU Make for the build. If
-  enabled, ninja becomes a dependency.
+USE_NINJA=yes|no (default yes): use ninja instead of GNU Make for the
+  build.
diff --git a/system/sboui/doinst.sh b/system/sboui/doinst.sh
index 68000a3b0b..d7769247a7 100644
--- a/system/sboui/doinst.sh
+++ b/system/sboui/doinst.sh
@@ -10,9 +10,20 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
+config_blacklist() {
+  # package_blacklist changed names to just blacklist in version 2.2, so make a copy
+  # of package_blacklist -> blacklist for the user to compare with blacklist.new.
+  NEW="etc/sboui/blacklist"
+  OLD="etc/sboui/package_blacklist"
+  if [[ ! -r $NEW && -r $OLD ]]; then
+    cp $OLD $NEW
+  fi
+}
+
 config etc/sboui/sboui.conf.new
 config etc/sboui/sboui-backend.conf.new
-config etc/sboui/package_blacklist.new
+config_blacklist
+config etc/sboui/blacklist.new
 
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
diff --git a/system/sboui/sboui.SlackBuild b/system/sboui/sboui.SlackBuild
index 28076d324b..d6ac6327d7 100644
--- a/system/sboui/sboui.SlackBuild
+++ b/system/sboui/sboui.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sboui
 
-# Copyright 2019 | Daniel Prosser | Lexington Park, MD
+# Copyright 2022 | Daniel Prosser | Lexington Park, MD
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sboui
-VERSION=${VERSION:-2.1}
+VERSION=${VERSION:-2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -70,7 +80,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Build options
-USE_NINJA="${USE_NINJA:-no}"
+USE_NINJA="${USE_NINJA:-yes}"
 GRAPHICAL_SU="${GRAPHICAL_SU:-kdesu}"
 TERMINAL_EMULATOR="${TERMINAL_EMULATOR:-xterm}"
 INSTALL_SYSTRAY_NOTIFIER="${INSTALL_SYSTRAY_NOTIFIER:-no}"
@@ -110,7 +120,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mv $PKG/etc/sboui/sboui.conf $PKG/etc/sboui/sboui.conf.new
 mv $PKG/etc/sboui/sboui-backend.conf $PKG/etc/sboui/sboui-backend.conf.new
-mv $PKG/etc/sboui/package_blacklist $PKG/etc/sboui/package_blacklist.new
+mv $PKG/etc/sboui/blacklist $PKG/etc/sboui/blacklist.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog INSTALL LICENSE README.md \
@@ -122,4 +132,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sboui/sboui.info b/system/sboui/sboui.info
index c5abbd71c2..3f90cab080 100644
--- a/system/sboui/sboui.info
+++ b/system/sboui/sboui.info
@@ -1,8 +1,8 @@
 PRGNAM="sboui"
-VERSION="2.1"
+VERSION="2.3"
 HOMEPAGE="https://github.com/montagdude/sboui"
-DOWNLOAD="https://github.com/montagdude/sboui/archive/2.1/sboui-2.1.tar.gz"
-MD5SUM="c4f7c1c757efc1d7523cace75c1c1078"
+DOWNLOAD="https://github.com/montagdude/sboui/archive/2.3/sboui-2.3.tar.gz"
+MD5SUM="b00f064674b2266fec96079b99d1a281"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libconfig"
diff --git a/system/sbpkg/README b/system/sbpkg/README
new file mode 100644
index 0000000000..53f1b43bc8
--- /dev/null
+++ b/system/sbpkg/README
@@ -0,0 +1,5 @@
+Sbpkg is a command-line tool to synchronize with the SlackBuilds.org
+repository. It features resolving dependency support, install and
+uninstall scripts, and the ability to sync your local machine with
+a remote repository to automatically upgrade packages.
+
diff --git a/system/sbpkg/doinst.sh b/system/sbpkg/doinst.sh
new file mode 100644
index 0000000000..214b738953
--- /dev/null
+++ b/system/sbpkg/doinst.sh
@@ -0,0 +1,12 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    rm $NEW
+  fi
+}
+
+config etc/sbpkg/sbpkg.conf.new
+config etc/sbpkg/blacklist.new
diff --git a/system/sbpkg/sbpkg.SlackBuild b/system/sbpkg/sbpkg.SlackBuild
new file mode 100644
index 0000000000..69b783e868
--- /dev/null
+++ b/system/sbpkg/sbpkg.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/bash
+
+# Slackware build script for sbpkg
+
+# Copyright 2024 Dimitris Zlatanidis Greece, Orestiada
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=sbpkg
+VERSION=${VERSION:-1.0.8}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 setup.py install --root=$PKG
+
+mkdir -p $PKG/usr/sbin $PKG/etc/$PRGNAM $PKG/usr/man/man1
+mv $PKG/usr/bin/$PRGNAM $PKG/usr/sbin/$PRGNAM
+rm -rf $PKG/usr/bin
+install -D -m0644 config/$PRGNAM.conf $PKG/etc/$PRGNAM/$PRGNAM.conf.new
+install -D -m0644 config/blacklist $PKG/etc/$PRGNAM/blacklist.new
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+cp man/$PRGNAM.1 $PKG/usr/man/man1
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt README.md ChangeLog.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sbpkg/sbpkg.info b/system/sbpkg/sbpkg.info
new file mode 100644
index 0000000000..23f9f43c76
--- /dev/null
+++ b/system/sbpkg/sbpkg.info
@@ -0,0 +1,10 @@
+PRGNAM="sbpkg"
+VERSION="1.0.8"
+HOMEPAGE="https://gitlab.com/dslackw/sbpkg"
+DOWNLOAD="https://gitlab.com/dslackw/sbpkg/-/archive/1.0.8/sbpkg-1.0.8.tar.gz"
+MD5SUM="f83fdff3ae389575c09ea9cbec0def09"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="dslackw@gmail.com"
diff --git a/system/sbpkg/slack-desc b/system/sbpkg/slack-desc
new file mode 100644
index 0000000000..b6e4d55499
--- /dev/null
+++ b/system/sbpkg/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+sbpkg: sbpkg (full-featured SBo package manager)
+sbpkg:
+sbpkg: Sbpkg is a command-line tool to synchronize with the SlackBuilds.org
+sbpkg: repository. It features resolving dependency support, install and
+sbpkg: uninstall scripts, and the ability to sync your local machine with
+sbpkg: a remote repository to automatically upgrade packages.
+sbpkg:
+sbpkg: Homepage: https://gitlab.com/dslackw/sbpkg
+sbpkg:
+sbpkg:
+sbpkg:
diff --git a/system/sbsigntools/README b/system/sbsigntools/README
index 491bdcbb5a..54aec01b79 100644
--- a/system/sbsigntools/README
+++ b/system/sbsigntools/README
@@ -1 +1,4 @@
-sbsigntools is a set of tools for adding signatures.
+sbsigntools (signing utility for UEFI Secure Boot)
+
+sbsigntools is a set of tools for signing EFI binaries and drivers for
+use with Secure Boot.
diff --git a/system/sbsigntools/autogen.patch b/system/sbsigntools/autogen.patch
deleted file mode 100644
index e681792c49..0000000000
--- a/system/sbsigntools/autogen.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-From c8c7e1ba97d15433247bcf87e88485cf7c6b7cc3 Mon Sep 17 00:00:00 2001
-From: James Bottomley <JBottomley@Parallels.com>
-Date: Tue, 26 Jun 2012 09:49:05 +0100
-Subject: sbsigntools: fix autogen.sh for build service
-
----
- AUTHORS    |   4 ++
- ChangeLog  | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- autogen.sh |  10 ---
- 3 files changed, 228 insertions(+), 10 deletions(-)
- create mode 100644 AUTHORS
- create mode 100644 ChangeLog
-
-diff --git a/AUTHORS b/AUTHORS
-new file mode 100644
-index 0000000..3eaa355
---- /dev/null
-+++ b/AUTHORS
-@@ -0,0 +1,4 @@
-+	Adam Conrad
-+	Ivan Hu
-+	James Bottomley
-+	Jeremy Kerr
-diff --git a/ChangeLog b/ChangeLog
-new file mode 100644
-index 0000000..d5d5ea6
---- /dev/null
-+++ b/ChangeLog
-@@ -0,0 +1,224 @@
-+2012-06-20 c07dfb9 Ivan Hu <ivan.hu@canonical.com>
-+
-+  * configure: Add check for bfh.h
-+
-+2012-06-19 5e07c4e Ivan Hu <ivan.hu@canonical.com>
-+
-+  * tests: Add a test to check invalid PKCS7 signature attaching
-+
-+2012-06-19 bfb778e Ivan Hu <ivan.hu@canonical.com>
-+
-+  * sbattach: Check that attached signatures are valid PKCS7 data
-+
-+2012-06-14 bf6df84 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: Use a variable for image filename
-+
-+2012-06-13 9b7f7fb Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * image: Unconditionally parse PE/COFF data
-+
-+2012-06-13 128f1c1 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: Check for failed image load
-+
-+2012-06-13 b48e256 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * tests: Add tests for missing image, cert & key files
-+
-+2012-06-13 0af5e01 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * tests: Execute tests in a clean (temporary) directory
-+
-+2012-06-13 8716e88 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * tests: Use COMPILE.S for assembing test object
-+
-+2012-06-13 807f0e6 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Version 0.2
-+
-+2012-06-13 7c2d8bb Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * docs: Add simple manpage for sbattach
-+
-+2012-06-13 deb9211 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * automake: Clean generated man files
-+
-+2012-06-13 3cde1e4 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * tests: Add a few simple tests
-+
-+2012-06-13 cc881c2 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Remove unused test.c file
-+
-+2012-06-12 4c79e3a Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbattach: Add too to manage detached signatures
-+
-+2012-06-12 564f5bc Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * image: Add facility to write unsigned images
-+
-+2012-06-11 a07b8d2 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbsign,sbverify: Update getopt_long optstrings
-+
-+2012-06-11 5836038 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: Add support for detached signatures
-+
-+2012-06-11 b8a7d51 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: Split image signature table reading to separate function
-+
-+2012-06-11 e9f438c Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Fix warnings from added -W flags
-+
-+2012-06-11 f19e8bb Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * automake: Add -Wall -Wextra CFLAGS
-+
-+2012-06-11 af4f088 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbsign: Add --detached option to create detached PKCS7 signatures
-+
-+2012-06-11 0c9fbd2 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbsign: fix flag for verbose operation
-+
-+2012-06-11 3673db1 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * docs: Fix manpage creation
-+
-+2012-05-29 9b2f3a7 Adam Conrad <adconrad@0c3.net>
-+
-+  * autogen.sh: Fix ccan_module assignment
-+
-+2012-05-28 3fb0f00 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * image: use read_write_all from ccan
-+
-+2012-05-28 f1112b4 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * image: Fix format specifier for 32-bit builds
-+
-+2012-05-24 d5e634c Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * autoconfiscate
-+
-+2012-05-23 82f8c30 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * docs: Add initial manpages
-+
-+2012-05-23 c14efcb Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbsign,sbverify: help2man-ize usage output
-+
-+2012-05-23 98a4f10 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Makefile: Add dist targets
-+
-+2012-05-22 1b2b5c6 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * ccan: Add ccan import logic
-+
-+2012-05-15 6ff68e5 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Move ccan submodule
-+
-+2012-05-15 9a08e25 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Remove unused header
-+
-+2012-05-14 bc618c5 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Remove pkcs7-simple test file
-+
-+2012-05-14 9ac930e Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Makefile: add install target
-+
-+2012-05-14 a1b270f Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Makefile: Comment components
-+
-+2012-05-14 c67b82a Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: clean up openssl init
-+
-+2012-05-14 c499763 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: add check for invalid PKCS7 data
-+
-+2012-05-14 74eb766 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: Add certificate chain verification
-+
-+2012-05-12 e111127 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * verify: move idc-related parsing to idc.c
-+
-+2012-05-12 46cf6a6 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbsign: fix incorrect check for certificate load
-+
-+2012-05-12 57d9f0c Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * image: reformat gap warnings
-+
-+2012-05-12 ab05bec Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * image: add cert table to image size
-+
-+2012-05-12 e1fec08 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: Add check for image hash
-+
-+2012-05-12 fefe97c Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbverify: check for presence of signature table
-+
-+2012-05-12 b73f723 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Makefile: add $(tools) var
-+
-+2012-05-12 55b1940 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbsigntool -> sbsign
-+
-+2012-05-12 a183de9 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * image: open output file with O_TRUNC
-+
-+2012-04-24 04b70fc Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * sbsigntooL: expand usage info
-+
-+2012-04-24 9826a43 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Add GPLv3 text in COPYING
-+
-+2012-04-24 906654e Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * coff: remove unneeded coff includes
-+
-+2012-04-23 9d3c8b5 Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Add copyright comments
-+
-+2012-04-23 e019eec Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * image: warn about potential checksum differences
-+
-+2012-04-23 01e33cd Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * idc: allocate using the image context
-+
-+2012-04-23 acd8c0a Jeremy Kerr <jeremy.kerr@canonical.com>
-+
-+  * Initial commit
-+
-diff --git a/autogen.sh b/autogen.sh
-index 32ea6f6..117835b 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -16,16 +16,6 @@ then
- 		--build-type=automake lib/ccan $ccan_modules
- fi
- 
--# Create generatable docs from git
--(
--	echo "Authors of sbsigntool:"
--	echo
--	git log --format='%an' | sort -u | sed 's,^,\t,'
--) > AUTHORS
--
--# Generate simple ChangeLog
--git log --date=short --format='%ad %t %an <%ae>%n%n  * %s%n' > ChangeLog
--
- # automagic
- aclocal
- autoheader
--- 
-2.1.2
-
diff --git a/system/sbsigntools/ccan_makefile.patch b/system/sbsigntools/ccan_makefile.patch
deleted file mode 100644
index e77b958ab8..0000000000
--- a/system/sbsigntools/ccan_makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- sbsigntools-0.7/lib/ccan.git/Makefile	2015-02-07 12:56:54.457781357 +0000
-+++ sbsigntools-0.7/lib/ccan.git/Makefile	2015-02-07 13:00:25.482175092 +0000
-@@ -15,7 +15,7 @@
- EXCLUDE=wwviaudio ogg_to_pcm jmap jset nfs
- 
- # Where make scores puts the results
--SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shell git describe --always --dirty)
-+#SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shell git describe --always --dirty)
- 
- ALL=$(filter-out $(EXCLUDE), $(REALLY_ALL))
- 
-@@ -77,7 +77,7 @@ distclean: clean
- scores: $(SCOREDIR)/SUMMARY
- 
- $(SCOREDIR)/SUMMARY: $(patsubst ccan/%/_info, $(SCOREDIR)/score-%, $(wildcard ccan/*/_info))
--	git describe --always > $@
-+#	git describe --always > $@
- 	uname -a >> $@
- 	$(CC) -v >> $@
- 	cat $^ | grep 'Total score:' >> $@
diff --git a/system/sbsigntools/fix_efi_arch.patch b/system/sbsigntools/fix_efi_arch.patch
deleted file mode 100644
index fceb96f4bf..0000000000
--- a/system/sbsigntools/fix_efi_arch.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 706bec1a957f2fcce3781e326e6e0b2be41a9b86 Mon Sep 17 00:00:00 2001
-From: James Bottomley <JBottomley@Parallels.com>
-Date: Tue, 6 Jan 2015 08:00:28 -0800
-Subject: [PATCH] OBS add correcting definition of EFI_ARCH
-
-Signed-off-by: James Bottomley <JBottomley@Parallels.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4891151..2e80e09 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -64,7 +64,7 @@ PKG_CHECK_MODULES(uuid, uuid,
-     AC_MSG_ERROR([libuuid (from the uuid package) is required]))
- 
- dnl gnu-efi headers require extra include dirs
--EFI_ARCH=$(uname -m)
-+EFI_ARCH=$(uname -m | sed s/i.86/ia32/)
- EFI_CPPFLAGS="-I/usr/include/efi -I/usr/include/efi/$EFI_ARCH \
-  -DEFI_FUNCTION_WRAPPER"
- CPPFLAGS_save="$CPPFLAGS"
--- 
-2.1.2
-
diff --git a/system/sbsigntools/git2tarxz.sh b/system/sbsigntools/git2tarxz.sh
new file mode 100644
index 0000000000..a93ce8b4da
--- /dev/null
+++ b/system/sbsigntools/git2tarxz.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+# Create source tarball from git repo.
+
+# Takes one optional argument, which is the commit or tag to create a
+# tarball of. With no arg, HEAD is used.
+
+# Version number example: 0.0.1+20200227_ad7ec17
+
+# Notes:
+
+# This script doesn't need to be run as root. It does need to be able
+# to write to the current directory it's run from.
+
+# Running this script twice for the same commit will NOT give identical
+# tarballs, even if the contents are identical. This is because tar
+# includes the current time in a newly-created tarball (plus there may
+# be other git-related reasons).
+
+# Once you've generated a tarball, you'll still need a place to host it.
+# Ask on the mailing list, if you don't have your own web server to
+# play with.
+
+## Config:
+VERSION=0.9.5
+
+# final tarball and slackbuild PRGNAM:
+PRGNAM=sbsigntools
+
+# what it says on the tin:
+CLONE_URL=https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git
+
+## End of config.
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone --recursive $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+git reset --hard "v$VERSION"
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=\"$VERSION\""
+echo "MD5SUM=\"$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )\""
diff --git a/system/sbsigntools/sbsigntools.SlackBuild b/system/sbsigntools/sbsigntools.SlackBuild
index f9701591ff..9146f824f6 100644
--- a/system/sbsigntools/sbsigntools.SlackBuild
+++ b/system/sbsigntools/sbsigntools.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sbsigntools
 
 # Copyright 2015 Jonathan Li
+# Copyright 2023 Sam Wright
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,28 +23,39 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20231211 bkw:
+# - update for v0.9.5.
+# - new maintainer (who isn't me, for once!)
+# - remove 0-byte ChangeLog from doc dir.
+# - various minor tweaks.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sbsigntools
-VERSION=${VERSION:-0.7}
+VERSION=${VERSION:-0.9.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
-CCAN_VERSION=${CCAN_VERSION:-0.0.2}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -62,31 +74,21 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+# The tarball is generated from a clone --recursive of the git repository,
+# see git2tarxz.sh.
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
-tar -xvf $CWD/ccan-$CCAN_VERSION.tar.gz -C lib/ccan.git
-
-# Next 2 patches taken from
-# https://build.opensuse.org/package/show/home:jejb1:UEFI/sbsigntools?rev=16
-# Fixes build on 32-bit.
-patch -p1 -i $CWD/fix_efi_arch.patch
-
-# Creates changelog and stops git from being called.
-patch -p1 -i $CWD/autogen.patch
-
-# Suppress "not git repo messages"- they're evaluated by the makefile but don't
-# actually get run so it's just noise.
-patch -p1 -i $CWD/ccan_makefile.patch
-rm lib/ccan.git/Makefile-web
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
+
+sed -i "s|/usr/lib$LIBDIRSUFFIX/efi|/usr/lib$LIBDIRSUFFIX/gnuefi|" configure.ac
+
+NOCONFIGURE=1 ./autogen.sh
 
-./autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -98,20 +100,15 @@ CXXFLAGS="$SLKCFLAGS" \
 cp lib/ccan.git/config.h lib/ccan
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING LICENSE.GPLv3 ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING LICENSE.GPLv3 $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sbsigntools/sbsigntools.info b/system/sbsigntools/sbsigntools.info
index 7a80834512..edb9bb25f7 100644
--- a/system/sbsigntools/sbsigntools.info
+++ b/system/sbsigntools/sbsigntools.info
@@ -1,12 +1,10 @@
 PRGNAM="sbsigntools"
-VERSION="0.7"
+VERSION="0.9.5"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/sbsigntools-0.7.tar.gz \
-          http://ponce.cc/slackware/sources/repo/ccan-0.0.2.tar.gz"
-MD5SUM="5adb5f7caaf435268f833eb816566c8e \
-        6de60482bf935a159ecb647d2e4a57ab"
+DOWNLOAD="https://slackware.uk/~urchlay/src/sbsigntools-0.9.5.tar.xz"
+MD5SUM="a85d3283ddf70b6daac7f9e9601355b4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Jonathan Li"
-EMAIL="jonathan dot li at hotmail dot co dot uk"
+MAINTAINER="Sam Wright"
+EMAIL="proaudiomanuk@gmail.com"
diff --git a/system/sbsigntools/slack-desc b/system/sbsigntools/slack-desc
index e577aa4398..f0674c85c1 100644
--- a/system/sbsigntools/slack-desc
+++ b/system/sbsigntools/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
            |-----handy-ruler------------------------------------------------------|
-sbsigntools: sbsigntools (Signing utility for UEFI Secure Boot)
+sbsigntools: sbsigntools (signing utility for UEFI Secure Boot)
 sbsigntools:
 sbsigntools: sbsigntools is a set of tools for signing EFI binaries and drivers
 sbsigntools: for use with Secure Boot.
diff --git a/system/scalpel/README b/system/scalpel/README
index d4fc999472..60efafb3f5 100644
--- a/system/scalpel/README
+++ b/system/scalpel/README
@@ -1,10 +1,12 @@
-Scalpel is a fast file carver that reads a database of header and footer
-definitions and extracts matching files or data fragments from a set of
-image files or raw device files. Scalpel is filesystem-independent and will
-carve files from FATx, NTFS, ext2/3, HFS+, or raw partitions. It is useful
-for both digital forensics investigation and file recovery.
+Scalpel is a fast file carver that reads a database of header
+and footer definitions and extracts matching files or data
+fragments from a set of image files or raw device files. Scalpel is
+filesystem-independent and will carve files from FATx, NTFS, ext2/3,
+HFS+, or raw partitions. It is useful for both digital forensics
+investigation and file recovery.
 
-To use it, you MUST have a conf file that defines the file types you want
-to recover.  Use the example scalpel.conf file from /usr/doc/scalpel
+To use it, you MUST have a conf file that defines the file types
+you want to recover. Use the example scalpel.conf file from
+/usr/doc/scalpel
 
 See the man page for details.
diff --git a/system/scalpel/scalpel.SlackBuild b/system/scalpel/scalpel.SlackBuild
index 2a84b48d6c..6954de680c 100644
--- a/system/scalpel/scalpel.SlackBuild
+++ b/system/scalpel/scalpel.SlackBuild
@@ -1,28 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for scalpel
 # Written by klaatu at member dot fsf dot org
 
+# 20220414 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix doc permissions.
+# - i486 => i586.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=scalpel
 VERSION=${VERSION:-2.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -46,9 +57,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -61,16 +72,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
+install -m0644 \
     README Changelog gpl.txt \
     scalpel.conf \
   $PKG/usr/doc/$PRGNAM-$VERSION
@@ -80,4 +86,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/scangearmp2/README b/system/scangearmp2/README
index f4d82f23af..9968fe29ba 100644
--- a/system/scangearmp2/README
+++ b/system/scangearmp2/README
@@ -1,9 +1,10 @@
-scangearmp2 (scanning front-end GUI for Canon Multifunction Inkjet Printer)
+scangearmp2 (scanning front-end GUI for Canon Multifunction Inkjet
+Printer)
 
-scangearmp2 is a scanning program for Canon Multifunction Inkjet Printer.
-You can scan image from Canon Multifunction Inkjet Printer, and select the 
-scanning parameters, for example, scan mode, size, etc.
+scangearmp2 is a scanning program for Canon Multifunction Inkjet
+Printer.  You can scan image from Canon Multifunction Inkjet Printer,
+and select the scanning parameters, for example, scan mode, size, etc.
 
-Support MG7500 series, MG6600 series, MG5600 series, MG2900 series, 
-MB2000 series, MB2300 series, MB5000 series, MB5300 series, E460 series, 
-MX490 series, E480 series.
+Support MG7500 series, MG6600 series, MG5600 series, MG2900 series,
+MB2000 series, MB2300 series, MB5000 series, MB5300 series, E460
+series, MX490 series, E480 series.
diff --git a/system/scangearmp2/doinst.sh b/system/scangearmp2/doinst.sh
new file mode 100644
index 0000000000..29048cbbad
--- /dev/null
+++ b/system/scangearmp2/doinst.sh
@@ -0,0 +1,5 @@
+# reload udev rules
+if [ -x /sbin/udevadm ]; then
+	/sbin/udevadm control --reload-rules 2> /dev/null
+	/sbin/udevadm trigger --action=add --subsystem-match=usb 2> /dev/null
+fi
diff --git a/system/scangearmp2/libusb.patch b/system/scangearmp2/libusb.patch
new file mode 100644
index 0000000000..cc40f1ab01
--- /dev/null
+++ b/system/scangearmp2/libusb.patch
@@ -0,0 +1,11 @@
+--- scangearmp2.orig/src/canon_mfp_tools.c	2023-03-08 14:07:54.261226941 +1300
++++ scangearmp2/src/canon_mfp_tools.c	2023-03-08 14:09:44.926237600 +1300
+@@ -394,7 +394,7 @@
+ 		goto onErr;
+ 	}
+ 	/* search canon mfp */
+-	numdev = libusb_get_device_list(NULL, &g_devlist);
++	numdev = libusb_get_device_list(g_context, &g_devlist);
+ 	if((int)numdev == 0) {
+ 		err = CN_USB_WRITE_ERROR;
+ 		goto onErr;
diff --git a/system/scangearmp2/scangearmp2.SlackBuild b/system/scangearmp2/scangearmp2.SlackBuild
index 162fcbc20a..41eaabf872 100644
--- a/system/scangearmp2/scangearmp2.SlackBuild
+++ b/system/scangearmp2/scangearmp2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for scangearmp2
 
@@ -22,13 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=scangearmp2
-VERSION=${VERSION:-3.90.1}
+VERSION=${VERSION:-4.50.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=$PRGNAM-source
-SRCVERSION=3.90-1
+SRCVERSION=4.50-1
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -46,18 +56,19 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
-  LDFLAGS="-L$TMP/$SRCNAM-${SRCVERSION}/com/libs_bin32"
-  BITS="i386"
+  BITS="i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-  LDFLAGS="-L$TMP/$SRCNAM-${SRCVERSION}/com/libs_bin32"
-  BITS="i386"
+  BITS="i686"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  LDFLAGS="-L$TMP/$SRCNAM-${SRCVERSION}/com/libs_bin64"
-  BITS="amd64"
+  BITS="x86_64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  BITS="aarch64"
 else
   echo "Package for $(uname -m) architecture is not available."
   exit 1
@@ -84,26 +95,29 @@ find -L . \
 
 cd $PRGNAM
 
-./autogen.sh --prefix=/usr LDFLAGS="$LDFLAGS"
+patch -p1 < $CWD/libusb.patch
+
+./autogen.sh --prefix=/usr --enable-libpath=/usr/lib${LIBDIRSUFFIX} LDFLAGS="-L$TMP/$SRCNAM-${SRCVERSION}/com/libs_bin_${BITS}"
 make
-make install-strip DESTDIR=$PKG
+make install DESTDIR=$PKG
 
 # Follow debian/rules
-if [ "$ARCH" = "x86_64" ]; then
-   mv $PKG/usr/lib $PKG/usr/lib64
-   install -s -m 755 ../com/libs_bin64/*.so $PKG/usr/lib64/
-   install -m 666 ../com/ini/canon_mfp2_net.ini $PKG/usr/lib64/bjlib/
-elif [ "$ARCH" = "i586" ]; then
-   install -s -m 755 ../com/libs_bin32/*.so $PKG/usr/lib/
-   install -m 666 ../com/ini/canon_mfp2_net.ini $PKG/usr/lib/bjlib/
-elif [ "$ARCH" = "i686" ]; then
-   install -s -m 755 ../com/libs_bin32/*.so $PKG/usr/lib/
-   install -m 666 ../com/ini/canon_mfp2_net.ini $PKG/usr/lib/bjlib/
+install -s -m 755 ../com/libs_bin_${BITS}/*.so.* $PKG/usr/lib${LIBDIRSUFFIX}/
+install -m 666 ../com/ini/canon_mfp2_net.ini $PKG/usr/lib${LIBDIRSUFFIX}/bjlib/
+
+if [ -x /sbin/ldconfig ]; then
+  /sbin/ldconfig $PKG/usr/lib${LIBDIRSUFFIX}
 fi
 
 mkdir -p $PKG/lib/udev/rules.d
 install -m 644 etc/80-canon_mfp2.rules $PKG/lib/udev/rules.d
 
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/share/applications
+cat $CWD/scangearmp2.desktop > $PKG/usr/share/applications/scangearmp2.desktop
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README ../doc/* \
@@ -112,6 +126,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/scangearmp2/scangearmp2.desktop b/system/scangearmp2/scangearmp2.desktop
new file mode 100644
index 0000000000..80154dfb7e
--- /dev/null
+++ b/system/scangearmp2/scangearmp2.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=3.90
+Encoding=UTF-8
+Name=ScanGearMP
+Type=Application
+Exec=scangearmp2
+Terminal=false
+Icon=scanner.png
+Comment=Canon Scanner
+NoDisplay=false
+Categories=Graphics;
\ No newline at end of file
diff --git a/system/scangearmp2/scangearmp2.info b/system/scangearmp2/scangearmp2.info
index 977724b7ed..afddb6530e 100644
--- a/system/scangearmp2/scangearmp2.info
+++ b/system/scangearmp2/scangearmp2.info
@@ -1,8 +1,8 @@
 PRGNAM="scangearmp2"
-VERSION="3.90.1"
-HOMEPAGE="https://asia.canon/en/support/0101048701/1"
-DOWNLOAD="http://gdlp01.c-wss.com/gds/7/0100010487/01/scangearmp2-source-3.90-1.tar.gz"
-MD5SUM="6c22dd63e8ed0e8badd5f012f773497d"
+VERSION="4.50.1"
+HOMEPAGE="https://asia.canon/en/support/0101164201"
+DOWNLOAD="https://gdlp01.c-wss.com/gds/2/0100011642/01/scangearmp2-source-4.50-1.tar.gz"
+MD5SUM="4bee2cb72e0a18e136248603394a017e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/scangearmp2/slack-desc b/system/scangearmp2/slack-desc
index 714f021816..2750b8a83e 100644
--- a/system/scangearmp2/slack-desc
+++ b/system/scangearmp2/slack-desc
@@ -16,4 +16,4 @@ scangearmp2: Support MG7500 series, MG6600 series, MG5600 series, MG2900 series,
 scangearmp2: MB2000 series, MB2300 series, MB5000 series, MB5300 series, E460
 scangearmp2: series, MX490 series, E480 series.
 scangearmp2:
-scangearmp2: Homepage: https://asia.canon/en/support/0101048701/1
+scangearmp2: Homepage: https://asia.canon/en/support/0101164201
diff --git a/system/scanmem/README b/system/scanmem/README
index 3a5f2cfafd..70be1b4f47 100644
--- a/system/scanmem/README
+++ b/system/scanmem/README
@@ -1,6 +1,7 @@
-scanmem is a debugging utility designed to isolate the address of an arbitrary
-variable in an executing process. scanmem simply needs to be told the pid of
-the process, and the value of the variable at several different times.
+scanmem is a debugging utility designed to isolate the address of an
+arbitrary variable in an executing process. scanmem simply needs to be
+told the pid of the process, and the value of the variable at several
+different times.
 
 After several scans of the process, scanmem isolates the position of the
-variable and allows you to modify it's value.
+variable and allows you to modify its value.
diff --git a/system/scanmem/scanmem.SlackBuild b/system/scanmem/scanmem.SlackBuild
index 38d770982f..f0f84d6695 100644
--- a/system/scanmem/scanmem.SlackBuild
+++ b/system/scanmem/scanmem.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for scanmem
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=scanmem
-VERSION=${VERSION:-0.16}
+VERSION=${VERSION:-0.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -85,8 +95,8 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-# Remove unused GameConqueror files from usr/share/locale
-find $PKG/usr/share/locale -name GameConqueror.mo -delete
+# Use python3
+sed -i "s|env\ python|env python3|" $PKG/usr/share/gameconqueror/GameConqueror.py
 
 # Remove usr/share* empty directories
 find $PKG -depth -empty -exec rmdir {} \;
@@ -104,9 +114,11 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING NEWS README TODO *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/scanmem/scanmem.info b/system/scanmem/scanmem.info
index 0d1e361707..566437b67a 100644
--- a/system/scanmem/scanmem.info
+++ b/system/scanmem/scanmem.info
@@ -1,8 +1,8 @@
 PRGNAM="scanmem"
-VERSION="0.16"
+VERSION="0.17"
 HOMEPAGE="http://taviso.decsystem.org/scanmem.html"
-DOWNLOAD="https://github.com/scanmem/scanmem/archive/v0.16/scanmem-0.16.tar.gz"
-MD5SUM="1665f6c985f3a29e42a502187dd41775"
+DOWNLOAD="https://github.com/scanmem/scanmem/archive/v0.17/scanmem-0.17.tar.gz"
+MD5SUM="a759fa91173d808bef484871c864236e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/scdoc/fix-makefile.patch.gz b/system/scdoc/fix-makefile.patch.gz
deleted file mode 100644
index a9918c14cc..0000000000
--- a/system/scdoc/fix-makefile.patch.gz
+++ /dev/null
diff --git a/system/scdoc/scdoc.SlackBuild b/system/scdoc/scdoc.SlackBuild
index fb7418e537..88098462e2 100644
--- a/system/scdoc/scdoc.SlackBuild
+++ b/system/scdoc/scdoc.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for scdoc
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=scdoc
-VERSION=${VERSION:-1.11.1}
+VERSION=${VERSION:-1.11.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,8 +79,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-zcat $CWD/fix-makefile.patch.gz | patch -p1
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 PREFIX=/usr \
@@ -94,4 +102,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/scdoc/scdoc.info b/system/scdoc/scdoc.info
index fd8e496116..b5bfd41e34 100644
--- a/system/scdoc/scdoc.info
+++ b/system/scdoc/scdoc.info
@@ -1,8 +1,8 @@
 PRGNAM="scdoc"
-VERSION="1.11.1"
+VERSION="1.11.2"
 HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
-DOWNLOAD="https://git.sr.ht/~sircmpwn/scdoc/archive/1.11.1.tar.gz"
-MD5SUM="ce8369cb5d2406786f61cf805ceae66f"
+DOWNLOAD="https://git.sr.ht/~sircmpwn/scdoc/archive/1.11.2.tar.gz"
+MD5SUM="0f6e8b9bb741f52d975081784757078b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/schedtool/README b/system/schedtool/README
index f040c5dc53..71a5c61752 100644
--- a/system/schedtool/README
+++ b/system/schedtool/README
@@ -1,13 +1,15 @@
 Schedtool interfaces with the Linux CPU scheduler.
 
-It allows the user to set and query the CPU-affinity and nice-levels of 
-processes, as well as all scheduling policies, like batch or real-time 
-(RR/FIFO) classes and their priorities.  It can be used to avoid skipping 
-for A/V-applications, to lock processes onto certain CPUs on SMP/NUMA 
-systems, or to adjust nice-levels of lesser important jobs to maintain a 
-high amount of interactive responsiveness under high load.
+It allows the user to set and query the CPU-affinity and nice-levels
+of processes, as well as all scheduling policies, like batch or
+real-time (RR/FIFO) classes and their priorities. It can be used to
+avoid skipping for A/V-applications, to lock processes onto certain
+CPUs on SMP/NUMA systems, or to adjust nice-levels of lesser important
+jobs to maintain a high amount of interactive responsiveness under
+high load.
 
-All special scheduling classes of the -ck kernel patchset are also supported.
+All special scheduling classes of the -ck kernel patchset are also
+supported.
 
 Certain modes (as of this writing: SCHED_IDLEPRIO and SCHED_ISO) need a
 patched kernel; see the INSTALL file for details.
diff --git a/system/schedtool/schedtool.SlackBuild b/system/schedtool/schedtool.SlackBuild
index cab23bce7d..e3b9e2cf60 100644
--- a/system/schedtool/schedtool.SlackBuild
+++ b/system/schedtool/schedtool.SlackBuild
@@ -1,30 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for schedtool
 
 # Written by Dave Margell (dmargell@gmail.com)
 # Thanks to Robby Workman for help with the Makefile patch.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=schedtool
 VERSION=${VERSION:-1.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -65,4 +75,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/scrypt/scrypt.SlackBuild b/system/scrypt/scrypt.SlackBuild
index 3f1f51f3c2..230beb4356 100644
--- a/system/scrypt/scrypt.SlackBuild
+++ b/system/scrypt/scrypt.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for scrypt
 
 # Copyright (c) 2011-2013 LEVAI Daniel
-# Copyright 2020, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2020-2023 Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=scrypt
-VERSION=${VERSION:-1.3.1}
+VERSION=${VERSION:-1.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -91,11 +98,11 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a FORMAT tests $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a FORMAT README.md $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/scrypt/scrypt.info b/system/scrypt/scrypt.info
index 5f88fd121f..79869eb67d 100644
--- a/system/scrypt/scrypt.info
+++ b/system/scrypt/scrypt.info
@@ -1,8 +1,8 @@
 PRGNAM="scrypt"
-VERSION="1.3.1"
+VERSION="1.3.2"
 HOMEPAGE="http://www.tarsnap.com/scrypt.html"
-DOWNLOAD="http://www.tarsnap.com/scrypt/scrypt-1.3.1.tgz"
-MD5SUM="1f5aded31478319357c2c611eb5c4f71"
+DOWNLOAD="http://www.tarsnap.com/scrypt/scrypt-1.3.2.tgz"
+MD5SUM="82922531d2a0eafb72d1fe9cfaf23432"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/sddm/README b/system/sddm/README
deleted file mode 100644
index 48efe82f75..0000000000
--- a/system/sddm/README
+++ /dev/null
@@ -1,24 +0,0 @@
-SDDM is a modern display manager for X11 and Wayland aiming to be
-fast, simple and beautiful. It uses modern technologies like QtQuick,
-which in turn gives the designer the ability to create smooth,
-animated user interfaces.
-
-You will need to edit /etc/rc.d/rc.4 to get this work.
-Put the section that refers to sddm before the sections for xdm, kdm
-etc:
-
-# Look for SDDM as well:
-if [ -x /usr/bin/sddm ]; then
-  exec /usr/bin/sddm
-fi
-
-Note: The home for SDDM is set by default in /etc/passwd as
-/var/empty. This ought to be changed to /var/lib/sddm. To do this,
-run:
-
-usermod -d /var/lib/sddm sddm
-
-when SDDM is *not* running. Do this before installing or upgrading the
-package.
-
-Note that this is fixed in -current.
diff --git a/system/sddm/consolekit.patch b/system/sddm/consolekit.patch
deleted file mode 100644
index 2d0cc20938..0000000000
--- a/system/sddm/consolekit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/daemon/LogindDBusTypes.cpp
-+++ b/src/daemon/LogindDBusTypes.cpp
-@@ -60,7 +60,7 @@
- 
-     if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
-         qDebug() << "Console kit interface found";
--        available = true;
-+        available = false;
-         serviceName = QStringLiteral("org.freedesktop.ConsoleKit");
-         managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
-         managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind
-
diff --git a/system/sddm/doinst.sh b/system/sddm/doinst.sh
deleted file mode 100644
index 873f5495c0..0000000000
--- a/system/sddm/doinst.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/sddm.conf.new
-
-if [ -n "$(grep sddm etc/passwd | grep var/empty)" ]; then
-  echo "*NOTICE*"
-  echo
-  echo 'SDDM $HOME is set to /var/empty in /etc/passwd'
-  echo "This needs to be changed to /var/lib/sddm"
-  echo "(see README)."
-  echo
-  echo "Please run:"
-  echo "usermod -d /var/lib/sddm sddm"
-  echo
-fi
diff --git a/system/sddm/sddm.SlackBuild b/system/sddm/sddm.SlackBuild
deleted file mode 100644
index a977bd5c30..0000000000
--- a/system/sddm/sddm.SlackBuild
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for sddm
-# Copyright 2017 David Woodfall <dave@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=sddm
-VERSION=${VERSION:-0.18.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-SDDM_HOME="/var/lib/sddm"
-PW_HOME="$( getent passwd sddm | cut -d: -f6 )"
-if [ "$PW_HOME" != "$SDDM_HOME" ]; then
-  cat <<EOF
-It appears that the sddm user's home is set to $PW_HOME in /etc/passwd.
-This needs to be changed to $SDDM_HOME
-To do this, run: usermod -d $SDDM_HOME sddm
-This installation will now terminate.
-EOF
-  exit 1
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-patch -p1 --verbose < $CWD/consolekit.patch
-
-# Fix so that SDDM doesn't source ~/.xsession which breaks on some WMs
-patch -p1 --verbose < $CWD/xsession.patch
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DENABLE_PAM=no \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
-cd ..
-
-mkdir -p $PKG/etc
-cp $CWD/sddm.conf.new $PKG/etc
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ChangeLog INSTALL.md LICENSE.CC-BY-3.0 LICENSE README.md docs *.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/$SDDM_HOME
-chown sddm:sddm $PKG/$SDDM_HOME
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/sddm/sddm.conf.new b/system/sddm/sddm.conf.new
deleted file mode 100644
index b5b4e205e5..0000000000
--- a/system/sddm/sddm.conf.new
+++ /dev/null
@@ -1,129 +0,0 @@
-[Autologin]
-# Whether sddm should automatically log back into sessions when they exit
-Relogin=false
-
-# Name of session file for autologin session (if empty try last logged in)
-Session=
-
-# Username for autologin session
-User=
-
-
-[General]
-# Halt command
-HaltCommand=/sbin/shutdown -h -P now
-
-# Input method module
-InputMethod=
-
-# Initial NumLock state. Can be on, off or none.
-# If property is set to none, numlock won't be changed
-# NOTE: Currently ignored if autologin is enabled.
-Numlock=on
-
-# Reboot command
-RebootCommand=/sbin/shutdown -r now
-
-
-[Theme]
-# Current theme name
-Current=maya
-
-# Cursor theme used in the greeter
-CursorTheme=Oxygen_White
-
-# Number of users to use as threshold
-# above which avatars are disabled
-# unless explicitly enabled with EnableAvatars
-DisableAvatarsThreshold=7
-
-# Enable display of custom user avatars
-EnableAvatars=
-
-# Global directory for user avatars
-# The files should be named <username>.face.icon
-FacesDir=/usr/share/sddm/faces
-
-# Theme directory path
-ThemeDir=/usr/share/sddm/themes
-
-
-[Users]
-# Default $PATH for logged in users
-DefaultPath=/bin:/usr/bin:/usr/local/bin
-
-# Comma-separated list of shells.
-# Users with these shells as their default won't be listed
-HideShells=
-
-# Comma-separated list of users that should not be listed
-HideUsers=
-
-# Maximum user id for displayed users
-MaximumUid=60000
-
-# Minimum user id for displayed users
-MinimumUid=1000
-
-# Remember the session of the last successfully logged in user
-RememberLastSession=true
-
-# Remember the last successfully logged in user
-RememberLastUser=true
-
-# When logging in as the same user twice, restore the original session, rather than create a new one
-ReuseSession=false
-
-
-[Wayland]
-# Enable Qt's automatic high-DPI scaling
-EnableHiDPI=false
-
-# Path to a script to execute when starting the desktop session
-SessionCommand=/usr/share/sddm/scripts/wayland-session
-
-# Directory containing available Wayland sessions
-SessionDir=/usr/share/wayland-sessions
-
-# Path to the user session log file
-SessionLogFile=.local/share/sddm/wayland-session.log
-
-
-[X11]
-# Path to a script to execute when starting the display server
-DisplayCommand=/usr/share/sddm/scripts/Xsetup
-
-# Path to a script to execute when stopping the display server
-DisplayStopCommand=/usr/share/sddm/scripts/Xstop
-
-# Enable Qt's automatic high-DPI scaling
-EnableHiDPI=false
-
-# The lowest virtual terminal number that will be used.
-MinimumVT=7
-
-# Arguments passed to the X server invocation
-ServerArguments=-nolisten tcp
-
-# Path to X server binary
-ServerPath=/usr/bin/X
-
-# Path to a script to execute when starting the desktop session
-SessionCommand=/usr/share/sddm/scripts/Xsession
-
-# Directory containing available X sessions
-SessionDir=/usr/share/xsessions
-
-# Path to the user session log file
-SessionLogFile=.local/share/sddm/xorg-session.log
-
-# Path to the Xauthority file
-UserAuthFile=.Xauthority
-
-# Path to xauth binary
-XauthPath=/usr/bin/xauth
-
-# Path to Xephyr binary
-XephyrPath=/usr/bin/Xephyr
-
-
diff --git a/system/sddm/sddm.info b/system/sddm/sddm.info
deleted file mode 100644
index 6b38805b07..0000000000
--- a/system/sddm/sddm.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sddm"
-VERSION="0.18.1"
-HOMEPAGE="https://github.com/sddm/sddm"
-DOWNLOAD="https://github.com/sddm/sddm/releases/download/v0.18.1/sddm-0.18.1.tar.xz"
-MD5SUM="c1ca638a3faf76c526df3049cbc9668a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="extra-cmake-modules qt5"
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@slackbuilds.org"
diff --git a/system/sddm/slack-desc b/system/sddm/slack-desc
deleted file mode 100644
index 63b8060419..0000000000
--- a/system/sddm/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-    |-----handy-ruler------------------------------------------------------|
-sddm: sddm (QML based X11 and Wayland display manager)
-sddm:
-sddm: SDDM is a modern display manager for X11 and Wayland aiming to be
-sddm: fast, simple and beautiful. It uses modern technologies like QtQuick,
-sddm: which in turn gives the designer the ability to create smooth,
-sddm: animated user interfaces.
-sddm:
-sddm: https://github.com/sddm/sddm
-sddm:
-sddm:
-sddm:
diff --git a/system/sddm/xsession.patch b/system/sddm/xsession.patch
deleted file mode 100644
index 457ba85ed0..0000000000
--- a/system/sddm/xsession.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur a/data/scripts/Xsession b/data/scripts/Xsession
---- a/data/scripts/Xsession	2018-07-18 11:31:40.000000000 +0100
-+++ b/data/scripts/Xsession	2018-08-07 20:06:16.937412206 +0100
-@@ -68,6 +68,7 @@
- # by the scripts to work
- xsessionddir="/etc/X11/Xsession.d"
- OPTIONFILE=/etc/X11/Xsession.options
-+# This seems to break with some WMs
- USERXSESSION=$HOME/.xsession
- USERXSESSIONRC=$HOME/.xsessionrc
- ALTUSERXSESSION=$HOME/.Xsession
-@@ -91,9 +92,10 @@
- fi
- [ -f $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources
- 
--if [ -f "$USERXSESSION" ]; then
--  . "$USERXSESSION"
--fi
-+# This seems to break with some WMs
-+#if [ -f "$USERXSESSION" ]; then
-+#  . "$USERXSESSION"
-+#fi
- 
- if [ -z "$*" ]; then
-     exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
diff --git a/system/sdl-jstest/README b/system/sdl-jstest/README
index 3e1a770d74..609fecff44 100644
--- a/system/sdl-jstest/README
+++ b/system/sdl-jstest/README
@@ -7,5 +7,5 @@ displaying the events they send or by displaying their current button,
 axis, hat or ball state. sdl-jstest is especially useful if you want
 to test your SDL Linux joystick configuration.
 
-Optional dependency: if SDL2 is installed, the SDL2 version will
-be built and installed as sdl2-jstest.
+The package includes both sdl-jstest (SDL 1.2) and sdl2-jstest (SDL
+2.0) executables.
diff --git a/system/sdl-jstest/sdl-jstest.SlackBuild b/system/sdl-jstest/sdl-jstest.SlackBuild
index c5a1e0ee7b..f3861cd72e 100644
--- a/system/sdl-jstest/sdl-jstest.SlackBuild
+++ b/system/sdl-jstest/sdl-jstest.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sdl-jstest
 
@@ -40,10 +40,13 @@
 # - upstream now supports both sdl1 and sdl2, build for sdl2 only
 #   if installed
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sdl-jstest
 VERSION=${VERSION:-20180715_aafbdb1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -53,7 +56,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -119,4 +126,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sdl-jstest/sdl-jstest.info b/system/sdl-jstest/sdl-jstest.info
index cf78c56ffc..7b24db98b5 100644
--- a/system/sdl-jstest/sdl-jstest.info
+++ b/system/sdl-jstest/sdl-jstest.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/sdl2trs/README b/system/sdl2trs/README
new file mode 100644
index 0000000000..c51609ea1e
--- /dev/null
+++ b/system/sdl2trs/README
@@ -0,0 +1,27 @@
+sdl2trs (Radio Shack TRS-80 Model I/III/4/4P Emulator)
+
+sdl2trs is a Radio Shack TRS-80 Model I/III/4/4P emulator for
+Macintosh OSX, Windows and Linux. It has been ported from the
+excellent X Window Unix emulator xtrs. Instead of using the X-Window
+system for graphics, it uses the portable SDL library.
+
+This build uses SDL-2.0, which is designed for newer machines. If you
+have an older machine, or if sdl2trs doesn't perform well on your
+system, try the SDL-1.2 version, sdl2trs. It's possible to install
+both sdl2trs and sdl2trs on the same system with no conflicts.
+
+Note: When you start up sdl2trs for the first time, it attempts
+to boot from floppy disk. If you didn't give either the "-disk0
+/path/to/image.dsk" or "-nofloppy" options on the command line, it
+will "hang" with a black screen, because it's trying to boot from a
+nonexistent floppy disc. To recover from this:
+
+- Hold down F10 (TRS-80 Reset) and press Escape (TRS-80 Break key) to
+  skip the disk boot and enter the ROM BASIC.
+
+- Press Alt+D to enter the emulator's disk menu, and from there,
+  either select a bootable disk image for drive 0, or disable the
+  floppy disk controller. Then press Shift-F10 to reboot the TRS-80.
+
+See the man page and the documentation at
+/usr/doc/sdl2trs-$VERSION/html/index.html for further details.
diff --git a/system/sdl2trs/doinst.sh b/system/sdl2trs/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/system/sdl2trs/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/sdl2trs/git2tarxz.sh b/system/sdl2trs/git2tarxz.sh
new file mode 100644
index 0000000000..d54365353a
--- /dev/null
+++ b/system/sdl2trs/git2tarxz.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create
+# a tarball of. With no arg, HEAD is used.
+
+PRGNAM=sdl2trs
+CLONE_URL=https://gitlab.com/jengun/sdltrs/
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+git checkout remotes/origin/sdl2
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+VERTAG=$( git tag --sort=version:refname | tail -1 | sed 's,^v,,' )
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=${VERTAG}+${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/system/sdl2trs/sdl2trs.SlackBuild b/system/sdl2trs/sdl2trs.SlackBuild
new file mode 100644
index 0000000000..081513b19e
--- /dev/null
+++ b/system/sdl2trs/sdl2trs.SlackBuild
@@ -0,0 +1,130 @@
+#!/bin/bash
+
+# Slackware build script for sdl2trs
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Because upstream's SDL-1.2 and SDL-2.0 codebases are in separate git
+# branches, it's impossible to make a SlackBuild that can build either
+# from the same source. So this is a new build for the sdl2 branch.
+
+# Note: to stay in sync with upstream's Debian packages, this build
+# uses commit 9ac732ce60304ca99f1eec703030d05e2a43618f, not the latest
+# git (tarball created by passing the commit ID to git2tarxz.sh as an
+# argument).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=sdl2trs
+VERSION=${VERSION:-1.2.28+20230819_9ac732ce}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# 20230417 bkw: Look in system-wide ROM directory by default.
+sed -i '/strcpy(romfile/s, ", "/usr/share/trs80-roms/,' src/trs_sdl_interface.c
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true
+  "${NINJA:=ninja}" -v
+  install -D -m0755 -s $PRGNAM $PKG/usr/games/$PRGNAM
+cd ..
+
+# 20230418 bkw: use upstream's man page, but section 6.
+mkdir -p $PKG/usr/man/man6
+sed -e '/^\.TH/s, 1 , 6 ,' \
+    -e '/^\.TH/s,$, SlackBuilds.org,' \
+    src/$PRGNAM.1 \
+    | gzip -9c > $PKG/usr/man/man6/$PRGNAM.6.gz
+
+sed -i -e 's,^Exec=,&/usr/games/,' $PRGNAM.desktop
+install -D -m0644 $PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+
+# 20230418 bkw: use upstream's icon, but pre-resized.
+HICOLOR=$PKG/usr/share/icons/hicolor
+SVGICON=icons/$PRGNAM.svg
+
+for px in 16 22 32 48 64 96 128; do
+  size=${px}x${px}
+  dir=$HICOLOR/$size/apps
+  mkdir -p $dir
+  rsvg-convert -w $px -h $px -o $dir/$PRGNAM.png $SVGICON
+done
+
+mkdir -p $HICOLOR/scalable/apps
+cp -a $SVGICON $HICOLOR/scalable/apps/$PRGNAM.svg
+
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+# Include the disk images upstream ships.
+mkdir -p $PKG/usr/share/$PRGNAM
+cp -a diskimages/*.dsk $PKG/usr/share/$PRGNAM
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a CHANGELOG.md README.md *LICENSE utilities html $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sdl2trs/sdl2trs.info b/system/sdl2trs/sdl2trs.info
new file mode 100644
index 0000000000..b56e7cc7e9
--- /dev/null
+++ b/system/sdl2trs/sdl2trs.info
@@ -0,0 +1,10 @@
+PRGNAM="sdl2trs"
+VERSION="1.2.28+20230819_9ac732ce"
+HOMEPAGE="https://gitlab.com/jengun/sdltrs/"
+DOWNLOAD="https://slackware.uk/~urchlay/src/sdl2trs-1.2.28+20230819_9ac732ce.tar.xz"
+MD5SUM="88f7a48ef6062dfb98ebdee04269eae5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="trs80-roms"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/sdl2trs/slack-desc b/system/sdl2trs/slack-desc
new file mode 100644
index 0000000000..be94648865
--- /dev/null
+++ b/system/sdl2trs/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+sdl2trs: sdl2trs (Radio Shack TRS-80 Model I/III/4/4P Emulator, for SDL2)
+sdl2trs:
+sdl2trs: sdl2trs is a Radio Shack TRS-80 Model I/III/4/4P emulator for
+sdl2trs: Macintosh OSX, Windows and Linux. It has been ported from the
+sdl2trs: excellent X-Windows Unix emulator xtrs. Instead of using the
+sdl2trs: X-Window system for graphics, it uses the portable SDL-2.0 library.
+sdl2trs:
+sdl2trs:
+sdl2trs:
+sdl2trs:
+sdl2trs:
diff --git a/system/sdltrs/README b/system/sdltrs/README
index bab7f5bafa..f3b219e8d0 100644
--- a/system/sdltrs/README
+++ b/system/sdltrs/README
@@ -1,8 +1,28 @@
-sdltrs is a Radio Shack TRS-80 Model I/III/4/4P emulator for Macintosh OSX, 
-Windows and Linux. It has been ported from the excellent X Window Unix 
-emulator xtrs.  Instead of using the X-Window system for graphics, it uses 
-the portable SDL library.
-
-A simple sdltrs.desktop file is included that will start sdltrs with the 
-default options.  Read the included documentation after installation for 
-more information.
+sdltrs (Radio Shack TRS-80 Model I/III/4/4P Emulator)
+
+sdltrs is a Radio Shack TRS-80 Model I/III/4/4P emulator for Macintosh
+OSX, Windows and Linux. It has been ported from the excellent X
+Window Unix emulator xtrs. Instead of using the X-Window system for
+graphics, it uses the portable SDL library.
+
+This build uses SDL-1.2, which is an older library that performs
+better on older and lower-spec machine. If your computer was made
+in the last 10 years or so, you probably should be using the SDL-2.0
+build, which is called sdl2trs. It's possible to install both sdltrs
+and sdl2trs on the same system without conflict.
+
+Note: When you start up sdltrs for the first time, it attempts
+to boot from floppy disk. If you didn't give either the "-disk0
+/path/to/image.dsk" or "-nofloppy" options on the command line, it
+will "hang" with a black screen, because it's trying to boot from a
+nonexistent floppy disc. To recover from this:
+
+- Hold down F10 (TRS-80 Reset) and press Escape (TRS-80 Break key) to
+  skip the disk boot and enter the ROM BASIC.
+
+- Press Alt+D to enter the emulator's disk menu, and from there,
+  either select a bootable disk image for drive 0, or disable the
+  floppy disk controller. Then press Shift-F10 to reboot the TRS-80.
+
+See the man page and the documentation at
+/usr/doc/sdltrs-$VERSION/html/index.html for further details.
diff --git a/system/sdltrs/doinst.sh b/system/sdltrs/doinst.sh
index 4e8ba7071d..3e5691a052 100644
--- a/system/sdltrs/doinst.sh
+++ b/system/sdltrs/doinst.sh
@@ -2,3 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/sdltrs/git2tarxz.sh b/system/sdltrs/git2tarxz.sh
new file mode 100644
index 0000000000..e7a4f38c46
--- /dev/null
+++ b/system/sdltrs/git2tarxz.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create
+# a tarball of. With no arg, HEAD is used.
+
+PRGNAM=sdltrs-sdl2
+CLONE_URL=https://gitlab.com/jengun/sdltrs/
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+git checkout remotes/origin/sdl2
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+VERTAG=$( git tag --sort=version:refname | tail -1 | sed 's,^v,,' )
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=${VERTAG}+${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/system/sdltrs/sdltrs.SlackBuild b/system/sdltrs/sdltrs.SlackBuild
index 0ce5123722..e04e9b64b3 100644
--- a/system/sdltrs/sdltrs.SlackBuild
+++ b/system/sdltrs/sdltrs.SlackBuild
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sdltrs:
 # the Radio Shack TRS-80 Model I/III/4/4p emulator
 
 # Copyright 2009-2010, 2012 Niels Horn, Rio de Janeiro, Brazil
+# Copyright 2023, B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,90 +24,156 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# revision date 2012/08/09
+# 20240311 bkw, BUILD=2: having heard from upstream... the proper SDL2
+# version of sdltrs is in the sdl2 branch on his gitlab. This branch
+# (master) is the SDL-1.2 branch... though, confusingly, it does
+# support SDL2 (not in the modern way though, using hardware assisted
+# scaling and such). So. Modified the README to explain this, added
+# -DSDL1=true to the meson options, and added a completely new sdl2trs
+# build.
+# Also, include diskimages/*.dsk in the package (should have been there
+# all along, my bad).
+
+# 20240213 bkw: update for v1.2.28.
+
+# 20230524 bkw: previous update had wrong version number. use latest
+# git (with fix for .desktop file), with correct tag.
+
+# 20230517 bkw: update for latest git, v1.2.9a+20230517_29980234,
+# the sdl2 branch. This is done at the suggestion of the upstream
+# maintainer, because the master branch doesn't support SDL2's
+# hardware rendering and scaling. The binary changes names to
+# sdl2trs, so there's symlinks to the old name for now.
+
+# 20230418 bkw:
+# - new maintainer.
+# - update for v1.2.27 (make => meson, for one thing).
+# - patch to support system-wide ROM directory (which is shared
+#   with xtrs).
+# - remove disk images from package (they're in trs80-roms now).
+# - use upstream's icon and .desktop.
+# - include man page in package.
+# - new version defaults to enabling the floppy drive, which causes
+#   it to wait for a disk boot. add a README note explaining the
+#   situation.
+
+# 20230418 bkw: Note: the default build is for SDL 2. It's still
+# possible to build with SDL 1, but I haven't bothered adding an
+# option for that. If you *really* need SDL 1 for some reason, let
+# me know.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=sdltrs
-VERSION=${VERSION:-1.1.0}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.2.28}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-SRCVERSION=$(echo $VERSION | tr . _)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
-  ARCHQUADLET=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-  ARCHQUADLET=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  ARCHQUADLET=""
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
-  ARCHQUADLET=""
 fi
 
 set -e
 
-rm -rf $TMP/${PRGNAM}_$SRCVERSION $PKG
+rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
+rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-tar xvf $CWD/${PRGNAM}_$SRCVERSION.tar.gz
-cd ${PRGNAM}_$SRCVERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 --exclude='*/bin/*' # debs/exes
+cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# include -lX11 in the Makefile (sw-14.0)
-sed "/^LIBS/s/= /= -lX11 /" -i src/linux/Makefile
-
-# the Makefile is in the src/linux directory
-make INCS="$SLKCFLAGS" -C src/linux
-
-# sdltrs does not have a "make install" option, so we'll do it manually
-mkdir -p $PKG/usr/bin
-cp -a src/linux/sdltrs $PKG/usr/bin
-strip --strip-unneeded $PKG/usr/bin/sdltrs
-
-# Copy icon & desktop file to package
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-cat $CWD/sdltrs.desktop > $PKG/usr/share/applications/sdltrs.desktop
-cat $CWD/sdltrs.png > $PKG/usr/share/pixmaps/sdltrs.png
-
-# Make a directory for the ROMs (not included) and copy included images
-mkdir -p $PKG/usr/share/sdltrs
-cp -a diskimages/* $PKG/usr/share/sdltrs
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
-cp -a BUILDING README $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION/html/
-find $PKG/usr/doc/$PRGNAM-$VERSION/ -type f -exec chmod 644 {} \;
+# upstream permissions are wonky, do not revert to template.
+find . -type f -a -exec chmod 644 {} + -o \
+       -type d -a -exec chmod 755 {} +
+
+# 20230417 bkw: Look in system-wide ROM directory by default.
+sed -i '/strcpy(romfile/s, ", "/usr/share/trs80-roms/,' src/trs_sdl_interface.c
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    -DSDL1=true \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true
+  "${NINJA:=ninja}" -v
+  install -D -m0755 -s $PRGNAM $PKG/usr/games/$PRGNAM
+cd ..
+
+# 20230418 bkw: use upstream's man page, but section 6.
+mkdir -p $PKG/usr/man/man6
+sed -e '/^\.TH/s, 1 , 6 ,' \
+    -e '/^\.TH/s,$, SlackBuilds.org,' \
+    src/$PRGNAM.1 \
+    | gzip -9c > $PKG/usr/man/man6/$PRGNAM.6.gz
+
+sed -i -e 's,^Exec=,&/usr/games/,' $PRGNAM.desktop
+install -D -m0644 $PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+
+# 20230418 bkw: use upstream's icon, but pre-resized.
+HICOLOR=$PKG/usr/share/icons/hicolor
+SVGICON=icons/$PRGNAM.svg
+
+for px in 16 22 32 48 64 96 128; do
+  size=${px}x${px}
+  dir=$HICOLOR/$size/apps
+  mkdir -p $dir
+  rsvg-convert -w $px -h $px -o $dir/$PRGNAM.png $SVGICON
+done
+
+mkdir -p $HICOLOR/scalable/apps
+cp -a $SVGICON $HICOLOR/scalable/apps/$PRGNAM.svg
+
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+# Include the disk images upstream ships.
+mkdir -p $PKG/usr/share/$PRGNAM
+cp -a diskimages/*.dsk $PKG/usr/share/$PRGNAM
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a CHANGELOG.md README.md *LICENSE utilities html $PKGDOC
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chmod 755 $PKG/usr/doc/$PRGNAM-$VERSION/html/images/
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sdltrs/sdltrs.desktop b/system/sdltrs/sdltrs.desktop
deleted file mode 100644
index cb4197b28f..0000000000
--- a/system/sdltrs/sdltrs.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=sdltrs
-Comment=Emulator for TRS-80
-Categories=System;
-Exec=sdltrs
-Icon=sdltrs
-Terminal=false
-StartupNotify=false
diff --git a/system/sdltrs/sdltrs.info b/system/sdltrs/sdltrs.info
index 9533a9570a..7308a23dbd 100644
--- a/system/sdltrs/sdltrs.info
+++ b/system/sdltrs/sdltrs.info
@@ -1,10 +1,10 @@
 PRGNAM="sdltrs"
-VERSION="1.1.0"
-HOMEPAGE="http://sdltrs.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/sdltrs/sdltrs_1_1_0.tar.gz"
-MD5SUM="528ef3a6b491ce7858c2d24341494a40"
+VERSION="1.2.28"
+HOMEPAGE="https://gitlab.com/jengun/sdltrs/"
+DOWNLOAD="https://gitlab.com/jengun/sdltrs/-/archive/1.2.28/sdltrs-1.2.28.tar.bz2"
+MD5SUM="1ae7542c28d9b63fcb723ba95d23e443"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Niels Horn"
-EMAIL="niels.horn@gmail.com"
+REQUIRES="trs80-roms"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/sdltrs/sdltrs.png b/system/sdltrs/sdltrs.png
deleted file mode 100644
index 6f28450c52..0000000000
--- a/system/sdltrs/sdltrs.png
+++ /dev/null
diff --git a/system/sdltrs/slack-desc b/system/sdltrs/slack-desc
index 51f059c873..a8cb6ad9e0 100644
--- a/system/sdltrs/slack-desc
+++ b/system/sdltrs/slack-desc
@@ -9,11 +9,11 @@
 sdltrs: sdltrs (Radio Shack TRS-80 Model I/III/4/4P Emulator)
 sdltrs:
 sdltrs: sdltrs is a Radio Shack TRS-80 Model I/III/4/4P emulator for
-sdltrs: Macintosh OSX, Windows and Linux.  It has been ported from the
-sdltrs: excellent X-Windows Unix emulator xtrs.  Instead of using the
+sdltrs: Macintosh OSX, Windows and Linux. It has been ported from the
+sdltrs: excellent X-Windows Unix emulator xtrs. Instead of using the
 sdltrs: X-Window system for graphics, it uses the portable SDL library.
 sdltrs:
-sdltrs: http://sdltrs.sourceforge.net/
+sdltrs:
 sdltrs:
 sdltrs:
 sdltrs:
diff --git a/system/sdwmbar/README b/system/sdwmbar/README
new file mode 100644
index 0000000000..7fb3ab2692
--- /dev/null
+++ b/system/sdwmbar/README
@@ -0,0 +1,3 @@
+Simple suckless dwm status bar
+
+Preview: `dwm-6.4  L:0.03 0.10 0.05  2023-03-05  12:47`
diff --git a/system/sdwmbar/sdwmbar.SlackBuild b/system/sdwmbar/sdwmbar.SlackBuild
new file mode 100644
index 0000000000..3d71f3a14c
--- /dev/null
+++ b/system/sdwmbar/sdwmbar.SlackBuild
@@ -0,0 +1,90 @@
+#!/bin/bash
+
+# Slackware build script for sdwmbar
+
+# Copyright 2023 Ivan Kovmir <i@kovmir.eu>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd "$(dirname "$0")" ; CWD=$(pwd)
+
+PRGNAM=sdwmbar
+VERSION=${VERSION:-1.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+NAMVER=$PRGNAM-$VERSION
+
+if [ -z "$ARCH" ]; then
+	case "$(uname -m)" in
+		i?86) ARCH=ia32 ;;
+		arm*) ARCH=aarch64 ;;
+		*) ARCH=$(uname -m) ;;
+	esac
+fi
+
+if [ -n "${PRINT_PACKAGE_NAME}" ]; then
+	echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+	exit 0
+fi
+
+TMP="${TMP:-/tmp/SBo}"
+SRC="$TMP/$NAMVER"
+PKG="$TMP/package-$PRGNAM"
+OUTPUT="${OUTPUT:-/tmp}"
+
+if [ "$ARCH" = "i586" ]; then
+	SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+	SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+	SLKCFLAGS="-O2 -fPIC"
+else
+	SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf "$PKG"
+mkdir -p "$TMP" "$PKG" "$OUTPUT"
+cd "$TMP"
+rm -rf "$PRGNAM-$VERSION"
+tar xvf "$CWD/$PRGNAM-$VERSION.tar.gz"
+cd "$PRGNAM-$VERSION"
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
+
+INSTPREFIX='/usr'
+
+make -f GNUMakefile
+DESTDIR="$PKG" PREFIX="$INSTPREFIX" make -f GNUMakefile install
+strip "$PKG$INSTPREFIX/bin/sdwmbar"
+
+mkdir -p "$PKG/install"
+mkdir -p "$PKG/usr/doc/$NAMVER"
+mkdir -p "$PKG/usr/share/$NAMVER"
+cat "$CWD/$PRGNAM.SlackBuild" > "$PKG/usr/doc/$NAMVER/$PRGNAM.SlackBuild"
+cat "$CWD/README"             > "$PKG/usr/doc/$NAMVER/README"
+cat "$CWD/slack-desc"         > "$PKG/install/slack-desc"
+
+# Copy useful things directly from the repository folder.
+cat "$SRC/README.md" > "$PKG/usr/doc/$NAMVER/repository-README.md"
+
+cd "$PKG"
+/sbin/makepkg -l y -c n "$OUTPUT/$NAMVER-$ARCH-$BUILD$TAG.$PKGTYPE"
diff --git a/system/sdwmbar/sdwmbar.info b/system/sdwmbar/sdwmbar.info
new file mode 100644
index 0000000000..cab9333b2f
--- /dev/null
+++ b/system/sdwmbar/sdwmbar.info
@@ -0,0 +1,10 @@
+PRGNAM="sdwmbar"
+VERSION="1.5"
+HOMEPAGE="https://github.com/sakhmatd/sdwmbar"
+DOWNLOAD="https://github.com/sakhmatd/sdwmbar/archive/1.5/sdwmbar-1.5.tar.gz"
+MD5SUM="e2e992d0ead9d01e5d858477e3756e7d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Ivan Kovmir"
+EMAIL="i@kovmir.eu"
diff --git a/system/sdwmbar/slack-desc b/system/sdwmbar/slack-desc
new file mode 100644
index 0000000000..06a7b308e0
--- /dev/null
+++ b/system/sdwmbar/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+sdwmbar: sdwmbar (dwm status bar)
+sdwmbar:
+sdwmbar: Simple suckless dwm status bar
+sdwmbar:
+sdwmbar:
+sdwmbar:
+sdwmbar:
+sdwmbar:
+sdwmbar:
+sdwmbar: https://github.com/sakhmatd/sdwmbar
+sdwmbar:
diff --git a/system/seahorse/seahorse.SlackBuild b/system/seahorse/seahorse.SlackBuild
index 7a5520cb3b..56e3065951 100644
--- a/system/seahorse/seahorse.SlackBuild
+++ b/system/seahorse/seahorse.SlackBuild
@@ -1,30 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for seahorse
 
 # Written by Andrew Rowland (weibullguy@gmail.com)
 # Updated to version 3.8.1 by Andrew Rowland
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=seahorse
 VERSION=${VERSION:-3.18.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -83,4 +93,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/secure-delete/secure-delete.SlackBuild b/system/secure-delete/secure-delete.SlackBuild
index 3d05a44e21..f5eddeaf73 100644
--- a/system/secure-delete/secure-delete.SlackBuild
+++ b/system/secure-delete/secure-delete.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for secure-delete.
 #
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=secure-delete
 VERSION=${VERSION:-3.1_6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -98,4 +108,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sensord/README b/system/sensord/README
new file mode 100644
index 0000000000..e8b5190d7a
--- /dev/null
+++ b/system/sensord/README
@@ -0,0 +1,22 @@
+sensord is an rrd-based logger for lm_sensors
+
+Sensord is a daemon that can be used to periodically log sensor
+       readings from hardware health-monitoring chips to syslog(3) or
+       a round- robin database (RRD) and to alert when a sensor alarm
+       is signalled; for example, if a fan fails, a temperature limit
+       is exceeded, etc.
+
+A classic redhat-style initscript is shipped in the doc directory,
+
+A command similar to this one would log sensor data into a file under
+/var/log:
+
+/usr/sbin/sensord -i1m -l30m -1 -t3m -r/var/log/sensord.rrd -d -a
+
+Viewing the graph requires a bit of rrdtool mastery, but
+man sensord suggest an option to generate a cgi script to be
+used by rrdcgi and delivered through a CGI-supporting web server.
+
+Nginx (not shipped with Slackware, but popular) does not support
+CGI, so you may have to delve into fcgiwrap and/or spawn-fcgi.
+
diff --git a/system/sensord/sensord.SlackBuild b/system/sensord/sensord.SlackBuild
new file mode 100644
index 0000000000..1f5b20aa94
--- /dev/null
+++ b/system/sensord/sensord.SlackBuild
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+# Slackware build script for sensord
+
+# Copyright 2024, Lockywolf
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=sensord
+VERSION=${VERSION:-3.6.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+TARNAM=lm-sensors
+TARVER=${VERSION//./-}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $TARNAM-$TARVER
+tar xvf $CWD/$TARNAM-$TARVER.tar.gz
+cd $TARNAM-$TARVER
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
+
+make user PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} PROG_EXTRA=sensord || exit 1
+#make user_install PROG_EXTRA=sensord PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG || exit 1
+
+mkdir -p $PKG/usr/sbin $PKG/usr/man/man8
+install -m 755 prog/sensord/sensord $PKG/usr/sbin
+install -m 644 prog/sensord/sensord.8 $PKG/usr/man/man8
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  ./prog/init/sensord.init \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sensord/sensord.info b/system/sensord/sensord.info
new file mode 100644
index 0000000000..eed802225d
--- /dev/null
+++ b/system/sensord/sensord.info
@@ -0,0 +1,10 @@
+PRGNAM="sensord"
+VERSION="3.6.0"
+HOMEPAGE="https://hwmon.wiki.kernel.org/"
+DOWNLOAD="https://github.com/lm-sensors/lm-sensors/archive/V3-6-0/lm-sensors-3-6-0.tar.gz"
+MD5SUM="f60e47b5eb50bbeed48a9f43bb08dd5e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="rrdtool"
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.sensord_2024-02-10@lockywolf.net"
diff --git a/system/sensord/slack-desc b/system/sensord/slack-desc
new file mode 100644
index 0000000000..34286bf222
--- /dev/null
+++ b/system/sensord/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+sensord: sensord (Sensor information logging daemon)
+sensord:
+sensord: sensord is developed together with lm_sensors, and is intended to log
+sensord: sensors data into an rrd database.
+sensord:
+sensord: Slackware does not ship rrdtool, so in this case sensord is provided
+sensord: as a SlackBuild.
+sensord:
+sensord:
+sensord:
+sensord:
diff --git a/system/sentimental-skk/README b/system/sentimental-skk/README
index 85d8cfb6af..c3dede662b 100644
--- a/system/sentimental-skk/README
+++ b/system/sentimental-skk/README
@@ -1,8 +1,8 @@
 Sentimental SKK
 
-This program provides Simple Kana Kanji conversion (SKK) input method service
-to your terminal.
+This program provides Simple Kana Kanji conversion (SKK) input method
+service to your terminal.
 
-It depends on "Canossa"(https://github.com/saitoha/canossa), which is an 
-off-screen terminal emulation service, "Canossa" makes application enable
-to restore specified screen region on demand!!
+It depends on "Canossa"(https://github.com/saitoha/canossa), which is
+an off-screen terminal emulation service, "Canossa" makes application
+enable to restore specified screen region on demand!!
diff --git a/system/sentimental-skk/sentimental-skk.SlackBuild b/system/sentimental-skk/sentimental-skk.SlackBuild
index 6b093fced4..79a19aa412 100644
--- a/system/sentimental-skk/sentimental-skk.SlackBuild
+++ b/system/sentimental-skk/sentimental-skk.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sentimental-skk
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sentimental-skk
 VERSION=${VERSION:-0.0.146}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -82,4 +92,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ser2net/ser2net.SlackBuild b/system/ser2net/ser2net.SlackBuild
index dae2477aaf..73343853ce 100644
--- a/system/ser2net/ser2net.SlackBuild
+++ b/system/ser2net/ser2net.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # slackware build script for ser2net
 # Written Evandro Alves Rodrigues evandrofisico@gmail.com
 #
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ser2net
 VERSION=${VERSION:-2.7}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -17,7 +20,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -80,4 +90,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/set_rlimits/set_rlimits.SlackBuild b/system/set_rlimits/set_rlimits.SlackBuild
index 9eca567c64..899a1fc538 100644
--- a/system/set_rlimits/set_rlimits.SlackBuild
+++ b/system/set_rlimits/set_rlimits.SlackBuild
@@ -1,14 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for set_rlimits 1.2.0
 # Slackbuild script by paul wisehart wise@lupulin.net
 
 # Modified by the SlackBuilds Project
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=set_rlimits
 VERSION=${VERSION:-1.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -18,7 +21,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -77,4 +87,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/setconf/setconf.SlackBuild b/system/setconf/setconf.SlackBuild
index 5efa224d3e..14c5f5ded9 100644
--- a/system/setconf/setconf.SlackBuild
+++ b/system/setconf/setconf.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for setconf
 
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=setconf
 VERSION=${VERSION:-0.7.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -61,4 +71,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/shake/README b/system/shake/README
index 0750c439ff..989999ae4c 100644
--- a/system/shake/README
+++ b/system/shake/README
@@ -1,4 +1,4 @@
-Shake is a filesystem defragmenter that runs in userspace.
+shake: shake (filesystem defragmenter that runs in userspace)
 
 Contrary to xfs_fsr, it uses functions common to all filesystems and
 can be used to selectively defragment files.
diff --git a/system/shake/shake-dev_t-include.patch b/system/shake/shake-dev_t-include.patch
deleted file mode 100644
index 19ca1c2ae9..0000000000
--- a/system/shake/shake-dev_t-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- judge.h_old	2013-11-15 22:00:35.085301859 +0100
-+++ judge.h	2013-11-15 22:00:54.811967958 +0100
-@@ -22,6 +22,7 @@
- #include <stdbool.h>
- #include <fcntl.h>
- #include <time.h>
-+#include <sys/stat.h>
- typedef unsigned int uint;
- typedef long long int llint;
- 
diff --git a/system/shake/shake.SlackBuild b/system/shake/shake.SlackBuild
index 12d0d10815..8d8b9be807 100644
--- a/system/shake/shake.SlackBuild
+++ b/system/shake/shake.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for shake
 
@@ -22,26 +22,36 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220212 bkw: Modified by SlackBuilds.org:
+# - updated for v1.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=shake
-VERSION=${VERSION:-0.999}
+VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -59,50 +69,45 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-fs-$VERSION
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-fs-$VERSION
+cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# patch for "error: unknown type name 'dev_t'"
-patch -p0 < $CWD/shake-dev_t-include.patch
-
+find . -type f -exec chmod 644 {} \+
+find . -type d -exec chmod 755 {} \+
+
+# 20220212 bkw: put man pages in the right place, and since these are
+# sysadmin tools (section 8 manpages), put the binaries in /usr/sbin.
+sed -i -e '/DESTINATION/s,share/man,man,' \
+       -e '/DESTINATION/s,bin,sbin,' \
+       CMakeLists.txt
+
+# 20220212 bkw: sorry, this bugs me.
+sed -i 's,choosen,chosen,g' doc/unattr-man_insert unattr.c
+sed -i -e 's,there is no,there are no,g' \
+       -e 's,shake read from,shake reads from,g' \
+       doc/shake-man_insert \
+       msg.c
+
+mkdir -p build
 cd build
-CFLAGS="$SLKCFLAGS" \
-cmake \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DCMAKE_BUILD_TYPE=Release \
-  ..
-
-make VERBOSE=1
-make install DESTDIR=$PKG
-cd -
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-#Move manpages manually
-mkdir $PKG/usr/man
-mv $PKG/usr/share/man/* $PKG/usr/man/
-rm -R $PKG/usr/share
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+  cmake \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -DNDEBUG" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make VERBOSE=1
+  make install/strip DESTDIR=$PKG
+cd ..
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  GPL.txt INSTALL NEWS \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-chmod -R 644 $PKG/usr/doc/$PRGNAM-$VERSION/*
+cp -a README.md doc/FDL.txt GPL.txt NEWS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/shake/shake.info b/system/shake/shake.info
index 31bbf27b23..9651d259be 100644
--- a/system/shake/shake.info
+++ b/system/shake/shake.info
@@ -1,8 +1,8 @@
 PRGNAM="shake"
-VERSION="0.999"
-HOMEPAGE="https://savannah.nongnu.org/projects/shake"
-DOWNLOAD="http://mirror.lihnidos.org/GNU/savannah/shake/shake-0.999.tar.gz"
-MD5SUM="20b5086ec8920ad91528dec81a576c1d"
+VERSION="1.0"
+HOMEPAGE="http://vleu.net/shake/"
+DOWNLOAD="https://github.com/unbrice/shake/archive/v1.0/shake-1.0.tar.gz"
+MD5SUM="e5759e180b765a6ff13e77d775652e92"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/shake/slack-desc b/system/shake/slack-desc
index 4a92f4b719..e546b7dea0 100644
--- a/system/shake/slack-desc
+++ b/system/shake/slack-desc
@@ -12,7 +12,7 @@ shake: Contrary to xfs_fsr, it uses functions common to all filesystems and
 shake: can be used to selectively defragment files.
 shake: For best results, mount your partitions with the user_xattr option.
 shake:
-shake: Homepage: https://savannah.nongnu.org/projects/shake
+shake:
 shake:
 shake:
 shake:
diff --git a/system/signify/README b/system/signify/README
index 77a8b58724..9ca66cf859 100644
--- a/system/signify/README
+++ b/system/signify/README
@@ -1,12 +1,12 @@
-OpenBSD tool to signs and verify signatures on files. Portable version.
+OpenBSD tool to sign and verify signatures on files. Portable version.
 
 The signify utility creates and verifies cryptographic signatures.
 A signature verifies the integrity of a message.
 
 The key and signature files created by signify have the same format.
-The first line of the file is a free form text comment that may be edited,
-so long as it does not exceed a single line. Signature comments will be
-generated based on the name of the secret key used for signing.
-This comment can then be used as a hint for the name of the public key
-when verifying. The second line of the file is the actual key or signature
-base64 encoded.
+The first line of the file is a free form text comment that may
+be edited, so long as it does not exceed a single line. Signature
+comments will be generated based on the name of the secret key used
+for signing. This comment can then be used as a hint for the name
+of the public key when verifying. The second line of the file is the
+actual key or signature base64 encoded.
diff --git a/system/signify/signify.SlackBuild b/system/signify/signify.SlackBuild
index 9c86f16547..9afce0fc59 100644
--- a/system/signify/signify.SlackBuild
+++ b/system/signify/signify.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for signify
 
-# Copyright 2017 Frédéric Galusik, Lyon, France
+# Copyright 2017 - 2022 Frederic Galusik, Bordeaux, France
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=signify
-VERSION=${VERSION:-20}
+VERSION=${VERSION:-31}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,7 +67,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -94,4 +101,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/signify/signify.info b/system/signify/signify.info
index 975de614f0..72af13d541 100644
--- a/system/signify/signify.info
+++ b/system/signify/signify.info
@@ -1,10 +1,10 @@
 PRGNAM="signify"
-VERSION="20"
+VERSION="31"
 HOMEPAGE="https://github.com/aperezdc/signify"
-DOWNLOAD="https://github.com/aperezdc/signify/archive/v20/signify-20.tar.gz"
-MD5SUM="6d8421fd1c22c35166e5daf1903240e7"
+DOWNLOAD="https://github.com/aperezdc/signify/releases/download/v31/signify-31.tar.xz"
+MD5SUM="363cb222ecff75de96255241073b547d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libbsd"
-MAINTAINER="Frédéric Galusik"
-EMAIL="slack+SBo@galusik.xyz"
+MAINTAINER="Frederic Galusik"
+EMAIL="f@galusik.fr"
diff --git a/system/siji-font/siji-font.SlackBuild b/system/siji-font/siji-font.SlackBuild
index f82f75eb08..861b4353c6 100644
--- a/system/siji-font/siji-font.SlackBuild
+++ b/system/siji-font/siji-font.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for siji-font
 
@@ -22,17 +22,27 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=siji-font
 VERSION=${VERSION:-20171023_2546822}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=${PRGNAM%-*}
 SRCVER=25468227348e2d4b3abbc163b2e2d68882fa2ba6
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,4 +77,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/skim/README b/system/skim/README
index 5f5f45da93..a5a02f1a73 100644
--- a/system/skim/README
+++ b/system/skim/README
@@ -1,2 +1,10 @@
-skim is a fuzzy finder that can be used as a general filter like grep or as an
-interactive interface for invoking commands.
+skim is a fuzzy finder that can be used as a general filter like grep
+or as an interactive interface for invoking commands.
+
+Vim Users: A skim.vim plugin is installed to
+/usr/share/vim/vimfiles/plugin. If you'd rather exclude the plugin,
+or only manually enable it in your vim, you can build with:
+
+WITH_VIM=no ./skim.SlackBuild
+
+and the plugin will be installed to /usr/share/skim/vim/ instead.
diff --git a/system/skim/skim.SlackBuild b/system/skim/skim.SlackBuild
index 4a57244887..07044715ce 100644
--- a/system/skim/skim.SlackBuild
+++ b/system/skim/skim.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for skim
 
 # Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2023 Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +23,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=skim
 BINNAM=sk
-VERSION=${VERSION:-0.9.3}
+VERSION=${VERSION:-0.10.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -42,7 +46,11 @@ if [ -z "$ARCH" ]; then
   fi
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -50,15 +58,15 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
-  CARGOTARGET="--target i586-unknown-linux-gnu"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-  CARGOTARGET="--target i686-unknown-linux-gnu"
-elif [ "$ARCH" = "x86_64" ]; then
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
+elif [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "aarch64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  CARGOTARGET="--target x86_64-unknown-linux-gnu"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -120,7 +128,7 @@ mkdir vendor
       sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
 
       printf "}\n"
-    } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json
+    } > $dep-$ver/.cargo-checksum.json
   done
 )
 
@@ -131,22 +139,51 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
+CARGO_HOME=.cargo \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 cargo build --offline --release $CARGOTARGET
 
 mkdir -p $PKG/usr/bin/
 find target -name $BINNAM -exec install -m 755 {} $PKG/usr/bin/$BINNAM \;
+install -m 755 bin/sk-tmux $PKG/usr/bin/sk-tmux
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/etc/bash_completion.d
-install -m 755 shell/completion.bash $PKG/etc/bash_completion.d/skim
+WITH_VIM=${WITH_VIM:-yes}
+if [ "$WITH_VIM" = "yes" ] ; then
+  mkdir -p $PKG/usr/share/vim/vimfiles/plugin
+  install -m 0644 plugin/skim.vim $PKG/usr/share/vim/vimfiles/plugin
+
+  # neovim support
+  mkdir -p $PKG/usr/share/nvim/runtime/plugin
+  (
+    cd $PKG/usr/share/nvim/runtime
+
+
+    ln -s ../../../vim/vimfiles/plugin/skim.vim plugin/skim.vim
+  )
+else
+  mkdir -p $PKG/usr/share/skim/vim/
+  install -m 0644 plugin/skim.vim $PKG/usr/share/skim/vim/
+fi
+
+mkdir -p $PKG/usr/share/bash-completion/completions
+install -m 644 shell/completion.bash $PKG/usr/share/bash-completion/completions/skim
 
 mkdir -p $PKG/usr/man/man1
 cp -a man/man1/*.1 $PKG/usr/man/man1
-gzip -9 $PKG/usr/man/man1/*.1
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a -r \
@@ -158,4 +195,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/skim/skim.info b/system/skim/skim.info
index 2417bc73aa..c47014a35f 100644
--- a/system/skim/skim.info
+++ b/system/skim/skim.info
@@ -1,174 +1,214 @@
 PRGNAM="skim"
-VERSION="0.9.3"
+VERSION="0.10.4"
 HOMEPAGE="https://github.com/lotabout/skim"
-DOWNLOAD="https://github.com/lotabout/skim/archive/v0.9.3/skim-0.9.3.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayref/arrayref-0.3.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.5.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.12.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/beef/beef-0.4.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/blake2b_simd/blake2b_simd-0.5.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.61.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.19.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/constant_time_eq/constant_time_eq-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam/crossbeam-0.7.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.4.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-deque/crossbeam-deque-0.7.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-epoch/crossbeam-epoch-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-queue/crossbeam-queue-0.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/darling/darling-0.10.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/darling_core/darling_core-0.10.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/darling_macro/darling_macro-0.10.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/defer-drop/defer-drop-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/derive_builder/derive_builder-0.9.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/derive_builder_core/derive_builder_core-0.9.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs/dirs-2.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-sys/dirs-sys-0.3.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/either/either-1.6.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/env_logger/env_logger-0.6.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fuzzy-matcher/fuzzy-matcher-0.3.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.15.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.17.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/humantime/humantime-1.3.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ident_case/ident_case-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.79.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/maybe-uninit/maybe-uninit-2.0.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/memoffset/memoffset-0.5.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.14.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.43.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.12.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/once_cell/once_cell-1.4.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.24.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quick-error/quick-error-1.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon/rayon-1.4.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon-core/rayon-core-1.8.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.57.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.3.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.4.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.20.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rust-argon2/rust-argon2-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-1.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/shlex/shlex-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.9.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.44.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/term/term-0.6.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.44.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/timer/timer-0.2.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tuikit/tuikit-0.4.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8parse/utf8parse-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/void/void-1.0.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vte/vte-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.10.0+wasi-snapshot-preview1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate"
-MD5SUM="2abbd7cdb12dfdf0ac71c221bcfef619 \
-        d00e12a7f092ab591790a9a5323f72c0 \
-        294a49d3c53865fa7ac5d0ce2f5d5735 \
-        6ff474dd60c839a9c788844b7a42c72c \
-        38a5278571eefda86428a8ebfc1cedc2 \
+DOWNLOAD="https://github.com/lotabout/skim/archive/v0.10.4/skim-0.10.4.tar.gz \
+          https://static.crates.io/crates/aho-corasick/aho-corasick-0.7.19.crate \
+          https://static.crates.io/crates/android_system_properties/android_system_properties-0.1.5.crate \
+          https://static.crates.io/crates/arrayvec/arrayvec-0.7.2.crate \
+          https://static.crates.io/crates/atty/atty-0.2.14.crate \
+          https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \
+          https://static.crates.io/crates/beef/beef-0.5.2.crate \
+          https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \
+          https://static.crates.io/crates/bumpalo/bumpalo-3.11.1.crate \
+          https://static.crates.io/crates/cc/cc-1.0.73.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://static.crates.io/crates/chrono/chrono-0.4.22.crate \
+          https://static.crates.io/crates/clap/clap-3.2.22.crate \
+          https://static.crates.io/crates/clap_lex/clap_lex-0.2.4.crate \
+          https://static.crates.io/crates/codespan-reporting/codespan-reporting-0.11.1.crate \
+          https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.3.crate \
+          https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.6.crate \
+          https://static.crates.io/crates/crossbeam-deque/crossbeam-deque-0.8.2.crate \
+          https://static.crates.io/crates/crossbeam-epoch/crossbeam-epoch-0.9.11.crate \
+          https://static.crates.io/crates/crossbeam-queue/crossbeam-queue-0.3.6.crate \
+          https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.12.crate \
+          https://static.crates.io/crates/crossbeam/crossbeam-0.8.2.crate \
+          https://static.crates.io/crates/cxx-build/cxx-build-1.0.80.crate \
+          https://static.crates.io/crates/cxx/cxx-1.0.80.crate \
+          https://static.crates.io/crates/cxxbridge-flags/cxxbridge-flags-1.0.80.crate \
+          https://static.crates.io/crates/cxxbridge-macro/cxxbridge-macro-1.0.80.crate \
+          https://static.crates.io/crates/darling/darling-0.14.1.crate \
+          https://static.crates.io/crates/darling_core/darling_core-0.14.1.crate \
+          https://static.crates.io/crates/darling_macro/darling_macro-0.14.1.crate \
+          https://static.crates.io/crates/defer-drop/defer-drop-1.3.0.crate \
+          https://static.crates.io/crates/derive_builder/derive_builder-0.11.2.crate \
+          https://static.crates.io/crates/derive_builder_core/derive_builder_core-0.11.2.crate \
+          https://static.crates.io/crates/derive_builder_macro/derive_builder_macro-0.11.2.crate \
+          https://static.crates.io/crates/dirs-next/dirs-next-2.0.0.crate \
+          https://static.crates.io/crates/dirs-sys-next/dirs-sys-next-0.1.2.crate \
+          https://static.crates.io/crates/either/either-1.8.0.crate \
+          https://static.crates.io/crates/env_logger/env_logger-0.9.1.crate \
+          https://static.crates.io/crates/fnv/fnv-1.0.7.crate \
+          https://static.crates.io/crates/fuzzy-matcher/fuzzy-matcher-0.3.7.crate \
+          https://static.crates.io/crates/getrandom/getrandom-0.2.8.crate \
+          https://static.crates.io/crates/hashbrown/hashbrown-0.12.3.crate \
+          https://static.crates.io/crates/hermit-abi/hermit-abi-0.1.19.crate \
+          https://static.crates.io/crates/humantime/humantime-2.1.0.crate \
+          https://static.crates.io/crates/iana-time-zone-haiku/iana-time-zone-haiku-0.1.1.crate \
+          https://static.crates.io/crates/iana-time-zone/iana-time-zone-0.1.51.crate \
+          https://static.crates.io/crates/ident_case/ident_case-1.0.1.crate \
+          https://static.crates.io/crates/indexmap/indexmap-1.9.1.crate \
+          https://static.crates.io/crates/js-sys/js-sys-0.3.60.crate \
+          https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \
+          https://static.crates.io/crates/libc/libc-0.2.135.crate \
+          https://static.crates.io/crates/link-cplusplus/link-cplusplus-1.0.7.crate \
+          https://static.crates.io/crates/log/log-0.4.17.crate \
+          https://static.crates.io/crates/memchr/memchr-2.5.0.crate \
+          https://static.crates.io/crates/memoffset/memoffset-0.6.5.crate \
+          https://static.crates.io/crates/nix/nix-0.24.2.crate \
+          https://static.crates.io/crates/nix/nix-0.25.0.crate \
+          https://static.crates.io/crates/num-integer/num-integer-0.1.45.crate \
+          https://static.crates.io/crates/num-traits/num-traits-0.2.15.crate \
+          https://static.crates.io/crates/num_cpus/num_cpus-1.13.1.crate \
+          https://static.crates.io/crates/num_threads/num_threads-0.1.6.crate \
+          https://static.crates.io/crates/once_cell/once_cell-1.15.0.crate \
+          https://static.crates.io/crates/os_str_bytes/os_str_bytes-6.3.0.crate \
+          https://static.crates.io/crates/pin-utils/pin-utils-0.1.0.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.47.crate \
+          https://static.crates.io/crates/quote/quote-1.0.21.crate \
+          https://static.crates.io/crates/rayon-core/rayon-core-1.9.3.crate \
+          https://static.crates.io/crates/rayon/rayon-1.5.3.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.2.16.crate \
+          https://static.crates.io/crates/redox_users/redox_users-0.4.3.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.27.crate \
+          https://static.crates.io/crates/regex/regex-1.6.0.crate \
+          https://static.crates.io/crates/rustversion/rustversion-1.0.9.crate \
+          https://static.crates.io/crates/scopeguard/scopeguard-1.1.0.crate \
+          https://static.crates.io/crates/scratch/scratch-1.0.2.crate \
+          https://static.crates.io/crates/shlex/shlex-1.1.0.crate \
+          https://static.crates.io/crates/strsim/strsim-0.10.0.crate \
+          https://static.crates.io/crates/syn/syn-1.0.103.crate \
+          https://static.crates.io/crates/term/term-0.7.0.crate \
+          https://static.crates.io/crates/termcolor/termcolor-1.1.3.crate \
+          https://static.crates.io/crates/textwrap/textwrap-0.15.1.crate \
+          https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.37.crate \
+          https://static.crates.io/crates/thiserror/thiserror-1.0.37.crate \
+          https://static.crates.io/crates/thread_local/thread_local-1.1.4.crate \
+          https://static.crates.io/crates/time/time-0.1.44.crate \
+          https://static.crates.io/crates/time/time-0.3.15.crate \
+          https://static.crates.io/crates/timer/timer-0.2.0.crate \
+          https://static.crates.io/crates/tuikit/tuikit-0.5.0.crate \
+          https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.5.crate \
+          https://static.crates.io/crates/unicode-width/unicode-width-0.1.10.crate \
+          https://static.crates.io/crates/utf8parse/utf8parse-0.2.0.crate \
+          https://static.crates.io/crates/vte/vte-0.11.0.crate \
+          https://static.crates.io/crates/vte_generate_state_changes/vte_generate_state_changes-0.1.1.crate \
+          https://static.crates.io/crates/wasi/wasi-0.10.0+wasi-snapshot-preview1.crate \
+          https://static.crates.io/crates/wasi/wasi-0.11.0+wasi-snapshot-preview1.crate \
+          https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.83.crate \
+          https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.83.crate \
+          https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.83.crate \
+          https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.83.crate \
+          https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.83.crate \
+          https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi-util/winapi-util-0.1.5.crate \
+          https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi/winapi-0.3.9.crate"
+MD5SUM="8e1431e2054692680a9d00ed3703f424 \
+        d67bff45f921eea8a4a4890cddf70e6c \
+        bf23cd323c33a8c283c41bb9b79e4ce4 \
+        499a258fd90cc30a46c5afc894e7fe96 \
         142cb4b9a653e56e56311f0c883b8582 \
-        c6443ec8d007c729ba5482008d0c864d \
-        600137b12b6b717eec0f376bc6680540 \
-        1b84be3a44c44500abfd1e9f6adc2ded \
-        6799c26a7eacaf8e58d3e45c6c5add89 \
-        085f6f44e54f62691bf3cf3365f5544a \
-        87343079a03b28726b323c5c40c9167c \
-        882dbbc613a93f64c3709b0a2bd0d6dc \
-        1581b390d17f6e73a43ffc8a7b009e57 \
-        bc79e0eb364df515a33755ac9a581cfd \
-        ec9751a4c0d35e7313e52ddb7147376b \
-        22ed3b5d9a15917e74e09d7f600b1608 \
-        093c5099d3cef0f418550fe28788d34d \
-        897911f15f349a357899045e6b0c04e0 \
-        49b4b022e9fa4cc60376a79ecb39d04f \
-        836bbd6315ea443caf33fe3394ea4991 \
-        ff67cf2eb9668167782b8012d3b48e7b \
-        a42201f337a8d7cd51aae9e5ecad91f0 \
-        b1c8b47b8fc9077b6a6aadc47c819115 \
-        5663ea952316dfff411bc1ef78c1979d \
-        1d0a8951a71eff8e28acc555152902ac \
-        a9045fa57c1e4ed702e51da973b658cb \
-        2ff8927b9cc3e6bcec18745859808751 \
-        8b418106a3968619300a2af8f6b4f200 \
-        8b70009baf55df3c0eea3582883f148b \
-        b4e2b229c362ad0dd313ff631816d5db \
-        034a5cb6f2dd0fe6602fbe95806b678b \
+        05d77ef52e90ad161fdd41b252420467 \
+        11cc36bd487629c8aca8eb121fae0c8d \
+        a295edb6953237ebbdfa8e731229f9a3 \
+        ae7cef17432deef88eccb128126e0b1f \
+        8e3a4d0980acef2c4e74485a45de29a9 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        0a6cbf6ef95c7e7db7837f58db8d1773 \
+        93e15a5ac07c68393778ab34b90e7d69 \
+        a2e1b64489b6bdae548ec08f883eaecf \
+        faa32da3be14130a4525bb7ba601c62e \
+        d05cbf26ed52299487a802688a1d22cb \
+        0324dfd2b4384ae8c82433bd0efdabf8 \
+        5a734a3aa2e5a9f47b3c05ae597a21fa \
+        38332d69b151e9471b3d60ff48cf4e32 \
+        5dffbbb1a93f0a09ca1b38d2eb41dc72 \
+        5dc694071fea9eb300bb47b221f05373 \
+        275b369d81fc7f92f4ad2a7adc6ca74b \
+        9243a0df6659f9a457f18beb64c37df3 \
+        7786564afcc58a685abf8f7bacf408e8 \
+        cee3a786cb9a709ab1e47532326f6360 \
+        c1afdde4dbd6986e1a2d39bba782063a \
+        c157f7cd1552a17ba25f6414cc69bf8d \
+        c610a98f8287157214e2d4b83284fa21 \
+        d0ac0be612dce2aa4ddc3d88219974f5 \
+        4416e8c045e3856d1aeb4ee4f5646d30 \
+        93eb44c0dcc750ed4c4d2176a5fa5d3a \
+        54594bd9dbe8303c38e1c70429879b8d \
+        60d69f475d3d2f6e0833d182cb86eafc \
+        3681f813c502d911e9eea940dddd26a5 \
+        056c8d712ee146347c412b72f4077b2f \
+        212574e303e85b9101f495e021eb701b \
+        e1314db984066175c7db2801d572cf11 \
         8dab3b3ec00dc56cffde0b0c410d47b5 \
         39767ee14933b0006f02f295314668af \
-        704babd757a22f163230a36fa5474890 \
-        553b325a602b701eb7eaef228e69d0f2 \
-        bb2582cae7b3d837f5da1df153001db5 \
+        7e3435db94bbfde52efb6e639cfff542 \
+        1b41b97d982520b7364a87a39e2a1ed8 \
+        0b7994d1256215201bdfb810a357ffa2 \
+        c01022fe0357c10ca1d48b16187f81bd \
+        1e49f16311d2a62e44c05750c0ec0dc7 \
+        a1ba8a4f22e9124e2538f37bb12baf0e \
         fe77a3f609b6fd8d5b08f3b2ef14d2ad \
+        9473c008d472707d1aa3273d7cbabb96 \
+        b758e6307968eb4b33e5fbe08ac79878 \
         fba3b040a55c01be7376d3dd5c4d4920 \
-        7aef65438636d8662cd61e77c42c28f0 \
-        f50d2e280b4a3491fffda43b90982544 \
-        b5cf10e268e8a3bee2de8a734104245e \
-        124ec4f35274a0e9c1a4ef3dc0958643 \
-        5d9532411dde9442741983efd0961351 \
-        0cddb62b3dcfb814b4e0b9441c5c1a18 \
-        759816fe5b617674ae5dee83e3c3e6e2 \
-        2daa59d0efd38e9b5fbb2658b080eaa1 \
-        c36d452e37c73b1e99f40bae18cddfdb \
-        a37a5b604bc2fd746aaa12623bab6154 \
-        0736e4f76f4f8f0a29563b0608ca3974 \
-        3181dca31efe33cbed29a45d0ec67848 \
-        63b29211eef9ccee0b0401d423db0efd \
-        5ceb2f0194476fd7a5f603646690a29e \
-        bdce8d6ae27394b8e0334d7b1152582b \
-        3cc3a4bd5861ca93d7c0d19129334703 \
-        870008bba2e68db4988c31e511fbd9c4 \
-        a9ba533889383bc3cb9999ec7dc06a5c \
-        c0e4e83c5ae5f75f410559f7ab3d39fa \
-        8557ac6195186e216af6b33bc6ab9f8c \
+        bbce56154945f1ec06b8c8e16a86e515 \
+        d3603cbda3d2711cc62162e08e4950cd \
+        b31bf94ffe7e0f2ada93afae1076eaeb \
+        94b8bf179385ff071bdc33b58bf047c0 \
+        76124c2327f642cddf19a4aa50cbcb7d \
+        8ccfe88c62ae19423e4167343bcf7be1 \
+        3b02314fa7ee8a999634631ad54af44f \
+        073b4c53e303ccf2a807dfce7f5e986a \
+        a0de6eabdeb1320350abcbd7c02df6ac \
+        c5e50e299295e662ad19c58428d6e085 \
+        ae2471729f689287aec9da43f8106a4b \
+        81bd380ba31052f9c84f5e71e8c0ee52 \
+        64de3398e82ebbe60ed771948179d375 \
+        07c75fec267864bcbb800ca7709ceae2 \
+        487f06e2ab256c39cdd4a404814532bb \
+        1de20a0fc1cfdf5e332cbdb2e0899a2b \
+        4df2c80615b7827c19c735c047a7c82f \
+        5d8cb7121bd2954f7cbb189eacd90c08 \
+        16111f31a29feae4ce4a324b83dc0189 \
+        2793ed3e6807d79ff72271baec586531 \
+        eae2f2a5c23013ff8849962c49844095 \
+        91b6b40d2d4c43ea78a8fa15b6b9b3d7 \
+        d782fe02c9ccf016f6bcadcc90d6265a \
         b4a0a98a54439a5a37952c8879187ee3 \
-        e4e7efe2ab7921499d5c247a349e9e1f \
-        781d4ccf5d04c98fa02af207a9639249 \
-        90253ab52670a0551a533eb78a1f6b10 \
-        6ea0679ddba8be454d35266e69f4b660 \
-        03a495cfd0e710b3528a8792883e2572 \
-        62e883807a65ebe1ba9d0e555d703339 \
-        a8de006fe0c7e373c560dd51599287a8 \
-        a5dd75e77c7324f5c1d2d372c990d0a7 \
+        003c86d62de7c9a356133a2619520141 \
+        0bfb08b9dd5df72ba5ed7d74dd5fe6eb \
+        82d98dc87dc8503400aa095f5aa70f13 \
+        51f0ea5d3f9ba09041383de851062c75 \
+        53928078ab8d120d5459d86d64bbc1ef \
+        40ce77bc7803d0ff8734f6a11c4e8814 \
+        e35a9158fcb2c35183dde4ce83f39bfb \
+        1688ae2cb59368d0b35c9913ebc06dad \
+        a1fa70e992507a9d15a30b054b07591a \
+        d03f75b223b8c2a58c73971ec0227fc0 \
         c6c50e4feea5f4cc4e1fb3c7e88606a5 \
+        e7c0def3e60f57a045730c910cb8433a \
         a2eb00593ac747dfeced9d0376bd3728 \
-        be0ab0224b25643007ce9ec88878fb88 \
-        4272c279b06b88f8b0ffce7109348e27 \
-        a51c43692084979295641a7ffba4b297 \
-        3b656a3aebdf60145eb01a1300cd85ca \
-        333b4ba3f64c35b6f89b521e8d64548b \
-        689203efc084fc0f1d1f74f5d354ae75 \
-        9f49c12903d0319936054bf1c128f112 \
+        2bc9f2b19b122914d99c95530feaabba \
+        15b1826d931453eef20babb0f1f4fe2d \
+        7d6d4fc9fad200d6e295f6930e97e022 \
+        9d83f7627e511837fb2d94fbad338d35 \
+        dad7368fc688b43a38b6b06af1e18ff0 \
+        a29fec77b1e07caf7b682b881b676c06 \
         a312b55a428f827a91097d1d8497b02b \
-        6e23e0eee42b1ba9ec61a6db7ec2dc08 \
-        0498c4a11448bfc35dc7bb2caa64c753 \
+        e972ea58ec203bfa6c79c1207852298b \
+        bb789e1e7b841ebbde3e6393fc2337a3 \
+        97b79fe13241e09751a08520ba0e7f28 \
+        f0b95fd0ef51d09b504852cdce3720dd \
+        2444d343904d41ce5b8b8964b7bbaa6c \
+        4c0a0c6c834a788605ce396729718ef7 \
         db96b50050277bf05a3c68534bbb9586 \
         b9e37d5fc4ad28b612b78ad37816684d \
-        09de9d01e7331ff3da11f58be8bef0df"
+        09de9d01e7331ff3da11f58be8bef0df \
+        0498c4a11448bfc35dc7bb2caa64c753"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
+REQUIRES="rust16"
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"
diff --git a/system/skopeo/README b/system/skopeo/README
index faf0aa1990..dc9b9bf48b 100644
--- a/system/skopeo/README
+++ b/system/skopeo/README
@@ -1,7 +1,7 @@
-skopeo is a command line utility that performs various operations on container
-images and image repositories. It can work with OCI images as well as the
-original Docker v2 images. It works with API V2 registries such as Docker
-registries, private registries, local directories and local OCI-layout
-directories.
+skopeo is a command line utility that performs various operations
+on container images and image repositories. It can work with OCI
+images as well as the original Docker v2 images. It works with API
+V2 registries such as Docker registries, private registries, local
+directories and local OCI-layout directories.
 
 `skopeo inspect docker://docker.io/vbatts/slackware`
diff --git a/system/skopeo/skopeo.SlackBuild b/system/skopeo/skopeo.SlackBuild
index 20b80f6b6f..062598fd6e 100644
--- a/system/skopeo/skopeo.SlackBuild
+++ b/system/skopeo/skopeo.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for skopeo
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=skopeo
 VERSION=${VERSION:-0.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 DOMAIN=github.com
 ORG=containers
@@ -38,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -95,4 +105,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/slack-osquery/README b/system/slack-osquery/README
index 0b825b4c5c..8fb9c39567 100644
--- a/system/slack-osquery/README
+++ b/system/slack-osquery/README
@@ -2,10 +2,11 @@ slack-osquery - osquery extensions for Slackware
 
 This extension provides extra tables for osquery on slackware.
 
-After installation, you will need to configure osquery to load your extension:
+After installation, you will need to configure osquery to load your
+extension:
 https://osquery.readthedocs.io/en/stable/deployment/extensions/
 
-The extension currently exposes the package database through a table called
-slackware_packages.
+The extension currently exposes the package database through a table
+called slackware_packages.
 
 NOTE: google-go-lang is only needed at compile time - not at runtime.
diff --git a/system/slack-osquery/slack-osquery.SlackBuild b/system/slack-osquery/slack-osquery.SlackBuild
index d8ec7d4871..417f16109e 100644
--- a/system/slack-osquery/slack-osquery.SlackBuild
+++ b/system/slack-osquery/slack-osquery.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for slack-osquery
 
 # Copyright 2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2022-2023 Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=slack-osquery
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +39,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,37 +67,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-
-mkdir -p vendor/github.com
-
-for DEPENDENCY in Microsoft/go-winio/0.4.9 \
-                  apache/thrift/0.12.0 \
-                  davecgh/go-spew/1.1.0 \
-                  kolide/osquery-go/a74aa860032dacda9b8304c6565efcb9d80dfaa9 \
-                  pkg/errors/0.8.0 \
-                  pmezard/go-difflib/1.0.0 \
-                  stretchr/testify/1.2.2 ; do
-  DEPENDENCY_OWNER="$(echo "$DEPENDENCY" | cut -d/ -f1)"
-  DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f2)"
-  DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f3)"
-
-  mkdir -p "vendor/github.com/$DEPENDENCY_OWNER"
-
-  tar xf "$CWD/$DEPENDENCY_NAME-$DEPENDENCY_REV.tar.gz"
-  mv "$DEPENDENCY_NAME-$DEPENDENCY_REV" "vendor/github.com/$DEPENDENCY_OWNER/$DEPENDENCY_NAME"
-done
-
-mkdir -p vendor/golang.org/x
-for DEPENDENCY in sys/14742f9018cd6651ec7364dc6ee08af0baaa1031 ; do
-  DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f1)"
-  DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f2)"
-
-  tar xf "$CWD/$DEPENDENCY_NAME-$DEPENDENCY_REV.tar.gz"
-  mv "$DEPENDENCY_NAME-$DEPENDENCY_REV" "vendor/golang.org/x/$DEPENDENCY_NAME"
-done
+rm -rf $PRGNAM-v$VERSION
+tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz
+cd $PRGNAM-v$VERSION
 
 chown -R root:root .
 find -L . \
@@ -117,4 +97,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/slack-osquery/slack-osquery.info b/system/slack-osquery/slack-osquery.info
index 21b713f5f6..d12fa3fffa 100644
--- a/system/slack-osquery/slack-osquery.info
+++ b/system/slack-osquery/slack-osquery.info
@@ -1,24 +1,8 @@
 PRGNAM="slack-osquery"
-VERSION="1.0"
-HOMEPAGE="https://github.com/aclemosn/slack-osquery"
-DOWNLOAD="https://github.com/aclemons/slack-osquery/archive/v1.0/slack-osquery-1.0.tar.gz \
-          https://github.com/Microsoft/go-winio/archive/v0.4.9/go-winio-0.4.9.tar.gz \
-          https://github.com/apache/thrift/archive/v0.12.0/thrift-0.12.0.tar.gz \
-          https://github.com/davecgh/go-spew/archive/v1.1.0/go-spew-1.1.0.tar.gz \
-          https://github.com/kolide/osquery-go/archive/a74aa860032dacda9b8304c6565efcb9d80dfaa9/osquery-go-a74aa860032dacda9b8304c6565efcb9d80dfaa9.tar.gz \
-          https://github.com/pkg/errors/archive/v0.8.0/errors-0.8.0.tar.gz \
-          https://github.com/pmezard/go-difflib/archive/v1.0.0/go-difflib-1.0.0.tar.gz \
-          https://github.com/stretchr/testify/archive/v1.2.2/testify-1.2.2.tar.gz \
-          https://github.com/golang/sys/archive/14742f9018cd6651ec7364dc6ee08af0baaa1031/sys-14742f9018cd6651ec7364dc6ee08af0baaa1031.tar.gz"
-MD5SUM="6f9cdd4f0f8e2d5e5a41568f1c80eb7e \
-        8696fc61920c07d8591b5f5c6920cf82 \
-        ff9af01fec424b5a279fa8a3c9e95c0c \
-        89875fb674e0ea72a189e5048186206c \
-        c11f2cbf425ccf11292e0caaf9619a69 \
-        8072f1b5f0f97a9167caff82f812edeb \
-        56e81fe945d04771dcb79964ce958a5f \
-        cae3d38d807581cd78da0a9dc6b0eb70 \
-        e854fa1c61cb6d71bf9feb71b3f97f97"
+VERSION="1.2"
+HOMEPAGE="https://github.com/aclemons/slack-osquery"
+DOWNLOAD="https://github.com/aclemons/slack-osquery/releases/download/v1.2/slack-osquery-v1.2.tar.gz"
+MD5SUM="fe50edbec5b3cb23937decfdb62db2b0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="google-go-lang"
diff --git a/system/slack-utils/slack-utils.SlackBuild b/system/slack-utils/slack-utils.SlackBuild
index 0aecd16e22..6b63df6fca 100644
--- a/system/slack-utils/slack-utils.SlackBuild
+++ b/system/slack-utils/slack-utils.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for slack-utils
 
@@ -22,20 +22,30 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=slack-utils
-VERSION=${VERSION:-0.7.2}
+VERSION=${VERSION:-0.7.5}
+SRCVER=$(echo $VERSION | tr . _)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -45,9 +55,11 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # Fix renamed Config -> RbConfig
 sed -i -e 's/::Config::CONFIG/::RbConfig::CONFIG/' setup.rb
@@ -73,4 +85,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -p -l y -c n ${OUTPUT}/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}
+/sbin/makepkg -p -l y -c n ${OUTPUT}/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.$PKGTYPE
diff --git a/system/slack-utils/slack-utils.info b/system/slack-utils/slack-utils.info
index eea352de44..144f1c6302 100644
--- a/system/slack-utils/slack-utils.info
+++ b/system/slack-utils/slack-utils.info
@@ -1,8 +1,8 @@
 PRGNAM="slack-utils"
-VERSION="0.7.2"
+VERSION="0.7.5"
 HOMEPAGE="https://github.com/vbatts/slack-utils"
-DOWNLOAD="https://github.com/downloads/vbatts/slack-utils/slack-utils-0.7.2.tar.gz"
-MD5SUM="dbb174c55087186f69c47256c514ad4e"
+DOWNLOAD="https://github.com/vbatts/slack-utils/archive/0_7_5/slack-utils-0.7.5.tar.gz"
+MD5SUM="e15f84ad533239ffac257c8818705f64"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/slackchlog/slackchlog.SlackBuild b/system/slackchlog/slackchlog.SlackBuild
index e06df30bd9..a71268d230 100644
--- a/system/slackchlog/slackchlog.SlackBuild
+++ b/system/slackchlog/slackchlog.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for slackchlog
 
@@ -22,13 +22,23 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=slackchlog
 VERSION=${VERSION:-0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -63,4 +73,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/slackrepo-hints/README b/system/slackrepo-hints/README
new file mode 100644
index 0000000000..688349015d
--- /dev/null
+++ b/system/slackrepo-hints/README
@@ -0,0 +1 @@
+slackrepo-hints: Default hintfiles for slackrepo
diff --git a/system/slackrepo-hints/slack-desc b/system/slackrepo-hints/slack-desc
new file mode 100644
index 0000000000..c5a7bce8a1
--- /dev/null
+++ b/system/slackrepo-hints/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+slackrepo-hints: slackrepo-hints (Default hintfiles for slackrepo)
+slackrepo-hints:
+slackrepo-hints: The default hintfiles for slackrepo, packaged separately for
+slackrepo-hints: easy regular updating.
+slackrepo-hints:
+slackrepo-hints: https://github.com/aclemons/slackrepo-hints
+slackrepo-hints:
+slackrepo-hints:
+slackrepo-hints:
+slackrepo-hints:
+slackrepo-hints:
diff --git a/system/slackrepo-hints/slackrepo-hints.SlackBuild b/system/slackrepo-hints/slackrepo-hints.SlackBuild
new file mode 100644
index 0000000000..61abc75bfc
--- /dev/null
+++ b/system/slackrepo-hints/slackrepo-hints.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# Slackware build script for slackrepo-hints
+
+# Copyright 2017-2022 Andrew Clemons, Wellington New Zealand
+# Copyright 2022-2024 Andrew Clemons, Tokyo Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=slackrepo-hints
+VERSION=${VERSION:-20240420}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/etc/slackrepo
+
+find . -type d -maxdepth 1 -mindepth 1 \! -name SlackBuild -print0 | xargs -0 -I xx cp -a xx $PKG/etc/slackrepo
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENCE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/slackrepo-hints/slackrepo-hints.info b/system/slackrepo-hints/slackrepo-hints.info
new file mode 100644
index 0000000000..51b4bee6d2
--- /dev/null
+++ b/system/slackrepo-hints/slackrepo-hints.info
@@ -0,0 +1,10 @@
+PRGNAM="slackrepo-hints"
+VERSION="20240420"
+HOMEPAGE="https://github.com/aclemons/slackrepo-hints"
+DOWNLOAD="https://github.com/aclemons/slackrepo-hints/archive/v20240420/slackrepo-hints-20240420.tar.gz"
+MD5SUM="63925bb6151fe3074fb08d99a03a3c47"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"
diff --git a/system/slackrepo/README b/system/slackrepo/README
new file mode 100644
index 0000000000..c3949a0291
--- /dev/null
+++ b/system/slackrepo/README
@@ -0,0 +1,14 @@
+slackrepo - Automated SlackBuild package builder
+
+slackrepo is a tool for making and managing package repositories on
+Slackware, by building from repositories of SlackBuilds.
+
+Features:
+  * Clean repeatable building, including dependencies
+  * Highly automated (no interaction required)
+  * Package updates detected by tracking upstream git revisions
+  * Output repositories suitable for use with slackpkg+
+
+You'll most likely want to also install slackrepo-hints.
+
+Optional dependency: fakeroot
diff --git a/system/slackrepo/doinst.sh b/system/slackrepo/doinst.sh
new file mode 100644
index 0000000000..680f7354b3
--- /dev/null
+++ b/system/slackrepo/doinst.sh
@@ -0,0 +1,15 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    rm $NEW
+  fi
+}
+
+config etc/slackrepo/slackrepo_SBo.conf.new
+config etc/slackrepo/slackrepo_csb.conf.new
+config etc/slackrepo/slackrepo_msb.conf.new
+config etc/slackrepo/slackrepo_ponce.conf.new
+config etc/sudoers.d/slackrepo.new
diff --git a/system/slackrepo/slack-desc b/system/slackrepo/slack-desc
new file mode 100644
index 0000000000..2a2d118bb3
--- /dev/null
+++ b/system/slackrepo/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+slackrepo: slackrepo (Automated SlackBuild package builder)
+slackrepo:
+slackrepo: slackrepo is a tool for making and managing package repositories on
+slackrepo: Slackware, by building from repositories of SlackBuilds.
+slackrepo:
+slackrepo: https://github.com/aclemons/slackrepo
+slackrepo:
+slackrepo:
+slackrepo:
+slackrepo:
+slackrepo:
diff --git a/system/slackrepo/slackrepo.SlackBuild b/system/slackrepo/slackrepo.SlackBuild
new file mode 100644
index 0000000000..aed39e8448
--- /dev/null
+++ b/system/slackrepo/slackrepo.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# Slackware build script for slackrepo
+
+# Copyright 2017-2022 Andrew Clemons, Wellington New Zealand
+# Copyright 2022-2024 Andrew Clemons, Tokyo Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=slackrepo
+VERSION=${VERSION:-20240420}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/var/lib/$PRGNAM
+mkdir -p $PKG/var/log/$PRGNAM
+
+mkdir -p $PKG/usr/{bin,sbin}
+install -m0755 $PRGNAM $PKG/usr/sbin
+
+(
+  cd $PKG/usr/bin
+  ln -s ../sbin/slackrepo slackrepo
+)
+
+sed -i "s/%PKGID%/$PRGNAM-$VERSION/" $PKG/usr/sbin/$PRGNAM
+
+mkdir -p $PKG/etc
+cp -a etc $PKG/etc/$PRGNAM
+mv $PKG/etc/$PRGNAM/sudoers.d $PKG/etc/
+chmod 0750 $PKG/etc/sudoers.d
+chmod 0640 $PKG/etc/sudoers.d/$PRGNAM
+
+find $PKG/etc -type f -print0 | xargs -0 -I xx mv xx xx.new
+
+mkdir -p $PKG/usr/share
+cp -a share $PKG/usr/share/$PRGNAM
+
+mkdir -p $PKG/usr/libexec
+cp -a libexec $PKG/usr/libexec/$PRGNAM
+
+cp -a man $PKG/usr/
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  BUGS LICENCE NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/slackrepo/slackrepo.info b/system/slackrepo/slackrepo.info
new file mode 100644
index 0000000000..d2d6cd746a
--- /dev/null
+++ b/system/slackrepo/slackrepo.info
@@ -0,0 +1,10 @@
+PRGNAM="slackrepo"
+VERSION="20240420"
+HOMEPAGE="https://github.com/aclemons/slackrepo"
+DOWNLOAD="https://github.com/aclemons/slackrepo/archive/v20240420/slackrepo-20240420.tar.gz"
+MD5SUM="2145692548db7aa7c81b4627ca5e4941"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"
diff --git a/system/slackroll/slack-desc b/system/slackroll/slack-desc
index 15550f3e37..2051cd049a 100644
--- a/system/slackroll/slack-desc
+++ b/system/slackroll/slack-desc
@@ -14,6 +14,6 @@ slackroll: easing the task of upgrading or installing packages, and letting you
 slackroll: detect which packages have been added to or removed from the
 slackroll: Slackware tree.
 slackroll:
-slackroll: http://rg3.github.io/slackroll/
+slackroll: http://slackroll.github.io/slackroll/
 slackroll:
 slackroll:
diff --git a/system/slackroll/slackroll.SlackBuild b/system/slackroll/slackroll.SlackBuild
index b67bb23661..7434973d88 100644
--- a/system/slackroll/slackroll.SlackBuild
+++ b/system/slackroll/slackroll.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for slackroll
 
-# Copyright 2011-2018,2020-2021 Andrew Clemons, Wellington New Zealand
+# Copyright 2011-2018,2020-2022 Andrew Clemons, Wellington New Zealand
+# Copyright 2022-2024 Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,16 +23,22 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=slackroll
-GITREV="${GITREV:-0c6ab0b24b9ec48fb1f1058b92720a6ff794d8ac}"
-VERSION=${VERSION:-git$(echo "$GITREV" | sed 's/^\(.\{7\}\).*$/\1/')}
-SRCVER=${SRCVER:-v48}
+VERSION=${VERSION:-v55}
+SRCVER=${VERSION#v}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -41,9 +48,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$GITREV
-tar xvf $CWD/$PRGNAM-$GITREV.tar.gz
-cd $PRGNAM-$GITREV
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -68,10 +75,8 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mv $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM-$SRCVER
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/slackroll/slackroll.info b/system/slackroll/slackroll.info
index aa3edaa433..0c6f46e478 100644
--- a/system/slackroll/slackroll.info
+++ b/system/slackroll/slackroll.info
@@ -1,8 +1,8 @@
 PRGNAM="slackroll"
-VERSION="git0c6ab0b"
-HOMEPAGE="http://rg3.github.io/slackroll/"
-DOWNLOAD="https://github.com/rg3/slackroll/archive/0c6ab0b24b9ec48fb1f1058b92720a6ff794d8ac/slackroll-0c6ab0b24b9ec48fb1f1058b92720a6ff794d8ac.tar.gz"
-MD5SUM="4474bcb2e48cf55947c9b30022381a9e"
+VERSION="v55"
+HOMEPAGE="http://slackroll.github.io/slackroll/"
+DOWNLOAD="https://github.com/slackroll/slackroll/archive/v55/slackroll-55.tar.gz"
+MD5SUM="04f6941d0ed43e8d778f16125c7c4481"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/slackupdr/README b/system/slackupdr/README
new file mode 100644
index 0000000000..847fc419fa
--- /dev/null
+++ b/system/slackupdr/README
@@ -0,0 +1,11 @@
+NAME
+  slackupdr - autoslackpkg plus kernel & config tools
+
+SYNOPSIS
+  slackupdr [-h] [-m manpage] [-v]
+
+DESCRIPTION
+  slackupdr is a CLI menu driven tool. It automates slackpkg, manages
+  installation of multiple kernels, updates GRUB, ELILO & LILO
+  bootloaders & manages /etc .new & .orig files. slackupdr uses
+  slackpkg, pkgtools, mkinitrd & diff/edit tools.
diff --git a/system/slackupdr/doinst.sh b/system/slackupdr/doinst.sh
new file mode 100644
index 0000000000..d95b935ced
--- /dev/null
+++ b/system/slackupdr/doinst.sh
@@ -0,0 +1,16 @@
+# doinst.sh for slackupdr
+
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/slackpkg/slackupdr.conf.new
diff --git a/system/slackupdr/slack-desc b/system/slackupdr/slack-desc
new file mode 100644
index 0000000000..287f655212
--- /dev/null
+++ b/system/slackupdr/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+slackupdr: slackupdr (slackupdr - autoslackpkg plus kernel & config tools)
+slackupdr:
+slackupdr: slackupdr is a CLI menu driven tool. It automates slackpkg, manages
+slackupdr: installation of multiple kernels, updates GRUB, ELILO & LILO
+slackupdr: bootloaders & manages /etc .new & .orig files. slackupdr uses
+slackupdr: slackpkg, pkgtools, mkinitrd & diff/edit tools.
+slackupdr:
+slackupdr: Home: https://dev.go4it2day.com
+slackupdr:
+slackupdr:
+slackupdr:
diff --git a/system/slackupdr/slackupdr.SlackBuild b/system/slackupdr/slackupdr.SlackBuild
new file mode 100644
index 0000000000..3e889ebe8c
--- /dev/null
+++ b/system/slackupdr/slackupdr.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+# Slackware build script for slackupdr
+
+# Copyright 2019 - 2022 Stu Miller, Colorado, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=slackupdr
+VERSION=${VERSION:-3.6.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -Eeu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CHANGELOG \
+  README \
+  slackupdr.8.txt \
+  slackupdr.conf.5.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/etc/slackpkg
+cp -a \
+  $PRGNAM.conf.new \
+  $PKG/etc/slackpkg/
+
+mkdir -p $PKG/usr/sbin
+cp -a \
+  $PRGNAM \
+  $PKG/usr/sbin/
+
+mkdir -p $PKG/usr/libexec/slackpkg
+cp -a \
+  ${PRGNAM}_lib \
+  $PKG/usr/libexec/slackpkg/
+
+mkdir -p $PKG/usr/man/man5
+cp -a \
+  $PRGNAM.conf.5.gz \
+  $PKG/usr/man/man5
+
+mkdir -p $PKG/usr/man/man8
+cp -a \
+  $PRGNAM.8.gz \
+  $PKG/usr/man/man8
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/slackupdr/slackupdr.info b/system/slackupdr/slackupdr.info
new file mode 100644
index 0000000000..f03d21cfeb
--- /dev/null
+++ b/system/slackupdr/slackupdr.info
@@ -0,0 +1,10 @@
+PRGNAM="slackupdr"
+VERSION="3.6.3"
+HOMEPAGE="https://www.go4it2day.com/news/slackupdr-3.6.3.html"
+DOWNLOAD="https://www.go4it2day.com/repo/slackupdr_source/snapshot/slackupdr-3.6.3.tar.gz"
+MD5SUM="3907b0137f6d44178357fb498b91d724"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Stu Miller"
+EMAIL="slackbuilds@go4it2day.com"
diff --git a/system/slackware-grub2-theme/slackware-grub2-theme.SlackBuild b/system/slackware-grub2-theme/slackware-grub2-theme.SlackBuild
index 20416278fe..4f75b30f4b 100644
--- a/system/slackware-grub2-theme/slackware-grub2-theme.SlackBuild
+++ b/system/slackware-grub2-theme/slackware-grub2-theme.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for slackware-grub2-theme
 
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=slackware-grub2-theme
 VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,4 +69,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/slackware-grub2-theme/slackware-grub2-theme.info b/system/slackware-grub2-theme/slackware-grub2-theme.info
index b4fa4f5675..1a54b048a6 100644
--- a/system/slackware-grub2-theme/slackware-grub2-theme.info
+++ b/system/slackware-grub2-theme/slackware-grub2-theme.info
@@ -1,7 +1,7 @@
 PRGNAM="slackware-grub2-theme"
 VERSION="1.0"
 HOMEPAGE="https://github.com/philipvdh/slackware-grub2-theme"
-DOWNLOAD="https://github.com/philipvdh/slackware-grub2-theme/archive/v1.0.tar.gz"
+DOWNLOAD="https://github.com/philipvdh/slackware-grub2-theme/archive/v1.0/slackware-grub2-theme-1.0.tar.gz"
 MD5SUM="17d4a27bad2fabc2861c6be0557ce400"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/slackyd/slackyd.SlackBuild b/system/slackyd/slackyd.SlackBuild
index e02d19902c..5ec870f10a 100644
--- a/system/slackyd/slackyd.SlackBuild
+++ b/system/slackyd/slackyd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for slackyd
 # Copyright Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy, 2012
@@ -21,26 +21,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=slackyd
 VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -70,7 +80,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-make "CFLAGS=$SLKCFLAGS -lcrypto"
+make "CFLAGS=$SLKCFLAGS -lcrypto -w -Wl,--allow-multiple-definition"
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -92,4 +102,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/slapt-get/README b/system/slapt-get/README
new file mode 100644
index 0000000000..d5a726e6e4
--- /dev/null
+++ b/system/slapt-get/README
@@ -0,0 +1,6 @@
+slapt-get tries to emulate apt-get as closely as possible.
+It is a frontend to pkgtools uses native slackware tools
+such as upgradepkg,installpkg and removepkg. It supports
+multiple repo's and each can be assigned a priority value.
+It also supports resuming downloads and verifies the integrity
+of the package.
diff --git a/system/slapt-get/changelog b/system/slapt-get/changelog
new file mode 100644
index 0000000000..a8f6cb28d6
--- /dev/null
+++ b/system/slapt-get/changelog
@@ -0,0 +1,10 @@
+Changelog for slapt-get SlackBuild Script
+--------------------------------------------------------------------
+
+24/05/2023:
+
+Submitted to slackbuilds.org
+
+26/10/2023:
+
+updated to version 0.11.10
diff --git a/system/slapt-get/doinst.sh b/system/slapt-get/doinst.sh
new file mode 100644
index 0000000000..77fdeff535
--- /dev/null
+++ b/system/slapt-get/doinst.sh
@@ -0,0 +1,12 @@
+if [ ! -d etc/slapt-get ]; then
+mkdir -p etc/slapt-get
+fi
+
+if [ -f etc/slapt-getrc -a ! -f etc/slapt-get/slapt-getrc ]; then
+mv -f etc/slapt-getrc etc/slapt-get/slapt-getrc
+fi
+
+if [ ! -f etc/slapt-get/slapt-getrc ]; then
+mv -f etc/slapt-get/slapt-getrc.new etc/slapt-get/slapt-getrc
+else cmp etc/slapt-get/slapt-getrc etc/slapt-get/slapt-getrc.new >/dev/null 2>&1 && rm etc/slapt-get/slapt-getrc.new
+fi
diff --git a/system/slapt-get/slack-desc b/system/slapt-get/slack-desc
new file mode 100644
index 0000000000..553e30aeea
--- /dev/null
+++ b/system/slapt-get/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+slapt-get: slapt-get (apt-get for pkgtool)
+slapt-get:
+slapt-get: slapt-get tries to emulate apt-get as closely as possible.
+slapt-get: It is a frontend to pkgtools uses native slackware tools
+slapt-get: such as upgradepkg,installpkg and removepkg. It supports
+slapt-get: multiple repo's and each can be assigned a priority value.
+slapt-get: It also supports resuming downloads and verifies the integrity
+slapt-get: of the package.
+slapt-get:
+slapt-get: Homepage:https://software.jaos.org
+slapt-get:
diff --git a/system/slapt-get/slapt-get.SlackBuild b/system/slapt-get/slapt-get.SlackBuild
new file mode 100644
index 0000000000..9aedbb8581
--- /dev/null
+++ b/system/slapt-get/slapt-get.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# Slackware build script for slapt-get
+
+# Copyright 2023 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=slapt-get
+VERSION=${VERSION:-0.11.10}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+aarch64*) ARCH=aarch64 ;;
+       *) ARCH=$( uname -m ) ;;
+esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-march=i586 -mtune=i686 -pipe -O2 -fPIC"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-march=i686 -mtune=i686 -pipe -O2 -fPIC"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-march=x86-64 -mtune=generic -pipe -O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS"   CXXFLAGS="$SLKCFLAGS" meson setup build --prefix=/usr --libdir=/usr/lib${LIBDIRSUFFIX}  --sysconfdir=/etc --mandir=/usr/man --buildtype=release
+meson compile -C build
+DESTDIR="$PKG" meson install -C build
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv -v $PKG/usr/share/doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rvf $PKG/usr/share/doc 
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/slapt-get/slapt-get.info b/system/slapt-get/slapt-get.info
new file mode 100644
index 0000000000..e14c39ef24
--- /dev/null
+++ b/system/slapt-get/slapt-get.info
@@ -0,0 +1,10 @@
+PRGNAM="slapt-get"
+VERSION="0.11.10"
+HOMEPAGE="https://software.jaos.org"
+DOWNLOAD="https://github.com/jaos/slapt-get/archive/0.11.10/slapt-get-0.11.10.tar.gz"
+MD5SUM="c2232a3d48aa153aa9cca775f021cb84"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/slapt-src/README b/system/slapt-src/README
new file mode 100644
index 0000000000..b349d093c2
--- /dev/null
+++ b/system/slapt-src/README
@@ -0,0 +1,3 @@
+slapt-src is a utility to query,retrieve and building
+slackbuilds as easy as working with binary packages in
+slapt-get.
diff --git a/system/slapt-src/changelog b/system/slapt-src/changelog
new file mode 100644
index 0000000000..cd22ee29b1
--- /dev/null
+++ b/system/slapt-src/changelog
@@ -0,0 +1,6 @@
+Changelog for slapt-src SlackBuild Script
+--------------------------------------------------------------------
+
+24/05/2023:
+
+Submitted to slackbuilds.org
diff --git a/system/slapt-src/doinst.sh b/system/slapt-src/doinst.sh
new file mode 100644
index 0000000000..3892c91d9d
--- /dev/null
+++ b/system/slapt-src/doinst.sh
@@ -0,0 +1,9 @@
+if [ ! -d etc/slapt-get ]; then
+mkdir -p etc/slapt-get
+fi
+
+if [ ! -f etc/slapt-get/slapt-srcrc ]; then
+mv -f etc/slapt-get/slapt-srcrc.new etc/slapt-get/slapt-srcrc
+else
+! diff -q etc/slapt-get/slapt-srcrc etc/slapt-get/slapt-srcrc.new >/dev/null 2>&1 || rm etc/slapt-get/slapt-srcrc.new
+fi
diff --git a/system/slapt-src/slack-desc b/system/slapt-src/slack-desc
new file mode 100644
index 0000000000..61cc241d05
--- /dev/null
+++ b/system/slapt-src/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+slapt-src: slapt-src (Slapt SlackBuild Utility)
+slapt-src:
+slapt-src: slapt-src is a utility to query,retrieve and building
+slapt-src: slackbuilds as easy as working with binary packages in
+slapt-src: slapt-get.
+slapt-src:
+slapt-src:
+slapt-src:
+slapt-src: Homepage:https://software.jaos.org
+slapt-src:
+slapt-src:
diff --git a/system/slapt-src/slapt-src.SlackBuild b/system/slapt-src/slapt-src.SlackBuild
new file mode 100644
index 0000000000..d56c770420
--- /dev/null
+++ b/system/slapt-src/slapt-src.SlackBuild
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# Slackware build script for slapt-src
+
+# Copyright 2023 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=slapt-src
+VERSION=${VERSION:-0.3.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+aarch64*) ARCH=aarch64 ;;
+       *) ARCH=$( uname -m ) ;;
+esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-march=i586 -mtune=i686 -pipe -O2 -fPIC"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-march=i686 -mtune=i686 -pipe -O2 -fPIC"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-march=x86-64 -mtune=generic -pipe -O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" meson setup build --prefix=/usr --sysconfdir=/etc --mandir=/usr/man --buildtype=debugoptimized
+ninja -C build
+DESTDIR=$PKG ninja -C build install
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv -v $PKG/usr/share/doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rvf $PKG/usr/share/doc
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/slapt-src/slapt-src.info b/system/slapt-src/slapt-src.info
new file mode 100644
index 0000000000..3029b6df3f
--- /dev/null
+++ b/system/slapt-src/slapt-src.info
@@ -0,0 +1,10 @@
+PRGNAM="slapt-src"
+VERSION="0.3.7"
+HOMEPAGE="https://software.jaos.org"
+DOWNLOAD="https://github.com/jaos/slapt-src/archive/0.3.7/slapt-src-0.3.7.tar.gz"
+MD5SUM="926c8de42115e99187cac6e58579fdb7"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="slapt-get"
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/slapt-update-service/README b/system/slapt-update-service/README
new file mode 100644
index 0000000000..8d788647de
--- /dev/null
+++ b/system/slapt-update-service/README
@@ -0,0 +1,6 @@
+slapt-update-service is a DBus service which 
+notifies about package updates  available via 
+slapt-get and gslapt.  slapt-update-service 
+places an icon in the user's notification area 
+when updates are available.  Clicking the icon
+starts upgrading with gslapt.
diff --git a/system/slapt-update-service/changelog b/system/slapt-update-service/changelog
new file mode 100644
index 0000000000..60aa689129
--- /dev/null
+++ b/system/slapt-update-service/changelog
@@ -0,0 +1,6 @@
+Changelog for slapt-update-service SlackBuild Script
+--------------------------------------------------------------------
+
+24/05/2023:
+
+Submitted to slackbuilds.org
diff --git a/system/slapt-update-service/slack-desc b/system/slapt-update-service/slack-desc
new file mode 100644
index 0000000000..e621662322
--- /dev/null
+++ b/system/slapt-update-service/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+slapt-update-service: slapt-update-service (Update Notifier for Slapt-get/gslapt)
+slapt-update-service:
+slapt-update-service: slapt-update-service is a DBus service which notifies about
+slapt-update-service: package updates available via slapt-get or gslapt. It also
+slapt-update-service: places an icon in the user's notification area when
+slapt-update-service: updates are available. Clicking the icon starts gslapt.
+slapt-update-service:
+slapt-update-service:
+slapt-update-service: Homepage:https://software.jaos.org
+slapt-update-service:
+slapt-update-service:
diff --git a/system/slapt-update-service/slapt-update-service.SlackBuild b/system/slapt-update-service/slapt-update-service.SlackBuild
new file mode 100644
index 0000000000..f3062917db
--- /dev/null
+++ b/system/slapt-update-service/slapt-update-service.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+# Slackware build script for slapt-update-service
+
+# Copyright 2023 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=slapt-update-service
+VERSION=${VERSION:-0.5.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+aarch64*) ARCH=aarch64 ;;
+       *) ARCH=$( uname -m ) ;;
+esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-march=i586 -mtune=i686 -pipe -O2 -fPIC"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-march=i686 -mtune=i686 -pipe -O2 -fPIC"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-march=x86-64 -mtune=generic -pipe -O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" meson setup build --prefix=/usr --sysconfdir=/etc --mandir=/usr/man --buildtype=debugoptimized
+ninja -C build
+DESTDIR=$PKG ninja -C build install
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv -v $PKG/usr/share/doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rvf $PKG/usr/share/doc
+rm -rvf $PKG/usr/doc/slapt-update-service-0.5.3/slapt-update-service/NEWS
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/slapt-update-service/slapt-update-service.info b/system/slapt-update-service/slapt-update-service.info
new file mode 100644
index 0000000000..938e164178
--- /dev/null
+++ b/system/slapt-update-service/slapt-update-service.info
@@ -0,0 +1,10 @@
+PRGNAM="slapt-update-service"
+VERSION="0.5.3"
+HOMEPAGE="https://software.jaos.org"
+DOWNLOAD="https://github.com/jaos/slapt-update-service/archive/0.5.3/slapt-update-service-0.5.3.tar.gz"
+MD5SUM="4c0badc7c8f5b915b77c3db44181f315"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="gslapt"
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/sleepd/sleepd.SlackBuild b/system/sleepd/sleepd.SlackBuild
index d4847ffee4..09274e2456 100644
--- a/system/sleepd/sleepd.SlackBuild
+++ b/system/sleepd/sleepd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for sleepd
 
 # Copyright 2017 Kenneth Chan <kenneth dot t dot chan at gmail dot com>
@@ -21,10 +21,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org to fix the build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM="sleepd"
 VERSION=${VERSION:-2.05}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,7 +39,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,9 +73,12 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20220210 bkw: actually use the SLKCFLAGS, and add -fcommon for 15.0.
+sed -i "s,-O2 -g,$SLKCFLAGS -fcommon," Makefile
 
 sed -i "s|share/man|man|"g Makefile
 
@@ -94,4 +106,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sleuthkit/README b/system/sleuthkit/README
index 790e55aee7..47375806de 100644
--- a/system/sleuthkit/README
+++ b/system/sleuthkit/README
@@ -12,7 +12,11 @@ various disk image formats:
   - afflib (for Advanced Forensic Format files).
   - libvhdi
   - libvmdk
+  - libvslvm
 
-Note: If you are building TSK for use with Plaso or the DFVFS, it is
-strongly recommended that you build libewf, libvhdi and libvmdk
-support into TSK by installing those libraries first.
+Note: by default, Java support is disabled in this build. If you
+require Java support, install a JDK (jdk, openjdk8, etc), source its
+profile script, and run sleuthkit.SlackBuild with JAVA=yes in the
+environment. Be warned that the Java build process downloads many
+files, therefore it requires network access (something SlackBuild
+scripts normally don't do).
diff --git a/system/sleuthkit/sleuthkit.SlackBuild b/system/sleuthkit/sleuthkit.SlackBuild
index 470f81084a..2ca64bff62 100644
--- a/system/sleuthkit/sleuthkit.SlackBuild
+++ b/system/sleuthkit/sleuthkit.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sleuthkit
 
@@ -26,13 +26,15 @@
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 
-# Updated v4.10.1 December 2020.  Barry J. Grundy
-# <bgrundy(at)linuxleo.com>
+# Updated v4.12.1 August 2023 Barry J. Grundy <bgrundy(at)linuxleo.com>
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=sleuthkit
-VERSION=${VERSION:-4.10.1}
+VERSION=${VERSION:-4.12.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -42,7 +44,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -76,6 +85,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+JAVAOPT="--disable-java"
+[ "${JAVA:-no}" = "yes" ] && JAVAOPT="--enable-java"
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -85,13 +97,12 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --disable-static \
+  $JAVAOPT \
   --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip -9 $PKG/usr/man/man*/*
 
 # "docs" directory now contains a simple pointer to the wiki.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -99,8 +110,10 @@ cp -a *.txt README.md docs $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 rm -f $PKG/usr/doc/$PRGNAM-$VERSION/docs/Makefile*
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sleuthkit/sleuthkit.info b/system/sleuthkit/sleuthkit.info
index 5654baee56..d14c652050 100644
--- a/system/sleuthkit/sleuthkit.info
+++ b/system/sleuthkit/sleuthkit.info
@@ -1,8 +1,8 @@
 PRGNAM="sleuthkit"
-VERSION="4.10.1"
+VERSION="4.12.1"
 HOMEPAGE="http://www.sleuthkit.org/sleuthkit/"
-DOWNLOAD="https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-4.10.1/sleuthkit-4.10.1.tar.gz"
-MD5SUM="c37bb35897a471c52ec18e0cbb807e9e"
+DOWNLOAD="https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-4.12.1/sleuthkit-4.12.1.tar.gz"
+MD5SUM="fc550c509d62ce6583315a793474a852"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/slim/CMakeLists.txt.patch b/system/slim/CMakeLists.txt.patch
deleted file mode 100644
index 9a29e6c2d7..0000000000
--- a/system/slim/CMakeLists.txt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- CMakeLists.txt.orig	2014-08-08 07:24:01.864876514 -0700
-+++ CMakeLists.txt	2014-08-08 07:24:51.980873088 -0700
-@@ -221,7 +221,10 @@
- ####### install
- # slim
- install(TARGETS slim RUNTIME DESTINATION bin)
--install(TARGETS slimlock RUNTIME DESTINATION bin)
-+## we have to comment this out or else
-+## build will fail on slackware as pam
-+## is required for slimlock
-+#install(TARGETS slimlock RUNTIME DESTINATION bin)
- 
- if (BUILD_SHARED_LIBS)
- 	set_target_properties(libslim PROPERTIES
diff --git a/system/slim/README b/system/slim/README
index 6400e2ed27..5f189bcabb 100644
--- a/system/slim/README
+++ b/system/slim/README
@@ -6,3 +6,5 @@ Included is a custom Slackware theme that goes nicely with the lilo boot
 theme. Regardless of whether you would like to use the custom theme, you
 should see README.SLACKWARE for configuration hints (this file is also
 installed into the package's documentation directory).
+
+When at the login screen, select the login session cycling with F1.
diff --git a/system/slim/files/Xsession b/system/slim/files/Xsession
new file mode 100644
index 0000000000..237fb36306
--- /dev/null
+++ b/system/slim/files/Xsession
@@ -0,0 +1,158 @@
+#!/bin/sh
+#
+# Slim login manager Xsession script
+#
+
+command="$@"
+
+# this will go into slim.log along with all other echo's
+# good for debugging where things go wrong
+echo "$0: Beginning session setup..."
+
+# First read /etc/profile and .profile
+test -f /etc/profile && . /etc/profile
+test -f "$HOME/.profile" && . "$HOME/.profile"
+# Second read /etc/xprofile and .xprofile for X specific setup
+test -f /etc/xprofile && . /etc/xprofile
+test -f "$HOME/.xprofile" && . "$HOME/.xprofile"
+
+# wrap possible arguments to determine whether to treat special or not
+if [ "x$command" = "xcustom" ] || [ "x$command" = "xCustom" ] || [ "x$command" = "xdefault" ] || [ "x$command" = "xDefault" ]; then
+  command="Xsession"
+fi
+if [ "x$command" = "x" ]; then
+  # no default specified, check if Xsession will complete
+  # and if not then assign XSESSION to command
+  if [ -x "$HOME/.xsession" ] || [ -x "$HOME/.Xclients" ] || [ -x /etc/X11/xinit/Xclients ] || [ -x /etc/X11/Xclients ]; then
+    command="Xsession"
+  else
+    command=$XSESSION
+  fi
+fi
+
+# most of this is from /etc/X11/chooser.sh
+sessionscript=""
+if [ -n "${command}" ]; then
+  # find a match for $command in /etc/X11/Sessions
+  for x in /etc/X11/Sessions/* ; do
+    if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" = "`echo ${command} | awk '{ print toupper($1) }'`" ]; then
+      sessionscript=${x}
+      break
+    fi
+  done
+  if [ -n "${sessionscript}" ]; then
+    if [ -x "${sessionscript}" ]; then
+      command="${sessionscript}"
+    else
+      command="/bin/sh ${sessionscript}"
+    fi
+  else
+
+    # find an executable for $command
+    x=""
+    y=""
+
+    for x in "${command}" "`echo ${command} | awk '{ print toupper($1) }'`" "`echo ${command} | awk '{ print tolower($1) }'`"
+    do
+      # Fall through ...
+      if [ -x "`which ${x} 2>/dev/null`" ]; then
+	y="`which ${x} 2>/dev/null`"
+	break
+      fi
+    done
+    # note , if the command could not be found then $command will be empty
+    command="$y"
+    unset x
+    unset y
+  fi
+fi
+
+# call xrdb and xmodmap and such, since $command is not a session script
+if [ -z "${sessionscript}" ]; then
+  userresources="$HOME/.Xresources"
+  usermodmap="$HOME/.Xmodmap"
+  userxkbmap="$HOME/.Xkbmap"
+
+  sysresources=/etc/X11/Xresources 
+  sysmodmap=/etc/X11/Xmodmap 
+  sysxkbmap=/etc/X11/Xkbmap
+
+  rh6sysresources=/etc/X11/xinit/Xresources 
+  rh6sysmodmap=/etc/X11/xinit/Xmodmap 
+
+  # merge in defaults
+  if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+  fi
+
+  if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+  fi
+
+  if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+  fi
+
+  # merge in keymaps
+  if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+  fi
+
+  if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+  fi
+
+  #
+  # Eeek, this seems like too much magic here
+  #
+  if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+      xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
+      if [ -n "$xkbsymbols" ]; then
+        setxkbmap -symbols "$xkbsymbols"
+        XKB_IN_USE=yes
+      fi
+    fi
+  fi
+
+  # xkb and xmodmap don't play nice together
+  if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+      xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+      xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+      xmodmap "$usermodmap"
+    fi
+  fi
+
+  unset XKB_IN_USE
+fi
+unset sessionscript
+
+# start failsafe session
+if [ -z "${command}" ]; then
+  echo "$0: Failed to find a command to start the session, so starting a failsafe xterm."
+  exec xterm -geometry 80x24+0+0
+fi
+
+# run all system xinitrc shell scripts which will update command
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+  for i in /etc/X11/xinit/xinitrc.d/* ; do
+    if [ -x "$i" ]; then
+      . "$i"
+    fi
+  done
+  unset i
+fi
+
+echo "$0: Setup done, will execute: $command"
+exec $command
+
+# vim:ts=4
diff --git a/system/slim/slim.logrotate b/system/slim/files/slim.logrotate
index 3d237a2d14..3d237a2d14 100644
--- a/system/slim/slim.logrotate
+++ b/system/slim/files/slim.logrotate
diff --git a/system/slim/files/slim.pam b/system/slim/files/slim.pam
new file mode 100644
index 0000000000..1ab7fb0911
--- /dev/null
+++ b/system/slim/files/slim.pam
@@ -0,0 +1,7 @@
+#%PAM-1.0
+
+auth        include     system-local-login
+-auth       optional    pam_gnome_keyring.so
+account     include     system-local-login
+session     include     system-local-login
+-session    optional    pam_gnome_keyring.so auto_start
diff --git a/system/slim/files/slimlock.pam b/system/slim/files/slimlock.pam
new file mode 100644
index 0000000000..660b510bc3
--- /dev/null
+++ b/system/slim/files/slimlock.pam
@@ -0,0 +1,3 @@
+#%PAM-1.0
+
+auth        include     system-local-login
diff --git a/system/slim/patches/slim-1.3.6-config.diff b/system/slim/patches/slim-1.3.6-config.diff
new file mode 100644
index 0000000000..466590ccdc
--- /dev/null
+++ b/system/slim/patches/slim-1.3.6-config.diff
@@ -0,0 +1,60 @@
+diff -Naur slim-1.3.6.orig/slim.conf slim-1.3.6/slim.conf
+--- slim-1.3.6.orig/slim.conf	2013-10-02 00:38:05.000000000 +0200
++++ slim-1.3.6/slim.conf	2021-09-22 19:23:30.484086604 +0200
+@@ -9,6 +9,8 @@
+ reboot_cmd          /sbin/shutdown -r now
+ console_cmd         /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login"
+ #suspend_cmd        /usr/sbin/suspend
++## slackware suspend command
++suspend_cmd        /usr/sbin/pm-suspend
+ 
+ # Full path to the xauth binary
+ xauth_path         /usr/bin/xauth 
+@@ -33,7 +35,8 @@
+ # to adjust the command according to your preferred shell,
+ # i.e. for freebsd use:
+ # login_cmd           exec /bin/sh - ~/.xinitrc %session
+-login_cmd           exec /bin/bash -login ~/.xinitrc %session
++# login_cmd           exec /bin/bash -login ~/.xinitrc %session
++login_cmd           exec /bin/bash -login /usr/share/slim/Xsession %session
+ 
+ # Commands executed when starting and exiting a session.
+ # They can be used for registering a X11 session with
+@@ -41,17 +44,25 @@
+ #
+ # sessionstart_cmd	some command
+ # sessionstop_cmd	some command
++sessionstart_cmd       /usr/bin/sessreg -a -l :0.0 %user
++sessionstop_cmd     /usr/bin/sessreg -d -l :0.0 %user
+ 
+ # Start in daemon mode. Valid values: yes | no
+ # Note that this can be overriden by the command line
+ # options "-d" and "-nodaemon"
+ # daemon	yes
+ 
+-# Available sessions (first one is the default).
+-# The current chosen session name is replaced in the login_cmd
++# Available sessions:
++# The current chosen session name replaces %session in the login_cmd
+ # above, so your login command can handle different sessions.
++# If no session is chosen (via F1), %session will be an empty string.
+ # see the xinitrc.sample file shipped with slim sources
+-sessions            xfce4,icewm-session,wmaker,blackbox
++#sessions            xfce4,icewm-session,wmaker,blackbox
++# Alternatively, read available sessions from a directory of scripts:
++#sessiondir           /etc/X11/Sessions
++# Or, read available sessions from the xsessions desktop files --
++# note that this may provide a full path to the session executable!
++sessiondir     /usr/share/xsessions
+ 
+ # Executed when pressing F11 (requires imagemagick)
+ screenshot_cmd      import -window root /slim.png
+@@ -84,7 +95,7 @@
+ current_theme       default
+ 
+ # Lock file
+-lockfile            /var/run/slim.lock
++lockfile            /run/slim.lock
+ 
+ # Log file
+ logfile             /var/log/slim.log
diff --git a/system/slim/patches/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch b/system/slim/patches/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch
new file mode 100644
index 0000000000..b3787dd584
--- /dev/null
+++ b/system/slim/patches/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch
@@ -0,0 +1,15 @@
+--- a/app.cpp	2015-09-14 12:00:00.460481656 -0400
++++ b/app.cpp	2015-09-14 14:41:10.970536588 -0400
+@@ -606,9 +606,9 @@
+ 
+ 		n++;
+ 
+-		child_env = static_cast<char**>(malloc(sizeof(char*)*n));
+-		memcpy(child_env, old_env, sizeof(char*)*n+1);
+-		child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
++		child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
++		memcpy(child_env, old_env, sizeof(char*)*n);
++		child_env[n-1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
+ 		child_env[n] = NULL;
+ 		}
+ # endif /* USE_CONSOLEKIT */
diff --git a/system/slim/patches/slim-1.3.6-gcc11.patch b/system/slim/patches/slim-1.3.6-gcc11.patch
new file mode 100644
index 0000000000..a6b07c6377
--- /dev/null
+++ b/system/slim/patches/slim-1.3.6-gcc11.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/786498
+--- a/panel.cpp
++++ b/panel.cpp
+@@ -48,7 +48,7 @@
+ 		gcm = GCGraphicsExposures;
+ 		gcv.graphics_exposures = False;
+ 		WinGC = XCreateGC(Dpy, Win, gcm, &gcv);
+-		if (WinGC < 0) {
++		if (WinGC == 0) {
+ 			cerr << APPNAME
+ 				<< ": failed to create pixmap\n.";
+ 			exit(ERR_EXIT);
diff --git a/system/slim/patches/slim-1.3.6-honour-cflags.patch b/system/slim/patches/slim-1.3.6-honour-cflags.patch
new file mode 100644
index 0000000000..2a43be75fb
--- /dev/null
+++ b/system/slim/patches/slim-1.3.6-honour-cflags.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt	2013-10-01 18:38:05.000000000 -0400
++++ b/CMakeLists.txt.new	2013-10-15 11:33:18.975741094 -0400
+@@ -42,11 +42,6 @@
+ set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPKGDATADIR=\"${PKGDATADIR}\"")
+ set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"${SYSCONFDIR}\"")
+ 
+-# Flags
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O2")
+-set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -Wall -g -O2")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -O2")
+-
+ # source 
+ set(slim_srcs
+ 	main.cpp
diff --git a/system/slim/patches/slim-1.3.6-libslim-cmake-fixes.patch b/system/slim/patches/slim-1.3.6-libslim-cmake-fixes.patch
new file mode 100644
index 0000000000..ecd40390c8
--- /dev/null
+++ b/system/slim/patches/slim-1.3.6-libslim-cmake-fixes.patch
@@ -0,0 +1,33 @@
+--- a/CMakeLists.txt	2013-10-15 11:35:16.688739802 -0400
++++ b/CMakeLists.txt	2013-10-15 11:53:46.185727620 -0400
+@@ -115,6 +115,7 @@
+ 		message("\tPAM Found")
+ 		set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM")
+ 		target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY})
++		target_link_libraries(libslim ${PAM_LIBRARY})
+ 		target_link_libraries(slimlock ${PAM_LIBRARY})
+ 		include_directories(${PAM_INCLUDE_DIR})
+ 	else(PAM_FOUND)
+@@ -173,7 +174,10 @@
+ )
+ 
+ target_link_libraries(libslim
+-    ${JPEG_LIBRARIES}
++	${RT_LIB}
++	${X11_Xft_LIB}
++	${X11_Xrandr_LIB}
++	${JPEG_LIBRARIES}
+ 	${PNG_LIBRARIES}
+ )
+ 
+@@ -228,8 +228,8 @@
+ 		SOVERSION ${SLIM_VERSION})
+ 
+ 	install(TARGETS libslim
+-		LIBRARY DESTINATION lib
+-		ARCHIVE DESTINATION lib
++		LIBRARY DESTINATION lib${LIB_SUFFIX}
++		ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ 	)
+ endif (BUILD_SHARED_LIBS)
+ 
diff --git a/system/slim/patches/slim-1.3.6-session-chooser.patch b/system/slim/patches/slim-1.3.6-session-chooser.patch
new file mode 100644
index 0000000000..b43c9a3076
--- /dev/null
+++ b/system/slim/patches/slim-1.3.6-session-chooser.patch
@@ -0,0 +1,115 @@
+--- a/cfg.cpp	2013-10-01 18:38:05.000000000 -0400
++++ b/cfg.cpp	2013-10-24 12:12:20.584103253 -0400
+@@ -274,14 +274,14 @@
+ 	while (true) {
+ 		string::const_iterator begin = s;
+ 		while (*s != c && s != str.end()) { ++s; }
+-	tmp = string(begin, s);
+-	if (useEmpty || tmp.size() > 0)
++		tmp = string(begin, s);
++		if (useEmpty || tmp.size() > 0)
+ 			v.push_back(tmp);
+ 		if (s == str.end()) {
+ 			break;
+ 		}
+ 		if (++s == str.end()) {
+-		if (useEmpty)
++			if (useEmpty)
+ 				v.push_back("");
+ 			break;
+ 		}
+@@ -289,6 +289,7 @@
+ }
+ 
+ void Cfg::fillSessionList(){
++	string strSessionList = getOption("sessions");
+ 	string strSessionDir  = getOption("sessiondir");
+ 
+ 	sessions.clear();
+@@ -307,29 +308,29 @@
+ 				struct stat oFileStat;
+ 
+ 				if (stat(strFile.c_str(), &oFileStat) == 0) {
+-                    if (S_ISREG(oFileStat.st_mode) &&
+-                            access(strFile.c_str(), R_OK) == 0){
+-                        ifstream desktop_file( strFile.c_str() );
+-                        if (desktop_file){
+-                             string line, session_name = "", session_exec = "";
+-                             while (getline( desktop_file, line )) {
+-                                 if (line.substr(0, 5) == "Name=") {
+-                                     session_name = line.substr(5);
+-                                     if (!session_exec.empty())
+-                                         break;
+-                                 } else
+-                                     if (line.substr(0, 5) == "Exec=") {
+-                                         session_exec = line.substr(5);
+-                                         if (!session_name.empty())
+-                                             break;
+-                                     }
+-                             }
+-                             desktop_file.close();
+-                             pair<string,string> session(session_name,session_exec);
+-                             sessions.push_back(session);
+-                             cout << session_exec << " - " << session_name << endl;
+-                        }
+-
++					if (S_ISREG(oFileStat.st_mode) &&
++						access(strFile.c_str(), R_OK) == 0){
++							ifstream desktop_file( strFile.c_str() );
++							if (desktop_file){
++								string line, session_name = "", session_exec = "";
++								while (getline( desktop_file, line )) {
++								if (line.substr(0, 5) == "Name=") {
++									session_name = line.substr(5);
++									if (!session_exec.empty()) break;
++								} else if (line.substr(0, 5) == "Exec=") {
++									session_exec = line.substr(5);
++									if (!session_name.empty()) break;
++								}
++							}
++							desktop_file.close();
++							if (!session_name.empty() && !session_exec.empty()) {
++								pair<string,string> session(session_name,session_exec);
++								sessions.push_back(session);
++							} else if (access(strFile.c_str(), X_OK) == 0) {
++								pair<string,string> session(string(pDirent->d_name),strFile);
++								sessions.push_back(session);
++							}
++						}
+ 					}
+ 				}
+ 			}
+@@ -338,8 +339,18 @@
+ 	}
+ 
+ 	if (sessions.empty()){
+-        pair<string,string> session("","");
+-        sessions.push_back(session);
++		if (strSessionList.empty()) {
++			pair<string,string> session("","");
++			sessions.push_back(session);
++		} else {
++			// iterate through the split of the session list
++			vector<string> sessit;
++			split(sessit,strSessionList,',',false);
++			for (vector<string>::iterator it = sessit.begin(); it != sessit.end(); ++it) {
++				pair<string,string> session(*it,*it);
++				sessions.push_back(session);
++			}
++		}
+ 	}
+ }
+ 
+--- a/app.cpp	2013-10-24 12:16:59.870111072 -0400
++++ b/app.cpp	2013-10-24 12:29:59.899132910 -0400
+@@ -377,10 +377,6 @@
+ 			LoginPanel->SetName(cfg->getOption("default_user") );
+ 		}
+ 
+-        if (firstloop) {
+-            LoginPanel->SwitchSession();
+-        }
+-
+ 		if (!AuthenticateUser(focuspass && firstloop)){
+ 			panelclosed = 0;
+ 			firstloop = false;
diff --git a/system/slim/slim-1.3.6_freetype-2.5.1.diff b/system/slim/patches/slim-1.3.6_freetype-2.5.1.diff
index 7f4f48a9f9..7f4f48a9f9 100644
--- a/system/slim/slim-1.3.6_freetype-2.5.1.diff
+++ b/system/slim/patches/slim-1.3.6_freetype-2.5.1.diff
diff --git a/system/slim/slim.SlackBuild b/system/slim/slim.SlackBuild
index cf75bea5e7..b05bd1afa8 100644
--- a/system/slim/slim.SlackBuild
+++ b/system/slim/slim.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for SLiM
 
@@ -27,26 +27,36 @@
 #
 # Maintained by David Spencer <baildon.research@googlemail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=slim
 VERSION=${VERSION:-1.3.6}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -74,16 +84,21 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Correct the path used for suspend:
-patch -p0 < $CWD/slim.conf.patch
-# disable slimlock build
-patch -p0 < $CWD/CMakeLists.txt.patch
+# Correct the path used for suspend and a few things about sessions
+patch -p1 < $CWD/patches/slim-1.3.6-config.diff
 # Fix for freetype-2.5.5 headers
-patch -p1 < $CWD/slim-1.3.6_freetype-2.5.1.diff
+patch -p1 < $CWD/patches/slim-1.3.6_freetype-2.5.1.diff
+# Fixes for slim libraries
+patch -p1 < $CWD/patches/slim-1.3.6-libslim-cmake-fixes.patch
+# Honour our FLAGS
+patch -p1 < $CWD/patches/slim-1.3.6-honour-cflags.patch
+# Fix for the latest gcc
+patch -p1 < $CWD/patches/slim-1.3.6-gcc11.patch
+# Fix a bug
+patch -p1 < $CWD/patches/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch
 
 # Fix location of man-pages
 sed "s/share\/man/man/" -i CMakeLists.txt
-sed -i "s/DESTINATION lib/DESTINATION lib${LIBDIRSUFFIX}/" CMakeLists.txt
 
 mkdir -p build
 cd build
@@ -91,6 +106,8 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=$LIBDIRSUFFIX \
+    -DUSE_PAM=yes \
     -DUSE_CONSOLEKIT=no \
     -DCMAKE_BUILD_TYPE=Release ..
   make
@@ -105,7 +122,7 @@ tar xvf $CWD/slackware-black.tar.bz2 -C $PKG/usr/share/slim/themes
 
 # Add a logrotate file
 mkdir -p $PKG/etc/logrotate.d
-cat $CWD/slim.logrotate > $PKG/etc/logrotate.d/slim.new
+cat $CWD/files/slim.logrotate > $PKG/etc/logrotate.d/slim.new
 
 # Kill the incorrectly-placed (and useless anyway) systemd stuff
 rm -rf $PKG/usr/usr
@@ -113,15 +130,17 @@ rm -rf $PKG/usr/usr
 # Kill systemd stuff
 rm -rf $PKG/lib
 
+install -m 0644 -D $CWD/files/Xsession $PKG/usr/share/slim/Xsession
+install -m 0644 -D $CWD/files/slim.pam $PKG/etc/pam.d/slim/slim.pam
+install -m 0644 -D $CWD/files/slimlock.pam $PKG/etc/pam.d/slimlock/slimlock.pam
+install -m 0644 -D slimlock.conf $PKG/etc/slimlock.conf
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-# Remove slimlock as we don't build it
-rm $PKG/usr/man/man1/slimlock.1.gz
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog COPYING INSTALL README THEMES TODO xinitrc.sample $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -132,4 +151,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/slim/slim.conf.patch b/system/slim/slim.conf.patch
deleted file mode 100644
index 88d47513c1..0000000000
--- a/system/slim/slim.conf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- slim.conf.orig	2014-08-07 21:04:23.591900466 -0700
-+++ slim.conf	2014-08-07 21:05:44.455894937 -0700
-@@ -9,6 +9,8 @@
- reboot_cmd          /sbin/shutdown -r now
- console_cmd         /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login"
- #suspend_cmd        /usr/sbin/suspend
-+## slackware suspend command
-+suspend_cmd        /usr/sbin/pm-suspend
- 
- # Full path to the xauth binary
- xauth_path         /usr/bin/xauth 
diff --git a/system/slmenu/README b/system/slmenu/README
new file mode 100644
index 0000000000..ace35977b4
--- /dev/null
+++ b/system/slmenu/README
@@ -0,0 +1,4 @@
+slmenu (single line menu)
+
+slmenu is a dmenu clone for the console. It works with the Linux
+console or any X or Wayland terminal emulator.
diff --git a/system/slmenu/git2tarxz.sh b/system/slmenu/git2tarxz.sh
new file mode 100644
index 0000000000..9717c7d813
--- /dev/null
+++ b/system/slmenu/git2tarxz.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create
+# a tarball of. With no arg, HEAD is used.
+
+PRGNAM=slmenu
+CLONE_URL=https://github.com/joshaw/slmenu
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/system/slmenu/slack-desc b/system/slmenu/slack-desc
new file mode 100644
index 0000000000..380f1a2c19
--- /dev/null
+++ b/system/slmenu/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+slmenu: slmenu (single line menu)
+slmenu:
+slmenu: slmenu is a dmenu clone for the console. It works with the Linux
+slmenu: console or any X or Wayland terminal emulator.
+slmenu:
+slmenu:
+slmenu:
+slmenu:
+slmenu:
+slmenu:
+slmenu:
diff --git a/system/slmenu/slmenu.SlackBuild b/system/slmenu/slmenu.SlackBuild
new file mode 100644
index 0000000000..5338a14dae
--- /dev/null
+++ b/system/slmenu/slmenu.SlackBuild
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+# Slackware build script for slmenu
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=slmenu
+VERSION=${VERSION:-20160415_b3740ca}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+sed -i "s,-Os,$SLKCFLAGS," config.mk
+sed -i '/@..CC/s,@,,' Makefile # show compile commands!
+
+make
+make install PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$PKG
+
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/slmenu/slmenu.info b/system/slmenu/slmenu.info
new file mode 100644
index 0000000000..56673fbd9d
--- /dev/null
+++ b/system/slmenu/slmenu.info
@@ -0,0 +1,10 @@
+PRGNAM="slmenu"
+VERSION="20160415_b3740ca"
+HOMEPAGE="https://github.com/joshaw/slmenu"
+DOWNLOAD="https://slackware.uk/~urchlay/src/slmenu-20160415_b3740ca.tar.xz"
+MD5SUM="720cc57bbde7e350f9e33549aa32e351"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/slpkg/README b/system/slpkg/README
index 5828dd8d0e..94145cfd3e 100644
--- a/system/slpkg/README
+++ b/system/slpkg/README
@@ -1,36 +1,5 @@
-Slpkg is a powerful software package manager that installs,
-updates, and removes packages on Slackware based systems.
-It automatically computes dependencies and figures out what
-things should occur to install packages. Slpkg makes it easier
-to maintain groups of machines without having to manually update.
-Slpkg works in accordance with the standards of the organization
-slackbuilds.org to builds packages. Also uses the Slackware Linux
-instructions for installation, upgrading or removing packages.
-
-What makes slpkg to distinguish it from the other tools;
-The user-friendliness it's a primary target as well as easy to
-understand and use, also use colours (by default) to highlight
-packages and display warning messages, and many of the others
-available options it's ready to use.
-
-Features
-
-* Dependencies resolutions
-* Dependencies visualizations
-* Multiple options
-* Multiple repositories
-* Easy configuration
-* Fully configurable
-* Adaptability
-* Powerful options
-* Source builder
-* Faster process
-* Better Security
-
-Optional dependencies:
-
-* python3-pythondialog (for dialog box interface)
-* pygraphviz (for drawing dependencies diagram)
-* graph-easy (for drawing ascii dependencies diagram)
-* aria2 (alternative downloader)
-* httpie (alternative downloader)
+Slpkg is a software package manager that installs, updates and
+removes packages on Slackware-based systems. It automatically
+calculates dependencies and figures out what things need to
+happen to install packages. Slpkg makes it easier to manage
+groups of machines without the need for manual updates.
diff --git a/system/slpkg/doinst.sh b/system/slpkg/doinst.sh
index 67244ee97e..ad7af35073 100644
--- a/system/slpkg/doinst.sh
+++ b/system/slpkg/doinst.sh
@@ -8,12 +8,7 @@ config() {
   fi
 }
 
-CONFIGS="slpkg.conf repositories.conf blacklist slackware-mirrors \
-    default-repositories custom-repositories rlworkman.deps pkg_security"
-for file in $CONFIGS; do
-    config etc/slpkg/${file}.new
+FILES="slpkg repositories blacklist"
+for file in $FILES; do
+  config etc/slpkg/$file.toml.new
 done
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
diff --git a/system/slpkg/slack-desc b/system/slpkg/slack-desc
index 9eebd74623..e9abbc7cd9 100644
--- a/system/slpkg/slack-desc
+++ b/system/slpkg/slack-desc
@@ -8,11 +8,11 @@
      |-----handy-ruler------------------------------------------------------|
 slpkg: slpkg (Slackware Packaging Tool)
 slpkg:
-slpkg: Slpkg is a powerful software package manager that installs, updates
-slpkg: and removes packages on Slackware based systems. It automatically
-slpkg: computes dependencies and figures out what things should occur
-slpkg: to install packages. Slpkg makes it easier to maintain groups of
-slpkg: of machines without having to manually update.
+slpkg: Slpkg is a software package manager that installs, updates and
+slpkg: removes packages on Slackware-based systems. It automatically
+slpkg: calculates dependencies and figures out what things need to
+slpkg: happen to install packages. Slpkg makes it easier to manage
+slpkg: groups of machines without the need for manual updates.
 slpkg:
 slpkg: Homepage: https://dslackw.gitlab.io/slpkg
 slpkg:
diff --git a/system/slpkg/slpkg.SlackBuild b/system/slpkg/slpkg.SlackBuild
index 317c863c13..7ce48dca49 100644
--- a/system/slpkg/slpkg.SlackBuild
+++ b/system/slpkg/slpkg.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for slpkg
 
-# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2024  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=slpkg
-VERSION=${VERSION:-3.9.1}
+VERSION=${VERSION:-5.0.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,28 +79,34 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python3 setup.py install --root=$PKG
+python3 -m build --wheel --no-isolation
+python3 -m installer --destdir "$PKG" dist/*.whl
+
+# Move executables to the /usr/sbin folder.
+mkdir -p $PKG/usr/sbin
+mv $PKG/usr/bin/slpkg $PKG/usr/sbin/slpkg
+mv $PKG/usr/bin/slpkg_new-configs $PKG/usr/sbin/slpkg_new-configs
+rm -rf $PKG/usr/bin
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/etc/slpkg
-# install configuration files
-CONFIGS="slpkg.conf repositories.conf blacklist slackware-mirrors \
-    default-repositories custom-repositories rlworkman.deps pkg_security"
-for file in $CONFIGS; do
-    install -D -m0644 conf/$file $PKG/etc/slpkg/${file}.new
+FILES="slpkg repositories blacklist"
+for file in $FILES; do
+  install -D -m0644 configs/$file.toml $PKG/etc/slpkg/$file.toml.new
 done
 
-# keep original configuration file for reset
-cp -p conf/slpkg.conf $PKG/etc/slpkg/slpkg.conf.orig
+mkdir -p $PKG/usr/man/man1 & mkdir -p $PKG/usr/man/fr/man1
+cp man/slpkg.1 $PKG/usr/man/man1
+cp man/slpkg-fr.1 $PKG/usr/man/fr/man1/slpkg.1
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.md ChangeLog.txt LICENSE TESTING ISSUES KNOWN_ISSUES REPOSITORIES.md \
-    INSTALL.md requirements.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md ChangeLog.txt LICENSE requirements.txt repositories.txt \
+	$PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -98,4 +114,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/slpkg/slpkg.info b/system/slpkg/slpkg.info
index 66c1162c9f..4f41452f37 100644
--- a/system/slpkg/slpkg.info
+++ b/system/slpkg/slpkg.info
@@ -1,10 +1,10 @@
 PRGNAM="slpkg"
-VERSION="3.9.1"
+VERSION="5.0.6"
 HOMEPAGE="https://dslackw.gitlab.io/slpkg"
-DOWNLOAD="https://gitlab.com/dslackw/slpkg/-/archive/3.9.1/slpkg-3.9.1.tar.gz"
-MD5SUM="19d4b05df424482d8532892fc6271666"
+DOWNLOAD="https://gitlab.com/dslackw/slpkg/-/archive/5.0.6/slpkg-5.0.6.tar.gz"
+MD5SUM="e60a6209746b71acab473f09e406d441"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3 python-urllib3"
+REQUIRES="python3-build python3-pythondialog"
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/system/smart/README b/system/smart/README
index 463d9b6434..b316a3c90f 100644
--- a/system/smart/README
+++ b/system/smart/README
@@ -1,15 +1,18 @@
-The Smart Package Manager project has the ambitious objective of creating smart
-and portable algorithms for solving adequately the problem of managing
-software upgrades and installation. 
-This tool works in all major distributions and will bring notable advantages
-over native tools currently in use (APT, APT-RPM, YUM, URPMI, etc).
-
-Notice that this project is not a magical bridge between every distribution in
-the planet. Instead, this is software offering better package management for
-these distributions when working with their native packages. Using multiple 
-packaging systems at the same time (like rpm and dpkg) is possible but would
-require packages from those systems to follow the same packaging guidelines.
-As a general rule, mixing packaging systems is not recommended.
+The Smart Package Manager project has the ambitious objective of
+creating smart and portable algorithms for solving adequately the
+problem of managing software upgrades and installation.
+
+This tool works in all major distributions and will bring notable
+advantages over native tools currently in use (APT, APT-RPM, YUM,
+URPMI, etc).
+
+Notice that this project is not a magical bridge between every
+distribution in the planet. Instead, this is software offering better
+package management for these distributions when working with their
+native packages. Using multiple packaging systems at the same time
+(like rpm and dpkg) is possible but would require packages from those
+systems to follow the same packaging guidelines. As a general rule,
+mixing packaging systems is not recommended.
 
 Smart supports the following repository formats as source channels:
 
@@ -20,13 +23,13 @@ RPM repositories
   Red Carpet (used by Ximian/Novell)
 
   RPM Header List (used by RedHat and Conectiva installation CDs)
-  RPM Directory (a directory with a bunch of RPMs in it, no indexing required)
+  RPM Directory (a dir with a bunch of RPMs in it, no indexing required)
   URPMI (used by Mandriva) 
 
 DEB repositories
   DEB System Database (locally installed packages)
   APT repositories for .deb
-  DEB Directory (a directory with a bunch of DEBs in it, no indexing required) 
+  DEB Directory (a dir with a bunch of DEBs in it, no indexing required)
 
 Slackware
   Slackware installed packages database
diff --git a/system/smart/smart.SlackBuild b/system/smart/smart.SlackBuild
index 6b8a161f19..9803c676ee 100644
--- a/system/smart/smart.SlackBuild
+++ b/system/smart/smart.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for smart
 # Written by Marcin Slodkiewicz <slociu@wp.pl>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=smart
 VERSION=${VERSION:-1.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -16,7 +19,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,4 +79,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/smbldap-tools/smbldap-tools.SlackBuild b/system/smbldap-tools/smbldap-tools.SlackBuild
index baace4cd42..55683a178c 100644
--- a/system/smbldap-tools/smbldap-tools.SlackBuild
+++ b/system/smbldap-tools/smbldap-tools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for smbldap-tools
 
@@ -31,14 +31,24 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=smbldap-tools
 VERSION=${VERSION:-0.9.10}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -104,4 +114,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/smem/README b/system/smem/README
index 5058db778f..fd3bebd203 100644
--- a/system/smem/README
+++ b/system/smem/README
@@ -3,4 +3,7 @@ systems.  Unlike existing tools, smem can report proportional set size
 (PSS), which is a more meaningful representation of the amount of
 memory used by libraries and applications in a virtual memory system.
 
-Optional dependency: matplotlib (for chart generation)
+Optional dependency: python3-matplotlib (for chart generation)
+
+Note: the executable and man page are renamed smem-py to avoid conflict
+with stock slackware's cfitsio package.
diff --git a/system/smem/smem.SlackBuild b/system/smem/smem.SlackBuild
index 240da7dcec..ca8a23bd35 100644
--- a/system/smem/smem.SlackBuild
+++ b/system/smem/smem.SlackBuild
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for smem
 
+# Copyright 2022 Yth | Pont-en-Royans, France | yth@ythogtha.org
 # Copyright 2009 Dušan Stefanović <stefanovic.dusan@gmail.com>
 # Copyright 2013-2017 Audrius Kažukauskas <audrius@neutrino.lt>
 # All rights reserved.
@@ -23,14 +24,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=smem
-VERSION=${VERSION:-1.4}
+VERSION=${VERSION:-1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -41,7 +52,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || tar xvf $CWD/$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -50,9 +61,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-install -m 0755 -D smem $PKG/usr/bin/smem
+# Using python3
+sed -i 's#usr/bin/env python#usr/bin/env python3#' smem
+# Renamed to smem-py because /usr/bin/smem is part of slackware's cfitsio package
+install -m 0755 -D smem $PKG/usr/bin/smem-py
 
-install -m 0644 -D smem.8 $PKG/usr/man/man8/smem.8
+install -m 0644 -D smem.8 $PKG/usr/man/man8/smem-py.8
 gzip -9 $PKG/usr/man/man8/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -63,4 +77,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/smem/smem.info b/system/smem/smem.info
index bc1fcb75cd..1e493ec7e7 100644
--- a/system/smem/smem.info
+++ b/system/smem/smem.info
@@ -1,10 +1,10 @@
 PRGNAM="smem"
-VERSION="1.4"
+VERSION="1.5"
 HOMEPAGE="https://www.selenic.com/smem/"
-DOWNLOAD="https://www.selenic.com/smem/download/smem-1.4.tar.gz"
-MD5SUM="fe79435c3930389bfdb560255c802162"
+DOWNLOAD="https://selenic.com/repo/smem/archive/1.5.tar.bz2"
+MD5SUM="cda151260f38d2e3257df5c04ccecc1d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Audrius Kažukauskas"
-EMAIL="audrius@neutrino.lt"
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/system/smenu/README b/system/smenu/README
new file mode 100644
index 0000000000..84033e9c46
--- /dev/null
+++ b/system/smenu/README
@@ -0,0 +1,8 @@
+smenu (interactive selection filter)
+
+smenu is a selection filter just like sed is an editing filter.
+
+This tool reads words from standard input or from a file, and presents
+them to the terminal screen in different layouts in a scrolling
+window. A cursor, easily moved using the keyboard and/or the mouse,
+makes it possible to select one or more words.
diff --git a/system/smenu/slack-desc b/system/smenu/slack-desc
new file mode 100644
index 0000000000..e1a0226c9e
--- /dev/null
+++ b/system/smenu/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+smenu: smenu (interactive selection filter)
+smenu:
+smenu: smenu is a selection filter just like sed is an editing filter.
+smenu:
+smenu: This tool reads words from standard input or from a file, and presents
+smenu: them to the terminal screen in different layouts in a scrolling
+smenu: window. A cursor, easily moved using the keyboard and/or the mouse,
+smenu: makes it possible to select one or more words.
+smenu:
+smenu:
+smenu:
diff --git a/system/smenu/smenu.SlackBuild b/system/smenu/smenu.SlackBuild
new file mode 100644
index 0000000000..9d83b1160c
--- /dev/null
+++ b/system/smenu/smenu.SlackBuild
@@ -0,0 +1,85 @@
+#!/bin/bash
+
+# Slackware build script for smenu
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=smenu
+VERSION=${VERSION:-1.3.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a COPYRIGHT ChangeLog FAQ LICENSE README* SUMMARY examples $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/smenu/smenu.info b/system/smenu/smenu.info
new file mode 100644
index 0000000000..c771324c90
--- /dev/null
+++ b/system/smenu/smenu.info
@@ -0,0 +1,10 @@
+PRGNAM="smenu"
+VERSION="1.3.0"
+HOMEPAGE="https://github.com/p-gen/smenu/"
+DOWNLOAD="https://github.com/p-gen/smenu/archive/v1.3.0/smenu-1.3.0.tar.gz"
+MD5SUM="67301a5460e6888d6d3834765fa62c35"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/smokeping/README b/system/smokeping/README
new file mode 100644
index 0000000000..ce743b71e6
--- /dev/null
+++ b/system/smokeping/README
@@ -0,0 +1,92 @@
+SmokePing is a deluxe latency measurement tool.
+
+It can measure, store and display latency, latency distribution and
+packet loss. SmokePing uses RRDtool to maintain a longterm data-store
+and to draw pretty graphs, giving up to the minute information on the
+state of each network connection.
+
+1. Measures latency as well as latency variation.
+2. Wide variety of probes, ranging from simple ping to web requests and
+    custom protocols.
+3. Advanced alarm system, triggering on configurable 'latency patterns'.
+4. Master/slave deployment model to run measurments from multiple
+   sources in parallel.
+5. Ajax based graph navigation.
+6. Chart mode, to show the most interesting graphs first
+7. Plug-able probes, alarms (matchers) and charting function.
+
+As Smokeping is a web application, installing it is more involved
+than ordinary slackbuilds.
+
+0. smokeping needs to run under its own user/group. This has been
+ assigned to
+the following by SlackBuilds.org, but feel free to change it on your
+system for consistency with local assignments.
+  User:   smokeping            UID: 383        GID: 383
+  group:  smokeping                            GID: 383
+You can change pass alternate values for the user and group using
+SB_USER, SB_GROUP, SB_UID, SB_GID variables when running the build
+ script.
+
+1. Most of smokeping is installed into normal system directories.
+2. The web part is installed into /var/www/htdocs/smokeping/
+3. You need to configure a web server to serve the web part. This is
+   a reference nginx setup:
+           location /smokeping/ {
+            client_max_body_size 200M;
+            index smokeping.fcgi;
+            chunked_transfer_encoding off;
+            gzip off;
+            location ~ \.fcgi$ {
+                client_max_body_size 200M;
+                fastcgi_intercept_errors on;
+                include /etc/nginx/fastcgi_params;
+       fastcgi_param SCRIPT_FILENAME /srv/http/smokeping/smokeping.fcgi;
+                gzip off;
+                fastcgi_buffering off;
+                chunked_transfer_encoding off;
+                fastcgi_pass unix:/run/smokeping-fcgi.sock;
+
+            }
+        }
+4. The above setup relies on the fact that smokeping.fcgi is started as
+   a fastcgi service by spawn-fcgi, rc.smokeping does this for you.
+   Nginx, or whatever webserver you are using, must be in the
+   "smokeping" group to
+   access the /run/smokeping-fcgi.sock socket.
+
+5. Smokeping uses /ect/smokeping/config" as its
+   configuration file.
+
+6. This build ships a Slackware-style init file /etc/rc.d/rc.smokeping
+    , which
+   is not coming from the package itself. So patches welcome. It is,
+   therefore,
+   shipped as a .new file, because you might want to adjust it.
+
+7. This build does not ship a slave init file for distributed setups.
+   Patches welcome.
+
+8. Smokeping has a lot of configuration files, which might tweak its
+   behaviour. Most of these files are installed as .dist, and will be
+   overwritten on update. Ready-to use .conf files are not provided, the
+   user is expected to copy them as needed.
+
+   The list is:
+   /etc/smokeping/basepage.html.dist -- webpage template
+   /etc/smokeping/tmail.dist -- mail report template
+   /etc/smokeping/smokemail.dist -- some other mail template
+   /etc/smokeping/config.dist -- main configuration file
+   /var/www/htdocs/smokeping/smokeping.fcgi.dist -- fcgi template
+
+9. Smokeping service, _and_ smokeping fcgi service both need access to
+   data files, which are by default in /var/lib/smokeping/.
+   So they both run as the user smokeping.
+   Your webserver should be able to read images from
+   /var/lib/smokeping/images,
+   so you might want to add apache (or whichever user your webserver
+   uses) to the group smokeping.
+
+10. Verify that fcgi works by
+/usr/bin/spawn-fcgi -n -u smokeping -s /run/smokeping-fcgi.sock -M 660\
+-U smokeping -- /var/www/htdocs/smokeping/smokeping.fcgi
diff --git a/system/smokeping/rc.smokeping b/system/smokeping/rc.smokeping
new file mode 100755
index 0000000000..3ed71d2128
--- /dev/null
+++ b/system/smokeping/rc.smokeping
@@ -0,0 +1,145 @@
+#!/bin/bash
+
+#SMOKEPING_VERSION="2.8.3"
+SMOKEPING_PIDFILE="/run/smokeping/smokeping.pid"
+SMOKEPING_USER=@SMOKEPING_USER@
+SMOKEPING_PATH=@SMOKEPING_PATH@
+SMOKEPING_CONFIG_PATH=@SMOKEPING_CONFIG_PATH@
+SMOKEPING_LOG_PATH="/var/log/smokeping.nosyslog.log"
+
+get_child_pids() {
+  if [[ -z "$1" ]]; then echo "get_child_pids:error: \$1 is empty " 1>&2 ; exit 1 ; fi
+  local parent_pid=$1
+  ps -o pid --no-headers --ppid $parent_pid
+}
+
+# Function to recursively get all descendant PIDs
+get_descendant_pids() {
+  if [[ -z "$1" ]]; then echo "get_descendant_pids:error: \$1 is empty " 1>&2 ; exit 1 ; fi
+  local parent_pid=$1
+  local child_pids=$(get_child_pids $parent_pid)
+  for pid in $child_pids; do
+    echo $pid
+    get_descendant_pids $pid
+  done
+}
+
+function start
+{
+  export LC_ALL=C
+  # no idea why this is required
+  # https://github.com/oetiker/SmokePing/issues/29
+  cd /var/lib/smokeping
+
+  mkdir -p /run/smokeping/
+  chown $SMOKEPING_USER /run/smokeping/
+
+  touch "$SMOKEPING_LOG_PATH"
+  chown $SMOKEPING_USER "$SMOKEPING_LOG_PATH"
+  
+  if [[ -e $SMOKEPING_PIDFILE && ( "" == "$(cat $SMOKEPING_PIDFILE)" ) ]]
+  then
+    printf "Pid file is empty: %s\n" "$SMOKEPING_PIDFILE" 1>&2
+  elif [[ -e $SMOKEPING_PIDFILE && ( "" != "$(cat $SMOKEPING_PIDFILE)" ) ]]
+  then
+    PID=$(cat "$SMOKEPING_PIDFILE")
+    printf "PID=%s\n" "$PID"
+    if ps --pid "$PID"
+    then
+      printf "Smokeping already running with pid %d.\n" "$PID" 1>&2
+      return 1
+    else
+      printf "You have bogus pid file!\n" 1>&2
+      rm "$SMOKEPING_PIDFILE"
+    fi
+  fi
+
+  /sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip'  /usr/sbin/fping
+  if ! su smokeping -s/bin/sh -c "$SMOKEPING_PATH --config=$SMOKEPING_CONFIG_PATH --logfile=$SMOKEPING_LOG_PATH"
+  then
+    printf "Smokeping failed to start!\n" 1>&2
+    return 2
+  fi
+
+  if [[ ! -e $SMOKEPING_PIDFILE ]]
+  then
+    printf "Smokeping pidfile missing!\n" 1>&2
+    return 3
+  elif [[ "" == $(cat $SMOKEPING_PIDFILE  | tr -d '\n' ) ]]
+  then
+    printf "Pid file %s empty.\n" $(cat $SMOKEPING_PIDFILE) 1>&2
+  else
+    PID=$(cat "$SMOKEPING_PIDFILE")
+    if ps --pid "$PID"
+    then
+      :
+    else
+      printf "Smokeping created pidfile, but is not running!\n" 1>&2
+      return 4
+    fi
+  fi
+  rm -f /run/smokeping-fcgi.sock
+  /usr/bin/spawn-fcgi -u $SMOKEPING_USER -s /run/smokeping-fcgi.sock -M 660 -U $SMOKEPING_USER -- /var/www/htdocs/smokeping/smokeping.fcgi
+  return 0
+}
+
+function stop()
+{
+  if [[ ! -e "$SMOKEPING_PIDFILE" ]];  then
+    printf "Pid file %s does not exist!\n" "$SMOKEPING_PIDFILE"
+    return 6
+  elif [[ "" == "$(cat "$SMOKEPING_PIDFILE")" ]] ;  then
+    printf "Pid file %s empty!\n" "$SMOKEPING_PIDFILE"
+    return 6
+  fi
+  child_pids=$(get_descendant_pids $(cat  "$SMOKEPING_PIDFILE"))
+  printf "Full pid list (smokeping+children):%s\n" "$(cat "$SMOKEPING_PIDFILE") $child_pids"
+  /bin/kill --timeout 3000 TERM --timeout 1000 KILL --signal QUIT $(cat "$SMOKEPING_PIDFILE") $child_pids
+
+  rm -f "$SMOKEPING_PIDFILE"
+
+  if pgrep -f 'bin/smokeping ' -la >/dev/null 2>&1 # the space is important
+  then
+    printf "Killing smokeping failed!\n" 1>&2
+    pgrep -f 'bin/smokeping' -la
+  fi
+  /bin/kill --timeout 3000 TERM --timeout 1000 KILL --signal QUIT $(/usr/sbin/ss -f unix -l -p | grep /run/smokeping-fcgi.sock | sed -E 's/.*pid=([[:digit:]]+),.*/\1/g')
+  rm /run/smokeping-fcgi.sock
+}
+
+case "$1" in
+  start)
+    printf "case up\n"
+    start
+    exit "$?"
+    ;;
+  stop)
+    printf "case down\n"
+    stop
+    exit "$?"
+    ;;
+  status)
+    if [[ -e "$SMOKEPING_PIDFILE" && "" != $(cat  "$SMOKEPING_PIDFILE") ]] ; then
+      pstree -s -p $(cat  "$SMOKEPING_PIDFILE")
+    else
+      printf "smokeping is not running or not running from this service.\n"
+    fi
+    cgi_pid=$(/usr/sbin/ss -f unix -l -p | grep /run/smokeping-fcgi.sock | sed -E 's/.*pid=([[:digit:]]+),.*/\1/g' 2>/dev/null)
+    if [[ "" == "$cgi_pid" ]] ; then
+      printf "smokeping_cgi is not running or not running from this service.\n"
+    else
+      pstree -s -p "$cgi_pid"
+    fi
+    ;;
+  restart)
+    if ! stop
+    then
+      exit "$?"
+    fi
+    if ! start
+    then
+      exit "$?"
+    fi
+    ;;
+  *) printf "usage: {up,down,restart,status}\n"
+esac
diff --git a/system/smokeping/rc.smokeping-slave b/system/smokeping/rc.smokeping-slave
new file mode 100755
index 0000000000..423bafc259
--- /dev/null
+++ b/system/smokeping/rc.smokeping-slave
@@ -0,0 +1,125 @@
+#!/usr/bin/env bash
+
+
+get_child_pids() {
+  if [[ -z "$1" ]]; then echo "get_child_pids:error: \$1 is empty " 1>&2 ; exit 1 ; fi
+  local parent_pid=$1
+  ps -o pid --no-headers --ppid $parent_pid
+}
+
+# Function to recursively get all descendant PIDs
+get_descendant_pids() {
+  if [[ -z "$1" ]]; then echo "get_descendant_pids:error: \$1 is empty " 1>&2 ; exit 1 ; fi
+  local parent_pid=$1
+  local child_pids=$(get_child_pids $parent_pid)
+  for pid in $child_pids; do
+    echo $pid
+    get_descendant_pids $pid
+  done
+}
+
+export LC_ALL=C
+function qnd_waitpid()
+(
+    while ps -p $1 &> /dev/null
+    do
+	sleep 5
+    done
+)
+cd /tmp
+
+source /etc/smokeping/slave_config.conf || { printf "/etc/smokeping/slave_config.conf not found\n" ; exit 1; }
+LOGFILE=${LOGFILE:-/var/log/smokeping-slave.log}
+CACHEDIR=${CACHEDIR:-/var/lib/smokeping/slave-cache}
+SLAVE_SECRET_PATH=${SLAVE_SECRET_PATH:-/etc/smokeping/slave_secret.conf}
+SMOKEPING_USER=${SMOKEPING_USER:-smokeping}
+if [[ "$MASTER_URL" == "" ]] ; then
+    printf "Set MASTER_URL= in /etc/smokeping/slave_config.conf\n"
+    exit 1
+fi
+if [[ ! -e "$SLAVE_SECRET_PATH" ]] ; then
+    printf "set SLAVE_SECRET_PATH in /etc/smokeping/slave_config.conf\n"
+fi
+chmod a-rwx "$SLAVE_SECRET_PATH"
+SMOKEPING_PIDFILE=/run/smokeping-slave.pid
+
+
+start()
+{
+    cd /var/lib/smokeping/
+
+    mkdir -p "$CACHEDIR"
+    chown $SMOKEPING_USER $CACHEDIR
+
+    touch "$LOGFILE"
+    chown $SMOKEPING_USER "$LOGFILE"
+
+    while true
+    do
+        /sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip'  /usr/sbin/fping
+        printf "\nStarting smokeping: %s\n" "$(date +'%Y-%m-%dT%H:%M:%S')" >> "$LOGFILE"
+        unset LC_ALL
+        unset LC_COLLATE
+        rm -rf "$CACHEDIR"/*.cache
+        printf '\nMONITOR:%s New process\n' $(date +'%Y-%m-%dT%H:%M:%S') >> $LOGFILE
+
+        /bin/su $SMOKEPING_USER -s/bin/bash -c "\
+           /usr/bin/smokeping \
+           --nodaemon \
+           --master-url=$MASTER_URL\
+           --cache-dir=$CACHEDIR  \
+           --shared-secret=$SLAVE_SECRET_PATH \
+           --logfile=$LOGFILE &>> $LOGFILE"
+        sync
+        sleep 1
+#        qnd_waitpid $(cat "$CACHEDIR"/smokeping.pid)
+        printf "MONITOR:Smokeping died: %s\n" "$(date +'%Y-%m-%dT%H:%M:%S')" | tee "$LOGFILE"
+        sleep 5
+    done & >/dev/null 2>&1
+    WRAPPER_PID=$!
+    echo "$WRAPPER_PID" > /run/smokeping-slave.pid
+}
+
+stop()
+{
+    printf "Killing smokeping slave.\n"
+
+    child_pids=$(get_descendant_pids $(cat  "$SMOKEPING_PIDFILE"))
+
+    printf "PIDS=%s" "$(cat "$SMOKEPING_PIDFILE") $child_pids"
+    /bin/kill --timeout 3000 TERM --timeout 1000 KILL --signal QUIT $(cat "$SMOKEPING_PIDFILE") $child_pids
+    
+}
+
+
+case "$1" in
+  start)
+    printf "case up\n"
+    start
+    exit "$?"
+    ;;
+  stop)
+    printf "case down\n"
+    stop
+    exit "$?"
+    ;;
+  status)
+    if [[ -e "$SMOKEPING_PIDFILE" && "" != $(cat  "$SMOKEPING_PIDFILE") ]] ; then
+      pstree -s -p $(cat  "$SMOKEPING_PIDFILE")
+    else
+      printf "smokeping slave is not running or not running from this service.\n"
+    fi
+    ;;
+  restart)
+    if ! stop
+    then
+      exit "$?"
+    fi
+    if ! start
+    then
+      exit "$?"
+    fi
+    ;;
+  *) printf "usage: {up,down,restart,status}\n"
+esac
+
diff --git a/system/smokeping/slack-desc b/system/smokeping/slack-desc
new file mode 100644
index 0000000000..8823c7aa95
--- /dev/null
+++ b/system/smokeping/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+smokeping: smokeping (the father of all monitoring systems)
+smokeping:
+smokeping: Smokeping is the first available systems and network monitoring
+smokeping: system. Its logic is very simple: ping a machine from the list, and
+smokeping: record response time into a database. Display the graphs on a
+smokeping: webpage.
+smokeping: Most modern monitoring systems, such as Prometheus, learned from
+smokeping: smokeping's experience, and many reuse its components, such as fping
+smokeping: and rrdtool.
+smokeping:
+smokeping:
diff --git a/system/smokeping/smokeping-2.8.2-no-3rd-party.patch b/system/smokeping/smokeping-2.8.2-no-3rd-party.patch
new file mode 100644
index 0000000000..bd4734cb4e
--- /dev/null
+++ b/system/smokeping/smokeping-2.8.2-no-3rd-party.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile.am b/Makefile.am
+index 1dc34c7..8c00ec5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,7 +16,7 @@
+ 
+ AUTOMAKE_OPTIONS =  foreign
+ 
+-SUBDIRS = lib thirdparty bin doc etc htdocs
++SUBDIRS = lib bin doc etc htdocs
+ 
+ EXTRA_DIST = COPYRIGHT CHANGES CONTRIBUTORS LICENSE cpanfile VERSION README.md
+ 
+diff --git a/configure.ac b/configure.ac
+index 33b75c5..4ce4a12 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -140,7 +140,7 @@ NOTES
+    exit 1
+ fi
+ 
+-AC_CONFIG_FILES([Makefile bin/Makefile doc/Makefile htdocs/Makefile etc/Makefile lib/Makefile thirdparty/Makefile etc/config.dist])
++AC_CONFIG_FILES([Makefile bin/Makefile doc/Makefile htdocs/Makefile etc/Makefile lib/Makefile etc/config.dist])
+ 
+ AC_SUBST(VERSION)
+ 
diff --git a/system/smokeping/smokeping-2.8.2-paths.patch b/system/smokeping/smokeping-2.8.2-paths.patch
new file mode 100644
index 0000000000..1989ed061a
--- /dev/null
+++ b/system/smokeping/smokeping-2.8.2-paths.patch
@@ -0,0 +1,93 @@
+diff --git a/bin/smokeinfo b/bin/smokeinfo
+index 2b38b86..ff96674 100755
+--- a/bin/smokeinfo
++++ b/bin/smokeinfo
+@@ -2,8 +2,7 @@
+ use strict;
+ use warnings;
+ 
+-use lib (split /:/, q{}); # PERL5LIB
+-use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
++use lib qw(/usr/share/perl5);
+ 
+ use Smokeping::Info;
+ use Getopt::Long 2.25 qw(:config no_ignore_case);
+diff --git a/bin/smokeping b/bin/smokeping
+index 1dae42a..550beb5 100755
+--- a/bin/smokeping
++++ b/bin/smokeping
+@@ -4,13 +4,10 @@
+ use strict;
+ use warnings;
+ 
+-use FindBin;
+-use lib (split /:/, q{}); # PERL5LIB
+-use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
+-
++use lib qw(/usr/share/perl5);
+ use Smokeping;
+  
+-Smokeping::main("$FindBin::RealBin/../etc/config");
++Smokeping::main("/etc/smokeping/config");
+ 
+ =head1 NAME
+ 
+diff --git a/bin/smokeping_cgi b/bin/smokeping_cgi
+index 610118c..9a995c1 100755
+--- a/bin/smokeping_cgi
++++ b/bin/smokeping_cgi
+@@ -4,9 +4,7 @@
+ use strict;
+ use warnings;
+ 
+-use FindBin;
+-use lib (split /:/, q{}); # PERL5LIB
+-use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
++use lib qw(/usr/share/perl5);
+ 
+ # don't bother with zombies
+ $SIG{CHLD} = 'IGNORE';
+@@ -17,7 +15,7 @@ use Smokeping;
+ 
+ use CGI::Fast;
+ 
+-my $cfg = (shift @ARGV) || "$FindBin::Bin/../etc/config";
++my $cfg = (shift @ARGV) || "/etc/smokeping/config";
+ 
+ 
+ while (my $q = new CGI::Fast) {
+diff --git a/bin/tSmoke b/bin/tSmoke
+index 6b56479..db9ef92 100755
+--- a/bin/tSmoke
++++ b/bin/tSmoke
+@@ -52,9 +52,7 @@ use warnings;
+ #
+ # Point the lib variables to your implementation
+ 
+-use lib (split /:/, q{}); # PERL5LIB
+-use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
+-
++use lib qw(/usr/share/perl5);
+ 
+ use Smokeping;
+ use Net::SMTP;
+@@ -63,7 +61,7 @@ use Pod::Usage;
+ use RRDs;
+ 
+ # Point to your Smokeping config file
+-my $cfgfile = (shift @ARGV) || "$FindBin::Bin/../etc/config";
++my $cfgfile = "/etc/smokeping/config";
+ 
+ # global variables
+ my $cfg;
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 2209134..ab09330 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -31,5 +31,5 @@ MATCH := $(wildcard Smokeping/matchers/*.pm)
+ 
+ EXTRA_DIST = $(PM) $(SP) $(SORT) $(PROBE) $(MATCH)
+ 
+-perllibdir = $(prefix)/lib
++perllibdir = $(prefix)/share/perl5
+ nobase_perllib_DATA = $(EXTRA_DIST)
diff --git a/system/smokeping/smokeping-config.patch b/system/smokeping/smokeping-config.patch
new file mode 100644
index 0000000000..724798b67c
--- /dev/null
+++ b/system/smokeping/smokeping-config.patch
@@ -0,0 +1,135 @@
+diff --git a/etc/config.dist.in b/etc/config.dist.in
+index 8b9fdf3..b6f6180 100644
+--- a/etc/config.dist.in
++++ b/etc/config.dist.in
+@@ -1,19 +1,19 @@
+ *** General ***
+ 
+-owner    = Peter Random
+-contact  = some@address.nowhere
++owner    = Super User
++contact  = root@localhost
+ mailhost = my.mail.host
+-sendmail = @SENDMAIL@
++sendmail = /usr/sbin/sendmail
+ # NOTE: do not put the Image Cache below cgi-bin
+ # since all files under cgi-bin will be executed ... this is not
+ # good for images.
+-imgcache = @prefix@/cache
+-imgurl   = cache
+-datadir  = @prefix@/data
+-piddir  = @prefix@/var
+-cgiurl   = http://some.url/smokeping.cgi
+-smokemail = @prefix@/etc/smokemail.dist
+-tmail = @prefix@/etc/tmail.dist
++imgcache = /var/lib/smokeping/imgcache
++imgurl   = /smokeping/images
++datadir  = /var/lib/smokeping
++piddir   = /run/smokeping/
++cgiurl   = http://localhost/smokeping/sm.cgi
++smokemail = /etc/smokeping/smokemail
++tmail     = /etc/smokeping/tmail
+ # specify this to get syslog logging
+ syslogfacility = local0
+ # each probe is now run in its own process
+@@ -21,8 +21,8 @@ syslogfacility = local0
+ # concurrentprobes = no
+ 
+ *** Alerts ***
+-to = alertee@address.somewhere
+-from = smokealert@company.xy
++to = root@localhost
++from = root@localhost
+ 
+ +someloss
+ type = loss
+@@ -47,7 +47,7 @@ AVERAGE  0.5 144   720
+ 
+ *** Presentation ***
+ 
+-template = @prefix@/etc/basepage.html.dist
++template = /etc/smokeping/basepage.html
+ htmltitle = yes
+ graphborders = no
+ 
+@@ -110,7 +110,7 @@ unison_tolerance = 2
+ binary = /usr/sbin/fping
+ 
+ *** Slaves ***
+-secrets=@prefix@/etc/smokeping_secrets.dist
++secrets=/etc/smokeping/smokeping_secrets
+ +boomer
+ display_name=boomer
+ color=0000ff
+@@ -121,28 +121,57 @@ color=00ff00
+ 
+ *** Targets ***
+ 
++#menuextra = <a target='_blank' href='/smokeping/tr.html{HOST}' class='{CLASS}' \
++#               onclick="window.open(this.href,this.target, \
++#               'width=800,height=500,toolbar=no,location=no,status=no,scrollbars=no'); \
++#                return false;">*</a>
++#
+ probe = FPing
+ 
+ menu = Top
+ title = Network Latency Grapher
+-remark = Welcome to the SmokePing website of xxx Company. \
++remark = Welcome to the SmokePing website of <b>Insert Company Name Here</b>. \
+          Here you will learn all about the latency of our network.
+ 
+-+ Test
+-menu= Targets
+-#parents = owner:/Test/James location:/
+++ Ping
+ 
+-++ James
++menu = Alpine
++title = Alpine Pings
+ 
+-menu = James
+-title =James
+-alerts = someloss
+-slaves = boomer slave2
+-host = james.address
++++ AlpinelinuxOrg
+ 
+-++ MultiHost
++menu = alpinelinux.org
++title = Alpine Linux Webserver
++host = alpinelinux.org
+ 
+-menu = Multihost
+-title = James and James as seen from Boomer
+-host = /Test/James /Test/James~boomer
++++ DocsAlpinelinuxOrg
++
++menu = docs.alpinelinux.org
++title = Alpine Linux Docs Webserver
++host = docs.alpinelinux.org
++
++++ PkgsAlpinelinuxOrg
++
++menu = pkgs.alpinelinux.org
++title = Alpine Linux Packages
++host = pkgs.alpinelinux.org
++
++#
++# Lots of more options are available, please have a look in the included documentation.
++#
++
++
++#++ James
++
++#menu = James
++#title =James
++#alerts = someloss
++#slaves = boomer slave2
++#host = james.address
++
++#++ MultiHost
++
++#menu = Multihost
++#title = James and James as seen from Boomer
++#host = /Test/James /Test/James~boomer
+ 
diff --git a/system/smokeping/smokeping.SlackBuild b/system/smokeping/smokeping.SlackBuild
new file mode 100644
index 0000000000..74b7b3bc4c
--- /dev/null
+++ b/system/smokeping/smokeping.SlackBuild
@@ -0,0 +1,185 @@
+#!/bin/bash
+
+# Copyright Lockywolf, lockywolf gmail.com
+# Based on the work of Patrick J. Volkerding
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=smokeping
+VERSION=${VERSION:-2.8.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=${ARCH:-}
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i586 ;;
+    arm*) export ARCH=arm ;;
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+PRINT_PACKAGE_NAME=${PRINT_PACKAGE_NAME:-}
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O0 -fPIC -ggdb"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+SB_UID=${MUID:-383}
+SB_GID=${MGID:-383}
+SB_USER=${NTOPUSER:-smokeping}
+SB_GROUP=${NTOPGROUP:-smokeping}
+
+if ! getent group $SB_GROUP 2>&1 > /dev/null; then
+  echo "  You must have an $SB_GROUP group to run this script."
+  echo "    # groupadd -g $SB_GID $PRGNAM"
+  exit 1
+elif ! getent passwd $SB_USER 2>&1 > /dev/null; then
+  echo "  You must have a $SB_USER user to run this script."
+  echo "    # useradd -u $SB_UID -g $SB_GID -d /var/lib/$PRGNAM $SB_USER"
+  exit 1
+fi
+
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
+cd $PRGNAM-$VERSION || exit 1
+
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+
+
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+
+
+patch -p1 < $CWD/smokeping-2.8.2-no-3rd-party.patch
+patch -p1 < $CWD/smokeping-2.8.2-paths.patch
+patch -p1 < $CWD/smokeping-config.patch
+
+rm -rf configure
+sed -i "s|\$(distdir)/lib|\$(distdir)/lib${LIBDIRSUFFIX}|g" Makefile.am
+sed -i "s|perllibdir = \$(prefix)/lib|perllibdir = \$(prefix)/share/perl5|g" ./lib/Makefile.am
+autoreconf -i
+
+export LC_ALL=C
+
+#PERL5LIB=/usr/share/perl5/ \
+CFLAGS="$SLKCFLAGS" \
+      ./configure \
+      --prefix=/usr \
+      --with-htdocs-dir=/var/www/htdocs/smokeping \
+      --mandir=/usr/man \
+      --libdir=/usr/lib${LIBDIRSUFFIX} \
+      --sysconfdir=/etc/$PRGNAM \
+      --localstatedir=/var/ \
+      --docdir=/usr/doc/$PRGNAM-$VERSION
+#mkdir -p thirdparty/lib/perl5/removeme
+rm -rf thirdparty/CPAN
+mkdir thirdparty/CPAN
+touch cpanfile "thirdparty/cpanfile-$(perl -MConfig -e 'my $v =$Config{version}; $v =~ s/.\d+$//;print $v;').snapshot"
+touch thirdparty/touch thirdparty/CPAN/touch
+
+DESTDIR=$PKG gmake || exit 1
+gmake DESTDIR=$PKG install  || exit 1
+
+#rmdir $PKG/usr/lib${LIBDIRSUFFIX}/removeme/
+
+mkdir -p $PKG/etc/rc.d/
+
+cat $CWD/rc.smokeping > $PKG/etc/rc.d/rc.smokeping.template
+sed -i "s/@SMOKEPING_USER@/$SB_USER/g" $PKG/etc/rc.d/rc.smokeping.template
+sed -i "s|@SMOKEPING_PATH@|/usr/bin/smokeping|g" $PKG/etc/rc.d/rc.smokeping.template
+sed -i "s|@SMOKEPING_GROUP@|$SB_GROUP|g" $PKG/etc/rc.d/rc.smokeping.template
+sed -i "s|@SMOKEPING_CONFIG_PATH@|/etc/smokeping/config|g" $PKG/etc/rc.d/rc.smokeping.template
+#mv $CWD/rc.smokeping.template > $PKG/etc/rc.d/rc.smokeping.new
+mv $PKG/etc/rc.d/rc.smokeping.template $PKG/etc/rc.d/rc.smokeping
+chmod +x $PKG/etc/rc.d/rc.smokeping
+cat $CWD/rc.smokeping-slave > $PKG/etc/rc.d/rc.smokeping-slave
+chmod +x $PKG/etc/rc.d/rc.smokeping-slave
+
+install -d -m 755 -o smokeping -g smokeping $PKG/var/lib/$PRGNAM
+install -d -m 755 -o smokeping -g smokeping $PKG/var/lib/$PRGNAM/data
+install -d -m 755 -o smokeping -g smokeping $PKG/var/lib/$PRGNAM/imgcache
+ln -sf /var/lib/$PRGNAM/imgcache ${PKG}/var/www/htdocs/${PRGNAM}/images
+
+
+#mkdir -p $PKG/opt/${PRGNAM}-${VERSION}/data
+#mkdir -p $PKG/opt/${PRGNAM}-${VERSION}/var
+#mkdir -p $PKG/opt/${PRGNAM}-${VERSION}/imgcache
+
+#chown -R apache:apache $PKG/opt/${PRGNAM}-${VERSION}/{data,var,imgcache}
+
+#ln -s smokeping.fcgi.dist ${PKG}/var/www/htdocs/${PRGNAM}/smokeping.fcgi
+#ln -s /opt/${PRGNAM}-${VERSION}/imgcache ${PKG}/var/www/htdocs/${PRGNAM}/imgcache
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/${PRGNAM}-$VERSION
+cp -a \
+    CHANGES       COPYRIGHT README.md  VERSION    \
+   CONTRIBUTORS  LICENSE  TODO       \
+  $PKG/usr/doc/${PRGNAM}-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat "$CWD"/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.sbo
+
+cat > $PKG/usr/doc/${PRGNAM}-$VERSION/dothtaccess <<"END"
+Options +ExecCGI
+Options +FollowSymlinks
+AddHandler cgi-script .fcgi
+AddHandler cgi-script .dist
+DirectoryIndex smokeping.fcgi
+END
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/smokeping/smokeping.info b/system/smokeping/smokeping.info
new file mode 100644
index 0000000000..14fff24d58
--- /dev/null
+++ b/system/smokeping/smokeping.info
@@ -0,0 +1,10 @@
+PRGNAM="smokeping"
+VERSION="2.8.2"
+HOMEPAGE="https://oss.oetiker.ch/smokeping/"
+DOWNLOAD="https://oss.oetiker.ch/smokeping/pub/smokeping-2.8.2.tar.gz"
+MD5SUM="cce2bf3f59736ecf77e59d64db60e3fb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="rrdtool fping spawn-fcgi perl-CGI perl-CGI-Fast perl-Config-Grammar perl-digest-hmac libwww-perl"
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.smokeping_2023-11-24@lockywolf.net"
diff --git a/system/smpq/8b978dd4b0b264cebd82445a25ccce57c41e7bb5.patch b/system/smpq/8b978dd4b0b264cebd82445a25ccce57c41e7bb5.patch
new file mode 100644
index 0000000000..8b978dd4b0
--- /dev/null
+++ b/system/smpq/8b978dd4b0b264cebd82445a25ccce57c41e7bb5.patch
@@ -0,0 +1,52 @@
+--- a/CMakeLists.txt	2016-12-12 23:31:14.000000000 +0100
++++ b/CMakeLists.txt	2021-10-01 13:06:43.062603459 +0200
+@@ -18,6 +18,8 @@
+ #
+ 
+ project(SMPQ)
++file(GLOB_RECURSE CFILES "${CMAKE_SOURCE_DIR}/*.c")
++SET_SOURCE_FILES_PROPERTIES(${CFILES} PROPERTIES LANGUAGE CXX)
+ set(VERSION 1.6)
+ cmake_minimum_required(VERSION 2.6)
+ 
+@@ -43,9 +45,9 @@
+ 
+ 	try_compile(CHECK ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/check.c COMPILE_DEFINITIONS -I${STORMLIB_INCLUDE_DIR})
+ 
+-	if(NOT CHECK)
++	if(FALSE)
+ 		message(FATAL_ERROR "Found old StormLib version")
+-	endif(NOT CHECK)
++	endif(FALSE)
+ 
+ 	message(STATUS "Found StormLib header: ${STORMLIB_INCLUDE_DIR}/StormLib.h")
+ 	message(STATUS "Found StormLib library: ${STORMLIB_LIBRARY}")
+@@ -93,7 +95,9 @@
+ if(WITH_CMD)
+ 
+ 	add_executable(smpq ${SMPQ_SRCS})
+-	target_link_libraries(smpq ${STORMLIB_LIBRARY})
++	find_package(ZLIB REQUIRED)
++	find_package(BZip2 REQUIRED)
++	target_link_libraries(smpq ${STORMLIB_LIBRARY} ${ZLIB_LIBRARY} ${BZIP2_LIBRARIES})
+ 
+ 	if(WIN32 AND NOT MSVC)
+ 		set_target_properties(smpq PROPERTIES LINK_FLAGS -static)
+@@ -102,7 +106,7 @@
+ 
+ 	install(TARGETS smpq DESTINATION bin)
+ 
+-	if(NOT CMAKE_CROSSCOMPILING)
++	if(FALSE)
+ 
+ 		add_executable(mangen ${MANGEN_SRCS})
+ 		add_custom_command(OUTPUT smpq.1 COMMAND mangen > smpq.1 DEPENDS mangen)
+@@ -110,7 +114,7 @@
+ 
+ 		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/smpq.1 DESTINATION share/man/man1)
+ 
+-	endif(NOT CMAKE_CROSSCOMPILING)
++	endif(FALSE)
+ 
+ 	if(WIN32 AND WITH_NSIS)
+ 
diff --git a/system/smpq/README b/system/smpq/README
new file mode 100644
index 0000000000..84fdc7fa23
--- /dev/null
+++ b/system/smpq/README
@@ -0,0 +1,6 @@
+SMPQ  (StormLib MPQ archiving utility)
+
+This utility is designed for the full manipulation of Blizzard MPQ
+archives. It supports extracting, appending, renaming, and deleting
+files in MPQ archives. It can also create MPQ archives. SMPQ can
+access different types and versions of MPQ archives.
diff --git a/system/smpq/slack-desc b/system/smpq/slack-desc
new file mode 100644
index 0000000000..dc123dba83
--- /dev/null
+++ b/system/smpq/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+smpq: smpq (StormLib MPQ archiving utility)
+smpq:
+smpq: This utility is designed for the full manipulation of Blizzard MPQ
+smpq: archives. It supports extracting, appending, renaming, and deleting
+smpq: files in MPQ archives. It can also create MPQ archives. SMPQ can
+smpq: access different types and versions of MPQ archives.
+smpq:
+smpq:
+smpq:
+smpq:
+smpq:
diff --git a/system/smpq/smpq.SlackBuild b/system/smpq/smpq.SlackBuild
new file mode 100644
index 0000000000..0b5e995d75
--- /dev/null
+++ b/system/smpq/smpq.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/bash
+
+# Slackware build script for smpq
+
+# Copyright 2022 Steven Voges <svoges.sbo@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=smpq
+VERSION=${VERSION:-1.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM\_$VERSION.orig.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Patch for latest stormlib
+# https://aur.archlinux.org/cgit/aur.git/tree/fix-smpq-compilation.patch?h=smpq
+patch  -p1 <$CWD/8b978dd4b0b264cebd82445a25ccce57c41e7bb5.patch
+
+# Configure
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_KDE=OFF \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS CHANGELOG COPYING README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/smpq/smpq.info b/system/smpq/smpq.info
new file mode 100644
index 0000000000..40f38ce99b
--- /dev/null
+++ b/system/smpq/smpq.info
@@ -0,0 +1,10 @@
+PRGNAM="smpq"
+VERSION="1.6"
+HOMEPAGE="https://launchpad.net/smpq"
+DOWNLOAD="https://launchpad.net/smpq/trunk/1.6/+download/smpq_1.6.orig.tar.gz"
+MD5SUM="c7124d2dfdbaaf428413513856f446ce"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="stormlib"
+MAINTAINER="Steven Voges"
+EMAIL="svoges.sbo@gmail.com"
diff --git a/system/snapscreenshot/NOTES.txt b/system/snapscreenshot/NOTES.txt
deleted file mode 100644
index 3acfd2a9b9..0000000000
--- a/system/snapscreenshot/NOTES.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Notes:
-
-snapscreenshot is *fast*, when compared to fbdump and fbcat. However,
-the reason it's so fast is that it doesn't read the graphic content of
-the framebuffer. Instead, the text content of the screen is read (from
-the /dev/vcs* devices) and rendered in the current console font... which
-is the current font of the console you executed snapscreenshot from,
-*not* the font in the console you're taking a snapshot of!
-
-Also, custom fonts just don't work well with snapscreenshot. Depending
-on the font, you may get an error (GIO_FONTX), a segmentation fault,
-or else the resulting screenshot is garbled.
-
-Because /dev/vcs* is used, snapscreenshot does NOT work for taking
-screenshots of software that actually uses the framebuffer for graphics,
-e.g. fbpdf, feh, "mplayer -vo fbdev", "links -g -driver fb". For these,
-use fbcat or fbdump instead.
-
-By default, the text on all the consoles ends up in the output image. To
-take a shot of only one console, use a command like:
-
-# snapscreenshot --firstwin 1 -c1 -x1 > shot.tga
-
-...or use this:
-
-# snapscreenshot.cur > shot.tgz
-
-The snapscreenshot.cur script was written by the SlackBuild author,
-and is not part of snapscreenshot itself.
diff --git a/system/snapscreenshot/README b/system/snapscreenshot/README
deleted file mode 100644
index efa597e5a0..0000000000
--- a/system/snapscreenshot/README
+++ /dev/null
@@ -1,15 +0,0 @@
-snapscreenshot (screenshot program for text consoles)
-
-snapscreenshot creates a .tga (Targa) image file from the text contents
-of the Linux framebuffer consoles (by default, all of the consoles,
-tiled in a single image).
-
-This probably doesn't work for non-framebuffer consoles (not tested).
-
-By default, snapscreenshot is installed setuid root and executable by
-users in the 'video' group. Normally on Slackware, users logged in at
-the console are in the 'video' group by default. If you don't like this,
-export SETUID=no in the script's environment. This will require root
-access (e.g. su or sudo) for snapscreenshot to work.
-
-See NOTES.txt for more information.
diff --git a/system/snapscreenshot/errors_to_stderr.diff b/system/snapscreenshot/errors_to_stderr.diff
deleted file mode 100644
index d769e262bd..0000000000
--- a/system/snapscreenshot/errors_to_stderr.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur snapscreenshot-1.0.14.3/argh.c snapscreenshot-1.0.14.3.patched/argh.c
---- snapscreenshot-1.0.14.3/argh.c	2009-08-31 07:23:26.000000000 -0400
-+++ snapscreenshot-1.0.14.3.patched/argh.c	2018-07-04 17:48:36.194652959 -0400
-@@ -13,7 +13,7 @@
-     long tmp = strtol(*s, (char **)s, 10);
-     if(tmp<min || tmp>max)
-     {
--        printf("%s: parameter (--%s) value out of range `%ld'\n", ProgName, LastParm, tmp);
-+        fprintf(stderr, "%s: parameter (--%s) value out of range `%ld'\n", ProgName, LastParm, tmp);
-         exit(EXIT_FAILURE);
-     }
-     return tmp;
-@@ -21,14 +21,14 @@
- 
- void SuggestHelp(void)
- {
--    printf("\nTry `%s --help' for more information.\n", ProgName);
-+    fprintf(stderr, "\nTry `%s --help' for more information.\n", ProgName);
- }
- void ArgError(int a, const char *b)
- {
-     switch(a)
-     {
-         case 0:
--            printf("%s: illegal option -- %c", ProgName, *b);
-+            fprintf(stderr, "%s: illegal option -- %c", ProgName, *b);
-             for(a=0; Options[a].c; a++)
-                 if(*b == Options[a].c)
-                 {
-@@ -37,10 +37,10 @@
-                 }
-             break;
-         case 1:
--            printf("%s: unrecognized option `--%s'", ProgName, b);
-+            fprintf(stderr, "%s: unrecognized option `--%s'", ProgName, b);
-             break;
-         default:
--            printf("%s: invalid parameter: `%s'\n", ProgName, b);
-+            fprintf(stderr, "%s: invalid parameter: `%s'\n", ProgName, b);
-     }
-     SuggestHelp();
-     exit(EXIT_FAILURE);
diff --git a/system/snapscreenshot/manpage.diff b/system/snapscreenshot/manpage.diff
deleted file mode 100644
index 73146a362f..0000000000
--- a/system/snapscreenshot/manpage.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur snapscreenshot-1.0.14.3/snapscreenshot.1 snapscreenshot-1.0.14.3.patched/snapscreenshot.1
---- snapscreenshot-1.0.14.3/snapscreenshot.1	2009-08-31 07:23:26.000000000 -0400
-+++ snapscreenshot-1.0.14.3.patched/snapscreenshot.1	2018-07-04 17:55:43.011642115 -0400
-@@ -14,8 +14,12 @@
- console(s) and outputs a Targa file.
- You can use convert(1) to convert the resulting image to various formats.
- .SH OPTIONS
--This program follows the usual GNU command line syntax, with long
--options starting with two dashes (`-').
-+This program follows vaguely GNU-like command line syntax, with long
-+options starting with two dashes (`\-'). Long options that take an
-+argument require a space before the argument (an `=' is not accepted),
-+and short options that take an argument do NOT allow a space (use
-+\fB\-c1\fR, NOT \fB\-c 1\fR).
-+.PP
- A summary of options is included below.
- .TP
- .B \-h, \-\-help
diff --git a/system/snapscreenshot/slack-desc b/system/snapscreenshot/slack-desc
deleted file mode 100644
index f0c1dafe46..0000000000
--- a/system/snapscreenshot/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-              |-----handy-ruler------------------------------------------------------|
-snapscreenshot: snapscreenshot (screenshot program for text consoles)
-snapscreenshot:
-snapscreenshot: snapscreenshot creates a .tga (Targa) image file from the text
-snapscreenshot: contents of the Linux framebuffer console (by default, all of the
-snapscreenshot: consoles, tiled in a single image).
-snapscreenshot:
-snapscreenshot:
-snapscreenshot:
-snapscreenshot:
-snapscreenshot:
-snapscreenshot:
diff --git a/system/snapscreenshot/snapscreenshot.SlackBuild b/system/snapscreenshot/snapscreenshot.SlackBuild
deleted file mode 100644
index 5c6d716405..0000000000
--- a/system/snapscreenshot/snapscreenshot.SlackBuild
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for snapscreenshot
-
-# Written by B. Watson (yalhcru@gmail.com)
-
-# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-
-PRGNAM=snapscreenshot
-VERSION=${VERSION:-1.0.14.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
-
-# It's really annoying to have errors sent to stdout, when the main
-# way to use the program is to redirect stdout to a file...
-patch -p1 < $CWD/errors_to_stderr.diff
-
-# It's also annoying that -c1 is accepted, but -c 1 isn't. Likewise
-# --firstwin 1, but not --firstwin=1. Not going to fix the code, but at
-# least the man page can document it.
-patch -p1 < $CWD/manpage.diff
-
-make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
-mkdir -p $PKG/usr/bin $PKG/usr/man/man1
-install -s -m0755 $PRGNAM $PKG/usr/bin
-gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
-
-# Include this script, because pretty much everyone who ever uses this
-# will either write their own version, or wish they knew how...
-install -m0755 -oroot -groot $CWD/$PRGNAM.cur $PKG/usr/bin
-
-if [ "${SETUID:-yes}" = "yes" ]; then
-  chown root:video $PKG/usr/bin/$PRGNAM
-  chmod 4750 $PKG/usr/bin/$PRGNAM
-fi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README* COPYING $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/snapscreenshot/snapscreenshot.cur b/system/snapscreenshot/snapscreenshot.cur
deleted file mode 100644
index b674c0a8e0..0000000000
--- a/system/snapscreenshot/snapscreenshot.cur
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# 20180704 bkw: wrapper for snapscreenshot, determines the current tty
-# and takes a screenshot of it by calling snapscreenshot with the
-# appropriate arguments.
-
-# I tried to make this work under X. You can find out which tty X is using
-# with: xprop -root | grep ^XFree86_VT | cut -d' ' -f3
-# However snapscreenshot itself fails because that console will be in
-# graphics mode (no text to read from /dev/vcs$TTY, so it'd give a
-# blank image).
-
-TTY="$( tty )"
-case "$TTY" in
-  /dev/tty?) TTY="$( echo $TTY | cut -dy -f2 )"
-     ;;
-  *) echo "You must run this from a console login session, not e.g. X or ssh" 1>&2
-     exit 1
-     ;;
-esac
-
-exec snapscreenshot --firstwin "$TTY" -c1 -x1 "$@"
diff --git a/system/snapscreenshot/snapscreenshot.info b/system/snapscreenshot/snapscreenshot.info
deleted file mode 100644
index e6d21eb103..0000000000
--- a/system/snapscreenshot/snapscreenshot.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="snapscreenshot"
-VERSION="1.0.14.3"
-HOMEPAGE="https://bisqwit.iki.fi/source/snapscreenshot.html"
-DOWNLOAD="http://www.pc-freak.net/files/snapscreenshot-1.0.14.3.tar.bz2"
-MD5SUM="6332e26ed7b6bbddf1a3c3d11f82c39a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/snore/README b/system/snore/README
new file mode 100644
index 0000000000..a9acf28aac
--- /dev/null
+++ b/system/snore/README
@@ -0,0 +1,10 @@
+snore (sleep with visual feedback)
+
+Usage: snore [-v] [NUMBER[SUFFIX]...]
+
+snore pauses for NUMBER seconds. SUFFIX may be 's' for seconds
+(default), 'm' for minutes, 'h' four hours or 'd' for days. Given two
+or more arguments, pause for the amount of time specified by the sum
+of their values. A visual feedback is given by printing the flowing
+of time in both ascending and descending order. If no arguments are
+given, snore pauses for 1d (one day).
diff --git a/system/snore/slack-desc b/system/snore/slack-desc
new file mode 100644
index 0000000000..1995c751e7
--- /dev/null
+++ b/system/snore/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+snore: snore (sleep with visual feedback)
+snore:
+snore: Usage: snore [-v] [NUMBER[SUFFIX]...]
+snore:
+snore: snore pauses for NUMBER seconds. SUFFIX may be 's' for seconds
+snore: (default), 'm' for minutes, 'h' four hours or 'd' for days. Given two
+snore: or more arguments, pause for the amount of time specified by the sum
+snore: of their values. A visual feedback is given by printing the flowing
+snore: of time in both ascending and descending order. If no arguments are
+snore: given, snore pauses for 1d (one day).
+snore:
diff --git a/system/snore/snore.SlackBuild b/system/snore/snore.SlackBuild
new file mode 100644
index 0000000000..2f5d50fe53
--- /dev/null
+++ b/system/snore/snore.SlackBuild
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+# Slackware build script for snore
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20221228 bkw: update for v0.3.1, fix PKGTYPE, strip binary.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=snore
+VERSION=${VERSION:-0.3.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+chmod 644 *
+
+# grammar fix and path to license
+sed -i -e 's,^pause for,pauses for,' \
+       -e "s,LICENSE,/usr/doc/$PRGNAM-$VERSION/LICENSE,g" \
+       $PRGNAM.1
+
+sed -i "s|-Os|$SLKCFLAGS -Wl,-s|" config.mk
+make
+strip $PRGNAM
+make install PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/snore/snore.info b/system/snore/snore.info
new file mode 100644
index 0000000000..95cba29da4
--- /dev/null
+++ b/system/snore/snore.info
@@ -0,0 +1,10 @@
+PRGNAM="snore"
+VERSION="0.3.1"
+HOMEPAGE="https://github.com/clamiax/snore"
+DOWNLOAD="https://github.com/clamiax/snore/archive/0.3.1/snore-0.3.1.tar.gz"
+MD5SUM="f8205dd4ba00792eb7a4f9a7f43d80b9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/socketcand/socketcand.SlackBuild b/system/socketcand/socketcand.SlackBuild
index 1b883e3fe7..cf2dedb968 100644
--- a/system/socketcand/socketcand.SlackBuild
+++ b/system/socketcand/socketcand.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for socketcand
 
@@ -22,11 +22,18 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org: upgraded to the latest
+# commit in upstream's new git repo to fix the build on 15.0. Also
+# had to diddle the autoconf stuff in the script a bit.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=socketcand
 VERSION=${VERSION:-0.4.2}
-COMMIT=${COMMIT:-df7fb4ff8a4439d7737fe2df3540e1ab7465721a}
+COMMIT=${COMMIT:-ae0af080058a576d62c72ffc011d644d0b4dcb98}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +43,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -71,9 +85,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+autoreconf -if
+
 CFLAGS="$SLKCFLAGS -fgnu89-inline" \
 CXXFLAGS="$SLKCFLAGS -fgnu89-inline" \
-autoconf
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -104,4 +119,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/socketcand/socketcand.info b/system/socketcand/socketcand.info
index dca84918cc..44c511a643 100644
--- a/system/socketcand/socketcand.info
+++ b/system/socketcand/socketcand.info
@@ -1,8 +1,8 @@
 PRGNAM="socketcand"
 VERSION="0.4.2"
-HOMEPAGE="https://github.com/dschanoeh/socketcand"
-DOWNLOAD="https://github.com/dschanoeh/socketcand/archive/df7fb4ff8a4439d7737fe2df3540e1ab7465721a/socketcand-df7fb4ff8a4439d7737fe2df3540e1ab7465721a.tar.gz"
-MD5SUM="4be5e8db2eea4312f787cf7fcbe74eb5"
+HOMEPAGE="https://github.com/linux-can/socketcand"
+DOWNLOAD="https://github.com/linux-can/socketcand/archive/ae0af080058a576d62c72ffc011d644d0b4dcb98/socketcand-ae0af080058a576d62c72ffc011d644d0b4dcb98.tar.gz"
+MD5SUM="c08c26e339ef7c81c691ca31f2cf2a96"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/socklog/README b/system/socklog/README
index 808c505ff3..0a100dfceb 100644
--- a/system/socklog/README
+++ b/system/socklog/README
@@ -1,10 +1,13 @@
-socklog, in cooperation with the runit package, is a small and secure replacement for syslogd.
+socklog, in cooperation with the runit package, is a small and secure
+replacement for syslogd.
 
-It can receive syslog messages from a unix domain socket ("/dev/log") and
-write them to various files on disk depending on facility and priority.
+It can receive syslog messages from a unix domain socket ("/dev/log")
+and write them to various files on disk depending on facility and
+priority.
 
-It can receive messages from a udp socket ("0.0.0.0:514") and write them to
-disk, or forward the messages to another udp socket ("a.b.c.d:514").
+It can receive messages from a udp socket ("0.0.0.0:514") and
+write them to disk, or forward the messages to another udp socket
+("a.b.c.d:514").
 
 svlogd has a built in log file rotation based on file size, 
 so there is no need for any cron jobs or similar to rotate the logs.
diff --git a/system/socklog/socklog.SlackBuild b/system/socklog/socklog.SlackBuild
index a58f15fac8..a8515cfcf1 100644
--- a/system/socklog/socklog.SlackBuild
+++ b/system/socklog/socklog.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for socklog
 # generated with mkslack, based on aur and gentoo pkg
 #
-# Copyright 2019 Aaditya Bagga <aaditya_gnulinux@zoho.com>
+# Copyright 2019 Aaditya <aaditya_gnulinux@zoho.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=socklog
 VERSION=${VERSION:-2.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -109,4 +119,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/socklog/socklog.info b/system/socklog/socklog.info
index 40788fe0be..483a279886 100644
--- a/system/socklog/socklog.info
+++ b/system/socklog/socklog.info
@@ -6,5 +6,5 @@ MD5SUM="5d0e8e28c9329ad3af982c5241df9ff1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="runit"
-MAINTAINER="Aaditya Bagga"
+MAINTAINER="Aaditya"
 EMAIL="aaditya_gnulinux@zoho.com"
diff --git a/system/softhsm/README b/system/softhsm/README
index caabb5186b..a004945362 100644
--- a/system/softhsm/README
+++ b/system/softhsm/README
@@ -1,5 +1,5 @@
 softhsm (Software Hardware Security Module)
 
-SoftHSM is an implementation of a cryptographic store accessible through a
-PKCS #11 interface. You can use it to explore PKCS #11 without having a
-Hardware Security Module.
+SoftHSM is an implementation of a cryptographic store accessible
+through a PKCS #11 interface. You can use it to explore PKCS #11
+without having a Hardware Security Module.
diff --git a/system/softhsm/doinst.sh b/system/softhsm/doinst.sh
new file mode 100644
index 0000000000..a3383ce28e
--- /dev/null
+++ b/system/softhsm/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/softhsm2.conf.new
diff --git a/system/softhsm/softhsm.SlackBuild b/system/softhsm/softhsm.SlackBuild
index a853328cf7..998aa07390 100644
--- a/system/softhsm/softhsm.SlackBuild
+++ b/system/softhsm/softhsm.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for softhsm
 
-# Copyright 2016-2018 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
+# Copyright 2016-2021 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=softhsm
-VERSION=${VERSION:-2.5.0}
+VERSION=${VERSION:-2.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -91,12 +101,15 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+mv $PKG/etc/softhsm2.conf $PKG/etc/softhsm2.conf.new
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a *.md NEWS LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/softhsm/softhsm.info b/system/softhsm/softhsm.info
index 4f6f6b88f2..8cb44f0374 100644
--- a/system/softhsm/softhsm.info
+++ b/system/softhsm/softhsm.info
@@ -1,8 +1,8 @@
 PRGNAM="softhsm"
-VERSION="2.5.0"
+VERSION="2.6.1"
 HOMEPAGE="https://www.opendnssec.org"
-DOWNLOAD="https://dist.opendnssec.org/source/softhsm-2.5.0.tar.gz"
-MD5SUM="fb0e490aa5d83de1b3936288c22c2475"
+DOWNLOAD="https://dist.opendnssec.org/source/softhsm-2.6.1.tar.gz"
+MD5SUM="040b93ca327cbe0a3a8661e7c371ab16"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/solarize-12x29-psf/README b/system/solarize-12x29-psf/README
index 75ee0c916f..3b419fb37c 100644
--- a/system/solarize-12x29-psf/README
+++ b/system/solarize-12x29-psf/README
@@ -1,10 +1,11 @@
 solarize-12x29-psf (large linux console font)
 
-This package provides a large size 512 glyph console font. It is
-especially designed for prolonged word processing in multiple languages.
+This package provides a large size 512 glyph console font. It
+is especially designed for prolonged word processing in multiple
+languages.
 
-Because this font contains over 256 glyphs, the hardware bold text property
-of your console will be turned off.
+Because this font contains over 256 glyphs, the hardware bold text
+property of your console will be turned off.
 
 To make this the system default font, edit /etc/rc.d/rc.font and change
 the setfont line to read:
diff --git a/system/solarize-12x29-psf/solarize-12x29-psf.SlackBuild b/system/solarize-12x29-psf/solarize-12x29-psf.SlackBuild
index 9acde6ddc8..327e9df981 100644
--- a/system/solarize-12x29-psf/solarize-12x29-psf.SlackBuild
+++ b/system/solarize-12x29-psf/solarize-12x29-psf.SlackBuild
@@ -1,18 +1,26 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for solarize-12x29-psf
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=solarize-12x29-psf
 VERSION=${VERSION:-20150529}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
-CWD=$(pwd)
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -39,4 +47,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/solarize-12x29-psf/solarize-12x29-psf.info b/system/solarize-12x29-psf/solarize-12x29-psf.info
index 7752ca27e9..fdc1309bb1 100644
--- a/system/solarize-12x29-psf/solarize-12x29-psf.info
+++ b/system/solarize-12x29-psf/solarize-12x29-psf.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/spacefm/gcc10.patch b/system/spacefm/gcc10.patch
new file mode 100644
index 0000000000..1e8c1e52d7
--- /dev/null
+++ b/system/spacefm/gcc10.patch
@@ -0,0 +1,92 @@
+https://github.com/IgnorantGuru/spacefm/issues/770
+
+diff --git a/src/settings.c b/src/settings.c
+index 280196f..9d8e880 100644
+--- a/src/settings.c
++++ b/src/settings.c
+@@ -52,6 +52,24 @@
+ /* Dirty hack: check whether we are under LXDE or not */
+ #define is_under_LXDE()     (g_getenv( "_LXSESSION_PID" ) != NULL)
+ 
++/* GCC 10.1+ */
++char* settings_terminal_su = NULL;
++char* settings_graphical_su = NULL;
++GList* xset_cmd_history = NULL;
++XSet* evt_win_focus = NULL;
++XSet* evt_win_move = NULL;
++XSet* evt_win_click = NULL;
++XSet* evt_win_key = NULL;
++XSet* evt_win_close = NULL;
++XSet* evt_pnl_show = NULL;
++XSet* evt_pnl_focus = NULL;
++XSet* evt_pnl_sel = NULL;
++XSet* evt_tab_new = NULL;
++XSet* evt_tab_chdir = NULL;
++XSet* evt_tab_focus = NULL;
++XSet* evt_tab_close = NULL;
++XSet* evt_device = NULL;
++
+ AppSettings app_settings = {0};
+ /* const gboolean singleInstance_default = TRUE; */
+ const gboolean show_hidden_files_default = FALSE;
+diff --git a/src/settings.h b/src/settings.h
+index 07419b8..4591d48 100644
+--- a/src/settings.h
++++ b/src/settings.h
+@@ -130,7 +130,7 @@ const char* xset_get_user_tmp_dir();
+ ///////////////////////////////////////////////////////////////////////////////
+ //MOD extra settings below
+ 
+-GList* xsets;
++extern GList* xsets;
+ 
+ enum {
+     XSET_B_UNSET,
+@@ -333,22 +333,22 @@ typedef struct
+ } XMenuItem;
+ 
+ // cache these for speed in event handlers
+-XSet* evt_win_focus;
+-XSet* evt_win_move;
+-XSet* evt_win_click;
+-XSet* evt_win_key;
+-XSet* evt_win_close;
+-XSet* evt_pnl_show;
+-XSet* evt_pnl_focus;
+-XSet* evt_pnl_sel;
+-XSet* evt_tab_new;
+-XSet* evt_tab_chdir;
+-XSet* evt_tab_focus;
+-XSet* evt_tab_close;
+-XSet* evt_device;
++extern XSet* evt_win_focus;
++extern XSet* evt_win_move;
++extern XSet* evt_win_click;
++extern XSet* evt_win_key;
++extern XSet* evt_win_close;
++extern XSet* evt_pnl_show;
++extern XSet* evt_pnl_focus;
++extern XSet* evt_pnl_sel;
++extern XSet* evt_tab_new;
++extern XSet* evt_tab_chdir;
++extern XSet* evt_tab_focus;
++extern XSet* evt_tab_close;
++extern XSet* evt_device;
+ 
+ // instance-wide command history
+-GList* xset_cmd_history;
++extern GList* xset_cmd_history;
+ 
+ static const char* terminal_programs[] =  //for pref-dialog.c
+ {
+@@ -396,8 +396,8 @@ static const char* gsu_commands[] = // order and contents must match prefdlg.ui
+ };
+ 
+ // These will contain the su and gsu settings from /etc/spacefm/spacefm.conf
+-char* settings_terminal_su;
+-char* settings_graphical_su;
++extern char* settings_terminal_su;
++extern char* settings_graphical_su;
+ 
+ typedef struct
+ {
diff --git a/system/spacefm/glibc-2.28.patch b/system/spacefm/glibc-2.28.patch
new file mode 100644
index 0000000000..324bc43b93
--- /dev/null
+++ b/system/spacefm/glibc-2.28.patch
@@ -0,0 +1,12 @@
+diff --git a/src/main.c b/src/main.c                                                                                                                                              
+index 645e2ec..9453a3b 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -23,6 +23,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
++#include <sys/sysmacros.h>
+ 
+ #include <signal.h>
+
diff --git a/system/spacefm/spacefm.SlackBuild b/system/spacefm/spacefm.SlackBuild
index c8a93b7eaa..72708b0a0c 100644
--- a/system/spacefm/spacefm.SlackBuild
+++ b/system/spacefm/spacefm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for spacefm
 
 # Copyright 2012  Binh Nguyen <binhvng@gmail.com>
@@ -23,26 +23,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=spacefm
 VERSION=${VERSION:-1.0.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -81,6 +91,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# https://github.com/IgnorantGuru/spacefm/issues/727
+patch -p1 < $CWD/glibc-2.28.patch
+# https://github.com/IgnorantGuru/spacefm/issues/770
+patch -p1 < $CWD/gcc10.patch
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -113,4 +128,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sparse/README b/system/sparse/README
new file mode 100644
index 0000000000..76cc70e7fb
--- /dev/null
+++ b/system/sparse/README
@@ -0,0 +1,8 @@
+Sparse is a semantic parser provides a compiler frontend
+capable of parsing ANSI C as well as many GCC extensions,
+and a collection of sample compiler backends including a
+static analyzer called sparse.It is designed to convey
+semantic information about types or what locks function
+aquires or releases.
+
+This is an optional dependency for QEMU
diff --git a/system/sparse/slack-desc b/system/sparse/slack-desc
new file mode 100644
index 0000000000..b3c54fa490
--- /dev/null
+++ b/system/sparse/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+sparse: sparse (Sematic Parser)
+sparse:
+sparse: Sparse is a semantic parser provides a compiler frontend
+sparse: capable of parsing ANSI C as well as many GCC extensions,
+sparse: and a collection of sample compiler backends including a
+sparse: static analyzer called sparse.It is designed to convey 
+sparse: semantic information about types or what locks function
+sparse: aquires or releases.
+sparse:
+sparse: Homepage:https://sparse.docs.kernel.org/en/latest/
+sparse:
diff --git a/system/sparse/sparse.SlackBuild b/system/sparse/sparse.SlackBuild
new file mode 100644
index 0000000000..3b3ddcb314
--- /dev/null
+++ b/system/sparse/sparse.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/bash
+
+# Slackware build script for sparse
+
+# Copyright 2022 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=sparse
+VERSION=${VERSION:-0.6.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+    *) ARCH=$( uname -m ) ;;
+esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}"  ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+
+make PREFIX=/usr DESTDIR=$PKG install
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+mv -v $PKG/usr/share/man $PKG/usr/man
+rm -rvf $PKG/usr/share
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod \
+  -o -name ".packlist"   -o -name "*.bs" \
+  | xargs rm -f
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE FAQ  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sparse/sparse.info b/system/sparse/sparse.info
new file mode 100644
index 0000000000..c27ecf4ad3
--- /dev/null
+++ b/system/sparse/sparse.info
@@ -0,0 +1,10 @@
+PRGNAM="sparse"
+VERSION="0.6.4"
+HOMEPAGE="https://sparse.docs.kernel.org/en/latest/"
+DOWNLOAD="https://mirrors.edge.kernel.org/pub/software/devel/sparse/dist/sparse-0.6.4.tar.xz"
+MD5SUM="297257cc3c08a3e1fcea03aa660a896c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/speedcontrol/speedcontrol.SlackBuild b/system/speedcontrol/speedcontrol.SlackBuild
index 164064237d..12ddbe93af 100644
--- a/system/speedcontrol/speedcontrol.SlackBuild
+++ b/system/speedcontrol/speedcontrol.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for speedcontrol
 
@@ -22,10 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=speedcontrol
 VERSION=${VERSION:-20041204}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -83,4 +93,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/speedcontrol/speedcontrol.info b/system/speedcontrol/speedcontrol.info
index 4974a38ae7..356ed320df 100644
--- a/system/speedcontrol/speedcontrol.info
+++ b/system/speedcontrol/speedcontrol.info
@@ -1,10 +1,10 @@
 PRGNAM="speedcontrol"
 VERSION="20041204"
 HOMEPAGE="http://noto.de/"
-DOWNLOAD="http://www.liwjatan.at/files/src/speedcontrol.c"
+DOWNLOAD="https://sources.liwjatan.org/speedcontrol.c"
 MD5SUM="5c50b0a62f52774cbd9f1036ade36d1b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+EMAIL="pprkut@slackbuilds.org"
diff --git a/system/spice-guest-tools/spice-guest-tools.SlackBuild b/system/spice-guest-tools/spice-guest-tools.SlackBuild
index b192f2e2a8..4ebad43361 100644
--- a/system/spice-guest-tools/spice-guest-tools.SlackBuild
+++ b/system/spice-guest-tools/spice-guest-tools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for spice-guest-tools
 
@@ -22,15 +22,25 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=spice-guest-tools
 VERSION=${VERSION:-0.141}
 VERSION_VIRTIO="0.1.$( echo $VERSION | rev | cut -f1 -d. | rev )"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -75,4 +85,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/spice-vdagent/files/rc.spice-vdagent b/system/spice-vdagent/files/rc.spice-vdagent
index 16709ba5b7..8f079f9653 100644
--- a/system/spice-vdagent/files/rc.spice-vdagent
+++ b/system/spice-vdagent/files/rc.spice-vdagent
@@ -20,6 +20,7 @@ start() {
   /sbin/modprobe uinput > /dev/null 2>&1
   # In case the previous running vdagentd crashed
   /usr/bin/rm -f /var/run/spice-vdagentd/spice-vdagent-sock
+  /usr/bin/mkdir -p /var/run/spice-vdagentd
   /usr/bin/echo "Starting $prog: "
   $exec -s $port
   retval=$?
diff --git a/system/spice-vdagent/spice-vdagent.SlackBuild b/system/spice-vdagent/spice-vdagent.SlackBuild
index 32a454042b..700fbb0f20 100644
--- a/system/spice-vdagent/spice-vdagent.SlackBuild
+++ b/system/spice-vdagent/spice-vdagent.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for spice-vdagent
 
-# Copyright 2012-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2012-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=spice-vdagent
-VERSION=${VERSION:-0.17.0}
+VERSION=${VERSION:-0.22.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,7 +64,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="COPYING ChangeLog README TODO"
+DOCS="COPYING CHANGELOG.md README.md"
 
 set -e
 
@@ -106,4 +116,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/spice-vdagent/spice-vdagent.info b/system/spice-vdagent/spice-vdagent.info
index 3a5a65669f..bcda64922c 100644
--- a/system/spice-vdagent/spice-vdagent.info
+++ b/system/spice-vdagent/spice-vdagent.info
@@ -1,8 +1,8 @@
 PRGNAM="spice-vdagent"
-VERSION="0.17.0"
+VERSION="0.22.1"
 HOMEPAGE="https://www.spice-space.org"
-DOWNLOAD="https://www.spice-space.org/download/releases/spice-vdagent-0.17.0.tar.bz2"
-MD5SUM="b184791c49968a54c653de9a630df1dd"
+DOWNLOAD="https://www.spice-space.org/download/releases/spice-vdagent-0.22.1.tar.bz2"
+MD5SUM="bcc98e716c170f58ebf44c49fdda3a2e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="spice"
diff --git a/system/spkg/spkg.SlackBuild b/system/spkg/spkg.SlackBuild
index dc93135470..f817984b75 100644
--- a/system/spkg/spkg.SlackBuild
+++ b/system/spkg/spkg.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for spkg
 
-# Copyright 2013-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2022 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=spkg
-VERSION=${VERSION:-1.1}
+VERSION=${VERSION:-1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,11 +79,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-./autogen.sh
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
+./autogen.sh \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -98,4 +106,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/spkg/spkg.info b/system/spkg/spkg.info
index ff3b42c437..0b85969e26 100644
--- a/system/spkg/spkg.info
+++ b/system/spkg/spkg.info
@@ -1,8 +1,8 @@
 PRGNAM="spkg"
-VERSION="1.1"
+VERSION="1.4"
 HOMEPAGE="https://github.com/megous/spkg/"
-DOWNLOAD="https://github.com/megous/spkg/archive/1.1/spkg-1.1.tar.gz"
-MD5SUM="39f2ca45ae9532ce7f23036c175fbd40"
+DOWNLOAD="https://github.com/megous/spkg/archive/1.4/spkg-1.4.tar.gz"
+MD5SUM="04ec6ef31a5fed367cb1055a85da9d2f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/spl-solaris/README b/system/spl-solaris/README
deleted file mode 100644
index bda1ca4944..0000000000
--- a/system/spl-solaris/README
+++ /dev/null
@@ -1,19 +0,0 @@
-The Solaris Porting Layer (SPL) is a Linux kernel module which
-provides many of the Solaris kernel APIs.  This shim layer makes
-it possible to run Solaris kernel code in the Linux kernel with
-relatively minimal modification.
-
-This can be particularly useful when you want to track upstream
-Solaris development closely and do not want the overhead of
-maintaining a large patch which converts Solaris primitives to Linux
-primitives.
-
-You need this if you want to run ZFS on Linux.
-
-NOTE: You'll need the kernel source code to be able to compile this.
-This package is kernel dependent, so you'll need to recompile it for
-every new kernel you choose to run.
-
-If you're building this for a kernel that isn't currently running,
-you'll need to pass what that kernel's 'uname -r' output will be
-to the KERN variable when running the build script, e.g. KERN=4.14.9
diff --git a/system/spl-solaris/doinst.sh b/system/spl-solaris/doinst.sh
deleted file mode 100644
index ddc5b85c14..0000000000
--- a/system/spl-solaris/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /sbin/depmod ]; then
-  chroot . /sbin/depmod -a >/dev/null 2>&1
-fi
diff --git a/system/spl-solaris/slack-desc b/system/spl-solaris/slack-desc
deleted file mode 100644
index ffce6023f9..0000000000
--- a/system/spl-solaris/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-           |-----handy-ruler------------------------------------------------------|
-spl-solaris: spl-solaris (solaris kernel API for linux)
-spl-solaris:
-spl-solaris: The Solaris Porting Layer (SPL) is a Linux kernel module
-spl-solaris: which provides many of the Solaris kernel APIs.
-spl-solaris: This shim layer makes it possible to run Solaris kernel code
-spl-solaris: in the Linux kernel with relatively minimal modification.
-spl-solaris:
-spl-solaris: Homepage: https://zfsonlinux.org
-spl-solaris:
-spl-solaris:
-spl-solaris:
diff --git a/system/spl-solaris/spl-solaris.SlackBuild b/system/spl-solaris/spl-solaris.SlackBuild
deleted file mode 100644
index b98925ff28..0000000000
--- a/system/spl-solaris/spl-solaris.SlackBuild
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for spl-solaris
-
-# Copyright 2017 Marcin Szychowski <szycha@gmail.com>, Poland
-# Copyright 2016 Kevin Paulus <goarilla@gmail.com>, Belgium
-# Copyright 2013-2014 Petr Hejl - Czech Republic
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by the SlackBuilds.org project
-
-PRGNAM=spl-solaris
-SRCNAM=spl
-VERSION=${VERSION:-0.7.13}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-KERN=${KERN:-"$(uname -r)"}
-PKGVER="$(printf %s "${VERSION}_${KERN}" | tr - _)"
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -fr $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-env -u ARCH \
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --sbindir=/sbin \
-  --includedir=/usr/include \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-linux="/lib/modules/${KERN}/source" \
-  --with-linux-obj="/lib/modules/${KERN}/source" \
-  --build=$ARCH-slackware-linux
-
-env -u ARCH make
-env -u ARCH make install DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING DISCLAIMER $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/spl-solaris/spl-solaris.info b/system/spl-solaris/spl-solaris.info
deleted file mode 100644
index d9263db039..0000000000
--- a/system/spl-solaris/spl-solaris.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="spl-solaris"
-VERSION="0.7.13"
-HOMEPAGE="https://zfsonlinux.org"
-DOWNLOAD="https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.13/spl-0.7.13.tar.gz"
-MD5SUM="b36a84314e7fc8ebb68affeb1e22a9dd"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Marcin Szychowski"
-EMAIL="szycha@gmail.com"
diff --git a/system/splitjob/README b/system/splitjob/README
new file mode 100644
index 0000000000..985797496b
--- /dev/null
+++ b/system/splitjob/README
@@ -0,0 +1,28 @@
+This program is used to split up data from stdin in blocks which are
+sent as input to parallel invocations of commands. The output from
+those are then concatenated in the right order and sent to stdout.
+
+Splitting up and parallelizing jobs like this might be useful to speed
+up compression using multiple CPU cores or even multiple computers.
+
+For this approach to be useful, the compressed format needs to allow
+multiple compressed files to be concatenated. This is the case for
+gzip, bzip2, lzip and xz.
+
+Example 1, use multiple logical cores:
+splitjob -j 4 bzip2 < bigfile > bigfile.bz2
+
+Example 2, use remote machines:
+splitjob "ssh host1 gzip" "ssh host2 gzip" < f > f.gz
+
+The above example assumes that ssh is configured to allow logins
+without asking for password. See the manpage for ssh-keygen or do
+a google search for examples on how to accomplish this.
+
+Example 3, Use bigger blocks to reduce overhead:
+splitjob -j 2 -b 10M gzip < file > file.gz
+
+For "xz -9" a block size of 384 MB gives best compression.
+
+Example 4, parallel decompression:
+splitjob -X -r 10 -j 10 -b 384M "xz -d -" < file.xz > file
diff --git a/system/splitjob/slack-desc b/system/splitjob/slack-desc
new file mode 100644
index 0000000000..463fef9c98
--- /dev/null
+++ b/system/splitjob/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+splitjob: splitjob (tool to split up data)
+splitjob:
+splitjob: Splitjob is tool to split up data and send it to parallel invocations
+splitjob: of some program and concatenate the output of those invocations.
+splitjob: It is useful to speed up compression of big amounts of data by using
+splitjob: multiple CPU cores or even multiple machines in the network.
+splitjob:
+splitjob:
+splitjob:
+splitjob:
+splitjob:
diff --git a/system/splitjob/splitjob.SlackBuild b/system/splitjob/splitjob.SlackBuild
new file mode 100644
index 0000000000..a1e1b236a4
--- /dev/null
+++ b/system/splitjob/splitjob.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+# Slackware build script for splitjob
+
+# Copyright 2022 Henrik Carlqvist, Sweden
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=splitjob
+VERSION=${VERSION:-3.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make PREFIX=/usr
+make install PREFIX=/usr DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING CONTRIBUTORS CHANGELOG TODO README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/splitjob/splitjob.info b/system/splitjob/splitjob.info
new file mode 100644
index 0000000000..8bca35536b
--- /dev/null
+++ b/system/splitjob/splitjob.info
@@ -0,0 +1,10 @@
+PRGNAM="splitjob"
+VERSION="3.2"
+HOMEPAGE="http://splitjob.sourceforge.net/"
+DOWNLOAD="https://master.dl.sourceforge.net/project/splitjob/3.2stable/splitjob-3.2.tar.xz"
+MD5SUM="e11d35fced4b34de1ac5196c257d2b20"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Henrik Carlqvist"
+EMAIL="hc1363@poolhem.se"
diff --git a/system/splix/README b/system/splix/README
index f8a1037680..14ed2a872a 100644
--- a/system/splix/README
+++ b/system/splix/README
@@ -3,7 +3,9 @@ Language) printers. It covers several Samsung and Xerox printers. See
 ppd/*.ppd in the tarball for supported models. Only SPL2 and SPLc
 printers are supported.
 
-JBIG-KIT is an optional dependency. To build SpliX with support for JBIG printers:
+JBIG-KIT is an optional dependency. To build SpliX with support for
+JBIG printers:
+
   JBIG=yes ./splix.SlackBuild
 
 IMPORTANT:
diff --git a/system/splix/splix.SlackBuild b/system/splix/splix.SlackBuild
index 52d2f8d914..2e5d83b234 100644
--- a/system/splix/splix.SlackBuild
+++ b/system/splix/splix.SlackBuild
@@ -1,14 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for splix
 # Written by Iskar Enev <iskar.enev[@]gmail.com>
 # Currently maintained by endspiel <endspiel@disroot.org>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=splix
 VERSION=${VERSION:-2.0.0_76268c4}
 SRCVERSION=${SRCVERSION:-76268c4dd7dbc8218ea7426401104c3b40cc707a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -18,7 +21,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -96,4 +106,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/spman/README b/system/spman/README
index 26c997450e..3bcd75af0f 100644
--- a/system/spman/README
+++ b/system/spman/README
@@ -27,10 +27,6 @@ Supported repositories:
     Alien's
     Alien's multilib
 
-NOTE:
-    Make sure python3 is installed before building any dependencies
-    as we need Python3 bindings.
-
 Optional dependencies:
     - sbbdep (for search dependency problems functionality)
     - tqdm (progress bar for some parameters)
diff --git a/system/spman/spman.SlackBuild b/system/spman/spman.SlackBuild
index 0a5d50e02c..eeeed1bef8 100644
--- a/system/spman/spman.SlackBuild
+++ b/system/spman/spman.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for spman
 #
@@ -27,10 +27,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=spman
-VERSION=${VERSION:-2.2.2}
+VERSION=${VERSION:-2.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -40,7 +43,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -78,7 +88,7 @@ find -L . \
 mkdir -p $PKG/usr/sbin
 install --mode=755 src/$PRGNAM $PKG/usr/sbin
 
-# etc/{spman,bash_completion.d}
+# etc/spman
 cp -R etc $PKG
 (
     cd $PKG/etc/$PRGNAM || exit 1
@@ -88,7 +98,11 @@ cp -R etc $PKG
         mv $CONFIG $CONFIG.new
     done
 )
-chmod 755 $PKG/etc/bash_completion.d/$PRGNAM-bash-complition.sh
+
+mkdir -p $PKG/usr/share/bash-completion/completions
+mv $PKG/etc/bash_completion.d/$PRGNAM-bash-complition.sh \
+   $PKG/usr/share/bash-completion/completions/$PRGNAM
+rm -rf $PKG/etc/bash_completion.d
 
 # python libs
 PY3VER="$(python3 -c 'import sys; ver = sys.version_info; \
@@ -117,4 +131,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 # make the package
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/spman/spman.info b/system/spman/spman.info
index ad07383348..452adcabfb 100644
--- a/system/spman/spman.info
+++ b/system/spman/spman.info
@@ -1,10 +1,10 @@
 PRGNAM="spman"
-VERSION="2.2.2"
+VERSION="2.2.3"
 HOMEPAGE="https://github.com/MyRequiem/spman"
-DOWNLOAD="https://github.com/MyRequiem/spman/archive/2.2.2/spman-2.2.2.tar.gz"
-MD5SUM="d3db7abfb252c2121a38975a1d1e0564"
+DOWNLOAD="https://github.com/MyRequiem/spman/archive/2.2.3/spman-2.2.3.tar.gz"
+MD5SUM="1858af08f2dbf22d21b851d46d6e57fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3 python-requests"
+REQUIRES=""
 MAINTAINER="Vladimir MyRequiem"
 EMAIL="mrvladislavovich@gmail.com"
diff --git a/system/sqlcipher/README b/system/sqlcipher/README
index efbb45c125..7bba917ad2 100644
--- a/system/sqlcipher/README
+++ b/system/sqlcipher/README
@@ -1,12 +1,12 @@
 SQLCipher is an SQLite extension that provides transparent 256-bit AES
-encryption of database files. Pages are encrypted before being written to
-disk and are decrypted when read back. Due to the small footprint and great
-performance it's ideal for protecting embedded application databases and is
-well suited for mobile development.
+encryption of database files. Pages are encrypted before being written
+to disk and are decrypted when read back. Due to the small footprint
+and great performance it's ideal for protecting embedded application
+databases and is well suited for mobile development.
 
 SQLCipher was initially developed by Stephen Lombardo at Zetetic LLC
-(sjlombardo@zetetic.net) as the encrypted database layer for Strip, an iPhone
-data vault and password manager (http://getstrip.com).
+(sjlombardo@zetetic.net) as the encrypted database layer for Strip,
+an iPhone data vault and password manager (http://getstrip.com).
 
 TCL extension (libtclsqlite3.so) can be enabled with:
 
diff --git a/system/sqlcipher/sqlcipher.SlackBuild b/system/sqlcipher/sqlcipher.SlackBuild
index 5ae180c8cb..3eec195808 100644
--- a/system/sqlcipher/sqlcipher.SlackBuild
+++ b/system/sqlcipher/sqlcipher.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sqlcipher
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sqlcipher
 VERSION=${VERSION:-4.4.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -99,8 +109,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CHANGELOG.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sqldiff/README b/system/sqldiff/README
index bf4909faa9..21305a6df4 100644
--- a/system/sqldiff/README
+++ b/system/sqldiff/README
@@ -1,15 +1,16 @@
-The sqldiff binary is a command-line utility program that displays
-the differences between SQLite databases.
+The sqldiff binary is a command-line utility program that displays the
+differences between SQLite databases.
 
 Example usage:
 sqldiff [options] database1.sqlite database2.sqlite
 
 The usual output is an SQL script that will transform database1.sqlite
-(the "source" database) into database2.sqlite (the "destination" database).
-
+(the "source" database) into database2.sqlite (the "destination"
+database).
 
 sqldiff is part of SQLite, it comes inside the tools directory of
-the SQLite sources. It isn't included in the stock slackware SQLite package.
-Hence this SlackBuild follows the Slackware SQLite version and compilation options.
-This is why the source used are linked from Slackware mirrors, to ensure
-maximum compatibility with stock Slackware.
+the SQLite sources. It isn't included in the stock slackware SQLite
+package. Hence this SlackBuild follows the Slackware SQLite version
+and compilation options. This is why the sources used are linked
+from Slackware mirrors, to ensure maximum compatibility with stock
+Slackware.
diff --git a/system/sqldiff/sqldiff.SlackBuild b/system/sqldiff/sqldiff.SlackBuild
index 4385747b8b..76af639f2d 100644
--- a/system/sqldiff/sqldiff.SlackBuild
+++ b/system/sqldiff/sqldiff.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sqldiff
 
@@ -21,12 +21,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sqldiff
-VERSION=${VERSION:-3.13}
+VERSION=${VERSION:-3.37.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 SRCNAM=sqlite
-SRCVER=$(tr -d . <<< "${VERSION}0000")
+SRCVER="3370200"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -50,13 +60,46 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
 # Enable the same features as slackware official sqlite package:
-SLKCFLAGS="$SLKCFLAGS -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_ICU -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_STAT2=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_SECURE_DELETE=1"
+# Enable AND, NOT and nested parenthesis in FTS3
+SLKCFLAGS="$SLKCFLAGS -DSQLITE_ENABLE_FTS3_PARENTHESIS=1"
+
+# Enable the ICU extension
+SLKCFLAGS="$SLKCFLAGS -DSQLITE_ENABLE_ICU"
+
+# Enables the retrieval of column metadata
+SLKCFLAGS="$SLKCFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1"
+
+# Disable directory syncs
+SLKCFLAGS="$SLKCFLAGS -DSQLITE_DISABLE_DIRSYNC=1"
+
+# Add additional logic to the ANALYZE command and to the query planner
+# to chose better query plans under certain situations
+SLKCFLAGS="$SLKCFLAGS -DSQLITE_ENABLE_STAT4=1"
+
+# Enable the sqlite3_unlock_notify() interface and its associated functionality
+# https://www.sqlite.org/unlock_notify.html
+SLKCFLAGS="$SLKCFLAGS -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"
+
+# The secure_delete setting causes deleted content to be overwritten with zeros
+# https://www.sqlite.org/pragma.html#pragma_secure_delete
+SLKCFLAGS="$SLKCFLAGS -DSQLITE_SECURE_DELETE=1"
+
+# Enable the "Resumable Bulk Update" extension
+# https://www.sqlite.org/rbu.html
+SLKCFLAGS="$SLKCFLAGS -DSQLITE_ENABLE_RBU=1"
+
+# Enable the DBSTAT Virtual Table
+# https://www.sqlite.org/dbstat.html
+SLKCFLAGS="$SLKCFLAGS -DSQLITE_ENABLE_DBSTAT_VTAB=1"
 
 set -e
 
@@ -74,8 +117,15 @@ find -L . \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Completely copied from slackware's official sqlite SlackBuild
-# except --enable-cross-thread-connections is removed because it does not work.
-configure() {
+if [ ! -f configure ]; then
+  # Try regenerating configure:
+  autoreconf -vif
+fi
+
+# Fix a bug in ./configure that discards all but the last considered option:
+sed -i "s|\$(OPT_FEATURE_FLAGS)|\${OPT_FEATURE_FLAGS}|g" ./configure
+
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS $(icu-config --cppflags)" \
 LDFLAGS="$(icu-config --ldflags)" \
@@ -88,20 +138,18 @@ LDFLAGS="$(icu-config --ldflags)" \
   --enable-threadsafe \
   --enable-tempstore=yes \
   --enable-load-extension \
+  --enable-fts3 \
+  --enable-fts4 \
+  --enable-fts5 \
+  --enable-json1 \
+  --enable-rtree \
+  --enable-session \
   --enable-static=no \
-  --build=$ARCH-slackware-linux 
-  return $?
-}
-
-if ! configure ; then
-  # Try regenerating configure:
-  autoconf
-  configure || exit 1
-fi
+  --build=$ARCH-slackware-linux || exit 1
 # End of Slackware's SlackBuild copy-pasting
 
 # Here we only build $PRGNAM target
-make $NUMJOBS $PRGNAM || make $PRGNAM || exit 1
+make $PRGNAM || exit 1
 
 mkdir -p $PKG/usr/bin
 install -m755 $PRGNAM $PKG/usr/bin/
@@ -116,4 +164,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sqldiff/sqldiff.info b/system/sqldiff/sqldiff.info
index 5a13395c33..056c0f21b3 100644
--- a/system/sqldiff/sqldiff.info
+++ b/system/sqldiff/sqldiff.info
@@ -1,8 +1,8 @@
 PRGNAM="sqldiff"
-VERSION="3.13"
+VERSION="3.37.2"
 HOMEPAGE="https://www.sqlite.org/"
-DOWNLOAD="https://mirrors.slackware.com/slackware/slackware64-14.2/source/ap/sqlite/sqlite-src-3130000.tar.xz"
-MD5SUM="871f618307359b5a739955f690eebba0"
+DOWNLOAD="https://mirrors.slackware.com/slackware/slackware64-15.0/source/ap/sqlite/sqlite-src-3370200.tar.lz"
+MD5SUM="e1ba86e0d82b58d3b7f2f65e5dc968ba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/sqlite2/Makefile.patch b/system/sqlite2/Makefile.patch
deleted file mode 100644
index f80d057feb..0000000000
--- a/system/sqlite2/Makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.in.orig	2014-08-10 08:46:19.947934827 +0700
-+++ Makefile.in	2014-08-10 08:46:38.961957767 +0700
-@@ -465,14 +465,14 @@
- 	mv $(DOC) doc
- 
- install:	sqlite libsqlite.la sqlite.h
--	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib
--	$(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib
-+	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib64
-+	$(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib64
- 	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
- 	$(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin
- 	$(INSTALL) -d $(DESTDIR)$(prefix)/include
- 	$(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include
--	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
--	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
-+	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib64/pkgconfig; 
-+	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib64/pkgconfig; 
- 
- clean:	
- 	rm -f *.lo *.la *.o sqlite@TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.*
diff --git a/system/sqlite2/README b/system/sqlite2/README
deleted file mode 100644
index 4cd7724fa5..0000000000
--- a/system/sqlite2/README
+++ /dev/null
@@ -1,7 +0,0 @@
-SQLite is a small C library that implements a self-contained, embeddable, 
-zero-configuration SQL database engine.  The distribution contains a 
-standalone command-line database access program as well.
-
-This is a legacy build that is no longer maintained or supported by the 
-upstream developers at sqlite.org.  This sqlite2 package can be installed
-in parallel with the sqlite (version 3) package included in Slackware.
diff --git a/system/sqlite2/slack-desc b/system/sqlite2/slack-desc
deleted file mode 100644
index 1e00380769..0000000000
--- a/system/sqlite2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-sqlite2: sqlite2 (simple, self contained database engine)
-sqlite2:
-sqlite2: SQLite is a small C library that implements a self-contained,
-sqlite2: embeddable, zero-configuration SQL database engine. The distribution
-sqlite2: contains a standalone command-line database access program as well.
-sqlite2:
-sqlite2: SQLite version 2 is installable in parallel with SQLite version 3,
-sqlite2: which is included in Slackware.
-sqlite2:
-sqlite2: Homepage:  http://www.sqlite.org/
-sqlite2:
diff --git a/system/sqlite2/sqlite2.SlackBuild b/system/sqlite2/sqlite2.SlackBuild
deleted file mode 100644
index 66ffb2774e..0000000000
--- a/system/sqlite2/sqlite2.SlackBuild
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for sqlite2
-# As sqlite version 2 is no longer maintained in favour of version 3,
-# we'll grab the source and security patches from the Debian project.
-# File names in v.2 and v.3 do not overlap, so both packages can safely coexist
-
-# Written by V'yacheslav Stetskevych
-# Now maintained by Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=sqlite2
-VERSION=${VERSION:-2.8.17_7}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-SRCNAM=sqlite
-SRCVERSION=$(printf "$VERSION" | cut -d _ -f 1)
-PATCHLEVEL=$(printf "$VERSION" | cut -d _ -f 2)
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$SRCVERSION
-tar xvf $CWD/${SRCNAM}_${SRCVERSION}.orig.tar.gz
-cd $SRCNAM-$SRCVERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Apply the debian patchset, which creates the "debian" directory
-zcat $CWD/${SRCNAM}_$SRCVERSION-$PATCHLEVEL.diff.gz | patch -p1
-# Apply individual debian patches
-cat debian/patches/* | patch -p1
-
-if [ "$ARCH" = "x86_64" ]; then
-  patch -p0 < $CWD/Makefile.patch
-fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --disable-static \
-  --enable-utf8 \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Install the manpage
-mkdir -p $PKG/usr/man/man1
-gzip -9 < sqlite.1 > $PKG/usr/man/man1/sqlite.1.gz
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/sqlite2/sqlite2.info b/system/sqlite2/sqlite2.info
deleted file mode 100644
index aaa7b6674f..0000000000
--- a/system/sqlite2/sqlite2.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="sqlite2"
-VERSION="2.8.17_7"
-HOMEPAGE="http://www.sqlite.org"
-DOWNLOAD="http://ftp.de.debian.org/debian/pool/main/s/sqlite/sqlite_2.8.17.orig.tar.gz \
-          http://archive.debian.org/debian/pool/main/s/sqlite/sqlite_2.8.17-7.diff.gz"
-MD5SUM="04f15ed552134b06528b3628be7d7315 \
-        9d926474caaed0d12f2fb418bdcf1ccf"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
diff --git a/system/squashfuse/README b/system/squashfuse/README
new file mode 100644
index 0000000000..7b09573dcf
--- /dev/null
+++ b/system/squashfuse/README
@@ -0,0 +1,6 @@
+Squashfuse lets you mount SquashFS archives in user-space.
+It supports almost all features of the SquashFS format,
+yet is still fast and memory-efficient.
+
+It provides two binaries and two libraries, one pair uses high-level
+FUSE API and another faster low-level API (these have "_ll" suffix).
diff --git a/system/squashfuse/slack-desc b/system/squashfuse/slack-desc
new file mode 100644
index 0000000000..83565cac8c
--- /dev/null
+++ b/system/squashfuse/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+squashfuse: squashfuse (FUSE filesystem to mount squashfs archives)
+squashfuse:
+squashfuse: Squashfuse lets you mount SquashFS archives in user-space. It
+squashfuse: supports almost all features of the SquashFS format, yet is still
+squashfuse: fast and memory-efficient.
+squashfuse:
+squashfuse: It provides two binaries and two libraries, one pair uses high-level
+squashfuse: FUSE API and another faster low-level API (these have "_ll" suffix).
+squashfuse:
+squashfuse:
+squashfuse:
diff --git a/system/squashfuse/squashfuse.SlackBuild b/system/squashfuse/squashfuse.SlackBuild
new file mode 100644
index 0000000000..bcd35fa03c
--- /dev/null
+++ b/system/squashfuse/squashfuse.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# Slackware build script for squashfuse
+
+# Copyright 2022 xaizek <xaizek@posteo.net>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=squashfuse
+VERSION=${VERSION:-0.5.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --disable-static \
+  --disable-demo \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE NEWS PLATFORMS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/squashfuse/squashfuse.info b/system/squashfuse/squashfuse.info
new file mode 100644
index 0000000000..9c855added
--- /dev/null
+++ b/system/squashfuse/squashfuse.info
@@ -0,0 +1,10 @@
+PRGNAM="squashfuse"
+VERSION="0.5.2"
+HOMEPAGE="https://github.com/vasi/squashfuse"
+DOWNLOAD="https://github.com/vasi/squashfuse/releases/download/0.5.2/squashfuse-0.5.2.tar.gz"
+MD5SUM="91ff3b12ee2a52051a5cd588ba478989"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="xaizek"
+EMAIL="xaizek@posteo.net"
diff --git a/system/squidclamav/README b/system/squidclamav/README
index fd77f63ee4..61cf5e54b7 100644
--- a/system/squidclamav/README
+++ b/system/squidclamav/README
@@ -12,17 +12,4 @@ Building and configuring squid
 You must have built squid with the option "ICAP=yes", for example:
   ICAP=yes ./squid.SlackBuild
 
-Add this into your squid.conf:
-
-# icap squidclamav
-icap_enable on
-icap_send_client_ip on
-icap_send_client_username on
-icap_client_username_encode off
-icap_client_username_header X-Authenticated-User
-icap_preview_enable on
-icap_preview_size 1024
-icap_service service_avi_req reqmod_precache icap://localhost:1344/squidclamav bypass=off
-adaptation_access service_avi_req allow all
-icap_service service_avi_resp respmod_precache icap://localhost:1344/squidclamav bypass=on
-adaptation_access service_avi_resp allow all
+See README.SBo for squid.conf configuration.
diff --git a/system/squidclamav/README.SBo b/system/squidclamav/README.SBo
new file mode 100644
index 0000000000..4a5f6e8f25
--- /dev/null
+++ b/system/squidclamav/README.SBo
@@ -0,0 +1,14 @@
+Add this into your squid.conf:
+
+# icap squidclamav
+icap_enable on
+icap_send_client_ip on
+icap_send_client_username on
+icap_client_username_encode off
+icap_client_username_header X-Authenticated-User
+icap_preview_enable on
+icap_preview_size 1024
+icap_service service_avi_req reqmod_precache icap://localhost:1344/squidclamav bypass=off
+adaptation_access service_avi_req allow all
+icap_service service_avi_resp respmod_precache icap://localhost:1344/squidclamav bypass=on
+adaptation_access service_avi_resp allow all
diff --git a/system/squidclamav/squidclamav.SlackBuild b/system/squidclamav/squidclamav.SlackBuild
index d6f636e70d..abcf32ca9b 100644
--- a/system/squidclamav/squidclamav.SlackBuild
+++ b/system/squidclamav/squidclamav.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for squidclamav
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=squidclamav
 VERSION=${VERSION:-6.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -103,4 +113,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/srm/README b/system/srm/README
index a2c86552ed..906440e880 100644
--- a/system/srm/README
+++ b/system/srm/README
@@ -1,15 +1,17 @@
-srm is a secure replacement for rm(1). Unlike the standard rm, it overwrites
-the data in the target files before unlinking them. This prevents command-line
-recovery of the data by examining the raw block device. It may also help to
-frustrate a physical examination of the disk, although it's unlikely that it can
-completely protect against this type of recovery.
+srm is a secure replacement for rm(1). Unlike the standard rm, it
+overwrites the data in the target files before unlinking them. This
+prevents command-line recovery of the data by examining the raw block
+device. It may also help to frustrate a physical examination of the
+disk, although it's unlikely that it can completely protect against
+this type of recovery.
 
-srm uses algorithms found in "Secure Deletion of Data from Magnetic and Solid-
-State Memory" by Peter Gutmann and THC Secure Delete (the overwrite, truncate,
-rename, unlink sequence).
+srm uses algorithms found in "Secure Deletion of Data from Magnetic
+and Solid- State Memory" by Peter Gutmann and THC Secure Delete (the
+overwrite, truncate, rename, unlink sequence).
 
-Please note that srm will only work on file systems that overwrite blocks in
-place. In particular, it will *NOT* work on reiserfs or the vast majority of
-journaled file systems. It should work on ext2, FAT-based file systems, and
-the BSD native file system. On ext3, srm will try to disable the journaling
-of data (please see the verbose output if this fails).
+Please note that srm will only work on file systems that overwrite
+blocks in place. In particular, it will *NOT* work on reiserfs or
+the vast majority of journaled file systems. It should work on ext2,
+FAT-based file systems, and the BSD native file system. On ext3, srm
+will try to disable the journaling of data (please see the verbose
+output if this fails).
diff --git a/system/srm/srm.SlackBuild b/system/srm/srm.SlackBuild
index 8bd3ee060b..8daa24dd24 100644
--- a/system/srm/srm.SlackBuild
+++ b/system/srm/srm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for srm
 
@@ -25,26 +25,36 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=srm
 VERSION=${VERSION:-1.2.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -104,4 +114,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ssdeep/ssdeep.SlackBuild b/system/ssdeep/ssdeep.SlackBuild
index 994591bb81..c2506ee184 100644
--- a/system/ssdeep/ssdeep.SlackBuild
+++ b/system/ssdeep/ssdeep.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ssdeep
 # Written by Oleg O. Chukaev <oleg.chukaev@mail.ru>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ssdeep
 VERSION=${VERSION:-2.10}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -16,7 +19,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -70,8 +80,10 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sst/README b/system/sst/README
new file mode 100644
index 0000000000..74f398284a
--- /dev/null
+++ b/system/sst/README
@@ -0,0 +1,7 @@
+sst (Solidigm Storage Tool) is a proprietary command-line tool to
+manage Solidigm SSDs (former Intel SSDs). It provides firmware update
+capability as well as reading and setting many configuration settings.
+
+To work with SATA drives sst requires the sg kernel module. To have
+this module loaded on boot, please uncomment the corresponding line in
+/etc/rc.d/rc.modules.local
diff --git a/system/sst/slack-desc b/system/sst/slack-desc
new file mode 100644
index 0000000000..fe935f3845
--- /dev/null
+++ b/system/sst/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+sst: sst (Solidigm Storage Tool)
+sst:
+sst: sst (Solidigm Storage Tool) is a proprietary command-line tool to
+sst: manage Solidigm SSDs (former Intel SSDs). It provides firmware
+sst: update capability as well as reading and setting many configuration
+sst: settings.
+sst:
+sst: Homepage:
+sst: https://www.solidigm.com/support-page/drivers-downloads/ka-00085.html
+sst:
+sst:
diff --git a/system/sst/sst.SlackBuild b/system/sst/sst.SlackBuild
new file mode 100644
index 0000000000..1ce2a4b715
--- /dev/null
+++ b/system/sst/sst.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# Slackware build script for sst
+
+# Copyright 2022-2024, Alexander Verbovetsky, Moscow, Russia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=sst
+VERSION=${VERSION:-1.12}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+case "$ARCH" in
+    i?86) RPMARCH=i386 ;;
+  x86_64) RPMARCH=x86_64 ;;
+       *) printf "\n$ARCH is unsupported for the Solidigm Storage Tool.\n\n"
+          exit 1 ;;
+esac
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+
+unzip "$CWD/${PRGNAM}-cli-linux-rpm--${VERSION/./-}.zip"
+rpm2cpio ${PRGNAM}-${VERSION}*.$RPMARCH.rpm | cpio -imdv
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+find usr/lib/solidigm -print0 | xargs -0 file \
+  | grep -e "shared object" | grep ELF | cut -f 1 -d : \
+  | xargs chmod 755 2> /dev/null || true
+
+# The library path is hard-coded, so we stick with /usr/lib
+cp -a usr $PKG
+mv $PKG/usr/bin $PKG/usr/sbin
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/sst $PKG/usr/doc/$PRGNAM-$VERSION/Licenses
+rmdir $PKG/usr/share/doc $PKG/usr/share
+cp -a *.pdf $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sst/sst.info b/system/sst/sst.info
new file mode 100644
index 0000000000..914fbcf915
--- /dev/null
+++ b/system/sst/sst.info
@@ -0,0 +1,10 @@
+PRGNAM="sst"
+VERSION="1.12"
+HOMEPAGE="https://www.solidigm.com/support-page/drivers-downloads/ka-00085.html"
+DOWNLOAD="https://sdmsdfwdriver.blob.core.windows.net/files/kba-gcc/drivers-downloads/ka-00085/sst--1-12/sst-cli-linux-rpm--1-12.zip"
+MD5SUM="182e41d054ddc72e4121ae2e7a757257"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Alexander Verbovetsky"
+EMAIL="alik@ejik.org"
diff --git a/system/st/README b/system/st/README
index 21aafe7c18..26c29cb298 100644
--- a/system/st/README
+++ b/system/st/README
@@ -1 +1,26 @@
-st is a simple terminal implementation for X.
+st (simple terminal)
+
+st is a simple terminal emulator for X which sucks less.
+
+Most st configuration done by editing config.h, which gets baked into
+the st executable. To make this easier, the SlackBuild will look for
+"config.h" in its directory, and copy it into the source directory if
+found. To get the default config.h from the source, do something like
+this:
+
+tar xfO st-0.8.4.tar.gz --wildcards '*/config.def.h' > config.h
+
+...then edit it to your heart's content and copy it into the
+SlackBuild directory. When the package is built, your config.h will be
+used, and also included in /usr/doc/st-$VERSION for reference.
+
+Also, a lot of extra functionality for st is provided as patches, from
+"https://st.suckless.org/patches/". To use these, download them and
+place them in the patches/ directory in the SlackBuild's dir. Note
+that not all provided patches will apply, since some are for old
+versions of st and some are for post-release git. If you use patches,
+the file /usr/doc/st-$VERSION/patches.txt will contain a list of them,
+for reference.
+
+Note that this SlackBuild already includes a .desktop file and icon
+for st, so you don't need the st-desktopentry patch.
diff --git a/system/st/doinst.sh b/system/st/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/system/st/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/st/patches/README b/system/st/patches/README
new file mode 100644
index 0000000000..6448a682f7
--- /dev/null
+++ b/system/st/patches/README
@@ -0,0 +1,2 @@
+Place any st patches you want to apply in this directory before
+running the SlackBuild.
diff --git a/system/st/slack-desc b/system/st/slack-desc
index f076fcba61..d799f80096 100644
--- a/system/st/slack-desc
+++ b/system/st/slack-desc
@@ -6,11 +6,11 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
   |-----handy-ruler------------------------------------------------------|
-st: st (a simple terminal implementation for X)
+st: st (simple terminal)
+st:
+st: st is a simple terminal emulator for X which sucks less.
 st:
-st: st is a simple virtual terminal emulator for X which sucks less.
 st:
-st: Homepage: https://st.suckless.org
 st:
 st:
 st:
diff --git a/system/st/st.SlackBuild b/system/st/st.SlackBuild
index 38aecd74ee..0a7764c938 100644
--- a/system/st/st.SlackBuild
+++ b/system/st/st.SlackBuild
@@ -1,33 +1,30 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for st
 
-# Copyright 2011-2020, Nikolay Korotkiy <sikmir@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by the SlackBuilds.org project
+# Originally written by Nikolay Korotkiy <email removed>
+# Now maintained by B. Watson <urchlay@slackware.uk>
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20221228 bkw: updated for v0.9.
+
+# 20211119 bkw: BUILD=2
+# - new maintainer.
+# - don't overwrite ncurses' st and st-256color terminfo entries.
+#   thanks to Eric Lindblad for pointing this out.
+# - install the rest of the docs (FAQ, LEGACY, TODO).
+# - include config.h in the doc dir.
+# - include patches.txt in the doc dir, if patches are used.
+# - add .desktop and icon.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=st
-VERSION=${VERSION:-0.8.4}
+VERSION=${VERSION:-0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +34,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,22 +66,22 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+[ -e "$CWD/config.h" ] && cp -f $CWD/config.h config.h
 
-# Now apply any other patches that users might have added
+# Now apply any other patches the user might have added. Have to
+# do this *after* applying custom config.h, so any changes to
+# config.h here won't get overwritten.
 for i in $(ls $CWD/patches 2>/dev/null); do
-  echo "Applying patch $i"
+  [ "$i" = "README" ] && continue
+  echo "=== applying patch $i"
   patch -p1 < $CWD/patches/$i
+  PATCHES+=" $i"
 done
 
-# Remove "tic" line from Makefile - we cannot do this here!
-#sed -i "/^\t@tic/d" Makefile
-
-# 20200123 bkw: Actually, yes we can:
+# 20200123 bkw: 'tic' stuff in Makefile doesn't respect DESTDIR.
 sed -i "s|\\<tic\\>|& -o $PKG/usr/share/terminfo|" Makefile
 
 # Above sed command got broken by upstream (they removed the @)
@@ -89,26 +90,68 @@ sed -i "s|\\<tic\\>|& -o $PKG/usr/share/terminfo|" Makefile
 # when the package is removed. tic won't create the dir, so:
 mkdir -p $PKG/usr/share/terminfo
 
-[ -f "$CWD/config.h" ] && cp -f $CWD/config.h config.h
-
 CFLAGS="$SLKCFLAGS" make && \
 make install \
   PREFIX=/usr \
   MANPREFIX=/usr/man \
   DESTDIR=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+strip $PKG/usr/bin/$PRGNAM
+gzip -9 $PKG/usr/man/man?/*
+
+# 20211119 bkw: some of st's terminfo defs have been included in
+# Slackware's ncurses package. After some discussion with Thomas
+# Dickey (the ncurses maintainer) I've decided the ncurses versions
+# of these are better. Instead of hardcoding a list here, we'll
+# actually use the ncurses package's file list to decide what to
+# exclude.
+pkgfile="$(
+  ls /var/lib/pkgtools/packages/ncurses-* \
+  | grep '/ncurses-[^-]\+-[^-]\+-[^-]\+$' \
+)"
+
+if [ -z "$pkgfile" ]; then
+  echo "!!! can't find ncurses package, including all st terminfo entries"
+  pkgfile=/dev/null
+fi
+
+for file in $PKG/usr/share/terminfo/s/*; do
+  name="$( basename $file )"
+  if grep -q '^usr/share/terminfo/s/'$name'$' $pkgfile
+  then
+    echo "=== excluding terminfo entry: $name"
+    rm $file
+  fi
+done
+
+# .desktop file adapted from xterm.desktop
+mkdir -p $PKG/usr/share/applications
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+# Icons converted from https://en.wikipedia.org/wiki/File:Suckless_logo.svg
+for px in 16 32 48 64 128; do
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  convert -resize $size $CWD/$PRGNAM.png $dir/$PRGNAM.png
+done
+
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a config.h FAQ LEGACY LICENSE README TODO $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+if [ -n "$PATCHES" ]; then
+  echo "This package was built with the following patch(es):" > $PKGDOC/patches.txt
+  echo "$PATCHES" | sed 's, ,\n,g' >> $PKGDOC/patches.txt
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/st/st.desktop b/system/st/st.desktop
new file mode 100644
index 0000000000..b836d7f7f0
--- /dev/null
+++ b/system/st/st.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=st
+Comment=Simple terminal emulator which sucks less
+Exec=st
+Terminal=false
+Type=Application
+Icon=st
+Categories=System;TerminalEmulator;
+Keywords=shell;prompt;command;commandline;cmd;
diff --git a/system/st/st.info b/system/st/st.info
index 471bfcaa6a..c9b288558e 100644
--- a/system/st/st.info
+++ b/system/st/st.info
@@ -1,10 +1,10 @@
 PRGNAM="st"
-VERSION="0.8.4"
+VERSION="0.9"
 HOMEPAGE="https://st.suckless.org"
-DOWNLOAD="https://dl.suckless.org/st/st-0.8.4.tar.gz"
-MD5SUM="e00b074c0e5d55513745c99f027b7a34"
+DOWNLOAD="https://dl.suckless.org/st/st-0.9.tar.gz"
+MD5SUM="accd12489e3d48b77f1c11be794f9ee5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Nikolay Korotkiy"
-EMAIL="sikmir@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/st/st.png b/system/st/st.png
new file mode 100644
index 0000000000..daa2578126
--- /dev/null
+++ b/system/st/st.png
diff --git a/system/statifier/README b/system/statifier/README
index ec168b1c5a..d3c33156b1 100644
--- a/system/statifier/README
+++ b/system/statifier/README
@@ -7,10 +7,11 @@ allow a 32-bit binary to run on a 64-bit-only system.
 Notes:
 
 1. To get statifier to work properly, VDSO support must be disabled in
-   the kernel. This must be done on the system statifier is being run on,
-   before it's run. The converted binaries themselves don't require this,
-   only statifier itself. If you forget to do this, statifier will appear
-   to run OK, but the converted binaries will segfault when run.
+   the kernel. This must be done on the system statifier is being
+   run on, before it's run. The converted binaries themselves don't
+   require this, only statifier itself. If you forget to do this,
+   statifier will appear to run OK, but the converted binaries will
+   segfault when run.
 
    For 32-bit systems only, this can be done without a reboot.
    Execute this as root:
@@ -19,20 +20,22 @@ Notes:
 
    ...and to re-enable VDSO, replace the "0" with "1".
 
-   For 64-bit systems, you must use kernel parameters, meaning a reboot is
-   required. At the lilo (elilo, grub, etc) prompt, enter:
+   For 64-bit systems, you must use kernel parameters, meaning a
+   reboot is required. At the lilo (elilo, grub, etc) prompt, enter:
 
    linux vdso=0 vdso32=0
 
    ...or add 'append="vdso=0 vdso32=0"' to the kernel image section in
    /etc/lilo.conf to make it permanent (not recommended).
 
-   If you run statifier with VDSO enabled, it will remind you to disable it.
+   If you run statifier with VDSO enabled, it will remind you to
+   disable it.
 
 2. Executables converted with statifier will show up as dynamic, in
    'file' output, but ldd will say 'not a dynamic executable'.
 
-3. A 64-bit statifier can only convert 64-bit binaries. Converting 32-bit
-   executables on a 64-bit system requires multilib and a 32-bit statifier
-   package. The SlackBuild maintainer hasn't tested multilib, and would
-   be interested to know what kind of results you get with it.
+3. A 64-bit statifier can only convert 64-bit binaries. Converting
+   32-bit executables on a 64-bit system requires multilib and a
+   32-bit statifier package. The SlackBuild maintainer hasn't tested
+   multilib, and would be interested to know what kind of results you
+   get with it.
diff --git a/system/statifier/statifier.SlackBuild b/system/statifier/statifier.SlackBuild
index 3ce16e8914..539e2d8b7b 100644
--- a/system/statifier/statifier.SlackBuild
+++ b/system/statifier/statifier.SlackBuild
@@ -1,13 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for statifier
 
 # Written by Niels Horn <email removed>, revision date: 2010/03/13
 # Updated by Willy Sudiarto Raharjo <email removed>
-# Updated again and now maintained by B. Watson <yalhcru@gmail.com>
+# Updated again and now maintained by B. Watson <urchlay@slackware.uk>
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20221228 bkw: BUILD=2, remove useless INSTALL from doc dir.
+
 # 20180118 bkw:
 # - take over maintenance.
 # - update for v1.7.4.
@@ -15,10 +17,13 @@
 # - add useful info to README, like how to actually get this to work.
 # - add patch to help the user remember to disable VDSO.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=statifier
 VERSION=${VERSION:-1.7.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -28,7 +33,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -52,11 +61,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # We need to patch config.x86_64 because Slackware64 is not multi-lib and we
 # only have the 32-bits libraries
@@ -83,7 +89,7 @@ gzip $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS ChangeLog FAQ INSTALL LICENSE NEWS \
+  AUTHORS ChangeLog FAQ LICENSE NEWS \
   README RELEASE THANKS TODO VERSION doc \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -92,4 +98,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/statifier/statifier.info b/system/statifier/statifier.info
index 1429abea62..c4b69ebaaa 100644
--- a/system/statifier/statifier.info
+++ b/system/statifier/statifier.info
@@ -1,10 +1,10 @@
 PRGNAM="statifier"
 VERSION="1.7.4"
 HOMEPAGE="http://statifier.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/statifier/statifier-1.7.4.tar.gz"
+DOWNLOAD="https://downloads.sourceforge.net/statifier/statifier-1.7.4.tar.gz"
 MD5SUM="e6004f1436be1d525e973536d12b44de"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/steamos-xpad/Makefile b/system/steamos-xpad/Makefile
index 97907b3967..dd47b8423e 100644
--- a/system/steamos-xpad/Makefile
+++ b/system/steamos-xpad/Makefile
@@ -1,6 +1,6 @@
 obj-m = steamos-xpad.o
 
-KVERSION = $(shell uname -r)
+KVERSION ?= $(shell uname -r)
 all:
 	make -C /lib/modules/$(KVERSION)/build V=1 M=$(PWD) modules
 clean:
diff --git a/system/steamos-xpad/steamos-xpad.SlackBuild b/system/steamos-xpad/steamos-xpad.SlackBuild
index aeecae20ba..96a30e0fb8 100644
--- a/system/steamos-xpad/steamos-xpad.SlackBuild
+++ b/system/steamos-xpad/steamos-xpad.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for the SteamOS xpad kernel driver
 #
@@ -22,27 +22,37 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=steamos-xpad
 VERSION=${VERSION:-f5f73eb}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-KERNEL=$(uname -r)
+KERNEL=${KERNEL:-$(uname -r)}
 PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
 set -ue
 
 rm -rf $PKG
@@ -57,6 +67,7 @@ sed -e 's/"xpad"/"steamos-xpad"/' xpad.c > steamos-xpad.c
 
 # Makefile is from the ARCH AUR steamos-xpad-dkms located here:
 # https://aur.archlinux.org/packages/steamos-xpad-dkms/
+export KVERSION="$KERNEL"
 env -u ARCH make
 
 mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/input/joystick
@@ -74,4 +85,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/steampipe-bin/README b/system/steampipe-bin/README
new file mode 100644
index 0000000000..d53f6197ef
--- /dev/null
+++ b/system/steampipe-bin/README
@@ -0,0 +1,3 @@
+Steampipe is the universal interface to APIs.
+
+Use SQL to query cloud infrastructure, SaaS, code, logs, and more.
diff --git a/system/steampipe-bin/slack-desc b/system/steampipe-bin/slack-desc
new file mode 100644
index 0000000000..d649598189
--- /dev/null
+++ b/system/steampipe-bin/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+steampipe-bin: steampipe-bin (universal interface to APIs)
+steampipe-bin:
+steampipe-bin: Steampipe is the universal interface to APIs.
+steampipe-bin:
+steampipe-bin: Use SQL to query cloud infrastructure, SaaS, code, logs, and more.
+steampipe-bin:
+steampipe-bin:
+steampipe-bin:
+steampipe-bin:
+steampipe-bin: Project URL: https://github.com/turbot/steampipe
+steampipe-bin:
diff --git a/system/steampipe-bin/steampipe-bin.SlackBuild b/system/steampipe-bin/steampipe-bin.SlackBuild
new file mode 100644
index 0000000000..9ff47b64f5
--- /dev/null
+++ b/system/steampipe-bin/steampipe-bin.SlackBuild
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# Slackware build script for steampipe-bin
+
+# Copyright 2023 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=steampipe-bin
+SRCNAM=steampipe
+VERSION=${VERSION:-0.20.9}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+tar xvf $CWD/${SRCNAM}_linux_amd64.tar.gz
+chown -R root:root steampipe
+strip --strip-unneeded steampipe
+
+mkdir -p $PKG/usr/bin
+cp steampipe $PKG/usr/bin
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/steampipe-bin/steampipe-bin.info b/system/steampipe-bin/steampipe-bin.info
new file mode 100644
index 0000000000..bbc8b7cc35
--- /dev/null
+++ b/system/steampipe-bin/steampipe-bin.info
@@ -0,0 +1,10 @@
+PRGNAM="steampipe-bin"
+VERSION="0.20.9"
+HOMEPAGE="https://github.com/turbot/steampipe"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/turbot/steampipe/releases/download/v0.20.9/steampipe_linux_amd64.tar.gz"
+MD5SUM_x86_64="d9288baff8fc54ca323ca2da2f95aaff"
+REQUIRES=""
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackbuilds.org"
diff --git a/system/steghide/steghide.SlackBuild b/system/steghide/steghide.SlackBuild
index ce643226b8..7565f5b0ab 100644
--- a/system/steghide/steghide.SlackBuild
+++ b/system/steghide/steghide.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for steghide
 
-# Copyright 2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2019-2022 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=steghide
 VERSION=${VERSION:-0.5.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -73,8 +83,8 @@ find -L . \
 patch -p1 < $CWD/gcc-4.2.patch
 patch -p1 < $CWD/steghide-climits.patch
 
-# This patch is for -current
-#patch -p1 < $CWD/steghide-gcc6.patch
+# This patch is for 15.0
+patch -p1 < $CWD/steghide-gcc6.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -103,4 +113,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/stegseek/README b/system/stegseek/README
new file mode 100644
index 0000000000..e83ddcf068
--- /dev/null
+++ b/system/stegseek/README
@@ -0,0 +1 @@
+stegseek is a fast steghide cracker
diff --git a/system/stegseek/slack-desc b/system/stegseek/slack-desc
new file mode 100644
index 0000000000..0d7e28d046
--- /dev/null
+++ b/system/stegseek/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+stegseek: stegseek (fast steghide cracker)
+stegseek:
+stegseek: a fast steghide cracker
+stegseek:
+stegseek:
+stegseek:
+stegseek:
+stegseek:
+stegseek:
+stegseek:
+stegseek:
diff --git a/system/stegseek/stegseek.SlackBuild b/system/stegseek/stegseek.SlackBuild
new file mode 100644
index 0000000000..e6d50a517f
--- /dev/null
+++ b/system/stegseek/stegseek.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+# Slackware build script for stegseek
+
+# Copyright 2021 toolonely <lonely_@tutanota.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=stegseek
+VERSION=${VERSION:-0.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_STANDARD:STRING=11 \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/stegseek/stegseek.info b/system/stegseek/stegseek.info
new file mode 100644
index 0000000000..5b3c57ea31
--- /dev/null
+++ b/system/stegseek/stegseek.info
@@ -0,0 +1,10 @@
+PRGNAM="stegseek"
+VERSION="0.5"
+HOMEPAGE="https://github.com/RickdeJager/stegseek"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/RickdeJager/stegseek/archive/v0.5/stegseek-0.5.tar.gz"
+MD5SUM_x86_64="d8f0ed0cabea7ab95262de9d65f017ce"
+REQUIRES=""
+MAINTAINER="toolonely"
+EMAIL="lonely_@tutanota.com"
diff --git a/system/stm32flash/stm32flash.SlackBuild b/system/stm32flash/stm32flash.SlackBuild
index 454e53bd1b..41a81b7274 100644
--- a/system/stm32flash/stm32flash.SlackBuild
+++ b/system/stm32flash/stm32flash.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2017 Fernando Lopez Jr.
 # All rights reserved.
@@ -20,10 +20,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=stm32flash
 VERSION=${VERSION:-0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -33,7 +36,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -89,4 +99,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/stow/stow.SlackBuild b/system/stow/stow.SlackBuild
index f6189b5089..64b4d89388 100644
--- a/system/stow/stow.SlackBuild
+++ b/system/stow/stow.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for stow
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=stow
 VERSION=${VERSION:-2.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -96,4 +106,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/stress-ng/stress-ng.SlackBuild b/system/stress-ng/stress-ng.SlackBuild
index 18ecea0125..7ddb469246 100644
--- a/system/stress-ng/stress-ng.SlackBuild
+++ b/system/stress-ng/stress-ng.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for stress-ng
 # Copyright 2018 David Woodfall <dave@slackbuilds.org>
@@ -21,10 +21,17 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: fix github download URL. we were getting a different
+# filename depending on what client was used to download it. script
+# can still use the old (wrong) filename though.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=stress-ng
-VERSION=${VERSION:-0.09.48}
+VERSION=${VERSION:-0.13.05}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,8 +41,12 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/daw}
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
@@ -58,15 +69,16 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
+rm -rf ColinIanKing-stress-ng-c0e0123
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || \
+  tar xvf $CWD/ColinIanKing-stress-ng-V0.13.05-0-gc0e0123.tar.gz
+cd ColinIanKing-stress-ng-c0e0123
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -80,7 +92,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING README.Android README TODO *.txt \
+  COPYING README.Android README.md TODO *.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -88,4 +100,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/stress-ng/stress-ng.info b/system/stress-ng/stress-ng.info
index 8c292bea66..ad8504f637 100644
--- a/system/stress-ng/stress-ng.info
+++ b/system/stress-ng/stress-ng.info
@@ -1,10 +1,10 @@
 PRGNAM="stress-ng"
-VERSION="0.09.48"
+VERSION="0.13.05"
 HOMEPAGE="http://kernel.ubuntu.com/~cking/stress-ng"
-DOWNLOAD="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.09.48.tar.xz"
-MD5SUM="2a4b2c3ec8c740d90e7bcb51e2cc089d"
+DOWNLOAD="https://github.com/ColinIanKing/stress-ng/tarball/V0.13.05/ColinIanKing-stress-ng-V0.13.05-0-gc0e0123.tar.gz"
+MD5SUM="48ac92b114ccaafad53c687bf21abce1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dave Woodfall"
+MAINTAINER="D Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/system/stress/stress.SlackBuild b/system/stress/stress.SlackBuild
index c7743f2acb..cdb96b8111 100644
--- a/system/stress/stress.SlackBuild
+++ b/system/stress/stress.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for stress
 
@@ -22,20 +22,30 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=stress
 VERSION=${VERSION:-1.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -99,4 +109,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/stressapptest/README b/system/stressapptest/README
new file mode 100644
index 0000000000..1f5bfafc4f
--- /dev/null
+++ b/system/stressapptest/README
@@ -0,0 +1,8 @@
+stressapptest (hardware stress test)
+
+Stressful Application Test (or stressapptest, its unix name) is a
+memory interface test. It tries to maximize randomized traffic to
+memory from processor and I/O, with the intent of creating a realistic
+high load situation in order to test the existing hardware devices
+in a computer. It has been used at Google for some time and now it is
+available under the Apache 2.0 license.
diff --git a/system/stressapptest/slack-desc b/system/stressapptest/slack-desc
new file mode 100644
index 0000000000..cf9e75f4bd
--- /dev/null
+++ b/system/stressapptest/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+stressapptest: stressapptest (hardware stress test)
+stressapptest:
+stressapptest: Stressful Application Test (or stressapptest, its unix name) is a
+stressapptest: memory interface test. It tries to maximize randomized traffic to
+stressapptest: memory from processor and I/O, with the intent of creating a realistic
+stressapptest: high load situation in order to test the existing hardware devices
+stressapptest: in a computer. It has been used at Google for some time and now it is
+stressapptest: available under the Apache 2.0 license.
+stressapptest:
+stressapptest:
+stressapptest:
diff --git a/system/stressapptest/stressapptest.SlackBuild b/system/stressapptest/stressapptest.SlackBuild
new file mode 100644
index 0000000000..24ef170a42
--- /dev/null
+++ b/system/stressapptest/stressapptest.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# Slackware build script for stressapptest
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20231120 bkw: update for v1.0.11.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=stressapptest
+VERSION=${VERSION:-1.0.11}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# The -O2 that's normally here is removed, because upstream puts -O3
+# after our supplied flags. I assume they know what they're doing.
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-march=i586 -mtune=i686"
+  PATCH=yes
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-fPIC"
+else
+  SLKCFLAGS=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# This patch is based on Debian's support_i586_builds for
+# stressapptest-1.0.6. Extra logic here to avoid running autoreconf if
+# we don't need to (since it's slow). Allow PATCH=yes in the env for my
+# own testing purposes.
+if [ "${PATCH:-no}" = "yes" ]; then
+  patch -p1 < $CWD/support_i586.diff
+  autoreconf -if
+fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+
+# There are 2 slightly different copies of the Apache license (COPYING
+# and NOTICE). Not being a lawyer, I'm just going to punt and include
+# them both in the doc dir. Also, MODULE_LICENSE_APACHE2 looks like it
+# belongs in the doc dir, but it's 0 bytes long. *Shrug*.
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING NOTICE *.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/stressapptest/stressapptest.info b/system/stressapptest/stressapptest.info
new file mode 100644
index 0000000000..0fe038b71d
--- /dev/null
+++ b/system/stressapptest/stressapptest.info
@@ -0,0 +1,10 @@
+PRGNAM="stressapptest"
+VERSION="1.0.11"
+HOMEPAGE="https://github.com/stressapptest/stressapptest"
+DOWNLOAD="https://github.com/stressapptest/stressapptest/archive/v1.0.11/stressapptest-1.0.11.tar.gz"
+MD5SUM="bf1c1d73b44b65f8a1584a61b4605097"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/stressapptest/support_i586.diff b/system/stressapptest/support_i586.diff
new file mode 100644
index 0000000000..ca9d1302cd
--- /dev/null
+++ b/system/stressapptest/support_i586.diff
@@ -0,0 +1,23 @@
+diff -Naur stressapptest-1.0.9/configure.ac stressapptest-1.0.9.patched/configure.ac
+--- stressapptest-1.0.9/configure.ac	2018-08-09 20:01:24.000000000 -0400
++++ stressapptest-1.0.9.patched/configure.ac	2020-06-06 13:34:23.000966542 -0400
+@@ -19,6 +19,10 @@
+     AC_DEFINE([STRESSAPPTEST_CPU_X86_64],[],
+               [Defined if the target CPU is x86_64])
+     ], 
++  [*i586*], [
++    AC_DEFINE([STRESSAPPTEST_CPU_I686],[],
++              [Defined if the target CPU is i586])
++    ], 
+   [*i686*], [
+     AC_DEFINE([STRESSAPPTEST_CPU_I686],[],
+               [Defined if the target CPU is i686])
+@@ -35,7 +39,7 @@
+     AC_DEFINE([STRESSAPPTEST_CPU_AARCH64],[],
+               [Defined if the target CPU is aarch64])
+     ],
+-[AC_MSG_WARN([Unsupported CPU: $host_cpu! Try x86_64, i686, powerpc, armv7a, or aarch64])]
++[AC_MSG_WARN([Unsupported CPU: $host_cpu! Try x86_64, i586, i686, powerpc, armv7a, or aarch64])]
+ )
+ 
+ ## The following allows like systems to share settings. This is not meant to
diff --git a/system/suckless-tools/README b/system/suckless-tools/README
index 66ca33d394..18ff53932e 100644
--- a/system/suckless-tools/README
+++ b/system/suckless-tools/README
@@ -5,13 +5,13 @@ bundled together in one build because they're so small and simple.
 
 Included tools:
 
-lsw - Lists the titles of all running X windows to stdout, similar to ls(1).
+lsw - List titles of all running X windows to stdout, similar to ls(1).
 lsx - List executables in a directory tree [1].
 sprop - Simple X property utility.
 sselp - Simple X selection printer.
 ssid - Simple setsid replacement.
 swarp - Simple pointer warping tool for X.
-wmname - Prints/sets the window manager name property of the root window [2].
+wmname - Print/set window manager name property of the root window [2].
 xssstate - A simple tool to retrieve the X screensaver state.
 
 Not included:
@@ -23,9 +23,9 @@ on SlackBuilds.org.
 one of these, please let me know so I can update this README.
 
 [1] lsx would conflict with the /usr/bin/lsx from Slackware's minicom
-package. To avoid this, lsx is installed as /usr/bin/lsX. If you don't use
-XMODEM (or even know what it is), "rm -f /usr/bin/lsx" before installing
-suckless-tools, and /usr/bin/lsx will be a symlink to lsX.
+package. To avoid this, lsx is installed as /usr/bin/lsX. If you don't
+use XMODEM (or even know what it is), "rm -f /usr/bin/lsx" before
+installing suckless-tools, and /usr/bin/lsx will be a symlink to lsX.
 
 [2] wmname has been packaged separately (as desktop/wmname). This build
 gives you the same version of wmname, plus a man page for it, so the
diff --git a/system/suckless-tools/suckless-tools.SlackBuild b/system/suckless-tools/suckless-tools.SlackBuild
index c32bd1febe..b0e5252ed7 100644
--- a/system/suckless-tools/suckless-tools.SlackBuild
+++ b/system/suckless-tools/suckless-tools.SlackBuild
@@ -1,17 +1,23 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for suckless-tools
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-PROGS="lsw lsx sprop sselp ssid swarp wmname xssstate"
+# 20210823 bkw: note to self: don't try to upgrade lsw to 0.3. It
+# doesn't actually work (0.2 does).
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=suckless-tools
 VERSION=${VERSION:-20140317}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+PROGS="lsw lsx sprop sselp ssid swarp wmname xssstate"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -21,7 +27,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,11 +75,8 @@ for prog in $PROGS; do
   toolver=$( echo $dir | cut -d- -f2 )
 
   chown -R root:root .
-  find -L . \
-   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-    -o -perm 511 \) -exec chmod 755 {} \; -o \
-   \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+          \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
   sed -i -e "s,-O.\>,$SLKCFLAGS," -e "s,\<lib\>,lib$LIBDIRSUFFIX," config.mk
 
@@ -104,4 +111,4 @@ cat slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/suckless-tools/suckless-tools.info b/system/suckless-tools/suckless-tools.info
index e7b0c71b2d..3dd07e42c9 100644
--- a/system/suckless-tools/suckless-tools.info
+++ b/system/suckless-tools/suckless-tools.info
@@ -21,4 +21,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/sudosh2/README b/system/sudosh2/README
index cb5fa47a86..6a68645ba9 100644
--- a/system/sudosh2/README
+++ b/system/sudosh2/README
@@ -1,18 +1,18 @@
-sudosh is a filter and can be used as a login shell.  sudosh takes advantage
-of pty devices in order to sit between the user's keyboard and a program, in
-this case a shell.
+sudosh is a filter and can be used as a login shell.  sudosh takes
+advantage of pty devices in order to sit between the user's keyboard
+and a program, in this case a shell.
 
-sudosh was designed specifically to be used in conjunction with sudo or by
-itself as a login shell..  sudosh allows the execution of a root shell with
-logging.  Every command the user types within the root shell is logged as
-well as the output.
+sudosh was designed specifically to be used in conjunction with sudo
+or by itself as a login shell..  sudosh allows the execution of a
+root shell with logging.  Every command the user types within the root
+shell is logged as well as the output.
 
 How is this different than "sudo -s" or "sudo /bin/sh" ?
 
 Using "sudo -s" or other methods doesn't log commands typed to syslog.
-Generally the commands are logged to a file such as .sh_history and if you
-use a shell such as csh that doesn't support command-line logging you're
-out of luck.
+Generally the commands are logged to a file such as .sh_history and if
+you use a shell such as csh that doesn't support command-line logging
+you're out of luck.
 
 sudosh fills this gap.  No matter what shell you use, all of the command
 lines are logged to syslog (including vi keystrokes.)
diff --git a/system/sudosh2/sudosh2.SlackBuild b/system/sudosh2/sudosh2.SlackBuild
index 6d5512deae..5e2ed5a56d 100644
--- a/system/sudosh2/sudosh2.SlackBuild
+++ b/system/sudosh2/sudosh2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sudosh2
 
@@ -22,20 +22,30 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sudosh2
 VERSION=${VERSION:-1.0.4}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,8 +57,8 @@ else
    do_record="--enable-recordinput"
 fi
 
-if [ "$ARCH" = "i486" ]; then
-   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -108,4 +118,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/suhosin/README b/system/suhosin/README
deleted file mode 100644
index 3b321cc0c3..0000000000
--- a/system/suhosin/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Suhosin (pronounced 'su-ho-shin') is an advanced protection system
-for PHP installations. It was designed to protect servers and users
-from known and unknown flaws in PHP applications and the PHP core.
-
-You need to modify php.ini manually and add this line:
-extension=suhosin.so
-
-and restart HTTPD
diff --git a/system/suhosin/slack-desc b/system/suhosin/slack-desc
deleted file mode 100644
index e046098593..0000000000
--- a/system/suhosin/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-suhosin: suhosin (PHP Protection System)
-suhosin:
-suhosin: Suhosin (pronounced 'su-ho-shin') is an advanced protection system
-suhosin: for PHP installations. It was designed to protect servers and users
-suhosin: from known and unknown flaws in PHP applications and the PHP core.
-suhosin:
-suhosin:
-suhosin:
-suhosin: Project URL: https://www.suhosin.org/
-suhosin:
-suhosin:
diff --git a/system/suhosin/suhosin.SlackBuild b/system/suhosin/suhosin.SlackBuild
deleted file mode 100644
index 5d8415b12e..0000000000
--- a/system/suhosin/suhosin.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for suhosin
-
-# Copyright 2015-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=suhosin
-VERSION=${VERSION:-0.9.38}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-phpize
-# locate the php-config installation directory dynamically
-phpconf=$(php-config --prefix)
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-php-config=$phpconf/bin/php-config \
-  --build=$ARCH-slackware-linux
-
-make
-
-mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/php/extensions
-cp -a modules/$PRGNAM.so $PKG/usr/lib$LIBDIRSUFFIX/php/extensions
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CREDITS Changelog LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/suhosin/suhosin.info b/system/suhosin/suhosin.info
deleted file mode 100644
index bf5af7253d..0000000000
--- a/system/suhosin/suhosin.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="suhosin"
-VERSION="0.9.38"
-HOMEPAGE="https://www.suhosin.org"
-DOWNLOAD="https://download.suhosin.org/suhosin-0.9.38.tar.gz"
-MD5SUM="0c26402752b0aff69e4b891f062a52bf"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackbuilds.org"
diff --git a/system/sunflower/README b/system/sunflower/README
index 711a5bd496..8c66b0e56f 100644
--- a/system/sunflower/README
+++ b/system/sunflower/README
@@ -1,5 +1,2 @@
 Sunflower is a small and highly customizable twin-panel file manager
 with support for plugins. It contains a built-in terminal.
-
-Sunflower 0.4 requires GTK+ 3.22 (and thus is unsupported on 
-Slackware 14.2).
diff --git a/system/sunflower/sunflower.SlackBuild b/system/sunflower/sunflower.SlackBuild
index a4d545f82a..3368022b3b 100644
--- a/system/sunflower/sunflower.SlackBuild
+++ b/system/sunflower/sunflower.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sunflower
-# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2020-2022 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,12 +21,18 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220312 bkw: Modified by SlackBuilds.org: VERSION must be constant,
+# and match VERSION in the .info file. Also, do not install useless
+# INSTALL in documentation directory.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sunflower
-VERSION=${VERSION:-0.3}
+VERSION=${VERSION:-0.5_63}
+SRCVER="$( echo $VERSION | tr _ - )"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
-COMMIT=61
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -61,33 +71,33 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf Sunflower
-tar xvf $CWD/$PRGNAM-$VERSION-$COMMIT.tgz
+tar xvf $CWD/$PRGNAM-$SRCVER.tgz
 cd Sunflower
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Treat sunflower as an executable
-mkdir -p "$PKG/usr/bin"
-[ ! -f "$PKG/usr/bin/sunflower" ] \
-   && echo -e '#!/bin/bash\nexec python /usr/share/sunflower/Sunflower.py "$@"' > "$PKG/usr/bin/sunflower"
-chmod 755 "$PKG/usr/bin/sunflower"
-
-# Copy other files
-mkdir -p "$PKG/usr/share/sunflower"
-cp -r Sunflower.py application images translations "$PKG/usr/share/sunflower/"
-install -Dm644 Sunflower.desktop "$PKG/usr/share/applications/sunflower.desktop"
-install -Dm644 images/sunflower.svg "$PKG/usr/share/pixmaps/sunflower.svg"
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+python3 setup.py install --root=$PKG
+
+# Detect Python 3 version
+# Code taken from FabioLolix, at Arch Linux AUR:
+# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=sunflower
+PYVER=$(python3 -c "from sys import version_info; print(\"%d.%d\" % (version_info[0],version_info[1]))")
+
+# Copy icons and translations
+install -Dm644 images/sunflower.svg "$PKG/usr/lib/python${PYVER}/site-packages/images/sunflower.svg"
 install -Dm644 images/sunflower.png "$PKG/usr/share/pixmaps/sunflower.png"
+cp -r translations "$PKG/usr/share/locale/"
+rmdir $PKG/usr/share/sunflower/translations
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp AUTHORS CHANGES COPYING DEPENDS LICENSE README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp AUTHORS CHANGES COPYING LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -95,4 +105,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sunflower/sunflower.info b/system/sunflower/sunflower.info
index e2d5a51dc6..7cfdb82c73 100644
--- a/system/sunflower/sunflower.info
+++ b/system/sunflower/sunflower.info
@@ -1,10 +1,10 @@
 PRGNAM="sunflower"
-VERSION="0.3"
+VERSION="0.5_63"
 HOMEPAGE="https://sunflower-fm.org"
-DOWNLOAD="https://sunflower-fm.org/pub/sunflower-0.3-61.tgz"
-MD5SUM="a5cd28438e83b88e5a4edeb3aacef0c6"
+DOWNLOAD="https://sunflower-fm.org/pub/sunflower-0.5-63.tgz"
+MD5SUM="33c0bba1ccaf256838f5be12ddad5e7f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-chardet"
-MAINTAINER="Isaac Yu"
-EMAIL="isaacyu1@isaacyu1.com"
+REQUIRES=""
+MAINTAINER="orphaned - no maintainer"
+EMAIL="nobody@nowhere"
diff --git a/system/supervisor/supervisor.SlackBuild b/system/supervisor/supervisor.SlackBuild
index 61882499cd..3769f38f42 100644
--- a/system/supervisor/supervisor.SlackBuild
+++ b/system/supervisor/supervisor.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2014-2018 digwtx <wtx358@qq.com>
 # All rights reserved.
@@ -20,10 +20,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=supervisor
 VERSION=${VERSION:-3.3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=supervisor
 
@@ -35,9 +38,13 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$SRCNAM}
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 set -eu
@@ -60,7 +67,7 @@ rm -f setuptools/*.exe
 mkdir -p $PKG/etc
 cat $PRGNAM/skel/sample.conf > $PKG/etc/supervisord.conf.new
 
-python setup.py install --root=$PKG
+python2 setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
@@ -75,4 +82,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/swapinzram/README b/system/swapinzram/README
new file mode 100644
index 0000000000..99a48effc0
--- /dev/null
+++ b/system/swapinzram/README
@@ -0,0 +1,30 @@
+# swapinzram for Slackware
+Modified swapinzram script by Didier Spaier  
+http://slackware.uk/slint/x86_64/slint-15.0/source/swapinzram/
+
+
+The package swapinzram is intended to extend the swap spaces available
+beyond swap partitions and swap files, providing swap space in the form
+of a block device in compressed RAM, using the zram kernel module. 
+As the files in it are compressed this results in an increase of the 
+RAM size usable by the system at the cost of a small overhead to 
+compress and decompress the files. 
+
+This can be useful to:
+1. Avoid or at least delay swapping on a mass storage device when 
+available space in RAM decreases. This results in a performance gain 
+because writing in RAM is way faster that on a hard disk or even an SSD
+2. Less writing on a storage devices like flash drives, eMMC, USB flash
+drives or SD card, if the swap partition or file is installed on such 
+devices.
+Beyond the performance gain this also minimizes wearing of the device.
+
+zram can also be used to create block devices in RAM for other usages,
+like to store the files in /tmp or the kernel log, but this is not in
+the scope of this package. However as we pick an available zram device
+id there should be no conflict when adding these features. 
+
+Also in the TODO list, allow to write idle/incompressible pages to a
+backing storage rather than keeping them in memory. The documentation 
+states that the backing storage should be a swap partition, not a swap
+file, but I will check if it's still true.
diff --git a/system/swapinzram/doinst.sh b/system/swapinzram/doinst.sh
new file mode 100644
index 0000000000..6856f514ad
--- /dev/null
+++ b/system/swapinzram/doinst.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    rm $NEW
+  fi
+}
+
+config etc/swapinzram.conf.new
+config etc/sysctl.d/10-zram.conf.new
diff --git a/system/swapinzram/slack-desc b/system/swapinzram/slack-desc
new file mode 100644
index 0000000000..40404e3891
--- /dev/null
+++ b/system/swapinzram/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+swapinzram: swapinzram (Configure a swap block device in RAM)
+swapinzram:
+swapinzram: Zram creates a compressed block device in memory, and the RAM
+swapinzram: assigned to it is only used for swapping as-needed (until then, the
+swapinzram: RAM is still available for use by applications).
+swapinzram: Swap data stored is compressed thereby allowing more data to be
+swapinzram: stored in RAM.
+swapinzram:
+swapinzram:
+swapinzram: https://www.kernel.org/doc/html/latest/admin-guide/blockdev/zram.html
+swapinzram:
diff --git a/system/swapinzram/swapinzram.SlackBuild b/system/swapinzram/swapinzram.SlackBuild
new file mode 100644
index 0000000000..d14b5fd52d
--- /dev/null
+++ b/system/swapinzram/swapinzram.SlackBuild
@@ -0,0 +1,69 @@
+#!/bin/bash
+#
+# Copyright 2022 marav, Paris, FR
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=swapinzram
+SRC_SCRIPTS="swapinzram-files.tar.gz"
+VERSION=${VERSION:-1.0}
+ARCH=noarch
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/{install,etc/rc.d,etc/sysctl.d}
+
+tar -xvf $SRC_SCRIPTS -C $PKG || exit 1
+
+mv $PKG/rc.swapinzram $PKG/etc/rc.d
+    chmod 644 $PKG/etc/rc.d/rc.swapinzram
+    chown root:root -R $PKG/etc/rc.d/rc.swapinzram
+
+mv $PKG/swapinzram.conf $PKG/etc/swapinzram.conf.new
+    chmod 644 $PKG/etc/swapinzram.conf.new
+
+mv $PKG/10-zram.conf $PKG/etc/sysctl.d/10-zram.conf.new
+    chmod 644 $PKG/etc/sysctl.d/10-zram.conf.new
+
+cp $CWD/README $PKG/usr/doc/$PRGNAM-$VERSION/
+cp $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/
+    chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/*
+
+
+mkdir -p $PKG/install
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/swapinzram/swapinzram.info b/system/swapinzram/swapinzram.info
new file mode 100644
index 0000000000..b435ec5c90
--- /dev/null
+++ b/system/swapinzram/swapinzram.info
@@ -0,0 +1,10 @@
+PRGNAM="swapinzram"
+VERSION="1.0"
+HOMEPAGE="https://gitlab.com/maravtdm/swapinzram-slackbuild"
+DOWNLOAD="https://master.dl.sourceforge.net/project/swapinzram-src/swapinzram-files.tar.gz"
+MD5SUM="48d5cdaa3d20013689747d0836dcc98c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="marav"
+EMAIL="marav8@free.fr"
diff --git a/system/swatch/swatch.SlackBuild b/system/swatch/swatch.SlackBuild
index 8ea0e9ea31..9da38e0ac0 100644
--- a/system/swatch/swatch.SlackBuild
+++ b/system/swatch/swatch.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for swatch
 
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=swatch
 SRCNAM=swatchdog
 VERSION=${VERSION:-3.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -102,4 +112,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/swtpm/README b/system/swtpm/README
new file mode 100644
index 0000000000..a579a029c4
--- /dev/null
+++ b/system/swtpm/README
@@ -0,0 +1,18 @@
+swtpm (TPM emulation)
+
+swtpm emulates a TPM (Trusted Process Module) in software; once
+running, QEMU can attach TPMs to virtual machines (to run Windows 11,
+for example). See specs/tpm.rst in the QEMU doc directory for more
+details.
+
+Please note that the swtpm command will emulate TPM 1.2 unless it is
+called with "--tpm2".
+
+For more information about the different tools provided by swtpm, see
+the documents in /usr/doc/swtpm-0.8.2/readmes.
+
+The user and group for TSS are both "tss" by default, and should have
+been created before compiling the trousers package.
+
+It is not possible to install Windows 11 to a virtual machine without
+Secure Boot-enabled UEFI firmware and variables. See edk2-ovmf on SBo.
diff --git a/system/swtpm/doinst.sh b/system/swtpm/doinst.sh
new file mode 100644
index 0000000000..007903496a
--- /dev/null
+++ b/system/swtpm/doinst.sh
@@ -0,0 +1,16 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/swtpm_setup.conf.new
+config etc/swtpm-localca.conf.new
+config etc/swtpm-localca.options.new
diff --git a/system/swtpm/slack-desc b/system/swtpm/slack-desc
new file mode 100644
index 0000000000..c1298bb1e9
--- /dev/null
+++ b/system/swtpm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+swtpm: swtpm (libtpms-based TPM emulator)
+swtpm:
+swtpm: swtpm is a libtpms-based TPM emulator with socket, character device
+swtpm: and Linux CUSE interface options.
+swtpm:
+swtpm: Once swtpm is running, QEMU can attach the emulated TPM to a virtual
+swtpm: machine.
+swtpm:
+swtpm:
+swtpm: Author: Stefan Berger
+swtpm: Homepage: https://github.com/stefanberger/swtpm
diff --git a/system/swtpm/swtpm.SlackBuild b/system/swtpm/swtpm.SlackBuild
new file mode 100644
index 0000000000..f6cd799fa2
--- /dev/null
+++ b/system/swtpm/swtpm.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/bash
+
+# Slackware build script for swtpm
+
+# Copyright 2022-2024 K. Eugene Carlson  Tsukuba, Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=swtpm
+VERSION=${VERSION:-0.8.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./autogen.sh
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc \
+  --mandir=/usr/man \
+  --with-selinux=no
+make
+make install-strip DESTDIR=$PKG
+find $PKG/usr/lib${LIBDIRSUFFIX} -type f -name *\.la -delete
+
+gzip -9 $PKG/usr/man/man*/*
+
+for new in swtpm_setup.conf swtpm-localca.conf swtpm-localca.options; do
+  mv $PKG/etc/$new $PKG/etc/$new.new
+done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+# Each tool has its own short README document.
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/readmes
+(
+cd src
+for dir in swtpm_bios swtpm_cert swtpm_ioctl swtpm_setup; do
+  cp -a $dir/README $PKG/usr/doc/$PRGNAM-$VERSION/readmes/$dir.readme
+done
+)
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/swtpm/swtpm.info b/system/swtpm/swtpm.info
new file mode 100644
index 0000000000..fbabd468e2
--- /dev/null
+++ b/system/swtpm/swtpm.info
@@ -0,0 +1,10 @@
+PRGNAM="swtpm"
+VERSION="0.8.2"
+HOMEPAGE="https://github.com/stefanberger/swtpm"
+DOWNLOAD="https://github.com/stefanberger/swtpm/archive/refs/tags/v0.8.2/swtpm-0.8.2.tar.gz"
+MD5SUM="773f1b0fbdde470d55e254eedbdc9406"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libtpms trousers python3-twisted"
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/swun/swun.SlackBuild b/system/swun/swun.SlackBuild
index fa2870414d..efebd6c310 100644
--- a/system/swun/swun.SlackBuild
+++ b/system/swun/swun.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for swun
 # Written by Benno Grolik fwxx@rocketmail.com
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=swun
 VERSION=${VERSION:-0.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -96,4 +106,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/swun/swun.info b/system/swun/swun.info
index a26cc7b36e..2c65beaee4 100644
--- a/system/swun/swun.info
+++ b/system/swun/swun.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/fwxx/swun/releases/download/v0.0.3/swun-0.0.3.tar.g
 MD5SUM="c0f4b27d468ba4bbe68cebfd08ebf2a5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="qt4"
 MAINTAINER="Benno"
 EMAIL="fwxx@rocketmail.com"
diff --git a/system/symbola-font-ttf/README b/system/symbola-font-ttf/README
index 9744e70cd7..843bcd8bbe 100644
--- a/system/symbola-font-ttf/README
+++ b/system/symbola-font-ttf/README
@@ -1,6 +1,7 @@
 Symbola is a otf font, which contains many scripts, special symbols,
 and emoji characters supported by The Unicode Standard.
 
-Symbola is free strictly for personal, non-commercial use.
+Symbola up to and including version 14.00 is free strictly for personal,
+non-commercial use.
 
 This script also creates the ttf font file using the FontForge.
diff --git a/system/symbola-font-ttf/symbola-font-ttf.SlackBuild b/system/symbola-font-ttf/symbola-font-ttf.SlackBuild
index 0c3420e93e..8b30d591ef 100644
--- a/system/symbola-font-ttf/symbola-font-ttf.SlackBuild
+++ b/system/symbola-font-ttf/symbola-font-ttf.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for symbola-font-ttf
 
-# Copyright 2016-2020 Alexander Verbovetsky, Moscow, Russia
+# Copyright 2016-2023 Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=symbola-font-ttf
-VERSION=${VERSION:-13.00}
+VERSION=${VERSION:-14.00}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -42,7 +49,9 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-unzip $CWD/Symbola.zip
+pdfdetach -saveall $CWD/Symbola.pdf
+qpdf --remove-attachment="Untitled Object" \
+  --remove-attachment="Untitled Object 2" $CWD/Symbola.pdf Symbola.pdf
 
 fontforge -lang=ff -c 'Open("Symbola.otf");Generate("Symbola.ttf");Close();'
 
@@ -60,4 +69,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/symbola-font-ttf/symbola-font-ttf.info b/system/symbola-font-ttf/symbola-font-ttf.info
index c2a8c85655..7605f7470e 100644
--- a/system/symbola-font-ttf/symbola-font-ttf.info
+++ b/system/symbola-font-ttf/symbola-font-ttf.info
@@ -1,10 +1,10 @@
 PRGNAM="symbola-font-ttf"
-VERSION="13.00"
+VERSION="14.00"
 HOMEPAGE="https://dn-works.com/ufas/"
-DOWNLOAD="https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/Symbola.zip \
-          https://dn-works.com/wp-content/uploads/2020/UFAS-Docs/License.pdf"
-MD5SUM="a14dda162bd1cb407059f62d77fcc5ea \
-        bb6edb616a86a98826cd269486b095b5"
+DOWNLOAD="https://dn-works.com/wp-content/uploads/2021/UFAS121921/Symbola.pdf \
+          https://dn-works.com/wp-content/uploads/2021/UFAS121921/License.pdf"
+MD5SUM="deef28dd48f791021195d95a594e7f0c \
+        8da585bd4ec90b22d6cf21a778e976c3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fontforge"
diff --git a/system/sysbench/sysbench.SlackBuild b/system/sysbench/sysbench.SlackBuild
index 69dc96805f..d580232ab3 100644
--- a/system/sysbench/sysbench.SlackBuild
+++ b/system/sysbench/sysbench.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sysbench
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sysbench
 VERSION=${VERSION:-1.0.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -100,4 +110,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sysdig/README b/system/sysdig/README
index 45c9e6bc6a..2658aec554 100644
--- a/system/sysdig/README
+++ b/system/sysdig/README
@@ -1,16 +1,17 @@
-Sysdig is open source, system-level exploration: capture system state and
-activity from a running Linux instance, then save, filter and analyze. Sysdig is
-scriptable in Lua and includes a command line interface and a powerful
-interactive UI, csysdig, that runs in your terminal. Think of sysdig as strace +
-tcpdump + htop + iftop + lsof + awesome sauce. With state of the art container
-visibility on top.
+Sysdig is open source, system-level exploration: capture system
+state and activity from a running Linux instance, then save, filter
+and analyze. Sysdig is scriptable in Lua and includes a command line
+interface and a powerful interactive UI, csysdig, that runs in your
+terminal. Think of sysdig as strace + tcpdump + htop + iftop + lsof +
+awesome sauce. With state of the art container visibility on top.
 
-To build the package for a kernel different from the running one, start the
-script setting the KERNEL variable as in
+To build the package for a kernel different from the running one,
+start the script setting the KERNEL variable as in:
 KERNEL=2.6.38.8 ./sysdig.SlackBuild
 
-To build sysdig with dkms support supply the variable DKMS="yes" to
-sysdig.SlackBuild.  This also needs dkms installed as a runtime dependency.
+To build sysdig with dkms support supply the variable DKMS="yes"
+to sysdig.SlackBuild. This also needs dkms installed as a runtime
+dependency.
 
   # DKMS="yes" ./sysdig.SlackBuild
 
diff --git a/system/sysdig/sysdig.SlackBuild b/system/sysdig/sysdig.SlackBuild
index 6ef570486d..bb0d7af4b4 100644
--- a/system/sysdig/sysdig.SlackBuild
+++ b/system/sysdig/sysdig.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for sysdig
 
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=sysdig
-VERSION=${VERSION:-0.26.6}
+VERSION=${VERSION:-0.28.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+KERNEL=${KERNEL:-$(uname -r)}
+PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,9 +64,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-KERNEL=${KERNEL:-$(uname -r)}
-PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
-
 set -e
 
 rm -rf $PKG
@@ -65,12 +72,19 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+
+FALCO_HASH=${FALCO_HASH:-2160111cd088aea9ae2235d3385ecb0b1ab6623c}
+
+mkdir -p build/falcosecurity-libs-repo/falcosecurity-libs-prefix/src
+cp $CWD/libs-$FALCO_HASH.tar.gz \
+   build/falcosecurity-libs-repo/falcosecurity-libs-prefix/src/$FALCO_HASH.tar.gz
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Fix manpage location
 sed -i 's|share/||' userspace/sysdig/man/CMakeLists.txt
@@ -83,7 +97,6 @@ else
   sed -i '/sysdig-probe-loader/,$d' scripts/CMakeLists.txt
 fi
 
-mkdir build
 cd build
   cmake -G "Unix Makefiles" \
     -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
@@ -98,7 +111,6 @@ cd build
   env -u ARCH make VERBOSE=1
   env -u ARCH make install DESTDIR=$PKG
   mkdir -p $PKG/lib/modules/$KERNEL/misc
-  install -m 0644 driver/$PRGNAM-probe.ko $PKG/lib/modules/$KERNEL/misc
 cd -
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -115,4 +127,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 sed -e "s|@KERNEL@|$KERNEL|" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/sysdig/sysdig.info b/system/sysdig/sysdig.info
index 0e203261da..9e0f5eebe6 100644
--- a/system/sysdig/sysdig.info
+++ b/system/sysdig/sysdig.info
@@ -1,10 +1,12 @@
 PRGNAM="sysdig"
-VERSION="0.26.6"
+VERSION="0.28.0"
 HOMEPAGE="https://www.sysdig.org"
-DOWNLOAD="https://github.com/draios/sysdig/archive/0.26.6/sysdig-0.26.6.tar.gz"
-MD5SUM="60f9498c97b6e69639a8be8e9d6ed032"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/draios/sysdig/archive/0.28.0/sysdig-0.28.0.tar.gz \
+          https://github.com/falcosecurity/libs/archive/2160111/libs-2160111cd088aea9ae2235d3385ecb0b1ab6623c.tar.gz"
+MD5SUM_x86_64="b0a25f902d6d520380f03a1f39177033 \
+        52ff63dc35604d0a37aa780a4472a114"
 REQUIRES="jsoncpp lua libb64 jq tbb grpc gtest"
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/system/syslog-ng/README b/system/syslog-ng/README
index 893d7b585e..f1f77021d1 100644
--- a/system/syslog-ng/README
+++ b/system/syslog-ng/README
@@ -1,17 +1,19 @@
-The syslog-ng application is a flexible and highly scalable system logging
-application that is ideal for creating centralized and trusted logging
-solutions. This free, open-source version is an extremely well-developed,
-high performance, stable system being the Linux/Unix world's most frequently
-used alternative central logging system. The application can operate in server
-or agent mode, and - apart from UDP - supports the reliable TCP and the
-encrypted TLS protocols. That way syslog-ng can be used to create flexible
-and reliable logging infrastructure even in heterogeneous environments.
+The syslog-ng application is a flexible and highly scalable system
+logging application that is ideal for creating centralized and trusted
+logging solutions. This free, open-source version is an extremely
+well-developed, high performance, stable system being the Linux/Unix
+world's most frequently used alternative central logging system. The
+application can operate in server or agent mode, and - apart from UDP
+- supports the reliable TCP and the encrypted TLS protocols. That
+way syslog-ng can be used to create flexible and reliable logging
+infrastructure even in heterogeneous environments.
 
-libdbi is an optional dependency (enables SQL support). GeoIP support can be
-enabled with: GEOIP=yes ./syslog-ng.SlackBuild
+libdbi is an optional dependency (enables SQL support). GeoIP support
+can be enabled with: GEOIP=yes ./syslog-ng.SlackBuild
 
 This package will conflict with sysklogd - in other words, you *need*
 to remove sysklogd before installing syslog-ng.
- 
-For more information on how to install and run syslog-ng, see README.SLACKWARE
-that came with this package (which is also installed with the docs).
+
+For more information on how to install and run syslog-ng, see
+README.SLACKWARE that came with this package (which is also installed
+with the docs).
diff --git a/system/syslog-ng/slack-desc b/system/syslog-ng/slack-desc
index 8740291aab..58419f0ec9 100644
--- a/system/syslog-ng/slack-desc
+++ b/system/syslog-ng/slack-desc
@@ -15,5 +15,5 @@ syslog-ng: This free, open-source version is an extremely well-developed, high
 syslog-ng: performance, stable system being the Linux/Unix world's most
 syslog-ng: frequently used alternative central logging system.
 syslog-ng:
-syslog-ng: Homepage: https://www.balabit.com/
+syslog-ng: Homepage: https://www.syslog-ng.com/
 syslog-ng:
diff --git a/system/syslog-ng/syslog-ng.SlackBuild b/system/syslog-ng/syslog-ng.SlackBuild
index 8a199d7a02..1b6df897e9 100644
--- a/system/syslog-ng/syslog-ng.SlackBuild
+++ b/system/syslog-ng/syslog-ng.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for syslog-ng
 
-# Copyright 2010, 2012, 2013, 2016, 2017, 2019  Mario Preksavec, Zagreb, Croatia
+# Copyright 2010, 2021  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,13 @@
 
 # Updates and extras, thanks to Janos Szigetvari, Szekesfehervar, Hungary
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=syslog-ng
-VERSION=${VERSION:-3.10.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.35.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -175,9 +185,11 @@ done
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/syslog-ng/syslog-ng.conf b/system/syslog-ng/syslog-ng.conf
index 8ef417f569..d903f2eaa0 100644
--- a/system/syslog-ng/syslog-ng.conf
+++ b/system/syslog-ng/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.10
+@version: 3.35
 @include "scl.conf"
 
 # Drop-in replacement for a stock Slackware syslog.conf
diff --git a/system/syslog-ng/syslog-ng.info b/system/syslog-ng/syslog-ng.info
index 9392718eb9..fef1c7595c 100644
--- a/system/syslog-ng/syslog-ng.info
+++ b/system/syslog-ng/syslog-ng.info
@@ -1,8 +1,8 @@
 PRGNAM="syslog-ng"
-VERSION="3.10.1"
+VERSION="3.35.1"
 HOMEPAGE="https://www.balabit.com/"
-DOWNLOAD="https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.10.1/syslog-ng-3.10.1.tar.gz"
-MD5SUM="1b50516783d6d1814cad1fe940c698ef"
+DOWNLOAD="https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.35.1/syslog-ng-3.35.1.tar.gz"
+MD5SUM="0dd5f5cf3a1ff02190f198903cc96229"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README% eventlog"
diff --git a/system/system76-io-dkms/README b/system/system76-io-dkms/README
index 66dbcbc7b9..b89e1a734f 100644
--- a/system/system76-io-dkms/README
+++ b/system/system76-io-dkms/README
@@ -1,17 +1,18 @@
-DKMS module for controlling System76 Io board.
+DKMS module for controlling the System76 Io board, which is used in
+System76's Thelio desktop line.
 
-This kernel module enables reading/controlling the fan speed of fans plugged
-into the System76 Io board on Thelio desktops.
+This driver provides hwmon interfaces for fan control, and tells the Io
+board when the system is suspending. Decisions on fan speeds are made in
+system76-power.
 
 To ensure loading of the system76-io kernel module, you may need to add
 modprobe system76-io
 to /etc/rc.d/rc.modules.local.
 
-See system76-power (available on SBo) for a daemon to control the fan speed.
-
 The system76-io dkms module is automatically registered with dkms by
 doinst.sh with the following command:
+
 dkms install system76-io/$VER
 
-Old versions of system76-io should be manually unregistered from dkms using:
-dkms remove system76-io/$OLD_VER --all
+A douninst.sh script is included which calls "dkms remove" to delete all
+kernel versions of the old module on package removal or upgrade.
diff --git a/system/system76-io-dkms/doinst.sh b/system/system76-io-dkms/doinst.sh
index 6b33ed6c28..e7dbe2df63 100644
--- a/system/system76-io-dkms/doinst.sh
+++ b/system/system76-io-dkms/doinst.sh
@@ -1,7 +1,5 @@
 VER=@MODULE_VERSION@
 dkms install system76-io/$VER
 
-# Before removing the system76-io package, the following command should
-# be run to unregister the module from dkms:
-#
-# dkms remove system76-io/$VER --all
+# Copy a backup of dkms.conf for module removal by douninst.sh.
+cp usr/src/system76-io-$VER/dkms.conf etc/dkms/system76-io-$VER.conf
diff --git a/system/system76-io-dkms/douninst.sh b/system/system76-io-dkms/douninst.sh
new file mode 100644
index 0000000000..9a5a1e16a0
--- /dev/null
+++ b/system/system76-io-dkms/douninst.sh
@@ -0,0 +1,6 @@
+VER=@MODULE_VERSION@
+CONF=etc/dkms/system76-io-$VER.conf
+if [ -r $CONF ]; then
+    dkms remove system76-io/$VER --all -c $CONF
+    rm $CONF
+fi
diff --git a/system/system76-io-dkms/system76-io-dkms.SlackBuild b/system/system76-io-dkms/system76-io-dkms.SlackBuild
index 3b9dead3d7..650181521a 100644
--- a/system/system76-io-dkms/system76-io-dkms.SlackBuild
+++ b/system/system76-io-dkms/system76-io-dkms.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for system76-io-dkms
 
-# Copyright 2019 Erich Ritz, Scottsdale, Arizona, USA
+# Copyright 2019,2021,2023 Erich Ritz, Jenks, Oklahoma, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=system76-io-dkms
 MODNAM=system76-io
-VERSION=${VERSION:-1.0.1}
+VERSION=${VERSION:-1.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,7 +74,7 @@ cp -a \
   $PKG/usr/src/$MODNAM-$VERSION
 
 # Edit and install dkms configuration
-sed "s/@MODULE_VERSION@/${VERSION}/" "debian/system76-io-dkms.dkms" > "$PKG/usr/src/$MODNAM-$VERSION/dkms.conf"
+sed "s/#MODULE_VERSION#/${VERSION}/" "debian/system76-io-dkms.dkms" > "$PKG/usr/src/$MODNAM-$VERSION/dkms.conf"
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -78,6 +85,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 sed "s/@MODULE_VERSION@/${VERSION}/" "$CWD/doinst.sh" > "$PKG/install/doinst.sh"
+sed "s/@MODULE_VERSION@/${VERSION}/" "$CWD/douninst.sh" > "$PKG/install/douninst.sh"
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/system76-io-dkms/system76-io-dkms.info b/system/system76-io-dkms/system76-io-dkms.info
index e4d59ba66a..183a22e730 100644
--- a/system/system76-io-dkms/system76-io-dkms.info
+++ b/system/system76-io-dkms/system76-io-dkms.info
@@ -1,8 +1,8 @@
 PRGNAM="system76-io-dkms"
-VERSION="1.0.1"
+VERSION="1.0.3"
 HOMEPAGE="https://github.com/pop-os/system76-io-dkms"
-DOWNLOAD="https://github.com/pop-os/system76-io-dkms/archive/1.0.1/system76-io-dkms-1.0.1.tar.gz"
-MD5SUM="7b78b9397bac972ebe4503262fea33c4"
+DOWNLOAD="https://github.com/pop-os/system76-io-dkms/archive/1.0.3/system76-io-dkms-1.0.3.tar.gz"
+MD5SUM="aba6c7c14ff0b35ab99f3289e6acb3ac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dkms"
diff --git a/system/system76-power/README b/system/system76-power/README
index 6e1f40fa8f..75056a5fdf 100644
--- a/system/system76-power/README
+++ b/system/system76-power/README
@@ -14,12 +14,12 @@ The system76-power daemon log messages are logged to
 /var/log/system76-power.log by default.  Logging can be disabled by
 setting LOG_FILE=/dev/null in /etc/rc.d/rc.system76-power.
 
-This project is pinned to a specific Rust version, currently 1.41.0.  As
+This project is pinned to a specific Rust version, currently 1.70.0.  As
 such, rustup is a compile time only dependency.  If this specific
 version of the Rust toolchain is not already installed, it will be
 downloaded and installed automatically during build script execution.
 It can be installed manually beforehand by running
-  rustup toolchain install 1.41.0
+  rustup toolchain install 1.70.0
 
 NOTE: The directions in rustup's README must be followed so that the
 rust installed by rustup is preferred over the system rust.
diff --git a/system/system76-power/fix_groups.patch b/system/system76-power/fix_groups.patch
new file mode 100644
index 0000000000..5773d1cb53
--- /dev/null
+++ b/system/system76-power/fix_groups.patch
@@ -0,0 +1,22 @@
+diff --git a/data/com.system76.PowerDaemon.conf b/data/com.system76.PowerDaemon.conf
+index 335981c..1705b0c 100644
+--- a/data/com.system76.PowerDaemon.conf
++++ b/data/com.system76.PowerDaemon.conf
+@@ -6,17 +6,9 @@
+         <allow send_destination="com.system76.PowerDaemon"/>
+         <allow receive_sender="com.system76.PowerDaemon"/>
+     </policy>
+-    <policy group="sudo">
+-        <allow send_destination="com.system76.PowerDaemon"/>
+-        <allow receive_sender="com.system76.PowerDaemon"/>
+-    </policy>
+     <policy user="root">
+         <allow own="com.system76.PowerDaemon"/>
+         <allow send_destination="com.system76.PowerDaemon"/>
+         <allow receive_sender="com.system76.PowerDaemon"/>
+     </policy>
+-    <policy user="gnome-initial-setup">
+-        <allow send_destination="com.system76.PowerDaemon"/>
+-        <allow receive_sender="com.system76.PowerDaemon"/>
+-    </policy>
+ </busconfig>
diff --git a/system/system76-power/nvme_temp.patch b/system/system76-power/nvme_temp.patch
new file mode 100644
index 0000000000..c0531cd38a
--- /dev/null
+++ b/system/system76-power/nvme_temp.patch
@@ -0,0 +1,135 @@
+diff --git a/src/fan.rs b/src/fan.rs
+index 03fdadd..4b3db3b 100644
+--- a/src/fan.rs
++++ b/src/fan.rs
+@@ -23,9 +23,11 @@ pub enum FanDaemonError {
+ 
+ pub struct FanDaemon {
+     curve:             FanCurve,
++    curve_nvme:        FanCurve,
+     amdgpus:           Vec<HwMon>,
+     platforms:         Vec<HwMon>,
+     cpus:              Vec<HwMon>,
++    nvmes:             Vec<HwMon>,
+     nvidia_exists:     bool,
+     displayed_warning: Cell<bool>,
+ }
+@@ -41,9 +43,11 @@ impl FanDaemon {
+                 "thelio-massive-b1" => FanCurve::xeon(),
+                 _ => FanCurve::standard(),
+             },
++            curve_nvme: FanCurve::nvme(),
+             amdgpus: Vec::new(),
+             platforms: Vec::new(),
+             cpus: Vec::new(),
++            nvmes: Vec::new(),
+             nvidia_exists,
+             displayed_warning: Cell::new(false),
+         };
+@@ -60,6 +64,7 @@ impl FanDaemon {
+         self.amdgpus.clear();
+         self.platforms.clear();
+         self.cpus.clear();
++        self.nvmes.clear();
+ 
+         for hwmon in HwMon::all().map_err(FanDaemonError::HwmonDevices)? {
+             if let Ok(name) = hwmon.name() {
+@@ -70,6 +75,7 @@ impl FanDaemon {
+                     "system76" => (), // TODO: Support laptops
+                     "system76_io" | "system76_thelio_io" => self.platforms.push(hwmon),
+                     "coretemp" | "k10temp" => self.cpus.push(hwmon),
++                    "nvme" => self.nvmes.push(hwmon),
+                     _ => (),
+                 }
+             }
+@@ -83,6 +89,10 @@ impl FanDaemon {
+             return Err(FanDaemonError::CpuHwmonNotFound);
+         }
+ 
++        if self.nvmes.is_empty() {
++            // No error.
++        }
++
+         Ok(())
+     }
+ 
+@@ -128,6 +138,25 @@ impl FanDaemon {
+         temp_opt
+     }
+ 
++    /// Get the maximum measured temperature from any NVME on the system, in thousandths of a
++    /// Celsius. Thousandths celsius is the standard Linux hwmon temperature unit.
++    pub fn get_nvme_temp(&self) -> Option<u32> {
++        self
++            .nvmes
++            .iter()
++            .filter_map(|sensor| sensor.temp(1).ok())
++            .filter_map(|temp| temp.input().ok())
++            .fold(None, |mut temp_opt, input| {
++                // Assume temperatures are always above freezing
++                if temp_opt.map_or(true, |x| input as u32 > x) {
++                    log::debug!("highest hwmon nvme temp: {}", input);
++                    temp_opt = Some(input as u32);
++                }
++
++                temp_opt
++            })
++    }
++
+     /// Get the correct duty cycle for a temperature in thousandths Celsius, from 0 to 255
+     /// Thousandths celsius is the standard Linux hwmon temperature unit
+     /// 0 to 255 is the standard Linux hwmon pwm unit
+@@ -137,6 +166,15 @@ impl FanDaemon {
+             .map(|duty| (((u32::from(duty)) * 255) / 10_000) as u8)
+     }
+ 
++    /// Get the correct duty cycle for an NVME temperature in thousandths Celsius, from 0 to 255
++    /// Thousandths celsius is the standard Linux hwmon temperature unit
++    /// 0 to 255 is the standard Linux hwmon pwm unit
++    pub fn get_nvme_duty(&self, temp: u32) -> Option<u8> {
++        self.curve_nvme
++            .get_duty((temp / 10) as i16)
++            .map(|duty| (((u32::from(duty)) * 255) / 10_000) as u8)
++    }
++
+     /// Set the current duty cycle, from 0 to 255
+     /// 0 to 255 is the standard Linux hwmon pwm unit
+     pub fn set_duty(&self, duty_opt: Option<u8>) {
+@@ -159,7 +197,20 @@ impl FanDaemon {
+     /// Calculate the correct duty cycle and apply it to all fans
+     pub fn step(&mut self) {
+         if let Ok(()) = self.discover() {
+-            self.set_duty(self.get_temp().and_then(|temp| self.get_duty(temp)));
++            self.set_duty({
++                let cpu_duty = self.get_temp().and_then(|temp| self.get_duty(temp));
++                log::debug!("cpu duty: {:?}", cpu_duty);
++                if self.nvmes.is_empty() {
++                    cpu_duty
++                } else {
++                    let nvme_duty = self.get_nvme_temp().and_then(|temp| self.get_nvme_duty(temp));
++                    log::debug!("nvme duty: {:?}", nvme_duty);
++                    match(cpu_duty, nvme_duty) {
++                        (Some(cpu_duty), Some(nvme_duty)) => Some(cmp::max(cpu_duty, nvme_duty)),
++                        _ => None,
++                    }
++                }
++            });
+         }
+     }
+ }
+@@ -282,6 +333,15 @@ impl FanCurve {
+             .append(78_00, 100_00)
+     }
+ 
++    /// Fan curve for NVME drives
++    pub fn nvme() -> Self {
++        Self::default()
++            .append(00_00, 00_00)
++            .append(60_00, 00_00)
++            .append(65_00, 70_00)
++            .append(68_00, 100_00)
++    }
++
+     pub fn get_duty(&self, temp: i16) -> Option<u16> {
+         // If the temp is less than the first point, return the first point duty
+         if let Some(first) = self.points.first() {
diff --git a/system/system76-power/system76-power.SlackBuild b/system/system76-power/system76-power.SlackBuild
index 4eafea3ea1..ba3303aa2f 100644
--- a/system/system76-power/system76-power.SlackBuild
+++ b/system/system76-power/system76-power.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for system76-power
 
-# Copyright 2019-2020 Erich Ritz, Scottsdale, Arizona, USA
+# Copyright 2019-2024 Erich Ritz, Jenks, Oklahoma, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,22 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Warning from SlackBuilds.org: the download URLs are
+# incorrect. They work OK when using a client that doesn't respect the
+# Content-disposition header (e.g. wget in its default config), but
+# they'll break with clients that do respect it.
+#
+# 20220301 etr: Fix script to work with Content-disposition-safe download URL.
+# Bit hackish, but it works.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=system76-power
-VERSION=${VERSION:-1.1.11}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.1.25_fc8eb49}
+SRCVER=${SRCVER:-fc8eb49fae5222da56dcfa414ef2b190e9f870c7}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -33,15 +45,19 @@ if [ -z "$ARCH" ]; then
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
+fi
 
-  if [ "$ARCH" = "i586" ]; then
-    if rustc -Vv | grep host | grep i686 > /dev/null ; then
-      ARCH=i686
-    fi
-  fi
+case "$ARCH" in
+  x86_64) ;;
+  arm*) ;;
+  *) echo "Unsupported ARCH '$ARCH'"; exit 1 ;;
+esac
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,111 +81,63 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-if [ -e $CWD/$VERSION.tar.gz ]; then
-  tar xvf $CWD/$VERSION.tar.gz
-else
-  tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-fi
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
 
 # build offline
 # configuration tells cargo to use the configured directory
 # for dependencies intead of downloading from crates.io
 mkdir .cargo
-cat << EOF >> .cargo/config
+cat << EOF >> .cargo/config.toml
+[source]
 [source.crates-io]
 replace-with = "vendored-sources"
 
 [source."https://github.com/pop-os/sysfs-class"]
 git = "https://github.com/pop-os/sysfs-class"
-branch = "master"
 replace-with = "vendored-sources"
 
 [source.vendored-sources]
-directory = "$(pwd)/vendor"
+directory = "vendor"
 EOF
 
-mkdir vendor
 # deps and versions come from Cargo.lock
+mkdir vendor
 (
   cd vendor
 
-  for dependency in \
-      ansi_term=0.11.0 \
-      atty=0.2.14 \
-      autocfg=1.0.1 \
-      bitflags=1.2.1 \
-      bytes=0.5.6 \
-      cc=1.0.59 \
-      cfg-if=0.1.10 \
-      chrono=0.4.15 \
-      clap=2.33.3 \
-      dbus=0.8.4 \
-      err-derive=0.2.4 \
-      fern=0.6.0 \
-      fuchsia-zircon=0.3.3 \
-      fuchsia-zircon-sys=0.3.3 \
-      futures-core=0.3.5 \
-      hermit-abi=0.1.15 \
-      hidapi=1.2.3 \
-      inotify=0.8.3 \
-      inotify-sys=0.1.3 \
-      intel-pstate=0.2.1 \
-      iovec=0.1.4 \
-      kernel32-sys=0.2.2 \
-      lazy_static=1.4.0 \
-      libc=0.2.76 \
-      libdbus-sys=0.2.1 \
-      log=0.4.11 \
-      mio=0.6.22 \
-      miow=0.2.1 \
-      net2=0.2.34 \
-      num-integer=0.1.43 \
-      num-traits=0.2.12 \
-      numtoa=0.2.3 \
-      pin-project-lite=0.1.7 \
-      pkg-config=0.3.18 \
-      proc-macro-error=1.0.4 \
-      proc-macro-error-attr=1.0.4 \
-      proc-macro2=1.0.19 \
-      quote=1.0.7 \
-      rustversion=1.0.3 \
-      slab=0.4.2 \
-      smart-default=0.6.0 \
-      strsim=0.8.0 \
-      syn=1.0.39 \
-      synstructure=0.12.4 \
-      sysfs-class=0.1.3 \
-      textwrap=0.11.0 \
-      time=0.1.44 \
-      tokio=0.2.22 \
-      unicode-width=0.1.8 \
-      unicode-xid=0.2.1 \
-      vec_map=0.8.2 \
-      vergen=3.1.0 \
-      version_check=0.9.2 \
-      wasi=0.10.0+wasi-snapshot-preview1 \
-      winapi=0.2.8 \
-      winapi=0.3.9 \
-      winapi-build=0.1.1 \
-      winapi-i686-pc-windows-gnu=0.4.0 \
-      winapi-x86_64-pc-windows-gnu=0.4.0 \
-      ws2_32-sys=0.2.1; do
-
-    dep="$(echo "$dependency" | cut -d= -f1)"
-    ver="$(echo "$dependency" | cut -d= -f2)"
-
-    if [ -e $CWD/$dep-$ver.crate ]; then
-        CRATE_FILE=$CWD/$dep-$ver.crate
+  grep -h -A 4 "\[\[package\]\]" \
+      $(find "../" -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
+      sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
+      awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4, $5 }' | \
+      sed 's/"//g;s/name=//;s/ version=/=/' | \
+      grep " source=" | \
+      sed 's/ dependencies=.*$//' | \
+      sed 's/ source=[^ ]*//' | \
+      sed 's/ checksum=/=/' | \
+      sort -u | \
+      while read -r dep ; do
+
+    cksum="$(printf "%s\n" "$dep" | cut -d= -f3)"
+    ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
+    dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
+
+    CRATE_FILE=$CWD/$dep-$ver.crate
+
+    if [ -z "$cksum" ] ; then
+      if [ "$dep" = "sysfs-class" ] ; then
+        CRATE_FILE=$CWD/pop-os-sysfs-class-0.1.3-1-gab63e7f.tar.gz
+      fi
+      mkdir $dep-$ver
+      if [ "$dep" = "sysfs-class" ] ; then
+        CRATE_FILE=$CWD/pop-os-$dep-$ver-1-gab63e7f.tar.gz
+      fi
+      tar xvf $CRATE_FILE -C $dep-$ver --strip-components=1
+      cksum="null"
     else
-        if [ -e $CWD/$ver.tar.gz ]; then
-            CRATE_FILE=$CWD/$ver.tar.gz
-        else
-            CRATE_FILE=$CWD/$dep-$ver.tar.gz
-        fi
+      tar xvf $CRATE_FILE
     fi
-    tar xvf $CRATE_FILE
 
     touch $dep-$ver/.cargo-ok
 
@@ -184,16 +152,10 @@ mkdir vendor
       ) | sed '$ s/,$//'
 
       printf "    },\n"
-      printf '    "package": "'
-
-      sha256sum "$CRATE_FILE" | cut -f1 -d' ' | sed 's/$/"/'
+      printf '    "package": "%s"'  "$cksum"
 
       printf "}\n"
-    } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json
-    # Change selected package checksums to null
-    if [ "$dep" == "sysfs-class" ] ; then
-        sed -i 's/"package" : ".\{64\}"/"package" : null/' $dep-$ver/.cargo-checksum.json
-    fi
+    } | python3 -c "import sys, json; data = sys.stdin.read(); print (json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : ')))" > $dep-$ver/.cargo-checksum.json
   done
 )
 
@@ -204,15 +166,24 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Prevent syslog messasge 'Unknown group "sudo" in message bus configuration file'.
+patch -p1 < $CWD/fix_groups.patch
+# Prevent CPU from overheating
+patch -p1 < $CWD/xeon_fan_curve.patch
+# Prevent NVMe U.2 SSD from overheating
+patch -p1 < $CWD/nvme_temp.patch
+
+export CARGO_HOME=.cargo
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-libdir=/usr/lib${LIBDIRSUFFIX} \
 make
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+rm -rf $PKG/usr/lib
 mkdir -p $PKG/etc/logrotate.d $PKG/etc/rc.d
 install -m 0644 $CWD/config/system76-power.logrotate $PKG/etc/logrotate.d/system76-power.new
 install -m 0644 $CWD/config/rc.system76-power $PKG/etc/rc.d/rc.system76-power.new
@@ -226,4 +197,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/system76-power/system76-power.info b/system/system76-power/system76-power.info
index 4d8860281d..2aac307a27 100644
--- a/system/system76-power/system76-power.info
+++ b/system/system76-power/system76-power.info
@@ -1,130 +1,188 @@
 PRGNAM="system76-power"
-VERSION="1.1.11"
+VERSION="1.1.25_fc8eb49"
 HOMEPAGE="https://github.com/pop-os/system76-power"
-DOWNLOAD="https://github.com/pop-os/system76-power/archive/1.1.11/system76-power-1.1.11.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/bytes/bytes-0.5.6.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.59.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.15.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/dbus/dbus-0.8.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/err-derive/err-derive-0.2.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fern/fern-0.6.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon/fuchsia-zircon-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon-sys/fuchsia-zircon-sys-0.3.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-core/futures-core-0.3.5.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.15.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/hidapi/hidapi-1.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/inotify/inotify-0.8.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/inotify-sys/inotify-sys-0.1.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/intel-pstate/intel-pstate-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/iovec/iovec-0.1.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/kernel32-sys/kernel32-sys-0.2.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.76.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libdbus-sys/libdbus-sys-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.11.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/mio/mio-0.6.22.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/miow/miow-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/net2/net2-0.2.34.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.43.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.12.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/numtoa/numtoa-0.2.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-project-lite/pin-project-lite-0.1.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.18.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-error/proc-macro-error-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-error-attr/proc-macro-error-attr-1.0.4.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.19.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.7.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/rustversion/rustversion-1.0.3.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/slab/slab-0.4.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/smart-default/smart-default-0.6.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.39.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/synstructure/synstructure-0.12.4.crate \
-          https://github.com/pop-os/sysfs-class/archive/0.1.3/sysfs-class-0.1.3.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.44.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio/tokio-0.2.22.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/vergen/vergen-3.1.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.2.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.10.0+wasi-snapshot-preview1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.2.8.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-build/winapi-build-0.1.1.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/ws2_32-sys/ws2_32-sys-0.2.1.crate"
-MD5SUM="6124c0467008e4e3c9cd1466fca70479 \
-        294a49d3c53865fa7ac5d0ce2f5d5735 \
-        142cb4b9a653e56e56311f0c883b8582 \
-        c6443ec8d007c729ba5482008d0c864d \
-        6799c26a7eacaf8e58d3e45c6c5add89 \
-        d123f33f646e37ca5b825ea6eb2dd150 \
-        1e6c2fa88c44a0822243fee42526719b \
-        882dbbc613a93f64c3709b0a2bd0d6dc \
-        a47dd336c3099e7986f926b48c64ec6a \
-        bc79e0eb364df515a33755ac9a581cfd \
-        ff4619d1e15ab5c4ca25d549589f1046 \
-        9d53a61cdf8af705fd38cc26481b610d \
-        9bb99bc31c32da009e64621f4c635748 \
-        dd7c80c2d04d2e9ceba82826cf69764d \
-        54cfab480b7a5f7302eadf44129d3f4b \
-        4554d3a0b77373fba853c413f30d6f59 \
-        9e4eacf58977b54f76be2b80d7d3b776 \
-        c5287d42ccd4b81389cc8c08939b0218 \
-        e7696ea7bac5b2d62b5306498960430b \
-        50929c2de8a472031f43c9fc371f2111 \
-        1c4f7ad251632c854fa67dc1f1f314e3 \
-        f1c40b9836035b69e464df711a1d2950 \
-        9d033cc2daa6924420a4a89e6705773f \
-        fba3b040a55c01be7376d3dd5c4d4920 \
-        1e624bdaaecfb8c58f030d6adf405c04 \
-        78e11acb853ee9a9c1b905e209b33d4a \
-        f50d2e280b4a3491fffda43b90982544 \
-        e820082de1cf13e1111d2acbae898fcc \
-        a82e0b9efe7f6385071c9fd9b3bccfa3 \
-        683a998da434a7ff8558bdf6eaa7b8c7 \
-        759816fe5b617674ae5dee83e3c3e6e2 \
-        2daa59d0efd38e9b5fbb2658b080eaa1 \
-        28a4e2e962d9723f131cdd5acb140b6d \
-        62e9fc18f293722fdded066f34714585 \
-        0c860c0d0fa0dde03bd6be862fb1b6b4 \
-        6a32bab57772c3a1146d599b65ffb0cb \
-        7d76a523677de261dda1b65d29a93c4e \
-        2e821a99ce8067bee8c1007c07a5d1e8 \
-        63b29211eef9ccee0b0401d423db0efd \
-        322ae19fb8b0ec961b1168bab243c08a \
-        c7bfa89e6da163f1474bb3787987bb12 \
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/pop-os/system76-power/archive/fc8eb49/system76-power-fc8eb49fae5222da56dcfa414ef2b190e9f870c7.tar.gz \
+          https://github.com/pop-os/sysfs-class/tarball/ab63e7f638aadfaf896a02e53cf330343d331337/pop-os-sysfs-class-0.1.3-1-gab63e7f.tar.gz \
+          https://static.crates.io/crates/anstream/anstream-0.3.2.crate \
+          https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.0.crate \
+          https://static.crates.io/crates/anstyle-query/anstyle-query-1.0.0.crate \
+          https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-1.0.1.crate \
+          https://static.crates.io/crates/anstyle/anstyle-1.0.0.crate \
+          https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \
+          https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \
+          https://static.crates.io/crates/cc/cc-1.0.79.crate \
+          https://static.crates.io/crates/clap/clap-4.3.4.crate \
+          https://static.crates.io/crates/clap_builder/clap_builder-4.3.4.crate \
+          https://static.crates.io/crates/clap_derive/clap_derive-4.3.2.crate \
+          https://static.crates.io/crates/clap_lex/clap_lex-0.5.0.crate \
+          https://static.crates.io/crates/colorchoice/colorchoice-1.0.0.crate \
+          https://static.crates.io/crates/concat-in-place/concat-in-place-1.1.0.crate \
+          https://static.crates.io/crates/darling/darling-0.20.1.crate \
+          https://static.crates.io/crates/darling_core/darling_core-0.20.1.crate \
+          https://static.crates.io/crates/darling_macro/darling_macro-0.20.1.crate \
+          https://static.crates.io/crates/dbus-crossroads/dbus-crossroads-0.5.2.crate \
+          https://static.crates.io/crates/dbus-tokio/dbus-tokio-0.7.6.crate \
+          https://static.crates.io/crates/dbus/dbus-0.9.7.crate \
+          https://static.crates.io/crates/derive_setters/derive_setters-0.1.6.crate \
+          https://static.crates.io/crates/errno-dragonfly/errno-dragonfly-0.1.2.crate \
+          https://static.crates.io/crates/errno/errno-0.3.1.crate \
+          https://static.crates.io/crates/fern/fern-0.6.2.crate \
+          https://static.crates.io/crates/fnv/fnv-1.0.7.crate \
+          https://static.crates.io/crates/futures-channel/futures-channel-0.3.28.crate \
+          https://static.crates.io/crates/futures-core/futures-core-0.3.28.crate \
+          https://static.crates.io/crates/futures-executor/futures-executor-0.3.28.crate \
+          https://static.crates.io/crates/futures-io/futures-io-0.3.28.crate \
+          https://static.crates.io/crates/futures-macro/futures-macro-0.3.28.crate \
+          https://static.crates.io/crates/futures-sink/futures-sink-0.3.28.crate \
+          https://static.crates.io/crates/futures-task/futures-task-0.3.28.crate \
+          https://static.crates.io/crates/futures-util/futures-util-0.3.28.crate \
+          https://static.crates.io/crates/futures/futures-0.3.28.crate \
+          https://static.crates.io/crates/heck/heck-0.4.1.crate \
+          https://static.crates.io/crates/hermit-abi/hermit-abi-0.3.1.crate \
+          https://static.crates.io/crates/hidapi/hidapi-1.5.0.crate \
+          https://static.crates.io/crates/ident_case/ident_case-1.0.1.crate \
+          https://static.crates.io/crates/inotify-sys/inotify-sys-0.1.5.crate \
+          https://static.crates.io/crates/inotify/inotify-0.10.1.crate \
+          https://static.crates.io/crates/intel-pstate/intel-pstate-1.0.1.crate \
+          https://static.crates.io/crates/io-lifetimes/io-lifetimes-1.0.11.crate \
+          https://static.crates.io/crates/is-terminal/is-terminal-0.4.7.crate \
+          https://static.crates.io/crates/itoa/itoa-1.0.6.crate \
+          https://static.crates.io/crates/libc/libc-0.2.146.crate \
+          https://static.crates.io/crates/libdbus-sys/libdbus-sys-0.2.5.crate \
+          https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.3.8.crate \
+          https://static.crates.io/crates/log/log-0.4.19.crate \
+          https://static.crates.io/crates/memchr/memchr-2.5.0.crate \
+          https://static.crates.io/crates/mio/mio-0.8.8.crate \
+          https://static.crates.io/crates/numtoa/numtoa-0.2.4.crate \
+          https://static.crates.io/crates/once_cell/once_cell-1.18.0.crate \
+          https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.9.crate \
+          https://static.crates.io/crates/pin-utils/pin-utils-0.1.0.crate \
+          https://static.crates.io/crates/pkg-config/pkg-config-0.3.27.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.60.crate \
+          https://static.crates.io/crates/quote/quote-1.0.28.crate \
+          https://static.crates.io/crates/rustix/rustix-0.37.20.crate \
+          https://static.crates.io/crates/ryu/ryu-1.0.13.crate \
+          https://static.crates.io/crates/serde/serde-1.0.164.crate \
+          https://static.crates.io/crates/serde_derive/serde_derive-1.0.164.crate \
+          https://static.crates.io/crates/serde_json/serde_json-1.0.96.crate \
+          https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.4.1.crate \
+          https://static.crates.io/crates/slab/slab-0.4.8.crate \
+          https://static.crates.io/crates/smart-default/smart-default-0.6.0.crate \
+          https://static.crates.io/crates/socket2/socket2-0.4.9.crate \
+          https://static.crates.io/crates/strsim/strsim-0.10.0.crate \
+          https://static.crates.io/crates/syn/syn-1.0.109.crate \
+          https://static.crates.io/crates/syn/syn-2.0.18.crate \
+          https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.40.crate \
+          https://static.crates.io/crates/thiserror/thiserror-1.0.40.crate \
+          https://static.crates.io/crates/tokio-macros/tokio-macros-2.1.0.crate \
+          https://static.crates.io/crates/tokio/tokio-1.28.2.crate \
+          https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.9.crate \
+          https://static.crates.io/crates/utf8parse/utf8parse-0.2.1.crate \
+          https://static.crates.io/crates/wasi/wasi-0.11.0+wasi-snapshot-preview1.crate \
+          https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi/winapi-0.3.9.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.48.0.crate \
+          https://static.crates.io/crates/windows-targets/windows-targets-0.48.0.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.48.0.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.48.0.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.48.0.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.48.0.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.48.0.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.48.0.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.0.crate"
+MD5SUM_x86_64="dc76a1933efe5cc7b29bf038376bcb60 \
+        864d84ec428600e74b322b01d0d9040c \
+        fefa6f663a171d17cd210af8a8cf979d \
+        aea9df8755bcb59733b1be84252ffd00 \
+        d2453c99c7af98286c2dc9017a8dba6d \
+        d303b3d9c077ff67b2ae93e7354830cf \
+        285e1a0d21d8078099686654ad13235a \
+        05d77ef52e90ad161fdd41b252420467 \
+        a295edb6953237ebbdfa8e731229f9a3 \
+        7d83f411bb22318c65fec8bbee937ece \
+        1b4f420f92f4ef2bab6f00dee3626de6 \
+        f76d8a8006d0bf162c9f36a434476c45 \
+        b2ddb7066ebce14862707f98be002c6d \
+        174448468cf3c9ccffd07dddd68df964 \
+        010f6d0e98cc2a2b99907a23c6cd6bbc \
+        a9bbef8e965372f310b1187ed99a9ebf \
+        96c0b4f4f9c2cf5b997e62fc36deebd4 \
+        0978758ab068cf97fb551ff08d5c64eb \
+        fe60ae14723027a32978b7afd45dd87e \
+        2547929b1e53593dbad1729791feb6c6 \
+        7ef916a17b87cf35a7e7fac44bb20390 \
+        b170c380ee4d59e4ed866afaa26a86c7 \
+        878ece459543004969e42906a59bb848 \
+        fc65414dcac661c46f2cfad7722304f9 \
+        b21aa70c76c22f8936338797372236bf \
+        90dd7e5de8d668d26234ac4e308ef6a2 \
+        8dab3b3ec00dc56cffde0b0c410d47b5 \
+        378bd2c8eb6adcc1a837558e1927e1eb \
+        b2458958308a0923a65777b9297bf11a \
+        2399b8b3b39b993d8e44d2fc1628663c \
+        6052db16e7627061500931e7f53b0128 \
+        3f798ffba5e1f1ec5ad2df0afd1f76f8 \
+        3e2c0b885f7430e02dd6df1f8c626bc7 \
+        83e4c4337a8dac395b19ebcb8e3136a7 \
+        7ee7fac47a513e4f7e44c66195ad8051 \
+        10764f40bd10141d9f12920d7cfa123c \
+        b92fa50f56a1e06a7f1bf665442d4a73 \
+        c9fa9187985880eb320b350bd9024510 \
+        109da42b31a8942bc91555ad6c4ed6a5 \
+        fe77a3f609b6fd8d5b08f3b2ef14d2ad \
+        639af0cca65c012e6a028acfb657e417 \
+        cb2673febef851f50e1a5e2eccb32eae \
+        2462165e077d8a663e36d1fc030d3afe \
+        c6612f34c3ee98ced239da95fbede236 \
+        d2920a948e00e7c077883cebba898847 \
+        ffbab2186e43af074b619d6d8bfe3566 \
+        84a3fa6d10e58bddb269d653a1d1735f \
+        fd05e11da4cc641616b87a31223645bd \
+        18fa61f2d92d4df309c67cb3f3197987 \
+        bcaebb6074616f470c9f80e42406836f \
+        94b8bf179385ff071bdc33b58bf047c0 \
+        c2fcb0d833f465037c91bfeb3f1cefc8 \
+        6361a447cdbc285fce46c8a090428167 \
+        2dc8aacabbc090f8025a4789d4d6d8f0 \
+        ce6dde2ea2691fdd97632fb8c9b3e042 \
+        07c75fec267864bcbb800ca7709ceae2 \
+        73d4dff694f3acab34c217b4f4943a37 \
+        1428169df4dd87209e7c0645616da82c \
+        a44fba1024d0f9892cc5a41e9ca5cfdb \
+        83dd589ed909edec46fa36663d468485 \
+        853888e375addadf7e85c8499e0745d3 \
+        cea43537c5f6a3adf886a49814e3ff75 \
+        fa6cd406107683737b6525dcf3d90f39 \
+        f4e16ed6fedc75de9647dee3ff4d3967 \
+        22e95901b912671da26457ac33e36a23 \
+        cf636206d0c3287ce209551fc5b02d88 \
         26b4ac1432c227434bc943817f42872e \
-        781d4ccf5d04c98fa02af207a9639249 \
-        acc287a32cea7e35d5d35207a1c9e14a \
-        09f09b3f56045183393726a31d8a0192 \
-        80ca0de72168dc03e90bc3c519153305 \
-        a8de006fe0c7e373c560dd51599287a8 \
-        c6c50e4feea5f4cc4e1fb3c7e88606a5 \
-        4d130fad86abe7c08cddf9275e031bd6 \
-        4272c279b06b88f8b0ffce7109348e27 \
-        a51c43692084979295641a7ffba4b297 \
-        333b4ba3f64c35b6f89b521e8d64548b \
-        63630c8b8aeb092854a6e47f5d6468e1 \
-        8b01b016a9b6deebc1b43f296057efb5 \
-        a312b55a428f827a91097d1d8497b02b \
-        b44489eb4799c4fabac3fceb48de54f7 \
-        0498c4a11448bfc35dc7bb2caa64c753 \
-        c900e7dbce808ff8ced375077b17a163 \
+        4acc1eadff484a737c93592e15b31f8a \
+        82d98dc87dc8503400aa095f5aa70f13 \
+        64d9f46e9ba78f68c30c486be3d8b7df \
+        bd8c0b43f8eda422cfa6b58cca1a5f5b \
+        dd290e713c28d2e565d78eedd471ed78 \
+        ab44b0c93adeb9ee88e1c66555b8e6a7 \
+        8d8246e06d38a79f77e0d82e088474b6 \
+        28423beab35a69836d3d5d6bfa24e1e5 \
+        2e6f3d2a4c7414137fa48dfd73678840 \
+        ceee1159c41351d05f4cf705490867b3 \
+        e972ea58ec203bfa6c79c1207852298b \
         db96b50050277bf05a3c68534bbb9586 \
         09de9d01e7331ff3da11f58be8bef0df \
-        38346bab0933c9eb1e36d22fe4220ba7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        f2797ade0e36f1e5d6be9d11b5076582 \
+        7244738a73643f06df82069d00393ad7 \
+        e8732bb9eec91463ea10020fc16991c1 \
+        3d2bf2e578fe93c538d4f8c5cfddbe9b \
+        631f9e1bcfe18e3976ef4c893ee13531 \
+        f3dad0f67aa70c6618c1593bd2086c36 \
+        085ec81e4ced998bb7f1aea30b7a630e \
+        e24dfcf625e130a1e6db0ae375a17dd7 \
+        2fa0c13b386de68baa17168774b1c5fa"
 REQUIRES="system76-io-dkms rustup %README%"
 MAINTAINER="Erich Ritz"
 EMAIL="erich.public@protonmail.com"
diff --git a/system/system76-power/xeon_fan_curve.patch b/system/system76-power/xeon_fan_curve.patch
new file mode 100644
index 0000000000..4cd1ffe449
--- /dev/null
+++ b/system/system76-power/xeon_fan_curve.patch
@@ -0,0 +1,52 @@
+From 9de22620c8876ddfa15a452d5435405f43e8a1fd Mon Sep 17 00:00:00 2001
+From: Erich Ritz <erich.public@protonmail.com>
+Date: Wed, 23 Mar 2022 08:28:57 -0500
+Subject: [PATCH] Make xeon fan curve more aggressive
+
+I've been suffering from occasional power offs with no warning, and I
+suspect the CPU is getting too hot.  On the most recent power off, the
+computer once again powered down during the bootup phase (before the EFI
+boot screen).  To me this solidified my suspicions.
+
+I have a a thelio-massive-b1 with 2
+Intel(R) Xeon(R) Gold 6238 CPU @ 2.10GHz
+
+I patched the source making the xeon fan curve more aggressive and the
+maximum CPU temperatures are now a little lower.  Under low system load
+there is no noticable difference in fan speed.
+
+Plots of CPU temperature, fan speed, and fan command are attached as
+comments to the commit on GitHub.
+
+Signed-off-by: Erich Ritz <erich.public@protonmail.com>
+---
+ src/fan.rs | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/src/fan.rs b/src/fan.rs
+index c0fca10..73e284c 100644
+--- a/src/fan.rs
++++ b/src/fan.rs
+@@ -271,13 +271,12 @@ impl FanCurve {
+             .append(50_00, 40_00)
+             .append(55_00, 45_00)
+             .append(60_00, 50_00)
+-            .append(65_00, 55_00)
+-            .append(70_00, 60_00)
+-            .append(72_00, 65_00)
+-            .append(74_00, 80_00)
+-            .append(76_00, 85_00)
+-            .append(77_00, 90_00)
+-            .append(78_00, 100_00)
++            .append(62_00, 60_00)
++            .append(64_00, 65_00)
++            .append(66_00, 80_00)
++            .append(68_00, 85_00)
++            .append(69_00, 90_00)
++            .append(70_00, 100_00)
+     }
+ 
+     pub fn get_duty(&self, temp: i16) -> Option<u16> {
+-- 
+2.35.6
+
diff --git a/system/systraq/README b/system/systraq/README
new file mode 100644
index 0000000000..04572ca0d6
--- /dev/null
+++ b/system/systraq/README
@@ -0,0 +1,4 @@
+FileTraq is designed to be run periodically from the root crontab.  Each
+time, it compares a list of system files with the copies that it keeps.
+Any changes are reported in diff or patchfile style, and dated backup
+copies are kept.
diff --git a/system/systraq/doinst.sh b/system/systraq/doinst.sh
new file mode 100644
index 0000000000..0f83faf9dc
--- /dev/null
+++ b/system/systraq/doinst.sh
@@ -0,0 +1,15 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/filetraq.conf.new
+
diff --git a/system/systraq/slack-desc b/system/systraq/slack-desc
new file mode 100644
index 0000000000..ff1a3e632b
--- /dev/null
+++ b/system/systraq/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+systraq: systraq (monitor system files change)
+systraq:
+systraq: FileTraq is designed to be run periodically from the root crontab.
+systraq: Each time, it compares a list of system files with the copies that it
+systraq: keeps.  Any changes are reported in diff or patchfile style, and
+systraq: dated backup copies are kept.
+systraq:
+systraq:
+systraq:
+systraq:
+systraq:
diff --git a/system/systraq/systraq.SlackBuild b/system/systraq/systraq.SlackBuild
new file mode 100644
index 0000000000..8bedbd99c3
--- /dev/null
+++ b/system/systraq/systraq.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# Slackware build script for systraq
+
+# Copyright 2022 Pierre-Philipp Braun, Russia
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=systraq
+VERSION=${VERSION:-0.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM=filetraq-debian-${VERSION}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM/
+tar xvf $CWD/$SRCNAM.tar.gz
+cd $SRCNAM/
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/sbin/
+cp -a filetraq $PKG/usr/sbin/
+
+mkdir -p $PKG/etc/
+cp -a filetraq.conf $PKG/etc/
+
+mkdir -p $PKG/usr/man/man8/
+gzip -9 < debian/filetraq.8 > $PKG/usr/man/man8/filetraq.8.gz
+
+# default folder for filetraq backups
+mkdir -p $PKG/var/lib/filetraq/
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING NEWS README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/systraq/systraq.info b/system/systraq/systraq.info
new file mode 100644
index 0000000000..df2592caaf
--- /dev/null
+++ b/system/systraq/systraq.info
@@ -0,0 +1,10 @@
+PRGNAM="systraq"
+VERSION="0.3"
+HOMEPAGE="https://salsa.debian.org/debian/filetraq"
+DOWNLOAD="https://salsa.debian.org/debian/filetraq/-/archive/debian/0.3/filetraq-debian-0.3.tar.gz"
+MD5SUM="08d2e06d9ddca284512dc837ae4bd400"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Pierre-Philipp Braun"
+EMAIL="pbraun@nethence.com"
diff --git a/system/t1utils/README b/system/t1utils/README
deleted file mode 100644
index 5ff4feb67b..0000000000
--- a/system/t1utils/README
+++ /dev/null
@@ -1,17 +0,0 @@
-t1utils is a collection of simple Type 1 font manipulation programs.  Together,
-they allow you to convert between PFA (ASCII) and PFB (binary) formats,
-disassemble PFA or PFB files into human-readable form, and reassemble them
-into PFA or PFB format.  Additionally you can extract font resources from
-a Macintosh font file (ATM/Laserwriter), or create a Macintosh Type 1 font
-file from a PFA or PFB font.
-
-* t1ascii:  changes PFB (binary) fonts into PFA (ASCII) format
-* t1binary:  goes the opposite direction
-* t1disasm:  translates PFBs or PFAs into a human-readable and -editable format
-* t1asm:  goes the opposite direction
-* t1unmac:  translates a Macintosh Type 1 font into either PFB or PFA format
-* t1mac:  goes the opposite direction
-
-NOTE: You do not need t1utils if you already have texlive installed as it is
-already included there. However, installing it anyway doesn't do any harm
-either.
diff --git a/system/t1utils/slack-desc b/system/t1utils/slack-desc
deleted file mode 100644
index ecbc9472a2..0000000000
--- a/system/t1utils/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-t1utils: t1utils (Type 1 Font Utilities)
-t1utils:
-t1utils: t1utils is a collection of simple Type 1 font manipulation programs.
-t1utils: Together, they allow you to convert between PFA (ASCII) and PFB
-t1utils: (binary) formats, disassemble PFA or PFB files into human-readable
-t1utils: form, and reassemble them into PFA or PFB format.  Additionally you
-t1utils: can extract font resources from a Macintosh font file
-t1utils: (ATM/Laserwriter), or create a Macintosh Type 1 font file from a
-t1utils: PFA or PFB font.
-t1utils:
-t1utils:
diff --git a/system/t1utils/t1utils.SlackBuild b/system/t1utils/t1utils.SlackBuild
deleted file mode 100644
index 5b0176ceb1..0000000000
--- a/system/t1utils/t1utils.SlackBuild
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for t1utils
-
-# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=t1utils
-VERSION=${VERSION:-1.42}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$(uname -m) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM-$VERSION
-OUTPUT=${OUTPUT:-/tmp}
-
-DOCS="INSTALL LICENSE NEWS.md README.md"
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-chmod -R u+w,go-w,a+rX-st .
-
-# -D_GNU_SOURCE is to fix https://github.com/kohler/t1utils/issues/8
-# (Was fixed in 1.42, but keep this workaround to prefer the system memmem.)
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-dependency-tracking \
-  --build=$ARCH-slackware-linux \
-  CFLAGS="$SLKCFLAGS" \
-  CPPFLAGS="-D_GNU_SOURCE" \
-
-make
-make install-strip DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} +
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/t1utils/t1utils.info b/system/t1utils/t1utils.info
deleted file mode 100644
index d1d725aa09..0000000000
--- a/system/t1utils/t1utils.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="t1utils"
-VERSION="1.42"
-HOMEPAGE="https://www.lcdf.org/type/#t1utils"
-DOWNLOAD="https://www.lcdf.org/type/t1utils-1.42.tar.gz"
-MD5SUM="acc4bc832bafbdc059fb3b0cad8c3ab0"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Kyle Guinn"
-EMAIL="elyk03@gmail.com"
diff --git a/system/tabbed/README b/system/tabbed/README
index c694fdb974..8fba968b50 100644
--- a/system/tabbed/README
+++ b/system/tabbed/README
@@ -1,8 +1,8 @@
 tabbed (framework for embeddable apps)
 
-Simple generic tabbed frontend to xembed aware applications, originally
-designed for surf but also usable with many other applications, e.g. st,
-uzbl, urxvt, and xterm.
+Simple generic tabbed frontend to xembed aware applications,
+originally designed for surf but also usable with many other
+applications, e.g. st, uzbl, urxvt, and xterm.
 
 Recommended dependency: dmenu. tabbed is still useful without it, but
 the control-T "new tab" function won't work without it.
@@ -13,5 +13,5 @@ variables. Default size is 800x600. Example:
 
   WIDTH=1024 HEIGHT=768 ./tabbed.SlackBuild
 
-For other customizations, you can create a diff and place it in patches/.
-See README.SBo for details.
+For other customizations, you can create a diff and place it in
+patches/.  See README.SBo for details.
diff --git a/system/tabbed/tabbed.SlackBuild b/system/tabbed/tabbed.SlackBuild
index a1dcf22651..e371454aab 100644
--- a/system/tabbed/tabbed.SlackBuild
+++ b/system/tabbed/tabbed.SlackBuild
@@ -1,21 +1,26 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tabbed
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20221228 bkw: update for 0.7
+
 # 20140826 bkw:
 # - updated for 0.6
 # - add support for patches/. The old 0.4 build had this, but this one
 #   works with simple config patches or the ones from suckless.org
 # - mention dmenu in the README
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tabbed
-VERSION=${VERSION:-0.6}
+VERSION=${VERSION:-0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -25,7 +30,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -53,11 +62,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
  
 # Apply any patches the user might have added. This is more complex
 # than usual because we want to detect whether each patch needs -p0
@@ -79,6 +85,9 @@ for i in $( ls $CWD/patches ); do
   patch -p$p < $diff
 done
 
+# upstream forgot this man page, apparently
+sed -i '/xembed\.1/d' Makefile
+
 sed -i \
   -e 's,share/man,man,' \
   -e 's,usr/local,usr/,' \
@@ -97,11 +106,11 @@ make install DESTDIR=$PKG
 gzip -9 $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tabbed/tabbed.info b/system/tabbed/tabbed.info
index b76f56ab5c..01ab6938eb 100644
--- a/system/tabbed/tabbed.info
+++ b/system/tabbed/tabbed.info
@@ -1,10 +1,10 @@
 PRGNAM="tabbed"
-VERSION="0.6"
+VERSION="0.7"
 HOMEPAGE="https://tools.suckless.org/tabbed/"
-DOWNLOAD="https://dl.suckless.org/tools/tabbed-0.6.tar.gz"
-MD5SUM="7898992feb9358e0196119750b77b42c"
+DOWNLOAD="https://dl.suckless.org/tools/tabbed-0.7.tar.gz"
+MD5SUM="a26d39a321507702775f33ed95b8d352"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/tagainijisho/slack-desc b/system/tagainijisho/slack-desc
index ef0e3b44fb..1fc3d94e3c 100644
--- a/system/tagainijisho/slack-desc
+++ b/system/tagainijisho/slack-desc
@@ -16,4 +16,4 @@ tagainijisho: you tag and annote them, in addition to providing easy navigation
 tagainijisho: between related entries. A powerful search engine also allows you
 tagainijisho: to search for entries very precisely. Finally, Tagaini let you
 tagainijisho: produce printed material.
-tagainijisho: Homepage: http://tagaini.net
+tagainijisho: Homepage: https://www.tagaini.net/
diff --git a/system/tagainijisho/tagainijisho-1.0.3-fts3_tokenizer.patch b/system/tagainijisho/tagainijisho-1.0.3-fts3_tokenizer.patch
deleted file mode 100644
index adae7c8862..0000000000
--- a/system/tagainijisho/tagainijisho-1.0.3-fts3_tokenizer.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up tagainijisho-1.0.3/src/sqlite/sqlite3ext.cc.fts3_tokenizer tagainijisho-1.0.3/src/sqlite/sqlite3ext.cc
---- tagainijisho-1.0.3/src/sqlite/sqlite3ext.cc.fts3_tokenizer	2018-07-22 14:22:31.597931031 +0200
-+++ tagainijisho-1.0.3/src/sqlite/sqlite3ext.cc	2018-07-22 14:22:35.858945041 +0200
-@@ -118,6 +118,10 @@ int register_tokenizer(sqlite3 *db, cons
- 	sqlite3_stmt *pStmt;
- 	const char *zSql = "SELECT fts3_tokenizer(?, ?)";
- 
-+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
-+	sqlite3_db_config(db, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
-+#endif
-+
- 	rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
- 	if( rc!=SQLITE_OK ){
- 		return rc;
diff --git a/system/tagainijisho/tagainijisho.SlackBuild b/system/tagainijisho/tagainijisho.SlackBuild
index 950586963a..76c15a32ae 100644
--- a/system/tagainijisho/tagainijisho.SlackBuild
+++ b/system/tagainijisho/tagainijisho.SlackBuild
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tagainijisho
 
 # originally written by Alex-P. Natsios <drakevr@2f30.org>
 
-# Copyright 2019 Andrew Clemons, Wellington New Zealand
+# Copyright 2019,2022 Andrew Clemons, Wellington New Zealand
+# Copyright 2022 Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +25,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tagainijisho
-VERSION=${VERSION:-1.0.3}
+VERSION=${VERSION:-1.2.2}
+VERSION_JMDICT=${VERSION_JMDICT:-2022-04-01}
+VERSION_KANJIDIC2=${VERSION_KANJIDIC2:-2022-04-01}
+VERSION_KANJIVG=${VERSION_KANJIVG:-20220427}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +44,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,6 +75,10 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+mkdir -p 3rdparty
+zcat $CWD/kanjivg-$VERSION_KANJIVG.xml.gz > 3rdparty/kanjivg.xml
+zcat $CWD/JMdict-$VERSION_JMDICT.gz > 3rdparty/JMdict
+zcat $CWD/kanjidic2-$VERSION_KANJIDIC2.xml.gz > 3rdparty/kanjidic2.xml
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,38 +86,33 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# thanks to fedora
-patch -p1 < $CWD/tagainijisho-1.0.3-fts3_tokenizer.patch
-
-cd $TMP/$PRGNAM-$VERSION
-  cmake . \
+mkdir -p build
+cd build
+  cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_TESTS=OFF \
-    -DDEBUG_DETAILED_VIEW=OFF \
-    -DDEBUG_ENTRIES_CACHE=OFF \
-    -DDEBUG_LISTS=OFF \
-    -DDEBUG_PATHS=OFF \
-    -DDEBUG_QUERIES=OFF \
-    -DDEBUG_TRANSACTIONS=OFF \
-    -DDICT_LANG="fr;de;es;ru;it;pt;th;tr" \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DDICT_LANG="ar;cs;de;en;es;fa;fi;fr;hu;id;it;ja;nb;nl;pl;pt;ru;sv;tr;uk;vi;zh" \
     -DEMBED_SQLITE=OFF \
-    -DGUNZIP=/usr/bin/gunzip \
-    -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \
-    -DSQLITE_INCLUDE_DIR=/usr/include \
-    -DSQLITE_LIBRARY=/usr/lib${LIBDIRSUFFIX}/libsqlite3.so
-
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+chmod 0644 $PKG/usr/share/applications/$PRGNAM.desktop
+mkdir -p $PKG/usr/share/metainfo
+mv $PKG/usr/share/applications/tagainijisho.appdata.xml $PKG/usr/share/metainfo
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  $TMP/$PRGNAM-$VERSION/doc \
+  doc COPYING.txt Changelog README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -111,4 +121,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tagainijisho/tagainijisho.info b/system/tagainijisho/tagainijisho.info
index cb96e001b9..3fab666853 100644
--- a/system/tagainijisho/tagainijisho.info
+++ b/system/tagainijisho/tagainijisho.info
@@ -1,8 +1,14 @@
 PRGNAM="tagainijisho"
-VERSION="1.0.3"
-HOMEPAGE="http://tagaini.net/"
-DOWNLOAD="https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz"
-MD5SUM="e3aef7b1a3e4a38e0f144dd98fdcb680"
+VERSION="1.2.2"
+HOMEPAGE="https://www.tagaini.net/"
+DOWNLOAD="https://github.com/Gnurou/tagainijisho/archive/1.2.2/tagainijisho-1.2.2.tar.gz \
+          https://github.com/KanjiVG/kanjivg/releases/download/r20220427/kanjivg-20220427.xml.gz \
+          https://home.apache.org/~arfrever/distfiles/JMdict-2022-04-01.gz \
+          https://home.apache.org/~arfrever/distfiles/kanjidic2-2022-04-01.xml.gz"
+MD5SUM="1cef5830d7835fa2e92c6e4e90ce0682 \
+        e466d6df0bd9b46d0b30e7b7ad3f2b39 \
+        13dbfe7f0fa24ed08136bc5733a6428b \
+        06ae61c156637228cceddb21c4f63310"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/tagtools/tagtools.SlackBuild b/system/tagtools/tagtools.SlackBuild
index c7ed4d3386..d39879768a 100644
--- a/system/tagtools/tagtools.SlackBuild
+++ b/system/tagtools/tagtools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tagtools
 # Copyright 2018 Jefferson Rocha 'slackjeff' <lrcjefferson@gmail.com>
@@ -21,14 +21,24 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tagtools
 VERSION=${VERSION:-v1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -59,4 +69,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tagtools/tagtools.info b/system/tagtools/tagtools.info
index cae7b1a6e5..9778a11fb3 100644
--- a/system/tagtools/tagtools.info
+++ b/system/tagtools/tagtools.info
@@ -1,7 +1,7 @@
 PRGNAM="tagtools"
 VERSION="v1"
 HOMEPAGE="https://notabug.org/jeffersonrocha/tagtools"
-DOWNLOAD="https://notabug.org/jeffersonrocha/tagtools/raw/master/tagtools.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/tagtools.tar.xz"
 MD5SUM="d56b71d973b6b764d5f69187d55f1fc6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/tamsyn-font/tamsyn-font.SlackBuild b/system/tamsyn-font/tamsyn-font.SlackBuild
index aa851184e5..648e4c463a 100644
--- a/system/tamsyn-font/tamsyn-font.SlackBuild
+++ b/system/tamsyn-font/tamsyn-font.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware package build script for proggyfonts
 
@@ -7,13 +7,23 @@
 # Redistribution and use with or without modification are permitted.
 # There is ABSOLUTELY NO WARRANTY, express or implied.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tamsyn-font
 VERSION=${VERSION:-1.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=${ARCH:-noarch}
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 
 PKG=$TMP/package-$PRGNAM
@@ -48,4 +58,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/targetcli-fb/targetcli-fb.SlackBuild b/system/targetcli-fb/targetcli-fb.SlackBuild
index 8a8eb91dca..c9420e2c83 100644
--- a/system/targetcli-fb/targetcli-fb.SlackBuild
+++ b/system/targetcli-fb/targetcli-fb.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for targetcli-fb
 
@@ -23,12 +23,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=targetcli-fb
-VERSION=${VERSION:-2.1.53}
-RTVERSION=${RTVERSION:-2.1.73}
-CSVERSION=${CSVERSION:-1.1.28}
+VERSION=${VERSION:-2.1.58}
+RTVERSION=${RTVERSION:-2.1.76}
+CSVERSION=${CSVERSION:-1.1.30}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -84,15 +94,15 @@ find -L . \
 
 # RTSLIB
 cd $TMP/$PRGNAM-$VERSION/$RTSLIB
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 # CONFIGSHELL
 cd $TMP/$PRGNAM-$VERSION/$CONFIGSHELL
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 # TARGETCLI-FB
 cd $TMP/$PRGNAM-$VERSION
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -110,4 +120,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/targetcli-fb/targetcli-fb.info b/system/targetcli-fb/targetcli-fb.info
index 99d90cc03d..5df612c5e3 100644
--- a/system/targetcli-fb/targetcli-fb.info
+++ b/system/targetcli-fb/targetcli-fb.info
@@ -1,14 +1,14 @@
 PRGNAM="targetcli-fb"
-VERSION="2.1.53"
+VERSION="2.1.58"
 HOMEPAGE="https://github.com/open-iscsi/targetcli-fb"
-DOWNLOAD="https://github.com/open-iscsi/targetcli-fb/archive/v2.1.53/targetcli-fb-2.1.53.tar.gz \
-          https://github.com/open-iscsi/rtslib-fb/archive/v2.1.73/rtslib-fb-2.1.73.tar.gz \
-          https://github.com/open-iscsi/configshell-fb/archive/v1.1.28/configshell-fb-1.1.28.tar.gz"
-MD5SUM="61cdf4c71a0b206b021232fb9e845bd8 \
-        5eb1fc54a5f16566b76b6037950c0dc6 \
-        d1908982dffb1df700fa52ed65949729"
+DOWNLOAD="https://github.com/open-iscsi/targetcli-fb/archive/v2.1.58/targetcli-fb-2.1.58.tar.gz \
+          https://github.com/open-iscsi/rtslib-fb/archive/v2.1.76/rtslib-fb-2.1.76.tar.gz \
+          https://github.com/open-iscsi/configshell-fb/archive/v1.1.30/configshell-fb-1.1.30.tar.gz"
+MD5SUM="33ba115c73507d50c6e0fafb83695d90 \
+        257d79770918799c0a779bf2fad0f7ea \
+        4d4ee409b5fad8b8ccf05f4457b23601"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pyudev pyparsing six"
+REQUIRES="pyudev"
 MAINTAINER="Marek Wodzinski"
 EMAIL="majek@w7i.pl"
diff --git a/system/tarsnap/tarsnap.SlackBuild b/system/tarsnap/tarsnap.SlackBuild
index 746ae398b2..66569b2565 100644
--- a/system/tarsnap/tarsnap.SlackBuild
+++ b/system/tarsnap/tarsnap.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # SlackBuild for Tarsnap, 12 August 2017
 # awg <awg@cock.li>
@@ -20,10 +20,13 @@
 ## The Tarsnap client itself remains a copyrighted work.
 ## Please see the file COPYING in the Tarsnap source distribution.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tarsnap
 VERSION=${VERSION:-1.0.39}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -33,7 +36,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -86,4 +96,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tbsm/README b/system/tbsm/README
index a02d5c305a..b461ca64d4 100644
--- a/system/tbsm/README
+++ b/system/tbsm/README
@@ -2,12 +2,12 @@ tbsm is a pure bash session or application launcher, inspired by cdm,
 tdm and krunner.  It supports X and Wayland sessions.
 
 Autostart tbsm upon login by adding the following to $HOME/.profile
-(Reference: https://wiki.gentoo.org/wiki/Start_X_on_login):
+(Information taken from tbsm manual): 
 
 # Autostart tbsm on tty1
-if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
+if [[ ! ${DISPLAY} && ${XDG_VTNR} == 1 ]]; then
     exec tbsm
 fi
 
-/usr/share/doc/tbsm-0.5/01_Manual.txt contains instructions.
+/usr/doc/tbsm-0.7/doc/01_Manual.txt contains instructions.
 README.SLACKWARE contains additional tips.
diff --git a/system/tbsm/README.SLACKWARE b/system/tbsm/README.SLACKWARE
index 2a04e39c6a..f206be8b19 100644
--- a/system/tbsm/README.SLACKWARE
+++ b/system/tbsm/README.SLACKWARE
@@ -1,6 +1,13 @@
-tbsm may run desktop sessions, such as i3, without consolekit and dbus
-support.  Thus, given that tbsm detects available .desktop files from
-/usr/share/xsessions, create a copy of the .desktop file and modify
-the Name and Exec lines as such:
-Name=i3-dbus
-Exec=ck-launch-session dbus-launch --sh-syntax --exit-with-session i3
+tbsm may run desktop sessions, such as dwm, without dbus support.
+Thus, here are 2 methods for autostarting dbus upon login:
+
+1. Please add the following line to .xinitrc or .xsession:
+exec dbus-launch --sh-syntax --exit-with-session dwm
+
+2. Please add the following lines to autostart.sh (dwm has an optional
+patch for autostarting ~/.dwm/autostart.sh):
+
+# Start DBUS session bus:
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+   eval $(dbus-launch --sh-syntax --exit-with-session)
+fi
diff --git a/system/tbsm/tbsm.SlackBuild b/system/tbsm/tbsm.SlackBuild
index 0d01a210fb..6b0baace63 100644
--- a/system/tbsm/tbsm.SlackBuild
+++ b/system/tbsm/tbsm.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tbsm
 
-# Copyright 2019 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2019-2023 Isaac Yu <isaacyu@protonmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,38 +22,25 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tbsm
-VERSION=${VERSION:-0.5}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.7}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -69,17 +56,20 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Change doc folder location from /usr/share/tbsm to /usr/doc/tbsm-0.7/doc
+sed -i 's/share\/doc\/${MyName}/doc\/$(notdir $(CURDIR))\/doc/g' Makefile
+
+# within the tbsm binary, change docpath from /usr/share/tbsm/doc to /usr/doc/tbsm-0.7/doc
+sed -i 's/share\/doc\/tbsm/doc\/${myName}-${myVersion}\/doc/g' src/tbsm
+
 make
 make install PREFIX=/usr DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Redundant directory
-rm -r $PKG/usr/share/doc/tbsm
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/ changelog license readme-install.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a themes/ changelog license readme-install.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
@@ -87,4 +77,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tbsm/tbsm.info b/system/tbsm/tbsm.info
index b28e8cd25e..ef1175e889 100644
--- a/system/tbsm/tbsm.info
+++ b/system/tbsm/tbsm.info
@@ -1,10 +1,10 @@
 PRGNAM="tbsm"
-VERSION="0.5"
+VERSION="0.7"
 HOMEPAGE="https://github.com/loh-tar/tbsm"
-DOWNLOAD="https://github.com/loh-tar/tbsm/archive/v0.5/tbsm-0.5.tar.gz"
-MD5SUM="35faadd3c3cdba0c87541823cadb65f1"
+DOWNLOAD="https://github.com/loh-tar/tbsm/archive/v0.7/tbsm-0.7.tar.gz"
+MD5SUM="093066bf3733d7fd2ca8a94397a9e7a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Isaac Yu"
-EMAIL="isaacyu1@isaacyu1.com"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/tc-play/tc-play.SlackBuild b/system/tc-play/tc-play.SlackBuild
index 8fc01bb169..85eb42dc98 100644
--- a/system/tc-play/tc-play.SlackBuild
+++ b/system/tc-play/tc-play.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tc-play
 
@@ -22,22 +22,28 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org to fix the build on 15.0.
+# I didn't upgrade to a newer version, but it might be a good idea.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tc-play
 VERSION=${VERSION:-2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -52,7 +58,11 @@ fi
 
 set -e
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,9 +76,12 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20220210 bkw: makedev() is a macro...
+sed -i '1i#include <sys/sysmacros.h>' tcplay.c
 
 # Don't force these flags kthxbye
 sed -i \
@@ -109,4 +122,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tc-play/tc-play.info b/system/tc-play/tc-play.info
index 862a0b8ec4..85e702649f 100644
--- a/system/tc-play/tc-play.info
+++ b/system/tc-play/tc-play.info
@@ -1,7 +1,7 @@
 PRGNAM="tc-play"
 VERSION="2.0"
 HOMEPAGE="https://github.com/bwalex/tc-play"
-DOWNLOAD="https://github.com/bwalex/tc-play/archive/v2.0.tar.gz"
+DOWNLOAD="https://github.com/bwalex/tc-play/archive/v2.0/tc-play-2.0.tar.gz"
 MD5SUM="c0c6638f078d946b58d6108518e54e3c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/telegraf/README b/system/telegraf/README
index 5603c0571c..96a46d299c 100644
--- a/system/telegraf/README
+++ b/system/telegraf/README
@@ -11,7 +11,8 @@ Kafka, MQTT, NSQ, and many others.
 
 Groupname and Username
 
-You must have the "telegraf" group and user to run this script, for example:
+You must have the "telegraf" group and user to run this script, for
+example:
 
   groupadd -g 349 telegraf
   useradd -u 349 -s /bin/false -d /dev/null -g telegraf telegraf
diff --git a/system/telegraf/slack-desc b/system/telegraf/slack-desc
index e302ddec05..30a670256c 100644
--- a/system/telegraf/slack-desc
+++ b/system/telegraf/slack-desc
@@ -10,7 +10,7 @@ telegraf: telegraf (An Open-Source Collecting & Reporting Agent)
 telegraf:
 telegraf: It is part of the TICK stack and is a plugin-driven server agent for
 telegraf: collecting and reporting metrics. Telegraf has plugins or integrations
-telegraf: to source a variety of metrics directly from the system it’s running
+telegraf: to source a variety of metrics directly from the system it's running
 telegraf: on, pull metrics from third-party APIs, or even listen for metrics via
 telegraf: a StatsD and Kafka consumer services. It also has output plugins to
 telegraf: send metrics to a variety of other datastores, services, and message
diff --git a/system/telegraf/telegraf.SlackBuild b/system/telegraf/telegraf.SlackBuild
index ee7bbac495..779f723af2 100644
--- a/system/telegraf/telegraf.SlackBuild
+++ b/system/telegraf/telegraf.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Telegraf
 
-# Copyright 2017-2021 Ebben Aries <slackbuilds@dscp.org>
+# Copyright 2017-2024 Ebben Aries <slackbuilds@dscp.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=telegraf
-VERSION=${VERSION:-1.17.3}
+VERSION=${VERSION:-1.30.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -46,7 +49,14 @@ elif ! getent passwd $PRGNAM; then
 	exit 1
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -104,4 +114,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/telegraf/telegraf.info b/system/telegraf/telegraf.info
index 30ec91c5c0..f78a096890 100644
--- a/system/telegraf/telegraf.info
+++ b/system/telegraf/telegraf.info
@@ -1,10 +1,10 @@
 PRGNAM="telegraf"
-VERSION="1.17.3"
+VERSION="1.30.1"
 HOMEPAGE="https://www.influxdata.com"
-DOWNLOAD="https://dl.influxdata.com/telegraf/releases/telegraf-1.17.3_linux_i386.tar.gz"
-MD5SUM="f56999d43b96b054650eb380193f1d93"
-DOWNLOAD_x86_64="https://dl.influxdata.com/telegraf/releases/telegraf-1.17.3_linux_amd64.tar.gz"
-MD5SUM_x86_64="bdba432789fd789a9e02634452bb5876"
+DOWNLOAD="https://dl.influxdata.com/telegraf/releases/telegraf-1.30.1_linux_i386.tar.gz"
+MD5SUM="d765bebe51033ec8bfd8098b52da5ac1"
+DOWNLOAD_x86_64="https://dl.influxdata.com/telegraf/releases/telegraf-1.30.1_linux_amd64.tar.gz"
+MD5SUM_x86_64="b592f7423f327991ff178a40460f73ea"
 REQUIRES=""
 MAINTAINER="Ebben Aries"
 EMAIL="slackbuilds@dscp.org"
diff --git a/system/termenu/README b/system/termenu/README
index 4987a6b6da..48c57eb7d2 100644
--- a/system/termenu/README
+++ b/system/termenu/README
@@ -1,2 +1,2 @@
-Termenu is a command line utility and Python library for displaying console
-based interactive menus.
+Termenu is a command line utility and Python library for displaying
+console based interactive menus.
diff --git a/system/termenu/termenu.SlackBuild b/system/termenu/termenu.SlackBuild
index 097cf41032..235e797922 100644
--- a/system/termenu/termenu.SlackBuild
+++ b/system/termenu/termenu.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for termenu
 
-# Copyright 2014-2018  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2022  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=termenu
-VERSION=${VERSION:-1.2.4}
+VERSION=${VERSION:-1.2.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,7 +79,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -82,4 +92,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/termenu/termenu.info b/system/termenu/termenu.info
index a51f8c4b73..be2b49df50 100644
--- a/system/termenu/termenu.info
+++ b/system/termenu/termenu.info
@@ -1,8 +1,8 @@
 PRGNAM="termenu"
-VERSION="1.2.4"
+VERSION="1.2.5"
 HOMEPAGE="https://github.com/gooli/termenu"
-DOWNLOAD="https://pypi.python.org/packages/a6/33/b6cae06794b11f7dcb3d261482056dd96ed5355b5a8402e5b246005dd586/termenu-1.2.4.tar.gz"
-MD5SUM="5fc92c352392affc7d8819fd6ab22ba8"
+DOWNLOAD="https://files.pythonhosted.org/packages/48/ee/00298f75219268417ce3b9bec69c60d30a7990a0654360d72efaa10a85bc/termenu-1.2.5.tar.gz"
+MD5SUM="0b63ca6fc9f600a42a9420a6f1325f5a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/terminator/README b/system/terminator/README
index b3c2ba1f4f..59d346e0c1 100644
--- a/system/terminator/README
+++ b/system/terminator/README
@@ -1,6 +1,5 @@
 The goal of this project is to produce a useful tool for arranging
-terminals.  It is inspired by programs such as gnome-multi-term,
-quadkonsole, etc. in that the main focus is arranging terminals in grids
-(tabs is the most common default method, which Terminator also supports).
-
-Optionally requires python-keybinder
+terminals. It is inspired by programs such as gnome-multi-term,
+quadkonsole, etc. in that the main focus is arranging terminals in
+grids (tabs is the most common default method, which Terminator also
+supports).
diff --git a/system/terminator/terminator.SlackBuild b/system/terminator/terminator.SlackBuild
index 54a7a4ce2f..e8f7c5a953 100644
--- a/system/terminator/terminator.SlackBuild
+++ b/system/terminator/terminator.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for terminator
 
@@ -30,11 +30,15 @@
 # 20130530 - Updated for version 0.97
 # 20160625 - Updated for version 0.98 (thanks to Andrzej Telszewski)
 # 20161126 - Updated for version 1.0
+# 20230507 - Updated for version 2.1.3
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=terminator
-VERSION=${VERSION:-1.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.1.3}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -44,12 +48,19 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="INSTALL COPYING RELEASING README ChangeLog"
+DOCS="INSTALL.md AUTHORS COPYING RELEASE.md README.md CHANGELOG.md CHANGELOG.legacy.txt TRANSLATION.md"
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -87,7 +98,7 @@ sed -i "s|'share', 'doc', 'terminator'|'doc', '$PRGNAM-$VERSION'|g" terminatorli
 sed -i "s|share/man|man|g" setup.py
 
 CFLAGS=$SLKCFLAGS \
-./setup.py --no-user-cfg --without-icon-cache install --prefix=/usr --root=$PKG
+python3 setup.py --no-user-cfg install --prefix=/usr --root=$PKG
 
 rm -f $PKG/usr/doc/$PRGNAM-$VERSION/apidoc/.buildinfo
 rm -f $PKG/usr/doc/$PRGNAM-$VERSION/html/.buildinfo
@@ -109,4 +120,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/terminator/terminator.info b/system/terminator/terminator.info
index 217966f2ae..3e84c51471 100644
--- a/system/terminator/terminator.info
+++ b/system/terminator/terminator.info
@@ -1,10 +1,10 @@
 PRGNAM="terminator"
-VERSION="1.0"
-HOMEPAGE="https://launchpad.net/terminator/"
-DOWNLOAD="https://launchpad.net/terminator/trunk/1.0/+download/terminator-1.0.tar.gz"
-MD5SUM="26b2c80a30bead957b83cef3a2b9101f"
+VERSION="2.1.3"
+HOMEPAGE="https://github.com/gnome-terminator/terminator"
+DOWNLOAD="https://github.com/gnome-terminator/terminator/releases/download/v2.1.3/terminator-2.1.3.tar.gz"
+MD5SUM="c15ed0329bd324fb3f0c59a88650780f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="psutil"
+REQUIRES="python3-pytest-runner python3-psutil configobj"
 MAINTAINER="Alan Alberghini"
 EMAIL="414N@slacky.it"
diff --git a/system/terminology/README b/system/terminology/README
index 166860367d..57de015681 100644
--- a/system/terminology/README
+++ b/system/terminology/README
@@ -15,7 +15,7 @@ and bling thrown in.
 - Works directly in the linux framebuffer (fbcon)
 - Can be finger/touch controlled
 - Scan scale by UI scaling factors
-- Can render using OpenGL or OpenGL-ES2 (not a requirement - just an option)
+- Can render using OpenGL/OpenGL-ES2 (not a requirement, just an option)
 - Can display inlined media content (images, video, documents)
 - Can do multiple "tabs"
 - Can do splitting into multiple panes
diff --git a/system/terminology/terminology.SlackBuild b/system/terminology/terminology.SlackBuild
index ba6ce393f3..097bb379a5 100644
--- a/system/terminology/terminology.SlackBuild
+++ b/system/terminology/terminology.SlackBuild
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for terminology
-# Erik Falor | Logan, UT | ewfalor@gmail.com
+# Erik Falor | Logan, UT, USA | ewfalor@gmail.com | January 2024
+# All rights reserved.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,10 +23,13 @@
 # <http://www.gnu.org/licenses/>.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=terminology
-VERSION=${VERSION:-1.8.1}
+VERSION=${VERSION:-1.13.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,7 +66,7 @@ else
 fi
 
 
-DOCS="AUTHORS COPYING ChangeLog ChangeLog.theme DESIGN.md NEWS README.md THEME.md TODO"
+DOCS="AUTHORS COLORSCHEMES.md COPYING ChangeLog ChangeLog.theme DESIGN.md NEWS README.md THEMES.md TODO"
 
 set -e
 
@@ -79,9 +90,7 @@ meson \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   . build
-
-ninja -C build -v
-DESTDIR=$PKG ninja -C build -v install
+DESTDIR=$PKG ${NINJA:=ninja} -C build -v install
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -98,4 +107,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/terminology/terminology.info b/system/terminology/terminology.info
index 6c5301afc7..cc9296dca4 100644
--- a/system/terminology/terminology.info
+++ b/system/terminology/terminology.info
@@ -1,8 +1,8 @@
 PRGNAM="terminology"
-VERSION="1.8.1"
+VERSION="1.13.0"
 HOMEPAGE="https://www.enlightenment.org/about-terminology"
-DOWNLOAD="https://download.enlightenment.org/rel/apps/terminology/terminology-1.8.1.tar.xz"
-MD5SUM="a01667086dd35557ecbbe3836ba66740"
+DOWNLOAD="https://download.enlightenment.org/rel/apps/terminology/terminology-1.13.0.tar.xz"
+MD5SUM="81e24535c1cf0ac9a506c711c9d621f7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="efl"
diff --git a/system/termite/README b/system/termite/README
deleted file mode 100644
index 8d8f60908d..0000000000
--- a/system/termite/README
+++ /dev/null
@@ -1,2 +0,0 @@
-A keyboard-centric VTE-based terminal, aimed at use within a window
-manager with tiling and/or tabbing support.
diff --git a/system/termite/doinst.sh b/system/termite/doinst.sh
deleted file mode 100644
index 77537ac377..0000000000
--- a/system/termite/doinst.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/xdg/termite/config.new
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
diff --git a/system/termite/slack-desc b/system/termite/slack-desc
deleted file mode 100644
index d1c3fe195a..0000000000
--- a/system/termite/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-termite: termite (a keyboard-centric VTE-based terminal)
-termite:
-termite: A keyboard-centric VTE-based terminal, aimed at use within a window
-termite: manager with tiling and/or tabbing support.
-termite:
-termite:
-termite:
-termite:
-termite:
-termite:
-termite:
diff --git a/system/termite/termite.SlackBuild b/system/termite/termite.SlackBuild
deleted file mode 100644
index 346e17684d..0000000000
--- a/system/termite/termite.SlackBuild
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for termite
-
-# Copyright 2017-2018 Azure Zanculmarktum <zanculmarktum@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=termite
-VERSION=${VERSION:-13}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-# Git modules
-MODULENAM=util
-MODULEVER=409b8449ab51fccf51057621168c9c15c54d4807
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-
-# Extract the Git modules
-rm -rf $MODULENAM
-tar xvf $CWD/$MODULENAM-$MODULEVER.tar.gz
-mv $MODULENAM-$MODULEVER $MODULENAM
-
-chown -R root:root .
-find -L . \
-  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-   -o -perm 511 \) -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Fix man pages path
-sed -i 's|\(\${DESTDIR}\${PREFIX}\)/share\(/man\)|\1\2|g' Makefile
-
-make
-make install \
-  PREFIX=/usr \
-  DESTDIR=$PKG
-
-# For use with doinst.sh
-mv $PKG/etc/xdg/termite/config{,.new}
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.rst TODO.rst $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/termite/termite.info b/system/termite/termite.info
deleted file mode 100644
index 4cddf13e7d..0000000000
--- a/system/termite/termite.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="termite"
-VERSION="13"
-HOMEPAGE="https://github.com/thestinger/termite"
-DOWNLOAD="https://github.com/thestinger/termite/archive/v13/termite-13.tar.gz \
-          https://github.com/thestinger/util/archive/409b8449ab51fccf51057621168c9c15c54d4807/util-409b8449ab51fccf51057621168c9c15c54d4807.tar.gz"
-MD5SUM="4872c33cd79e78f7229d1d53e57c2782 \
-        aecb3bb1e097e865c4aa3e12ef2ffd07"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="vte3-ng"
-MAINTAINER="Azure Zanculmarktum"
-EMAIL="zanculmarktum@gmail.com"
diff --git a/system/termsaver/slack-desc b/system/termsaver/slack-desc
index ac2618d099..676f2d7994 100644
--- a/system/termsaver/slack-desc
+++ b/system/termsaver/slack-desc
@@ -10,7 +10,7 @@ termsaver: termsaver (Simple text-based terminal screensaver)
 termsaver:
 termsaver: A simple text-based screensaver for terminal windows.
 termsaver:
-termsaver: Homepage: http://termsaver.brunobraga.net/
+termsaver: Homepage: https://pypi.org/project/termsaver/
 termsaver:
 termsaver:
 termsaver:
diff --git a/system/termsaver/termsaver.SlackBuild b/system/termsaver/termsaver.SlackBuild
index 0e8a7f70ef..de77c7508c 100644
--- a/system/termsaver/termsaver.SlackBuild
+++ b/system/termsaver/termsaver.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for termsaver
 
-# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2022  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=termsaver
-VERSION=${VERSION:-0.3}
+VERSION=${VERSION:-0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,7 +79,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+python2 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -85,4 +95,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/termsaver/termsaver.info b/system/termsaver/termsaver.info
index 64beb84b43..c8e17d7f5f 100644
--- a/system/termsaver/termsaver.info
+++ b/system/termsaver/termsaver.info
@@ -1,8 +1,8 @@
 PRGNAM="termsaver"
-VERSION="0.3"
-HOMEPAGE="http://termsaver.brunobraga.net/"
-DOWNLOAD="https://pypi.python.org/packages/source/t/termsaver/termsaver-0.3.tar.gz"
-MD5SUM="7b33d51e858254797dfeb3a5f04671e5"
+VERSION="0.4"
+HOMEPAGE="https://pypi.org/project/termsaver/"
+DOWNLOAD="https://files.pythonhosted.org/packages/9a/b0/4428c151d94b5358dd92b92c045cd40b448ff65a37b994ecb7252ad559f8/termsaver-0.4.tar.gz"
+MD5SUM="024d4079cb368b5a42300cac3857dd26"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/termsyn-font/termsyn-font.SlackBuild b/system/termsyn-font/termsyn-font.SlackBuild
index 2d448a6456..0b0d15e52c 100644
--- a/system/termsyn-font/termsyn-font.SlackBuild
+++ b/system/termsyn-font/termsyn-font.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for termsyn-font
 
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=termsyn-font
 TARNAM=termsyn
 VERSION=${VERSION:-1.8.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,4 +74,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/testdisk/README b/system/testdisk/README
index 0e15d7fff8..703732c26a 100644
--- a/system/testdisk/README
+++ b/system/testdisk/README
@@ -9,6 +9,9 @@ PhotoRec is file data recovery software designed to recover lost files
 including video, documents and archives from Hard Disks and CDRom and
 lost pictures from digital camera memory.
 
-If you want to enable the use of sudo run the script with SUDO=true
+To enable the use of sudo, run the script with SUDO=true, ie:
+SUDO=true ./testdisk.SlackBuild
 
 libewf is an optional dependency.
+
+Website - https://www.cgsecurity.org/wiki/TestDisk
diff --git a/system/testdisk/doinst.sh b/system/testdisk/doinst.sh
index d8b0d0d87b..65c7e2eeb9 100644
--- a/system/testdisk/doinst.sh
+++ b/system/testdisk/doinst.sh
@@ -1,4 +1,3 @@
-
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
@@ -8,4 +7,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
-
diff --git a/system/testdisk/testdisk.SlackBuild b/system/testdisk/testdisk.SlackBuild
index 222fd76c0b..4f84854e0b 100644
--- a/system/testdisk/testdisk.SlackBuild
+++ b/system/testdisk/testdisk.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for testdisk
 # Originally Written by Michales Michaloudes korgie@gmail.com
 
 # Copyright 2011 Grigorios Bouzakis <grbzks@imap.cc>
-# Copyright 2014-2015 Aaditya Bagga <aaditya_gnulinux@zoho.com>
+# Copyright 2014-2024 Aaditya <aaditya_gnulinux@zoho.com>
 # All rights reserved.
 #
 # Permission to use, copy, modify, and distribute this software for any purpose
@@ -22,26 +22,33 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=testdisk
-VERSION=${VERSION:-7.0}
+VERSION=${VERSION:-7.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -54,8 +61,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="COPYING INFO"
-
 set -e
 
 rm -rf $PKG
@@ -66,12 +71,12 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-[ "$SUDO" = "true" ] && ENABLE_SUDO="--enable-sudo"
+[ "${SUDO:-false}" != "false" ] && ENABLE_SUDO="--enable-sudo"
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -101,4 +106,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/testdisk/testdisk.info b/system/testdisk/testdisk.info
index 04b09727be..ab762629ec 100644
--- a/system/testdisk/testdisk.info
+++ b/system/testdisk/testdisk.info
@@ -1,10 +1,10 @@
 PRGNAM="testdisk"
-VERSION="7.0"
+VERSION="7.2"
 HOMEPAGE="https://www.cgsecurity.org"
-DOWNLOAD="https://www.cgsecurity.org/testdisk-7.0.tar.bz2"
-MD5SUM="f0cfe4ca9dd35f2878b2704251665e9f"
+DOWNLOAD="https://www.cgsecurity.org/testdisk-7.2.tar.bz2"
+MD5SUM="c6809b6fd06b5022467c8faa32d49a27"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Aaditya Bagga"
+MAINTAINER="Aaditya"
 EMAIL="aaditya_gnulinux@zoho.com"
diff --git a/system/tewi-font/README b/system/tewi-font/README
new file mode 100644
index 0000000000..212abfb937
--- /dev/null
+++ b/system/tewi-font/README
@@ -0,0 +1,5 @@
+tewi-font (Small bitmap font)
+
+Tewi is a bitmap font, readable even at very small font sizes. This is 
+particularily useful while programming, to fit a lot of code on your 
+screen.
diff --git a/system/tewi-font/doinst.sh b/system/tewi-font/doinst.sh
new file mode 100644
index 0000000000..440f45861f
--- /dev/null
+++ b/system/tewi-font/doinst.sh
@@ -0,0 +1,12 @@
+if [ -x /usr/bin/mkfontdir -o -x /usr/X11R6/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/misc
+    mkfontdir .
+  )
+fi
+if [ -x /usr/bin/xset ]; then
+  /usr/bin/xset +fp /usr/share/fonts/misc
+  /usr/bin/xset fp rehash
+fi
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/tewi-font/slack-desc b/system/tewi-font/slack-desc
new file mode 100644
index 0000000000..fbaa848227
--- /dev/null
+++ b/system/tewi-font/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+tewi-font: tewi-font (Small bitmap font)
+tewi-font:
+tewi-font: Tewi is a bitmap font, readable even at very small font sizes. This
+tewi-font: is particularily useful while programming, to fit a lot of code on
+tewi-font: your screen.
+tewi-font:
+tewi-font:
+tewi-font:
+tewi-font:
+tewi-font: Homepage: https://github.com/lucy/tewi-font
+tewi-font:
diff --git a/system/tewi-font/tewi-font.SlackBuild b/system/tewi-font/tewi-font.SlackBuild
new file mode 100644
index 0000000000..73425103f7
--- /dev/null
+++ b/system/tewi-font/tewi-font.SlackBuild
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# Slackware build script for tewi-font
+
+# Copyright 2023 Samuel Young, MO, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=tewi-font
+VERSION=${VERSION:-2.0.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make
+mkdir -p $PKG/usr/share/fonts/misc
+cp out/*.pcf.gz $PKG/usr/share/fonts/misc/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md LICENSE \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tewi-font/tewi-font.info b/system/tewi-font/tewi-font.info
new file mode 100644
index 0000000000..c15db1ce32
--- /dev/null
+++ b/system/tewi-font/tewi-font.info
@@ -0,0 +1,10 @@
+PRGNAM="tewi-font"
+VERSION="2.0.2"
+HOMEPAGE="https://github.com/lucy/tewi-font"
+DOWNLOAD="https://github.com/lucy/tewi-font/archive/2.0.2/tewi-font-2.0.2.tar.gz"
+MD5SUM="965a9a9b47b8e61e4fd6750b467d9b7a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Samuel Young"
+EMAIL="samyoung12788@gmail.com"
diff --git a/system/the_silver_searcher/README b/system/the_silver_searcher/README
index 6c4de395db..d66635acef 100644
--- a/system/the_silver_searcher/README
+++ b/system/the_silver_searcher/README
@@ -1,6 +1,9 @@
-Ag is a code searching tool similar to grep and ack, but with a focus on speed.
+the_silver_searcher (grep-like text search, but faster)
 
-Ag searches code about 3-5x faster than ack. It ignores file patterns from your
-.gitignore and .hgignore. If there are files in your source repo you don't want
-to search, just add their patterns to a .agignore file. The command name is 33%
-shorter than ack!
+Ag is a code searching tool similar to grep and ack, but with a focus
+on speed.
+
+Ag searches code about 3-5x faster than ack. It ignores file patterns
+from your .gitignore and .hgignore. If there are files in your source
+repo you don't want to search, just add their patterns to a .agignore
+file. The command name is 33% shorter than ack!
diff --git a/system/the_silver_searcher/the_silver_searcher.SlackBuild b/system/the_silver_searcher/the_silver_searcher.SlackBuild
index 6eb153be2e..5590489b50 100644
--- a/system/the_silver_searcher/the_silver_searcher.SlackBuild
+++ b/system/the_silver_searcher/the_silver_searcher.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # SlackBuild script for the_silver_searcher
 
-# Copyright 2013-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2013-2018 Benjamin Trigona-Harany <email removed>
+# Copyright 2021 B. Watson <urchlay@slackware.uk>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20211018 bkw: v2.2.0, BUILD=2
+# - take over maintenance.
+# - put bash completion stuff in the right place.
+# - include CONTRIBUTING.md in doc dir.
+# - reformat README to 72 columns.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=the_silver_searcher
 VERSION=${VERSION:-2.2.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +45,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -63,40 +77,27 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-AC_SEARCH_OPTS="-I /usr/share/aclocal"
-aclocal $AC_SEARCH_OPTS
-autoconf
-autoheader
-automake --add-missing
-
-CFLAGS="$SLKCFLAGS" \
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+autoreconf -ivf
+
+CFLAGS="$SLKCFLAGS -fcommon" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make install-strip DESTDIR=$PKG bashcompdir=/etc/bash_completion.d
+mv $PKG/etc/bash_completion.d/ag.bashcomp.sh $PKG/etc/bash_completion.d/ag
+gzip $PKG/usr/man/man?/*.*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  LICENSE NOTICE README.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE NOTICE *.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/the_silver_searcher/the_silver_searcher.info b/system/the_silver_searcher/the_silver_searcher.info
index 220533cd55..9c9aa13b44 100644
--- a/system/the_silver_searcher/the_silver_searcher.info
+++ b/system/the_silver_searcher/the_silver_searcher.info
@@ -6,5 +6,5 @@ MD5SUM="bad7f246c21b4cd92bd2553e45178bbf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="slackbuilds@jaxartes.net"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/thefuck/README b/system/thefuck/README
new file mode 100644
index 0000000000..610b667869
--- /dev/null
+++ b/system/thefuck/README
@@ -0,0 +1 @@
+thefuck - Magnificent app which corrects your previous console command.
diff --git a/system/thefuck/slack-desc b/system/thefuck/slack-desc
new file mode 100644
index 0000000000..b9961b32a7
--- /dev/null
+++ b/system/thefuck/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+thefuck: thefuck (corrects your previous console commands)
+thefuck:
+thefuck: The Fuck is a magnificent app, inspired by a @liamosaur tweet, that
+thefuck: corrects errors in previous console commands.
+thefuck:
+thefuck: https://github.com/nvbn/thefuck
+thefuck:
+thefuck:
+thefuck:
+thefuck:
+thefuck:
diff --git a/system/thefuck/thefuck.SlackBuild b/system/thefuck/thefuck.SlackBuild
new file mode 100644
index 0000000000..642f6262a0
--- /dev/null
+++ b/system/thefuck/thefuck.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/bash
+
+# Slackware build script for thefuck
+
+# Copyright 2023 Andrew Clemons, Tokyo Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=thefuck
+VERSION=${VERSION:-3.32}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 -m build --wheel --no-isolation
+
+python3 -m installer --destdir "$PKG" dist/*.whl
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CONTRIBUTING.md LICENSE.md MANIFEST.in README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/thefuck/thefuck.info b/system/thefuck/thefuck.info
new file mode 100644
index 0000000000..4aba658028
--- /dev/null
+++ b/system/thefuck/thefuck.info
@@ -0,0 +1,10 @@
+PRGNAM="thefuck"
+VERSION="3.32"
+HOMEPAGE="https://github.com/nvbn/thefuck"
+DOWNLOAD="https://github.com/nvbn/thefuck/archive/3.32/thefuck-3.32.tar.gz"
+MD5SUM="1625e79d354d569767dbc58c2fb50299"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="colorama python3-decorator python3-psutil pyte"
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"
diff --git a/system/thermald/README b/system/thermald/README
index 6a2fce490e..7c34a883b2 100644
--- a/system/thermald/README
+++ b/system/thermald/README
@@ -1,11 +1,13 @@
-The Linux Thermal Daemon program from Intel Open Source Technology Center
+The Linux Thermal Daemon program from Intel Open Source Technology
+Center
 
 Thermald deals with thermal issues for Intel processor families
 codenamed Intel Sandy-Bridge and above. It is a Linux daemon
 used to prevent the overheating of systems. This daemon monitors
 temperature and applies compensation using available cooling methods.
 
-Since this is a daemon, it can be started at boot via /etc/rc.d/rc.local:
+Since this is a daemon, it can be started at boot via
+/etc/rc.d/rc.local:
   /usr/sbin/thermald
 
 An entry could be added to /etc/rc.d/rc.local_shutdown as well:
diff --git a/system/thermald/slack-desc b/system/thermald/slack-desc
index e7d23cc482..a7825badc6 100644
--- a/system/thermald/slack-desc
+++ b/system/thermald/slack-desc
@@ -12,7 +12,7 @@ thermald: Thermald is a Linux daemon used to prevent system overheating.
 thermald: This daemon monitors temperature and applies compensation using
 thermald: available cooling methods.
 thermald:
-thermald: Project URL: https://github.com/01org/thermal_daemon
+thermald: Project URL: https://github.com/intel/thermal_daemon
 thermald:
 thermald:
 thermald:
diff --git a/system/thermald/thermald.SlackBuild b/system/thermald/thermald.SlackBuild
index a12ea9a03c..afba0a4163 100644
--- a/system/thermald/thermald.SlackBuild
+++ b/system/thermald/thermald.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for thermald
 
 # Copyright 2017 Aaditya Bagga <aaditya_gnulinux@zoho.com>
-# Copyright 2017-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2017-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,11 +23,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=thermald
 SRCNAM=thermal_daemon
-VERSION=${VERSION:-1.9}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.5.7}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -106,4 +113,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/thermald/thermald.info b/system/thermald/thermald.info
index a0088c2259..17c3c69b09 100644
--- a/system/thermald/thermald.info
+++ b/system/thermald/thermald.info
@@ -1,8 +1,8 @@
 PRGNAM="thermald"
-VERSION="1.9"
-HOMEPAGE="https://github.com/01org/thermal_daemon"
-DOWNLOAD="https://github.com/01org/thermal_daemon/archive/v1.9/thermal_daemon-1.9.tar.gz"
-MD5SUM="b0a56ae78a8fdbe71107e17240874235"
+VERSION="2.5.7"
+HOMEPAGE="https://github.com/intel/thermal_daemon"
+DOWNLOAD="https://github.com/intel/thermal_daemon/archive/v2.5.7/thermal_daemon-2.5.7.tar.gz"
+MD5SUM="dcee1cce3e8ac4fbc5898980e884ac70"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/thin-provisioning-tools/README b/system/thin-provisioning-tools/README
index 37d6d0e822..94697ac05d 100644
--- a/system/thin-provisioning-tools/README
+++ b/system/thin-provisioning-tools/README
@@ -3,10 +3,11 @@ and dm-cache device-mapper targets.
 
 Required by LVM2 to start and manage LVM volumes with above features.
 
-Package contains also patch for Slackware's mkinitrd.
-It's required if you want to boot from cached root partition.
+The package also contains a patch for Slackware's mkinitrd.
+It's required if you want to boot from a cached root partition.
 To apply the patch run:
 
-  cd /sbin ; patch -p0 < /usr/doc/thin-provisioning-tools-*/mkinitrd-1.4.X.patch
+  cd /sbin
+  patch -p0 < /usr/doc/thin-provisioning-tools-*/mkinitrd-1.4.X.patch
 
 where X is the version of the currently installed mkinitrd.
diff --git a/system/thin-provisioning-tools/thin-provisioning-tools.SlackBuild b/system/thin-provisioning-tools/thin-provisioning-tools.SlackBuild
index c2ad2a330f..0002eb8c1a 100644
--- a/system/thin-provisioning-tools/thin-provisioning-tools.SlackBuild
+++ b/system/thin-provisioning-tools/thin-provisioning-tools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for thin-provisioning-tools
 
@@ -23,10 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=thin-provisioning-tools
 VERSION=${VERSION:-0.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -107,4 +117,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/thinkfan/README b/system/thinkfan/README
index 392321b4fa..fac9fb8043 100644
--- a/system/thinkfan/README
+++ b/system/thinkfan/README
@@ -1,7 +1,7 @@
-Thinkfan is a simple, lightweight fan control program. Originally designed
-specifically for IBM/Lenovo Thinkpads, it now supports any kind of system via
-the sysfs hwmon interface (/sys/class/hwmon). It is designed to eat as little
-CPU power as possible.
+Thinkfan is a simple, lightweight fan control program. Originally
+designed specifically for IBM/Lenovo Thinkpads, it now supports any
+kind of system via the sysfs hwmon interface (/sys/class/hwmon). It is
+designed to eat as little CPU power as possible.
 
 Before using /etc/rc.d/rc.thinkfan, make sure to create and configure a
 /etc/thinkfan.conf file or the daemon will not start.
diff --git a/system/thinkfan/rc.thinkfan b/system/thinkfan/rc.thinkfan
index fae364cbe5..732a9542d4 100644
--- a/system/thinkfan/rc.thinkfan
+++ b/system/thinkfan/rc.thinkfan
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=thinkfan
-BIN=/usr/bin/$NAME
+BIN=/usr/sbin/$NAME
 CONFIG=/etc/thinkfan.conf
 ARGS="-q -c $CONFIG"
 PIDFILE=/var/run/$NAME.pid
diff --git a/system/thinkfan/thinkfan.SlackBuild b/system/thinkfan/thinkfan.SlackBuild
index b3a0afefcc..c21727fb8c 100644
--- a/system/thinkfan/thinkfan.SlackBuild
+++ b/system/thinkfan/thinkfan.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for thinkfan
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=thinkfan
 VERSION=${VERSION:-1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -105,4 +115,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ti99sim/README b/system/ti99sim/README
new file mode 100644
index 0000000000..21df8707c1
--- /dev/null
+++ b/system/ti99sim/README
@@ -0,0 +1,19 @@
+ti99sim (emulator for TI-99/4A computer)
+
+ti99sim emulates the Texas Instruments TI-99/4A computer. It supports
+emulated disk drives, joysticks, speech synthesis, and various other
+hardware.
+
+The package includes the system ROMs and a large collection of
+cartridge ROM images installed in /opt/ti99sim/cartridges.
+
+See /usr/doc/ti99sim-$VERSION/README.html for documentation. Although
+there's a desktop menu launcher, you'll have to use the command line
+to run cartridges and disk images.
+
+Note: because some of the utilities have very generic names (such as
+"disk", "decode", "say"), they're installed in /usr/bin with the
+prefix ti99sim- (e.g. "ti99sim-disk"). If you really want to call
+them by their original names, try:
+
+  export PATH=/opt/ti99sim/bin:$PATH
diff --git a/system/ti99sim/doinst.sh b/system/ti99sim/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/system/ti99sim/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/ti99sim/setup_paths.diff b/system/ti99sim/setup_paths.diff
new file mode 100644
index 0000000000..78cabba972
--- /dev/null
+++ b/system/ti99sim/setup_paths.diff
@@ -0,0 +1,73 @@
+diff -Naur ti99sim-0.16.0/scripts/setup ti99sim-0.16.0.patched/scripts/setup
+--- ti99sim-0.16.0/scripts/setup	2020-05-25 16:52:23.000000000 -0400
++++ ti99sim-0.16.0.patched/scripts/setup	2023-04-29 02:32:53.326030933 -0400
+@@ -1,15 +1,18 @@
+ #!/bin/sh
+ 
++CWD="$1"
++OUTDIR="$2"
++
+ root=`dirname $0`
+ root=`dirname $root`
+ root=`readlink -f $root`
+ 
+-tmpdir=$(mktemp -d)
++TMPDIR=`pwd` tmpdir=$(mktemp -d)
+ cd $tmpdir
+ 
+-wget http://ftp.whtech.com/System%20ROMs/MAME/pre_0.174/ti99_complete.zip
+-wget http://ftp.whtech.com/System%20ROMs/MAME/ti99_gkracker.zip
+-wget http://ftp.whtech.com/emulators/mess/mess_modules.zip
++cp "$CWD"/ti99_complete.zip .
++cp "$CWD"/ti99_gkracker.zip .
++cp "$CWD"/mess_modules.zip .
+ 
+ unzip -oq ti99_complete ti99_4a.zip
+ unzip -oq ti99_complete ti99_4qi.zip
+@@ -33,33 +36,16 @@
+ $root/bin/convert-ctg $root/roms/ti-disk.dat
+ $root/bin/convert-ctg $root/roms/ti-pcard.dat
+ 
+-mkdir -p ~/.ti99sim
+-
+-if [ -d /home/pi/RetroPie ]; then
+-	if [ ! -d ~/.ti99sim/console ]; then
+-		mkdir -p /home/pi/RetroPie/BIOS/ti99
+-		ln -s /home/pi/RetroPie/BIOS/ti99 ~/.ti99sim/console
+-	fi
+-	if [ ! -d ~/.ti99sim/cartridges ]; then
+-		mkdir -p /home/pi/RetroPie/roms/ti99
+-		ln -s /home/pi/RetroPie/roms/ti99 ~/.ti99sim/cartridges
+-	fi
+-fi
+-
+-mkdir -p ~/.ti99sim/console
+-mkdir -p ~/.ti99sim/cartridges
+-mkdir -p ~/.ti99sim/disks
+-
+-if [ ! -f ~/.ti99sim/disks/image.cf7 ]; then
++if [ ! -f $OUTDIR/disks/image.cf7 ]; then
+ 	tmpdisk=$(mktemp -uq)
+ 	$root/bin/disk --create=sssd $tmpdisk > /dev/null
+ 	$root/bin/disk --output=cf7+ --filename=image.cf7#32 $tmpdisk > /dev/null
+ 	rm $tmpdisk
+-	mv image.cf7 ~/.ti99sim/disks
++	mv image.cf7 $OUTDIR/disks
+ fi
+ 
+-mv -n *ctg ~/.ti99sim/console
+-mv -n spchrom.bin ~/.ti99sim/console
++mv -n *ctg $OUTDIR/console
++mv -n spchrom.bin $OUTDIR/console
+ 
+ unzip -oq mess_modules -d roms
+ mv roms/minimem*.bin .
+@@ -67,7 +53,7 @@
+ $root/bin/convert-ctg $root/roms/mini-memory.dat
+ $root/bin/mkcart roms
+ 
+-mv -n *ctg ~/.ti99sim/cartridges
++mv -n *ctg $OUTDIR/cartridges
+ 
+ cd -
+ 
diff --git a/system/ti99sim/slack-desc b/system/ti99sim/slack-desc
new file mode 100644
index 0000000000..ab758cce40
--- /dev/null
+++ b/system/ti99sim/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+ti99sim: ti99sim (emulator for TI-99/4A computer)
+ti99sim:
+ti99sim: ti99sim emulates the Texas Instruments TI-99/4A computer. It supports
+ti99sim: emulated disk drives, joysticks, speech synthesis, and various other
+ti99sim: hardware.
+ti99sim:
+ti99sim: The package includes the system ROMs and a large collection of
+ti99sim: cartridge ROM images.
+ti99sim:
+ti99sim:
+ti99sim:
diff --git a/system/ti99sim/ti99sim.SlackBuild b/system/ti99sim/ti99sim.SlackBuild
new file mode 100644
index 0000000000..a56499dfb3
--- /dev/null
+++ b/system/ti99sim/ti99sim.SlackBuild
@@ -0,0 +1,118 @@
+#!/bin/bash
+
+# Slackware build script for ti99sim
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ti99sim
+VERSION=${VERSION:-0.16.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.src.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# The actual code doesn't need patching, but the build stuff does.
+# Make it show the damn compile commands.
+patch -p1 < $CWD/verbose_compile.diff
+
+# Modify the setup script so it doesn't download anything, and so
+# it installs stuff in $PKG, not ~/.ti99sim.
+patch -p1 < $CWD/setup_paths.diff
+
+# No other way to make it use our flags.
+sed -i "s,-g3  *-O3,$SLKCFLAGS," rules.mak
+
+# Binaries already installed stripped. SYS_BIN must be <DATA_DIR>/bin
+# to avoid it creating absolute symlinks (we'll create relative ones, below).
+make install DATA_DIR=$PKG/opt/$PRGNAM SYS_BIN=$PKG/opt/$PRGNAM/bin
+
+# Modified setup script requires arguments (original one didn't).
+sh scripts/setup $CWD $PKG/opt/$PRGNAM
+
+# Names are too generic, prefix with ti99sim- unless already prefixed.
+mkdir -p $PKG/usr/bin
+for i in $PKG/opt/$PRGNAM/bin/*; do
+  src=$( basename $i )
+  case "$src" in
+    ti99sim-*) dest=$src ;;
+    *) dest=ti99sim-$src ;;
+  esac
+  ln -s ../../opt/$PRGNAM/bin/$src $PKG/usr/bin/$dest
+done
+
+# Icon cut from TI logo, found here:
+# https://logos.fandom.com/wiki/Texas_Instruments
+for px in 16 22 32 48 64 128; do
+  size="${px}x${px}"
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  convert -resize $size $CWD/$PRGNAM.png $dir/$PRGNAM.png
+done
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+# .desktop file by SlackBuild author. It's not that useful since there's no
+# way to attach disk images or cartridges to the emulator after it starts.
+# The .desktop file just starts it up with no media, you can plunk around
+# in BASIC but not save your work. Have to use --dsk1 and other options
+# to actually do anything fun.
+mkdir -p $PKG/usr/share/applications
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a doc/* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ti99sim/ti99sim.desktop b/system/ti99sim/ti99sim.desktop
new file mode 100644
index 0000000000..65863671f5
--- /dev/null
+++ b/system/ti99sim/ti99sim.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=TI-99 Sim
+GenericName=TI-99/4A Emulator
+Type=Application
+Exec=ti99sim-sdl
+Icon=ti99sim
+Terminal=false
+StartupNotify=false
+Categories=Emulator;System;
diff --git a/system/ti99sim/ti99sim.info b/system/ti99sim/ti99sim.info
new file mode 100644
index 0000000000..727a95201a
--- /dev/null
+++ b/system/ti99sim/ti99sim.info
@@ -0,0 +1,16 @@
+PRGNAM="ti99sim"
+VERSION="0.16.0"
+HOMEPAGE="https://mrousseau.org/programs/ti99sim/"
+DOWNLOAD="https://mrousseau.org/programs/ti99sim/archives/ti99sim-0.16.0.src.tar.xz \
+          http://ftp.whtech.com/System%20ROMs/MAME/pre_0.174/ti99_complete.zip \
+          http://ftp.whtech.com/System%20ROMs/MAME/ti99_gkracker.zip \
+          http://ftp.whtech.com/emulators/mess/mess_modules.zip"
+MD5SUM="224c88ae9b44d98be0b19f0686452572 \
+        bffb2d2132febf594b26bfffeaca8101 \
+        687d3633c736f8aa9646af0752acc850 \
+        73b40263a4e869e51c8957823eb97aa2"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/ti99sim/ti99sim.png b/system/ti99sim/ti99sim.png
new file mode 100644
index 0000000000..9d2a242e89
--- /dev/null
+++ b/system/ti99sim/ti99sim.png
diff --git a/system/ti99sim/verbose_compile.diff b/system/ti99sim/verbose_compile.diff
new file mode 100644
index 0000000000..a71f96e519
--- /dev/null
+++ b/system/ti99sim/verbose_compile.diff
@@ -0,0 +1,78 @@
+diff -Naur ti99sim-0.16.0/Makefile.linux ti99sim-0.16.0.patched/Makefile.linux
+--- ti99sim-0.16.0/Makefile.linux	2020-05-25 16:52:22.000000000 -0400
++++ ti99sim-0.16.0.patched/Makefile.linux	2023-04-29 04:55:35.807225123 -0400
+@@ -42,15 +42,15 @@
+ 	src/util
+ 
+ install: ti99sim
+-	@$(INSTALL) -d $(DATA_DIR)
+-	@$(INSTALL) -d $(DATA_DIR)/cartridges
+-	@$(INSTALL) -d $(DATA_DIR)/console
+-	@$(INSTALL) -d $(DATA_DIR)/disks
+-	@$(INSTALL) -d $(BIN_DIR)
+-	@for target in $(ITARGETS); do \
++	$(INSTALL) -d $(DATA_DIR)
++	$(INSTALL) -d $(DATA_DIR)/cartridges
++	$(INSTALL) -d $(DATA_DIR)/console
++	$(INSTALL) -d $(DATA_DIR)/disks
++	$(INSTALL) -d $(BIN_DIR)
++	for target in $(ITARGETS); do \
+ 	   $(INSTALL) -s $$target $(BIN_DIR); \
+ 	 done
+-	@if [ $(BIN_DIR) != $(SYS_BIN) ]; then \
++	if [ $(BIN_DIR) != $(SYS_BIN) ]; then \
+ 	   for target in $(notdir $(ITARGETS)); do \
+ 	     ln -f -s $(BIN_DIR)/$$target $(SYS_BIN)/$$target; \
+ 	   done \
+@@ -67,7 +67,7 @@
+ 	@if [ -x src ]; then \
+ 	   rm -f {.,include,doc}/*~; \
+ 	   for dir in $(SRC_DIRS); do \
+-	     $(MAKE) -sC $$dir clean; \
++	     $(MAKE) -C $$dir clean; \
+ 	   done \
+ 	 fi
+ 	@if [ -x bin ]; then \
+@@ -90,13 +90,13 @@
+ 	    fi \
+ 	  fi; \
+ 	  for dir in $(SRC_DIRS); do \
+-	    $(MAKE) -sC $$dir $(TI_DATA_DIR); \
++	    $(MAKE) -C $$dir $(TI_DATA_DIR); \
+ 	  done \
+ 	fi
+ 
+ test: ti99sim
+ 	@if [ -x test ]; then \
+-	  $(MAKE) -sC test; \
++	  $(MAKE) -C test; \
+ 	  for test in test/bin/test-*; do \
+ 	    $$test; \
+ 	  done \
+diff -Naur ti99sim-0.16.0/rules.mak ti99sim-0.16.0.patched/rules.mak
+--- ti99sim-0.16.0/rules.mak	2020-05-25 16:52:22.000000000 -0400
++++ ti99sim-0.16.0.patched/rules.mak	2023-04-29 04:56:01.280222726 -0400
+@@ -102,20 +102,18 @@
+ DF        = $(CFG)/$(*F)
+ 
+ $(CFG)/%.o : %.cpp
+-	@echo $<
+-	@$(CXX) -c $(CFLAGS) $(WARNINGS) $(INCLUDES) -MD -o $@ $<
++	$(CXX) -c $(CFLAGS) $(WARNINGS) $(INCLUDES) -MD -o $@ $<
+ 	@cp $(DF).d $(DF).dep; \
+ 		sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+ 			-e '/^$$/ d' -e 's/$$/ :/' < $(DF).d >> $(DF).dep; \
+ 		rm -f $(DF).d
+ 
+ $(CFG)/%.o : %.m
+-	@echo $<
+-	@$(CC) -c $(CFLAGS) $(WARNINGS) $(INCLUDES) -o $@ $<
++	$(CC) -c $(CFLAGS) $(WARNINGS) $(INCLUDES) -o $@ $<
+ 
+ %.h.gch: %.h
+ 	@echo Generating pre-compiled header for $<
+-	@$(CXX) $(CFLAGS) $(WARNINGS) $(INCLUDES) $<
++	$(CXX) $(CFLAGS) $(WARNINGS) $(INCLUDES) $<
+ 
+ .SUFFIXES: .cpp .c .o
+ 
diff --git a/system/ticpp/slack-desc b/system/ticpp/slack-desc
index e924f8e05e..d98a6f74b6 100644
--- a/system/ticpp/slack-desc
+++ b/system/ticpp/slack-desc
@@ -10,10 +10,10 @@ ticpp: ticpp (xml parser)
 ticpp:
 ticpp: TiCPP is short for the official name TinyXML++. It is a completely
 ticpp: new interface to TinyXML that uses MANY of the C++ strengths.
-ticpp: 
 ticpp:
-ticpp: 
-ticpp: 
+ticpp:
+ticpp:
+ticpp:
 ticpp:
 ticpp: Homepage: https://github.com/wxFormBuilder/ticpp
 ticpp:
diff --git a/system/ticpp/ticpp.SlackBuild b/system/ticpp/ticpp.SlackBuild
index 9fe9e6543b..22bd7fdf72 100644
--- a/system/ticpp/ticpp.SlackBuild
+++ b/system/ticpp/ticpp.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for TiCPP
 # XML Parser
@@ -25,11 +25,18 @@
 
 # Revision date: 2020/Nov/25
 
+# 20220410 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - do not install headers in /usr/include with execute permissions.
+# - remove useless and actually misleading build_instructions.txt.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ticpp
 VERSION=${VERSION:-0.1}
 COMVER=eb79120ea16b847ce9f483a298a394050f463d6b
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -39,7 +46,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -71,9 +82,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p build
 cd build
@@ -87,11 +98,11 @@ cd build
 cd ..
 
 mkdir -p "$PKG/usr/include"
-install -Dm775 ticpp.h "$PKG/usr/include"
-install -Dm775 ticppapi.h "$PKG/usr/include"
-install -Dm775 ticpprc.h "$PKG/usr/include"
-install -Dm775 tinystr.h "$PKG/usr/include"
-install -Dm775 tinyxml.h "$PKG/usr/include"
+install -Dm644 ticpp.h "$PKG/usr/include"
+install -Dm644 ticppapi.h "$PKG/usr/include"
+install -Dm644 ticpprc.h "$PKG/usr/include"
+install -Dm644 tinystr.h "$PKG/usr/include"
+install -Dm644 tinyxml.h "$PKG/usr/include"
 
 mkdir -p "$PKG/usr/lib${LIBDIRSUFFIX}"
 install -Dm775 build/libticpp.a "$PKG"/usr/lib${LIBDIRSUFFIX}
@@ -100,7 +111,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a build_instructions.txt changes.txt LICENSE README.md tutorial_gettingStarted.txt \
+cp -a changes.txt LICENSE README.md tutorial_gettingStarted.txt \
       tutorial_ticpp.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -108,4 +119,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tiger/patches/9a030129ceceba715dff801f8229e66de62a8083.patch b/system/tiger/patches/9a030129ceceba715dff801f8229e66de62a8083.patch
deleted file mode 100644
index a1069e2645..0000000000
--- a/system/tiger/patches/9a030129ceceba715dff801f8229e66de62a8083.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/scripts/check_rootdir b/scripts/check_rootdir
-index a34eb2a..5f55159 100755
---- a/scripts/check_rootdir
-+++ b/scripts/check_rootdir
-@@ -90,7 +90,7 @@ haveallvars TESTLINK HOSTNAME || exit 1
- # Checking to see if the root directory is on the correct INODE number
- inode=`$LS -di / | $AWK '{print $1}'`
- fstype=`$GETFS | $GREP " / " | $AWK -F " " '{ print $5;}'`
--[ $inode != 2 ] && [ "$fstype" = "ext2" -o "$fstype" = "ext3" ] &&
-+[ $inode != 2 ] && [ "$fstype" = "ext2" -o "$fstype" = "ext3" -o "$fstype" = "ext4" ] &&
-    message FAIL rootdir001f "" "Root directory on incorrect inode"
- 
- 
diff --git a/system/tiger/patches/check_signatures.patch b/system/tiger/patches/check_signatures.patch
deleted file mode 100644
index 5264ad57e3..0000000000
--- a/system/tiger/patches/check_signatures.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urpN tiger-3.2.3.orig/scripts/check_signatures tiger-3.2.3/scripts/check_signatures
---- tiger-3.2.3.orig/scripts/check_signatures	2011-08-14 05:44:29.474729020 +0000
-+++ tiger-3.2.3/scripts/check_signatures	2011-08-14 05:46:36.840361481 +0000
-@@ -91,7 +91,7 @@ do
- 	  *[!0-9a-f]*) {
- 	    std_signature="$p1"
- 	    comment="$p2 $p3 $p4 $p5 $p6 $p7 $p8 $comment"
--	    [ -n "$MD5" ] && loc_signature="`$MD5 < $file`"
-+	    [ -n "$MD5" ] && loc_signature="`$MD5 < $file | $AWK '{print $1}'`"
- 	  }
- 	  ;;
- 	  *) {
diff --git a/system/tiger/patches/mkfilelst.patch b/system/tiger/patches/mkfilelst.patch
deleted file mode 100644
index b3d5c678c1..0000000000
--- a/system/tiger/patches/mkfilelst.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urpN tiger-3.2.3.orig/util/mkfilelst tiger-3.2.3/util/mkfilelst
---- tiger-3.2.3.orig/util/mkfilelst	2011-08-07 21:16:16.361620719 +0000
-+++ tiger-3.2.3/util/mkfilelst	2011-08-07 21:18:30.710039906 +0000
-@@ -138,7 +138,7 @@ do
- 	if [ $glob -lt 2 ] ; then
- 	   [ -f "$file" -o -d "$file" ] && \
- 	   getpermit $file |
--           while read _file owner group ur uw ux gr gw gx or ow ox stk suid sgid stk
-+           while read _file owner group ur uw ux gr gw gx or ow ox suid sgid stk
- 	  do
- 	    echo "$file $owner $group $suid $sgid $ur $uw $ux $gr $gw $gx $or $ow $ox $lvl $ownmid $grpmid $prmmid"
- 	  done
diff --git a/system/tiger/patches/tiger-3.2.3-build-fix.diff b/system/tiger/patches/tiger-3.2.3-build-fix.diff
deleted file mode 100644
index 28b6985360..0000000000
--- a/system/tiger/patches/tiger-3.2.3-build-fix.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur tiger-3.2.3/util/genmsgidx tiger-3.2.3.new/util/genmsgidx
---- tiger-3.2.3/util/genmsgidx	2008-11-27 23:34:21.000000000 +0100
-+++ tiger-3.2.3.new/util/genmsgidx	2010-09-01 12:43:22.000000000 +0200
-@@ -96,10 +96,10 @@
- haveallof variables BASEDIR || exit 1
- 
- # Clear idx file and detect error
--> $BASEDIR/doc/explain.idx && {
--    echo "Error: Cannot write over the index file $BASEDIR/doc/explain.idx. Aborting"
--    exit 1
--}
-+#> $BASEDIR/doc/explain.idx && {
-+#    echo "Error: Cannot write over the index file $BASEDIR/doc/explain.idx. Aborting"
-+#    exit 1
-+#}
- 
- $LS $BASEDIR/doc/*.txt |
- while read infile 
diff --git a/system/tiger/patches/tiger-makefile.patch b/system/tiger/patches/tiger-makefile.patch
deleted file mode 100644
index 39a2571e3d..0000000000
--- a/system/tiger/patches/tiger-makefile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 160ba685d08651d1cc755d2bb0167dc7170f8e2b Mon Sep 17 00:00:00 2001
-From: pyllyukko <pyllyukko@maimed.org>
-Date: Sat, 6 Oct 2012 23:43:07 +0300
-Subject: Added facl.{tmpl|list} to Makefile.in.
-
----
- Makefile.in |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 9d6eab8..86ab714 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -167,6 +167,8 @@ MISCFILES=./initdefs \
- 	./util/mksig \
- 	./util/setsh \
- 	./util/sgrep \
-+	./util/facl.lst \
-+	./util/facl.tmpl \
-         ./doc/explain.idx
- 
- MISCDIRS=./bin \
--- 
-1.7.4.4
-
diff --git a/system/tiger/patches/tiger-sha512-1.patch b/system/tiger/patches/tiger-sha512-1.patch
deleted file mode 100644
index 70e087686a..0000000000
--- a/system/tiger/patches/tiger-sha512-1.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: scripts/check_passwd
-===================================================================
-RCS file: /sources/tiger/tiger/scripts/check_passwd,v
-retrieving revision 1.24
-diff -u -r1.24 check_passwd
---- scripts/check_passwd	27 Aug 2007 18:30:44 -0000	1.24
-+++ scripts/check_passwd	12 May 2010 06:23:57 -0000
-@@ -129,7 +129,7 @@
-   do
- 
-     # Check the password hash.
--    [ -z "$Tiger_Passwd_Hashes" ] && Tiger_Passwd_Hashes='crypt3|md5|xxxxxxxxxxxxx'
-+    [ -z "$Tiger_Passwd_Hashes" ] && Tiger_Passwd_Hashes='crypt3|md5|sha512|xxxxxxxxxxxxx'
-     eval "case \"$hash\" in
-       \"\")
-         message FAIL pass011f \"\" \"Username \\\`$login' has an empty password field.\"
-Index: systems/Linux/2/gen_passwd_sets
-===================================================================
-RCS file: /sources/tiger/tiger/systems/Linux/2/gen_passwd_sets,v
-retrieving revision 1.16
-diff -u -r1.16 gen_passwd_sets
---- systems/Linux/2/gen_passwd_sets	4 Aug 2005 08:48:15 -0000	1.16
-+++ systems/Linux/2/gen_passwd_sets	12 May 2010 06:23:57 -0000
-@@ -96,6 +96,10 @@
-       \$1\$[a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./]\$[a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./])
- 	     passwd="md5"
- 	   ;;
-+# For SHA512 passwds (98 chars) starting with $6$ (Linux)
-+      \$6\$[a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./])
-+	     passwd="md5"
-+	   ;;
-       " ") passwd=""
- 	   ;;
- 	*|!!)
diff --git a/system/tiger/patches/zappasswd-3.2.3.patch b/system/tiger/patches/zappasswd-3.2.3.patch
deleted file mode 100644
index 403ff6244c..0000000000
--- a/system/tiger/patches/zappasswd-3.2.3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/scripts/check_passwd b/scripts/check_passwd
-index 4a52092..8cb69be 100755
---- a/scripts/check_passwd
-+++ b/scripts/check_passwd
-@@ -129,7 +129,7 @@ check_passwd_entries()
-   do
- 
-     # Check the password hash.
--    [ -z "$Tiger_Passwd_Hashes" ] && Tiger_Passwd_Hashes='crypt3|md5|xxxxxxxxxxxxx'
-+    [ -z "$Tiger_Passwd_Hashes" ] && Tiger_Passwd_Hashes='crypt3|md5|blowfish|sha256|sha512|xxxxxxxxxxxxx'
-     eval "case \"$hash\" in
-       \"\")
-         message FAIL pass011f \"\" \"Username \\\`$login' has an empty password field.\"
-diff --git a/systems/Linux/2/gen_passwd_sets b/systems/Linux/2/gen_passwd_sets
-index ec48944..26d73f0 100755
---- a/systems/Linux/2/gen_passwd_sets
-+++ b/systems/Linux/2/gen_passwd_sets
-@@ -96,9 +96,19 @@ zappasswd()
-       \$1\$[a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./]\$[a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./][a-zA-Z0-9\./])
- 	     passwd="md5"
- 	   ;;
-+      \$2a\$*)
-+	     passwd="blowfish"
-+	   ;;
-+      \$5\$*)
-+	     passwd="sha256"
-+	   ;;
-+# For SHA512 passwds starting with $6$ (Linux)
-+      \$6\$*)
-+	     passwd="sha512"
-+	   ;;
-       " ") passwd=""
- 	   ;;
--	*|!!)
-+	*|!!|!\*)
- 	     passwd="*"
- 	   ;;
-     esac
diff --git a/system/tiger/tiger.SlackBuild b/system/tiger/tiger.SlackBuild
index d9ae3e69b9..3a688508cf 100644
--- a/system/tiger/tiger.SlackBuild
+++ b/system/tiger/tiger.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Tiger
 
@@ -9,26 +9,36 @@
 # Granted WTFPL, Version 2, as published by Sam Hocevar. See
 # http://sam.zoy.org/wtfpl/COPYING for more details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tiger
-VERSION=${VERSION:-3.2.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.2.4rc1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,13 +71,13 @@ then
   set -e
   # If we have the key and the signature file, we verify the package with GPG
   if [ ${GPG_RET} -eq 0 -a \
-       -f "${CWD}/${PRGNAM}-${VERSION}.tar.gz.sig" ]
+       -f "${CWD}/${PRGNAM}_${VERSION}.tar.gz.sig" ]
   then
-    /usr/bin/gpgv "${CWD}/${PRGNAM}-${VERSION}.tar.gz.sig"
+    /usr/bin/gpgv "${CWD}/${PRGNAM}_${VERSION}.tar.gz.sig"
   fi
 fi
 
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/${PRGNAM}_${VERSION}.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -76,23 +86,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# The build errs on this
-# see http://cvs.savannah.gnu.org/viewvc/tiger/tiger/util/genmsgidx?r1=1.6&r2=1.7
-patch --verbose -p1 < $CWD/patches/tiger-3.2.3-build-fix.diff
-# fix bug #7186 & #7675
+# fix bug #7675
 # see https://savannah.nongnu.org/patch/?7675
-patch --verbose -p1 < $CWD/patches/zappasswd-3.2.3.patch
-# fix bug #33969
-patch --verbose -p1 < $CWD/patches/mkfilelst.patch
-# fix bug #34028
-patch --verbose -p1 < $CWD/patches/check_signatures.patch
+patch --verbose -p1 < $CWD/patches/zappasswd.patch
 # see https://savannah.nongnu.org/patch/index.php?7859
 patch --verbose -p1 < $CWD/patches/tiger-aide.patch
-# fix bug #37517
-patch --verbose -p1 < $CWD/patches/tiger-makefile.patch
-# add support for ext4 in the check_rootdir script
-# see http://git.savannah.gnu.org/cgit/tiger.git/commit/?id=9a030129ceceba715dff801f8229e66de62a8083
-patch --verbose -p1 < $CWD/patches/9a030129ceceba715dff801f8229e66de62a8083.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS"
@@ -142,6 +140,7 @@ cp -a [A-Z][A-Z]* site-* tigerrc* \
 cp -a other/cert-usc20.txt contrib/fix_tiger_GROUPS.sh audit \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
+chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/*.txt
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
 cp $PKG/usr/libexec/tiger/html/*.html $PKG/usr/doc/$PRGNAM-$VERSION/html
@@ -155,4 +154,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh >  $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tiger/tiger.info b/system/tiger/tiger.info
index de916f7aa2..41c33eecea 100644
--- a/system/tiger/tiger.info
+++ b/system/tiger/tiger.info
@@ -1,8 +1,8 @@
 PRGNAM="tiger"
-VERSION="3.2.3"
+VERSION="3.2.4rc1"
 HOMEPAGE="http://www.nongnu.org/tiger"
-DOWNLOAD="http://download.savannah.nongnu.org/releases/tiger/tiger-3.2.3.tar.gz http://download.savannah.gnu.org/releases/tiger/tiger-3.2.3.tar.gz.sig"
-MD5SUM="f41076f645da9de937819bf6d516e546 fee7fd065e57a3a763d3a99f7ebf7b02"
+DOWNLOAD="https://download.savannah.nongnu.org/releases/tiger/tiger_3.2.4rc1.tar.gz https://download.savannah.nongnu.org/releases/tiger/tiger_3.2.4rc1.tar.gz.sig"
+MD5SUM="169207ac9c211983a7ef9d19c1e5b3cb 26f45652e995f3ad9cb597fe3697aa75"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/tilda/01_install_metadata_in_new_location.patch b/system/tilda/01_install_metadata_in_new_location.patch
deleted file mode 100644
index a5a93d0cbb..0000000000
--- a/system/tilda/01_install_metadata_in_new_location.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d437ecc0306c8b4b1c9737792963da4f7f4e4234 Mon Sep 17 00:00:00 2001
-From: Sebastian Geiger <sbastig@gmx.net>
-Date: Sun, 11 Feb 2018 15:27:29 +0100
-Subject: [PATCH] Install appstream metadata in new location
-
-Installing metadata into ${datadir}/appdata is deprecated. The new location
-is ${datadir}/metainfo.
-
-See also https://lintian.debian.org/tags/appstream-metadata-in-legacy-location.html
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 73a8e95..8d935e8 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -39,7 +39,7 @@ MAINTAINERCLEANFILES = \
- Applicationsdir = ${datadir}/applications
- Applications_DATA = tilda.desktop
- 
--Appdatadir = ${datadir}/appdata
-+Appdatadir = ${datadir}/metainfo
- Appdata_DATA = tilda.appdata.xml
- 
- Pixmapsdir = ${datadir}/pixmaps
diff --git a/system/tilda/configure.ac b/system/tilda/configure.ac
new file mode 100644
index 0000000000..133336b7fd
--- /dev/null
+++ b/system/tilda/configure.ac
@@ -0,0 +1,212 @@
+dnl ****************************************************************************
+dnl Tilda autoconf configuration file.
+dnl Use autogen.sh to bootstrap the build system.
+dnl ****************************************************************************
+
+m4_define ([tilda_issues],
+           [https://github.com/lanoxx/tilda/issues])
+
+m4_define ([tilda_repository],
+           [https://github.com/lanoxx/tilda])
+
+AC_PREREQ([2.69])
+
+AC_INIT([Tilda],
+        [2.0.0],
+        [tilda_issues],
+        [tilda],
+        [tilda_repository])
+
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_SRCDIR([src/tilda.c])
+AC_CONFIG_HEADERS([config.h])
+
+AM_INIT_AUTOMAKE([foreign subdir-objects])
+
+# We are going to use silent builds which have a much
+# nicer output. More information can be found here:
+#     https://wiki.gnome.org/Initiatives/GnomeGoals/NicerBuilds
+AM_SILENT_RULES([yes])
+
+# See http://www.gnu.org/savannah-checkouts/gnu/automake/manual/html_node/maintainer_002dmode.html
+# for an explanation of using this macro. The short explanation is:
+#     AM_MAINTAINER_MODE is bad but
+#     AM_MAINTAINER_MODE([enable]) is good
+AM_MAINTAINER_MODE([enable])
+
+# This registers the option '--enable-maintainer-flags' to the ./configure script
+# If this option is set then it activates both the '--enable-debug' and '--enable-debug-functions'
+# options that are defined below. It also activates several flags to the compile such that it
+# will show more warnings and errors to indicate problems in the source code.
+AC_ARG_ENABLE([maintainer-flags],
+	[AS_HELP_STRING([--enable-maintainer-flags],[\
+            Enables extra debugging; use this option if you want to develop for tilda,
+            but to not use it as an end user if you just want to compile and use tilda. \
+            This option includes the --enable-debug and --enable-debug-functions \
+            options. And sets several CFLAGS to enable more gcc warnings and errors.])])
+
+if test "x$enable_maintainer_flags" = "xyes"; then
+	enable_debug="yes"
+	enable_debug_functions="yes"
+	CFLAGS="$CFLAGS \
+            -Wall \
+            -Wextra \
+            -fno-common \
+            -Wstrict-aliasing=2 \
+            -Wshadow \
+            -Wmissing-prototypes \
+            -Wmissing-declarations \
+            -Wcast-align \
+            -Wuninitialized \
+            -Wno-strict-aliasing \
+            -Werror=pointer-arith \
+            -Werror=missing-declarations \
+            -Werror=redundant-decls \
+            -Werror=empty-body \
+            -Werror=format \
+            -Werror=format-security \
+            -Werror=format-nonliteral \
+            -Werror=init-self \
+            -Werror=vla \
+            -Wno-unused-parameter \
+           "
+fi
+
+# This registers the option '--enable-debug' in the ./configure script
+# If this option is set, then the the options -g and -ggdb will be
+# passed to the compiler.
+AC_ARG_ENABLE([debug],
+	[AS_HELP_STRING([--enable-debug],[Enables extra debugging output and \
+                                      sets debug flags for gdb])])
+
+if test "x$enable_debug" = "xyes"; then
+	AC_DEFINE([DEBUG], [1], [Enable extra debugging output])
+	CFLAGS="$CFLAGS -g -ggdb"
+fi
+
+# This registers the option '--debug-functions' in the ./configure script
+# If this option is set, then the name of each entered function will be
+# printed on the shell.
+AC_ARG_ENABLE([debug-functions],
+	[AS_HELP_STRING([--enable-debug-functions],[Enables function call tracing. \
+							                    When this option is enabled tilda will print \
+												the name of each function that is called to the \
+												console.])])
+
+if test "x$enable_debug_functions" = "xyes"; then
+	AC_DEFINE([DEBUG_FUNCTIONS], [1], [Enable function call tracing])
+fi
+
+AC_ARG_ENABLE([clang],
+    [AS_HELP_STRING([--enable-clang],[use clang instead of gcc as C compiler.])])
+
+#Use C99 compilation mode
+if test "x$enable_clang" = "xyes"; then
+    # clang uses c99 mode by default, so we just set CC to clang and we are done
+    CC="clang";
+else
+    # We do not need to set CC as the default is gcc, but we need to set it to
+    # use C99 compilation mode
+    CFLAGS="$CFLAGS -std=c99";
+fi
+
+AC_ARG_ENABLE([lto],
+    [AS_HELP_STRING([--enable-lto],[Optimize at link time. This enables the compiler \
+                                    to do a better job at optimization and (hopefully) \
+                                    produce smaller binaries.])])
+
+if test "x$enable_lto" = "xyes"; then
+    CFLAGS="$CFLAGS -flto"
+    if test "$CC" != "clang"; then
+        # If the user has enabled lto explicitly, we assume he has made sure
+        # that his toolchain can indeed handle lto objects.
+        CFLAGS="$CFLAGS -fno-fat-lto-objects"
+    fi
+    # In the case of lto optimizations, we need to pass the optimization options
+    # to the linker as well as telling it to use the linker plugin.
+    LDFLAGS="$LDFLAGS $CFLAGS -fuse-linker-plugin"
+fi
+
+
+
+AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums, no)
+if test x$GLIB_MKENUMS = xno; then
+  AC_MSG_ERROR(Could not find a glib-mkenums in your PATH)
+fi
+
+AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources, no)
+if test x$GLIB_COMPILE_RESOURCES = xno; then
+  AC_MSG_ERROR(Could not find a glib-compile-resources in your PATH)
+fi
+
+AC_PATH_PROG(GDBUS_CODEGEN, gdbus-codegen, no)
+if test x$GDBUS_CODEGEN = xno; then
+  AC_MSG_ERROR(Could not find a glib-codegen binary in your PATH)
+fi
+
+# Checks for programs.
+AC_PROG_CC
+AM_PROG_CC_C_O
+
+# This will initialize the internationalization
+# capabilities of glib (glib/gi18n.h) and gettext
+AM_GNU_GETTEXT_VERSION([0.18.1])
+AM_GNU_GETTEXT([external])
+# Checks for libraries.
+PKG_PROG_PKG_CONFIG
+PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.10.0])
+PKG_CHECK_MODULES([VTE], [vte-2.91 >= 0.40])
+PKG_CHECK_MODULES([LIBCONFUSE], [libconfuse])
+PKG_CHECK_MODULES([X11], [x11])
+
+# Checks for header files.
+AC_CHECK_HEADERS([fcntl.h malloc.h stdlib.h string.h strings.h sys/ioctl.h unistd.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+
+# Checks for library functions.
+AC_FUNC_MALLOC
+AC_FUNC_STRTOD
+AC_CHECK_FUNCS([mkdir strcasecmp strchr strncasecmp strstr strtol])
+
+AC_CONFIG_FILES([Makefile
+                 po/Makefile.in])
+AC_OUTPUT
+
+dnl ---------------------------------------------------------------------------
+dnl - Show summary
+dnl ---------------------------------------------------------------------------
+
+dnl The following 'for' block splits the CFLAGS variable into multiple lines of 4 options per line
+cflaglines=""
+cflagcount=0
+for flag in ${CFLAGS}; do
+    cflaglines=$cflaglines$flag" "
+    cflagcount=$(($cflagcount+1))
+    if (( $cflagcount % 4 == 0)); then
+       dnl Here we concatenate the current cflaglines variable with a newline and enough spaces
+       dnl such that the lines are correctly indented. Do not try to indent or reformat the
+       dnl position of the double quotes (\").
+       cflaglines=$cflaglines"
+                                       "
+    fi
+done;
+
+echo "
+              ${PACKAGE} $VERSION
+              `echo ${PACKAGE} $VERSION | sed "s/./=/g"`
+
+        prefix:                        ${prefix}
+        datarootdir:                   ${datarootdir}
+        datadir:                       ${datadir}
+        pkgdatadir:                    `if test x${pkgdatadir} != "x"; then echo ${pkgdatadir}; else echo ${datadir}/${PACKAGE}; fi`
+        source code location:          ${srcdir}
+        compiler:                      ${CC}
+        cflags:                        ${cflaglines}
+        Maintainer mode:               ${USE_MAINTAINER_MODE}
+        VTE:                           ${vte_package}
+        Use *_DISABLE_DEPRECATED:      ${enable_deprecation_flags}
+"
diff --git a/system/tilda/tilda.1 b/system/tilda/tilda.1
deleted file mode 100644
index 784217ece6..0000000000
--- a/system/tilda/tilda.1
+++ /dev/null
@@ -1,95 +0,0 @@
-.TH "TILDA" "1" "June 2008" "tilda 0.09.6" "User Commands"
-.SH "NAME"
-tilda \- first person shooter console likeness terminal
-.SH "DESCRIPTION"
-\fBTilda\fR is a terminal emulator taking after the likeness of many classic
-terminals from first person shooter games, Quake, Doom and Half\-Life 
-(to name a few), where the terminal has no border and is hidden from 
-the desktop until a key is pressed.
-.SS "Usage:"
-.IP 
-tilda [OPTION...]
-.SS "Help Options:"
-.TP 
-\fB\-?\fR, \fB\-\-help\fR
-Show help options
-.TP 
-\fB\-\-help\-all\fR
-Show all help options
-.TP 
-\fB\-\-help\-gtk\fR
-Show GTK+ Options
-.SS "Application Options:"
-.TP 
-\fB\-a\fR, \fB\-\-antialias\fR
-Use Antialiased Fonts
-.TP 
-\fB\-b\fR, \fB\-\-background\-color\fR
-Set the background color
-.TP 
-\fB\-c\fR, \fB\-\-command\fR
-Run a command at startup
-.TP 
-\fB\-h\fR, \fB\-\-hidden\fR
-Start Tilda hidden
-.TP 
-\fB\-f\fR, \fB\-\-font\fR
-Set the font to the following string
-.TP 
-\fB\-l\fR, \fB\-\-lines\fR
-Scrollback Lines
-.TP 
-\fB\-s\fR, \fB\-\-scrollbar\fR
-Use Scrollbar
-.TP 
-\fB\-t\fR, \fB\-\-transparency\fR
-Opaqueness: 0\-100%
-.TP 
-\fB\-v\fR, \fB\-\-version\fR
-Print the version, then exit
-.TP 
-\fB\-w\fR, \fB\-\-working\-dir\fR
-Set Initial Working Directory
-.TP 
-\fB\-x\fR, \fB\-\-x\-pos\fR
-X Position
-.TP 
-\fB\-y\fR, \fB\-\-y\-pos\fR
-Y Position
-.TP 
-\fB\-B\fR, \fB\-\-image\fR
-Set Background Image
-.TP 
-\fB\-C\fR, \fB\-\-config\fR
-Show Configuration Wizard
-.TP 
-\fB\-\-display\fR=\fIDISPLAY\fR
-X display to use
-.SH "COPYRIGHT"
-Copyright \(co 2005,2008 Tristan Sloughter (sloutri@iit.edu)
-.br 
-Copyright \(co 2005,2008 Ira W. Snyder (tilda@irasnyder.com)
-.br 
-Copyright \(co 2007,2008 Ken Dreyer (kdreyer@chicagolug.org)
-.PP 
-This program comes with ABSOLUTELY NO WARRANTY.
-This is free software, and you are welcome to redistribute it
-under certain conditions. See the file COPYING for details.
-.SH "SEE ALSO"
-The full documentation for
-.B tilda
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B tilda
-programs are properly installed at your site, the command
-.IP 
-.B info tilda
-.PP 
-should give you access to the complete manual.
-.SH "BUGS"
-Please report it using
-.B "reportbug tilda"
-.SH "AUTHOR"
-Davide Truffa <davide@catoblepa.org> wrote this manpage for
-inclusion on the Debian Project but it could be used for others.
diff --git a/system/tilda/tilda.SlackBuild b/system/tilda/tilda.SlackBuild
index 7937e7e299..8fb9f920bc 100644
--- a/system/tilda/tilda.SlackBuild
+++ b/system/tilda/tilda.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for tilda.
 #
-# Copyright 2017-2018  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2017-2024  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
 # Copyright 2009  Erik W. Hanson, Minneapolis, MN, USA
 #
@@ -25,10 +25,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tilda
-VERSION=${VERSION:-1.4.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.0.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -40,7 +43,14 @@ fi
 
 set -e
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -61,6 +71,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cp -a $CWD/configure.ac $PRGNAM-$PRGNAM-$VERSION/
 cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,8 +80,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 < $CWD/01_install_metadata_in_new_location.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./autogen.sh \
@@ -86,9 +95,6 @@ make install-strip DESTDIR=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/man/man1
-cp $CWD/tilda.1 $PKG/usr/man/man1
-
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
@@ -101,4 +107,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tilda/tilda.info b/system/tilda/tilda.info
index fc23589163..2b01f6de8c 100644
--- a/system/tilda/tilda.info
+++ b/system/tilda/tilda.info
@@ -1,10 +1,10 @@
 PRGNAM="tilda"
-VERSION="1.4.1"
+VERSION="2.0.0"
 HOMEPAGE="https://github.com/lanoxx/tilda"
-DOWNLOAD="https://github.com/lanoxx/tilda/archive/tilda-1.4.1.tar.gz"
-MD5SUM="7570432e482eff73ac8a5ce6d3d6fc38"
+DOWNLOAD="https://github.com/lanoxx/tilda/archive/tilda-2.0.0/tilda-tilda-2.0.0.tar.gz"
+MD5SUM="94b07981c67c300d719fb0bb557cd01e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="confuse vte3"
+REQUIRES="confuse"
 MAINTAINER="Edinaldo P.Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/system/tilix/tilix.SlackBuild b/system/tilix/tilix.SlackBuild
index 0e32eaf2e5..d48b476660 100644
--- a/system/tilix/tilix.SlackBuild
+++ b/system/tilix/tilix.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tilix
 
-# Copyright 2017-2018 Philip van der Hoeven, Almere, The Netherlands
+# Copyright 2022 Damian Perticone, Berisso, Argentina
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tilix
-VERSION=${VERSION:-1.8.5}
+VERSION=${VERSION:-1.9.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,7 +62,6 @@ else
 fi
 
 set -e
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -69,24 +75,45 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Remove suffixes from pkgconfig files
-sed -i 's/gtkd-3$DC_SUFFIX/gtkd-3/g' configure.ac
-sed -i 's/vted-3$DC_SUFFIX/vted-3/g' configure.ac
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS"  \
+  CXXFLAGS="$SLKCFLAGS"  \
+export DC=ldc2
+export LDFLAGS="$(echo -ne $LDFLAGS | sed -e 's/-flto=auto/--flto=full/')"
+meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Db_lto=true \
+    -Dstrip=true 
 
-./autogen.sh
-./configure --prefix=/usr
-make DC='dmd' DCFLAGS='-O -inline -release -version=StdLoggerDisableTrace'
-make install DESTDIR=$PKG
+   "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+
+sed -i 's/${title}/'Default'/g' $PKG/usr/share/glib-2.0/schemas/com.gexperts.Tilix.gschema.xml
+
+cd ..
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mv $PKG/usr/share/man $PKG/usr/
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod \
+  -o -name ".packlist" \
+  -o -name "*.bs" \
+  | xargs rm -f
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  CREDITS.md LICENSE README.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE NEWS README.md  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -94,4 +121,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tilix/tilix.info b/system/tilix/tilix.info
index fc9bf81f65..1f32e77d9d 100644
--- a/system/tilix/tilix.info
+++ b/system/tilix/tilix.info
@@ -1,10 +1,10 @@
 PRGNAM="tilix"
-VERSION="1.8.5"
+VERSION="1.9.5"
 HOMEPAGE="https://gnunn1.github.io/tilix-web/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/gnunn1/tilix/archive/1.8.5/tilix-1.8.5.tar.gz"
-MD5SUM_x86_64="ff94fd12649f5502af20b6a5666a3bbf"
-REQUIRES="GtkD po4a vte3"
-MAINTAINER="Philip van der Hoeven"
-EMAIL="philip@vd-hoeven.nl"
+DOWNLOAD_x86_64="https://github.com/gnunn1/tilix/archive/1.9.5/tilix-1.9.5.tar.gz"
+MD5SUM_x86_64="1c8eaa481f435b4ed13046d9a6e0e1c0"
+REQUIRES="AppStream GtkD po4a"
+MAINTAINER="Damian Perticone"
+EMAIL="mjolnirdam@gmail.com"
diff --git a/system/timeshift/README b/system/timeshift/README
new file mode 100644
index 0000000000..f0c2550934
--- /dev/null
+++ b/system/timeshift/README
@@ -0,0 +1,15 @@
+Timeshift for Linux is an application that provides functionality
+similar to the System Restore feature in Windows and the Time Machine
+tool in Mac OS. Timeshift protects your system by taking incremental
+snapshots of the file system at regular intervals. These snapshots
+can be restored at a later date to undo all changes to the system.
+
+In RSYNC mode, snapshots are taken using rsync and hard-links.
+Common files are shared between snapshots which saves disk space.
+Each snapshot is a full system backup that can be browsed with a
+file manager.
+
+In BTRFS mode, snapshots are taken using the in-built features
+of the BTRFS filesystem. BTRFS snapshots are supported only on
+BTRFS systems having an Ubuntu-type subvolume layout
+(with @ and @home subvolumes).
diff --git a/system/timeshift/doinst.sh b/system/timeshift/doinst.sh
new file mode 100644
index 0000000000..aea0f894eb
--- /dev/null
+++ b/system/timeshift/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/timeshift/slack-desc b/system/timeshift/slack-desc
new file mode 100644
index 0000000000..e734d874d4
--- /dev/null
+++ b/system/timeshift/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+timeshift: timeshift (incremental system snapshots, backup and restore)
+timeshift:
+timeshift: Timeshift for Linux is an application that provides functionality
+timeshift: similar to the System Restore feature in Windows and the Time Machine
+timeshift: tool in Mac OS. Timeshift protects your system by taking incremental
+timeshift: snapshots of the file system at regular intervals. These snapshots
+timeshift: can be restored at a later date to undo all changes to the system.
+timeshift:
+timeshift:
+timeshift:
+timeshift:
diff --git a/system/timeshift/timeshift-launcher b/system/timeshift/timeshift-launcher
new file mode 100644
index 0000000000..37e8cb7ab4
--- /dev/null
+++ b/system/timeshift/timeshift-launcher
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+app_command='timeshift-gtk'
+
+if [ "$(id -u)" -eq 0 ]; then
+	# user is admin
+	${app_command}
+else
+	# user is not admin
+	if echo $- | grep "i" >/dev/null 2>&1; then
+		# script is running in interactive mode
+		su - -c "${app_command}"
+	else
+		# script is running in non-interactive mode
+		gksu ${app_command}
+	fi
+fi
diff --git a/system/timeshift/timeshift.SlackBuild b/system/timeshift/timeshift.SlackBuild
new file mode 100644
index 0000000000..1ec214e7e9
--- /dev/null
+++ b/system/timeshift/timeshift.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# Slackware build script for timeshift
+
+# Copyright 2024 Antonio Leal, Porto Salvo, Oeiras, Portugal
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=timeshift
+VERSION=${VERSION:-24.01.1}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# do not support xapp at this time
+meson build --prefix=/usr -Dxapp=false
+cd build
+meson compile
+DESTDIR=$PKG meson install
+cd ..
+
+# slackware friendly launcher requiring gksu
+install -D -m0755 $CWD/timeshift-launcher $PKG/usr/bin/timeshift-launcher
+
+mv $PKG/usr/share/man $PKG/usr/
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/timeshift/timeshift.info b/system/timeshift/timeshift.info
new file mode 100644
index 0000000000..d3be96c067
--- /dev/null
+++ b/system/timeshift/timeshift.info
@@ -0,0 +1,10 @@
+PRGNAM="timeshift"
+VERSION="24.01.1"
+HOMEPAGE="https://github.com/linuxmint/timeshift"
+DOWNLOAD="https://github.com/linuxmint/timeshift/archive/24.01.1/timeshift-24.01.1.tar.gz"
+MD5SUM="4ecf72bd3cc1f41bc6775ad34a185397"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="gksu"
+MAINTAINER="Antonio Leal"
+EMAIL="antonioleal@yahoo.com"
diff --git a/system/tini/tini.SlackBuild b/system/tini/tini.SlackBuild
index 5ffafbcb8e..960a313691 100644
--- a/system/tini/tini.SlackBuild
+++ b/system/tini/tini.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tini
 
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tini
 GITHASH=${GITHASH:-de40ad0}
 VERSION=${VERSION:-0.19.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -97,4 +107,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tinycdb/README b/system/tinycdb/README
index 3c3724c74c..410c9385f7 100644
--- a/system/tinycdb/README
+++ b/system/tinycdb/README
@@ -1,16 +1,17 @@
-TinyCDB is a very fast and simple package for creating and reading constant
-data bases, a data structure introduced by Dan J. Bernstein in his cdb
-package. It may be used to speed up searches in a sequence of (key,value)
-pairs with very big number of records. Example usage is indexing a  big list
-of users - where a search will require linear reading of a large /etc/passwd
-file, and for many other tasks. It's usage/API is similar to ones found in
-BerkeleyDB, gdbm and traditional *nix dbm/ndbm libraries, and is compatible
-in great extent to cdb-0.75 package by Dan Bernstein.
+TinyCDB is a very fast and simple package for creating and reading
+constant data bases, a data structure introduced by Dan J. Bernstein
+in his cdb package. It may be used to speed up searches in a sequence
+of (key,value) pairs with very big number of records. Example usage
+is indexing a  big list of users - where a search will require linear
+reading of a large /etc/passwd file, and for many other tasks. It's
+usage/API is similar to ones found in BerkeleyDB, gdbm and traditional
+*nix dbm/ndbm libraries, and is compatible in great extent to cdb-0.75
+package by Dan Bernstein.
 
-CDB is a constant database, that is, it cannot be updated at a runtime, only
-rebuilt. Rebuilding is atomic operation and is very fast - much faster than of
-many other similar packages. Once created, CDB may be queried, and a query
-takes very little time to complete.
+CDB is a constant database, that is, it cannot be updated at a
+runtime, only rebuilt. Rebuilding is atomic operation and is very fast
+- much faster than of many other similar packages. Once created, CDB
+may be queried, and a query takes very little time to complete.
 
-The SlackBuild will install both the binary cdb as well the system library for
-use in other applications such as Postfix.
+The SlackBuild will install both the binary cdb as well the system
+library for use in other applications such as Postfix.
diff --git a/system/tinycdb/tinycdb.SlackBuild b/system/tinycdb/tinycdb.SlackBuild
index d83e626f57..5455bafb3b 100644
--- a/system/tinycdb/tinycdb.SlackBuild
+++ b/system/tinycdb/tinycdb.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tinycdb
 
@@ -8,10 +8,13 @@
 # I am not responsible for any consequences that follow from the
 # incorrect use of this script.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tinycdb
 VERSION=${VERSION:-0.78}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -21,7 +24,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -74,5 +84,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
 
diff --git a/system/tinyterm/README b/system/tinyterm/README
index 03583ef861..525a2a76e7 100644
--- a/system/tinyterm/README
+++ b/system/tinyterm/README
@@ -1,9 +1,11 @@
+tinyterm (simple terminal)
+
 tinyterm is a simple X terminal emulator written in C.
 
-It supports Ctrl + Shift + C and Ctrl + Shift + V for copy and paste actions.
+It supports copy & paste with Ctrl+Shift+C and Ctrl+Shift+V.
 
-Most of tinyterm's configuration is compiled in, rather than being read
-from config files or command-line options. To build a customized tinyterm,
-copy config.h from the tinyterm source to the SlackBuild's directory and
-edit as you see fit. Probably the most important change for most people
-will be to increase the font size (TINYTERM_FONT).
+Most of tinyterm's configuration is compiled in, rather than being
+read from config files or command-line options. To customize tinyterm,
+copy config.h from the tinyterm source to the SlackBuild's directory
+and edit as you see fit. Probably the most important change for most
+people will be to increase the font size (TINYTERM_FONT).
diff --git a/system/tinyterm/slack-desc b/system/tinyterm/slack-desc
index 32a74afb40..f8e7598829 100644
--- a/system/tinyterm/slack-desc
+++ b/system/tinyterm/slack-desc
@@ -10,10 +10,10 @@ tinyterm: tinyterm (simple terminal)
 tinyterm:
 tinyterm: tinyterm is a simple X terminal emulator written in C.
 tinyterm:
-tinyterm: It supports copy & paste with:
-tinyterm: Ctrl + Shift + C and Ctrl + Shift + V.
+tinyterm: It supports copy & paste with Ctrl+Shift+C and Ctrl+Shift+V.
+tinyterm:
+tinyterm: Homepage: https://github.com/ryanpcmcquen/tinyterm
 tinyterm:
-tinyterm: https://github.com/ryanpcmcquen/tinyterm
 tinyterm:
 tinyterm:
 tinyterm:
diff --git a/system/tinyterm/tinyterm.SlackBuild b/system/tinyterm/tinyterm.SlackBuild
index d7d3da0215..f3eb188896 100644
--- a/system/tinyterm/tinyterm.SlackBuild
+++ b/system/tinyterm/tinyterm.SlackBuild
@@ -1,29 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tinyterm
 
 # Originally written by:
 # Ryan P.C. McQuen | Everett, WA | (email removed)
 
-# Now maintained by B. Watson (yalhcru@gmail.com)
+# Now maintained by B. Watson (urchlay@slackware.uk)
 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version, with the following exception:
-# the text of the GPL license may be omitted.
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# This program is distributed in the hope that it will be useful, but
-# without any warranty; without even the implied warranty of
-# merchantability or fitness for a particular purpose. Compiling,
-# interpreting, executing or merely reading the text of the program
-# may result in lapses of consciousness and/or very being, up to and
-# including the end of all existence and the Universe as we know it.
-# See the GNU General Public License for more details.
-
-# You may have received a copy of the GNU General Public License along
-# with this program (most likely, a file named COPYING).  If not, see
-# <http://www.gnu.org/licenses/>.
+# 20210823 bkw: relicense as WTFPL with original author's permission
 
 # 20200114 bkw: update for v0.6.0
 
@@ -35,10 +21,13 @@
 # - allow custom config.h
 # - BUILD=2
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tinyterm
 VERSION=${VERSION:-0.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -48,7 +37,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -100,4 +93,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tinyterm/tinyterm.info b/system/tinyterm/tinyterm.info
index d27383884f..d2b2566dda 100644
--- a/system/tinyterm/tinyterm.info
+++ b/system/tinyterm/tinyterm.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/ryanpcmcquen/tinyterm/archive/0.6.0/tinyterm-0.6.0.
 MD5SUM="e9adc2bc038576dfaa51cb4390b1100b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="vte2"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/tinyvm/README b/system/tinyvm/README
deleted file mode 100644
index 5ba4f604b7..0000000000
--- a/system/tinyvm/README
+++ /dev/null
@@ -1,17 +0,0 @@
-TinyVM is a virtual machine with the goal of having a small footprint.
-Low memory usage, a small amount of code, and a small binary.
-
-Building can be accomplished on UNIX-like systems with make and GCC.
-
-There are no external dependencies, save the C standard library.
-
-There are some included example programs that will be installed to:
-
-  /usr/doc/tinyvm-$VERSION/programs/
-
-The main executable is `tvmi`.
-
-TinyVM does NOT implement a "real" architecture such as x86 or arm. In
-other words, it's not a replacement for qemu or virtualbox. The VM
-implemented here is loosely based on the x86 architecture, but highly
-simplified.
diff --git a/system/tinyvm/slack-desc b/system/tinyvm/slack-desc
deleted file mode 100644
index 3bc4330b24..0000000000
--- a/system/tinyvm/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-      |-----handy-ruler------------------------------------------------------|
-tinyvm: tinyvm (small virtual machine)
-tinyvm:
-tinyvm: TinyVM is a small, fast, lightweight virtual machine
-tinyvm: written in pure ANSI C.
-tinyvm:
-tinyvm:
-tinyvm:
-tinyvm:
-tinyvm: https://github.com/jakogut/tinyvm
-tinyvm:
-tinyvm:
diff --git a/system/tinyvm/tinyvm.SlackBuild b/system/tinyvm/tinyvm.SlackBuild
deleted file mode 100644
index 94b2eb5c1b..0000000000
--- a/system/tinyvm/tinyvm.SlackBuild
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for tinyvm
-
-# Originally written by:
-# Ryan P.C. McQuen | Everett, WA | (email removed)
-
-# Now maintained by B. Watson (yalhcru@gmail.com)
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version, with the following exception:
-# the text of the GPL license may be omitted.
-
-# This program is distributed in the hope that it will be useful, but
-# without any warranty; without even the implied warranty of
-# merchantability or fitness for a particular purpose. Compiling,
-# interpreting, executing or merely reading the text of the program
-# may result in lapses of consciousness and/or very being, up to and
-# including the end of all existence and the Universe as we know it.
-# See the GNU General Public License for more details.
-
-# You may have received a copy of the GNU General Public License along
-# with this program (most likely, a file named COPYING).  If not, see
-# <http://www.gnu.org/licenses/>.
-
-# 20201108 bkw: update for 20180322 (latest git)
-# 20170308 bkw:
-# - take over maintenance
-# - update to 20170212 (latest git commit)
-# - i486 => i586
-# - add some clarification to README
-
-PRGNAM=tinyvm
-VERSION=${VERSION:-20180322}
-SRCVER=${SRCVER:-10c25d83e442caf0c1fc4b0ab29a91b3805d72ec}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
-cd $PRGNAM-$SRCVER
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-## default compiler (clang)
-make OPTS="$SLKCFLAGS"
-
-## if you want to build tinyvm with a different
-## compiler, make sure you comment out all but
-## one `make` line
-##
-## gcc
-#make CC=gcc OPTS="$SLKCFLAGS"
-## pcc
-#make CC=pcc PEDANTIC=no OPTIMIZATION="-O2 -fPIC -xinline"
-
-mkdir -p $PKG/usr/bin $PKG/usr/include $PKG/usr/lib${LIBDIRSUFFIX}
-
-install -m0755 -s bin/* $PKG/usr/bin/
-cp -rf include/tvm $PKG/usr/include/
-install -m0644 lib/* $PKG/usr/lib${LIBDIRSUFFIX}/
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp $CWD/README $PKG/usr/doc/$PRGNAM-$VERSION/README-SBo
-cp LICENSE README SYNTAX TODO $PKG/usr/doc/$PRGNAM-$VERSION
-cp -r programs/ $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/tinyvm/tinyvm.info b/system/tinyvm/tinyvm.info
deleted file mode 100644
index 1bad6e47dd..0000000000
--- a/system/tinyvm/tinyvm.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="tinyvm"
-VERSION="20180322"
-HOMEPAGE="https://github.com/jakogut/tinyvm"
-DOWNLOAD="https://github.com/jakogut/tinyvm/archive/10c25d83e442caf0c1fc4b0ab29a91b3805d72ec/tinyvm-10c25d83e442caf0c1fc4b0ab29a91b3805d72ec.tar.gz"
-MD5SUM="95f649139746c6c5100fac113de518e1"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/tio/README b/system/tio/README
new file mode 100644
index 0000000000..f1eb09e35c
--- /dev/null
+++ b/system/tio/README
@@ -0,0 +1,39 @@
+tio - a simple serial device I/O tool
+
+tio is a simple serial device tool which features a straightforward
+command-line and configuration file interface to easily connect to
+serial TTY devices for basic I/O operations.
+
+Features:
+
+- Easily connect to serial TTY devices
+- Automatic connect and reconnect
+- Sensible defaults (115200 8n1)
+- Support for non-standard baud rates
+- Support for mark and space parity
+- X-modem (1K) and Y-modem file upload
+- Support for RS-485 mode
+- List available serial devices by ID
+- Show RX/TX statistics
+- Toggle serial lines
+- Pulse serial lines with configurable pulse duration
+- Local echo support
+- Remapping of characters (nl, cr-nl, bs, lowercase to uppercase, etc.)
+- Line timestamps
+- Support for delayed output per character
+- Support for delayed output per line
+- Hexadecimal mode
+- Log to file
+- Autogeneration of log filename
+- Configuration file support
+- Activate sub-configurations by name or pattern
+- Redirect I/O to UNIX socket or IPv4/v6 network socket for scripting or TTY sharing
+- Pipe input and/or output
+- Support for simple line request/response handling
+- Bash completion on options, serial device names, and sub-configuration names
+- Configurable text color
+- Visual or audible alert on connect/disconnect
+- Remapping of prefix key
+- Man page documentation
+- Binary size less than 90kB
+- Plays nicely with [tmux](https://tmux.github.io)
diff --git a/system/tio/slack-desc b/system/tio/slack-desc
new file mode 100644
index 0000000000..31a8df7b18
--- /dev/null
+++ b/system/tio/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+tio: tio (a simple serial device I/O tool)
+tio:
+tio: tio is a simple serial device tool which features a straightforward
+tio: command-line and configuration file interface to easily connect to
+tio: serial TTY devices for basic I/O operations.
+tio:
+tio: Homepage: https://github.com/tio/tio
+tio:
+tio:
+tio:
+tio:
diff --git a/system/tio/tio.SlackBuild b/system/tio/tio.SlackBuild
new file mode 100644
index 0000000000..3ee50d5092
--- /dev/null
+++ b/system/tio/tio.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+# Slackware build script for tio
+
+# Copyright 2024 Andrzej Telszewski, Koszalin
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=tio
+VERSION=${VERSION:-2.7}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -eu
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+
+chown -R root:root .
+chmod -R a-st,u+rwX,go-w+rX .
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+meson setup \
+  --buildtype=release \
+  --mandir=/usr/man \
+  --prefix=/usr \
+  --sysconfdir=/etc \
+  -Dbashcompletiondir=/etc/bash_completion.d \
+  . build
+
+meson compile -C build
+meson install -C build --destdir=$PKG
+
+strip --strip-unneeded $PKG/usr/bin/tio
+gzip -9 $PKG/usr/man/man1/tio.1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a example AUTHORS LICENSE NEWS README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tio/tio.info b/system/tio/tio.info
new file mode 100644
index 0000000000..35528e770e
--- /dev/null
+++ b/system/tio/tio.info
@@ -0,0 +1,10 @@
+PRGNAM="tio"
+VERSION="2.7"
+HOMEPAGE="https://github.com/tio/tio"
+DOWNLOAD="https://github.com/tio/tio/releases/download/v2.7/tio-2.7.tar.xz"
+MD5SUM="58f589d1e9382e8cdebce4de03c6a797"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andrzej Telszewski"
+EMAIL="andrzej@telszewski.com"
diff --git a/system/tkdvd/tkdvd.SlackBuild b/system/tkdvd/tkdvd.SlackBuild
index 93550a8a42..92c08ae676 100644
--- a/system/tkdvd/tkdvd.SlackBuild
+++ b/system/tkdvd/tkdvd.SlackBuild
@@ -1,23 +1,33 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tkdvd
 
 # Written by Luis Henrique <lmello.009@gmail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tkdvd
 VERSION=${VERSION:-4.0.9}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -57,4 +67,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tkinfo/README b/system/tkinfo/README
new file mode 100644
index 0000000000..1a1a88adbb
--- /dev/null
+++ b/system/tkinfo/README
@@ -0,0 +1,6 @@
+tkinfo is a graphical Tcl/Tk-based browser for documentation in the info
+hypertext format which is used by the GNU project. Can also be embedded
+into other Tcl/Tk programs.
+
+It can use tkman and rman if those are available, to be also able to
+browse man pages.
diff --git a/system/tkinfo/slack-desc b/system/tkinfo/slack-desc
new file mode 100644
index 0000000000..10ef6b027d
--- /dev/null
+++ b/system/tkinfo/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+tkinfo: tkinfo (Tcl/Tk-based browser for documentation in the info format)
+tkinfo:
+tkinfo: A graphical Tcl/Tk-based browser for documentation in the info
+tkinfo: hypertext format which is used by the GNU project. Can also be
+tkinfo: embedded into other Tcl/Tk programs.
+tkinfo:
+tkinfo:
+tkinfo:
+tkinfo:
+tkinfo:
+tkinfo:
diff --git a/system/tkinfo/tkinfo.SlackBuild b/system/tkinfo/tkinfo.SlackBuild
new file mode 100644
index 0000000000..c3c3c1c142
--- /dev/null
+++ b/system/tkinfo/tkinfo.SlackBuild
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+# Slackware build script for tkinfo
+
+# Copyright 2023, Lockywolf
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=tkinfo
+VERSION=${VERSION:-2.11}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/bin/
+install -m 755 tkinfo $PKG/usr/bin
+mkdir -p $PKG/usr/share/pixmaps/
+install -m 0644 TkInfo.xpm $PKG/usr/share/pixmaps/
+mkdir -p $PKG/usr/man/man1
+install -m 0644  tkinfo.1 $PKG/usr/man/man1
+
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tkinfo/tkinfo.info b/system/tkinfo/tkinfo.info
new file mode 100644
index 0000000000..b82ae6b3cf
--- /dev/null
+++ b/system/tkinfo/tkinfo.info
@@ -0,0 +1,10 @@
+PRGNAM="tkinfo"
+VERSION="2.11"
+HOMEPAGE="http://math-www.uni-paderborn.de/~axel/tkinfo/"
+DOWNLOAD="http://math-www.uni-paderborn.de/~axel/tkinfo/tkinfo-2.11.tar.gz"
+MD5SUM="609884b80a4c7ed4bb701de2da0abf67"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.tkinfo_2023-11-30@lockywolf.net"
diff --git a/system/tm/README b/system/tm/README
index b5c10f468c..b0b2b9390a 100644
--- a/system/tm/README
+++ b/system/tm/README
@@ -1,33 +1,13 @@
 * tm - tmux manager/helper
 
-This is a shell script used to ease day-to-day work with tmux (included
-with Slackware). It allows easy handling of various types of tmux sessions,
-as well as complex setups. It is mainly useful for using tmux as a
-ssh-multiplexer and replacement for clusterssh though its happy to do any
-other tmux session too.
+This is a shell script used to ease day-to-day work with tmux
+(included with Slackware). It allows easy handling of various types
+of tmux sessions, as well as complex setups. It is mainly useful for
+using tmux as a ssh-multiplexer and replacement for clusterssh though
+its happy to do any other tmux session too.
 
 "tm" can be driven directly from the command line or by using
-repeatable session files. See /usr/doc/tm-yyyymmdd/README.org & examples/
+repeatable session files. See /usr/doc/tm-yyyymmdd/README.org &
+examples/
 
-To create a repeatable tm/tmux session file:
-create folder: ~.tmux.d
-create file: remotes (example)
-
-REMOTES
-NONE
-root@remote_host1
-root@remote_host2
-
-The stock Slackware /etc/tmux.conf file can be modified to work better with
-multiple tmux panes. These changes help if replacing clusterssh with tm/tmux.
-The lines below are copied from /usr/doc/tmux-x.x/example_tmux.conf
-and added to a stock Slackware /etc/tmux.conf.
-
-# Turn the mouse on, but without copy mode dragging
-set -g mouse on
-unbind -n MouseDrag1Pane
-unbind -Tcopy-mode MouseDrag1Pane
-
-# Keys to toggle monitoring activity in a window, and synchronize-panes
-bind m set monitor-activity
-bind y set synchronize-panes\; display 'synchronize-panes #{?synchronize-panes,on,off}'
+See README.SBo for post-install config instructions.
diff --git a/system/tm/README.SBo b/system/tm/README.SBo
new file mode 100644
index 0000000000..2a9cac8cd0
--- /dev/null
+++ b/system/tm/README.SBo
@@ -0,0 +1,23 @@
+To create a repeatable tm/tmux session file:
+create folder: ~.tmux.d
+create file: remotes (example)
+
+REMOTES
+NONE
+root@remote_host1
+root@remote_host2
+
+The stock Slackware /etc/tmux.conf file can be modified to
+work better with multiple tmux panes. These changes help if
+replacing clusterssh with tm/tmux.  The lines below are copied from
+/usr/doc/tmux-x.x/example_tmux.conf and added to a stock Slackware
+/etc/tmux.conf.
+
+# Turn the mouse on, but without copy mode dragging
+set -g mouse on
+unbind -n MouseDrag1Pane
+unbind -Tcopy-mode MouseDrag1Pane
+
+# Keys to toggle monitoring activity in a window, and synchronize-panes
+bind m set monitor-activity
+bind y set synchronize-panes\; display 'synchronize-panes #{?synchronize-panes,on,off}'
diff --git a/system/tm/tm.SlackBuild b/system/tm/tm.SlackBuild
index 49830e6b86..e00f5b9095 100644
--- a/system/tm/tm.SlackBuild
+++ b/system/tm/tm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for:
 # tm - tmux manager/helper. Use as clusterssh replacement.
@@ -23,38 +23,30 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220212 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - mirror the source (original site is gone).
+# - make this noarch, since it's just a shell script.
+# - install the zsh completion in the right place.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tm
 VERSION=${VERSION:-20180206}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -66,22 +58,25 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+mkdir -p $PKG/usr/bin
+cp -a tm $PKG/usr/bin/
+
+ZSHVER="$( zsh --version | cut -d' ' -f2 )"
+if [ -n "$ZSHVER" ]; then
+  mkdir -p $PKG/usr/share/zsh/$ZSHVER/functions
+  cp -a _tm $PKG/usr/share/zsh/$ZSHVER/functions
+fi
 
-# Include the doc files
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a examples LICENSE README.org $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Include the bin files
-mkdir -p $PKG/usr/bin
-cp -a _tm tm $PKG/usr/bin/
-
-# Include the slackbuild files
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tm/tm.info b/system/tm/tm.info
index 657eb7cf64..e8e8d478df 100644
--- a/system/tm/tm.info
+++ b/system/tm/tm.info
@@ -1,7 +1,7 @@
 PRGNAM="tm"
 VERSION="20180206"
 HOMEPAGE="https://blog.ganneff.de/2013/03/tmux-like-screen-just-nicer.html"
-DOWNLOAD="https://www.go4it2day.com/downloads/tm-20180206.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/tm-20180206.tar.gz"
 MD5SUM="87c45bcb4e91dbc793c225aec34f128d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/tmpwatch/tmpwatch.SlackBuild b/system/tmpwatch/tmpwatch.SlackBuild
index ade8a5fdd8..343a48c53e 100644
--- a/system/tmpwatch/tmpwatch.SlackBuild
+++ b/system/tmpwatch/tmpwatch.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tmpwatch
 
@@ -8,10 +8,13 @@
 # I am not responsible for any consequences that follow from the
 # incorrect use of this script.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tmpwatch
 VERSION=${VERSION:-2.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -21,7 +24,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -75,6 +85,6 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
 
 
diff --git a/system/tmsu-bin/README b/system/tmsu-bin/README
new file mode 100644
index 0000000000..9237306c5c
--- /dev/null
+++ b/system/tmsu-bin/README
@@ -0,0 +1,12 @@
+TMSU is a tool for tagging your files. It provides a simple
+command-line tool for applying tags and a virtual filesystem so that
+you can get a tag-based view of your files from within any other
+program.
+
+TMSU does not alter your files in any way: they remain unchanged on
+disk, or on the network, wherever you put them. TMSU maintains its own
+database and you simply gain an additional view, which you can mount,
+based upon the tags you set up. The only commitment required is your
+time and there's absolutely no lock-in.
+
+This SlackBuild repackages the official binary tarball.
diff --git a/system/tmsu-bin/slack-desc b/system/tmsu-bin/slack-desc
new file mode 100644
index 0000000000..9e41ebae1e
--- /dev/null
+++ b/system/tmsu-bin/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+tmsu-bin: tmsu-bin (tool for tagging files)
+tmsu-bin:
+tmsu-bin: TMSU is a tool for tagging your files. It provides a simple
+tmsu-bin: command-line tool for applying tags and a virtual filesystem so that
+tmsu-bin: you can get a tag-based view of your files from within any other
+tmsu-bin: program.
+tmsu-bin:
+tmsu-bin: https://tmsu.org
+tmsu-bin:
+tmsu-bin:
+tmsu-bin:
diff --git a/system/tmsu-bin/tmsu-bin.SlackBuild b/system/tmsu-bin/tmsu-bin.SlackBuild
new file mode 100644
index 0000000000..0df7a2b397
--- /dev/null
+++ b/system/tmsu-bin/tmsu-bin.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/bash
+
+# Slackware build script for tmsu-bin
+
+# Copyright 2022 toolonely <lonely_@tutanota.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=tmsu-bin
+VERSION=${VERSION:-0.7.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+SRCNAM=${PRGNAM%-bin}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+if [ "$ARCH" != "x86_64" ]; then
+  echo "Package for $ARCH architecture is not available."
+  exit 1
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$ARCH-$VERSION.tgz
+cd $SRCNAM-$ARCH-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/bin
+cp -a bin/* $PKG/usr/bin
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/man/man1
+cp -a man/$SRCNAM.1.gz $PKG/usr/man/man1
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md \
+  COPYING.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tmsu-bin/tmsu-bin.info b/system/tmsu-bin/tmsu-bin.info
new file mode 100644
index 0000000000..ce52fe5549
--- /dev/null
+++ b/system/tmsu-bin/tmsu-bin.info
@@ -0,0 +1,10 @@
+PRGNAM="tmsu-bin"
+VERSION="0.7.5"
+HOMEPAGE="https://tmsu.org"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://github.com/oniony/TMSU/releases/download/v0.7.5/tmsu-x86_64-0.7.5.tgz"
+MD5SUM_x86_64="266bb562b8831370c76a4beb341d9e10"
+REQUIRES=""
+MAINTAINER="toolonely"
+EMAIL="lonely_@tutanota.com"
diff --git a/system/tmuxp/tmuxp.SlackBuild b/system/tmuxp/tmuxp.SlackBuild
index aa4879755a..022f11b853 100644
--- a/system/tmuxp/tmuxp.SlackBuild
+++ b/system/tmuxp/tmuxp.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tmuxp
 
-# Copyright 2014-2021  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2022-2024  fourtysixandtwo <fourtysixandtwo@sliderr.net>
+# Copyright 2014-2022  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220512 46and2: Updated version, fix README, New maintainer.
+# 20220919 46and2: Updated version, change build process.
+# 20221007 46and2: Updated version, drop kaptan as dep.
+# 20221007 46and2: Rebuilt for python3-libtmux
+# 20221210 46and2: Updated version, drop click dep.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tmuxp
-VERSION=${VERSION:-1.7.0}
+VERSION=${VERSION:-1.45.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,25 +45,15 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -65,22 +65,26 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-python3 setup.py install --root=$PKG
+python3 -m build --no-isolation
+python3 -m installer -d "$PKG" dist/*.whl
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES LICENSE PKG-INFO README.rst docs/*.rst $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES LICENSE PKG-INFO README.md docs/*.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# examples
+install -vDm 644 examples/*.{json,yaml} -t "$PKG/usr/doc/$PRGNAM-$VERSION/examples/"
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tmuxp/tmuxp.info b/system/tmuxp/tmuxp.info
index 53558856aa..c134edec3d 100644
--- a/system/tmuxp/tmuxp.info
+++ b/system/tmuxp/tmuxp.info
@@ -1,10 +1,10 @@
 PRGNAM="tmuxp"
-VERSION="1.7.0"
+VERSION="1.45.0"
 HOMEPAGE="https://github.com/tony/tmuxp/"
-DOWNLOAD="https://files.pythonhosted.org/packages/4f/c8/80c974b3c373d479945a2e4ad6b3a655547af5121854b5213ad78ec46401/tmuxp-1.7.0.tar.gz"
-MD5SUM="c12a96d257b78337422f04418367ccae"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/t/tmuxp/tmuxp-1.45.0.tar.gz"
+MD5SUM="2b137a14e27b20c0b6112e467b333b99"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="kaptan click colorama python-libtmux python3-PyYAML"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+REQUIRES="colorama python3-libtmux"
+MAINTAINER="fourtysixandtwo"
+EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/system/tokyocabinet/tokyocabinet.SlackBuild b/system/tokyocabinet/tokyocabinet.SlackBuild
index 7cb2fb78e9..353ec0e85d 100644
--- a/system/tokyocabinet/tokyocabinet.SlackBuild
+++ b/system/tokyocabinet/tokyocabinet.SlackBuild
@@ -1,28 +1,38 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Tokyo Cabinet
 # Written by kuroi_kenshi <kuroi_kenshi96@yahoo.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tokyocabinet
 VERSION=${VERSION:-1.4.43}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -81,4 +91,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tokyotyrant/tokyotyrant.SlackBuild b/system/tokyotyrant/tokyotyrant.SlackBuild
index 0f89a7dd51..6f3780d3a1 100644
--- a/system/tokyotyrant/tokyotyrant.SlackBuild
+++ b/system/tokyotyrant/tokyotyrant.SlackBuild
@@ -1,28 +1,38 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Tokyo Tyrant
 # Written by kuroi_kenshi <kuroi_kenshi96@yahoo.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tokyotyrant
 VERSION=${VERSION:-1.1.40}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -81,4 +91,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tomb/README b/system/tomb/README
index 2c2fbc2fba..2743d7c129 100644
--- a/system/tomb/README
+++ b/system/tomb/README
@@ -2,7 +2,5 @@ Tomb is an 100% free and open source system for file encryption on
 GNU/Linux, facilitating the backup of secret files.
 
 Optional deps:
-- haveged: fast entropy generation for key forging
 - unoconv: fast search of contents in PDF and DOC files
-- qrencode: engrave keys into printable qrcode sheets
 - steghide: bury and exhume keys inside images
diff --git a/system/tomb/tomb.SlackBuild b/system/tomb/tomb.SlackBuild
index 0d1c22c077..075b17352c 100644
--- a/system/tomb/tomb.SlackBuild
+++ b/system/tomb/tomb.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tomb
 
-# Copyright 2015-2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2015-2023 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tomb
 SRCNAM=Tomb
-VERSION=${VERSION:-2.6}
+VERSION=${VERSION:-2.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -78,4 +85,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tomb/tomb.info b/system/tomb/tomb.info
index f55b83777c..8dc44ee390 100644
--- a/system/tomb/tomb.info
+++ b/system/tomb/tomb.info
@@ -1,8 +1,8 @@
 PRGNAM="tomb"
-VERSION="2.6"
+VERSION="2.10"
 HOMEPAGE="https://www.dyne.org/software/tomb/"
-DOWNLOAD="https://github.com/dyne/Tomb/archive/v2.6/Tomb-2.6.tar.gz"
-MD5SUM="1c3d2d01f2ee70e725d544b41d6c8db3"
+DOWNLOAD="https://github.com/dyne/Tomb/archive/v2.10/Tomb-2.10.tar.gz"
+MD5SUM="2f253f328ca25303a130766826b62a37"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/torrent-file-editor/README b/system/torrent-file-editor/README
new file mode 100644
index 0000000000..90bb7576c1
--- /dev/null
+++ b/system/torrent-file-editor/README
@@ -0,0 +1,10 @@
+torrent-file-editor - GUI tool for creating and editing .torrent files
+
+Cross-platform Qt application intended to create and edit .torrent and
+uTorrent .dat files. Replacement for BEncode Editor with modern design
+and extra features.
+
+Can also be used on command-line to convert .torrent files to and from
+JSON format.
+
+BEncode Editor: https://sites.google.com/site/ultimasites/bencode-editor
diff --git a/system/torrent-file-editor/doinst.sh b/system/torrent-file-editor/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/system/torrent-file-editor/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/torrent-file-editor/slack-desc b/system/torrent-file-editor/slack-desc
new file mode 100644
index 0000000000..8c27acc14c
--- /dev/null
+++ b/system/torrent-file-editor/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                   |-----handy-ruler------------------------------------------------------|
+torrent-file-editor: torrent-file-editor (GUI tool for creating and editing .torrent files)
+torrent-file-editor:
+torrent-file-editor: Cross-platform Qt application intended to create and edit .torrent and
+torrent-file-editor: uTorrent .dat files. Replacement for BEncode Editor with modern design
+torrent-file-editor: and extra features.
+torrent-file-editor:
+torrent-file-editor: Can also be used on command-line to convert .torrent files to and from
+torrent-file-editor: JSON format.
+torrent-file-editor:
+torrent-file-editor: https://torrent-file-editor.github.io/
+torrent-file-editor:
diff --git a/system/torrent-file-editor/torrent-file-editor.SlackBuild b/system/torrent-file-editor/torrent-file-editor.SlackBuild
new file mode 100644
index 0000000000..58c9cdc614
--- /dev/null
+++ b/system/torrent-file-editor/torrent-file-editor.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+# Slackware build script for torrent-file-editor
+
+# Copyright 2023 xaizek <xaizek@posteo.net>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=torrent-file-editor
+VERSION=${VERSION:-0.3.18}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# -Werror is automatically enabled for release mode...
+sed -i '/Werror/d' CMakeLists.txt
+# reported version is wrong
+sed -i '/APP_VERSION/s/0.3.17/0.3.18/' CMakeLists.txt
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/torrent-file-editor/torrent-file-editor.info b/system/torrent-file-editor/torrent-file-editor.info
new file mode 100644
index 0000000000..d99e63b8ae
--- /dev/null
+++ b/system/torrent-file-editor/torrent-file-editor.info
@@ -0,0 +1,10 @@
+PRGNAM="torrent-file-editor"
+VERSION="0.3.18"
+HOMEPAGE="https://torrent-file-editor.github.io/"
+DOWNLOAD="https://github.com/torrent-file-editor/torrent-file-editor/releases/download/v0.3.18/torrent-file-editor-0.3.18.tar.gz"
+MD5SUM="6344c11b945cfd4b18a63d58dcc343e9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="xaizek"
+EMAIL="xaizek@posteo.net"
diff --git a/system/tp_smapi/tp_smapi.SlackBuild b/system/tp_smapi/tp_smapi.SlackBuild
index 21870942ba..1056545e07 100644
--- a/system/tp_smapi/tp_smapi.SlackBuild
+++ b/system/tp_smapi/tp_smapi.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tp_smapi
 
@@ -21,10 +21,13 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tp_smapi
 VERSION=${VERSION:-0.43}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 KERNEL=${KERNEL:-"$(uname -r)"}
 
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-${VERSION}_$(echo $KERNEL | tr '-' '_')-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -112,4 +122,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION\_$(echo ${KERNEL} | tr '-' '_')-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION\_$(echo ${KERNEL} | tr '-' '_')-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tpc/tpc.SlackBuild b/system/tpc/tpc.SlackBuild
index c36edff0ea..bacffe0c44 100644
--- a/system/tpc/tpc.SlackBuild
+++ b/system/tpc/tpc.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Copyright 2014 Nikos Yotis <nikos.giotis@gmail.com>
 # All rights reserved.
 #
@@ -19,11 +19,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220209 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tpc
 VERSION=${VERSION:-0.44rc2}
 RC_VERSION=${RC_VERSION:-0.44-rc2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -33,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,6 +76,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# 20220209 bkw: stupidity. does MSVC's round() really return int?
+sed -i 's,^,//,' MSVC_Round*
+
 CXXFLAGS="$SLKCFLAGS" make
 mkdir -p $PKG/usr/bin
 make install DESTDIR=$PKG
@@ -78,4 +90,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tpe-kmod/README b/system/tpe-kmod/README
deleted file mode 100644
index 87899273e1..0000000000
--- a/system/tpe-kmod/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Trusted Path Execution is a security feature that denies users from executing
-programs that are not owned by root, or are writable. This closes the door on a
-whole category of exploits where a malicious user tries to execute his or her
-own code to attack the system.
-
-Since this module doesn't use any kind of ACLs, it works out of the box with no
-configuration. It isn't complicated to test or deploy to current production
-systems. Just install it and you're done!
diff --git a/system/tpe-kmod/doinst.sh b/system/tpe-kmod/doinst.sh
deleted file mode 100644
index ecc1b57efb..0000000000
--- a/system/tpe-kmod/doinst.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/modprobe.d/tpe.conf.new
-config etc/sysctl.d/tpe.conf.new
diff --git a/system/tpe-kmod/slack-desc b/system/tpe-kmod/slack-desc
deleted file mode 100644
index c7475ac19b..0000000000
--- a/system/tpe-kmod/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-        |-----handy-ruler------------------------------------------------------|
-tpe-kmod: tpe-kmod (Trusted Path Execution Linux Kernel Module)
-tpe-kmod:
-tpe-kmod: Trusted Path Execution is a security feature that denies users from
-tpe-kmod: executing programs that are not owned by root, or are writable.
-tpe-kmod: This closes the door on a whole category of exploits where a malicious
-tpe-kmod: user tries to execute his or her own code to attack the system.
-tpe-kmod:
-tpe-kmod:
-tpe-kmod:
-tpe-kmod: Homepage: https://github.com/cormander/tpe-lkm
-tpe-kmod:
diff --git a/system/tpe-kmod/tpe-kmod.SlackBuild b/system/tpe-kmod/tpe-kmod.SlackBuild
deleted file mode 100644
index 6cbcbd8144..0000000000
--- a/system/tpe-kmod/tpe-kmod.SlackBuild
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for TPE LKM
-
-# Copyright 2019 pyllyukko
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=tpe-kmod
-VERSION=${VERSION:-2.0.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd tpe-lkm-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-make
-make install_files DESTDIR=$PKG
-
-mv -v $PKG/etc/sysctl.d/tpe.conf{,.new}
-mv -v $PKG/etc/modprobe.d/tpe.conf{,.new}
-
-# Sign the kernel module (if available)
-if [ -f /proc/config.gz ]
-then
-  if [ -z "${CONFIG_MODULE_SIG_HASH}" ]; then
-    eval $(zgrep "^CONFIG_MODULE_SIG_HASH=" /proc/config.gz)
-  fi
-  KERNVER=$(uname -r)
-  KERNSRC=${KERNSRC:-/lib/modules/${KERNVER}/source}
-  if [ -n "${CONFIG_MODULE_SIG_HASH}" ] && \
-    [ -f $KERNSRC/certs/signing_key.pem ] && \
-    [ -f $KERNSRC/certs/signing_key.x509 ] && \
-    [ -x $KERNSRC/scripts/sign-file ]
-  then
-    $KERNSRC/scripts/sign-file \
-      ${CONFIG_MODULE_SIG_HASH} \
-      $KERNSRC/certs/signing_key.pem \
-      $KERNSRC/certs/signing_key.x509 \
-      ${PKG}/lib/modules/${KERNVER}/extra/tpe/tpe.ko
-  fi
-fi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  FAQ GPL INSTALL LICENSE README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_${KERNVER//-/_}-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/tpe-kmod/tpe-kmod.info b/system/tpe-kmod/tpe-kmod.info
deleted file mode 100644
index 7dc4f3725c..0000000000
--- a/system/tpe-kmod/tpe-kmod.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="tpe-kmod"
-VERSION="2.0.4"
-HOMEPAGE="https://github.com/cormander/tpe-lkm"
-DOWNLOAD="https://github.com/cormander/tpe-lkm/archive/2.0.4/tpe-kmod-2.0.4.tar.gz"
-MD5SUM="e90cd220d299ca9adde7206c7d6fdf8b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="pyllyukko"
-EMAIL="pyllyukko@maimed.org"
diff --git a/system/tpm/tpm.SlackBuild b/system/tpm/tpm.SlackBuild
index d6cd6a2979..247a2bebb7 100644
--- a/system/tpm/tpm.SlackBuild
+++ b/system/tpm/tpm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tpm
 
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tpm
 VERSION=${VERSION:-1.3.3}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,4 +75,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/trachet/trachet.SlackBuild b/system/trachet/trachet.SlackBuild
index b63df9d113..5a6e7eadef 100644
--- a/system/trachet/trachet.SlackBuild
+++ b/system/trachet/trachet.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for trachet
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=trachet
 VERSION=${VERSION:-1.0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -83,4 +93,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tracker-miners/README b/system/tracker-miners/README
new file mode 100644
index 0000000000..0383189881
--- /dev/null
+++ b/system/tracker-miners/README
@@ -0,0 +1,5 @@
+Tracker Miners contains the indexer daemon (tracker-miner-fs-3) and 
+tools to extract metadata from many different filetypes.
+
+Tracker Miners is required for thumbnails to work in 
+GNOME Files (nautilus).
diff --git a/system/tracker-miners/doinst.sh b/system/tracker-miners/doinst.sh
new file mode 100644
index 0000000000..6922dbb756
--- /dev/null
+++ b/system/tracker-miners/doinst.sh
@@ -0,0 +1,5 @@
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
+fi
diff --git a/system/tracker-miners/slack-desc b/system/tracker-miners/slack-desc
new file mode 100644
index 0000000000..2f7ab3a5b2
--- /dev/null
+++ b/system/tracker-miners/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+tracker-miners: tracker-miners (Tracker Miners)
+tracker-miners:
+tracker-miners: The tracker-miners package contains a set of data extractors for 
+tracker-miners: Tracker.  
+tracker-miners:
+tracker-miners:
+tracker-miners:
+tracker-miners:
+tracker-miners:
+tracker-miners:  https://gitlab.gnome.org/GNOME/tracker-miners 
+tracker-miners:
diff --git a/system/tracker-miners/tracker-miners.SlackBuild b/system/tracker-miners/tracker-miners.SlackBuild
new file mode 100644
index 0000000000..02edaf120f
--- /dev/null
+++ b/system/tracker-miners/tracker-miners.SlackBuild
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+# Slackware build script for tracker3-miners
+
+# Copyright 2022 Bob Funk Winnipeg, Canada
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=tracker-miners
+VERSION=${VERSION:-3.3.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}	
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true \
+    -Dminer_rss=false \
+    -Dsystemd_user_services=false
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING* ChangeLog* MAINTAINERS NEWS *.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tracker-miners/tracker-miners.info b/system/tracker-miners/tracker-miners.info
new file mode 100644
index 0000000000..fba43a044c
--- /dev/null
+++ b/system/tracker-miners/tracker-miners.info
@@ -0,0 +1,10 @@
+PRGNAM="tracker-miners"
+VERSION="3.3.1"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/tracker-miners"
+DOWNLOAD="https://download.gnome.org/sources/tracker-miners/3.3/tracker-miners-3.3.1.tar.xz"
+MD5SUM="eac54156a33825e454d8976dba115dd8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="exempi libgxps libiptcdata libosinfo totem-pl-parser tracker"
+MAINTAINER="Bob Funk"
+EMAIL="bobfunk11@gmail.com"
diff --git a/system/tracker/tracker.SlackBuild b/system/tracker/tracker.SlackBuild
index 9b5278d918..f35450d6b6 100644
--- a/system/tracker/tracker.SlackBuild
+++ b/system/tracker/tracker.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Tracker
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220209 bkw: Modified by SlackBuilds.org: updated to latest version,
+# since the previous one wouldn't build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tracker
-VERSION=${VERSION:-1.7.1}
+VERSION=${VERSION:-3.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,26 +75,27 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-static \
-  --disable-miner-firefox \
-  --disable-miner-thunderbird \
-  --build=$ARCH-slackware-linux
-
-env -u BUILD make
-make install-strip DESTDIR=$PKG
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dsystemd_user_services=false \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -97,4 +108,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tracker/tracker.info b/system/tracker/tracker.info
index d5aba5fcc3..fb7277283c 100644
--- a/system/tracker/tracker.info
+++ b/system/tracker/tracker.info
@@ -1,8 +1,8 @@
 PRGNAM="tracker"
-VERSION="1.7.1"
+VERSION="3.2.1"
 HOMEPAGE="http://projects.gnome.org/tracker/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/tracker/1.7/tracker-1.7.1.tar.xz"
-MD5SUM="0733d0869ac55da43211e0047f5633e6"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/tracker/3.2/tracker-3.2.1.tar.xz"
+MD5SUM="89bb081f0ffcdd1d92296b73de0a371c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/trackfs/README b/system/trackfs/README
index d4a63214b9..60474ff85d 100644
--- a/system/trackfs/README
+++ b/system/trackfs/README
@@ -1,9 +1,11 @@
-Trackfs is a small program that tracks file system changes -- creation,
-update and removal of fs objects -- of another program (or group of
-programs).  It is similar to `installwatch', but works quite differently:
-While installwatch uses LD_PRELOAD to intercept library functions like
-open() and unlink(), trackfs runs the child program(s) with tracing
-enabled and tracks the system calls they make.
+trackfs (tracks filesystem changes)
+
+Trackfs is a small program that tracks file system changes --
+creation, update and removal of fs objects -- of another program (or
+group of programs).  It is similar to `installwatch', but works quite
+differently: While installwatch uses LD_PRELOAD to intercept library
+functions like open() and unlink(), trackfs runs the child program(s)
+with tracing enabled and tracks the system calls they make.
 
 trackfs also includes "playback", which runs a program via trackfs
 and creates a shell script which, when run, will reverse all filesystem
diff --git a/system/trackfs/trackfs.SlackBuild b/system/trackfs/trackfs.SlackBuild
index c702032975..5a7e8a63c0 100644
--- a/system/trackfs/trackfs.SlackBuild
+++ b/system/trackfs/trackfs.SlackBuild
@@ -1,17 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for trackfs
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 # Modified by Willy Sudiarto Raharjo <willysr@slackware-id.org>
 # Modified again by B. Watson for 0.1.0
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=trackfs
 VERSION=${VERSION:-0.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -21,7 +24,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -43,11 +50,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS -D_GNU_SOURCE" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -73,4 +77,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/trackfs/trackfs.info b/system/trackfs/trackfs.info
index fa78cc69d4..a1a38b93ed 100644
--- a/system/trackfs/trackfs.info
+++ b/system/trackfs/trackfs.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/trash-cli/slack-desc b/system/trash-cli/slack-desc
index 850ad04dee..1e01ec84e9 100644
--- a/system/trash-cli/slack-desc
+++ b/system/trash-cli/slack-desc
@@ -11,9 +11,9 @@ trash-cli:
 trash-cli: trash-cli trashes files recording the original path, deletion date,
 trash-cli: and permissions. It uses the same trashcan used by KDE, GNOME, and
 trash-cli: XFCE, but you can invoke it from the command line (and scripts).
-trash-cli: It provides these commands:
-trash-cli: trash-put     : trashes files and directories.
-trash-cli: trash-empty   : empty the trashcan(s).
-trash-cli: trash-list    : list trashed files.
-trash-cli: trash-restore : restore a trashed file.
-trash-cli: trash-rm      : remove individual files from trash can.
+trash-cli:
+trash-cli:
+trash-cli:
+trash-cli:
+trash-cli:
+trash-cli:
diff --git a/system/trash-cli/trash-cli.SlackBuild b/system/trash-cli/trash-cli.SlackBuild
index a345343671..828d82c064 100644
--- a/system/trash-cli/trash-cli.SlackBuild
+++ b/system/trash-cli/trash-cli.SlackBuild
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for the trash-cli utils.
 #
 # Copyright 2010 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
 # Copyright 2017 Donald Cooley South Haven, IN USA
+# Copyright 2022-2024 Isaac Yu <isaacyu@protonmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +25,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=trash-cli
-VERSION=${VERSION:-0.17.1.14}
+VERSION=${VERSION:-0.24.4.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,25 +41,15 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -71,15 +65,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+# Fix man path
+sed 's|share/man/|man/|' -i setup.cfg
+
+python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir $PKG/usr/man
-mv $PKG/usr/share/man/ $PKG/usr/
-rmdir $PKG/usr/share
-
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
@@ -94,4 +87,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/trash-cli/trash-cli.info b/system/trash-cli/trash-cli.info
index 4e107d9bb4..5a5aee45b6 100644
--- a/system/trash-cli/trash-cli.info
+++ b/system/trash-cli/trash-cli.info
@@ -1,10 +1,10 @@
 PRGNAM="trash-cli"
-VERSION="0.17.1.14"
+VERSION="0.24.4.17"
 HOMEPAGE="https://github.com/andreafrancia/trash-cli"
-DOWNLOAD="https://github.com/andreafrancia/trash-cli/archive/0.17.1.14/trash-cli-0.17.1.14.tar.gz"
-MD5SUM="75ccadb291fdef88cd7175d609fc6409"
+DOWNLOAD="https://github.com/andreafrancia/trash-cli/archive/0.24.4.17/trash-cli-0.24.4.17.tar.gz"
+MD5SUM="7ac2a44c193d45f992f036c38ccf17b8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+REQUIRES="python3-psutil"
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/trash/trash.SlackBuild b/system/trash/trash.SlackBuild
index 7eb4fbe870..bbbfdecc24 100644
--- a/system/trash/trash.SlackBuild
+++ b/system/trash/trash.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for trash
 # Copyright 2018 Jefferson Rocha <lrcjefferson@gmail.com>
@@ -21,13 +21,20 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=trash
 VERSION=${VERSION:-1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -41,11 +48,7 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod 644 *
 
 mkdir -p $PKG/usr/bin
 cp "$PRGNAM" $PKG/usr/bin
@@ -57,4 +60,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/trash/trash.info b/system/trash/trash.info
index 9439015221..16aed3c730 100644
--- a/system/trash/trash.info
+++ b/system/trash/trash.info
@@ -1,7 +1,7 @@
 PRGNAM="trash"
 VERSION="1.4"
 HOMEPAGE="https://notabug.org/jeffersonrocha/trash"
-DOWNLOAD="https://notabug.org/jeffersonrocha/trash/raw/master/trash-1.4.tar.xz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/trash-1.4.tar.xz"
 MD5SUM="70dcab86f05df9d9ff2b4cdd64087cfa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/trashy/README b/system/trashy/README
index ef5611eca3..f0daa0d9c4 100644
--- a/system/trashy/README
+++ b/system/trashy/README
@@ -4,7 +4,7 @@ written entirely in BASH.
 http://slackermedia.info/trashy
 
 Usage
--------
+-----
 
 Trashy is a simple shell script that introduces the idea of a trash
 can for the command line. Meaning that you can issue this command:
@@ -27,12 +27,11 @@ issue the command:
 
 and your system trash will be emptied.
 
-
 System Trash
----------------
+------------
 
 Trashy defines a "system trash" on Linux, BSD, and Solaris-based
-operating systems in accordance to the Open Desktop standard:
+operating systems in accordance with the Open Desktop standard:
 ~/.local/share/Trash
 
 On systems that do not use a desktop, trashy simply creates a ~/.trash
diff --git a/system/trashy/slack-desc b/system/trashy/slack-desc
index 7df2abbc63..e7ef88b95e 100644
--- a/system/trashy/slack-desc
+++ b/system/trashy/slack-desc
@@ -13,7 +13,7 @@ trashy: to encourage people to avoid using 'rm' so often. Move files to your
 trashy: trash, list files in your trash, restore files from trash, and empty
 trashy: the trash from your shell.
 trashy:
-trashy: https://gitlab.freedesktop.org/notklaatu/trashy/
+trashy:
 trashy:
 trashy:
 trashy:
diff --git a/system/trashy/trashy.8 b/system/trashy/trashy.8
deleted file mode 100644
index 76bc857651..0000000000
--- a/system/trashy/trashy.8
+++ /dev/null
@@ -1,108 +0,0 @@
-.\" trashy - an rm intermediary
-.TH "trashy" "8" ""  "Klaatu" ""
-.SH "NAME"
-trashy \- trash in the shell
-.SH "SYNOPSIS"
-\fBtrash\fP file1 file2...
-.nf 
-\fBempty\fP [option]
-.SH "DESCRIPTION"
-.PP 
-There is an unhealthy habit that arises with many a POSIX user: the
-careless and wreckless use of the dreaded \fBrm\fP command. \fBTrashy\fP
-is a helpful intermediary that intervenes when you would otherwise use
-\fBrm\fP. 
-.PP
-\fBtrashy\fP attempts to be compliant with the Free Desktop specification for
-desktop trash, meaning that you can use \fBtrashy\fP in conjunction
-with a desktop environment and find your files in your desktop trash
-just as if you had dragged and dropped them there yourself. You can
-also restore the files by right-clicking and selecting `restore`, or
-whatever method your desktop defines for that process. 
-.PP
-.SH "USAGE"
-.TP
-Issue this command:
-.PP
-\fBtrash\fP foo
-.PP
-and foo will be moved to the system trash.
-.PP
-At this point, you have not yet removed the file from your system, so
-if you wish to recover it, go and fetch it from your trash. There, now
-isn't that nicer than \fBrm\fP?
-.PP
-When you're really really sure that everything in
-your Trash wants to be nuked out of existance, then you can
-issue the command:
-.PP
-trask --empty
-.PP
-and your Trash will be emptied.
-.PP
-If there are spaces in your filenames, first of all stop using spaces
-in your filenames. Secondly, you must escape the space when you trash
-it:
-.PP
-\fBtrash\fP foo\\ bar
-.PP
-If you issue \fBtrash\fP without any arguments, it tells you the
-current size of your system trash.
-.SH OPTIONS
-.PP
-.TP
-.B -l, --list
-Lists the contents of your trash can.
-.TP
-.B -v, --verbose
-Makes \fBtrashy\fP verbose.
-.TP
-.B -w, --version, --which
-Returns the version of trashy you are currently running. -w because -v
-was already taken by verbose :-)
-.TP
-.B -d, --dry-run, --dryrun
-Does not actually move or remove files, just shows what will happen if
-you really did. The --empty process is verbose by default.
-.PP
-.SH "SYSTEM TRASH LOCATIONS"
-.PP
-On Linux, BSD, Ilumos, and Solaris, the system trash, by default, is
-that defined by the Free Desktop specification: ~/.local/share/Trash
-.PP
-If you do not use an environment that plays nice with the Free Desktop
-spec (ie, Mac OS) then trashy will attempt to detect and use
-your actual system trash.
-.PP
-If all else fails, a ~/.trash directory is created and used.
-.PP
-.SH "BUGS AND ISSUES"
-.PP
-Things can get a little messy when you're trashing files from an
-external drive because \fBtrash\fP currently moves the file from your external
-drive to your system harddrive. It works, but it's not as graceful as,
-say, creating a .trash folder on that external drive and hiding stuff
-there until later.
-.PP
-.SH "ALTERNATIVES"
-.PP
-\fBTrashy\fP depends on BASH. There is a similar application called
-trash-cli, which is Python-based. At this point, they do mostly the
-same thing, but obviously if you do not run BASH or ZSH or similar,
-then you might prefer a Python-based solution.
-.SH "SEE ALSO"
-.nf
-.I rm (1)
-.I mv (1)
-.URL http://slackermedia.info/trashy
-.URL https://github.com/andreafrancia/trash-cli
-.fi
-.PP
-.SH "AUTHORS"
-.nf
-Klaatu (klaatu@member.fsf.org)
-.fi
-.PP
-.SH "BUGS"
-Email bugs reports or fixes to klaatu@member.fsf.org
-.fi
diff --git a/system/trashy/trashy.SlackBuild b/system/trashy/trashy.SlackBuild
index bc2f1841d3..5071ab9623 100644
--- a/system/trashy/trashy.SlackBuild
+++ b/system/trashy/trashy.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for trashy
-# Copyright 2014 Klaatu @member.fsf.org
+# Copyright 2014-22 Klaatu @member.fsf.org
 
 # GNU All-Permissive License
 # Copying and distribution of this file, with or without modification,
@@ -9,14 +9,32 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 
+# 20220316 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - move symlink creation to the script, because doinst.sh was
+#   creating a symlink that didn't get removed by removepkg.
+# - get rid of the utterly useless and time-consuming autoconf,
+#   aclocal, configure stuff. this is a shell script and a man
+#   page, configure wasn't *doing* anything.
+# - do not install useless INSTALL in doc dir.
+# - do install LICENSE and AUTHORS in doc dir.
+# - use the man page from the source, which seems to document what
+#   trashy does more accurately than the one that was here.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=trashy
-VERSION=${VERSION:-2.3}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.5.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -27,36 +45,32 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 
 cd $TMP
-rm -rf $PRGNAM-$VERSION-$COMMITVER
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-#make install
-mkdir -p $PKG/usr/bin
-cp $PRGNAM $PKG/usr/bin/$PRGNAM
-
-(
-  cd $PKG/usr/bin
-  ln -s $PRGNAM trash
-)
-
-#man
-mkdir -p $PKG/usr/man/man8/
-cp $CWD/$PRGNAM.8 $PKG/usr/man/man8/$PRGNAM.8
-gzip $PKG/usr/man/man8/$PRGNAM.8
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp $CWD/README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# 20220316 bkw: skip the autoreconf/configure/make stuff, it's
+# 2 files, we can get by without 'make install'.
+mkdir -p $PKG/usr/{bin,man/man8}
+install -m0755 -oroot -groot bin/$PRGNAM $PKG/usr/bin/$PRGNAM
+gzip -9c < man/$PRGNAM.8 > $PKG/usr/man/man8/$PRGNAM.8.gz
+
+# 20220316 bkw: no idea why the thing is called "trashy" but
+# its man page and --help refer to it as "trash". symlinks
+# to the rescue.
+ln -s $PRGNAM $PKG/usr/bin/trash
+ln -s $PRGNAM.8.gz $PKG/usr/man/man8/trash.8.gz
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README.md LICENSE AUTHORS $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/trashy/trashy.info b/system/trashy/trashy.info
index f19bf50305..0f15c6b885 100644
--- a/system/trashy/trashy.info
+++ b/system/trashy/trashy.info
@@ -1,8 +1,8 @@
 PRGNAM="trashy"
-VERSION="2.3"
+VERSION="2.5.1"
 HOMEPAGE="http://slackermedia.info/trashy"
-DOWNLOAD="https://gitlab.freedesktop.org/notklaatu/trashy/-/archive/2.3/trashy-2.3.tar.bz2"
-MD5SUM="34134a6eac7aa41f072034edc54ddaca"
+DOWNLOAD="https://gitlab.com/trashy/trashy/-/archive/2.5.1/trashy-2.5.1.tar.bz2"
+MD5SUM="a466a47c74d20ef1d564fc134704c54c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/triggerhappy/README b/system/triggerhappy/README
index fc8e62f25f..1d23bc73dd 100644
--- a/system/triggerhappy/README
+++ b/system/triggerhappy/README
@@ -4,26 +4,40 @@ Triggerhappy is a hotkey daemon that operates on a system wide
 scale. It watches all configured input devices for key, switch,
 or button events and can launch arbitrary commands specified by the
 administrator. In contrast to hotkey services provided by desktop
-environments, Triggerhappy is especially suited to hardware related
+environments, triggerhappy is especially suited to hardware related
 switches like volume or wifi control; it works independently from
 a specific user being logged in and is also suitable for embedded
 systems that do not have a graphical user interface.
 
 The disadvantage of using triggerhappy is that it must be run with
-root privileges.
+root privileges. However, it will drop root privilege and run as
+'nobody' after initialization, with the provided rc.triggerhappy
+script.
 
 After installing the package, you'll want to:
 
   1. Read the man page for thd, particularly the EXAMPLES section.
 
-  2. Create one or more confg files, matching the pattern:
+  2. Create one or more config files, matching the pattern:
+
      /etc/triggerhappy/triggers.d/*.conf
+
      See the example files in /etc/triggerhappy/triggers.d/ for ideas.
 
   3. chmod +x /etc/rc.d/rc.triggerhappy
 
   4. /etc/rc.d/rc.triggerhappy start
 
+  5. Test that things work the way you want, according to your config
+     files from step 2. If not, fix them. Don't forget to run
+     /etc/rc.d/rc.triggerhappy restart after editing the config(s).
+
+  6. Add this to your /etc/rc.d/rc.local:
+
+     if [ -x /etc/rc.d/rc.triggerhappy ]; then
+       /etc/rc.d/rc.triggerhappy start
+     fi
+
 After this, the daemon will start on boot. To add devices to the
 running daemon, use th-cmd's --passfd option (not --add, since the
 daemon drops privileges after startup).
diff --git a/system/triggerhappy/rc.triggerhappy b/system/triggerhappy/rc.triggerhappy
index d8f3266484..5dd6f3ed50 100644
--- a/system/triggerhappy/rc.triggerhappy
+++ b/system/triggerhappy/rc.triggerhappy
@@ -3,8 +3,12 @@
 # rc.triggerhappy, sysv-style init script for triggerhappy.
 # part of the slackbuilds.org triggerhappy build.
 
+# The daemon has to be started as root, but will drop privileges
+# and run as this user after initialization:
+THD_USER=nobody
+
 THD_SOCKET=/var/run/thd.socket
-THD_ARGS="--daemon --user nobody --socket $THD_SOCKET --triggers /etc/triggerhappy/triggers.d/ /dev/input/event*"
+THD_ARGS="--daemon --user $THD_USER --socket $THD_SOCKET --triggers /etc/triggerhappy/triggers.d/ /dev/input/event*"
 
 case "$1" in
   ""|"start") if [ -e $THD_SOCKET ]; then
diff --git a/system/triggerhappy/slack-desc b/system/triggerhappy/slack-desc
index 49485ed1fb..54e4eacb07 100644
--- a/system/triggerhappy/slack-desc
+++ b/system/triggerhappy/slack-desc
@@ -12,7 +12,7 @@ triggerhappy: Triggerhappy is a hotkey daemon that operates on a system wide
 triggerhappy: scale. It watches all configured input devices for key, switch,
 triggerhappy: or button events and can launch arbitrary commands specified by the
 triggerhappy: administrator. In contrast to hotkey services provided by desktop
-triggerhappy: environments, Triggerhappy is especially suited to hardware related
+triggerhappy: environments, triggerhappy is especially suited to hardware related
 triggerhappy: switches like volume or wifi control; it works independently from
 triggerhappy: a specific user being logged in and is also suitable for embedded
 triggerhappy: systems that do not have a graphical user interface.
diff --git a/system/triggerhappy/triggerhappy.SlackBuild b/system/triggerhappy/triggerhappy.SlackBuild
index 8c8adb0f49..ef99f8cf29 100644
--- a/system/triggerhappy/triggerhappy.SlackBuild
+++ b/system/triggerhappy/triggerhappy.SlackBuild
@@ -1,15 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for triggerhappy
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=triggerhappy
 VERSION=${VERSION:-0.5.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCVER=release-$VERSION
 
@@ -21,7 +24,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -81,4 +88,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/triggerhappy/triggerhappy.info b/system/triggerhappy/triggerhappy.info
index edaa5e53e6..e7beff033f 100644
--- a/system/triggerhappy/triggerhappy.info
+++ b/system/triggerhappy/triggerhappy.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/trmaid/README b/system/trmaid/README
deleted file mode 100644
index 9374ed8ebe..0000000000
--- a/system/trmaid/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Takes care of transmission settings, keeps torrents under check
-nd adds em from feed or redis queue (well list actually).
diff --git a/system/trmaid/slack-desc b/system/trmaid/slack-desc
deleted file mode 100644
index e027dd5d19..0000000000
--- a/system/trmaid/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-      |-----handy-ruler------------------------------------------------------|
-trmaid: trmaid (maintain transmission)
-trmaid:
-trmaid: Takes care of transmission settings, keeps torrents
-trmaid: under check and adds em from feed or redis queue
-trmaid: (well list actually).
-trmaid:
-trmaid: Homepage: https://github.com/tanelpuhu/trmaid
-trmaid:
-trmaid:
-trmaid:
-trmaid:
diff --git a/system/trmaid/trmaid.SlackBuild b/system/trmaid/trmaid.SlackBuild
deleted file mode 100644
index 50b771caea..0000000000
--- a/system/trmaid/trmaid.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for trmaid
-
-# Copyright 2014-2018  Dimitris Zlatanidis  Orestiada, Greece
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=trmaid
-VERSION=${VERSION:-0.6.8}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/trmaid/trmaid.info b/system/trmaid/trmaid.info
deleted file mode 100644
index ca5dcb9e46..0000000000
--- a/system/trmaid/trmaid.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="trmaid"
-VERSION="0.6.8"
-HOMEPAGE="https://pypi.python.org/pypi/trmaid/"
-DOWNLOAD="https://pypi.python.org/packages/2b/a8/d171162c41f760a012284e4ebae6a3b345ce647479344600d470281a8eab/trmaid-0.6.8.tar.gz"
-MD5SUM="65ea65b6ce3b146ffa5109a420b5f605"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="PyYAML feedparser python-requests redis-py six"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
diff --git a/system/trousers/README b/system/trousers/README
new file mode 100644
index 0000000000..3ac7d2d958
--- /dev/null
+++ b/system/trousers/README
@@ -0,0 +1,9 @@
+trousers (open-source TSS implementation by IBM)
+
+trousers is an open-source TCG Software Stack implementation created and
+released by IBM.
+
+Before building trousers, please create a "tss" user and group:
+
+  # groupadd -g 374 tss
+  # useradd -g tss -u 374 -d /home/tss -M -s /bin/bash tss
diff --git a/system/trousers/slack-desc b/system/trousers/slack-desc
new file mode 100644
index 0000000000..8a498f23e4
--- /dev/null
+++ b/system/trousers/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+trousers: trousers (TSS implementation by IBM)
+trousers:
+trousers: trousers is an open-source TCG Software Stack implementation created
+trousers: and released by IBM.
+trousers:
+trousers:
+trousers:
+trousers:
+trousers: Author: Ryan Catherman
+trousers: Maintainer: Debora V Babb
+trousers: Homepage: https://sourceforge.net/projects/trousers/
diff --git a/system/trousers/trousers.SlackBuild b/system/trousers/trousers.SlackBuild
new file mode 100644
index 0000000000..ec70bb6fb2
--- /dev/null
+++ b/system/trousers/trousers.SlackBuild
@@ -0,0 +1,125 @@
+#!/bin/bash
+
+# Slackware build script for trousers
+
+# Copyright 2022 K. Eugene Carlson  Tsukuba, Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=trousers
+VERSION=${VERSION:-0.3.15}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+# Do not proceed if the tss user and group do not exist.
+nobuild () {
+  echo
+  echo "A \"tss\" user and group were not found. To run the script, please"
+  echo "add them:"
+  echo
+  echo '  # groupadd -g 374 tss'
+  echo '  # useradd -g tss -u 374 -d /home/tss -M -s /bin/bash tss'
+  exit 1
+}
+
+if ! getent group tss 2>&1 > /dev/null; then
+  nobuild ;
+elif ! getent passwd tss 2>&1 > /dev/null; then
+  nobuild ;
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./bootstrap.sh
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX}
+make
+make install-strip DESTDIR=$PKG
+rm -f $PKG/usr/lib*/*.la
+
+chown tss:tss $PKG/usr/sbin/tcsd
+
+mkdir $PKG/usr/man
+mv $PKG/usr/share/man/* $PKG/usr/man
+rm -r $PKG/usr/share
+gzip -9 $PKG/usr/man/man*/*
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENSE README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/trousers/trousers.info b/system/trousers/trousers.info
new file mode 100644
index 0000000000..a0b47ceff7
--- /dev/null
+++ b/system/trousers/trousers.info
@@ -0,0 +1,10 @@
+PRGNAM="trousers"
+VERSION="0.3.15"
+HOMEPAGE="https://sourceforge.net/projects/trousers/"
+DOWNLOAD="https://downloads.sourceforge.net/project/trousers/trousers/0.3.15/trousers-0.3.15.tar.gz"
+MD5SUM="eb1b02e98c7d360749b9076196db3f0f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/trrntzip/trrntzip.SlackBuild b/system/trrntzip/trrntzip.SlackBuild
index 877106776d..1a8fa43f80 100644
--- a/system/trrntzip/trrntzip.SlackBuild
+++ b/system/trrntzip/trrntzip.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for trrntzip
 #
@@ -23,10 +23,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=trrntzip
 VERSION=${VERSION:-v02}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=`pwd`
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -82,4 +92,4 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/trs80-roms/README b/system/trs80-roms/README
new file mode 100644
index 0000000000..7b229a3efe
--- /dev/null
+++ b/system/trs80-roms/README
@@ -0,0 +1,23 @@
+trs80-roms (ROM images for use with sdltrs and xtrs)
+
+This package includes ROM images for the TRS-80 Model I (Level I and
+Level II BASIC), Model III, Model 4, and Model 4P.
+
+Also included in the package are ld4-631.dsk (a bootable disk image
+of the final version of LS-DOS sold by Misosys, for the Model III
+and 4) two disk images with various utility software (utility.dsk
+and cpmutil.dsk), and newdos_80sssd_jv1.dsk (a bootable disk image of
+NEWDOS-80 v2.0 for the Model I).
+
+The sdltrs and xtrs emulators on SlackBuilds.org have been patched to
+use these ROM images by default, if there's no user config file. You
+can still use other ROMs by editing the config file or using the
+emulator's user interface.
+
+The copyright status of these ROM images is murky, but they've been
+widely available on the 'net since the 1990s. If you own the original
+TRS-80 computers, you probably can legally use the ROM images,
+depending on the laws where you live.
+
+There is a nice archive of TRS-80 Model I software available here:
+https://www.classic-computers.org.nz/system-80/software_archive.htm
diff --git a/system/trs80-roms/slack-desc b/system/trs80-roms/slack-desc
new file mode 100644
index 0000000000..e5a0969d51
--- /dev/null
+++ b/system/trs80-roms/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+trs80-roms: trs80-roms (ROM images for use with sdltrs and xtrs)
+trs80-roms:
+trs80-roms: This package includes ROM images for the TRS-80 Model I (Level I and
+trs80-roms: Level II BASIC), Model III, Model 4, and Model 4P.
+trs80-roms:
+trs80-roms: Also included in the package are ld4-631.dsk (a disk image of the
+trs80-roms: final version of LS-DOS sold by Misosys) and two disk images with
+trs80-roms: various utility software (utility.dsk and cpmutil.dsk).
+trs80-roms:
+trs80-roms:
+trs80-roms:
diff --git a/system/trs80-roms/trs80-roms.SlackBuild b/system/trs80-roms/trs80-roms.SlackBuild
new file mode 100644
index 0000000000..79a9ff0030
--- /dev/null
+++ b/system/trs80-roms/trs80-roms.SlackBuild
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+# Slackware build script for trs80-roms
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20230516 bkw: v20230516, add NewDOS image for Model I.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=trs80-roms
+VERSION=${VERSION:-20230516}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+PKGROMS=$PKG/usr/share/trs80-roms
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG
+mkdir -p $TMP $PKGROMS $PKGDOC $OUTPUT
+cd $PKGROMS
+
+# There is no "source" directory; everything is extracted directly
+# to $PKG.
+
+# Model I: level1.rom and level2.rom
+unzip -q $CWD/trs_roms.zip
+
+# Model III and 4: model3.rom and model4.rom.
+# Do not use the model4p.rom from this zip file, it won't work with
+# sdltrs or xtrs.
+unzip -LL -q $CWD/trs80-62.zip 'model?.rom'
+
+# Model 4P: model4p.rom. Both emulators can actually get by without this
+# (they have a built-in "hack" ROM that can boot a disk), but for
+# versimilitude, let's include the real deal. This is a split MAME ROM,
+# we have to combine the parts for xtrs and sdltrs.
+unzip -q $CWD/trs80m4p.zip 8075332.u69 8049007.u103
+cat 8075332.u69 8049007.u103 > model4p.rom
+rm -f 8075332.u69 8049007.u103
+
+# LS-DOS (not a ROM, a disk image). The zip file comment goes in $PKGDOC,
+# since it's useful documentation.
+unzip -q $CWD/ld4-631.zip
+unzip -z $CWD/ld4-631.zip > $PKGDOC/ld4-631.txt
+
+# 2 more disk images: cpmutil.dsk and utility.dsk. These ship with both
+# sdltrs and xtrs, and are identical in both source tarballs.
+tar xf $CWD/xtrs-4.9d.tar.gz --strip-components=1 --wildcards '*.dsk'
+
+# Another disk image: a bootable DOS for the Model I.
+cat $CWD/NEWDOS_80sssd_jv1.DSK > newdos_80sssd_jv1.dsk
+
+chmod 644 *
+chown root:root *
+
+# No docs, include our own README (better than nothing).
+cat $CWD/README > $PKGDOC/README
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/trs80-roms/trs80-roms.info b/system/trs80-roms/trs80-roms.info
new file mode 100644
index 0000000000..538a4de898
--- /dev/null
+++ b/system/trs80-roms/trs80-roms.info
@@ -0,0 +1,20 @@
+PRGNAM="trs80-roms"
+VERSION="20230516"
+HOMEPAGE="https://sdltrs.sourceforge.net/docs/index.html"
+DOWNLOAD="https://www.filfre.net/misc/trs_roms.zip \
+          http://cpmarchives.classiccmp.org/trs80/mirrors/www.discover-net.net/~dmkeil/trs80/files/trs80-62.zip \
+          https://www.tim-mann.org/trs80/ld4-631.zip \
+          https://archive.org/download/mame-0.250-roms-split_202212/MAME%200.250%20ROMs%20%28split%29/trs80m4p.zip \
+          http://www.tim-mann.org/trs80/xtrs-4.9d.tar.gz \
+          https://www.classic-computers.org.nz/system-80/disks/NEWDOS_80sssd_jv1.DSK"
+MD5SUM="ecd2c47c0624885fbcfb17889241f0ed \
+        9b342f4401801bbc947e303cbeb9902f \
+        f2678aa45b76d935a34a0cd2b108925d \
+        8a0f1567df8f166f4056a6a71ef7dce5 \
+        8bb7cf88a3bc1da890f1f29398120bf3 \
+        6f624bdbf4b410cfbe8603fa3bef44fa"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/ts/README b/system/ts/README
index 6028123804..7aa9218d96 100644
--- a/system/ts/README
+++ b/system/ts/README
@@ -1,37 +1,36 @@
-Task spooler is a Unix batch system where the tasks spooled run one after
-the other. The amount of jobs to run at once can be set at any time. Each
-user in each system has his own job queue. The tasks are run in the correct
-context (that of enqueue) from any shell/process, and its output/results
-can be easily watched. It is very useful when you know that your commands
-depend on a lot of RAM, a lot of disk use, give a lot of output, or for
-whatever reason it's better not to run them all at the same time, while you
-want to keep your resources busy for maximum benfit. Its interface allows
-using it easily in scripts.
+Task spooler is a Unix batch system where the tasks spooled run one
+after the other. The amount of jobs to run at once can be set at any
+time. Each user in each system has his own job queue. The tasks are
+run in the correct context (that of enqueue) from any shell/process,
+and its output/results can be easily watched. It is very useful when
+you know that your commands depend on a lot of RAM, a lot of disk use,
+give a lot of output, or for whatever reason it's better not to run
+them all at the same time, while you want to keep your resources busy
+for maximum benfit. Its interface allows using it easily in scripts.
 
 Features
 
 Task Spooler allows one to:
 
-    * Queue jobs from different terminals.
-    * Use it locally in the machine (not as in network queues).
-    * Have a good way of seeing the output of the processes (tail,
-      errorlevels, ...).
-    * Easy use: almost no configuration.
-    * Easy to use in scripts. 
+* Queue jobs from different terminals.
+* Use it locally in the machine (not as in network queues).
+* Have a good way of seeing the output of the processes (tail,
+  errorlevels, ...).
+* Easy use: almost no configuration.
+* Easy to use in scripts. 
 
 At the end, after some time using and developing ts, it can do something
 more:
 
-    * It works in GNU systems with the GNU c compiler (Linux, Darwin,
-      Cygwin, FreeBSD, etc).
-    * No configuration at all for a simple queue.
-    * Good integration with renice, kill, etc. (through `ts -p` and process
-      groups).
-    * Have any amount of queues identified by name, writting a simple
-      wrapper script for each (I use ts2, tsio, tsprint, etc).
-    * Control how many jobs may run at once in any queue (taking profit of
-      multicores).
-    * It never removes the result files, so they can be reached even after
-      we've lost the ts task list.
-    * Transparent if used as a subprogram with -nf.
-
+* It works on GNU systems with the GNU C compiler (Linux, Darwin,
+  Cygwin, FreeBSD, etc).
+* No configuration at all for a simple queue.
+* Good integration with renice, kill, etc. (through `ts -p` and process
+  groups).
+* Have any amount of queues identified by name, writting a simple
+  wrapper script for each (I use ts2, tsio, tsprint, etc).
+* Control how many jobs may run at once in any queue (taking profit of
+  multicores).
+* It never removes the result files, so they can be reached even after
+  we've lost the ts task list.
+* Transparent if used as a subprogram with -nf.
diff --git a/system/ts/ts.SlackBuild b/system/ts/ts.SlackBuild
index c5465c6e78..9f239c1466 100644
--- a/system/ts/ts.SlackBuild
+++ b/system/ts/ts.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ts
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ts
 VERSION=${VERSION:-0.7.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -90,4 +100,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-aller/ttf-aller.SlackBuild b/system/ttf-aller/ttf-aller.SlackBuild
index bdfea21bf0..4f89b530b9 100644
--- a/system/ttf-aller/ttf-aller.SlackBuild
+++ b/system/ttf-aller/ttf-aller.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for ttf-aller.
 #
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-aller
 VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,4 +77,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-aller/ttf-aller.info b/system/ttf-aller/ttf-aller.info
index e85a2ffe2e..8ff1e2eabe 100644
--- a/system/ttf-aller/ttf-aller.info
+++ b/system/ttf-aller/ttf-aller.info
@@ -1,7 +1,7 @@
 PRGNAM="ttf-aller"
 VERSION="1.0"
 HOMEPAGE="https://www.daltonmaag.com/"
-DOWNLOAD="http://dl.1001fonts.com/aller.zip"
+DOWNLOAD="https://slackware.uk/~urchlay/src/aller.zip"
 MD5SUM="46e8d0db3124f60a2b298ad895f11895"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/ttf-ancient-fonts/doinst.sh b/system/ttf-ancient-fonts/doinst.sh
index 2b48ae510c..51eba0ed68 100644
--- a/system/ttf-ancient-fonts/doinst.sh
+++ b/system/ttf-ancient-fonts/doinst.sh
@@ -8,6 +8,9 @@ if [ -x /usr/bin/mkfontdir ]; then
     mkfontdir .
   )
 fi
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
 if [ -x /usr/bin/fc-cache ]; then
   /usr/bin/fc-cache -f
 fi
diff --git a/system/ttf-ancient-fonts/ttf-ancient-fonts.SlackBuild b/system/ttf-ancient-fonts/ttf-ancient-fonts.SlackBuild
index f01844ad7e..620b1cbdd7 100644
--- a/system/ttf-ancient-fonts/ttf-ancient-fonts.SlackBuild
+++ b/system/ttf-ancient-fonts/ttf-ancient-fonts.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ttf-ancient-fonts
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
@@ -29,13 +29,22 @@
 # presumably included the licenses, so I'm including Debian's copyright
 # file that asserts these fonts are "free for any use".
 
+# 20230308 bkw: BUILD=2, add douninst.sh.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-ancient-fonts
 VERSION=${VERSION:-2.60}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -84,6 +93,7 @@ if [ "$HAS_SYMBOLA" = "yes" ]; then
     $PKG/install/slack-desc
 fi
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cp $PKG/install/doinst.sh $PKG/install/douninst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-ancient-fonts/ttf-ancient-fonts.info b/system/ttf-ancient-fonts/ttf-ancient-fonts.info
index 3e51b06439..98a3b567ec 100644
--- a/system/ttf-ancient-fonts/ttf-ancient-fonts.info
+++ b/system/ttf-ancient-fonts/ttf-ancient-fonts.info
@@ -1,10 +1,10 @@
 PRGNAM="ttf-ancient-fonts"
 VERSION="2.60"
 HOMEPAGE="https://packages.debian.org/sid/ttf-ancient-fonts"
-DOWNLOAD="http://deb.debian.org/debian/pool/main/t/ttf-ancient-fonts/ttf-ancient-fonts_2.60.orig.tar.xz"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/t/ttf-ancient-fonts/ttf-ancient-fonts_2.60.orig.tar.xz"
 MD5SUM="a0132b3262b3eec9bc2fc8ff8c4ed9f3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/ttf-arphic-uming/25-ttf-arphic-uming-bitmaps.conf b/system/ttf-arphic-uming/25-ttf-arphic-uming-bitmaps.conf
deleted file mode 100644
index ad7a8c7525..0000000000
--- a/system/ttf-arphic-uming/25-ttf-arphic-uming-bitmaps.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-	<match target="font">
-	  <test name="family">
-	  <string>AR PL UMing CN</string>
-<!--
-	  <string>AR PL UMing HK</string>
-	  <string>AR PL UMing TW</string>
-	  <string>AR PL UMing TW MBE</string>
--->
-	  </test>
-       	  <edit name="antialias"><bool>false</bool></edit>
-    	  <edit name="hinting"><bool>true</bool></edit>
-          <edit name="autohint"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-	  <test name="family">
-	  <string>AR PL UMing CN</string>
-<!--	 
-	  <string>AR PL UMing HK</string>
-	  <string>AR PL UMing TW</string>
-	  <string>AR PL UMing TW MBE</string>
--->	
-	  </test>
-      	  <test name="pixelsize" compare="more_eq"><int>17</int></test>
-	  <edit name="antialias" mode="assign"><bool>true</bool></edit>
-	  <edit name="hinting" mode="assign"><bool>true</bool></edit>
-	</match>
-
-</fontconfig>
diff --git a/system/ttf-arphic-uming/25-ttf-arphic-uming-render.conf b/system/ttf-arphic-uming/25-ttf-arphic-uming-render.conf
deleted file mode 100644
index f962c44551..0000000000
--- a/system/ttf-arphic-uming/25-ttf-arphic-uming-render.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-	<match target="font">
-	  <test name="family" compare="contains" >
-	  <string>AR PL UMing</string>
-	  </test>
-	  <edit name="globaladvance"><bool>false</bool></edit>
-	  <edit name="spacing"><int>90</int></edit>
-	  <edit name="minspace"><bool>false</bool></edit>
-	</match>
-</fontconfig>
diff --git a/system/ttf-arphic-uming/30-fix-fontconfig-syntax.patch b/system/ttf-arphic-uming/30-fix-fontconfig-syntax.patch
new file mode 100644
index 0000000000..10d16cb3d4
--- /dev/null
+++ b/system/ttf-arphic-uming/30-fix-fontconfig-syntax.patch
@@ -0,0 +1,218 @@
+From: Iain Lane <iain.lane@canonical.com>
+Date: Wed, 30 Oct 2013 22:17:18 +0100
+Subject: Use correct fontconfig syntax for disjunction and don't include
+ multiple elements in test/alias
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687043
+---
+ 25-arphic-uming-bitmaps.conf | 44 ++++++++++++++++++++++++++++++++++++++++++--
+ 41-arphic-uming.conf         | 32 +++++++++++++++++++++++++++++++-
+ 64-arphic-uming.conf         | 44 ++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 117 insertions(+), 3 deletions(-)
+
+diff --git a/25-arphic-uming-bitmaps.conf b/25-arphic-uming-bitmaps.conf
+index c4e1da4..93d96c2 100644
+--- a/25-arphic-uming-bitmaps.conf
++++ b/25-arphic-uming-bitmaps.conf
+@@ -5,25 +5,65 @@
+ 	<match target="font">
+ 	  <test name="family">
+ 	  <string>AR PL UMing CN</string>
++	  </test>
++       	  <edit name="antialias"><bool>false</bool></edit>
++    	  <edit name="hinting"><bool>true</bool></edit>
++          <edit name="autohint"><bool>false</bool></edit>
++	</match>
++	<match target="font">
++	  <test name="family">
+ 	  <string>AR PL UMing HK</string>
++	  </test>
++       	  <edit name="antialias"><bool>false</bool></edit>
++    	  <edit name="hinting"><bool>true</bool></edit>
++          <edit name="autohint"><bool>false</bool></edit>
++	</match>
++	<match target="font">
++	  <test name="family">
+ 	  <string>AR PL UMing TW</string>
++	  </test>
++       	  <edit name="antialias"><bool>false</bool></edit>
++    	  <edit name="hinting"><bool>true</bool></edit>
++          <edit name="autohint"><bool>false</bool></edit>
++	</match>
++	<match target="font">
++	  <test name="family">
+ 	  <string>AR PL UMing TW MBE</string>
+ 	  </test>
+        	  <edit name="antialias"><bool>false</bool></edit>
+     	  <edit name="hinting"><bool>true</bool></edit>
+           <edit name="autohint"><bool>false</bool></edit>
+ 	</match>
+-
+ 	<match target="font">
+ 	  <test name="family">
+ 	  <string>AR PL UMing CN</string>
++	  </test>
++      	  <test name="pixelsize" compare="more_eq"><int>17</int></test>
++	  <edit name="antialias" mode="assign"><bool>true</bool></edit>
++	  <edit name="hinting" mode="assign"><bool>true</bool></edit>
++	</match>
++	<match target="font">
++	  <test name="family">
+ 	  <string>AR PL UMing HK</string>
++	  </test>
++      	  <test name="pixelsize" compare="more_eq"><int>17</int></test>
++	  <edit name="antialias" mode="assign"><bool>true</bool></edit>
++	  <edit name="hinting" mode="assign"><bool>true</bool></edit>
++	</match>
++	<match target="font">
++	  <test name="family">
+ 	  <string>AR PL UMing TW</string>
++	  </test>
++      	  <test name="pixelsize" compare="more_eq"><int>17</int></test>
++	  <edit name="antialias" mode="assign"><bool>true</bool></edit>
++	  <edit name="hinting" mode="assign"><bool>true</bool></edit>
++	</match>
++	<match target="font">
++	  <test name="family">
+ 	  <string>AR PL UMing TW MBE</string>
+ 	  </test>
+       	  <test name="pixelsize" compare="more_eq"><int>17</int></test>
+ 	  <edit name="antialias" mode="assign"><bool>true</bool></edit>
+ 	  <edit name="hinting" mode="assign"><bool>true</bool></edit>
+ 	</match>
+-
+ </fontconfig>
+diff --git a/41-arphic-uming.conf b/41-arphic-uming.conf
+index 7e2f12b..4f91a4d 100644
+--- a/41-arphic-uming.conf
++++ b/41-arphic-uming.conf
+@@ -7,22 +7,52 @@
+  -->
+ 	<alias>
+ 		<family>AR PL ShanHeiSun Uni</family>
++		<default><family>serif</family></default>
++	</alias>
++	<alias>
+ 		<family>AR PL ShanHeiSun Uni MBE</family>
++		<default><family>serif</family></default>
++	</alias>
++	<alias>
+ 		<family>AR PL UMing CN</family>
++		<default><family>serif</family></default>
++	</alias>
++	<alias>
+ 		<family>AR PL UMing HK</family>
++		<default><family>serif</family></default>
++	</alias>
++	<alias>
+ 		<family>AR PL UMing TW</family>
++		<default><family>serif</family></default>
++	</alias>
++	<alias>
+ 		<family>AR PL UMing TW MBE</family>
+ 		<default><family>serif</family></default>
+ 	</alias>
+ <!--
+   Monospace faces
+  -->
+- 	<alias>
++	<alias>
+ 		<family>AR PL ShanHeiSun Uni</family>
++		<default><family>monospace</family></default>
++	</alias>
++	<alias>
+ 		<family>AR PL ShanHeiSun Uni MBE</family>
++		<default><family>monospace</family></default>
++	</alias>
++	<alias>
+ 		<family>AR PL UMing CN</family>
++		<default><family>monospace</family></default>
++	</alias>
++	<alias>
+ 		<family>AR PL UMing HK</family>
++		<default><family>monospace</family></default>
++	</alias>
++	<alias>
+ 		<family>AR PL UMing TW</family>
++		<default><family>monospace</family></default>
++	</alias>
++	<alias>
+ 		<family>AR PL UMing TW MBE</family>
+ 		<default><family>monospace</family></default>
+ 	</alias>
+diff --git a/64-arphic-uming.conf b/64-arphic-uming.conf
+index dd3ec7e..b20b2ad 100644
+--- a/64-arphic-uming.conf
++++ b/64-arphic-uming.conf
+@@ -4,6 +4,17 @@
+ 	<match target="pattern">
+ 		<test qual="any" name="lang" compare="contains">
+ 			<string>zh-cn</string>
++		</test>
++		<test qual="any" name="family">
++			<string>serif</string>
++		</test>
++		<edit name="family" mode="prepend" binding="strong">
++			<string>AR PL UMing CN</string>
++		</edit>
++	</match>
++
++	<match target="pattern">
++		<test qual="any" name="lang" compare="contains">
+ 			<string>zh-sg</string>
+ 		</test>
+ 		<test qual="any" name="family">
+@@ -17,6 +28,17 @@
+ 	<match target="pattern">
+ 		<test qual="any" name="lang" compare="contains">
+ 			<string>zh-cn</string>
++		</test>
++		<test name="family">
++			<string>AR PL UMing CN</string>
++		</test>
++		<edit name="family" mode="append" binding="strong">
++			<string>DejaVu Serif</string>
++		</edit>
++	</match>
++
++	<match target="pattern">
++		<test qual="any" name="lang" compare="contains">
+ 			<string>zh-sg</string>
+ 		</test>
+ 		<test name="family">
+@@ -30,6 +52,17 @@
+ 	<match target="pattern">
+ 		<test qual="any" name="lang" compare="contains">
+ 			<string>zh-hk</string>
++		</test>
++		<test qual="any" name="family">
++			<string>serif</string>
++		</test>
++		<edit name="family" mode="prepend" binding="strong">
++			<string>AR PL UMing HK</string>
++		</edit>
++	</match>
++
++	<match target="pattern">
++		<test qual="any" name="lang" compare="contains">
+ 			<string>zh-mo</string>
+ 		</test>
+ 		<test qual="any" name="family">
+@@ -43,6 +76,17 @@
+ 	<match target="pattern">
+ 		<test qual="any" name="lang" compare="contains">
+ 			<string>zh-hk</string>
++		</test>
++		<test name="family">
++			<string>AR PL UMing HK</string>
++		</test>
++		<edit name="family" mode="append" binding="strong">
++			<string>DejaVu Serif</string>
++		</edit>
++	</match>
++
++	<match target="pattern">
++		<test qual="any" name="lang" compare="contains">
+ 			<string>zh-mo</string>
+ 		</test>
+ 		<test name="family">
diff --git a/system/ttf-arphic-uming/35-ttf-arphic-uming-aliases.conf b/system/ttf-arphic-uming/35-ttf-arphic-uming-aliases.conf
deleted file mode 100644
index 2d803f708c..0000000000
--- a/system/ttf-arphic-uming/35-ttf-arphic-uming-aliases.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-	<alias binding="same">
-	  <family>AR PL ShanHeiSun Uni</family>
-	  <prefer><family>AR PL UMing HK</family></prefer>
-	</alias>
-
-	<alias binding="same">
-	  <family>AR PL ShanHeiSun Uni MBE</family>
-	  <prefer><family>AR PL UMing TW MBE</family></prefer>
-	</alias>
-</fontconfig>
diff --git a/system/ttf-arphic-uming/41-ttf-arphic-uming.conf b/system/ttf-arphic-uming/41-ttf-arphic-uming.conf
deleted file mode 100644
index f8273191ea..0000000000
--- a/system/ttf-arphic-uming/41-ttf-arphic-uming.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-<!--
-  Serif faces
- -->
-	<alias>
-		<family>AR PL ShanHeiSun Uni</family>
-		<family>AR PL ShanHeiSun Uni MBE</family>
-		<family>AR PL UMing CN</family>
-		<family>AR PL UMing HK</family>
-		<family>AR PL UMing TW</family>
-		<family>AR PL UMing TW MBE</family>
-		<default><family>serif</family></default>
-	</alias>
-<!--
-  Sans-serif faces
- -->
-	<alias>
-		<family>AR PL ShanHeiSun Uni</family>
-		<family>AR PL ShanHeiSun Uni MBE</family>
-		<family>AR PL UMing CN</family>
-		<family>AR PL UMing HK</family>
-		<family>AR PL UMing TW</family>
-		<family>AR PL UMing TW MBE</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-<!--
-  Monospace faces
- -->
- 	<alias>
-		<family>AR PL ShanHeiSun Uni</family>
-		<family>AR PL ShanHeiSun Uni MBE</family>
-		<family>AR PL UMing CN</family>
-		<family>AR PL UMing HK</family>
-		<family>AR PL UMing TW</family>
-		<family>AR PL UMing TW MBE</family>
-		<default><family>monospace</family></default>
-	</alias>
-</fontconfig>
diff --git a/system/ttf-arphic-uming/64-ttf-arphic-uming.conf b/system/ttf-arphic-uming/64-ttf-arphic-uming.conf
deleted file mode 100644
index f611d1034f..0000000000
--- a/system/ttf-arphic-uming/64-ttf-arphic-uming.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>AR PL UMing HK</family>
-			<family>AR PL UMing CN</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>AR PL UMing HK</family>
-			<family>AR PL UMing CN</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>AR PL UMing HK</family>
-			<family>AR PL UMing CN</family>
-		</prefer>
-	</alias>
-</fontconfig>
diff --git a/system/ttf-arphic-uming/90-ttf-arphic-uming-embolden.conf b/system/ttf-arphic-uming/90-ttf-arphic-uming-embolden.conf
deleted file mode 100644
index 30b19998bb..0000000000
--- a/system/ttf-arphic-uming/90-ttf-arphic-uming-embolden.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-	
-	<match target="font" >
-		<test name="family" compare="contains" >
-			<string>AR PL UMing</string>
-		</test> 
-                <!-- check to see if the font is just regular -->
-                <test name="weight" compare="less_eq">
-                        <int>100</int>
-		</test>
-		<test compare="more_eq" target="pattern" name="weight" >
-			<int>180</int>
-		</test>
-		<edit mode="assign" name="embolden" >
-			<bool>true</bool>
-		</edit>
-	</match>
-
-</fontconfig>
diff --git a/system/ttf-arphic-uming/README b/system/ttf-arphic-uming/README
index 4a848206b6..04b17c68d3 100644
--- a/system/ttf-arphic-uming/README
+++ b/system/ttf-arphic-uming/README
@@ -1,17 +1,19 @@
 CJK Unicode font Ming style
 ===========================
 
-This font was taken from the from the TrueType fonts generously released by
-Arphic Technologies Taiwan under the Arphic Public License.
-It was modified with Fontforge by Arne Goetje <arne@ubuntu.com> to contain
-both Big5 and GB2312 charsets plus some European characters.
+This font was taken from the from the TrueType fonts generously
+released by Arphic Technologies Taiwan under the Arphic
+Public License.  It was modified with Fontforge by Arne Goetje
+<arne@ubuntu.com> to contain both Big5 and GB2312 charsets plus some
+European characters.
 
 Currently it fully supports the following charsets:
-ISO8859-1,2,3,4,7,9,10,13,14,15
-Big5
-HKSCS-2004
-GB2312-80
-Bopomofo Extensions for Hakka, Minnan (Unicode 5.0) and their MBE variants.
+- ISO8859-1,2,3,4,7,9,10,13,14,15
+- Big5
+- HKSCS-2004
+- GB2312-80
+- Bopomofo Extensions for Hakka, Minnan (Unicode 5.0) and their MBE
+  variants.
 
 Partly support is implemented for:
 CNS 11643
@@ -20,9 +22,9 @@ GB18030
 Japanese
 Korean
 
-This font is under development, new glyphs for the partly supported charsets
-are constantly added.
+This font is under development, new glyphs for the partly supported
+charsets are constantly added.
 
-This font is a TrueType Collection containing 4 flavors, namely
-CN, HK, TW and TW MBE. Please see NEWS, KNOWN_ISSUES, FONTLOG and TODO for
+This font is a TrueType Collection containing 4 flavors, namely CN,
+HK, TW and TW MBE. Please see NEWS, KNOWN_ISSUES, FONTLOG and TODO for
 details.
diff --git a/system/ttf-arphic-uming/ttf-arphic-uming.SlackBuild b/system/ttf-arphic-uming/ttf-arphic-uming.SlackBuild
index 988ad7de5b..e92201c0f8 100644
--- a/system/ttf-arphic-uming/ttf-arphic-uming.SlackBuild
+++ b/system/ttf-arphic-uming/ttf-arphic-uming.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ttf-arphic-uming
 
@@ -22,14 +22,28 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220218 bkw: Modified by SlackBuilds.org:
+# - update for v0.2.20080216.2 and apply a Debian patch that fixes the
+#   syntax in the .conf files. This was required because (a) every app
+#   that uses fontconfig was spewing a ton of warnings on startup
+#   (whether or not it actually used these fonts), and (b) the
+#   'convert' command from ImageMagick was aborting.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-arphic-uming
-VERSION=${VERSION:-0.2.20080216.1}
+VERSION=${VERSION:-0.2.20080216.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -39,39 +53,37 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-mkdir -p $PRGNAM
 rm -rf $PRGNAM-$VERSION
-
-tar xvf $CWD/$PRGNAM\_${VERSION}.orig.tar.gz -C $PRGNAM
-mv $PRGNAM $PRGNAM-$VERSION
+tar xvf $CWD/fonts-arphic-uming\_${VERSION}.orig.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20220218 bkw: patch from debian:
+# http://deb.debian.org/debian/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_0.2.20080216.2-11.debian.tar.xz
+patch -p1 < $CWD/30-fix-fontconfig-syntax.patch
 
 mkdir -p $PKG/usr/share/fonts/TTF
 cp -a *.ttc $PKG/usr/share/fonts/TTF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CONTRIBUTERS FONTLOG Font_Comparison_ShanHeiSun_UMing.odt Font_Comparison_ShanHeiSun_UMing.pdf INSTALL \
-  KNOWN_ISSUES NEWS README README.Bitmap license $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTERS FONTLOG Font_Comparison_ShanHeiSun_UMing.odt \
+      Font_Comparison_ShanHeiSun_UMing.pdf INSTALL \
+      KNOWN_ISSUES NEWS README README.Bitmap license \
+      $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/etc/fonts/conf.{d,avail}
-cat $CWD/25-ttf-arphic-uming-bitmaps.conf > $PKG/etc/fonts/conf.avail/25-ttf-arphic-uming-bitmaps.conf
-cat $CWD/25-ttf-arphic-uming-render.conf > $PKG/etc/fonts/conf.avail/25-ttf-arphic-uming-render.conf
-cat $CWD/35-ttf-arphic-uming-aliases.conf > $PKG/etc/fonts/conf.avail/35-ttf-arphic-uming-aliases.conf
-cat $CWD/41-ttf-arphic-uming.conf > $PKG/etc/fonts/conf.avail/41-ttf-arphic-uming.conf
-cat $CWD/64-ttf-arphic-uming.conf > $PKG/etc/fonts/conf.avail/64-ttf-arphic-uming.conf
-cat $CWD/90-ttf-arphic-uming-embolden.conf > $PKG/etc/fonts/conf.avail/90-ttf-arphic-uming-embolden.conf
-cd $PKG/etc/fonts/conf.d && ln -sf ../conf.avail/25-ttf-arphic-uming-bitmaps.conf && ln -sf ../conf.avail/25-ttf-arphic-uming-render.conf && ln -sf ../conf.avail/35-ttf-arphic-uming-aliases.conf && ln -sf ../conf.avail/41-ttf-arphic-uming.conf && ln -sf ../conf.avail/64-ttf-arphic-uming.conf && ln -sf ../conf.avail/90-ttf-arphic-uming-embolden.conf
+cp -a *.conf $PKG/etc/fonts/conf.avail
+( cd $PKG/etc/fonts/conf.d && ln -s ../conf.avail/* .)
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-arphic-uming/ttf-arphic-uming.info b/system/ttf-arphic-uming/ttf-arphic-uming.info
index 6d23a37756..282811b40a 100644
--- a/system/ttf-arphic-uming/ttf-arphic-uming.info
+++ b/system/ttf-arphic-uming/ttf-arphic-uming.info
@@ -1,8 +1,8 @@
 PRGNAM="ttf-arphic-uming"
-VERSION="0.2.20080216.1"
+VERSION="0.2.20080216.2"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/CJKUnifonts/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/ttf-arphic-uming_0.2.20080216.1.orig.tar.gz"
-MD5SUM="d219fcaf953f3eb1889399955a00379f"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_0.2.20080216.2.orig.tar.bz2"
+MD5SUM="830e98afbc0644af1c365df5fd92cef0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ttf-babelstone-cjk/APL.txt b/system/ttf-babelstone-cjk/APL.txt
new file mode 100644
index 0000000000..c1aba41d3f
--- /dev/null
+++ b/system/ttf-babelstone-cjk/APL.txt
@@ -0,0 +1,58 @@
+ARPHIC PUBLIC LICENSE
+
+Copyright (C) 1999 Arphic Technology Co., Ltd.
+11Fl. No.168, Yung Chi Rd., Taipei, 110 Taiwan
+All rights reserved except as specified below.
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is forbidden.
+
+Preamble
+
+   The licenses for most software are designed to take away your freedom to share and change it. By contrast, the ARPHIC PUBLIC LICENSE specifically permits and encourages you to use this software, provided that you give the recipients all the rights that we gave you and make sure they can get the modifications of this software.
+
+Legal Terms
+
+0. Definitions:
+   Throughout this License, "Font" means the TrueType fonts "AR PL Mingti2L Big5", "AR PL KaitiM Big5" (BIG-5 character set) and "AR PL SungtiL GB", "AR PL KaitiM GB" (GB character set) which are originally distributed by Arphic, and the derivatives of those fonts created through any modification including modifying glyph, reordering glyph, converting format, changing font name, or adding/deleting some characters in/from glyph table.
+
+   "PL" means "Public License".
+
+   "Copyright Holder" means whoever is named in the copyright or copyrights for the Font.
+
+   "You" means the licensee, or person copying, redistributing or modifying the Font.
+
+   "Freely Available" means that you have the freedom to copy or modify the Font as well as redistribute copies of the Font under the same conditions you received, not price. If you wish, you can charge for this service.
+
+1. Copying & Distribution
+   You may copy and distribute verbatim copies of this Font in any medium, without restriction, provided that you retain this license file (ARPHICPL.TXT) unaltered in all copies.
+
+2. Modification
+   You may otherwise modify your copy of this Font in any way, including modifying glyph, reordering glyph, converting format, changing font name, or adding/deleting some characters in/from glyph table, and copy and distribute such modifications under the terms of Section 1 above, provided that the following conditions are met:
+
+   a) You must insert a prominent notice in each modified file stating how and when you changed that file.
+
+   b) You must make such modifications Freely Available as a whole to all third parties under the terms of this License, such as by offering access to copy the modifications from a designated place, or distributing the modifications on a medium customarily used for software interchange.
+
+   c) If the modified fonts normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the Font under these conditions, and telling the user how to view a copy of this License.
+
+   These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Font, and can be reasonably considered independent and separate works in themselves, then this License and its terms, do not apply to those sections when you distribute them as separate works. Therefore, mere aggregation of another work not based on the Font with the Font on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. Condition Subsequent
+   You may not copy, modify, sublicense, or distribute the Font except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Font will automatically retroactively void your rights under this License. However, parties who have received copies or rights from you under this License will keep their licenses valid so long as such parties remain in full compliance.
+
+4. Acceptance
+   You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to copy, modify, sublicense or distribute the Font. These actions are prohibited by law if you do not accept this License. Therefore, by copying, modifying, sublicensing or distributing the Font, you indicate your acceptance of this License and all its terms and conditions.
+
+5. Automatic Receipt
+   Each time you redistribute the Font, the recipient automatically receives a license from the original licensor to copy, distribute or modify the Font subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 
+
+6. Contradiction
+   If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Font at all. For example, if a patent license would not permit royalty-free redistribution of the Font by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Font.
+
+   If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. 
+
+7. NO WARRANTY
+   BECAUSE THE FONT IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE FONT, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS OR OTHER PARTIES PROVIDE THE FONT "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE FONT IS WITH YOU. SHOULD THE FONT PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+8. DAMAGES WAIVER
+   UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, IN NO EVENT WILL ANY COPYRIGHTT HOLDERS, OR OTHER PARTIES WHO MAY COPY, MODIFY OR REDISTRIBUTE THE FONT AS PERMITTED ABOVE, BE LIABLE TO YOU FOR ANY DIRECT, INDIRECT, CONSEQUENTIAL, INCIDENTAL, SPECIAL OR EXEMPLARY DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE FONT (INCLUDING BUT NOT LIMITED TO PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA OR PROFITS; OR BUSINESS INTERRUPTION), EVEN IF SUCH HOLDERS OR OTHER PARTIES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
diff --git a/system/ttf-babelstone-cjk/BabelStoneOFL.txt b/system/ttf-babelstone-cjk/BabelStoneOFL.txt
new file mode 100644
index 0000000000..ef758932ab
--- /dev/null
+++ b/system/ttf-babelstone-cjk/BabelStoneOFL.txt
@@ -0,0 +1,94 @@
+Copyright (c) 2013, Andrew West (www.babelstone.co.uk),
+with Reserved Font Name BabelStone.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/system/ttf-babelstone-cjk/README b/system/ttf-babelstone-cjk/README
new file mode 100644
index 0000000000..849bc0af07
--- /dev/null
+++ b/system/ttf-babelstone-cjk/README
@@ -0,0 +1,5 @@
+Babelstone fonts is created by Andrew West. This package
+contains the chinese fonts along with regional variants.
+It covers Han,Jurchen,Khitan,Tangut,Sui,Naxi Dongba and Yi
+scripts.It also covers Hanzi,Kanji and Hanja.
+
diff --git a/system/ttf-babelstone-cjk/copyright b/system/ttf-babelstone-cjk/copyright
new file mode 100644
index 0000000000..0a7deeeffd
--- /dev/null
+++ b/system/ttf-babelstone-cjk/copyright
@@ -0,0 +1,13 @@
+Tangut Yinchuan v. 15.102 copyright Prof. Jing Yongshi
+
+Tangut yinchuan Font is made available for free download 
+and use with the permission of Prof. Jing Yongshi, who 
+reserves the copyright to the font. This font may not be 
+modified, sold or redistributed for profit without the express 
+permission of the copyright holders. If you use this font in 
+a publication you are requested to 
+acknowledge Prof. Jing Yongshi's copyright of the font.
+
+The font is maintained by Andrew West, and any feature requests 
+or bug reports should be directed to Andrew West by email   
+Email: babelstone@gmail.com
diff --git a/system/ttf-babelstone-cjk/copyright2 b/system/ttf-babelstone-cjk/copyright2
new file mode 100644
index 0000000000..91eea19f45
--- /dev/null
+++ b/system/ttf-babelstone-cjk/copyright2
@@ -0,0 +1,6 @@
+BabelStone Fonts Copyright Andrew West 
+
+These fonts are free to use for personal or commercial purposes, 
+and you are also free to redistribute them by themself or as part 
+of a free or commercial software package, just as long as you 
+do not sell the fonts on its own.
diff --git a/system/ttf-babelstone-cjk/doinst.sh b/system/ttf-babelstone-cjk/doinst.sh
new file mode 100644
index 0000000000..5941fa3c7d
--- /dev/null
+++ b/system/ttf-babelstone-cjk/doinst.sh
@@ -0,0 +1,13 @@
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/ttf-babelstone-cjk/readme_fonts b/system/ttf-babelstone-cjk/readme_fonts
new file mode 100644
index 0000000000..473b73a9ea
--- /dev/null
+++ b/system/ttf-babelstone-cjk/readme_fonts
@@ -0,0 +1,147 @@
+ttf-babelstone-cjk contains the following fonts:
+
+Babelstonehan:
+
+It is a free Unicode CJK font with over 56,000 Han
+characters (hanzi, kanji, hanja), and 64,973 Unicode
+characters in total. It is a Song/Ming style font.
+with glyphs modelled on the official character forms
+used in the People's Republic of China, and is primarily
+intended for writing Modern Standard Chinese,
+Classical Chinese, and various Sinitic languages and dialects.
+The font also includes many rare or archaic characters that are
+not found in most CJK fonts, as well as many characters used for
+the scholarly transcription of Early Chinese texts written on
+bone, bronze, wood, bamboo, and silk.
+
+Babelstonehan PUA:
+
+it includes 4,444 unencoded CJK ideographs and ideographic
+components in the PUA, in the range U+E080 through U+F8DF.
+
+BabelStone Erijan 1 and 2:
+
+BabelStone Erjian 1 and 2 are two Unicode Han fonts
+using the draft second stage simplified forms of characters.
+Both fonts cover 8,157 high-frequency Hanzi, comprising
+8,105 Level 1, Level 2 and Level 3 characters listed in
+Tōngyòng Guīfàn Hànzì Zìdiǎn.and 52 other characters.
+"BabelStone Erjian 1" uses second stage simplified glyph
+forms for the characters listed in Table 1 only; whereas
+"BabelStone Erjian 2" uses second stage simplified glyph
+forms for the characters listed in Table 1 and Table 2
+(where the glyph for the same character differs between
+Table 1 and Table 2, the form given in Table 2 is used).
+
+Babelstone Jurchen Scan PUA fonts:
+
+urchen Berlin, Jurchen Tianyige, and Jurchen Toyo Bunko
+are three Jurchen fonts with glyphs scanned from the
+Jurchen section of three copies of the Ming dynasty Huáyí Yìyǔ.
+ "Sino-Foreign Vocabulary" (i.e. the Sino-Jurchen Vocabulary).
+Jurchen Berlin is derived from the manuscript copy held at the
+Berlin State Library (Staatsbibliothek zu Berlin)
+(pressmark Libri sin. Hirth Ms. 1);
+Jurchen Tianyige is derived from the Ming dynasty
+woodblock printed edition held at the Tiānyīgé
+library in Níngbō (pressmark 善0376);
+Jurchen Toyo Bunko is the manuscript copy held at the
+Tōyō Bunko (東洋文庫) in Tokyo (presssmark XI-5-2).
+There is currently no scan font for the manuscript
+copy held at the National Library of China
+in Běijīng (pressmark 10507). The characters are mapped
+non-contiguously to the PUA at E000..E6FA
+(matching the code points in my private Jurchen font).
+
+Babelstone Khitan Large scropt PUA fonts:
+
+it is an experimental font containing 1,469 Khitan
+Large Script glyphs, mapped to the PUA at E000..E5BC.
+This font is being developed as I slowly go through
+all Khitan Large Script sources, and will continue to grow.
+The glyphs are not ordered in the font,
+but have been added sequentially as I encounter
+each new character form. In addition, very many of the
+glyphs are variant forms of the same character,
+often trivial variants.
+
+Babelstone Khitan small script fonts:
+
+It  is a Unicode font supporting the 470 Khitan Small Script
+characters which were encoded in Unicode version 13.0 (March 2020).
+This font does not support cluster composition, but is intended
+for displaying individual glyphs in horizontal linear layout
+as used in Daniel Kane's The Kitan Language and Script (Brill, 2009).
+This font uses a Chinese (Song/Ming) style of glyphs which is
+not attested in surviving examples of Khitan
+small script text (mostly epitaphs engraved on stone tablets).
+
+It also contains font for for the thirty-six seal script style
+Khitan small script characters which are engraved on the covers
+for the eulogies for Emperor Daozong and Empress Xuanyi
+
+BabelStone Naxi Dongba PUA Fonts:
+
+It is a scan font covering 2,162 glyphs for the
+Naxi Dongba (Naxi Tomba) script. The glyphs are
+derived from Lǐ Líncàn's 李霖灿 Nàxīzú
+xiàngxíng biāo yīn wénzì zìdiǎn 纳西族象形标音文字字典
+[Naxi Pictographic Symbols Dictionary]
+(Kunming: Yunnan minzu chubanshe, 2001)
+[ISBN 7-5367-2126-9]. The 2,120 glyphs at E000..E849 are the main
+entries in the dictionary, and the 42 glyphs at
+F000..F029 are variant glyphs for some of the main entries.
+
+Babelstone Sui (Shuishu) PUA Fonts:
+
+These are a set of scan fonts covering Sui
+(Shuishu 水书) characters listed in various
+printed sources, with characters mapped to
+the Unicode Private Use Area (PUA).
+
+Babelstone Tangut Scan Fonts:
+
+These are a set of fonts covering Tangut glyphs from
+various sources, mapped to the PUA. The fonts were created
+from scanned images of the source glyphs, and the quality
+of the resultant font glyphs is generally quite poor. These fonts
+are not intended for use in typesetting Tangut text, but were
+created in order to facilitate mapping of Tangut characters
+between sources.
+
+BabelStone Tangut Wenhai Font:
+
+BabelStone Tangut Wenhai is a Unicode Tangut font covering
+3,061 of the 6,125 Tangut ideographs encoded in Unicode version 9.0
+(released in June 2016). The glyphs are derived from the
+3,064 head characters in the calligraphic facsimile reproduction of the
+Sea of Writing [Wénhǎi 文海] text in
+Wénhǎi Yánjiū 文海研究 [Study of the Sea of Writing] (Beijing, 1983) by
+Shi Bojin 史金波 et al. This font also includes 442 of the 755
+encoded Tangut components, but these are poorer quality compared with
+the Tangut ideographs, and may be replaced with glyphs derived from the
+Tangut ideographs in the future.
+NB This font does not cover many common Tangut characters,
+and so is not suitable for use in typesetting Tangut text in academic works.
+
+Tangut Yinchuan Font:
+
+Tangut Yinchuan v. 15.102 is a font for the Tangut script
+that supports the full set of Tangut characters defined in
+Unicode version 15.0 (Tangut, Tangut Supplement, Tangut Components code charts).
+It is based on a font named XXZT (西夏字体 in Chinese) that was
+designed by Prof. Jǐng Yǒngshí 景永时 of the
+Beifang Ethnic University (北方民族大学) in Yinchuan. The original
+font was used for typesetting the revised 2nd edition of the
+Tangut-Chinese dictionary Xià-Hàn Zìdiǎn 夏漢字典 (Beijing, 2008)
+by Prof. Li Fanwen
+
+BabelStone Sani Yi PUA Font:
+
+BabelStone Sani Yi is a PUA font covering characters in the Sani Yi script.
+The font was created from scanned images of the hand-written characters in
+Yí-Hàn Jiǎnmíng Cídiǎn 彝汉简明词典 [Concise Yi-Chinese Dictionary]
+(Kunming: Yunnan Minzu Chubanshe, 1984). The quality of the resultant font
+glyphs is generally quite poor. This font is not intended for use in typesetting
+Yi text, but was created in order to facilitate work on the encoding of the
+Sani Yi script in Unicode.
diff --git a/system/ttf-babelstone-cjk/slack-desc b/system/ttf-babelstone-cjk/slack-desc
new file mode 100644
index 0000000000..1bcd514ce3
--- /dev/null
+++ b/system/ttf-babelstone-cjk/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+ttf-babelstone-cjk: ttf-babelstone-cjk (BabelStone CJK Fonts)
+ttf-babelstone-cjk:
+ttf-babelstone-cjk: Babelstone fonts is created by Andrew West. This package
+ttf-babelstone-cjk: contains the chinese fonts along with regional variants.
+ttf-babelstone-cjk: It covers Han,Jurchen,Khitan,Tangut,Sui,Naxi Dongba and Yi
+ttf-babelstone-cjk: scripts.It also covers Hanzi,Kanji and Hanja.
+ttf-babelstone-cjk:
+ttf-babelstone-cjk: Homepage:https://www.babelstone.co.uk
+ttf-babelstone-cjk:
+ttf-babelstone-cjk:
+ttf-babelstone-cjk:
diff --git a/system/ttf-babelstone-cjk/ttf-babelstone-cjk.SlackBuild b/system/ttf-babelstone-cjk/ttf-babelstone-cjk.SlackBuild
new file mode 100644
index 0000000000..fe2458ce8f
--- /dev/null
+++ b/system/ttf-babelstone-cjk/ttf-babelstone-cjk.SlackBuild
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+# Slackware build script for ttf-babelstone-cjk
+
+# Copyright 2023 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ttf-babelstone-cjk
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+SRCH=${SRCH:-BabelStoneHan}
+SRCS=${SRCS:-BabelStoneShuishu}
+SRCT=${SRCT:-TangutScanFonts}
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $TMP/han
+mkdir -pv $TMP/sui
+mkdir -pv $TMP/tangut
+mkdir -pv $PKG/usr/share/fonts/TTF
+
+unzip -d $TMP/han $CWD/$SRCH.zip
+unzip -d $TMP/sui $CWD/$SRCS.zip
+unzip -d $TMP/tangut $CWD/$SRCT.zip
+
+install -D -m0644 -v $CWD/*.ttf -t $PKG/usr/share/fonts/TTF
+install -D -m0644 -v $TMP/han/*.ttf -t $PKG/usr/share/fonts/TTF
+install -D -m0644 -v $TMP/sui/*.ttf -t $PKG/usr/share/fonts/TTF
+install -D -m0644 -v $TMP/tangut/*.ttf -t $PKG/usr/share/fonts/TTF
+
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/APL.txt >  $PKG/usr/doc/$PRGNAM-$VERSION/APL.txt
+cat $CWD/BabelStoneOFL.txt > $PKG/usr/doc/$PRGNAM-$VERSION/babelstoneOFL.txt
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/copyright > $PKG/usr/doc/$PRGNAM-$VERSION/copyright
+cat $CWD/copyright2 > $PKG/usr/doc/$PRGNAM-$VERSION/copyright2
+cat $CWD/readme_fonts > $PKG/usr/doc/$PRGNAM-$VERSION/readme_fonts
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-babelstone-cjk/ttf-babelstone-cjk.info b/system/ttf-babelstone-cjk/ttf-babelstone-cjk.info
new file mode 100644
index 0000000000..7b96a36442
--- /dev/null
+++ b/system/ttf-babelstone-cjk/ttf-babelstone-cjk.info
@@ -0,0 +1,56 @@
+PRGNAM="ttf-babelstone-cjk"
+VERSION="1.0"
+HOMEPAGE="https://www/babelstone.co.uk"
+DOWNLOAD="https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneHanPUA.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneErjian1.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneErjian2.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/JurchenBerlin.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/JurchenTianyige.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/JurchenToyoBunko.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/JurchenSmall.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneKhitanLargeGlyphs.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneKhitanSeals.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneKhitanSealGlyphs.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneKhitanSmallLinear.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneKhitanSmallSeal.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/KhitanSmallLinear.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/KhitanSmallRotated.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/KhitanSmallVertical.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneNaxiLLC.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneShuishu.zip \
+          https://www.babelstone.co.uk/Fonts/Download/TangutScanFonts.zip \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneTangutWenhai.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/TangutYinchuan.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/TangutYinchuanInverse.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneTangutRadicals.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneSaniYi.ttf"
+MD5SUM="d7568d28ba67c7a6fc9fc896c4ae9bc2 \
+        6220c97e5da381b53462eef28fa81873 \
+        3dac88173ade093d945ccdae7d1f2fce \
+        fa33f8875b032c1d6bb70a203e418dd4 \
+        4baf9e3a67a8ad3c002e348f9d5b6bf7 \
+        6fde3b3dd390c66e79719eba0388a7d4 \
+        1214b2722a2ebf128d8138edc3b0209d \
+        a540c2fa397ae2b41191792c6023db80 \
+        5a528a3a699ab870a1ac52ffff5e5978 \
+        0d07928f544c3d873389412d1d04a94b \
+        e5764f3d5e0d5540e40190d8ccf4a2cd \
+        a1f9cda6991c3b0dc25afe9c98015f63 \
+        7867caf246b3f1f2f1824cd6024a44fa \
+        7ff6a2c4f32ef03343436bf4050feda5 \
+        7a3e2bd8aefdd0bb594f0f0e4b751bb7 \
+        3f80fb811bb14334f5c79f432a065445 \
+        b4d2f92f9b7e3ec375b9b2b1260d267c \
+        2e46a52a13f1c37b6d4f0956e8547618 \
+        75dd9971a19f12a1a3f5cef4d0990657 \
+        3d7fb66f97e5fe530504ef8736debb47 \
+        e86eae33ab5c7a4cfa3d459cc2ee1b0b \
+        70eaa3c7c9f2cdd31b6ac38b0b514298 \
+        b55128a55c2200c995f1cfe60e390867 \
+        b3c6baa077e7c3f4b5a75bd55c4ee650"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/ttf-babelstone-latin/BabelStoneOFL.txt b/system/ttf-babelstone-latin/BabelStoneOFL.txt
new file mode 100644
index 0000000000..ef758932ab
--- /dev/null
+++ b/system/ttf-babelstone-latin/BabelStoneOFL.txt
@@ -0,0 +1,94 @@
+Copyright (c) 2013, Andrew West (www.babelstone.co.uk),
+with Reserved Font Name BabelStone.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/system/ttf-babelstone-latin/README b/system/ttf-babelstone-latin/README
new file mode 100644
index 0000000000..c0893fb847
--- /dev/null
+++ b/system/ttf-babelstone-latin/README
@@ -0,0 +1,7 @@
+babelstone latin fonts include  fonts that covers the latin
+script and is fully unicode compliant. It also includes centaurian
+alphabet that is convered in Artemis Fowl by Eoin colfer. Goblin
+fonts based on J.R.R Tolkien's Father Christmas letters.
+Pigpen and Fowl fonts, a cipher font based on the tombstone of
+James Lesson in New York.
+
diff --git a/system/ttf-babelstone-latin/copyright b/system/ttf-babelstone-latin/copyright
new file mode 100644
index 0000000000..91eea19f45
--- /dev/null
+++ b/system/ttf-babelstone-latin/copyright
@@ -0,0 +1,6 @@
+BabelStone Fonts Copyright Andrew West 
+
+These fonts are free to use for personal or commercial purposes, 
+and you are also free to redistribute them by themself or as part 
+of a free or commercial software package, just as long as you 
+do not sell the fonts on its own.
diff --git a/system/ttf-babelstone-latin/doinst.sh b/system/ttf-babelstone-latin/doinst.sh
new file mode 100644
index 0000000000..2b9a8c5e32
--- /dev/null
+++ b/system/ttf-babelstone-latin/doinst.sh
@@ -0,0 +1,14 @@
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
+
diff --git a/system/ttf-babelstone-latin/readme_fonts b/system/ttf-babelstone-latin/readme_fonts
new file mode 100644
index 0000000000..d9f0a7f5cb
--- /dev/null
+++ b/system/ttf-babelstone-latin/readme_fonts
@@ -0,0 +1,70 @@
+ttf-babelstone-latin contains the following fonts
+
+BabelStone Roman:
+
+It is a Unicode serif font covering the Latin script.
+It was designed primarily for use in phonetic
+transcription of Tangut, but may be useful for
+other purposes. he current version of the font supports
+Unicode 15.0 and covers all 1,481 Latin script
+characters defined in Unicode 15.0.
+
+BabelStone Englisc:
+
+It is a font for Old English in the general style of
+the Anglo-Saxon font cut for Franciscus Junius (1591–1677)
+in about 1655, and used in various editions of Anglo-Saxon
+texts published in Oxford during the 17th and 18th centuries,
+for example the Anglo-Saxon Heptateuch compiled by Edward
+Thwaites, and published in 1698. The font uses the same
+letterforms as the Junius font, but not necessarily exactly
+same glyph forms. Some characters are double-mapped, both to
+their proper Unicode code point and to the
+semantically-corresponding character
+(e.g. 'wynn' maps to 'wynn' and 'w'; and 'and' maps
+to 'tyronian et' and 'ampersand').
+
+NB: This font is only available in regular style, and
+there are no bold or italic versions.
+
+BabelStone Goblin fonts:
+
+BabelStone Goblin and BabelStone Goblin Vertical are two
+versions of a font based on North Polar Bear's Goblin
+alphabet in J. R. R. Tolkien's Father Christmas Letters (1976).
+
+BabelStone Goblin is designed for horizontal layout, whereas
+BabelStone Goblin Vertical is designed for vertical layout.
+Note that the glyphs of the vertical font will be rotated
+counterclockwise with respect to normal reading orientation
+when used in horizontal contexts
+
+BabelStone Centaurian:
+
+BabelStone Centaurian is a font based on the Centaurian
+alphabet used in the first UK edition of Artemis Fowl :
+The Arctic Incident by Eoin Colfer (it has been replaced
+by the ubiquitous Gnommish script in the American and
+recent UK editions).
+
+The Centaurian alphabet is cypher of the English alphabet,
+but with the twist that the space character is a
+non-blank glyph and the character corresponding to the letter
+T is a blank space.
+
+BabelStone Pigpen fonts:
+
+BabelStone Pigpen is an extended version of one of the most
+common pigpen ciphers, with glyphs for all characters in the
+Basic Latin block.
+
+BabelStone Club Penguin is an extended version of the
+pigpen cipher used on Club Penguin, with glyphs for all
+characters in the Basic Latin block.
+
+BabelStone Leeson is the pigpen cipher used on the tombstone
+of James Leeson (died 1794) in the graveyard of Trinity Church
+on Broadway in New York. This cipher represents the 24-letter
+alphabet of the 18th century, so that I/J and U/V are not
+distinguished. There are three spare berths in the third pigpen,
+which I have assigned to ampersand, question mark and exclamation mark.
diff --git a/system/ttf-babelstone-latin/slack-desc b/system/ttf-babelstone-latin/slack-desc
new file mode 100644
index 0000000000..d03b7b4299
--- /dev/null
+++ b/system/ttf-babelstone-latin/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                    |-----handy-ruler------------------------------------------------------|
+ttf-babelstone-latin: ttf-babelstone-latin (Babelstone Latin fonts)
+ttf-babelstone-latin:
+ttf-babelstone-latin: babelstone latin fonts include  fonts that covers the latin
+ttf-babelstone-latin: script and is fully unicode compliant. It also includes centaurian
+ttf-babelstone-latin: alphabet that is convered in Artemis Fowl by Eoin colfer. Goblin
+ttf-babelstone-latin: fonts based on J.R.R Tolkien's Father Christmas letters.
+ttf-babelstone-latin: Pigpen and Fowl fonts, a cipher font based on the tombstone of
+ttf-babelstone-latin: James Lesson in New York.
+ttf-babelstone-latin:
+ttf-babelstone-latin: Homepage:https://www.babelstone.co.uk
+ttf-babelstone-latin:
diff --git a/system/ttf-babelstone-latin/ttf-babelstone-latin.SlackBuild b/system/ttf-babelstone-latin/ttf-babelstone-latin.SlackBuild
new file mode 100644
index 0000000000..5e22a5215b
--- /dev/null
+++ b/system/ttf-babelstone-latin/ttf-babelstone-latin.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Slackware build script for ttf-babelstone-latin
+
+# Copyright 2023 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ttf-babelstone-latin
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+SRCG=${SRCG:-BabelStoneGoblin}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $TMP/goblin
+mkdir -pv $PKG/usr/share/fonts/TTF
+
+unzip -d $TMP/goblin $CWD/$SRCG.zip
+install -D -m0644 -v $CWD/*.ttf -t $PKG/usr/share/fonts/TTF
+install -D -m0644 -v $TMP/goblin/*.ttf -t $PKG/usr/share/fonts/TTF
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/BabelStoneOFL.txt >  $PKG/usr/doc/$PRGNAM-$VERSION/babelstoneOFL.txt
+cat $CWD/copyright > $PKG/usr/doc/$PRGNAM-$VERSION/copyright
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-babelstone-latin/ttf-babelstone-latin.info b/system/ttf-babelstone-latin/ttf-babelstone-latin.info
new file mode 100644
index 0000000000..0f143f4833
--- /dev/null
+++ b/system/ttf-babelstone-latin/ttf-babelstone-latin.info
@@ -0,0 +1,22 @@
+PRGNAM="ttf-babelstone-latin"
+VERSION="1.0"
+HOMEPAGE="https://www.babelstone.co.uk"
+DOWNLOAD="https://www.babelstone.co.uk/Fonts/Download/BabelStoneRoman.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneEnglisc.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneCentaurian.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneGoblin.zip \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStonePigpen.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneClubPenguin.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneLeeson.ttf"
+MD5SUM="72e42430eccdda7cb89ac0ea21e9fc7c \
+        d00da18224f47e8c02be6c08f7f421f0 \
+        59e88e09a194d034599211f855187ee2 \
+        d4a04ff5e1b050a3f19e335ac92b230d \
+        a749a90136276af900a7fbbfb674ed93 \
+        4d4e352ad73215d984096d45d402b68b \
+        eb0265b370e6d34b83d5608ee5fb8123"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/ttf-babelstone-tibetan/BabelStoneOFL.txt b/system/ttf-babelstone-tibetan/BabelStoneOFL.txt
new file mode 100644
index 0000000000..ef758932ab
--- /dev/null
+++ b/system/ttf-babelstone-tibetan/BabelStoneOFL.txt
@@ -0,0 +1,94 @@
+Copyright (c) 2013, Andrew West (www.babelstone.co.uk),
+with Reserved Font Name BabelStone.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/system/ttf-babelstone-tibetan/README b/system/ttf-babelstone-tibetan/README
new file mode 100644
index 0000000000..c5ffd680f6
--- /dev/null
+++ b/system/ttf-babelstone-tibetan/README
@@ -0,0 +1,6 @@
+Babelstone fonts are created by Andrew west. This set of
+font contains the tibetan family of fonts.It contains
+fonts for Marchen,Tibetan,Phagspa and Zanabazar script.
+The Zanabazar script though used to write Mongolian
+language it is also used to write Tibetan and Sanskrit.
+
diff --git a/system/ttf-babelstone-tibetan/copyright b/system/ttf-babelstone-tibetan/copyright
new file mode 100644
index 0000000000..91eea19f45
--- /dev/null
+++ b/system/ttf-babelstone-tibetan/copyright
@@ -0,0 +1,6 @@
+BabelStone Fonts Copyright Andrew West 
+
+These fonts are free to use for personal or commercial purposes, 
+and you are also free to redistribute them by themself or as part 
+of a free or commercial software package, just as long as you 
+do not sell the fonts on its own.
diff --git a/system/ttf-babelstone-tibetan/doinst.sh b/system/ttf-babelstone-tibetan/doinst.sh
new file mode 100644
index 0000000000..5941fa3c7d
--- /dev/null
+++ b/system/ttf-babelstone-tibetan/doinst.sh
@@ -0,0 +1,13 @@
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/ttf-babelstone-tibetan/slack-desc b/system/ttf-babelstone-tibetan/slack-desc
new file mode 100644
index 0000000000..67728859d9
--- /dev/null
+++ b/system/ttf-babelstone-tibetan/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                      |-----handy-ruler------------------------------------------------------|
+ttf-babelstone-tibetan: ttf-babelstone-tibetan (Babelstone Tibetan fonts)
+ttf-babelstone-tibetan:
+ttf-babelstone-tibetan: Babelstone fonts are created by Andrew west. This set of
+ttf-babelstone-tibetan: font contains the tibetan family of fonts.It contains
+ttf-babelstone-tibetan: fonts for Marchen,Tibetan,Phagspa and Zanabazar script.The
+ttf-babelstone-tibetan: Zanabazar script though used to write Mongolian language
+ttf-babelstone-tibetan: it is also used to write Tibetan and Sanskrit.
+ttf-babelstone-tibetan:
+ttf-babelstone-tibetan: Homepage:https://www.babelstone.co.uk
+ttf-babelstone-tibetan:
+ttf-babelstone-tibetan:
diff --git a/system/ttf-babelstone-tibetan/ttf-babelstone-tibetan.SlackBuild b/system/ttf-babelstone-tibetan/ttf-babelstone-tibetan.SlackBuild
new file mode 100644
index 0000000000..218bdc6018
--- /dev/null
+++ b/system/ttf-babelstone-tibetan/ttf-babelstone-tibetan.SlackBuild
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Slackware build script for ttf-babelstone-tibetan
+
+# Copyright 2023 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ttf-babelstone-tibetan
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+SRCP=${SRCP:-BabelStonePhagspa_v2}
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $TMP/phagspa
+mkdir -pv $PKG/usr/share/fonts/TTF
+
+unzip -d $TMP/phagspa $CWD/$SRCP.zip
+
+install -D -m0644 -v $CWD/*.ttf -t $PKG/usr/share/fonts/TTF
+install -D -m0644 -v $TMP/phagspa/*.ttf -t $PKG/usr/share/fonts/TTF
+
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/BabelStoneOFL.txt >  $PKG/usr/doc/$PRGNAM-$VERSION/babelstoneOFL.txt
+cat $CWD/copyright > $PKG/usr/doc/$PRGNAM-$VERSION/copyright
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -pv  $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-babelstone-tibetan/ttf-babelstone-tibetan.info b/system/ttf-babelstone-tibetan/ttf-babelstone-tibetan.info
new file mode 100644
index 0000000000..b0805bcd74
--- /dev/null
+++ b/system/ttf-babelstone-tibetan/ttf-babelstone-tibetan.info
@@ -0,0 +1,20 @@
+PRGNAM="ttf-babelstone-tibetan"
+VERSION="1.0"
+HOMEPAGE="https://www.babelstone.co.uk"
+DOWNLOAD="https://www.babelstone.co.uk/Fonts/Download/BabelStoneMarchen.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneZanabazar.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneTibetan.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStoneTibetanSlim.ttf \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStonePhagspa_v2.zip \
+          https://www.babelstone.co.uk/Fonts/Download/BabelStonePhagspaSeal_v1.ttf"
+MD5SUM="9b31c772f05bb6e9c3ed3b908b7265f5 \
+        79bea5f34d05300fecbc871138998244 \
+        a2e1823db85fc0f85c423307ce79b428 \
+        787bfecc53ef373f3aff41a5179da7f8 \
+        5fe660073811281e1c13165fe879edd6 \
+        ed5b297d4e793ab60f432ef63b03929d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/ttf-bitstream-vera/ttf-bitstream-vera.SlackBuild b/system/ttf-bitstream-vera/ttf-bitstream-vera.SlackBuild
index af4cc7cdb8..f43744a693 100644
--- a/system/ttf-bitstream-vera/ttf-bitstream-vera.SlackBuild
+++ b/system/ttf-bitstream-vera/ttf-bitstream-vera.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for Bitstream Vera Fonts
 #
@@ -22,18 +22,25 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-bitstream-vera
 VERSION=${VERSION:-1.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 ARCH=noarch	# they're fonts, dummy
 
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 set -eu
 
 rm -rf $PKG
@@ -62,4 +69,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-caladea/ttf-caladea.SlackBuild b/system/ttf-caladea/ttf-caladea.SlackBuild
index ef21dd792e..a4ae0383fc 100644
--- a/system/ttf-caladea/ttf-caladea.SlackBuild
+++ b/system/ttf-caladea/ttf-caladea.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for ttf-caladea.
 #
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-caladea
 VERSION=${VERSION:-20130214}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -68,4 +78,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-carlito/30-0-carlito.conf b/system/ttf-carlito/30-0-carlito.conf
deleted file mode 100644
index 70aa81b07e..0000000000
--- a/system/ttf-carlito/30-0-carlito.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-	 <!-- Carlito / Calibri -->
-	<alias binding="same">
-          <family>Carlito</family>
-            <accept>
-              <family>Calibri</family>
-            </accept>
-        </alias>
-        <alias binding="same">
-          <family>Calibri</family>
-            <default>
-               <family>Carlito</family>
-            </default>
-        </alias>
-</fontconfig>
diff --git a/system/ttf-carlito/README b/system/ttf-carlito/README
index 247ea7a845..f08552b363 100644
--- a/system/ttf-carlito/README
+++ b/system/ttf-carlito/README
@@ -1,3 +1,7 @@
 ttf-carlito (Googles Carlito font)
 
-Googles Carlito font.
+Carlito is a font designed by Łukasz Dziedzic (@typoland) derived
+ttf-carlito: from Lato (also designed by Łukasz Dziedzic) that is
+metric-compatible with Calibri.
+
+It comes with Latin and Cyrillic character sets.
diff --git a/system/ttf-carlito/slack-desc b/system/ttf-carlito/slack-desc
index 666946312b..762a3a7765 100644
--- a/system/ttf-carlito/slack-desc
+++ b/system/ttf-carlito/slack-desc
@@ -8,12 +8,12 @@
            |-----handy-ruler------------------------------------------------------|
 ttf-carlito: ttf-carlito (Googles Carlito font)
 ttf-carlito:
-ttf-carlito: Googles Carlito font.
-ttf-carlito:
-ttf-carlito: Home page:
-ttf-carlito: https://bugs.chromium.org/p/chromium/issues/detail?id=280557
-ttf-carlito:
+ttf-carlito: Carlito is a font designed by Lukasz Dziedzic (@typoland) derived
+ttf-carlito: from Lato (also designed by Lukasz Dziedzic) that is metric-compatible
+ttf-carlito: with Calibri.
+ttf-carlito: It comes with Latin and Cyrillic character sets.
 ttf-carlito:
+ttf-carlito: Home page: https://salsa.debian.org/fonts-team/fonts-crosextra-carlito
 ttf-carlito:
 ttf-carlito:
 ttf-carlito:
diff --git a/system/ttf-carlito/ttf-carlito.SlackBuild b/system/ttf-carlito/ttf-carlito.SlackBuild
index 67bfcbb52c..b3f3500f0a 100644
--- a/system/ttf-carlito/ttf-carlito.SlackBuild
+++ b/system/ttf-carlito/ttf-carlito.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for ttf-carlito.
 #
-# Copyright 2016 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2016-2023  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,19 +22,29 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-carlito
-VERSION=${VERSION:-20130920}
+VERSION=${VERSION:-20220224}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SRCNAM="crosextrafonts-carlito"
+SRCNAM="fonts-crosextra-carlito"
 
 set -e
 
@@ -42,7 +52,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+tar xvf $CWD/${SRCNAM}_${VERSION}.orig.tar.gz
 mv $SRCNAM-$VERSION $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -56,12 +66,10 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 install -d $PKG/usr/share/fonts/TTF/
-install -m644 *.ttf $PKG/usr/share/fonts/TTF/
-
-install -Dm0644 $CWD/30-0-carlito.conf $PKG/etc/fonts/conf.avail/30-carlito.conf
+install -m644 fonts/ttf/* $PKG/usr/share/fonts/TTF/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a OFL.txt $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -69,4 +77,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-carlito/ttf-carlito.info b/system/ttf-carlito/ttf-carlito.info
index 724f63fb50..91ee48b064 100644
--- a/system/ttf-carlito/ttf-carlito.info
+++ b/system/ttf-carlito/ttf-carlito.info
@@ -1,8 +1,8 @@
 PRGNAM="ttf-carlito"
-VERSION="20130920"
-HOMEPAGE="https://bugs.chromium.org/p/chromium/issues/detail?id=280557"
-DOWNLOAD="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-20130920.tar.gz"
-MD5SUM="c74b7223abe75949b4af367942d96c7a"
+VERSION="20220224"
+HOMEPAGE="https://salsa.debian.org/fonts-team/fonts-crosextra-carlito"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/f/fonts-crosextra-carlito/fonts-crosextra-carlito_20220224.orig.tar.gz"
+MD5SUM="eabdad6c5da5b22a1458a9d5836674e9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ttf-charis-sil/ttf-charis-sil.SlackBuild b/system/ttf-charis-sil/ttf-charis-sil.SlackBuild
index c1c083544b..6c9f9d6744 100644
--- a/system/ttf-charis-sil/ttf-charis-sil.SlackBuild
+++ b/system/ttf-charis-sil/ttf-charis-sil.SlackBuild
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
+
+# @(#) ttf-charis-sil.SlackBuild 1.5@(#)
 
 # Slackware build script for ttf-charis-sil
-# $Id: ttf-charis-sil.SlackBuild,v 1.1 2018/09/23 18:44:52 pomf Exp pomf $
 
-# Copyright 2018 pomfland
+# Copyright 2022 pomfland
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,16 +24,23 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-charis-sil
-VERSION=${VERSION:-5.000}
+VERSION=${VERSION:-6.101}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=CharisSIL
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -53,7 +61,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/share/fonts/TTF
-cp $SRCNAM-{B,BI,I,R}.ttf $PKG/usr/share/fonts/TTF
+cp *.ttf $PKG/usr/share/fonts/TTF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -ar documentation *.txt $PKG/usr/doc/$PRGNAM-$VERSION
@@ -64,4 +72,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-charis-sil/ttf-charis-sil.info b/system/ttf-charis-sil/ttf-charis-sil.info
index 2d1fc8e2fa..2e9caf72e1 100644
--- a/system/ttf-charis-sil/ttf-charis-sil.info
+++ b/system/ttf-charis-sil/ttf-charis-sil.info
@@ -1,8 +1,8 @@
 PRGNAM="ttf-charis-sil"
-VERSION="5.000"
+VERSION="6.101"
 HOMEPAGE="https://software.sil.org/charis/"
-DOWNLOAD="https://software.sil.org/downloads/r/charis/CharisSIL-5.000.zip"
-MD5SUM="10b9f94ed21e56254b068c91ead7ec6f"
+DOWNLOAD="https://software.sil.org/downloads/r/charis/CharisSIL-6.101.zip"
+MD5SUM="56450842e03197611d8439dd98b9b8cc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ttf-coda/ttf-coda.SlackBuild b/system/ttf-coda/ttf-coda.SlackBuild
index 55c183fd2d..11d4628746 100644
--- a/system/ttf-coda/ttf-coda.SlackBuild
+++ b/system/ttf-coda/ttf-coda.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for ttf-coda.
 #
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-coda
 VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,4 +77,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-coda/ttf-coda.info b/system/ttf-coda/ttf-coda.info
index 95bdc082ce..dfc08b8b84 100644
--- a/system/ttf-coda/ttf-coda.info
+++ b/system/ttf-coda/ttf-coda.info
@@ -1,7 +1,7 @@
 PRGNAM="ttf-coda"
 VERSION="1.0"
 HOMEPAGE="https://fonts.google.com/specimen/Coda"
-DOWNLOAD="http://dl.static.1001fonts.net/niceid/c/o/coda.zip"
+DOWNLOAD="https://slackware.uk/~urchlay/src/coda.zip"
 MD5SUM="9277759c81259d2130e01837c9ac9dd6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/ttf-computer-modern/ttf-computer-modern.SlackBuild b/system/ttf-computer-modern/ttf-computer-modern.SlackBuild
index cf0a8e5e53..e418ac27fd 100644
--- a/system/ttf-computer-modern/ttf-computer-modern.SlackBuild
+++ b/system/ttf-computer-modern/ttf-computer-modern.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ttf-computer-modern
 # $Id: ttf-computer-modern.SlackBuild,v 1.1 2018/11/08 10:47:56 pomf Exp pomf $
@@ -23,16 +23,26 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-computer-modern
 VERSION=${VERSION:-0.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=cm-unicode
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,4 +74,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-console-fonts/ttf-console-fonts.SlackBuild b/system/ttf-console-fonts/ttf-console-fonts.SlackBuild
index 24bbcbb446..afbdd4b30c 100644
--- a/system/ttf-console-fonts/ttf-console-fonts.SlackBuild
+++ b/system/ttf-console-fonts/ttf-console-fonts.SlackBuild
@@ -1,19 +1,26 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ttf-console-fonts
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-console-fonts
 VERSION=${VERSION:-20170403_abc5771}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -27,11 +34,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 make install DESTDIR=$PKG
 
@@ -43,4 +47,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-console-fonts/ttf-console-fonts.info b/system/ttf-console-fonts/ttf-console-fonts.info
index 84c4372ff6..29b9225fc7 100644
--- a/system/ttf-console-fonts/ttf-console-fonts.info
+++ b/system/ttf-console-fonts/ttf-console-fonts.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="otf2bdf bdf2psf psftools"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/ttf-crosscorefonts/ttf-crosscorefonts.SlackBuild b/system/ttf-crosscorefonts/ttf-crosscorefonts.SlackBuild
index b92c9f4ed7..835f17ad4b 100644
--- a/system/ttf-crosscorefonts/ttf-crosscorefonts.SlackBuild
+++ b/system/ttf-crosscorefonts/ttf-crosscorefonts.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for ttf-crosscorefonts.
 #
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-crosscorefonts
 VERSION=${VERSION:-20180624}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,4 +79,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-dark-courier/ttf-dark-courier.SlackBuild b/system/ttf-dark-courier/ttf-dark-courier.SlackBuild
index 8c485459c9..13b697a3c5 100644
--- a/system/ttf-dark-courier/ttf-dark-courier.SlackBuild
+++ b/system/ttf-dark-courier/ttf-dark-courier.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ttf-dark-courier
 
@@ -22,21 +22,31 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-dark-courier
-VERSION=${VERSION:-01182001}
+VERSION=${VERSION:-1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
-SRCNAM="DarkCourier"
+SRCNAM="dark-courier"
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -44,8 +54,13 @@ cd $TMP
 rm -rf $SRCNAM $PRGNAM-$VERSION
 unzip $CWD/$SRCNAM.zip
 mkdir $PRGNAM-$VERSION/
-mv dour*.ttf $PRGNAM-$VERSION/
+mv *.ttf $PRGNAM-$VERSION/
+rm *.txt
 cd $PRGNAM-$VERSION
+
+#Remove duplicates
+find . -type f -name "*.ttf" -name "* *" -exec rm {} \;
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -57,7 +72,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/share/fonts/TTF
-install -Dm644 dour*.ttf $PKG/usr/share/fonts/TTF/
+install -Dm644 *.ttf $PKG/usr/share/fonts/TTF/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -67,4 +82,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-dark-courier/ttf-dark-courier.info b/system/ttf-dark-courier/ttf-dark-courier.info
index 2c7c2a1da5..916d8ba300 100644
--- a/system/ttf-dark-courier/ttf-dark-courier.info
+++ b/system/ttf-dark-courier/ttf-dark-courier.info
@@ -1,8 +1,8 @@
 PRGNAM="ttf-dark-courier"
-VERSION="01182001"
-HOMEPAGE="http://www.rolandstroud.com/Fonts-1.html"
-DOWNLOAD="http://www.rolandstroud.com/Fonts/DarkCourier.zip"
-MD5SUM="fb4c516d6d04761853cfae800798f55e"
+VERSION="1.3"
+HOMEPAGE="https://www.wfonts.com/font/dark-courier"
+DOWNLOAD="https://www.wfonts.com/download/data/2015/06/09/dark-courier/dark-courier.zip"
+MD5SUM="220e3feac4ecb8ed8bfec07e79a4f14e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ttf-doulos-sil/README b/system/ttf-doulos-sil/README
index fbde045d59..427d4c9f8e 100644
--- a/system/ttf-doulos-sil/README
+++ b/system/ttf-doulos-sil/README
@@ -1,5 +1,5 @@
 Doulos SIL is a Unicode-based font family that supports the wide
 range of languages that use the Latin and Cyryllic scripts. It
 is similar to Times New Roman.
-
+ 
 It is released under OFL license.
diff --git a/system/ttf-doulos-sil/ttf-doulos-sil.SlackBuild b/system/ttf-doulos-sil/ttf-doulos-sil.SlackBuild
index 255d01dc5a..3ebcf10cc8 100644
--- a/system/ttf-doulos-sil/ttf-doulos-sil.SlackBuild
+++ b/system/ttf-doulos-sil/ttf-doulos-sil.SlackBuild
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
+
+# @(#) ttf-doulos-sil.SlackBuild 1.2@(#)
 
 # Slackware build script for ttf-doulos-sil
-# $Id: ttf-doulos-sil.SlackBuild,v 1.1 2018/09/23 19:06:07 pomf Exp pomf $
 
-# Copyright 2018 pomfland
+# Copyright 2022 pomfland
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,16 +24,23 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-doulos-sil
-VERSION=${VERSION:-5.000}
+VERSION=${VERSION:-6.101}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=DoulosSIL
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -53,7 +61,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/share/fonts/TTF
-cp $SRCNAM-R.ttf $PKG/usr/share/fonts/TTF
+cp *.ttf $PKG/usr/share/fonts/TTF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -ar documentation *.txt $PKG/usr/doc/$PRGNAM-$VERSION
@@ -64,4 +72,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-doulos-sil/ttf-doulos-sil.info b/system/ttf-doulos-sil/ttf-doulos-sil.info
index 8076e2fc79..d5d1d42aa1 100644
--- a/system/ttf-doulos-sil/ttf-doulos-sil.info
+++ b/system/ttf-doulos-sil/ttf-doulos-sil.info
@@ -1,8 +1,8 @@
 PRGNAM="ttf-doulos-sil"
-VERSION="5.000"
+VERSION="6.101"
 HOMEPAGE="https://software.sil.org/doulos/"
-DOWNLOAD="https://software.sil.org/downloads/r/doulos/DoulosSIL-5.000.zip"
-MD5SUM="9c27d4fa550db23430ace3222fd14f6a"
+DOWNLOAD="https://software.sil.org/downloads/r/doulos/DoulosSIL-6.101.zip"
+MD5SUM="7a02601cab06b8add247af2464a44b85"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ttf-hanazono/README b/system/ttf-hanazono/README
new file mode 100644
index 0000000000..20e9259b8d
--- /dev/null
+++ b/system/ttf-hanazono/README
@@ -0,0 +1,4 @@
+ttf-hanazono (extended kanji font)
+
+ttf-hanazono includes the TTF fonts HanaMinA and HanaMinB. It provides
+coverage for the CJK extension sets B through F.
diff --git a/system/ttf-hanazono/doinst.sh b/system/ttf-hanazono/doinst.sh
new file mode 100644
index 0000000000..e0811da7df
--- /dev/null
+++ b/system/ttf-hanazono/doinst.sh
@@ -0,0 +1,11 @@
+# Update the X font indices:
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/ttf-hanazono/slack-desc b/system/ttf-hanazono/slack-desc
new file mode 100644
index 0000000000..d00c11e584
--- /dev/null
+++ b/system/ttf-hanazono/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+            |-----handy-ruler------------------------------------------------------|
+ttf-hanazono: ttf-hanazono (extended kanji font)
+ttf-hanazono:
+ttf-hanazono: ttf-hanazono provides coverage for the CJK extension sets B through F.
+ttf-hanazono:
+ttf-hanazono:
+ttf-hanazono:
+ttf-hanazono:
+ttf-hanazono:
+ttf-hanazono:
+ttf-hanazono:
+ttf-hanazono: Homepage: http://fonts.jp/hanazono
diff --git a/system/ttf-hanazono/ttf-hanazono.SlackBuild b/system/ttf-hanazono/ttf-hanazono.SlackBuild
new file mode 100644
index 0000000000..1636479098
--- /dev/null
+++ b/system/ttf-hanazono/ttf-hanazono.SlackBuild
@@ -0,0 +1,78 @@
+#!/bin/bash
+#
+# Slackware build script for ttf-hanazono
+#
+# Copyright 2022 K. Eugene Carlson  Tsukuba, Japan
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ttf-hanazono
+SRCNAM=hanazono
+VERSION=${VERSION:-20170904}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+unzip $CWD/$SRCNAM-$VERSION.zip
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/share/fonts/TTF
+install -m 644 HanaMin*.ttf $PKG/usr/share/fonts/TTF/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+for DOC in README LICENSE THANKS; do
+  cp $DOC.txt $PKG/usr/doc/$PRGNAM-$VERSION/$DOC
+done
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-hanazono/ttf-hanazono.info b/system/ttf-hanazono/ttf-hanazono.info
new file mode 100644
index 0000000000..f79607e7c0
--- /dev/null
+++ b/system/ttf-hanazono/ttf-hanazono.info
@@ -0,0 +1,10 @@
+PRGNAM="ttf-hanazono"
+VERSION="20170904"
+HOMEPAGE="http://fonts.jp/hanazono"
+DOWNLOAD="http://distcache.FreeBSD.org/ports-distfiles/hanazono-20170904.zip"
+MD5SUM="3614983d1a899dc212ed377c4b5c99eb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/ttf-ibm-plex/ttf-ibm-plex.SlackBuild b/system/ttf-ibm-plex/ttf-ibm-plex.SlackBuild
index d7fd215368..db13b49cd9 100644
--- a/system/ttf-ibm-plex/ttf-ibm-plex.SlackBuild
+++ b/system/ttf-ibm-plex/ttf-ibm-plex.SlackBuild
@@ -1,15 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for ttf-ibm-plex
 #
 # ISC License
-# 
+#
 # Copyright (c) 2019, 2020 Lazar Isailovic <etflazar@gmail.com>
-# 
+#
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
 # copyright notice and this permission notice appear in all copies.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
@@ -18,14 +18,24 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-ibm-plex
-VERSION=${VERSION:-5.1.3}
+VERSION=${VERSION:-6.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -48,7 +58,7 @@ find -L . \
 
 
 mkdir -p $PKG/usr/share/fonts/TTF
-cp -a */*.ttf $PKG/usr/share/fonts/TTF
+find . -name "*.ttf" -exec cp {} $PKG/usr/share/fonts/TTF/ \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a IBM-Plex-Mono/license.txt $PKG/usr/doc/$PRGNAM-$VERSION/
@@ -59,4 +69,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-ibm-plex/ttf-ibm-plex.info b/system/ttf-ibm-plex/ttf-ibm-plex.info
index 86067dc59d..c23589b436 100644
--- a/system/ttf-ibm-plex/ttf-ibm-plex.info
+++ b/system/ttf-ibm-plex/ttf-ibm-plex.info
@@ -1,10 +1,10 @@
 PRGNAM="ttf-ibm-plex"
-VERSION="5.1.3"
+VERSION="6.3.0"
 HOMEPAGE="https://github.com/IBM/plex"
-DOWNLOAD="https://github.com/IBM/plex/releases/download/v5.1.3/TrueType.zip"
-MD5SUM="813956ffd825da7d502adb545bb4367c"
+DOWNLOAD="https://github.com/IBM/plex/releases/download/v6.3.0/TrueType.zip"
+MD5SUM="c6fd93a5b8717c26a6ab6d7e4f3cac4b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Lazar Isailovic"
-EMAIL="etflazar@gmail.com"
+MAINTAINER="JW(Shinichi Abe)"
+EMAIL="shin1.abe@nifty.com"
diff --git a/system/ttf-inconsolata/OFL.txt b/system/ttf-inconsolata/OFL.txt
deleted file mode 100644
index 65f04cae46..0000000000
--- a/system/ttf-inconsolata/OFL.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright 2006 The Inconsolata Project Authors
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/system/ttf-inconsolata/ttf-inconsolata.SlackBuild b/system/ttf-inconsolata/ttf-inconsolata.SlackBuild
index 806e297e0d..29865606c1 100644
--- a/system/ttf-inconsolata/ttf-inconsolata.SlackBuild
+++ b/system/ttf-inconsolata/ttf-inconsolata.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for ttf-inconsolata.
 #
-# Copyright 2016-2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2016-2023  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,25 +22,38 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-inconsolata
-VERSION=${VERSION:-20160814}
+VERSION=${VERSION:-3.000}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+SRCNAM="Inconsolata"
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION
+tar -xzvf $CWD/$SRCNAM-$VERSION.tar.?z
+mv $SRCNAM-$VERSION $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -52,13 +65,13 @@ find -L . \
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-install -m 644 -D $CWD/75-ttf-inconsolata.conf $PKG/etc/fonts/conf.avail/75-ttf-inconsolata.conf
-
 install -d $PKG/usr/share/fonts/TTF/
-install -m 644 $CWD/Inconsolata-{Regular,Bold}.ttf $PKG/usr/share/fonts/TTF/
+install -Dm644 fonts/ttf/*.ttf "$PKG/usr/share/fonts/TTF"
+
+install -Dm644 $CWD/75-ttf-inconsolata.conf $PKG/usr/share/fontconfig/conf.avail/75-ttf-inconsolata.conf
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp $CWD/OFL.txt $PKG/usr/doc/$PRGNAM-$VERSION
+install -Dm644 AUTHORS.txt CONTRIBUTORS.txt FONTLOG.txt OFL.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -66,4 +79,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-inconsolata/ttf-inconsolata.info b/system/ttf-inconsolata/ttf-inconsolata.info
index 2b5094ce6b..9ac4d09f99 100644
--- a/system/ttf-inconsolata/ttf-inconsolata.info
+++ b/system/ttf-inconsolata/ttf-inconsolata.info
@@ -1,10 +1,8 @@
 PRGNAM="ttf-inconsolata"
-VERSION="20160814"
+VERSION="3.000"
 HOMEPAGE="https://fonts.google.com/specimen/Inconsolata"
-DOWNLOAD="https://github.com/google/fonts/raw/c6c7e432a29bd7c817feed0963f568a6d710625c/ofl/inconsolata/Inconsolata-Regular.ttf \
-          https://github.com/google/fonts/raw/c6c7e432a29bd7c817feed0963f568a6d710625c/ofl/inconsolata/Inconsolata-Bold.ttf"
-MD5SUM="b0639eb725c0df94f68b779889679457 \
-        c6623d74820bb62d25c969a50bafbb46"
+DOWNLOAD="https://github.com/googlefonts/Inconsolata/archive/v3.000/Inconsolata-3.000.tar.gz"
+MD5SUM="ee64a03c5fcd02702127d7ba324b7b23"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ttf-ipaex/ttf-ipaex.SlackBuild b/system/ttf-ipaex/ttf-ipaex.SlackBuild
index 979f694305..18acd0a00e 100644
--- a/system/ttf-ipaex/ttf-ipaex.SlackBuild
+++ b/system/ttf-ipaex/ttf-ipaex.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ttf-ipaex
 
@@ -22,17 +22,27 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-ipaex
 VERSION=${VERSION:-004.01}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=IPAexfont
 _VERSION=${VERSION/./}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,4 +76,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-ipaex/ttf-ipaex.info b/system/ttf-ipaex/ttf-ipaex.info
index 303be395b9..a5add46747 100644
--- a/system/ttf-ipaex/ttf-ipaex.info
+++ b/system/ttf-ipaex/ttf-ipaex.info
@@ -1,7 +1,7 @@
 PRGNAM="ttf-ipaex"
 VERSION="004.01"
 HOMEPAGE="https://ipafont.ipa.go.jp"
-DOWNLOAD="https://ipafont.ipa.go.jp/IPAexfont/IPAexfont00401.zip"
+DOWNLOAD="https://ftp.netbsd.org/pub/pkgsrc/distfiles/IPAexfont00401.zip"
 MD5SUM="57f2631833c1049ea89320971cc74ce5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/ttf-lato/README b/system/ttf-lato/README
index 302746a415..cf14bfb075 100644
--- a/system/ttf-lato/README
+++ b/system/ttf-lato/README
@@ -6,7 +6,7 @@ Polish). In December 2010 the Lato family was published under the
 open-source Open Font License by his foundryty Poland, with
 support from Google.
 
-The lato font family is available as a free download under the SIL Open Font
-License 1.1. The fonts can be used with out any limitations for
-commercial and non commercial purposes. They can be also freely
+The lato font family is available as a free download under the SIL
+Open Font License 1.1. The fonts can be used without any limitations
+for commercial and non-commercial purposes. They can be also freely
 modified if the terms of the license are observed.
diff --git a/system/ttf-lato/ttf-lato.SlackBuild b/system/ttf-lato/ttf-lato.SlackBuild
index 3eb0734607..ab401eeae9 100644
--- a/system/ttf-lato/ttf-lato.SlackBuild
+++ b/system/ttf-lato/ttf-lato.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for ttf-coda.
 #
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-lato
 VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,4 +77,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-monaco/README b/system/ttf-monaco/README
index 5542020459..ac325e3351 100644
--- a/system/ttf-monaco/README
+++ b/system/ttf-monaco/README
@@ -1,3 +1,4 @@
 ttf-monaco (True Type font)
 
-Monaco TrueType Font.
+The original monaco.ttf improved: add some special characters
+(which are from "DejaVu Sans Mono")..
diff --git a/system/ttf-monaco/slack-desc b/system/ttf-monaco/slack-desc
index d49c08e6cf..727a6b7562 100644
--- a/system/ttf-monaco/slack-desc
+++ b/system/ttf-monaco/slack-desc
@@ -8,10 +8,10 @@
           |-----handy-ruler------------------------------------------------------|
 ttf-monaco: ttf-monaco (True Type Font)
 ttf-monaco:
-ttf-monaco: Monaco True Type Font.
-ttf-monaco:
-ttf-monaco: Home page: http://www.gringod.com/?s=monaco
+ttf-monaco: The original monaco.ttf improved: add some special characters
+ttf-monaco: (which are from "DejaVu Sans Mono").
 ttf-monaco:
+ttf-monaco: Home page: https://github.com/taodongl/monaco.ttf
 ttf-monaco:
 ttf-monaco:
 ttf-monaco:
diff --git a/system/ttf-monaco/ttf-monaco.SlackBuild b/system/ttf-monaco/ttf-monaco.SlackBuild
index 7e133d3de2..688cd50192 100644
--- a/system/ttf-monaco/ttf-monaco.SlackBuild
+++ b/system/ttf-monaco/ttf-monaco.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for ttf-monaco.
 #
-# Copyright 2015-2016 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2015-2022  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,19 +22,29 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-monaco
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SRCNAM="Monaco_Linux"
+SRCNAM="monaco"
 
 set -e
 
@@ -66,4 +76,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-monaco/ttf-monaco.info b/system/ttf-monaco/ttf-monaco.info
index 2c02f89a3c..98a3a1f44f 100644
--- a/system/ttf-monaco/ttf-monaco.info
+++ b/system/ttf-monaco/ttf-monaco.info
@@ -1,8 +1,8 @@
 PRGNAM="ttf-monaco"
-VERSION="1.0"
-HOMEPAGE="http://www.gringod.com/?s=monaco"
-DOWNLOAD="http://www.gringod.com/wp-upload/software/Fonts/Monaco_Linux.ttf"
-MD5SUM="15406419f73436c28b7e7684d6e3f346"
+VERSION="6.1"
+HOMEPAGE="https://github.com/taodongl/monaco.ttf"
+DOWNLOAD="https://raw.githubusercontent.com/taodongl/monaco.ttf/master/monaco.ttf"
+MD5SUM="5152b5a652b84e8572c5d527aa590e82"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ttf-mononoki/ttf-mononoki.SlackBuild b/system/ttf-mononoki/ttf-mononoki.SlackBuild
index 8c1dcee09a..ce385283a8 100644
--- a/system/ttf-mononoki/ttf-mononoki.SlackBuild
+++ b/system/ttf-mononoki/ttf-mononoki.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ttf-mononoki
 
 # Copyright 2016-2017,2021 Andrew Clemons, Wellington New Zealand
+# Copyright 2022-2023 Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,15 +23,22 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-mononoki
 SRCNAM=${PRGNAM#ttf-}
-VERSION=${VERSION:-1.3}
+VERSION=${VERSION:-1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,11 +62,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 install -dm755 $PKG/usr/share/fonts/TTF/
-install -m644 export/webfont/*.ttf $PKG/usr/share/fonts/TTF/
+install -m644 export/*.ttf $PKG/usr/share/fonts/TTF/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  CONTRIBUTING.md LICENSE README.md \
+  README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -67,4 +75,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-mononoki/ttf-mononoki.info b/system/ttf-mononoki/ttf-mononoki.info
index a38db1a554..26e05e9d35 100644
--- a/system/ttf-mononoki/ttf-mononoki.info
+++ b/system/ttf-mononoki/ttf-mononoki.info
@@ -1,8 +1,8 @@
 PRGNAM="ttf-mononoki"
-VERSION="1.3"
+VERSION="1.6"
 HOMEPAGE="https://github.com/madmalik/mononoki"
-DOWNLOAD="https://github.com/madmalik/mononoki/archive/1.3/mononoki-1.3.tar.gz"
-MD5SUM="48c04185ec480173990d6b8853662da5"
+DOWNLOAD="https://github.com/madmalik/mononoki/archive/1.6/mononoki-1.6.tar.gz"
+MD5SUM="2b5901a6e8acb262eefaa480b562ec37"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ttf-nerd-fonts-symbols/README b/system/ttf-nerd-fonts-symbols/README
new file mode 100644
index 0000000000..f59ee9f74c
--- /dev/null
+++ b/system/ttf-nerd-fonts-symbols/README
@@ -0,0 +1,2 @@
+Nerd Fonts patches developer targeted fonts with a high number of glyphs
+(icons). This package in particular provides symbols (Regular and Mono).
diff --git a/system/ttf-nerd-fonts-symbols/doinst.sh b/system/ttf-nerd-fonts-symbols/doinst.sh
new file mode 100644
index 0000000000..67a9f6f9cf
--- /dev/null
+++ b/system/ttf-nerd-fonts-symbols/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/ttf-nerd-fonts-symbols/slack-desc b/system/ttf-nerd-fonts-symbols/slack-desc
new file mode 100644
index 0000000000..863c8e956a
--- /dev/null
+++ b/system/ttf-nerd-fonts-symbols/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                      |-----handy-ruler------------------------------------------------------|
+ttf-nerd-fonts-symbols: ttf-nerd-fonts-symbols (Symbols from Nerd Fonts)
+ttf-nerd-fonts-symbols:
+ttf-nerd-fonts-symbols: Nerd Fonts patches developer targeted fonts with a high number of
+ttf-nerd-fonts-symbols: glyphs (icons). This package in particular provides symbols (Regular
+ttf-nerd-fonts-symbols: and Mono).
+ttf-nerd-fonts-symbols:
+ttf-nerd-fonts-symbols:
+ttf-nerd-fonts-symbols:
+ttf-nerd-fonts-symbols:
+ttf-nerd-fonts-symbols:
+ttf-nerd-fonts-symbols:
diff --git a/system/ttf-nerd-fonts-symbols/ttf-nerd-fonts-symbols.SlackBuild b/system/ttf-nerd-fonts-symbols/ttf-nerd-fonts-symbols.SlackBuild
new file mode 100644
index 0000000000..e7c86055c4
--- /dev/null
+++ b/system/ttf-nerd-fonts-symbols/ttf-nerd-fonts-symbols.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+# Slackware build script for ttf-nerd-fonts-symbols
+
+# Copyright 2024 Isaac Yu <isaacyu@protonmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ttf-nerd-fonts-symbols
+VERSION=${VERSION:-3.2.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+SRCNAM=NerdFontsSymbolsOnly
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+unzip $CWD/$SRCNAM.zip -d $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p "$PKG/etc/fonts/conf.d" "$PKG/usr/share/fonts/TTF" "$PKG/etc/fonts/conf.avail"
+cp SymbolsNerdFont-Regular.ttf $PKG/usr/share/fonts/TTF/SymbolsNerdFont-Regular.ttf
+cp SymbolsNerdFontMono-Regular.ttf $PKG/usr/share/fonts/TTF/SymbolsNerdFontMono-Regular.ttf
+cp $CWD/10-nerd-font-symbols.conf $PKG/etc/fonts/conf.avail/10-nerd-font-symbols.conf
+ln -s "../conf.avail/10-nerd-font-symbols.conf" "$PKG/etc/fonts/conf.d/10-nerd-font-symbols.conf"
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-nerd-fonts-symbols/ttf-nerd-fonts-symbols.info b/system/ttf-nerd-fonts-symbols/ttf-nerd-fonts-symbols.info
new file mode 100644
index 0000000000..2be353fe2f
--- /dev/null
+++ b/system/ttf-nerd-fonts-symbols/ttf-nerd-fonts-symbols.info
@@ -0,0 +1,12 @@
+PRGNAM="ttf-nerd-fonts-symbols"
+VERSION="3.2.1"
+HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
+DOWNLOAD="https://github.com/ryanoasis/nerd-fonts/releases/download/v3.2.1/NerdFontsSymbolsOnly.zip \
+          https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v3.2.1/10-nerd-font-symbols.conf"
+MD5SUM="236184d5517a1d00f78b4a1fc6f958b4 \
+        ae91a7feddea599611f5f7ad326bfcb1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/ttf-open-sans/README.Source b/system/ttf-open-sans/README.Source
deleted file mode 100644
index 440f2c69c8..0000000000
--- a/system/ttf-open-sans/README.Source
+++ /dev/null
@@ -1,61 +0,0 @@
-fonts-open-sans
----------------
-
-The upstream website (http://www.opensans.com) does not publish
-any version information, and it is unclear if and how the font
-will ever be updated.
-
-The font is distributed in the form of a two zip files, open-sans.zip and
-open-sans-condensed.zip. These need to be repackaged to comply
-with debian source package standards.
-
-To find out if an update was released, you should download and
-unpack the fonts manually, then use otfdump to find out if they
-have a new version.
-
-
-Download the current font packages first:
-
-$ wget http://www.opensans.com/download/open-sans.zip http://www.opensans.com/download/open-sans-condensed.zip
-
-Unpack them into the source repository:
-
-$ unzip -o open-sans.zip
-$ unzip -o open-sans-condensed.zip
-
-
-Test if any of the files are tagged with a new version:
-
-$ for i in *.ttf; do echo $i; otfdump $i | grep '(nameID 5 "Version' ; done
-
-This should print something like:
-
-OpenSans-CondBold.ttf
-    (nameID 5 "Version 1.11")
-
-for each of the fonts. Note that they may not all have the same version.
-
-If any of the versions differ from the current package version, or if
-
-$ git status
-
-shows that a file has changed, it is recommended to prepare a new release.
-
-
-To accomplish this, debian/rules includes a script that does most of
-the work for you. Update the changelog first:
-
-$ dch -v <NEW_VERSION>-<PATCHLEVEL>
-
-Replace <NEW_VERSION> with the new upstream version, as determined above,
-or increment <PATCHLEVEL> if only some fonts have changed and the highest
-font version is still the same.
-Add a suitable changelog line. For example: New upstream release
-
-Then save and run the tarball script (it uses wget and unzip):
-
-$ debian/rules get-orig-source
-
-This should produce a new ../fonts-open-sans_<version>.tar.xz file.
-
-Commit the updated TTFs and Debian changelog, then release the new package.
diff --git a/system/ttf-open-sans/changelog b/system/ttf-open-sans/changelog
deleted file mode 100644
index ecce744114..0000000000
--- a/system/ttf-open-sans/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-fonts-open-sans (1.11-1) unstable; urgency=medium
-
-  * Initial release. (Closes: #754785)
-
- -- Gregor Riepl <onitake@gmail.com>  Tue, 18 Apr 2017 19:02:54 +0200
diff --git a/system/ttf-open-sans/copyright b/system/ttf-open-sans/copyright
deleted file mode 100644
index 00a4d88b1a..0000000000
--- a/system/ttf-open-sans/copyright
+++ /dev/null
@@ -1,29 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Open Sans
-Source: http://www.opensans.com/
-
-Files: *
-Copyright:
- Digitized data copyright (c) 2010-2011, Google Corporation.
-License: Apache-2.0
-
-Files: debian/*
-Copyright:
- Copyright (c) 2017, Gregor Riepl <onitake@gmail.com>
-License: Apache-2.0
-
-License: Apache-2.0
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
-       http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- On Debian systems, the complete text of the Apache License Version 2.0
- can be found in `/usr/share/common-licenses/Apache-2.0'.
diff --git a/system/ttf-open-sans/slack-desc b/system/ttf-open-sans/slack-desc
index 5d3c1dd6a1..ed3075cc6e 100644
--- a/system/ttf-open-sans/slack-desc
+++ b/system/ttf-open-sans/slack-desc
@@ -12,7 +12,7 @@ ttf-open-sans: Open Sans is a clean and modern sans-serif typeface designed by S
 ttf-open-sans: Matteson and commissioned by Google. It is especially designed for
 ttf-open-sans: legibility across print, web, and mobile interfaces.
 ttf-open-sans:
-ttf-open-sans: Home page: https://www.opensans.com/
+ttf-open-sans: Home page: https://github.com/googlefonts/opensans/
 ttf-open-sans:
 ttf-open-sans:
 ttf-open-sans:
diff --git a/system/ttf-open-sans/ttf-open-sans.SlackBuild b/system/ttf-open-sans/ttf-open-sans.SlackBuild
index ed86241753..b3ddb9c5ee 100644
--- a/system/ttf-open-sans/ttf-open-sans.SlackBuild
+++ b/system/ttf-open-sans/ttf-open-sans.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for ttf-open-sans.
 #
-# Copyright 2015-2018  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2015-2023  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,19 +22,30 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-open-sans
-VERSION=${VERSION:-1.11}
+VERSION=${VERSION:-20210927}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SRCNAM="fonts-open-sans"
+SRCNAM="opensans"
+SRCVER="27d060e1aad6886daeda67629ee28189f795f534"
 
 set -e
 
@@ -42,8 +53,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${SRCNAM}_${VERSION}.orig.tar.xz
-mv ${SRCNAM}-${VERSION} $PRGNAM-$VERSION
+unzip $CWD/${SRCNAM}-${SRCVER}.zip
+mv ${SRCNAM}-${SRCVER} $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -56,11 +67,10 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/share/fonts/TTF/
-install -m644 OpenSans-*.ttf $PKG/usr/share/fonts/TTF/
+install -m644 fonts/ttf/*.ttf $PKG/usr/share/fonts/TTF/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-install -m644 Apache\ License.txt $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
-install -m644 $CWD/{changelog,copyright,README.Source} $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a CONTRIBUTORS.md FONTLOG.txt OFL.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -68,4 +78,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-open-sans/ttf-open-sans.info b/system/ttf-open-sans/ttf-open-sans.info
index 80bea0fbba..01fec4aaeb 100644
--- a/system/ttf-open-sans/ttf-open-sans.info
+++ b/system/ttf-open-sans/ttf-open-sans.info
@@ -1,8 +1,8 @@
 PRGNAM="ttf-open-sans"
-VERSION="1.11"
+VERSION="20210927"
 HOMEPAGE="https://www.opensans.com/"
-DOWNLOAD="http://deb.debian.org/debian/pool/main/f/fonts-open-sans/fonts-open-sans_1.11.orig.tar.xz"
-MD5SUM="95ffb3776bf8a9e8b2ebd7a44c4d7869"
+DOWNLOAD="https://github.com/googlefonts/opensans/archive/27d060e1aad6886daeda67629ee28189f795f534/opensans-27d060e1aad6886daeda67629ee28189f795f534.zip"
+MD5SUM="c780a4557a14c7786b147ff111a973aa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ttf-paratype-pt-fonts/ttf-paratype-pt-fonts.SlackBuild b/system/ttf-paratype-pt-fonts/ttf-paratype-pt-fonts.SlackBuild
index 206f546920..12834f5996 100644
--- a/system/ttf-paratype-pt-fonts/ttf-paratype-pt-fonts.SlackBuild
+++ b/system/ttf-paratype-pt-fonts/ttf-paratype-pt-fonts.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ttf-paratype-pt-fonts
 
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-paratype-pt-fonts
 VERSION=${VERSION:-2019}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,4 +74,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-roboto/ttf-roboto.SlackBuild b/system/ttf-roboto/ttf-roboto.SlackBuild
index 5c5c470db0..acee1a9927 100644
--- a/system/ttf-roboto/ttf-roboto.SlackBuild
+++ b/system/ttf-roboto/ttf-roboto.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for ttf-roboto.
 #
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-roboto
 VERSION=${VERSION:-2.138}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,4 +77,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-sakalbharati/README b/system/ttf-sakalbharati/README
new file mode 100644
index 0000000000..67843e722f
--- /dev/null
+++ b/system/ttf-sakalbharati/README
@@ -0,0 +1,7 @@
+Sakal Bharati is a Unicode based Open Type font which includes 13
+scripts in one font.It is a Monothick font wherein the Glyphs have
+thickness of the horizontal and vertical stems. The Font has
+same X height for all 13 scripts, which caters to almost all the
+22 scheduled languages of India.This font supports the Rupee symbol.
+The glyphs across the languages are designed to have matching styles.
+
diff --git a/system/ttf-sakalbharati/doinst.sh b/system/ttf-sakalbharati/doinst.sh
new file mode 100644
index 0000000000..bfdd460697
--- /dev/null
+++ b/system/ttf-sakalbharati/doinst.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/ttf-sakalbharati/slack-desc b/system/ttf-sakalbharati/slack-desc
new file mode 100644
index 0000000000..e25efbdf7e
--- /dev/null
+++ b/system/ttf-sakalbharati/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                |-----handy-ruler------------------------------------------------------|
+ttf-sakalbharati: ttf-sakalbharati (Indic Font)
+ttf-sakalbharati:
+ttf-sakalbharati: Sakal Bharati is a Unicode based Open Type font which includes 13
+ttf-sakalbharati: scripts in one font.It is a Monothick font wherein the Glyphs have
+ttf-sakalbharati: thickness of the horizontal and vertical stems. The Font has
+ttf-sakalbharati: same X height for all 13 scripts, which caters to almost all the
+ttf-sakalbharati: 22 scheduled languages of India.This font supports the Rupee symbol.
+ttf-sakalbharati: The glyphs across the languages are designed to have matching styles.
+ttf-sakalbharati:
+ttf-sakalbharati: Homepage:https://cdac.in
+ttf-sakalbharati:
diff --git a/system/ttf-sakalbharati/ttf-sakalbharati.SlackBuild b/system/ttf-sakalbharati/ttf-sakalbharati.SlackBuild
new file mode 100644
index 0000000000..86d05aeb6f
--- /dev/null
+++ b/system/ttf-sakalbharati/ttf-sakalbharati.SlackBuild
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# Slackware build script for ttf-sakalbharati
+
+# Copyright 2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ttf-sakalbharati
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/TTF
+
+find $TMP/$PRGNAM-$VERSION/ -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+cp -av README.md COPYING LICENSE.txt  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-sakalbharati/ttf-sakalbharati.info b/system/ttf-sakalbharati/ttf-sakalbharati.info
new file mode 100644
index 0000000000..bcefa9d128
--- /dev/null
+++ b/system/ttf-sakalbharati/ttf-sakalbharati.info
@@ -0,0 +1,10 @@
+PRGNAM="ttf-sakalbharati"
+VERSION="1.0"
+HOMEPAGE="https://cdac.in/"
+DOWNLOAD="https://github.com/lecramyajiv/ttf-sakalbharati/archive/1.0/ttf-sakalbharati-1.0.tar.gz"
+MD5SUM="6c4c2e0fe1fcac551e2325c84381d0dd"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/ttf-ubuntu-font-family/ttf-ubuntu-font-family.SlackBuild b/system/ttf-ubuntu-font-family/ttf-ubuntu-font-family.SlackBuild
index 9ac6f89d35..8991fceab0 100644
--- a/system/ttf-ubuntu-font-family/ttf-ubuntu-font-family.SlackBuild
+++ b/system/ttf-ubuntu-font-family/ttf-ubuntu-font-family.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ttf-ubuntu-font-family
 
@@ -24,14 +24,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-ubuntu-font-family
 VERSION=${VERSION:-0.83}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -63,4 +73,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-x2/README b/system/ttf-x2/README
new file mode 100644
index 0000000000..2f5a0b466f
--- /dev/null
+++ b/system/ttf-x2/README
@@ -0,0 +1,33 @@
+X Series 2 Arabic web fonts is desinged with web use in
+mind and is optimized for arabic script in general use.
+These fonts support Arabic,persian,Urdu,Pashto,Dari,
+Kurdish,Uighur,old turkish and modern turkish(Roman).
+
+These fonts are equipped with two font technologies,
+AAT and OpenType and can be used on
+any platform, Mac, Windows or Linux.
+
+The following fonts are available in this series
+
+1. Kayhan
+2. Khoramshahr
+3. Niloofar
+4. Paatch
+5. Riyaz
+6. Roya
+7. Shafigh
+8. Shafigh Kurd
+9. Shafigh Uzbek
+10. Shiraz
+11. Solz
+12. Tabriz
+13. Titre
+14. Traffic
+15. Vahid
+16. Vosta
+17. Yagut
+18. Yas
+19. Yermook
+20. Zar
+21. Ziba 
+22. Yekan
diff --git a/system/ttf-x2/doinst.sh b/system/ttf-x2/doinst.sh
new file mode 100644
index 0000000000..b1446e3188
--- /dev/null
+++ b/system/ttf-x2/doinst.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Update the X font indexes:
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/TTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd /usr/share/fonts/OTF
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/ttf-x2/slack-desc b/system/ttf-x2/slack-desc
new file mode 100644
index 0000000000..790c3a347e
--- /dev/null
+++ b/system/ttf-x2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+ttf-x2: ttf-x2 (X Series 2 Arabic Webfont)
+ttf-x2:
+ttf-x2: X Series 2 Arabic web fonts is desinged with web use in
+ttf-x2: mind and is optimized for arabic script in general use.
+ttf-x2: These fonts support Arabic,persian,Urdu,Pashto,Dari,
+ttf-x2: Kurdish,Uighur,old turkish and modern turkish(Roman).
+ttf-x2:
+ttf-x2: Homepage:https://github.com/lecramyajiv/ttf-x2
+ttf-x2:
+ttf-x2:
+ttf-x2:
diff --git a/system/ttf-x2/ttf-x2.SlackBuild b/system/ttf-x2/ttf-x2.SlackBuild
new file mode 100644
index 0000000000..40db44583b
--- /dev/null
+++ b/system/ttf-x2/ttf-x2.SlackBuild
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# Slackware build script for ttf-x2
+
+# Copyright 2024 Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=ttf-x2
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/usr/share/fonts/TTF
+
+find $TMP/$PRGNAM-$VERSION/  -name '*.ttf' -type f -exec install -D -m0644 -v {} -t $PKG/usr/share/fonts/TTF \;
+
+mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $TMP/$PRGNAM-$VERSION/{License,README.md,URL.md}  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+mkdir -pv $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-x2/ttf-x2.info b/system/ttf-x2/ttf-x2.info
new file mode 100644
index 0000000000..7361ac0e97
--- /dev/null
+++ b/system/ttf-x2/ttf-x2.info
@@ -0,0 +1,10 @@
+PRGNAM="ttf-x2"
+VERSION="1.0"
+HOMEPAGE="https://github.com/lecramyajiv/ttf-x2"
+DOWNLOAD="https://github.com/lecramyajiv/ttf-x2/archive/1.0/ttf-x2-1.0.tar.gz"
+MD5SUM="cd6b6245a84d4bbb7a1bcf7d53ac2f5b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/ttf-xo-fonts/slack-desc b/system/ttf-xo-fonts/slack-desc
index 37e45d5fdc..f5c323bb80 100644
--- a/system/ttf-xo-fonts/slack-desc
+++ b/system/ttf-xo-fonts/slack-desc
@@ -14,6 +14,6 @@ ttf-xo-fonts: on Latin and Cyrillic scripts. XO Fonts are metrically compatible
 ttf-xo-fonts: common Microsoft and Monotype fonts and are designed as an alternative
 ttf-xo-fonts: to them.
 ttf-xo-fonts:
-ttf-xo-fonts: Homepage: https://fonts.myoffice.ru
+ttf-xo-fonts: Homepage: https://myoffice.ru/products/fonts/
 ttf-xo-fonts:
 ttf-xo-fonts:
diff --git a/system/ttf-xo-fonts/ttf-xo-fonts.SlackBuild b/system/ttf-xo-fonts/ttf-xo-fonts.SlackBuild
index 907790f575..e0a61bc9fb 100644
--- a/system/ttf-xo-fonts/ttf-xo-fonts.SlackBuild
+++ b/system/ttf-xo-fonts/ttf-xo-fonts.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ttf-xo-fonts
 
-# Copyright 2020, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2020-2023, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-xo-fonts
-VERSION=${VERSION:-2019}
+VERSION=${VERSION:-2022}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -58,4 +65,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttf-xo-fonts/ttf-xo-fonts.info b/system/ttf-xo-fonts/ttf-xo-fonts.info
index f62e5b18cf..7182f99ce6 100644
--- a/system/ttf-xo-fonts/ttf-xo-fonts.info
+++ b/system/ttf-xo-fonts/ttf-xo-fonts.info
@@ -1,8 +1,8 @@
 PRGNAM="ttf-xo-fonts"
-VERSION="2019"
-HOMEPAGE="https://fonts.myoffice.ru"
-DOWNLOAD="https://fonts.myoffice.ru/wp-content/themes/template/fonts_page/files/all_fonts_myoffice.zip"
-MD5SUM="16d1ea41f10ad0ecdb2afcac3ee56361"
+VERSION="2022"
+HOMEPAGE="https://myoffice.ru/products/fonts/"
+DOWNLOAD="https://myoffice.ru/files/fonts/all_fonts_myoffice.zip"
+MD5SUM="076c0cd2520074b3397bf4dbb2d02f3a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/ttf-zekton/ttf-zekton.SlackBuild b/system/ttf-zekton/ttf-zekton.SlackBuild
index 193af79d04..d2309fe7c5 100644
--- a/system/ttf-zekton/ttf-zekton.SlackBuild
+++ b/system/ttf-zekton/ttf-zekton.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for ttf-zekton.
 #
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-zekton
 VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,4 +82,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttmkfdir/ttmkfdir.SlackBuild b/system/ttmkfdir/ttmkfdir.SlackBuild
index b5d3d3071b..23577463f1 100644
--- a/system/ttmkfdir/ttmkfdir.SlackBuild
+++ b/system/ttmkfdir/ttmkfdir.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ttmkfdir
 
@@ -23,31 +23,41 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttmkfdir
 VERSION=${VERSION:-3.0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Set compiling FLAGS
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"; SLKLDFLAGS=""; LIBDIRSUFFIX=""; CHOST="i486"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"; SLKLDFLAGS=""; LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"; SLKLDFLAGS=""; LIBDIRSUFFIX=""; CHOST="i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"; SLKLDFLAGS=""; LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"; SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"; CHOST="x86_64"
+  SLKCFLAGS="-O2 -fPIC"; SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -89,4 +99,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttop/README b/system/ttop/README
index e6b015792a..8465cc3dda 100644
--- a/system/ttop/README
+++ b/system/ttop/README
@@ -1 +1,2 @@
-ttop is CUI graphical system monitor. this tools is designed for use with tmux.
+ttop is CUI graphical system monitor. This tool is designed for use
+with tmux.
diff --git a/system/ttop/ttop.SlackBuild b/system/ttop/ttop.SlackBuild
index a666cbdb8a..d00b492f71 100644
--- a/system/ttop/ttop.SlackBuild
+++ b/system/ttop/ttop.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ttop
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttop
 VERSION=${VERSION:-0.9.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -83,4 +93,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttop/ttop.info b/system/ttop/ttop.info
index f7f8fa1614..b97bba08ca 100644
--- a/system/ttop/ttop.info
+++ b/system/ttop/ttop.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://pypi.python.org/packages/cf/b2/3e41fffbf52260f871d1765cefe0d43
 MD5SUM="77c3ed124990c6affb638e56326f20b4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="docopt psutil"
+REQUIRES="python2-docopt python2-psutil"
 MAINTAINER="Dimitris Zlatanidis"
 EMAIL="d.zlatanidis@gmail.com"
diff --git a/system/tty2gif/README b/system/tty2gif/README
index 071c3a8d88..3dec696ecf 100644
--- a/system/tty2gif/README
+++ b/system/tty2gif/README
@@ -1,3 +1,3 @@
-tty2gif let you record terminal scripts and their outputs into both binary and
-gif animations. tty2gif also can be used to convert an exist binary script file
-into a gif animation.
+tty2gif let you record terminal scripts and their outputs into both
+binary and gif animations. tty2gif also can be used to convert an
+existing binary script file into a gif animation.
diff --git a/system/tty2gif/tty2gif.SlackBuild b/system/tty2gif/tty2gif.SlackBuild
index af8547dd01..d243c728e1 100644
--- a/system/tty2gif/tty2gif.SlackBuild
+++ b/system/tty2gif/tty2gif.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tty2gif
 
@@ -22,24 +22,31 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tty2gif
 VERSION=${VERSION:-0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 # Change source package name
 if [ "$ARCH" = "x86_64" ]; then
   SRCARCH="64bit"
@@ -83,4 +90,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tty2gif/tty2gif.info b/system/tty2gif/tty2gif.info
index 3393686ffb..9a7ceff55e 100644
--- a/system/tty2gif/tty2gif.info
+++ b/system/tty2gif/tty2gif.info
@@ -1,7 +1,7 @@
 PRGNAM="tty2gif"
 VERSION="0.2"
 HOMEPAGE="http://z24.github.io/tty2gif/"
-DOWNLOAD="https://github.com/z24/tty2gif/archive/v0.2.tar.gz"
+DOWNLOAD="https://github.com/z24/tty2gif/archive/v0.2/tty2gif-0.2.tar.gz"
 MD5SUM="443469a07ba8354ae393c7aff525f225"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/ttygif/README b/system/ttygif/README
index 13093ef1d5..07deb3270e 100644
--- a/system/ttygif/README
+++ b/system/ttygif/README
@@ -1,4 +1,4 @@
-ttygif converts a ttyrec file into gif files. It's a stripped down version 
-of ttyplay which calls xwd on every frame.
+ttygif converts a ttyrec file into gif files. It's a stripped down
+version of ttyplay which calls xwd on every frame.
 
 NOTE: ttyrec is also available from SBo
diff --git a/system/ttygif/ttygif.SlackBuild b/system/ttygif/ttygif.SlackBuild
index 276d1bc912..809a0e30ae 100644
--- a/system/ttygif/ttygif.SlackBuild
+++ b/system/ttygif/ttygif.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ttygif
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttygif
 VERSION=${VERSION:-1.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -86,4 +96,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/ttyrec/ttyrec-1.0.8-flags.patch b/system/ttyrec/ttyrec-1.0.8-flags.patch
new file mode 100644
index 0000000000..34687d9b8b
--- /dev/null
+++ b/system/ttyrec/ttyrec-1.0.8-flags.patch
@@ -0,0 +1,19 @@
+--- a/Makefile	2017-08-26 11:47:02.981266309 +0200
++++ b/Makefile	2017-08-26 14:33:47.161600445 +0200
+@@ -10,13 +10,13 @@
+ all: $(TARGET)
+ 
+ ttyrec: ttyrec.o io.o
+-	$(CC) $(CFLAGS) -o ttyrec ttyrec.o io.o
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttyrec ttyrec.o io.o
+ 
+ ttyplay: ttyplay.o io.o
+-	$(CC) $(CFLAGS) -o ttyplay ttyplay.o io.o
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttyplay ttyplay.o io.o
+ 
+ ttytime: ttytime.o io.o
+-	$(CC) $(CFLAGS) -o ttytime ttytime.o io.o
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ttytime ttytime.o io.o
+ 
+ clean:
+ 	rm -f *.o $(TARGET) ttyrecord *~
diff --git a/system/ttyrec/ttyrec-1.0.8-glibc-2.30.patch b/system/ttyrec/ttyrec-1.0.8-glibc-2.30.patch
new file mode 100644
index 0000000000..174fc7786e
--- /dev/null
+++ b/system/ttyrec/ttyrec-1.0.8-glibc-2.30.patch
@@ -0,0 +1,30 @@
+diff --git a/ttyrec.c b/ttyrec.c
+index 3392f70..86a59ee 100644
+--- a/ttyrec.c
++++ b/ttyrec.c
+@@ -57,7 +57,9 @@
+ 
+ #if defined(SVR4)
+ #include <fcntl.h>
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__linux__))
+ #include <stropts.h>
++#endif
+ #endif /* SVR4 */
+ 
+ #include <sys/time.h>
+@@ -449,6 +451,7 @@ getslave()
+ 		perror("open(fd, O_RDWR)");
+ 		fail();
+ 	}
++#ifndef __linux__
+ 	if (isastream(slave)) {
+ 		if (ioctl(slave, I_PUSH, "ptem") < 0) {
+ 			perror("ioctl(fd, I_PUSH, ptem)");
+@@ -466,6 +469,7 @@ getslave()
+ #endif
+ 		(void) ioctl(0, TIOCGWINSZ, (char *)&win);
+ 	}
++#endif
+ #else /* !SVR4 */
+ #ifndef HAVE_openpty
+ 	line[strlen("/dev/")] = 't';
diff --git a/system/ttyrec/ttyrec-1.0.8.RHEL5.patch b/system/ttyrec/ttyrec-1.0.8.RHEL5.patch
deleted file mode 100644
index 900b017cb9..0000000000
--- a/system/ttyrec/ttyrec-1.0.8.RHEL5.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -rupN original/Makefile new/Makefile
---- original/Makefile	2006-06-11 10:52:50.000000000 -0500
-+++ new/Makefile	2012-04-23 18:34:05.000000000 -0500
-@@ -1,5 +1,5 @@
- CC = gcc
--CFLAGS = -O2
-+CFLAGS = -O2 -DHAVE_openpty
- VERSION = 1.0.8
- 
- TARGET = ttyrec ttyplay ttytime
-@@ -10,7 +10,7 @@ DIST =	ttyrec.c ttyplay.c ttyrec.h io.c 
- all: $(TARGET)
- 
- ttyrec: ttyrec.o io.o
--	$(CC) $(CFLAGS) -o ttyrec ttyrec.o io.o
-+	$(CC) $(CFLAGS) -o ttyrec ttyrec.o io.o -lutil
- 
- ttyplay: ttyplay.o io.o
- 	$(CC) $(CFLAGS) -o ttyplay ttyplay.o io.o
-diff -rupN original/ttyrec.c new/ttyrec.c
---- original/ttyrec.c	2006-06-11 10:52:50.000000000 -0500
-+++ new/ttyrec.c	2012-04-23 18:26:41.000000000 -0500
-@@ -71,7 +71,9 @@
- #define _(FOO) FOO
- 
- #ifdef HAVE_openpty
--#include <libutil.h>
-+/* #include <libutil.h> */
-+#include <pty.h>  /* for openpty and forkpty */
-+#include <utmp.h> /* for login_tty */
- #endif
- 
- #if defined(SVR4) && !defined(CDEL)
diff --git a/system/ttyrec/ttyrec.SlackBuild b/system/ttyrec/ttyrec.SlackBuild
index caecc00574..b416afbb02 100644
--- a/system/ttyrec/ttyrec.SlackBuild
+++ b/system/ttyrec/ttyrec.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ttyrec
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttyrec
 VERSION=${VERSION:-1.0.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,10 +79,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fixed: "Out of pty's Terminated"
-patch -p1 < $CWD/ttyrec-1.0.8.RHEL5.patch
+patch -p1 < $CWD/ttyrec-1.0.8-flags.patch
+patch -p1 < $CWD/ttyrec-1.0.8-glibc-2.30.patch
 
-make
+make CFLAGS+="$SLKCFLAGS -DSVR4 -DHAVE_inotify -D_XOPEN_SOURCE=500"
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -95,4 +105,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tuptime/README b/system/tuptime/README
new file mode 100644
index 0000000000..4e984c6ebe
--- /dev/null
+++ b/system/tuptime/README
@@ -0,0 +1,17 @@
+tuptime is a daemon-less uptime statistics collection tool.
+
+It lets you know how long your machine manages to run without a reboot,
+and shows whether the reboot was graceful or hard.
+
+The slackbuild installs a SystemV-style initscript into rc3.d and rc4.d.
+The time your machine spends in other runlevels is not counter, because,
+presumably, it cannot be considered fully up.
+
+The slackbuild also installs a speically crafter crontab for the
+_tuptime user, to periodically log machine state.
+
+The scripts expects to have a system user called _tuptime. Create one
+by running:
+
+groupadd -g 379 _tuptime
+useradd -u 379 -g 379 -d /var/lib/_tuptime _tuptime
diff --git a/system/tuptime/cronfile b/system/tuptime/cronfile
new file mode 100644
index 0000000000..ce52dcc480
--- /dev/null
+++ b/system/tuptime/cronfile
@@ -0,0 +1 @@
+* * * * *  ID=tuptime_log   if [ -x /usr/bin/tuptime ]; then /usr/bin/tuptime -x > /dev/null 2>&1; fi
diff --git a/system/tuptime/slack-desc b/system/tuptime/slack-desc
new file mode 100644
index 0000000000..107a2ee52d
--- /dev/null
+++ b/system/tuptime/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+tuptime: tuptime (uptime statistics collector)
+tuptime:
+tuptime: tuptime is a daemon-less uptime statistics collection tool.
+tuptime: It lets you know how long your machine manages to run without a
+tuptime: reboot, and shows whether the reboot was graceful or hard.
+tuptime:
+tuptime:
+tuptime:
+tuptime: Homepage: https://github.com/rfrail3/tuptime
+tuptime:
+tuptime:
diff --git a/system/tuptime/tuptime.SlackBuild b/system/tuptime/tuptime.SlackBuild
new file mode 100644
index 0000000000..f15adf2d1c
--- /dev/null
+++ b/system/tuptime/tuptime.SlackBuild
@@ -0,0 +1,121 @@
+#!/bin/bash
+
+# Slackware build script for tuptime
+
+# Copyright 2023, Lockywolf
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# |-----------------------------------------------------------------| #
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=tuptime
+VERSION=${VERSION:-5.2.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+MUID=${MUID:-379}
+MGID=${MGID:-379}
+
+if ! getent group _tuptime 2>&1 > /dev/null; then
+  echo "  You must have an _tuptime group to run this script."
+  echo "    # groupadd -g $MGID _tuptime"
+  exit 1
+elif ! getent passwd _tuptime 2>&1 > /dev/null; then
+  echo "  You must have a _tuptime user to run this script."
+  echo "    # useradd -u $MUID -g $MGID -d /var/lib/_tuptime _tuptime"
+  exit 1
+fi
+
+
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
+
+mkdir -p "$PKG"/usr/bin
+install -m 755 ./src/tuptime "$PKG"/usr/bin/tuptime
+mkdir -p "$PKG"/etc/rc.d/init.d
+install -m 755 ./src/init.d/redhat/tuptime "$PKG"/etc/rc.d/init.d/tuptime
+install -m 750 -d "$PKG"/var/spool/cron/crontabs/
+install -m 600 "$CWD"/cronfile "$PKG"/var/spool/cron/crontabs/_tuptime
+mkdir -p "$PKG"/etc/rc.d/rc3.d/
+mkdir -p "$PKG"/etc/rc.d/rc4.d/
+(
+  cd "$PKG"/etc/rc.d/rc3.d/
+  ln -sr ../init.d/tuptime ./S01_tuptime
+  ln -sr ../init.d/tuptime ./K99_tuptime
+  cd "$PKG"/etc/rc.d/rc4.d/
+  ln -sr ../init.d/tuptime ./S01_tuptime
+  ln -sr ../init.d/tuptime ./K99_tuptime
+)
+
+mkdir -p $PKG/var/lib/tuptime
+chown -R _tuptime:_tuptime $PKG/var/lib/tuptime
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -ar \
+   CHANGELOG CONTRIBUTING.md LICENSE README.md tuptime-manual.txt \
+   misc/scripts \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tuptime/tuptime.info b/system/tuptime/tuptime.info
new file mode 100644
index 0000000000..f7f886707e
--- /dev/null
+++ b/system/tuptime/tuptime.info
@@ -0,0 +1,10 @@
+PRGNAM="tuptime"
+VERSION="5.2.2"
+HOMEPAGE="https://github.com/rfrail3/tuptime"
+DOWNLOAD="https://github.com/rfmoz/tuptime/archive/5.2.2/tuptime-5.2.2.tar.gz"
+MD5SUM="d5f4bfa0cd1be5d4353fdb4c5e68512b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="lockywolf"
+EMAIL="for_sbo.tuptime_2023-11-22@lockywolf.net"
diff --git a/system/twapake/twapake.SlackBuild b/system/twapake/twapake.SlackBuild
index adc13af005..63b42cdca9 100644
--- a/system/twapake/twapake.SlackBuild
+++ b/system/twapake/twapake.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for twapake
 
-# Copyright 2017 Frédéric Galusik Lyon, France
+# Copyright 2017 - 2022 Frederic Galusik Bordeaux, France
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=twapake
 VERSION=${VERSION:-0.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,4 +77,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/twapake/twapake.info b/system/twapake/twapake.info
index e2b6821b16..0bde7fb284 100644
--- a/system/twapake/twapake.info
+++ b/system/twapake/twapake.info
@@ -1,10 +1,10 @@
 PRGNAM="twapake"
 VERSION="0.5.1"
 HOMEPAGE="https://framagit.org/fredg/twapake"
-DOWNLOAD="https://framagit.org/fredg/twapake/raw/master/twapake-0.5.1.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/twapake-0.5.1.tar.gz"
 MD5SUM="38b39c888175a76ea9f65e3719a37ebe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Curses-UI"
-MAINTAINER="Frédéric Galusik"
-EMAIL="slack+SBo@galusik.xyz"
+MAINTAINER="Frederic Galusik"
+EMAIL="f@galusik.fr"
diff --git a/system/twin/README b/system/twin/README
index 849150dc01..b103287622 100644
--- a/system/twin/README
+++ b/system/twin/README
@@ -1,6 +1,7 @@
-Twin is a text-mode window environment. It turns a text terminal into a 
-X11-style display with window manager, terminal windows, and can also serve
-as display for remote applications. Each terminal window provides the 
-functions of a text-mode Linux console. Twin runs on X11, libggi, itself, 
-the Linux console, and any termcap/ncurses-compatible tty. It supports 
-multiple simultaneous displays, and can attach/detach each display on the fly.
+Twin is a text-mode window environment. It turns a text terminal into
+a X11-style display with window manager, terminal windows, and can
+also serve as display for remote applications. Each terminal window
+provides the functions of a text-mode Linux console. Twin runs on X11,
+libggi, itself, the Linux console, and any termcap/ncurses-compatible
+tty. It supports multiple simultaneous displays, and can attach/detach
+each display on the fly.
diff --git a/system/twin/twin.SlackBuild b/system/twin/twin.SlackBuild
index cc587a9db3..89a6d3411f 100644
--- a/system/twin/twin.SlackBuild
+++ b/system/twin/twin.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for twin
 
@@ -23,27 +23,35 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Slightly modified by Robby Workman <rworkman@slackbuilds.org>
+# 20220209 bkw: ...and fixed for 15.0 by B. Watson.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=twin
 VERSION=${VERSION:-0.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -68,8 +76,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+SLKCFLAGS+=" -fcommon"
+
+# 20220209 bkw: configure ignores CFLAGS from environment.
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -78,7 +87,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
-make -j1
+make -j1 CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
 make install DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -102,4 +111,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tzleap/README b/system/tzleap/README
new file mode 100644
index 0000000000..b08c06a323
--- /dev/null
+++ b/system/tzleap/README
@@ -0,0 +1,19 @@
+tzleap - leap-seconds.list from tzdb (zoneinfo)
+
+This package installs the leap-seconds.list file to the standard path
+expected by some software:
+
+    /usr/share/zoneinfo/leap-seconds.list 
+
+The IANA keeps the data and code used to create the Time Zone Database,
+("tz", "tzdb", "zoneinfo").
+
+    https://www.iana.org/time-zones
+
+This file comes from the commit for a tagged release from the
+maintainer's repo:
+
+    https://github.com/eggert/tz
+
+Slackware installs the current glibc-zoneinfo-* package, but does not
+include the leap-seconds.list file.
diff --git a/system/tzleap/slack-desc b/system/tzleap/slack-desc
new file mode 100644
index 0000000000..dcfa79b5c4
--- /dev/null
+++ b/system/tzleap/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+tzleap: tzleap (IANA zoneinfo leap-seconds.list)
+tzleap:
+tzleap: Installs the leap-seconds.list file to the standard path
+tzleap:
+tzleap:     /usr/share/zoneinfo/leap-seconds.list
+tzleap:
+tzleap: https://www.iana.org/time-zones
+tzleap:
+tzleap:
+tzleap:
+tzleap:
diff --git a/system/tzleap/tzleap.SlackBuild b/system/tzleap/tzleap.SlackBuild
new file mode 100644
index 0000000000..9c0a127cfc
--- /dev/null
+++ b/system/tzleap/tzleap.SlackBuild
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+# Slackware build script for tzleap
+
+# Copyright 2023 Dave Gauer, http://ratfactor.com
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=tzleap
+VERSION=${VERSION:-2022g}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+
+# We have just a single file, not a tarball
+# Make directory location in package and copy file
+mkdir -p $PKG/usr/share/zoneinfo/
+cp $CWD/leap-seconds.list $PKG/usr/share/zoneinfo/
+
+chown -R root:root $PKG
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tzleap/tzleap.info b/system/tzleap/tzleap.info
new file mode 100644
index 0000000000..7df9bb11b0
--- /dev/null
+++ b/system/tzleap/tzleap.info
@@ -0,0 +1,10 @@
+PRGNAM="tzleap"
+VERSION="2022g"
+HOMEPAGE="https://www.iana.org/time-zones"
+DOWNLOAD="https://raw.githubusercontent.com/eggert/tz/4e604e41115182c3ab1185bab4c888822511348e/leap-seconds.list"
+MD5SUM="202cceadb93219f6d02d13c4a7985445"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Dave Gauer"
+EMAIL="dave@ratfactor.com"
diff --git a/system/tzupdate/README b/system/tzupdate/README
new file mode 100644
index 0000000000..8036b374e4
--- /dev/null
+++ b/system/tzupdate/README
@@ -0,0 +1,14 @@
+tzupdate
+
+tzupdate is a fully automated utility to set the system time using
+geolocation.
+
+Internally, this geolocates you, gets the timezone for that geolocation,
+and then updates the system's local time zone.
+
+You can see what tzupdate would do without actually doing it by passing
+-p, and specify an alternative IP address by using -i. This is not an
+exhaustive list of options, see tzupdate --help for that.
+
+NOTE: Do not trust its results blindly. It does what it can, but
+determining a time zone based on an IP is inherently unreliable.
diff --git a/system/tzupdate/slack-desc b/system/tzupdate/slack-desc
new file mode 100644
index 0000000000..92128687ef
--- /dev/null
+++ b/system/tzupdate/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+tzupdate: tzupdate ( utility to set the system time using geolocation)
+tzupdate:
+tzupdate: Small, easy to understand codebase. Queries multiple geolocation
+tzupdate: services in parallel and returns the first with a successful result.
+tzupdate: Protects against directory traversal and invalid results when
+tzupdate: linking /etc/localtime
+tzupdate:
+tzupdate:
+tzupdate:
+tzupdate:
+tzupdate:
diff --git a/system/tzupdate/tzupdate.SlackBuild b/system/tzupdate/tzupdate.SlackBuild
new file mode 100644
index 0000000000..1c6cf249be
--- /dev/null
+++ b/system/tzupdate/tzupdate.SlackBuild
@@ -0,0 +1,165 @@
+#!/bin/bash
+
+# Slackware build script for tzupdate
+
+# Copyright 2023, Lockywolf
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=tzupdate
+VERSION=${VERSION:-3.1.0_e6815b}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+COMMIT="e6815b34d3bb37661ba8b677f30db408de651c7f"
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$COMMIT
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
+cd $PRGNAM-$COMMIT
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+rm -rf $TMP/$TARNAM-$VERSION/.cargo
+mkdir .cargo
+cat << EOF >> .cargo/config
+[source.crates-io]
+registry = 'https://github.com/rust-lang/crates.io-index'
+replace-with = 'vendored-sources'
+
+[source.vendored-sources]
+directory = '$(pwd)/vendor'
+EOF
+
+# deps and versions come from Cargo.lock
+mkdir vendor
+(
+  cd vendor
+
+  grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
+    sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
+    awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \
+    grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do
+
+    ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
+    dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
+
+    tar xvf $CWD/$dep-$ver.crate
+
+    touch $dep-$ver/.cargo-ok
+
+    # generate checksum
+    {
+      printf "{\n"
+      printf '    "files": {\n'
+
+      (
+        cd $dep-$ver
+        find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/'
+      ) | sed '$ s/,$//'
+
+      printf "    },\n"
+      printf '    "package": "'
+
+      sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
+
+      printf "}\n"
+    } > $dep-$ver/.cargo-checksum.json
+  done
+)
+
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
+CARGO_HOME=.cargo \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+cargo build --release --locked
+
+CARGO_HOME=.cargo \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+cargo install --no-track --locked --root "$PKG/usr" --path .
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md LICENSE \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/tzupdate/tzupdate.info b/system/tzupdate/tzupdate.info
new file mode 100644
index 0000000000..66fb7692dd
--- /dev/null
+++ b/system/tzupdate/tzupdate.info
@@ -0,0 +1,128 @@
+PRGNAM="tzupdate"
+VERSION="3.1.0_e6815b"
+HOMEPAGE="https://github.com/cdown/tzupdate"
+DOWNLOAD="https://github.com/cdown/tzupdate/archive/e6815b34d3bb37661ba8b677f30db408de651c7f/tzupdate-e6815b34d3bb37661ba8b677f30db408de651c7f.tar.gz \
+https://static.crates.io/crates/anstyle/anstyle-1.0.4.crate \
+https://static.crates.io/crates/anyhow/anyhow-1.0.75.crate \
+https://static.crates.io/crates/base64/base64-0.21.5.crate \
+https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \
+https://static.crates.io/crates/bitflags/bitflags-2.4.1.crate \
+https://static.crates.io/crates/cc/cc-1.0.83.crate \
+https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+https://static.crates.io/crates/clap/clap-4.4.10.crate \
+https://static.crates.io/crates/clap_builder/clap_builder-4.4.9.crate \
+https://static.crates.io/crates/clap_derive/clap_derive-4.4.7.crate \
+https://static.crates.io/crates/clap_lex/clap_lex-0.6.0.crate \
+https://static.crates.io/crates/env_logger/env_logger-0.10.1.crate \
+https://static.crates.io/crates/errno/errno-0.3.7.crate \
+https://static.crates.io/crates/fastrand/fastrand-2.0.1.crate \
+https://static.crates.io/crates/form_urlencoded/form_urlencoded-1.2.1.crate \
+https://static.crates.io/crates/getrandom/getrandom-0.2.11.crate \
+https://static.crates.io/crates/heck/heck-0.4.1.crate \
+https://static.crates.io/crates/humantime/humantime-2.1.0.crate \
+https://static.crates.io/crates/idna/idna-0.5.0.crate \
+https://static.crates.io/crates/itoa/itoa-1.0.9.crate \
+https://static.crates.io/crates/libc/libc-0.2.150.crate \
+https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.11.crate \
+https://static.crates.io/crates/log/log-0.4.20.crate \
+https://static.crates.io/crates/once_cell/once_cell-1.18.0.crate \
+https://static.crates.io/crates/percent-encoding/percent-encoding-2.3.1.crate \
+https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.70.crate \
+https://static.crates.io/crates/quote/quote-1.0.33.crate \
+https://static.crates.io/crates/redox_syscall/redox_syscall-0.4.1.crate \
+https://static.crates.io/crates/ring/ring-0.17.5.crate \
+https://static.crates.io/crates/rustix/rustix-0.38.25.crate \
+https://static.crates.io/crates/rustls-webpki/rustls-webpki-0.101.7.crate \
+https://static.crates.io/crates/rustls/rustls-0.21.9.crate \
+https://static.crates.io/crates/ryu/ryu-1.0.15.crate \
+https://static.crates.io/crates/sct/sct-0.7.1.crate \
+https://static.crates.io/crates/serde/serde-1.0.193.crate \
+https://static.crates.io/crates/serde_derive/serde_derive-1.0.193.crate \
+https://static.crates.io/crates/serde_json/serde_json-1.0.108.crate \
+https://static.crates.io/crates/spin/spin-0.9.8.crate \
+https://static.crates.io/crates/syn/syn-2.0.39.crate \
+https://static.crates.io/crates/tempfile/tempfile-3.8.1.crate \
+https://static.crates.io/crates/tinyvec/tinyvec-1.6.0.crate \
+https://static.crates.io/crates/tinyvec_macros/tinyvec_macros-0.1.1.crate \
+https://static.crates.io/crates/unicode-bidi/unicode-bidi-0.3.13.crate \
+https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.12.crate \
+https://static.crates.io/crates/unicode-normalization/unicode-normalization-0.1.22.crate \
+https://static.crates.io/crates/untrusted/untrusted-0.9.0.crate \
+https://static.crates.io/crates/ureq/ureq-2.9.1.crate \
+https://static.crates.io/crates/url/url-2.5.0.crate \
+https://static.crates.io/crates/wasi/wasi-0.11.0+wasi-snapshot-preview1.crate \
+https://static.crates.io/crates/webpki-roots/webpki-roots-0.25.3.crate \
+https://static.crates.io/crates/windows-sys/windows-sys-0.48.0.crate \
+https://static.crates.io/crates/windows-targets/windows-targets-0.48.5.crate \
+https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.48.5.crate \
+https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.48.5.crate \
+https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.48.5.crate \
+https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.48.5.crate \
+https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.48.5.crate \
+https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.48.5.crate \
+https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.5.crate"
+MD5SUM="b056f345d320331a40a16104133129c1 \
+b4f71ffecd3694a82ffb62c357d997a8 \
+39a78bec5a0ae75f210c1f67250152b0 \
+577bba6ae4d7493e169ca895141dd106 \
+a295edb6953237ebbdfa8e731229f9a3 \
+ebcf604c44976809506192718f439dc1 \
+9241fa90ea8b17c00010be46c9aa1ac5 \
+74634128440dbc3766bda76fdf0aaa05 \
+b9fb1a6efa893a291dc40b8f67894047 \
+7a5fbad4068946fdd6cf5020683d847c \
+08b9a34eadbb01ac16e36694e53eb254 \
+8f177f61a37d63f805acb925b30a0e58 \
+80a78a0fcf1ea91382db857c8e10c8fe \
+24f6202003a936e73e51f47584ea8bea \
+80e1c1b89d858c93fc5946b4a8266504 \
+c3e51926c9853b714191ef1bec90e2ce \
+3b00daaa372df161c5c8eeaf16a741d1 \
+b92fa50f56a1e06a7f1bf665442d4a73 \
+c01022fe0357c10ca1d48b16187f81bd \
+b5305bde14813da51d536a9df564db69 \
+c6e20d23948f86627f5d4668e7ca43e3 \
+5a8dc4bf5c57a6487a7247a635347cc9 \
+c0be6754bd3aef87de8cbc405f9f1673 \
+8ee79b4fe4c43d9ab09f16344612a656 \
+2dc8aacabbc090f8025a4789d4d6d8f0 \
+0ba30a94d7b8865c23e86d4d64e5b91e \
+3f210fd91912a2d7d2f0af5038704d17 \
+0ddb8bccd3198892d0dd0ec7151f7cd3 \
+ff1d093069cfc9eb161907e17a51208b \
+118b8b86f9aa5ae7adc04d0e0dc01642 \
+9bdda698a3c8ba141f4daba1a7630143 \
+9a668fb72cd7aeefb4e48fc37bdc0a4e \
+f615260189f3714be67797e8ad42a666 \
+254042a2a29ae1d79b96a283c8cc251f \
+c5a05bb3260e6a4b5d61cf78618f6021 \
+d6c1f2447aa984e398cdfdeb4cd75d44 \
+d43f1621c76532ffdc7990d23593c61b \
+3ed0ebc631b1840f3be21e1ba07fa4ed \
+ae0a9c293bf6cb72cd62d6b9486356c0 \
+16236f1edd28a8895ad8c3de8de226d8 \
+f80faded72df19d43134e2b44137376a \
+5f0470696baaa4e5953bddbf196998f9 \
+c678a7da0ee4b850ebde0474144a0415 \
+04c5de5f2fcb441ced909a45cff020bd \
+ca65153603a1a7240bbd9d2ce19f2d67 \
+c12d182417999fc365f952e701f6071f \
+674e5a6b49cf5e0ebb1d6cc85f6ec786 \
+23b29676b5f70e5155a2502f20f8d21e \
+e547b0e754cd61f24f9ef8c9e26fcd95 \
+e972ea58ec203bfa6c79c1207852298b \
+501eb875ed9de4f2e1422f5579833a78 \
+f2797ade0e36f1e5d6be9d11b5076582 \
+24c64817e85ef77765ed0f26c31c9b4c \
+dae6d89034a6988042fd8be4cf5e037d \
+de2839e16d9d7a9fd1c397da62f62b4a \
+e0c35ffb8cfdb74a39bf799811f79304 \
+d990172b607020701f9e84ca8e1c043c \
+0a68848588e847ceccf504891584d00b \
+45b469ad607b912256b7c80141fa2d17 \
+7799baff9a5664205d9110a2624e8989"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="rust16"
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.tzupdate_2023-12-03@lockywolf.net"
diff --git a/system/u3-tool/README b/system/u3-tool/README
index a93a75dc7d..97ca32fe15 100644
--- a/system/u3-tool/README
+++ b/system/u3-tool/README
@@ -3,13 +3,13 @@ u3-tool (utility for U3 flash drives, including SanDisk and Verbatim)
 Tool for controlling USB flash devices that confirm to the U3
 specifications. This program can control the following features:
 
-Replacing of CD image
-Changing of virtual CD allocated size and completely removing it
-Enabling and disabling Security
-Unlocking and changing password of secured U3 device
-Obtaining various device information
+- Replacing the virtual CD image
+- Changing the virtual CD's allocated size, or completely removing it
+- Enabling and disabling device security (password protection).
+- Unlocking and changing the password password of secured U3 device
+- Obtaining various device information
 
-In general all U3 USB flash devices should be supported. A list of devices
-that are reported to work with this tool is available in the forum:
+In general all U3 USB flash devices should be supported. A list of
+devices that are reported to work with this tool is available here:
 
-http://sourceforge.net/projects/u3-tool/forums/forum/746414/topic/3559573
+https://sourceforge.net/projects/u3-tool/forums/forum/746414/topic/3559573
diff --git a/system/u3-tool/slack-desc b/system/u3-tool/slack-desc
index 32e8ff90a2..f590b7acb5 100644
--- a/system/u3-tool/slack-desc
+++ b/system/u3-tool/slack-desc
@@ -11,9 +11,9 @@ u3-tool:
 u3-tool: Tool for controlling USB flash devices that confirm to the U3
 u3-tool: specifications. This program can control the following features:
 u3-tool:
-u3-tool: Replacing of CD image
-u3-tool: Changing of virtual CD allocated size and completely removing it
-u3-tool: Enabling and disabling Security
-u3-tool: Unlocking and changing password of secured U3 device
-u3-tool: Obtaining various device information
+u3-tool: - Replacing the virtual CD image
+u3-tool: - Changing the virtual CD's allocated size, or completely removing it
+u3-tool: - Enabling and disabling device security (password protection).
+u3-tool: - Unlocking and changing the password password of secured U3 device
+u3-tool: - Obtaining various device information
 u3-tool:
diff --git a/system/u3-tool/u3-tool.SlackBuild b/system/u3-tool/u3-tool.SlackBuild
index 42aa058f62..b7475f95e1 100644
--- a/system/u3-tool/u3-tool.SlackBuild
+++ b/system/u3-tool/u3-tool.SlackBuild
@@ -1,15 +1,24 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for u3-tool
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210822 bkw:
+# - new upstream, which released a 1.0 in 2012. old, but not as old as
+#   the 0.3 version from 2009.
+# - include commands.txt in the doc dir.
+# - fix grammar issues with README and slack-desc.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=u3-tool
-VERSION=${VERSION:-0.3}
+VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +28,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -43,15 +56,14 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+autoreconf -ivf
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -70,10 +82,11 @@ gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog NEWS TODO README $PKG/usr/doc/$PRGNAM-$VERSION
+cat doc/commands.txt > $PKG/usr/doc/$PRGNAM-$VERSION/commands.txt
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/u3-tool/u3-tool.info b/system/u3-tool/u3-tool.info
index 6905e8ff6f..8e608255e5 100644
--- a/system/u3-tool/u3-tool.info
+++ b/system/u3-tool/u3-tool.info
@@ -1,10 +1,10 @@
 PRGNAM="u3-tool"
-VERSION="0.3"
-HOMEPAGE="http://u3-tool.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/u3-tool/u3-tool/0.3/u3-tool-0.3.tar.gz"
-MD5SUM="4c7268614b30ba118f6dea6c85137f43"
+VERSION="1.0"
+HOMEPAGE="https://github.com/marcusrugger/u3-tool/"
+DOWNLOAD="https://github.com/marcusrugger/u3-tool/archive/u3-tool-1.0/u3-tool-u3-tool-1.0.tar.gz"
+MD5SUM="f17d9917a2a6edf7c5988746c72549f4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/uae/uae.SlackBuild b/system/uae/uae.SlackBuild
index 836aa14e0a..16a2b45a2f 100644
--- a/system/uae/uae.SlackBuild
+++ b/system/uae/uae.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for uae
 
 # Written by Michalis Pappas mepapp@noc.uoa.gr
 
+# 20220209 bkw: Modified by SlackBuilds.org:
+# - fix 15.0 build.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=uae
 VERSION=${VERSION:-0.8.29}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -51,8 +61,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+# 20220209 bkw: this configure script ignores CFLAGS, so be sneaky.
+# Also the -j1 is really needed.
+
+CC="gcc $SLKCFLAGS -fcommon" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -61,7 +73,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-make
+make -j1
 make install DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -78,4 +90,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/udevil/udevil.SlackBuild b/system/udevil/udevil.SlackBuild
index 20945f9d39..2313560159 100644
--- a/system/udevil/udevil.SlackBuild
+++ b/system/udevil/udevil.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for udevil
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=udevil
 VERSION=${VERSION:-0.4.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -109,4 +119,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/udftools/fix-compiler-errors.patch b/system/udftools/fix-compiler-errors.patch
deleted file mode 100644
index e6db4e808d..0000000000
--- a/system/udftools/fix-compiler-errors.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- udftools-1.0.0b3.orig/cdrwtool/cdrwtool.c	2002-12-28 15:48:51.000000000 +1100
-+++ udftools-1.0.0b3/cdrwtool/cdrwtool.c	2013-03-09 16:28:32.685490490 +1100
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- #include <getopt.h>
- #include <signal.h>
-+#include <limits.h>
- 
- #include <sys/ioctl.h>
- #include <asm/param.h>
---- udftools-1.0.0b3.orig/cdrwtool/main.c	2004-02-23 14:33:11.000000000 +1100
-+++ udftools-1.0.0b3/cdrwtool/main.c	2013-03-09 16:27:35.630406411 +1100
-@@ -30,6 +30,7 @@
- #include <time.h>
- #include <sys/time.h>
- #include <errno.h>
-+#include <string.h>
- 
- #include "cdrwtool.h"
- #include "defaults.h"
---- udftools-1.0.0b3.orig/cdrwtool/options.c	2003-10-24 11:16:04.000000000 +1000
-+++ udftools-1.0.0b3/cdrwtool/options.c	2013-03-09 16:27:49.846422176 +1100
-@@ -23,6 +23,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <malloc.h>
-+#include <string.h>
- 
- #include "cdrwtool.h"
- #include "libudffs.h"
---- udftools-1.0.0b3.orig/include/udf_endian.h	2002-11-26 18:18:51.000000000 +1100
-+++ udftools-1.0.0b3/include/udf_endian.h	2013-03-09 16:24:42.000920607 +1100
-@@ -23,6 +23,7 @@
- #ifndef __UDF_ENDIAN_H
- #define __UDF_ENDIAN_H
- 
-+#include <string.h>
- #include "bswap.h"
- 
- static inline lb_addr lelb_to_cpu(lb_addr in)
---- udftools-1.0.0b3.orig/libudffs/file.c	2002-11-26 18:18:51.000000000 +1100
-+++ udftools-1.0.0b3/libudffs/file.c	2013-03-09 16:25:21.175013609 +1100
-@@ -21,6 +21,7 @@
-  */
- 
- #include <malloc.h>
-+#include <string.h>
- 
- #include "libudffs.h"
- #include "defaults.h"
---- udftools-1.0.0b3.orig/libudffs/unicode.c	2002-11-26 18:18:51.000000000 +1100
-+++ udftools-1.0.0b3/libudffs/unicode.c	2013-03-09 16:25:59.433223040 +1100
-@@ -20,6 +20,8 @@
-  *
-  */
- 
-+#include <string.h>
-+
- #include "libudffs.h"
- #include "defaults.h"
- #include "config.h"
---- udftools-1.0.0b3.orig/mkudffs/main.c	2004-02-23 14:33:11.000000000 +1100
-+++ udftools-1.0.0b3/mkudffs/main.c	2013-03-09 16:26:27.967171881 +1100
-@@ -31,6 +31,7 @@
- #include <sys/time.h>
- #include <errno.h>
- #include <limits.h>
-+#include <string.h>
- 
- #include "mkudffs.h"
- #include "defaults.h"
---- udftools-1.0.0b3.orig/mkudffs/mkudffs.c	2004-02-23 14:35:33.000000000 +1100
-+++ udftools-1.0.0b3/mkudffs/mkudffs.c	2013-03-09 16:26:55.098244722 +1100
-@@ -30,6 +30,7 @@
- #include <time.h>
- #include <sys/time.h>
- #include <errno.h>
-+#include <string.h>
- 
- #include "mkudffs.h"
- #include "defaults.h"
---- udftools-1.0.0b3.orig/mkudffs/options.c	2002-11-26 18:18:51.000000000 +1100
-+++ udftools-1.0.0b3/mkudffs/options.c	2013-03-09 16:27:17.188691854 +1100
-@@ -24,6 +24,7 @@
- #include <stdlib.h>
- #include <getopt.h>
- #include <malloc.h>
-+#include <string.h>
- 
- #include "mkudffs.h"
- #include "defaults.h"
---- udftools-1.0.0b3.orig/pktsetup/pktsetup.c	2002-11-26 18:18:51.000000000 +1100
-+++ udftools-1.0.0b3/pktsetup/pktsetup.c	2013-03-09 16:30:53.851742260 +1100
-@@ -23,6 +23,7 @@
- #include <getopt.h>
- #include <bits/types.h>
- #include <sys/types.h>
-+#include <limits.h>
- 
- #include <linux/cdrom.h>
- 
---- udftools-1.0.0b3.orig/wrudf/ide-pc.c	2002-11-26 18:18:51.000000000 +1100
-+++ udftools-1.0.0b3/wrudf/ide-pc.c	2013-03-09 16:29:57.634001857 +1100
-@@ -31,6 +31,7 @@
- #include <sys/types.h>		/* for u_char etc. */
- #include <linux/cdrom.h>
- #include <unistd.h>		/* sleep() */
-+#include <stdlib.h>
- 
- #include "bswap.h"
- #include "ide-pc.h"
---- udftools-1.0.0b3.orig/wrudf/wrudf-cdr.c	2002-11-26 18:18:51.000000000 +1100
-+++ udftools-1.0.0b3/wrudf/wrudf-cdr.c	2013-03-09 16:31:43.156091936 +1100
-@@ -6,6 +6,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <string.h>
-+
- #include "wrudf.h"
- #include "ide-pc.h"
- #include "bswap.h"
---- udftools-1.0.0b3.orig/wrudf/wrudf-cdrw.c	2002-11-26 18:18:51.000000000 +1100
-+++ udftools-1.0.0b3/wrudf/wrudf-cdrw.c	2013-03-09 16:29:05.652037738 +1100
-@@ -31,6 +31,7 @@
- #include <sys/stat.h>
- #include <sys/ioctl.h>
- #include <linux/cdrom.h>		/* for CDROM_DRIVE_STATUS  */
-+#include <string.h>
- 
- #include "wrudf.h"
- #include "ide-pc.h"
---- udftools-1.0.0b3.orig/wrudf/wrudf.c	2002-11-26 18:18:51.000000000 +1100
-+++ udftools-1.0.0b3/wrudf/wrudf.c	2013-03-09 16:31:10.001538000 +1100
-@@ -245,7 +245,7 @@
- 	    } else if( strncmp( spm->partIdent.ident, UDF_ID_VIRTUAL, strlen(UDF_ID_VIRTUAL)) == 0 )
- 		virtualPartitionNum = i;
- 	}
--	(char*)spm += spm->partitionMapLength;
-+	spm += spm->partitionMapLength;
-     }
- 
-     if( medium == CDR ) {
diff --git a/system/udftools/udftools-1.0.0b3-gcc5.patch b/system/udftools/udftools-1.0.0b3-gcc5.patch
deleted file mode 100644
index 244683c5b0..0000000000
--- a/system/udftools/udftools-1.0.0b3-gcc5.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- udftools-1.0.0b3/include/libudffs.h	2004-02-23 04:33:11.000000000 +0100
-+++ udftools-1.0.0b3/include/libudffs.h	2015-06-27 18:53:17.000000000 +0200
-@@ -169,8 +169,8 @@
- struct udf_data *alloc_data(void *, int);
- 
- /* desc.c */
--inline struct impUseVolDescImpUse *query_iuvdiu(struct udf_disc *);
--inline struct logicalVolIntegrityDescImpUse *query_lvidiu(struct udf_disc *);
-+extern inline struct impUseVolDescImpUse *query_iuvdiu(struct udf_disc *);
-+extern inline struct logicalVolIntegrityDescImpUse *query_lvidiu(struct udf_disc *);
- 
- /* file.c */
- tag query_tag(struct udf_disc *, struct udf_extent *, struct udf_desc *, uint16_t);
diff --git a/system/udftools/udftools.SlackBuild b/system/udftools/udftools.SlackBuild
index 8f209ab7a5..e64ddfccfc 100644
--- a/system/udftools/udftools.SlackBuild
+++ b/system/udftools/udftools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for udftools
 
@@ -21,26 +21,36 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=udftools
-VERSION=${VERSION:-1.0.0b3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -63,15 +73,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-patch -p1 < $CWD/fix-compiler-errors.patch
-
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778153
-patch -p1 < $CWD/udftools-1.0.0b3-gcc5.patch
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -86,6 +91,9 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
@@ -99,4 +107,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/udftools/udftools.exclude b/system/udftools/udftools.exclude
deleted file mode 100644
index 26e04de8f3..0000000000
--- a/system/udftools/udftools.exclude
+++ /dev/null
@@ -1,6 +0,0 @@
-udftools/udftools-1.0.0b3
-udftools/udftools-1.0.0b3.orig
-udftools/udftools-1.0.0b3.tar.gz
-udftools/*.log
-udftools/*~
-udftools/zzz-config.help
diff --git a/system/udftools/udftools.info b/system/udftools/udftools.info
index a8bed5bc11..523b61fabc 100644
--- a/system/udftools/udftools.info
+++ b/system/udftools/udftools.info
@@ -1,8 +1,8 @@
 PRGNAM="udftools"
-VERSION="1.0.0b3"
+VERSION="2.3"
 HOMEPAGE="https://sourceforge.net/projects/linux-udf/"
-DOWNLOAD="https://downloads.sourceforge.net/project/linux-udf/udftools/1.0.0b3/udftools-1.0.0b3.tar.gz"
-MD5SUM="2f491ddd63f31040797236fe18db9e60"
+DOWNLOAD="https://github.com/pali/udftools/releases/download/2.3/udftools-2.3.tar.gz"
+MD5SUM="eada8dd40a675763ec71c35655cfd85e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/udiskie/README b/system/udiskie/README
index 35f6782e4d..b1cf74a21e 100644
--- a/system/udiskie/README
+++ b/system/udiskie/README
@@ -2,5 +2,3 @@ udiskie is a simple daemon that uses UDisks_ to automatically mount
 removable storage devices. This daemon comes with optional mount
 notifications and gtk tray icon. It also provides a user level CLI for
 mount and unmount operations.
-
-Optional dependency: python-keyutils
diff --git a/system/udiskie/udiskie.SlackBuild b/system/udiskie/udiskie.SlackBuild
index 17d1af476c..0d20126ed8 100644
--- a/system/udiskie/udiskie.SlackBuild
+++ b/system/udiskie/udiskie.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for udiskie
 
-# Copyright 2014-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2023  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=udiskie
-VERSION=${VERSION:-1.7.6}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.5.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,7 +79,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -83,4 +93,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/udiskie/udiskie.info b/system/udiskie/udiskie.info
index a36cb232f7..dcd52c73d6 100644
--- a/system/udiskie/udiskie.info
+++ b/system/udiskie/udiskie.info
@@ -1,10 +1,10 @@
 PRGNAM="udiskie"
-VERSION="1.7.6"
+VERSION="2.5.1"
 HOMEPAGE="https://github.com/coldfix/udiskie"
-DOWNLOAD="https://files.pythonhosted.org/packages/41/cc/cdc93457255376f0a69867ce84fadade21fac102abc48684b9294195a818/udiskie-1.7.6.tar.gz"
-MD5SUM="cadf952fc38434c2f13c0b00f82999a3"
+DOWNLOAD="https://files.pythonhosted.org/packages/28/d3/29d12e4b5d6007b980e6fdd944138f88fc06f0f2af1dd7951a905b32b764/udiskie-2.5.1.tar.gz"
+MD5SUM="3d7deb3bdc136fae05c0bd10792d4b06"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="PyYAML docopt"
+REQUIRES="python3-docopt"
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/system/ufiformat/ufiformat.SlackBuild b/system/ufiformat/ufiformat.SlackBuild
index 670c9432e0..edac8ac2c9 100644
--- a/system/ufiformat/ufiformat.SlackBuild
+++ b/system/ufiformat/ufiformat.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ufiFormat
 # Written by Ben Collver <bencollver@gmail.com>
@@ -7,10 +7,13 @@
 # 02 feb 2020 - 0.9.9 build 1 - Updated to 0.9.9. Updated homepage and download links.
 #               (Bojan)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ufiformat
 VERSION=${VERSION:-0.9.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -20,7 +23,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,4 +82,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/uhd/README b/system/uhd/README
index 3e7c6e766a..8519eb1755 100644
--- a/system/uhd/README
+++ b/system/uhd/README
@@ -1,6 +1,9 @@
-The USRP Hardware Driver software (UHD) is the hardware driver for all
-USRP devices. It works on all major platforms (Linux, Windows, and Mac)
-and can be built with GCC, Clang, and MSVC compilers. The goal of the
-UHD software is to provide a host driver and API for current and future
-Ettus Research products. Users will be able to use UHD software
+The USRP Hardware Driver software (UHD) is the hardware driver for
+all USRP devices. It works on all major platforms (Linux, Windows, and
+Mac) and can be built with GCC, Clang, and MSVC compilers. The goal of
+the UHD software is to provide a host driver and API for current and
+future Ettus Research products. Users will be able to use UHD software
 standalone or with third-party applications.
+
+Optional dependency: numpy3. This is required for building the UHD
+Python API.
diff --git a/system/uhd/uhd.SlackBuild b/system/uhd/uhd.SlackBuild
index 1171a01c0a..5e8171fa21 100644
--- a/system/uhd/uhd.SlackBuild
+++ b/system/uhd/uhd.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for uhd
 
@@ -22,26 +22,42 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220224 bkw: Modified by SlackBuilds.org:
+# - updated to latest release, 4.1.0.5. the previous version was
+#   unbuildable on Slackware 15.0.
+# - move man pages to /usr/man (they were going to /usr/share/man).
+
+# Note: This is a driver for hardware I don't own and can't test. It'd
+# be nice if someone who does own this hardware would test the new
+# version.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=uhd
-VERSION=${VERSION:-003_005_002}
+VERSION=${VERSION:-4.1.0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -59,15 +75,24 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf UHD-Mirror-release_$VERSION
-tar xvf $CWD/release_$VERSION.tar.gz || tar xvf $CWD/UHD-Mirror-release_$VERSION.tar.gz
-cd UHD-Mirror-release_$VERSION/host
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION/host
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# fix building with gcc >= 13.x
+sed -i s/\#include\ \<stddef.h\>/\#include\ \<stddef.h\>\\n\#include\ \<cstdint\>/ ./include/uhd/cal/database.hpp
+sed -i s/\#include\ \<string\>/\#include\ \<string\>\\n\#include\ \<cstdint\>/ ./include/uhd/rfnoc/defaults.hpp
+sed -i s/\#include\ \<cstddef\>/\#include\ \<cstddef\>\\n\#include\ \<cstdint\>/ ./lib/usrp/dboard/magnesium/magnesium_constants.hpp
+sed -i s/\#include\ \<cstddef\>/\#include\ \<cstddef\>\\n\#include\ \<cstdint\>/ ./lib/usrp/dboard/rhodium/rhodium_constants.hpp
+sed -i s/\#include\ \<string\>/\#include\ \<string\>\\n\#include\ \<cstdint\>/ ./include/uhd/types/eeprom.hpp
+sed -i s/\#include\ \<string\>/\#include\ \<string\>\\n\#include\ \<cstdint\>/ ./lib/include/uhdlib/utils/serial_number.hpp
+sed -i s/\#include\ "cast.h"/\#include\ "cast.h"\\n\#include\ \<cstdint\>/ ./lib/deps/pybind11/include/pybind11/attr.h
 
 mkdir -p build
 cd build
@@ -80,11 +105,10 @@ cd build
     -Wno-dev \
     -DCMAKE_BUILD_TYPE=Release ..
   make 
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+mv $PKG/usr/share/man $PKG/usr/man
 
 mv $PKG/usr/share/doc $PKG/usr/doc
 mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
@@ -94,4 +118,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/uhd/uhd.info b/system/uhd/uhd.info
index 15d3fc0305..eb8f9550df 100644
--- a/system/uhd/uhd.info
+++ b/system/uhd/uhd.info
@@ -1,10 +1,10 @@
 PRGNAM="uhd"
-VERSION="003_005_002"
+VERSION="4.1.0.5"
 HOMEPAGE="https://www.ettus.com/"
-DOWNLOAD="https://github.com/EttusResearch/UHD-Mirror/archive/release_003_005_002.tar.gz"
-MD5SUM="14f914b68bb9f58b1d08ae97000c03f4"
+DOWNLOAD="https://github.com/EttusResearch/uhd/archive/v4.1.0.5/uhd-4.1.0.5.tar.gz"
+MD5SUM="8fd12ef06fb56654edc6da7720fd925e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-cheetah"
+REQUIRES=""
 MAINTAINER="Georgi Kolev"
 EMAIL="shadowx@escom.bg"
diff --git a/system/uhubctl/slack-desc b/system/uhubctl/slack-desc
index ea4df7fdbe..4a2e0d997f 100644
--- a/system/uhubctl/slack-desc
+++ b/system/uhubctl/slack-desc
@@ -11,8 +11,8 @@ uhubctl:
 uhubctl: uhuctl is a utility to control USB power per-por on smart USB hubs.
 uhubctl: Smart hub is defined as one that implements per-port power switching.
 uhubctl:
-uhubctl: Original idea for this code was inspired by hub-ctrl.c by Niibe Yutaka:
-uhubctl: http://www.gniibe.org/development/ac-power-control-by-USB-hub
+uhubctl: Original idea for this code was inspired by hub-ctrl.c by Niibe
+uhubctl: Yutaka: http://www.gniibe.org/development/ac-power-control-by-USB-hub
 uhubctl:
 uhubctl:
 uhubctl:
diff --git a/system/uhubctl/uhubctl.SlackBuild b/system/uhubctl/uhubctl.SlackBuild
index 6ebf7e1171..09790e3d1e 100644
--- a/system/uhubctl/uhubctl.SlackBuild
+++ b/system/uhubctl/uhubctl.SlackBuild
@@ -1,12 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for <uhubctl>
 #
 # Michales (clavisound) Michaloudes korgie@gmail.com <2019>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=uhubctl
-VERSION=${VERSION:-2.0.0}
+VERSION=${VERSION:-2.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -16,7 +19,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}	
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,4 +74,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/uhubctl/uhubctl.info b/system/uhubctl/uhubctl.info
index 40cbfaa5e4..3d256b62fa 100644
--- a/system/uhubctl/uhubctl.info
+++ b/system/uhubctl/uhubctl.info
@@ -1,8 +1,8 @@
 PRGNAM="uhubctl"
-VERSION="2.0.0"
+VERSION="2.5.0"
 HOMEPAGE="https://github.com/mvp/uhubctl/"
-DOWNLOAD="https://github.com/mvp/uhubctl/archive/v2.0.0/uhubctl-2.0.0.tar.gz"
-MD5SUM="5c711911d766d76813333c3812277574"
+DOWNLOAD="https://github.com/mvp/uhubctl/archive/v2.5.0/uhubctl-2.5.0.tar.gz"
+MD5SUM="e4e66d445ba8fda181ce4aa4abcd4247"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/uif2iso/uif2iso.SlackBuild b/system/uif2iso/uif2iso.SlackBuild
index 1b9a9ac20b..81c94d07a0 100644
--- a/system/uif2iso/uif2iso.SlackBuild
+++ b/system/uif2iso/uif2iso.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for uif2iso
 
@@ -26,10 +26,13 @@
 # YOUR DATA IS DESTROYED, YOUR HOUSE BURNS DOWN OR YOUR DOG RUNS OFF.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=uif2iso
 VERSION=${VERSION:-0.1.7c}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -39,7 +42,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -92,4 +102,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/uif2iso/uif2iso.info b/system/uif2iso/uif2iso.info
index 645d3d6045..ddc7203ab8 100644
--- a/system/uif2iso/uif2iso.info
+++ b/system/uif2iso/uif2iso.info
@@ -6,5 +6,5 @@ MD5SUM="2eb9797ec463c38253014d45591a7043"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
+MAINTAINER="D Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/system/un-fonts-core/un-fonts-core.SlackBuild b/system/un-fonts-core/un-fonts-core.SlackBuild
index dedf19faef..b815394b01 100644
--- a/system/un-fonts-core/un-fonts-core.SlackBuild
+++ b/system/un-fonts-core/un-fonts-core.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for un-fonts-core
 
@@ -22,15 +22,25 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=un-fonts-core
 VERSION=${VERSION:-1.0}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAME=863-un-fonts-core
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -62,4 +72,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unac/README b/system/unac/README
index d0683d9169..c45e3b107b 100644
--- a/system/unac/README
+++ b/system/unac/README
@@ -1,5 +1,7 @@
-unac is a C library and command that removes accents from a string
-It provides a command line interface that removes accents from a
-input flow or a string given in argument (unaccent command).
-In the library function and the command, the charset of the input
-is specified as an argument.
+unac (remove accents from text)
+
+unac is a C library (libunac) and command (unaccent) that removes
+accents from a string of text; it replaces accented characters in the
+given character set with their unaccented (ASCII) equivalents.
+
+See also: perl/perl-text-unaccent, for a Perl module based on this.
diff --git a/system/unac/ligatures.diff b/system/unac/ligatures.diff
new file mode 100644
index 0000000000..aa796e04c5
--- /dev/null
+++ b/system/unac/ligatures.diff
@@ -0,0 +1,16 @@
+diff -Naur unac-1.8.0.orig/unaccent-local-map.perl unac-1.8.0.orig.patched/unaccent-local-map.perl
+--- unac-1.8.0.orig/unaccent-local-map.perl	2003-10-13 06:24:25.000000000 -0400
++++ unac-1.8.0.orig.patched/unaccent-local-map.perl	2021-08-20 14:13:53.224474419 -0400
+@@ -23,5 +23,12 @@
+ %::localmap = (
+     "LATIN SMALL LETTER AE" => [ "LATIN SMALL LETTER A", "LATIN SMALL LETTER E" ],
+     "LATIN CAPITAL LETTER AE" => [ "LATIN CAPITAL LETTER A", "LATIN CAPITAL LETTER E" ],
++    "LATIN SMALL LIGATURE OE" => [ "LATIN SMALL LETTER O", "LATIN SMALL LETTER E" ],
++    "LATIN CAPITAL LIGATURE OE" => [ "LATIN CAPITAL LETTER O", "LATIN CAPITAL LETTER E" ],
++    "LATIN SMALL LETTER SHARP S" => [ "LATIN SMALL LETTER S", "LATIN SMALL LETTER S" ],
++    "LATIN SMALL LETTER HV" => [ "LATIN SMALL LETTER H", "LATIN SMALL LETTER V" ],
+ 		 );
+ 
++# 20210820 bkw: Unicode standard 4.0.0 doesn't define these:
++#    "LATIN CAPITAL LETTER HV" => [ "LATIN CAPITAL LETTER H", "LATIN CAPITAL LETTER V" ],
++#    "LATIN CAPITAL LETTER SHARP S" => [ "LATIN CAPITAL LETTER S", "LATIN CAPITAL LETTER S" ],
diff --git a/system/unac/oe_ligature.diff b/system/unac/oe_ligature.diff
deleted file mode 100644
index 1fa9a52453..0000000000
--- a/system/unac/oe_ligature.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur unac-1.8.0.orig/unaccent-local-map.perl unac-1.8.0.orig.patched/unaccent-local-map.perl
---- unac-1.8.0.orig/unaccent-local-map.perl	2003-10-13 06:24:25.000000000 -0400
-+++ unac-1.8.0.orig.patched/unaccent-local-map.perl	2015-10-26 17:01:49.000000000 -0400
-@@ -23,5 +23,7 @@
- %::localmap = (
-     "LATIN SMALL LETTER AE" => [ "LATIN SMALL LETTER A", "LATIN SMALL LETTER E" ],
-     "LATIN CAPITAL LETTER AE" => [ "LATIN CAPITAL LETTER A", "LATIN CAPITAL LETTER E" ],
-+    "LATIN SMALL LIGATURE OE" => [ "LATIN SMALL LETTER O", "LATIN SMALL LETTER E" ],
-+    "LATIN CAPITAL LIGATURE OE" => [ "LATIN CAPITAL LETTER O", "LATIN CAPITAL LETTER E" ],
- 		 );
- 
diff --git a/system/unac/size_t.diff b/system/unac/size_t.diff
deleted file mode 100644
index e7ef82ba32..0000000000
--- a/system/unac/size_t.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -r fd7eb0d70970 unac-1.8.0/unac.c
---- a/unac-1.8.0/unac.c	Fri Sep 17 10:35:14 2010 +0200
-+++ b/unac-1.8.0/unac.c	Fri Sep 17 10:36:07 2010 +0200
-@@ -13873,9 +13873,9 @@
-     *out_lengthp = 0;
-   } else {
-     char* utf16 = 0;
--    int utf16_length = 0;
-+    size_t utf16_length = 0;
-     char* utf16_unaccented = 0;
--    int utf16_unaccented_length = 0;
-+    size_t utf16_unaccented_length = 0;
-   
-     if(convert(charset, utf16be(), in, in_length, &utf16, &utf16_length) < 0) {
-       return -1;
-diff -r fd7eb0d70970 unac-1.8.0/unaccent.c
---- a/unac-1.8.0/unaccent.c	Fri Sep 17 10:35:14 2010 +0200
-+++ b/unac-1.8.0/unaccent.c	Fri Sep 17 10:40:34 2010 +0200
-@@ -90,7 +90,7 @@
-     const char* charset = argv[optind++];
- 
-     char* unaccented = 0;
--    int unaccented_length = 0;
-+    size_t unaccented_length = 0;
- 
-     if(optind >= argc) {
- #define BUFFER_SIZE 10240
-@@ -101,7 +101,7 @@
- 	  perror("");
- 	  exit(1);
- 	}
--	printf("%.*s", unaccented_length, unaccented);
-+	printf("%.*s", (int)unaccented_length, unaccented);
-       }
-     } else {
-       const char* string = argv[optind++];
-@@ -114,7 +114,7 @@
- 
-       if(debug_level > UNAC_DEBUG_NONE)
- 	fprintf(stderr, "unaccented version is ");
--      printf("%.*s\n", unaccented_length, unaccented);
-+      printf("%.*s\n", (int)unaccented_length, unaccented);
- 
-       if(optind < argc) {
- 	const char* expected = argv[optind++];
diff --git a/system/unac/slack-desc b/system/unac/slack-desc
index 6d1787116c..72ea1225ba 100644
--- a/system/unac/slack-desc
+++ b/system/unac/slack-desc
@@ -8,11 +8,11 @@
     |-----handy-ruler------------------------------------------------------|
 unac: unac (remove accents from text)
 unac:
-unac: unac is a C library and command that removes accents from a string
-unac: It provides a command line interface that removes accents from a
-unac: input flow or a string given in argument (unaccent command).
-unac: In the library function and the command, the charset of the input
-unac: is specified as an argument.
+unac: unac is a C library (libunac) and command (unaccent) that removes
+unac: accents from a string of text; it replaces accented characters in the
+unac: given character set with their unaccented (ASCII) equivalents.
+unac:
+unac:
 unac:
 unac:
 unac:
diff --git a/system/unac/unac.SlackBuild b/system/unac/unac.SlackBuild
index 5c31b676bb..b5d5c7eb94 100644
--- a/system/unac/unac.SlackBuild
+++ b/system/unac/unac.SlackBuild
@@ -1,15 +1,27 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for unac
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210819 bkw:
+# - updated to match debian's patchlevel 9.
+# - add a few more ligatures.
+
+# Note to self: don't try to update this for Unicode standard 13.0.0.
+# It'll compile and run, but the code assumes the codepoints will fit
+# in an unsigned short (16 bits), which is no longer true in the new
+# standard.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=unac
-VERSION=${VERSION:-1.8.0}
+VERSION=${VERSION:-1.8.0_9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +31,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -40,8 +56,13 @@ fi
 
 set -e
 
-TARBALL=${PRGNAM}_${VERSION}.orig.tar.gz
-DIRNAME=${PRGNAM}-${VERSION}.orig
+# The original upstream hasn't maintained this since 2004, but
+# the Debian maintainers have been keeping it up to date.
+MAINVER="${VERSION//_*}"  # e.g. 1.8.0_9 => 1.8.0
+DEBVER="${VERSION//*_}"   # e.g. 1.8.0_9 => 9
+TARBALL=${PRGNAM}_${MAINVER}.orig.tar.gz
+DEBTAR=${PRGNAM}_${MAINVER}-${DEBVER}.debian.tar.xz
+DIRNAME=${PRGNAM}-${MAINVER}.orig
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -49,21 +70,19 @@ cd $TMP
 rm -rf $DIRNAME
 tar xvf $CWD/$TARBALL
 cd $DIRNAME
+tar xvf $CWD/$DEBTAR
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# patch taken from http://http.debian.net/debian/pool/main/u/unac/unac_1.8.0-6.diff.gz
-# (yes, it needs -p2)
-patch -p2 < $CWD/size_t.diff
+for i in $( cat debian/patches/series ); do
+  patch -p1 < debian/patches/$i
+done
 
-# patch by slackbuild author, add support for OE ligature
-patch -p1 < $CWD/oe_ligature.diff
+# patch by slackbuild author, add support for OE ligature, German sharp S,
+# and Hwair.
+patch -p1 < $CWD/ligatures.diff
 
-touch config.rpath # shut up, autocrap
 autoreconf -if
 
 CFLAGS="$SLKCFLAGS" \
@@ -79,11 +98,12 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-shared \
   --build=$ARCH-slackware-linux
 
-# this is needed for the OE ligature also
+# this is needed for the ligatures also
 make -B $PRGNAM.c
 
 make
 make install-strip DESTDIR=$PKG
+rm -f $PKG/usr/lib$LIBDIRSUFFIX/*.la
 gzip $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -94,4 +114,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unac/unac.info b/system/unac/unac.info
index 4379cc82e7..5e6f5486cb 100644
--- a/system/unac/unac.info
+++ b/system/unac/unac.info
@@ -1,10 +1,12 @@
 PRGNAM="unac"
-VERSION="1.8.0"
-HOMEPAGE="http://www.nongnu.org/unac/"
-DOWNLOAD="http://http.debian.net/debian/pool/main/u/unac/unac_1.8.0.orig.tar.gz"
-MD5SUM="8670c920969a199dec37f15c197602bf"
+VERSION="1.8.0_9"
+HOMEPAGE="https://www.nongnu.org/unac/"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/u/unac/unac_1.8.0.orig.tar.gz \
+          https://slackware.uk/~urchlay/src/unac_1.8.0-9.debian.tar.xz"
+MD5SUM="8670c920969a199dec37f15c197602bf \
+        5dcc4e384b015aebb7dd38569c22b6d0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/unace/README b/system/unace/README
index bd8d6d824b..321bf3d404 100644
--- a/system/unace/README
+++ b/system/unace/README
@@ -1,5 +1,5 @@
 unace is a tool for decompressing ACE archives in linux.
 
-To use this software, you have to accept the Public UnAce Licence located at:
-/usr/doc/unace-2.5/license
-If you do not accept, please remove this package.
+To use this software, you have to accept the Public UnAce Licence
+located at "/usr/doc/unace-2.5/license". If you do not accept, please
+remove this package.
diff --git a/system/unace/unace.SlackBuild b/system/unace/unace.SlackBuild
index d576d5f6bb..3ab6ce51dd 100644
--- a/system/unace/unace.SlackBuild
+++ b/system/unace/unace.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for unace
 #
@@ -23,10 +23,17 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230627 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - strip binary.
+# - actually use SLKCFLAGS.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=unace
 VERSION=${VERSION:-2.5}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -68,9 +79,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
 # Thanks to AUR for the patches
 zcat $CWD/01-makefiles.dpatch | patch -p1
@@ -79,10 +90,12 @@ if [ "$ARCH" = "x86_64" ]; then
   zcat $CWD/04-64bit.dpatch | patch -p1
 fi
 
+sed -i "s,\\tgcc,& $SLKCFLAGS," makefile
+
 make
 
 mkdir -p $PKG/usr/bin
-install -m 0755 unace $PKG/usr/bin/unace
+install -s -m 0755 unace $PKG/usr/bin/unace
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a licence $PKG/usr/doc/$PRGNAM-$VERSION
@@ -92,4 +105,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unar/unar.SlackBuild b/system/unar/unar.SlackBuild
index bf543ed322..43ac01aa34 100644
--- a/system/unar/unar.SlackBuild
+++ b/system/unar/unar.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for <appname>
 
-# Copyright 2016-2020 Alexander Verbovetsky, Moscow, Russia
+# Copyright 2016-2023 Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=unar
-VERSION=${VERSION:-1.10.7}
+VERSION=${VERSION:-1.10.8}
 UDVERSION=${UDVERSION:-1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -101,4 +108,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unar/unar.info b/system/unar/unar.info
index d0aad06e4a..35ebada0b2 100644
--- a/system/unar/unar.info
+++ b/system/unar/unar.info
@@ -1,9 +1,9 @@
 PRGNAM="unar"
-VERSION="1.10.7"
+VERSION="1.10.8"
 HOMEPAGE="https://theunarchiver.com/command-line"
-DOWNLOAD="https://github.com/MacPaw/XADMaster/archive/v1.10.7/XADMaster-1.10.7.tar.gz \
+DOWNLOAD="https://github.com/MacPaw/XADMaster/archive/v1.10.8/XADMaster-1.10.8.tar.gz \
           https://github.com/MacPaw/universal-detector/archive/1.1/universal-detector-1.1.tar.gz"
-MD5SUM="6cbb0629367e4f0fc0eac5af39786c6d \
+MD5SUM="3199b8ffdb9ceb67d1809befca9bd712 \
         5c87b87c72609b23110236c6d7aac8e5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/unetbootin/unetbootin.SlackBuild b/system/unetbootin/unetbootin.SlackBuild
index 23e9f5ba58..89e5356db3 100644
--- a/system/unetbootin/unetbootin.SlackBuild
+++ b/system/unetbootin/unetbootin.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for unetbootin
 # Written by Jens Weber <jens@tuxane.com>
 # v565: (jw) initial version 01/06/2012
@@ -11,10 +11,17 @@
 # v661: (jw) version bump to 661 29 July 2018 / take sources from github.com as the sourceforge page seems to be somehow obsolete
 # v677: (SBo) version bump to 677 14 April 2020
 
+# 20220414 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix icon permissions.
+# - make .desktop file validate.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=unetbootin
-VERSION=${VERSION:-677}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-702}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -24,7 +31,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,19 +66,27 @@ tar xvf $CWD/${PRGNAM}-source-$(echo $VERSION).tar.gz
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20220414 bkw: the above doesn't quite fix the permissions in the tarball.
+chmod 644 *.png *.svg *.desktop
 
-lupdate unetbootin.pro
-lrelease unetbootin.pro
-qmake -config release "DEFINES += NOSTATIC" "RESOURCES -= unetbootin.qrc"
+lupdate-qt5 unetbootin.pro
+lrelease-qt5 unetbootin.pro
+qmake-qt5 -config release "DEFINES += NOSTATIC" "RESOURCES -= unetbootin.qrc"
 make
 strip --strip-unneeded $PRGNAM
 
 mkdir -p $PKG/usr/bin
 cp -a $PTMP/$PRGNAM $PKG/usr/bin/$PRGNAM
+cp -a $PTMP/unetbootin_asroot $PKG/usr/bin/
+chmod 755 $PKG/usr/bin/unetbootin_asroot
 
+sed -i -e '/^Cat/s,Application;,,' \
+       -e '/^GenericName/s,\[en_US\],,' \
+       $PTMP/$PRGNAM.desktop
 mkdir -p $PKG/usr/share/applications
 cp -a $PTMP/$PRGNAM.desktop  $PKG/usr/share/applications/$PRGNAM.desktop
 
@@ -85,13 +104,11 @@ done
 mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps/
 cp -a $PTMP/unetbootin_icons.svg $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg
 
-find $PKG/usr/share/icons -type f -exec chmod 0644 {} \;
-
 mkdir -p $PKG/usr/share/pixmaps/
 cp -a $PTMP/unetbootin_icons.svg $PKG/usr/share/pixmaps/$PRGNAM.svg
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.TXT INSTALL  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.TXT $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.issues > $PKG/usr/doc/$PRGNAM-$VERSION/README.issues
 
@@ -100,4 +117,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unetbootin/unetbootin.info b/system/unetbootin/unetbootin.info
index 43633d144b..e44f0ea903 100644
--- a/system/unetbootin/unetbootin.info
+++ b/system/unetbootin/unetbootin.info
@@ -1,8 +1,8 @@
 PRGNAM="unetbootin"
-VERSION="677"
+VERSION="702"
 HOMEPAGE="https://unetbootin.github.io"
-DOWNLOAD="https://github.com/unetbootin/unetbootin/releases/download/677/unetbootin-source-677.tar.gz"
-MD5SUM="1478ccd53e0ea003fd33135cf458b9e3"
+DOWNLOAD="https://github.com/unetbootin/unetbootin/releases/download/702/unetbootin-source-702.tar.gz"
+MD5SUM="ee5c64a47817c4d897ccde91a6445b5d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="p7zip"
diff --git a/system/unhide/README b/system/unhide/README
index 96344d2a2b..4bf99df2bb 100644
--- a/system/unhide/README
+++ b/system/unhide/README
@@ -1,6 +1,6 @@
-Unhide is a forensic tool to find processes and TCP/UCP ports hidden by 
-rootkits, Linux kernel modules or by other techniques. It includes unhide
-and unhide-tcp.
+Unhide is a forensic tool to find processes and TCP/UCP ports hidden
+by rootkits, Linux kernel modules or by other techniques. It includes
+unhide and unhide-tcp.
 
 Remember to run unhide as root only. Failing to do so could result in
 a massive arrival of false positives.
diff --git a/system/unhide/doinst.sh b/system/unhide/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/system/unhide/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/system/unhide/fix-man.diff b/system/unhide/fix-man.diff
new file mode 100644
index 0000000000..74e2793137
--- /dev/null
+++ b/system/unhide/fix-man.diff
@@ -0,0 +1,90 @@
+Description: fix formatting error and typos in the manpages
+Author: Julien Valroff <julien@debian.org>
+        Giovani Augusto Ferreira <giovani@riseup.net>
+        Samuel Henrique <samueloph@debian.org>
+        Fukui Daichi <a.dog.will.talk@akane.waseda.jp>
+Last-Updated: 2022-8-31
+diff --git a/man/fr/unhide.8 b/man/fr/unhide.8
+index 5c06ffa..483c4a2 100644
+--- a/man/fr/unhide.8
++++ b/man/fr/unhide.8
+@@ -222,7 +222,7 @@ Test standard :
+ unhide sys proc
+ .TP
+ Test le plus complet :
+-unhide -m -d sys procall brute reverse
++unhide \-m \-d sys procall brute reverse
+ .SH "BUGS"
+ .PP
+ Rapportez les bugs de \fBunhide\fR sur le bug tracker de GitHub (https://github.com/YJesus/Unhide/issues)
+diff --git a/man/unhide-tcp.8 b/man/unhide-tcp.8
+index 46ae799..05be2e5 100644
+--- a/man/unhide-tcp.8
++++ b/man/unhide-tcp.8
+@@ -18,35 +18,35 @@ given on the command line.
+ .PP
+ .SH "OPTIONS"
+ .TP
+-\fB\-h --help\fR
++\fB\-h -\-help\fR
+ Display help
+ .TP
+-\fB\--brief\fR
++\fB\-\-brief\fR
+ Don't display warning messages, that's the default behavior.
+ .TP
+-\fB\-f --fuser\fR
++\fB\-f -\-fuser\fR
+ Display fuser output (if available) for the hidden port
+ On FreeBSD, instead of fuser command, displays the output of the sockstat command for the hidden port.
+ .TP
+-\fB\-l --lsof\fR
++\fB\-l -\-lsof\fR
+ Display lsof output (if available) for the hidden port
+ .TP
+-\fB\-n --netstat\fR
++\fB\-n -\-netstat\fR
+ Use /bin/netstat instead of /sbin/ss. On system with many opened ports, this can
+ slow down the test dramatically.
+ .TP
+-\fB\-s --server\fR
++\fB\-s -\-server\fR
+ Use a very quick strategy of scanning. On system with a lot of opened ports,
+ it is hundreds times faster than ss method and ten thousands times faster than
+ netstat method.
+ .TP
+-\fB\-o --log\fR
++\fB\-o -\-log\fR
+ Write a log file (unhide-tcp-AAAA-MM-DD.log) in the current directory.
+ .TP
+-\fB\-V --version\fR
++\fB\-V -\-version\fR
+ Show version and exit
+ .TP
+-\fB\-v --verbose\fR
++\fB\-v -\-verbose\fR
+ Be verbose, display warning message (default : don't display).
+ This option may be repeated more than once.
+ .PP
+diff --git a/man/unhide.8 b/man/unhide.8
+index c4d8c1f..e263de5 100644
+--- a/man/unhide.8
++++ b/man/unhide.8
+@@ -29,7 +29,7 @@ Display help
+ Do more checks. As of 2012\-03\-17 version, this option has only
+ effect for the procfs, procall, checkopendir and checkchdir tests.
+ .br
+-Implies -v
++Implies \-v
+ .TP
+ \fB\-r\fR
+ Use alternate version of sysinfo check in standard tests
+@@ -224,7 +224,7 @@ Standard test:
+ unhide sys proc
+ .TP
+ Deeper test:
+-unhide -m -d sys procall brute reverse
++unhide \-m \-d sys procall brute reverse
+ .SH "BUGS"
+ .PP
+ Report \fBunhide\fR bugs on the bug tracker on GitHub (https://github.com/YJesus/Unhide/issues)
diff --git a/system/unhide/fixgui.diff b/system/unhide/fixgui.diff
new file mode 100644
index 0000000000..090eda948e
--- /dev/null
+++ b/system/unhide/fixgui.diff
@@ -0,0 +1,44 @@
+diff -Naur Unhide-20220611/unhideGui.py Unhide-20220611.patched/unhideGui.py
+--- Unhide-20220611/unhideGui.py	2022-06-11 05:30:24.000000000 -0400
++++ Unhide-20220611.patched/unhideGui.py	2023-08-03 17:03:50.945488351 -0400
+@@ -1,4 +1,4 @@
+-#!/bin/python3
++#!/usr/bin/env python3
+ 
+ """
+ Copyright © 2020-2022 Patrick Gouin
+@@ -19,13 +19,15 @@
+ """
+ __author__ = "Patrick Gouin"
+ __copyright__ = "Copyright 2020-2022, Patrick Gouin"
+-__credits__ = [daichifukui]
++__credits__ = "daichifukui"
+ __license__ = "GPL V3"
+ __version__ = "1.1"
+ __maintainer__ = "Patrick Gouin"
+ __email__ = "patrickg.github@free.fr"
+ __status__ = "Production"
+ 
++import sys
++sys.path.append("/usr/share/unhide")
+ 
+ from tkinter import *
+ from tkinter.ttk import *
+@@ -187,7 +189,7 @@
+     
+ 
+ def GenCmd() :
+-    Cmd = './unhide-linux '
++    Cmd = '/usr/sbin/unhide-linux '
+     idx = 0
+     for opt in OptionBut :
+         if opt[VARB].get() == '1' :
+@@ -209,7 +211,7 @@
+     CmdText.config(width = len(Cmd))
+         
+ def GenTcpCmd() :
+-    Cmd = './unhide-tcp '
++    Cmd = '/usr/sbin/unhide-tcp '
+     idx = 0
+     for opt in TcpOptionBut :
+         if opt[VARB].get() == '1' :
diff --git a/system/unhide/unhide.SlackBuild b/system/unhide/unhide.SlackBuild
index e32a39575b..25e1372c6f 100644
--- a/system/unhide/unhide.SlackBuild
+++ b/system/unhide/unhide.SlackBuild
@@ -1,53 +1,55 @@
-#!/bin/sh
+#!/bin/bash
 
-# SlackBuild script for Unhide.
+# SlackBuild script for unhide.
 
-# This script is of public domain. It can be distributed, modified and used as desired.
-# Based on the PorteusBuild written by the same author at www.porteus.org/forum
+# Original author: Rubén Llorente <email removed>
+# Updated and maintained by B. Watson <urchlay@slackware.uk>
 
-# Rubén Llorente <porting@use.startmail.com>
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20230804 bkw:
+# - take over maintenance.
+# - relicense as WTFPL with permission from Rubén (via mailing list).
+# - update for v20220611.
+# - add GUI (unhideGui.py), .desktop file, doinst.sh.
+# - minor fixes for man pages.
+# - symlink man pages, unhide => unhide-linux, to match the binary.
+# - add NEWS to doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=unhide
-VERSION=${VERSION:-20121229}
+SRCNAM=Unhide
+VERSION=${VERSION:-20220611}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -55,40 +57,63 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# gcc --static unhide.c -o unhide  #### This is an obsolete version.
-gcc $SLKCFLAGS -Wall --static -pthread unhide-linux*.c unhide-output.c -o unhide-linux
-gcc $SLKCFLAGS -Wall --static unhide_rb.c -o unhide_rb
-gcc $SLKCFLAGS -Wall --static unhide-tcp.c unhide-tcp-fast.c unhide-output.c -o unhide-tcp
-ln -s unhide-linux unhide
-
-# We put the binaries and documents in their right places
-mkdir -p $PKG/usr/sbin
-install -m 0700 unhide-tcp unhide-linux unhide unhide_rb $PKG/usr/sbin
-
-# Copy man pages
-mkdir -p $PKG/usr/man/{,es/,fr/}man8
-cp man/unhide{,-tcp}.8 $PKG/usr/man/man8
-cp man/es/unhide.8 $PKG/usr/man/es/man8
-cp man/fr/unhide.8 $PKG/usr/man/fr/man8
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp COPYING LEEME.txt LISEZ-MOI.TXT README.txt TODO changelog $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# Fix the GUI. Patch by SlackBuild maintainer.
+patch -p1 < $CWD/fixgui.diff
+
+# Fix typos and formatting errors in man pages, from Debian:
+# https://packages.debian.org/sid/unhide
+patch -p1 < $CWD/fix-man.diff
+
+# No Makefile or anything, commands come from README.txt:
+GCC="gcc $SLKCFLAGS -Wall --static"
+$GCC -pthread unhide-linux*.c unhide-output.c -o unhide-linux
+$GCC unhide_rb.c -o unhide_rb
+$GCC unhide-tcp.c unhide-tcp-fast.c unhide-output.c -o unhide-tcp
+
+SBIN=$PKG/usr/sbin
+mkdir -p $SBIN
+install -s -m 0755 unhide-tcp unhide-linux unhide_rb $SBIN
+ln -s unhide-linux $SBIN/unhide
+
+for i in "" es fr; do
+  dir=$PKG/usr/man/$i/man8
+  mkdir -p $dir
+  for j in unhide unhide-tcp; do
+    gzip -9 < man/$i/$j.8 > $dir/$j.8.gz
+  done
+  ln -s unhide.8.gz $dir/unhide-linux.8.gz
+done
+
+# 20230803 bkw: the GUI isn't well-documented, but seems to work, at
+# least after a bit of patching.
+mkdir -p $PKG/usr/bin
+install -m0755 unhideGui.py $PKG/usr/bin
+PYDIR=$PKG/usr/share/$PRGNAM
+mkdir -p $PYDIR
+cp -a ToolTip.py $PYDIR
+
+# 20230804 bkw: wrote a .desktop file for the GUI. Couldn't think of
+# an idea for an icon, so I just used the magnifying glass icon
+# from WindowMaker.
+mkdir -p $PKG/usr/share/applications
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp COPYING LEEME.txt LISEZ-MOI.TXT README.txt NEWS TODO changelog $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+cat $CWD/README > $PKGDOC/README
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unhide/unhide.desktop b/system/unhide/unhide.desktop
new file mode 100644
index 0000000000..6a0bca33ee
--- /dev/null
+++ b/system/unhide/unhide.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=UnhideGUI
+Comment=Front-end for unhide
+Exec=unhideGui.py
+Terminal=false
+Type=Application
+Icon=/usr/share/WindowMaker/Icons/Magnify.xpm
+Categories=System;Security;
diff --git a/system/unhide/unhide.info b/system/unhide/unhide.info
index be8720c5d2..c9c1968c64 100644
--- a/system/unhide/unhide.info
+++ b/system/unhide/unhide.info
@@ -1,10 +1,10 @@
 PRGNAM="unhide"
-VERSION="20121229"
+VERSION="20220611"
 HOMEPAGE="http://www.unhide-forensics.info"
-DOWNLOAD="http://downloads.sourceforge.net/unhide/unhide-20121229.tgz"
-MD5SUM="1ad76312ed0ff7a26b8c501af9bffc67"
+DOWNLOAD="https://github.com/YJesus/Unhide/archive/v20220611/Unhide-20220611.tar.gz"
+MD5SUM="cb0fc465ef26e907ba2166551dc27369"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Rubén Llorente"
-EMAIL="porting@use.startmail.com"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/unicode-character-database/unicode-character-database.SlackBuild b/system/unicode-character-database/unicode-character-database.SlackBuild
index 166ad24775..cc714c4cc8 100644
--- a/system/unicode-character-database/unicode-character-database.SlackBuild
+++ b/system/unicode-character-database/unicode-character-database.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for unicode-character-database
 
-# Copyright 2016-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2016-2023 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,12 +22,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=unicode-character-database
 SRCNAM1=UCD
 SRCNAM2=Unihan
-VERSION=${VERSION:-13.0.0}
+VERSION=${VERSION:-15.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,25 +40,15 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -83,4 +76,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unicode-character-database/unicode-character-database.info b/system/unicode-character-database/unicode-character-database.info
index 841babe8e8..f6260ea2c5 100644
--- a/system/unicode-character-database/unicode-character-database.info
+++ b/system/unicode-character-database/unicode-character-database.info
@@ -1,10 +1,10 @@
 PRGNAM="unicode-character-database"
-VERSION="13.0.0"
+VERSION="15.1.0"
 HOMEPAGE="https://www.unicode.org/ucd/"
-DOWNLOAD="https://www.unicode.org/Public/zipped/13.0.0/UCD.zip \
-          https://www.unicode.org/Public/zipped/13.0.0/Unihan.zip"
-MD5SUM="23f7bf8cc99adef525718b2bee0867ba \
-        1e7f8b6bf1cf69d3602fe91f97aaee01"
+DOWNLOAD="https://www.unicode.org/Public/zipped/15.1.0/UCD.zip \
+          https://www.unicode.org/Public/zipped/15.1.0/Unihan.zip"
+MD5SUM="a269471d114035004d071df966018d93 \
+        08321a1a9909ce7f4400218fdcd819df"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/unigine-heaven-benchmark/unigine-heaven-benchmark.SlackBuild b/system/unigine-heaven-benchmark/unigine-heaven-benchmark.SlackBuild
index 315b37cdaf..1d343a7bca 100644
--- a/system/unigine-heaven-benchmark/unigine-heaven-benchmark.SlackBuild
+++ b/system/unigine-heaven-benchmark/unigine-heaven-benchmark.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for unigine-heaven-benchmark
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=unigine-heaven-benchmark
 VERSION=${VERSION:-4.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=Unigine_Heaven
 
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -73,10 +83,10 @@ find -L . \
 
 # copy excutable
 mkdir -p $PKG/usr/bin
-cp $PKG/opt/$PRGNAM/heaven $PKG/usr/bin
+cp $PKG/opt/$PRGNAM/heaven $PKG/usr/bin/unigine-heaven-benchmark
 
 # fix excutable
-sed -i 's,./bin,/opt/unigine-heaven-benchmark/bin,g' $PKG/usr/bin/heaven
+sed -i 's,cd ./bin,cd /opt/unigine-heaven-benchmark/bin,g' $PKG/usr/bin/unigine-heaven-benchmark
 
 #add application launcher
 mkdir -p $PKG/usr/share/applications
@@ -91,4 +101,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unigine-heaven-benchmark/unigine-heaven-benchmark.desktop b/system/unigine-heaven-benchmark/unigine-heaven-benchmark.desktop
index c28649c996..8c7927858e 100644
--- a/system/unigine-heaven-benchmark/unigine-heaven-benchmark.desktop
+++ b/system/unigine-heaven-benchmark/unigine-heaven-benchmark.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=unigine-heaven-benchmark
 GenericName=System benchmarking software
-Exec=heaven
+Exec=unigine-heaven-benchmark
 Terminal=false
 Type=Application
 Categories=Game;
diff --git a/system/unigine-valley-benchmark/unigine-valley-benchmark.SlackBuild b/system/unigine-valley-benchmark/unigine-valley-benchmark.SlackBuild
index 3f55ff015b..4e99c2cbb6 100644
--- a/system/unigine-valley-benchmark/unigine-valley-benchmark.SlackBuild
+++ b/system/unigine-valley-benchmark/unigine-valley-benchmark.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for unigine-valley-benchmark
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=unigine-valley-benchmark
 VERSION=${VERSION:-1.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=Unigine_Valley
 
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -73,10 +83,10 @@ find -L . \
 
 # copy excutable
 mkdir -p $PKG/usr/bin
-cp $PKG/opt/$PRGNAM/valley $PKG/usr/bin
+cp $PKG/opt/$PRGNAM/valley $PKG/usr/bin/unigine-valley-benchmark
 
 # fix excutable
-sed -i 's,./bin,/opt/unigine-valley-benchmark/bin,g' $PKG/usr/bin/valley
+sed -i 's,cd ./bin,cd /opt/unigine-valley-benchmark/bin,g' $PKG/usr/bin/unigine-valley-benchmark
 
 #add application launcher
 mkdir -p $PKG/usr/share/applications
@@ -91,4 +101,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unigine-valley-benchmark/unigine-valley-benchmark.desktop b/system/unigine-valley-benchmark/unigine-valley-benchmark.desktop
index f67847e9d3..9a50aadb38 100644
--- a/system/unigine-valley-benchmark/unigine-valley-benchmark.desktop
+++ b/system/unigine-valley-benchmark/unigine-valley-benchmark.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=unigine-valley-benchmark
 GenericName=System benchmarking software
-Exec=valley
+Exec=unigine-valley-benchmark
 Terminal=false
 Type=Application
 Categories=Game;
diff --git a/system/unionfs-fuse/unionfs-fuse.SlackBuild b/system/unionfs-fuse/unionfs-fuse.SlackBuild
index 8b5241e008..673fa6435a 100644
--- a/system/unionfs-fuse/unionfs-fuse.SlackBuild
+++ b/system/unionfs-fuse/unionfs-fuse.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for unionfs-fuse.
 #
 # Yth | Pont-en-Royans, France | yth@ythogtha.org
@@ -20,10 +20,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=unionfs-fuse
-VERSION=${VERSION:-2.1}
+VERSION=${VERSION:-3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -33,22 +36,29 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -D_FILE_OFFSET_BITS=64"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -D_FILE_OFFSET_BITS=64"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -D_FILE_OFFSET_BITS=64"
   LIBDIRSUFFIX=""
 fi
 
@@ -72,7 +82,9 @@ find -L . \
 sed -i -e 's|share/man|man|' Makefile
 sed -i -e 's|usr/local|usr|' Makefile
 
-make PREFIX=/usr CFLAGS_EXTRA="$SLKCFLAGS"
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make PREFIX=/usr
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -89,4 +101,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unionfs-fuse/unionfs-fuse.info b/system/unionfs-fuse/unionfs-fuse.info
index e8c9d31d6a..a6aa796932 100644
--- a/system/unionfs-fuse/unionfs-fuse.info
+++ b/system/unionfs-fuse/unionfs-fuse.info
@@ -1,8 +1,8 @@
 PRGNAM="unionfs-fuse"
-VERSION="2.1"
+VERSION="3.4"
 HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse"
-DOWNLOAD="https://github.com/rpodgorny/unionfs-fuse/archive/v2.1/unionfs-fuse-2.1.tar.gz"
-MD5SUM="07f877d5b440b526fcf4532905183085"
+DOWNLOAD="https://github.com/rpodgorny/unionfs-fuse/archive/v3.4/unionfs-fuse-3.4.tar.gz"
+MD5SUM="4b7ec6950ea36c275a45edb1cdd49d6d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/unison/README b/system/unison/README
index 2e50f0190d..965b6e2aa6 100644
--- a/system/unison/README
+++ b/system/unison/README
@@ -1,20 +1,24 @@
-Unison is a file-synchronization tool for Unix and Windows. It allows two
-replicas of a collection of files and directories to be stored on different
-hosts (or different disks on the same host), modified separately, and then
-brought up to date by propagating the changes in each replica to the other.
+Unison is a file-synchronization tool for Unix and Windows. It allows
+two replicas of a collection of files and directories to be stored
+on different hosts (or different disks on the same host), modified
+separately, and then brought up to date by propagating the changes in
+each replica to the other.
 
-Unlike simple mirroring or backup utilities, Unison can deal with updates
-to both replicas of a distributed directory structure. Updates that do not
-conflict are propagated automatically. Conflicting updates are detected and
-displayed.
+Unlike simple mirroring or backup utilities, Unison can deal with
+updates to both replicas of a distributed directory structure. Updates
+that do not conflict are propagated automatically. Conflicting updates
+are detected and displayed.
 
-Unison allows you to either build a text-only binary or a binary that will
-use a graphical user interface.
+Unison allows you to either build a text-only binary or a binary that
+will use a graphical user interface.
 
-By default this slackbuild will, similar to Slackware's own emacs package,
-build both a text-only and a gui binary. To do this (which is the default):
+By default this slackbuild will, similar to Slackware's own emacs
+package, build both a text-only and a gui binary. To do this (which is
+the default):
 
-  "FLAVOUR='gtk2 text' ./unison.SlackBuild" or just "./unison.SlackBuild"
+  "FLAVOUR='gtk2 text' ./unison.SlackBuild"
+
+...or just "./unison.SlackBuild"
 
 To only build a text only binary, do this:
 
@@ -24,5 +28,5 @@ To only build a gui only binary, do this:
 
   "FLAVOUR=gtk2 ./unison.SlackBuild"
 
-hevea is an optional dependency which allows building the HTML documentation.
-Otherwise only a version as PDF will be built.
+hevea is an optional dependency which allows building the HTML
+documentation. Otherwise only PDF docs will be built.
diff --git a/system/unison/old_ocaml.diff.gz b/system/unison/old_ocaml.diff.gz
deleted file mode 100644
index 9fd8b1b527..0000000000
--- a/system/unison/old_ocaml.diff.gz
+++ /dev/null
diff --git a/system/unison/unison.SlackBuild b/system/unison/unison.SlackBuild
index 3e82e4a68b..befb56c207 100644
--- a/system/unison/unison.SlackBuild
+++ b/system/unison/unison.SlackBuild
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for unison
 
 # Copyright 2007-2011 Ferenc Deak <ferenc.deak@gmail.com>
-# Copyright 2018,2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2018,2021 Andrew Clemons, Wellington New Zealand
+# Copyright 2023 Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +24,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=unison
-VERSION=${VERSION:-2.51.3}
+VERSION=${VERSION:-2.51.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -64,10 +72,6 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
-if [ "$(ocamlc --version | cut -d. -f1)" = "4" ] && [ "$(ocamlc --version | cut -d. -f2)" = "03" ] ; then
-  zcat $CWD/old_ocaml.diff.gz | patch -p1
-fi
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -130,7 +134,8 @@ install -m 0644 icons/U.32x32x16m.png $PKG/usr/share/pixmaps/$PRGNAM.png
 yes '' | make -C doc real
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a src/{BUGS.txt,CONTRIB,COPYING,INSTALL*,NEWS,README,ROADMAP.txt,TODO.txt} $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a src/{CONTRIB,COPYING,NEWS,README,ROADMAP.txt,TODO.txt} $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md  $PKG/usr/doc/$PRGNAM-$VERSION
 install -m 0644 doc/unison-manual.pdf $PKG/usr/doc/$PRGNAM-$VERSION
 
 # html manual only built if hevea installed
@@ -145,4 +150,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unison/unison.info b/system/unison/unison.info
index 3db7c7da02..e6e0aa79e2 100644
--- a/system/unison/unison.info
+++ b/system/unison/unison.info
@@ -1,8 +1,8 @@
 PRGNAM="unison"
-VERSION="2.51.3"
+VERSION="2.51.5"
 HOMEPAGE="https://www.cis.upenn.edu/~bcpierce/unison/"
-DOWNLOAD="https://github.com/bcpierce00/unison/archive/v2.51.3/unison-2.51.3.tar.gz"
-MD5SUM="015533d6f89b47d8862c0e56350d1b0a"
+DOWNLOAD="https://github.com/bcpierce00/unison/archive/v2.51.5/unison-2.51.5.tar.gz"
+MD5SUM="d2f69f6e99adc147661f47aad7e6bdb2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lablgtk"
diff --git a/system/univga-font/README b/system/univga-font/README
index 10e0670927..a5e814d8e5 100644
--- a/system/univga-font/README
+++ b/system/univga-font/README
@@ -28,3 +28,6 @@ some reason need it, you can also install the PCF (portable compiled
 X font) version, with PCF=yes in the environment. You can also set
 BDF=no, PSF=no, and/or OTB=no, if you want to omit one or more of
 these font types. Setting all 4 variables to "no" is an error, though.
+
+This package also includes bdf2psf.pl, which converts X bitmap fonts
+to console fonts.
diff --git a/system/univga-font/douninst.sh b/system/univga-font/douninst.sh
new file mode 100644
index 0000000000..6d7d53ac0a
--- /dev/null
+++ b/system/univga-font/douninst.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Update fonts.{dir,scale,alias}
+if [ -x /usr/bin/mkfontdir -a -x /usr/bin/mkfontscale ]; then
+  ( cd usr/share/fonts/misc
+    /usr/bin/mkfontscale .
+    /usr/bin/mkfontdir .
+    if [ -e fonts.alias ]; then
+      grep -v '^univga\>' fonts.alias > fonts.alias.new
+      mv fonts.alias.new fonts.alias
+    fi
+  )
+fi
+
+# If X is running...
+if [ "$DISPLAY" != "" ] && [ -x /usr/bin/xset ]; then
+  /usr/bin/xset fp rehash >/dev/null 2>&1
+fi
+
+# Update the X font indexes:
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/system/univga-font/slack-desc b/system/univga-font/slack-desc
index 6ec95c65cf..67c4cf124f 100644
--- a/system/univga-font/slack-desc
+++ b/system/univga-font/slack-desc
@@ -10,8 +10,8 @@ univga-font: univga-font (unicode terminal font)
 univga-font:
 univga-font: UNI-VGA is a Unicode VGA font for X11 and console. It is primarily
 univga-font: intended to be the single source of fonts for console and for MS-DOS
-univga-font:
 univga-font: emulators.
+univga-font:
 univga-font: Font types included in this package:
 univga-font:
 univga-font: PSF=@PSF@, BDF=@BDF@, OTB=@OTB@, PCF=@PCF@
diff --git a/system/univga-font/univga-font.SlackBuild b/system/univga-font/univga-font.SlackBuild
index 907dd8d16b..dffa83b51b 100644
--- a/system/univga-font/univga-font.SlackBuild
+++ b/system/univga-font/univga-font.SlackBuild
@@ -1,13 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for univga-font
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 # VERSION taken from the datestamp of the tarball.
 
+# 20230306 bkw: BUILD=4
+# - add douninst.sh.
+# - fix slack-desc formatting.
+# - mention bdf2psf.pl in README.
+
 # 20201206 bkw: BUILD=3, added OTB font since -current's pango wants it.
 #               Also add PCF (disabled by default). Based on a patch from
 #               Tomasz Bywalec. Update README. Have slack-desc list the
@@ -15,14 +20,21 @@
 
 # 20191224 bkw: BUILD=2, xset fp rehash in doinst.sh.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=univga-font
 VERSION=${VERSION:-20021031}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -104,6 +116,9 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a *.lsm $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# 20230306 bkw: douninst.sh makes package removal cleaner. it rebuilds
+# fonts.{dir|scale} after our fonts get removed, removes the "univga"
+# alias, and rebuilds the font cache.
 mkdir -p $PKG/install
 sed -e "s,@PCF@,$PCF," \
     -e "s,@BDF@,$BDF," \
@@ -111,6 +126,7 @@ sed -e "s,@PCF@,$PCF," \
     -e "s,@OTB@,$OTB," \
  $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/douninst.sh > $PKG/install/douninst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/univga-font/univga-font.info b/system/univga-font/univga-font.info
index b5dc60a78d..a9bfbcc3b6 100644
--- a/system/univga-font/univga-font.info
+++ b/system/univga-font/univga-font.info
@@ -1,10 +1,10 @@
 PRGNAM="univga-font"
 VERSION="20021031"
-HOMEPAGE="http://www.inp.nsk.su/~bolkhov/files/fonts/univga/index.html"
-DOWNLOAD="http://www.inp.nsk.su/~bolkhov/files/fonts/univga/uni-vga.tgz"
+HOMEPAGE="https://www.inp.nsk.su/~bolkhov/files/fonts/univga/index.html"
+DOWNLOAD="https://www.inp.nsk.su/~bolkhov/files/fonts/univga/uni-vga.tgz"
 MD5SUM="60fbba53cb0efec1363fcc5fb8c244d9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/unp/README b/system/unp/README
index 0d7e506c32..4fffb6287c 100644
--- a/system/unp/README
+++ b/system/unp/README
@@ -1,3 +1,4 @@
-unp is a small perl script which makes extraction of any archive files a
-bit easier. It support several compressors and archiver programs, chooses
-the right one(s) automatically and extracts one or more files in one go.
+unp is a small perl script which makes extraction of any archive files
+a bit easier. It support several compressors and archiver programs,
+chooses the right one(s) automatically and extracts one or more files
+in one go.
diff --git a/system/unp/unp.SlackBuild b/system/unp/unp.SlackBuild
index 64407f12e6..9f2f0e3e1d 100644
--- a/system/unp/unp.SlackBuild
+++ b/system/unp/unp.SlackBuild
@@ -1,17 +1,27 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for unp
 
 # Petr Kletecka petr@kle.cz <2015>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=unp
 VERSION=${VERSION:-2.0~pre7+nmu1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -46,4 +56,4 @@ make
 DESTDIR=$PKG make install
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unrar-free/README b/system/unrar-free/README
new file mode 100644
index 0000000000..ed336edafd
--- /dev/null
+++ b/system/unrar-free/README
@@ -0,0 +1,6 @@
+unrar-free
+
+This is the unrar project exported from the Gna! CVS archive and 
+ported to libarchive.
+The project is named unrar-free to distinguish it from the original,
+proprietary unrar.
diff --git a/system/unrar-free/slack-desc b/system/unrar-free/slack-desc
new file mode 100644
index 0000000000..99c9412ea6
--- /dev/null
+++ b/system/unrar-free/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# # The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+          |-----handy-ruler------------------------------------------------------|
+unrar-free: unrar-free (free version of the non-free unrar utility)
+unrar-free:
+unrar-free:
+unrar-free: This program is a simple command-line front-end to libarchive,
+unrar-free: and can list and extract RAR archives but also other formats
+unrar-free: supported by libarchive.
+unrar-free: It does not rival the non-free unrar in terms of features, but
+unrar-free: special care has been taken to ensure it meets most user's needs.
+unrar-free:
+unrar-free: homepage: https://gitlab.com/bgermann/unrar-free 
+unrar-free:
diff --git a/system/unrar-free/unrar-free.SlackBuild b/system/unrar-free/unrar-free.SlackBuild
new file mode 100644
index 0000000000..c9d13a394b
--- /dev/null
+++ b/system/unrar-free/unrar-free.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/bash
+
+# Slackware build script for unrar-free
+
+# Copyright 2023 marav FR
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=unrar-free
+VERSION=${VERSION:-0.1.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+autoreconf -i
+
+CFLAGS="$SLKCFLAGS -Wno-format-security" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+ln -sf $PRGNAM $PKG/usr/bin/unrar
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+    AUTHORS COPYING ChangeLog README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unrar-free/unrar-free.info b/system/unrar-free/unrar-free.info
new file mode 100644
index 0000000000..16e7eeda43
--- /dev/null
+++ b/system/unrar-free/unrar-free.info
@@ -0,0 +1,10 @@
+PRGNAM="unrar-free"
+VERSION="0.1.3"
+HOMEPAGE="https://gitlab.com/bgermann/unrar-free"
+DOWNLOAD="https://gitlab.com/bgermann/unrar-free/-/archive/0.1.3/unrar-free-0.1.3.tar.gz"
+MD5SUM="0113aff5200b4f7bf7b50d4f65b89db7"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="marav"
+EMAIL="marav8@free.fr"
diff --git a/system/unrar/unrar-5.5.5-soname.patch b/system/unrar/unrar-5.5.5-soname.patch
deleted file mode 100644
index f0b5dbbd9f..0000000000
--- a/system/unrar/unrar-5.5.5-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- unrar/makefile.orig	2017-06-13 13:04:49.000000000 +0200
-+++ unrar/makefile	2017-06-23 20:29:54.138415405 +0200
-@@ -156,7 +156,7 @@
- lib:	clean $(OBJECTS) $(LIB_OBJ)
- 	@rm -f libunrar.so
- 	@rm -f libunrar.a
--	$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
-+	$(LINK) -shared -Wl,-soname,libunrar.so.$(libversion) -o libunrar.so.$(libversion) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
- 	$(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ)
- 
- install-unrar:
diff --git a/system/unrar/unrar-6.1.7-soname.patch b/system/unrar/unrar-6.1.7-soname.patch
new file mode 100644
index 0000000000..9640e1cfd8
--- /dev/null
+++ b/system/unrar/unrar-6.1.7-soname.patch
@@ -0,0 +1,12 @@
+diff -Naur unrar.orig/makefile unrar/makefile
+--- unrar.orig/makefile	2022-02-22 11:43:06.000000000 +0100
++++ unrar/makefile	2022-06-29 15:30:41.787420000 +0200
+@@ -157,7 +157,7 @@
+ lib:	CXXFLAGS+=$(LIBFLAGS)
+ lib:	clean $(OBJECTS) $(LIB_OBJ)
+ 	@rm -f libunrar.*
+-	$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
++	$(LINK) -shared -Wl,-soname,libunrar.so.$(libversion) -o libunrar.so.$(libversion) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
+ 	$(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ)
+ 
+ install-unrar:
diff --git a/system/unrar/unrar.SlackBuild b/system/unrar/unrar.SlackBuild
index 4ee945818a..6da28d4868 100644
--- a/system/unrar/unrar.SlackBuild
+++ b/system/unrar/unrar.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for unrar
 
-# Copyright 2011, 2013, 2015, 2016, 2017, 2018  Mario Preksavec, Zagreb, Croatia
+# Copyright 2011, 2024  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230801 bkw: Modified by SlackBuilds.org: add -j1 to make commands,
+# since parallel builds fail.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=unrar
-VERSION=${VERSION:-5.6.1}
+VERSION=${VERSION:-6.2.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,18 +75,18 @@ cd $PRGNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
-patch -p1 < $CWD/unrar-5.5.5-soname.patch
+patch -p1 < $CWD/unrar-6.1.7-soname.patch
 cp -a $TMP/$PRGNAM/ $TMP/libunrar
 
-make -C $TMP/libunrar lib libversion=$VERSION CXXFLAGS="$SLKCFLAGS"
-make CXXFLAGS="$SLKCFLAGS" -f makefile unrar lib
+make -j1 -C $TMP/libunrar lib libversion=$VERSION CXXFLAGS="$SLKCFLAGS"
+make -j1 CXXFLAGS="$SLKCFLAGS" -f makefile unrar lib
 
-install -D -m 755 unrar $PKG/usr/bin/unrar
-install -D -m 755 $TMP/libunrar/libunrar.so.$VERSION $PKG/usr/lib${LIBDIRSUFFIX}/libunrar.so.$VERSION
+install -s -D -m 755 unrar $PKG/usr/bin/unrar
+install -s -D -m 755 $TMP/libunrar/libunrar.so.$VERSION $PKG/usr/lib${LIBDIRSUFFIX}/libunrar.so.$VERSION
 install -D -m 644 dll.hpp "$PKG/usr/include/unrar/dll.hpp"
 
 (
@@ -85,9 +95,6 @@ install -D -m 644 dll.hpp "$PKG/usr/include/unrar/dll.hpp"
   ln -s libunrar.so.$VERSION $PKG/usr/lib${LIBDIRSUFFIX}/libunrar.so.5
 )
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 mkdir -p $PKG/usr/man/man1
 gzip -9c $CWD/unrar.1 > $PKG/usr/man/man1/unrar.1.gz
 
@@ -103,4 +110,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unrar/unrar.info b/system/unrar/unrar.info
index 0c32d0c325..debb4d68f8 100644
--- a/system/unrar/unrar.info
+++ b/system/unrar/unrar.info
@@ -1,8 +1,8 @@
 PRGNAM="unrar"
-VERSION="5.6.1"
+VERSION="6.2.12"
 HOMEPAGE="https://www.rarlab.com"
-DOWNLOAD="https://www.rarlab.com/rar/unrarsrc-5.6.1.tar.gz"
-MD5SUM="e33bb37fead8538103bf292c59f3b130"
+DOWNLOAD="https://www.rarlab.com/rar/unrarsrc-6.2.12.tar.gz"
+MD5SUM="1f526429e8e50a9b3b94f325b2848c24"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/unrtf/unrtf.SlackBuild b/system/unrtf/unrtf.SlackBuild
index d31ef3d7d1..ba784a1c67 100644
--- a/system/unrtf/unrtf.SlackBuild
+++ b/system/unrtf/unrtf.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for unrtf
 
@@ -23,26 +23,36 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=unrtf
-VERSION=${VERSION:-0.21.9}
+VERSION=${VERSION:-0.21.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -104,4 +114,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unrtf/unrtf.info b/system/unrtf/unrtf.info
index eafeac2516..9f6a7e1395 100644
--- a/system/unrtf/unrtf.info
+++ b/system/unrtf/unrtf.info
@@ -1,8 +1,8 @@
 PRGNAM="unrtf"
-VERSION="0.21.9"
-HOMEPAGE="http://www.gnu.org/software/unrtf/unrtf.html"
-DOWNLOAD="http://www.gnu.org/software/unrtf/unrtf-0.21.9.tar.gz"
-MD5SUM="e2724018429d7710f2c72771705f6b37"
+VERSION="0.21.10"
+HOMEPAGE="https://www.gnu.org/software/unrtf/unrtf.html"
+DOWNLOAD="https://ftp.gnu.org/gnu/unrtf/unrtf-0.21.10.tar.gz"
+MD5SUM="cbd1ae563240e383d0773bb049887d3f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/unshield/README b/system/unshield/README
index d184f5fa92..72d9cbadb4 100644
--- a/system/unshield/README
+++ b/system/unshield/README
@@ -1 +1,12 @@
 unshield (extractor for Microsoft InstallShield cabinet files)
+
+Unshield extracts CAB files from InstallShield installers, used to
+install software on Microsoft Windows based machines. The goals of
+this implementation are:
+
+- Use a well known open source license (MIT)
+- Work on both little-endian and big-endian systems
+- Separate the implementation into a tool and a library
+- Support InstallShield versions 5 and later
+- Be able to list contents of InstallShield Cabinet Files
+- Be able to extract files from InstallShield Cabinet Files
diff --git a/system/unshield/slack-desc b/system/unshield/slack-desc
index fe46b7bdae..0b009c8716 100644
--- a/system/unshield/slack-desc
+++ b/system/unshield/slack-desc
@@ -8,8 +8,8 @@
         |-----handy-ruler------------------------------------------------------|
 unshield: unshield (extractor for Microsoft InstallShield cabinet files)
 unshield:
-unshield:
-unshield:
+unshield: Unshield extracts CAB files from InstallShield installers, used to
+unshield: install software on Microsoft Windows based machines.
 unshield:
 unshield:
 unshield:
diff --git a/system/unshield/unshield.SlackBuild b/system/unshield/unshield.SlackBuild
index d48f385810..3de15ff5bd 100644
--- a/system/unshield/unshield.SlackBuild
+++ b/system/unshield/unshield.SlackBuild
@@ -1,15 +1,22 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for unshield
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20221228 bkw: update for v1.5.1
+# 20210819 bkw: replace 2009 version from sourceforge with 2018 github
+# release. Expand README and slack-desc a bit, too.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=unshield
-VERSION=${VERSION:-0.6}
+VERSION=${VERSION:-1.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +26,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,43 +58,30 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --disable-static \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_DATAROOTDIR=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
 gzip -9 $PKG/usr/man/man?/*.?
 
+# 1.4.3 has a ChangeLog, but it's ancient, don't include.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README LICENSE TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README LICENSE TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unshield/unshield.info b/system/unshield/unshield.info
index f879824f7f..eff1e30fdb 100644
--- a/system/unshield/unshield.info
+++ b/system/unshield/unshield.info
@@ -1,10 +1,10 @@
 PRGNAM="unshield"
-VERSION="0.6"
-HOMEPAGE="https://sourceforge.net/projects/synce"
-DOWNLOAD="https://downloads.sourceforge.net/project/synce/Unshield/0.6/unshield-0.6.tar.gz"
-MD5SUM="31a829192a255160d1f71cda4c865c9c"
+VERSION="1.5.1"
+HOMEPAGE="https://github.com/twogood/unshield"
+DOWNLOAD="https://github.com/twogood/unshield/archive/1.5.1/unshield-1.5.1.tar.gz"
+MD5SUM="de85ed5c1a054ab7bf6551cac96af5b7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/unshieldv3/README b/system/unshieldv3/README
new file mode 100644
index 0000000000..48f15ea193
--- /dev/null
+++ b/system/unshieldv3/README
@@ -0,0 +1,13 @@
+unshieldv3 (extract v3 InstallShield files)
+
+unshieldv3 is a command line tool to extract the *.Z InstallShield v3
+packages many old windows games were distributed as.
+
+The files unshieldv3 supports are identified by the file command as
+"InstallShield Z archive Data", and begin with a hex signature of
+13 5d 65 8c 3a 01 02.
+
+See also:
+- unshield, for other types of InstallShield files.
+- isextract, for another v3 extractor.
+- cabextract, for cabinet (.cab) files.
diff --git a/system/unshieldv3/git2tarxz.sh b/system/unshieldv3/git2tarxz.sh
new file mode 100644
index 0000000000..2e18550cd0
--- /dev/null
+++ b/system/unshieldv3/git2tarxz.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create
+# a tarball of. With no arg, HEAD is used.
+
+PRGNAM=unshieldv3
+CLONE_URL=https://github.com/wfr/unshieldv3.git
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/system/unshieldv3/slack-desc b/system/unshieldv3/slack-desc
new file mode 100644
index 0000000000..e04fce7f23
--- /dev/null
+++ b/system/unshieldv3/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+unshieldv3: unshieldv3 (extract v3 InstallShield files)
+unshieldv3:
+unshieldv3: unshieldv3 is a command line tool to extract the *.Z InstallShield v3
+unshieldv3: packages many old windows games were distributed as.
+unshieldv3:
+unshieldv3: The files unshieldv3 supports are identified by the file command as
+unshieldv3: "InstallShield Z archive Data", and begin with a hex signature of
+unshieldv3: 13 5d 65 8c 3a 01 02.
+unshieldv3:
+unshieldv3:
+unshieldv3:
diff --git a/system/unshieldv3/unshieldv3.1 b/system/unshieldv3/unshieldv3.1
new file mode 100644
index 0000000000..8a9f51c546
--- /dev/null
+++ b/system/unshieldv3/unshieldv3.1
@@ -0,0 +1,115 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "UNSHIELDV3" 1 "2022-12-28" "0.2.1" "SlackBuilds.org"
+.SH NAME
+unshieldv3 \- Extract InstallShield v3 archives
+.\" RST source for unshieldv3(1) man page. Convert with:
+.
+.\" rst2man.py unshieldv3.rst > unshieldv3.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+unshieldv3 \fBinfo\fP \fIfile.z\fP
+.sp
+unshieldv3 \fBlist\fP [\fB\-v\fP] \fIfile.z\fP
+.sp
+unshieldv3 \fBextract\fP \fIfile.z\fP \fIoutput\-dir\fP
+.SH DESCRIPTION
+.sp
+\fBunshieldv3\fP is a command line tool to extract the .Z InstallShield v3
+packages many old windows games were distributed as.
+.sp
+The files \fBunshieldv3\fP supports normally have a \fB\&.Z\fP extension, and can be
+identified by the \fBfile\fP(1) command:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+$ file data.Z
+data.z: InstallShield Z archive Data
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+\&...or by the hex signature at the start of the file:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+$ head \-c6 data.Z | xxd
+00000000: 135d 658c 3a01                           .]e.:.
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+If \fBfile\fP says "compress\(aqd data" or similar, your .Z file isn\(aqt an
+InstallShield archive; it\(aqs compressed with the old UNIX compress
+command, and can be extracted with \fBuncompress\fP(1) or \fBgzip\fP(1).
+.sp
+When extracting, \fBunshieldv3\fP preserves the directory structure
+inside the archive. This is unlike \fBisextract\fP(1), which writes all
+the files in the same directory.
+.SH OPTIONS
+.sp
+Options may not be abbreviated.
+.INDENT 0.0
+.TP
+.B \fBinfo\fP
+Show archive metadata: number of files, compressed size, and
+uncompressed size.
+.TP
+.B \fBlist\fP
+List contents of archive. With \fB\-v\fP, shows the size and timestamp
+of each file.
+.TP
+.B \fBextract\fP
+Extract archive. \fIoutput\-dir\fP is required, but will not be created if
+it doesn\(aqt exist. Use \fB\&.\fP to extract to the current directory.
+.UNINDENT
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/unshieldv3\-0.2.1/LICENSE for license information.
+.SH AUTHORS
+.sp
+unshieldv3 was written by Wolfgang Frisch.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+\fBisextract\fP(1), \fBunshield\fP(1), \fBcabextract\fP(1)
+.\" Generated by docutils manpage writer.
+.
diff --git a/system/unshieldv3/unshieldv3.SlackBuild b/system/unshieldv3/unshieldv3.SlackBuild
new file mode 100644
index 0000000000..b58994e9c4
--- /dev/null
+++ b/system/unshieldv3/unshieldv3.SlackBuild
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# Slackware build script for unshieldv3
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20221228 bkw: updated for v0.2.1 (including man page). Also add
+# test-data to the doc dir (it's small, and might be useful).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=unshieldv3
+VERSION=${VERSION:-0.2.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  # use my flags or die!
+  sed -i 's,-O3 ,,' CMakeCache.txt
+  make VERBOSE=1
+  make install/strip DESTDIR=$PKG
+cd ..
+
+# man page written by SlackBuild author.
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README* LICENSE test-data $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unshieldv3/unshieldv3.info b/system/unshieldv3/unshieldv3.info
new file mode 100644
index 0000000000..c5c65275a9
--- /dev/null
+++ b/system/unshieldv3/unshieldv3.info
@@ -0,0 +1,10 @@
+PRGNAM="unshieldv3"
+VERSION="0.2.1"
+HOMEPAGE="https://github.com/wfr/unshieldv3/"
+DOWNLOAD="https://github.com/wfr/unshieldv3/archive/v0.2.1/unshieldv3-0.2.1.tar.gz"
+MD5SUM="e62b7d9cde2b5c75e0a3d16bf808ffbe"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/unshieldv3/unshieldv3.rst b/system/unshieldv3/unshieldv3.rst
new file mode 100644
index 0000000000..4e7a1e9dbb
--- /dev/null
+++ b/system/unshieldv3/unshieldv3.rst
@@ -0,0 +1,92 @@
+.. RST source for unshieldv3(1) man page. Convert with:
+..   rst2man.py unshieldv3.rst > unshieldv3.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 0.2.1
+.. |date| date::
+
+==========
+unshieldv3
+==========
+
+---------------------------------
+Extract InstallShield v3 archives
+---------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+unshieldv3 **info** *file.z*
+
+unshieldv3 **list** [**-v**] *file.z*
+
+unshieldv3 **extract** *file.z* *output-dir*
+
+DESCRIPTION
+===========
+
+**unshieldv3** is a command line tool to extract the .Z InstallShield v3
+packages many old windows games were distributed as.
+
+The files **unshieldv3** supports normally have a **.Z** extension, and can be
+identified by the **file**\(1) command:
+
+::
+
+  $ file data.Z
+  data.z: InstallShield Z archive Data
+
+...or by the hex signature at the start of the file:
+
+::
+
+  $ head -c6 data.Z | xxd
+  00000000: 135d 658c 3a01                           .]e.:.
+
+If **file** says "compress'd data" or similar, your .Z file isn't an
+InstallShield archive; it's compressed with the old UNIX compress
+command, and can be extracted with **uncompress**\(1) or **gzip**\(1).
+
+When extracting, **unshieldv3** preserves the directory structure
+inside the archive. This is unlike **isextract**\(1), which writes all
+the files in the same directory.
+
+OPTIONS
+=======
+
+Options may not be abbreviated.
+
+**info**
+  Show archive metadata: number of files, compressed size, and
+  uncompressed size.
+
+**list**
+  List contents of archive. With **-v**, shows the size and timestamp
+  of each file.
+
+**extract**
+  Extract archive. *output-dir* is required, but will not be created if
+  it doesn't exist. Use **.** to extract to the current directory.
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/unshieldv3-|version|/LICENSE for license information.
+
+AUTHORS
+=======
+
+unshieldv3 was written by Wolfgang Frisch.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+**isextract**\(1), **unshield**\(1), **cabextract**\(1)
diff --git a/system/untex/slack-desc b/system/untex/slack-desc
index abe8ff5b5f..b65cfa9a3e 100644
--- a/system/untex/slack-desc
+++ b/system/untex/slack-desc
@@ -10,10 +10,10 @@ untex: untex (strip LaTeX commands from source file)
 untex:
 untex: A tool for removing LaTeX commands from input.
 untex:
+untex: Homepage: https://www.ctan.org/pkg/untex
 untex:
 untex:
 untex:
 untex:
 untex:
 untex:
-untex: Homepage: https://www.ctan.org/pkg/untex
diff --git a/system/untex/untex.SlackBuild b/system/untex/untex.SlackBuild
index 0b3af3470a..9b20c06ae1 100644
--- a/system/untex/untex.SlackBuild
+++ b/system/untex/untex.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for untex
 
 # Written by Niki Kovacs (email removed)
 #
-# Now maintained by B. Watson <yalhcru@gmail.com>
+# Now maintained by B. Watson <urchlay@slackware.uk>
 #
 # All rights reserved.
 #
@@ -25,15 +25,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220212 bkw:
+# - actually update the maintainer/email in the .info file, d'oh!
+
 # 20170626 bkw:
 # - take over maintenance
 # - fix missing includes and other compiler warnings
 # - minor script tweaks
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=untex
 VERSION=${VERSION:-1.3}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -43,7 +49,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,11 +82,7 @@ mkdir $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -C $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod 644 *
 
 # 20170626 bkw: fix most of the compiler warnings we get with -Wall. This
 # should help with -current's gcc7, which is quite picky.
@@ -94,4 +100,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/untex/untex.info b/system/untex/untex.info
index 14d9bcac31..8ff6ba56a7 100644
--- a/system/untex/untex.info
+++ b/system/untex/untex.info
@@ -1,10 +1,10 @@
 PRGNAM="untex"
 VERSION="1.3"
 HOMEPAGE="https://www.ctan.org/pkg/untex"
-DOWNLOAD="ftp://ftp.thp.uni-duisburg.de/pub/source/untex-1.3.tar.gz"
+DOWNLOAD="https://ftp.netbsd.org/pub/pkgsrc/distfiles/untex-1.3.tar.gz"
 MD5SUM="909da862cdccea0f6987467be72f103a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Niki Kovacs"
-EMAIL="info@microlinux.fr"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/upass/upass.SlackBuild b/system/upass/upass.SlackBuild
index 428b6700f0..50fcd683b3 100644
--- a/system/upass/upass.SlackBuild
+++ b/system/upass/upass.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for upass
 # Copyright 2017 David Woodfall <dave@slackbuilds.org>
@@ -21,10 +21,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=upass
 VERSION=${VERSION:-0.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,7 +37,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -83,4 +93,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/upass/upass.info b/system/upass/upass.info
index 978cd80dd7..49a7266f5f 100644
--- a/system/upass/upass.info
+++ b/system/upass/upass.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/Kwpolska/upass/archive/v0.3.0/upass-0.3.0.tar.gz"
 MD5SUM="faef4d8f853b5469c091d5ff84a82ec3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-urwid pyperclip password-store"
-MAINTAINER="David Woodfall"
+REQUIRES="python-urwid pyperclip password-store"
+MAINTAINER="D Woodfall"
 EMAIL="dave@slackbuilds.org"
diff --git a/system/update-initrd/README b/system/update-initrd/README
new file mode 100644
index 0000000000..7f7d04bbf5
--- /dev/null
+++ b/system/update-initrd/README
@@ -0,0 +1,3 @@
+Update-initrd is a small script that automatically generates a new 
+initrd for your generic slackware linux kernel.
+
diff --git a/system/update-initrd/slack-desc b/system/update-initrd/slack-desc
new file mode 100644
index 0000000000..d0c84601dd
--- /dev/null
+++ b/system/update-initrd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+update-initrd: update-initrd (generate new initrd for linux kernel)
+update-initrd:
+update-initrd:
+update-initrd:
+update-initrd: Update-initrd is a small script that automatically
+update-initrd: generates a new initrd for your generic slackware
+update-initrd: linux kernel.
+update-initrd:
+update-initrd:
+update-initrd: HomePage: https://sf.net/projects/slackware-update-initrd
+update-initrd:
diff --git a/system/update-initrd/update-initrd.SlackBuild b/system/update-initrd/update-initrd.SlackBuild
new file mode 100644
index 0000000000..6cfaa98793
--- /dev/null
+++ b/system/update-initrd/update-initrd.SlackBuild
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# Slackware build script for update-initrd
+
+# Copyright 2023 Sergio Vicari <devteamtuc@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=update-initrd
+VERSION=${VERSION:-20230627}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# It is not arch spesific.
+ARCH="noarch"
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+chown -R root:root .
+chmod +x ./$PRGNAM-$VERSION/$PRGNAM
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p $PKG/usr/sbin
+cp $TMP/$PRGNAM-$VERSION/$PRGNAM-$VERSION/$PRGNAM $PKG/usr/sbin/$PRGNAM
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $TMP/$PRGNAM-$VERSION/$PRGNAM-$VERSION/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/update-initrd/update-initrd.info b/system/update-initrd/update-initrd.info
new file mode 100644
index 0000000000..736967f5e3
--- /dev/null
+++ b/system/update-initrd/update-initrd.info
@@ -0,0 +1,10 @@
+PRGNAM="update-initrd"
+VERSION="20230627"
+HOMEPAGE="https://sourceforge.net/projects/slackware-update-initrd/"
+DOWNLOAD="https://master.dl.sourceforge.net/project/slackware-update-initrd/update-initrd-20230627.tar.gz"
+MD5SUM="ec147645032099c7afca9b428558d76f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Sergio Vicari"
+EMAIL="devteamtuc@gmail.com"
diff --git a/system/uptimed/README b/system/uptimed/README
index dc1d782990..21d9911a16 100644
--- a/system/uptimed/README
+++ b/system/uptimed/README
@@ -8,16 +8,19 @@ Note: See below on how to launch uptimed automatically.
 Additional configuration via "/etc/uptimed.conf"
   (See "/etc/uptimed.conf-dist")
 
-The uptimed daemon runs in the background and regularly stores the following 
-data to "/var/spool/uptimed/records";
-"<Uptime in seconds>:<Boot up in unixtime>:<System kernel name and release>"
+The uptimed daemon runs in the background and regularly stores the
+following data to "/var/spool/uptimed/records";
+
+"<Uptime in seconds>:<Boot up in unixtime>:<Kernel name and release>"
+
 The boot up value is used as a unique identifier.
 
 See "uprecords -?" for additional record display options.
 
-The "uprecords" file can be copied as "uprecords.cgi" to your CGI directory,
-and will render Content-type head information and HTML tabs as necessary.
-(See "INSTALL.cgi" in the extracted source for more information.)
+The "uprecords" file can be copied as "uprecords.cgi" to your CGI
+directory, and will render Content-type head information and HTML tabs
+as necessary.  (See "INSTALL.cgi" in the extracted source for more
+information.)
 
 To have the daemon launch automatically at boot time,
   1) Set the rc.uptimed file as executable;
@@ -27,12 +30,12 @@ To have the daemon launch automatically at boot time,
     /etc/rc.d/rc.uptimed start &
   fi
 
-Q: Why are my records not saved between reboots? I can see the current uptime
-  info with the 'uprecords' command.
-A: The uptimed daemon was possibly not running to regularly save the data to the
-  "/var/spool/uptimed/records" file. See above on how to automatically start
-  the daemon, and confirm that the "/var/spool/uptimed" directory exists
-  and is writable.
+Q: Why are my records not saved between reboots? I can see the current
+   uptime info with the 'uprecords' command.
+A: The uptimed daemon was possibly not running to regularly save the
+   data to the "/var/spool/uptimed/records" file. See above on how to
+   automatically start the daemon, and confirm that the
+   "/var/spool/uptimed" directory exists and is writable.
 
-If performing an upgrade, you may need to chmod 755 rc.uptimed and restart the
-daemon with "/etc/rc.d/rc.uptimed restart".
+If performing an upgrade, you may need to chmod 755 rc.uptimed and
+restart the daemon with "/etc/rc.d/rc.uptimed restart".
diff --git a/system/uptimed/uptimed.SlackBuild b/system/uptimed/uptimed.SlackBuild
index 7695976e9e..2aa4443f9d 100644
--- a/system/uptimed/uptimed.SlackBuild
+++ b/system/uptimed/uptimed.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Graham Orange v0.18 2015-11-02
 
 # Copyright 2015 Graham Orange, USA
@@ -21,10 +21,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=uptimed
 VERSION=${VERSION:-0.4.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ fi
 
 DOCS="AUTHORS COPYING CREDITS ChangeLog INSTALL* NEWS README* TODO"
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -101,9 +111,11 @@ install -m 644 $CWD/rc.uptimed $PKG/etc/rc.d/rc.uptimed
 
 mv $PKG/etc/uptimed.conf-dist $PKG/etc/uptimed.conf-dist.new
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/upx/upx-0001-fix-check_whitespace.patch b/system/upx/upx-0001-fix-check_whitespace.patch
deleted file mode 100644
index 67aa0647a5..0000000000
--- a/system/upx/upx-0001-fix-check_whitespace.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/stub/scripts/check_whitespace.sh	2018-06-19 10:37:43.906967996 +0200
-+++ b/src/stub/scripts/check_whitespace.sh	2018-06-19 10:32:18.002066908 +0200
-@@ -15,6 +15,8 @@
-     -type f -iname '*.exe' -prune -o \
-     -type f -iname '*.pdf' -prune -o \
-     -type f -iname '*.swp' -prune -o \
-+    -type f -iname '*.o' -prune -o \
-+    -type f -iname '*.out' -prune -o \
-     -type f -print0 | \
- LC_ALL=C sort -z | xargs -0r perl -n -e '
-     #print("$ARGV\n");
diff --git a/system/upx/upx.SlackBuild b/system/upx/upx.SlackBuild
index 8e3e17f3e0..6033d7cf61 100644
--- a/system/upx/upx.SlackBuild
+++ b/system/upx/upx.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for upx
 
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=upx
-VERSION=${VERSION:-3.94}
+VERSION=${VERSION:-4.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -70,22 +80,25 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 < "$CWD/upx-0001-fix-check_whitespace.patch"
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-CXXFLAGS_WERROR="" \
-make all
-install -D src/upx.out $PKG/usr/bin/upx
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+mkdir -p build
+cd build
+  cmake \
+    -G "Unix Makefiles" \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_DOCDIR=doc/$PRGNAM-$VERSION \
+    -DCMAKE_INSTALL_MANDIR=man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
 
-install -D -m 644 doc/upx.1 $PKG/usr/man/man1/upx.1
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a BUGS COPYING LICENSE NEWS PROJECTS README* THANKS \
+cp -a \
   doc/*.txt doc/upx.pod \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -94,4 +107,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/upx/upx.info b/system/upx/upx.info
index ce664df17a..8fc7f70dcf 100644
--- a/system/upx/upx.info
+++ b/system/upx/upx.info
@@ -1,10 +1,10 @@
 PRGNAM="upx"
-VERSION="3.94"
+VERSION="4.2.3"
 HOMEPAGE="https://upx.github.io/"
-DOWNLOAD="https://github.com/upx/upx/releases/download/v3.94/upx-3.94-src.tar.xz"
-MD5SUM="19e898edc41bde3f21e997d237156731"
+DOWNLOAD="https://github.com/upx/upx/releases/download/v4.2.3/upx-4.2.3-src.tar.xz"
+MD5SUM="cf9244fbadac63faf210fb356aa120f0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ucl"
+REQUIRES=""
 MAINTAINER="Kot Czarny"
 EMAIL="tjosko@yahoo.com"
diff --git a/system/usbguard/README b/system/usbguard/README
index 543066146e..342f00e858 100644
--- a/system/usbguard/README
+++ b/system/usbguard/README
@@ -15,7 +15,6 @@ after it is inserted into the port.
 
 Optional dependencies:
  - audit
- - libseccomp
 
 To have the USBGuard daemon start and stop with your host,
 add to /etc/rc.d/rc.local:
diff --git a/system/usbguard/usbguard.SlackBuild b/system/usbguard/usbguard.SlackBuild
index 0bd7c48f96..cca84ac229 100644
--- a/system/usbguard/usbguard.SlackBuild
+++ b/system/usbguard/usbguard.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for usbguard
 
-# Copyright 2019 Michael Edie Orlando, FL USA
+# Copyright 2019-2022 Michael Edie Tampa, FL USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=usbguard
-VERSION=${VERSION:-0.7.8}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.1.2}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -100,9 +110,11 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/usbguard/usbguard.info b/system/usbguard/usbguard.info
index 2f91cbf1b3..b708790b74 100644
--- a/system/usbguard/usbguard.info
+++ b/system/usbguard/usbguard.info
@@ -1,10 +1,10 @@
 PRGNAM="usbguard"
-VERSION="0.7.8"
+VERSION="1.1.2"
 HOMEPAGE="https://usbguard.github.io/"
-DOWNLOAD="https://github.com/USBGuard/usbguard/releases/download/usbguard-0.7.8/usbguard-0.7.8.tar.gz"
-MD5SUM="b96dcae8c4169c455ac81adab44d59c8"
+DOWNLOAD="https://github.com/USBGuard/usbguard/releases/download/usbguard-1.1.2/usbguard-1.1.2.tar.gz"
+MD5SUM="3c9478e17bac575ff51b1d746e72f25c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="protobuf libqb libsodium"
+REQUIRES="protobuf3 libqb"
 MAINTAINER="Michael Edie"
 EMAIL="michael@sawbox.net"
diff --git a/system/usbmon/usbmon.SlackBuild b/system/usbmon/usbmon.SlackBuild
index 8727a94fc0..67dafc587e 100644
--- a/system/usbmon/usbmon.SlackBuild
+++ b/system/usbmon/usbmon.SlackBuild
@@ -1,15 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for usbmon
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=usbmon
 VERSION=${VERSION:-6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +22,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,11 +54,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 make CFLAGS="$SLKCFLAGS"
 strip --strip-unneeded $PRGNAM
@@ -69,4 +73,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/usbmon/usbmon.info b/system/usbmon/usbmon.info
index affe1e603d..c3014d1b59 100644
--- a/system/usbmon/usbmon.info
+++ b/system/usbmon/usbmon.info
@@ -1,10 +1,10 @@
 PRGNAM="usbmon"
 VERSION="6.1"
-HOMEPAGE="http://people.redhat.com/zaitcev/linux/"
-DOWNLOAD="http://people.redhat.com/zaitcev/linux/usbmon-6.1.tar.gz"
+HOMEPAGE="https://people.redhat.com/zaitcev/linux/"
+DOWNLOAD="https://slackware.uk/~urchlay/src/usbmon-6.1.tar.gz"
 MD5SUM="77c41b8a5536f3a47b3338b204aa188e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/usbredir/usbredir.SlackBuild b/system/usbredir/usbredir.SlackBuild
index 302221db36..93d9db22bc 100644
--- a/system/usbredir/usbredir.SlackBuild
+++ b/system/usbredir/usbredir.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for usbredir
-# Copyright 2013-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=usbredir
-VERSION=${VERSION:-0.8.0}
+VERSION=${VERSION:-0.13.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,7 +37,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -53,7 +63,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="ChangeLog COPYING* README* TODO"
+DOCS="COPYING* README* TODO"
 
 set -e
 
@@ -65,26 +75,28 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib$LIBDIRSUFFIX \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-silent-rules \
-  --disable-static \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc
+  ninja
+  DESTDIR=$PKG ninja install
+cd ..
+
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -100,4 +112,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/usbredir/usbredir.info b/system/usbredir/usbredir.info
index 3efa6ed7d1..0924b9aa87 100644
--- a/system/usbredir/usbredir.info
+++ b/system/usbredir/usbredir.info
@@ -1,8 +1,8 @@
 PRGNAM="usbredir"
-VERSION="0.8.0"
+VERSION="0.13.0"
 HOMEPAGE="https://www.spice-space.org"
-DOWNLOAD="https://www.spice-space.org/download/usbredir/usbredir-0.8.0.tar.bz2"
-MD5SUM="c1a15225a1b97f3c4bccb10e03f3750b"
+DOWNLOAD="https://www.spice-space.org/download/usbredir/usbredir-0.13.0.tar.xz"
+MD5SUM="8b6766c0de82cb686486ea141b25f5f2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/usbrelay/README b/system/usbrelay/README
index c7bd30e78d..723c6163a0 100644
--- a/system/usbrelay/README
+++ b/system/usbrelay/README
@@ -1 +1,2 @@
-Command line tool for 1,2,4 and 8 output usb relays based on HID compatible chips.
+Command line tool for 1, 2, 4 and 8 output USB relays based on HID
+compatible chips.
diff --git a/system/usbrelay/usbrelay.SlackBuild b/system/usbrelay/usbrelay.SlackBuild
index 1e6d5ca66d..1184d9360b 100644
--- a/system/usbrelay/usbrelay.SlackBuild
+++ b/system/usbrelay/usbrelay.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for usbrelay
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=usbrelay
-VERSION=${VERSION:-0.7}
+VERSION=${VERSION:-1.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -86,4 +96,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/usbrelay/usbrelay.info b/system/usbrelay/usbrelay.info
index 2c1c413699..2c67d87b9d 100644
--- a/system/usbrelay/usbrelay.info
+++ b/system/usbrelay/usbrelay.info
@@ -1,10 +1,10 @@
 PRGNAM="usbrelay"
-VERSION="0.7"
+VERSION="1.2.1"
 HOMEPAGE="https://github.com/darrylb123/usbrelay"
-DOWNLOAD="https://github.com/darrylb123/usbrelay/archive/0.7/usbrelay-0.7.tar.gz"
-MD5SUM="67b1d297db24a294722abcf7de5f9f71"
+DOWNLOAD="https://github.com/darrylb123/usbrelay/archive/1.2.1/usbrelay-1.2.1.tar.gz"
+MD5SUM="1efbc56dba38782a885ef4745d0d8d40"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="hidapi"
 MAINTAINER="Sebastian Arcus"
-EMAIL="s.arcus@open-t.co.uk"
+EMAIL="s [dot] arcus [at] open-t [dot] co [dot] uk"
diff --git a/system/usbtop/README b/system/usbtop/README
new file mode 100644
index 0000000000..fa7af1b95e
--- /dev/null
+++ b/system/usbtop/README
@@ -0,0 +1,4 @@
+usbtop is a top-like utility that shows an estimated instant-
+aneous bandwidth on USB buses and devices.
+
+you need to have the usbmon module loaded. ($ modprobe usbmon).
diff --git a/system/usbtop/slack-desc b/system/usbtop/slack-desc
new file mode 100644
index 0000000000..208848c9b1
--- /dev/null
+++ b/system/usbtop/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+usbtop: usbtop (bandwidth monitor for USB buses and devices)
+usbtop:
+usbtop: usbtop is a top-like utility that shows an estimated instantaneous
+usbtop: bandwidth on USB buses and devices.
+usbtop:
+usbtop: you need to have the usbmon module loaded. ($ modprobe usbmon).
+usbtop:
+usbtop:
+usbtop:
+usbtop:
+usbtop:
diff --git a/system/usbtop/usbtop.SlackBuild b/system/usbtop/usbtop.SlackBuild
new file mode 100644
index 0000000000..add63cf17f
--- /dev/null
+++ b/system/usbtop/usbtop.SlackBuild
@@ -0,0 +1,102 @@
+#!/bin/bash
+
+# Slackware build script for usbtop
+# Bandwidth monitor for USB buses and devices.
+
+# Copyright 2019 Fernando Lopez Jr. <fernando.lopezjr@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=usbtop
+VERSION=${VERSION:-1.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -std=c++11"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -std=c++11"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC -std=c++11"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2 -std=c++11"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-release-$VERSION
+tar xvf $CWD/$PRGNAM-release-$VERSION.tar.gz
+cd $PRGNAM-release-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make VERBOSE=1
+  make install DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a TODO README.md LICENSE INSTALL.md CHANGELOG $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/usbtop/usbtop.info b/system/usbtop/usbtop.info
new file mode 100644
index 0000000000..3763306521
--- /dev/null
+++ b/system/usbtop/usbtop.info
@@ -0,0 +1,10 @@
+PRGNAM="usbtop"
+VERSION="1.0"
+HOMEPAGE="https://github.com/aguinet/usbtop"
+DOWNLOAD="https://github.com/aguinet/usbtop/archive/release-1.0/usbtop-release-1.0.tar.gz"
+MD5SUM="6b7bc38826e6cadbf76faf63026aafb6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Fernando Lopez Jr."
+EMAIL="fernando.lopezjr@gmail.com"
diff --git a/system/usbview/README b/system/usbview/README
index 03ae2de1e8..2f0167a16f 100644
--- a/system/usbview/README
+++ b/system/usbview/README
@@ -1,17 +1,4 @@
-USBView is a GTK program that displays the topography of the devices that are
-plugged into the USB bus on a Linux machine.  It also displays information on
-each of the devices.  This can be useful to determine if a device is working
-properly or not.
-
-For this program to be useful, you will need to mount the debug filesystem
-(debugfs).  Add this line to your /etc/fstab:
-
-  debugfs /sys/kernel/debug debugfs noauto 0 0
-
-Now a simple `mount debugfs` will make the USB info available to USBView.
-
-The debugfs root directory is accessible only to the root user by default.
-You can grant access to the USB device info (as well as the rest of the
-debugfs tree) with the "uid", "gid", and "mode" mount options.  For example:
-
-  debugfs /sys/kernel/debug debugfs noauto,mode=755 0 0
+USBView is a GTK program that displays the topography of the devices
+that are plugged into the USB bus on a Linux machine. It also displays
+information on each of the devices. This can be useful to determine if
+a device is working properly or not.
diff --git a/system/usbview/doinst.sh b/system/usbview/doinst.sh
new file mode 100644
index 0000000000..4a25de5e6f
--- /dev/null
+++ b/system/usbview/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/system/usbview/usbview.SlackBuild b/system/usbview/usbview.SlackBuild
index b66dc7f632..e34b8e331d 100644
--- a/system/usbview/usbview.SlackBuild
+++ b/system/usbview/usbview.SlackBuild
@@ -1,49 +1,56 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for usbview
 
-# Copyright 2013 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2024 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
 # 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
+#    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=usbview
-VERSION=${VERSION:-2.0}
+VERSION=${VERSION:-3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
+       *) ARCH=$(uname -m) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
+DOCS="AUTHORS ChangeLog README LICENSES/*"
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,24 +72,23 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod -R u+w,go-w,a+rX-st .
 
-CFLAGS="$SLKCFLAGS" \
+autoreconf -vif
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=\${exec_prefix}/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
+  --mandir=\${prefix}/man \
+  --infodir=\${prefix}/info \
+  --docdir=\${prefix}/doc/$PRGNAM-$VERSION \
+  --disable-dependency-tracking \
+  --build=$ARCH-slackware-linux \
+  CFLAGS="$SLKCFLAGS"
 
 make
+make check
 make install-strip DESTDIR=$PKG
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
@@ -93,6 +99,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/usbview/usbview.info b/system/usbview/usbview.info
index 31d64ccf2c..1163d92ea6 100644
--- a/system/usbview/usbview.info
+++ b/system/usbview/usbview.info
@@ -1,8 +1,8 @@
 PRGNAM="usbview"
-VERSION="2.0"
+VERSION="3.1"
 HOMEPAGE="http://www.kroah.com/linux/usb/"
-DOWNLOAD="http://www.kroah.com/linux/usb/usbview-2.0.tar.gz"
-MD5SUM="565f2e79f3924d14ab5b4d8aced557e5"
+DOWNLOAD="https://github.com/gregkh/usbview/archive/v3.1/usbview-3.1.tar.gz"
+MD5SUM="304d161aea12658a8e145c18d6a341af"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/usermin/README b/system/usermin/README
index 7990fb53a0..6cc5ca85d2 100644
--- a/system/usermin/README
+++ b/system/usermin/README
@@ -18,8 +18,7 @@ login as normal user to use usermin.
 
 NOTES:
 If you want to use SSL/HTTPS support, change the ssl=0 into ssl=1 in
-/etc/usermin/miniserv.conf. SSL/HTTPS support requires additional
-dependency: Net-SSLeay.
+/etc/usermin/miniserv.conf.
 
 By default, this script set usermin to be accessible only on localhost.
 If you want global/public access, comment or remove this line in 
diff --git a/system/usermin/usermin.SlackBuild b/system/usermin/usermin.SlackBuild
index 10af330b0f..3bd8f88367 100644
--- a/system/usermin/usermin.SlackBuild
+++ b/system/usermin/usermin.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for usermin
 
-# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=usermin
-VERSION=${VERSION:-1.820}
+VERSION=${VERSION:-2.005}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -107,7 +114,7 @@ find $PKG/etc/usermin -type f -exec sed -i "s:$PKG::g" {} \;
 # make it only accessible by localhost
 echo 'allow=127.0.0.1' >> $PKG/etc/usermin/miniserv.conf
 
-CONFIG="postgresql telnet file fetchmail usermount forward schedule language filter theme cron \
+CONFIG="postgresql telnet fetchmail usermount forward schedule language filter theme cron \
           ssh proc tunnel spam gnupg plan man commands chfn shell htaccess at mailcap mailbox \
           htaccess-htpasswd changepass procmail cshrc mysql quota updown"
 for L in $CONFIG
@@ -128,4 +135,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/usermin/usermin.info b/system/usermin/usermin.info
index 6174ea579e..3757f0c8b6 100644
--- a/system/usermin/usermin.info
+++ b/system/usermin/usermin.info
@@ -1,8 +1,8 @@
 PRGNAM="usermin"
-VERSION="1.820"
+VERSION="2.005"
 HOMEPAGE="http://webmin.com/usermin.html"
-DOWNLOAD="http://jaist.dl.sourceforge.net/project/webadmin/usermin/1.820/usermin-1.820.tar.gz"
-MD5SUM="8a30617fc90a4e08a36f17703f1d7239"
+DOWNLOAD="http://jaist.dl.sourceforge.net/project/webadmin/usermin/2.005/usermin-2.005.tar.gz"
+MD5SUM="cee4af2a4186dfc1e8b1a2ce7756a9de"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="webmin"
diff --git a/system/v4l2loopback/update_to_master_17JUN2020.patch b/system/v4l2loopback/update_to_master_17JUN2020.patch
deleted file mode 100644
index cd44185102..0000000000
--- a/system/v4l2loopback/update_to_master_17JUN2020.patch
+++ /dev/null
@@ -1,671 +0,0 @@
-diff --git a/README.md b/README.md
-index d8b295a..d8d338b 100644
---- a/README.md
-+++ b/README.md
-@@ -18,9 +18,31 @@ only be of limited use...
- 
- # ISSUES
- for current issues, checkout https://github.com/umlaeute/v4l2loopback/issues
--please use the issue-tracker for reporting any problems
-+please use the issue-tracker for reporting any problems.
-+
-+before you create a new ticket in our issue tracker, please make sure that you have read
-+*this* document and followed any instructions found within.
-+
-+also, please search the issue-tracker *before* reporting any problems: it's much better
-+to add your information to an existing ticket than to create a new ticket with essentially
-+the same information.
-+
-+## SEEKING HELP
-+the issue tracker is meant to track specific bugs in the code (and new features).
-+however, it is ill-suited as a user support forum.
-+
-+if you have general questions or problems, please use the `v4l2loopback` tag
-+on [Stack Overflow](https://stackoverflow.com/questions/tagged/v4l2loopback) instead:
-+https://stackoverflow.com/questions/tagged/v4l2loopback
-+
- 
- # DEPENDENCIES
-+in order to build (compile,...) anything, you must have a *working* build-environment
-+(compiler, GNU make,...).
-+the kernel can be somewhat picky if you try to load a module that was compiled with
-+a different compiler than was used to compile the kernel itself.
-+so make sure to have the right compiler in place.
-+
- the v4l2loopback module is a *kernel module*.
- in order to build it, you *must have* the kernel headers installed that match
- the linux kernel with which you want to use the module (in most cases this will
-@@ -31,6 +53,12 @@ the first few number are the same.
- (modules will be incompatible if the versions don't match. if you are lucky, the module will
- simply refuse to load. if you are unlucky, your computer will spit in your eye or do worse.)
- 
-+there are distribution-specific differences on how to get the correct kernel headers
-+(or to install a compilation toolchain).
-+documenting all those possibilities would go far beyond the scope of `v4l2loopback`.
-+please understnd that we cannot provide support for questions regarding dependencies.
-+
-+
- # BUILD
- to build the kernel module run:
- 
-diff --git a/v4l2loopback.c b/v4l2loopback.c
-index bcf7667..b0f7b93 100644
---- a/v4l2loopback.c
-+++ b/v4l2loopback.c
-@@ -48,9 +48,9 @@
- 
- MODULE_DESCRIPTION("V4L2 loopback video device");
- MODULE_AUTHOR("Vasily Levin, " \
--              "IOhannes m zmoelnig <zmoelnig@iem.at>,"  \
--              "Stefan Diewald,"                         \
--              "Anton Novikov"                           \
-+	      "IOhannes m zmoelnig <zmoelnig@iem.at>,"	\
-+	      "Stefan Diewald,"				\
-+	      "Anton Novikov"				\
- 	      "et al."					\
- 		);
- MODULE_LICENSE("GPL");
-@@ -61,18 +61,18 @@ MODULE_LICENSE("GPL");
- #define STRINGIFY(s) #s
- #define STRINGIFY2(s) STRINGIFY(s)
- 
--#define dprintk(fmt, args...)                                           \
--	do { if (debug > 0) {                                                 \
-+#define dprintk(fmt, args...)						\
-+	do { if (debug > 0) {						\
- 		printk(KERN_INFO "v4l2-loopback[" STRINGIFY2(__LINE__) "]: " fmt, ##args); \
- 	} } while (0)
- 
--#define MARK()                                                          \
--	do { if (debug > 1) {                                                  \
-+#define MARK()								\
-+	do { if (debug > 1) {						\
- 		printk(KERN_INFO "%s:%d[%s]\n", __FILE__, __LINE__, __func__);	\
- 	} } while (0)
- 
--#define dprintkrw(fmt, args...)                                         \
--	do { if (debug > 2) {                                                 \
-+#define dprintkrw(fmt, args...)						\
-+	do { if (debug > 2) {						\
- 		printk(KERN_INFO "v4l2-loopback[" STRINGIFY2(__LINE__)"]: " fmt, ##args); \
- 	} } while (0)
- 
-@@ -85,14 +85,14 @@ struct v4l2_ctrl_handler {
- 	int error;
- };
- struct v4l2_ctrl_config {
--        void *ops;
--        u32 id;
-+	void *ops;
-+	u32 id;
- 	const char *name;
- 	int type;
--        s32 min;
--        s32 max;
--        u32 step;
--        s32 def;
-+	s32 min;
-+	s32 max;
-+	u32 step;
-+	s32 def;
- };
- int v4l2_ctrl_handler_init(struct v4l2_ctrl_handler*hdl,
- 			   unsigned nr_of_controls_hint)
-@@ -119,7 +119,7 @@ struct v4l2_device {
- 	char name[V4L2_DEVICE_NAME_SIZE];
- 	struct v4l2_ctrl_handler*ctrl_handler;
- };
--static inline int  v4l2_device_register  (void *dev, void *v4l2_dev) { return 0; }
-+static inline int  v4l2_device_register(void *dev, void *v4l2_dev) { return 0; }
- static inline void v4l2_device_unregister(struct v4l2_device *v4l2_dev) { return; }
- #endif /*  HAVE__V4L2_DEVICE */
- 
-@@ -155,7 +155,7 @@ static inline void v4l2l_get_timestamp(struct v4l2_buffer *b) {
- 
- /* module constants
-  *  can be overridden during he build process using something like
-- *      make KCPPFLAGS="-DMAX_DEVICES=100"
-+ *	make KCPPFLAGS="-DMAX_DEVICES=100"
-  */
- 
- 
-@@ -235,13 +235,13 @@ MODULE_PARM_DESC(max_height, "maximum frame height");
- 
- /* control IDs */
- #ifndef HAVE__V4L2_CTRLS
--# define V4L2LOOPBACK_CID_BASE  (V4L2_CID_PRIVATE_BASE)
-+# define V4L2LOOPBACK_CID_BASE	(V4L2_CID_PRIVATE_BASE)
- #else
--# define V4L2LOOPBACK_CID_BASE  (V4L2_CID_USER_BASE | 0xf000)
-+# define V4L2LOOPBACK_CID_BASE	(V4L2_CID_USER_BASE | 0xf000)
- #endif
--#define CID_KEEP_FORMAT        (V4L2LOOPBACK_CID_BASE + 0)
-+#define CID_KEEP_FORMAT	       (V4L2LOOPBACK_CID_BASE + 0)
- #define CID_SUSTAIN_FRAMERATE  (V4L2LOOPBACK_CID_BASE + 1)
--#define CID_TIMEOUT            (V4L2LOOPBACK_CID_BASE + 2)
-+#define CID_TIMEOUT	       (V4L2LOOPBACK_CID_BASE + 2)
- #define CID_TIMEOUT_IMAGE_IO   (V4L2LOOPBACK_CID_BASE + 3)
- 
- static int v4l2loopback_s_ctrl(struct v4l2_ctrl *ctrl);
-@@ -249,44 +249,44 @@ static const struct v4l2_ctrl_ops v4l2loopback_ctrl_ops = {
- 	.s_ctrl = v4l2loopback_s_ctrl,
- };
- static const struct v4l2_ctrl_config v4l2loopback_ctrl_keepformat = {
--        .ops = &v4l2loopback_ctrl_ops,
--        .id = CID_KEEP_FORMAT,
--        .name = "keep_format",
--        .type = V4L2_CTRL_TYPE_BOOLEAN,
--        .min = 0,
--        .max = 1,
--        .step = 1,
--        .def = 0,
-+	.ops = &v4l2loopback_ctrl_ops,
-+	.id = CID_KEEP_FORMAT,
-+	.name = "keep_format",
-+	.type = V4L2_CTRL_TYPE_BOOLEAN,
-+	.min = 0,
-+	.max = 1,
-+	.step = 1,
-+	.def = 0,
- };
- static const struct v4l2_ctrl_config v4l2loopback_ctrl_sustainframerate = {
--        .ops = &v4l2loopback_ctrl_ops,
--        .id = CID_SUSTAIN_FRAMERATE,
--        .name = "sustain_framerate",
--        .type = V4L2_CTRL_TYPE_BOOLEAN,
--        .min = 0,
--        .max = 1,
--        .step = 1,
--        .def = 0,
-+	.ops = &v4l2loopback_ctrl_ops,
-+	.id = CID_SUSTAIN_FRAMERATE,
-+	.name = "sustain_framerate",
-+	.type = V4L2_CTRL_TYPE_BOOLEAN,
-+	.min = 0,
-+	.max = 1,
-+	.step = 1,
-+	.def = 0,
- };
- static const struct v4l2_ctrl_config v4l2loopback_ctrl_timeout = {
--        .ops = &v4l2loopback_ctrl_ops,
--        .id = CID_TIMEOUT,
--        .name = "timeout",
--        .type = V4L2_CTRL_TYPE_INTEGER,
--        .min = 0,
--        .max = MAX_TIMEOUT,
--        .step = 1,
--        .def = 0,
-+	.ops = &v4l2loopback_ctrl_ops,
-+	.id = CID_TIMEOUT,
-+	.name = "timeout",
-+	.type = V4L2_CTRL_TYPE_INTEGER,
-+	.min = 0,
-+	.max = MAX_TIMEOUT,
-+	.step = 1,
-+	.def = 0,
- };
- static const struct v4l2_ctrl_config v4l2loopback_ctrl_timeoutimageio = {
--        .ops = &v4l2loopback_ctrl_ops,
--        .id = CID_TIMEOUT_IMAGE_IO,
--        .name = "timeout_image_io",
--        .type = V4L2_CTRL_TYPE_BOOLEAN,
--        .min = 0,
--        .max = 1,
--        .step = 1,
--        .def = 0,
-+	.ops = &v4l2loopback_ctrl_ops,
-+	.id = CID_TIMEOUT_IMAGE_IO,
-+	.name = "timeout_image_io",
-+	.type = V4L2_CTRL_TYPE_BOOLEAN,
-+	.min = 0,
-+	.max = 1,
-+	.step = 1,
-+	.def = 0,
- };
- 
- 
-@@ -321,7 +321,7 @@ struct v4l2_loopback_device {
- 				  (close to) nominal framerate */
- 
- 	/* buffers stuff */
--	u8 *image;         /* pointer to actual buffers data */
-+	u8 *image;	   /* pointer to actual buffers data */
- 	unsigned long int imagesize;  /* size of buffers data */
- 	int buffers_number;  /* should not be big, 4 is a good choice */
- 	struct v4l2l_buffer buffers[MAX_BUFFERS];	/* inner driver buffers */
-@@ -386,13 +386,13 @@ struct v4l2_loopback_opener {
- /* this is heavily inspired by the bttv driver found in the linux kernel */
- struct v4l2l_format {
- 	char *name;
--	int  fourcc;          /* video4linux 2      */
--	int  depth;           /* bit/pixel          */
-+	int  fourcc;	      /* video4linux 2	    */
-+	int  depth;	      /* bit/pixel	    */
- 	int  flags;
- };
- /* set the v4l2l_format.flags to PLANAR for non-packed formats */
--#define FORMAT_FLAGS_PLANAR       0x01
--#define FORMAT_FLAGS_COMPRESSED   0x02
-+#define FORMAT_FLAGS_PLANAR	  0x01
-+#define FORMAT_FLAGS_COMPRESSED	  0x02
- 
- #ifndef V4L2_PIX_FMT_VP9
- #define V4L2_PIX_FMT_VP9  v4l2_fourcc('V', 'P', '9', '0')
-@@ -446,7 +446,7 @@ static void pix_format_set_size(struct v4l2_pix_format *f,
- 		f->bytesperline = width; /* Y plane */
- 		f->sizeimage = (width * height * fmt->depth) >> 3;
- 	} else if (fmt->flags & FORMAT_FLAGS_COMPRESSED) {
--	        /* doesn't make sense for compressed formats */
-+		/* doesn't make sense for compressed formats */
- 		f->bytesperline = 0;
- 		f->sizeimage = (width * height * fmt->depth) >> 3;
- 	} else {
-@@ -458,7 +458,7 @@ static void pix_format_set_size(struct v4l2_pix_format *f,
- static int set_timeperframe(struct v4l2_loopback_device *dev,
- 		struct v4l2_fract *tpf)
- {
--        if((tpf->denominator < 1) || (tpf->numerator < 1)) {
-+	if((tpf->denominator < 1) || (tpf->numerator < 1)) {
- 	  return -EINVAL;
- 	}
- 	dev->capture_param.timeperframe = *tpf;
-@@ -485,7 +485,7 @@ static ssize_t attr_show_format(struct device *cd,
- 	tpf = &dev->capture_param.timeperframe;
- 
- 	fourcc2str(dev->pix_format.pixelformat, buf4cc);
--        buf4cc[4]=0;
-+	buf4cc[4]=0;
- 	if (tpf->numerator == 1)
- 		snprintf(buf_fps, sizeof(buf_fps), "%d", tpf->denominator);
- 	else
-@@ -578,7 +578,7 @@ static void v4l2loopback_create_sysfs(struct video_device *vdev)
- {
- 	int res = 0;
- 
--#define V4L2_SYSFS_CREATE(x)     res = device_create_file(&vdev->dev, &dev_attr_##x); if (res < 0) break
-+#define V4L2_SYSFS_CREATE(x)	 res = device_create_file(&vdev->dev, &dev_attr_##x); if (res < 0) break
- 	if (!vdev)
- 		return;
- 	do {
-@@ -671,7 +671,7 @@ static int vidioc_querycap(struct file *file, void *priv, struct v4l2_capability
- {
- 	struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
- 	int devnr = ((struct v4l2loopback_private *)video_get_drvdata(dev->vdev))->devicenr;
--        __u32 capabilities = V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
-+	__u32 capabilities = V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
- 
- 	strlcpy(cap->driver, "v4l2 loopback", sizeof(cap->driver));
- 	vidioc_fill_name(cap->card, sizeof(cap->card), devnr);
-@@ -698,7 +698,10 @@ static int vidioc_querycap(struct file *file, void *priv, struct v4l2_capability
- 		}
- 	}
- 
--	dev->vdev->device_caps = cap->device_caps = cap->capabilities = capabilities;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+	dev->vdev->device_caps =
-+#endif /* >=linux-4.7.0 */
-+	cap->device_caps = cap->capabilities = capabilities;
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)
- 	cap->capabilities |= V4L2_CAP_DEVICE_CAPS;
-@@ -891,7 +894,7 @@ static int vidioc_enum_fmt_out(struct file *file, void *fh, struct v4l2_fmtdesc
- 		f->pixelformat = dev->pix_format.pixelformat;
- 	} else {
- 		/* fill in a dummy format */
--                /* coverity[unsigned_compare] */
-+		/* coverity[unsigned_compare] */
- 		if (f->index < 0 || f->index >= FORMATS)
- 			return -EINVAL;
- 
-@@ -1069,11 +1072,11 @@ static int vidioc_s_parm(struct file *file, void *priv, struct v4l2_streamparm *
- 
- 	switch (parm->type) {
- 	case V4L2_BUF_TYPE_VIDEO_CAPTURE:
--                if ((err=set_timeperframe(dev, &parm->parm.capture.timeperframe)) < 0)
-+		if ((err=set_timeperframe(dev, &parm->parm.capture.timeperframe)) < 0)
- 		  return err;
- 		break;
- 	case V4L2_BUF_TYPE_VIDEO_OUTPUT:
--                if ((err=set_timeperframe(dev, &parm->parm.capture.timeperframe)) < 0)
-+		if ((err=set_timeperframe(dev, &parm->parm.capture.timeperframe)) < 0)
- 		  return err;
- 		break;
- 	default:
-@@ -1249,7 +1252,7 @@ static int vidioc_enum_output(struct file *file, void *fh, struct v4l2_output *o
- 	struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
- 	MARK();
- 
--        if (!dev->announce_all_caps && !dev->ready_for_output)
-+	if (!dev->announce_all_caps && !dev->ready_for_output)
- 		return -ENOTTY;
- 
- 	if (0 != index)
-@@ -1279,7 +1282,7 @@ static int vidioc_enum_output(struct file *file, void *fh, struct v4l2_output *o
- static int vidioc_g_output(struct file *file, void *fh, unsigned int *i)
- {
- 	struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
--        if (!dev->announce_all_caps && !dev->ready_for_output)
-+	if (!dev->announce_all_caps && !dev->ready_for_output)
- 		return -ENOTTY;
- 	if (i)
- 		*i = 0;
-@@ -1292,7 +1295,7 @@ static int vidioc_g_output(struct file *file, void *fh, unsigned int *i)
- static int vidioc_s_output(struct file *file, void *fh, unsigned int i)
- {
- 	struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
--        if (!dev->announce_all_caps && !dev->ready_for_output)
-+	if (!dev->announce_all_caps && !dev->ready_for_output)
- 		return -ENOTTY;
- 
- 	if (i)
-@@ -1340,7 +1343,7 @@ static int vidioc_enum_input(struct file *file, void *fh, struct v4l2_input *inp
- static int vidioc_g_input(struct file *file, void *fh, unsigned int *i)
- {
- 	struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
--        if (!dev->announce_all_caps && !dev->ready_for_capture)
-+	if (!dev->announce_all_caps && !dev->ready_for_capture)
- 		return -ENOTTY;
- 	if (i)
- 		*i = 0;
-@@ -1353,7 +1356,7 @@ static int vidioc_g_input(struct file *file, void *fh, unsigned int *i)
- static int vidioc_s_input(struct file *file, void *fh, unsigned int i)
- {
- 	struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file);
--        if (!dev->announce_all_caps && !dev->ready_for_capture)
-+	if (!dev->announce_all_caps && !dev->ready_for_capture)
- 		return -ENOTTY;
- 	if (i == 0)
- 		return 0;
-@@ -1527,7 +1530,7 @@ static int vidioc_qbuf(struct file *file, void *private_data, struct v4l2_buffer
- 		/*  Hopefully fix 'DQBUF return bad index if queue bigger then 2 for capture'
- 			https://github.com/umlaeute/v4l2loopback/issues/60 */
- 		buf->flags &= ~V4L2_BUF_FLAG_DONE;
--	        buf->flags |= V4L2_BUF_FLAG_QUEUED;
-+		buf->flags |= V4L2_BUF_FLAG_QUEUED;
- 
- 		wake_up_all(&dev->read_event);
- 		return 0;
-@@ -1666,7 +1669,7 @@ static int vidioc_streamon(struct file *file, void *private_data, enum v4l2_buf_
- 	default:
- 		return -EINVAL;
- 	}
--        return -EINVAL;
-+	return -EINVAL;
- }
- 
- /* stop streaming
-@@ -1896,8 +1899,8 @@ static ssize_t v4l2_loopback_read(struct file *file,
- 	dev    = v4l2loopback_getdevice(file);
- 
- 	read_index = get_capture_buffer(file);
--        if (read_index < 0)
--          return read_index;
-+	if (read_index < 0)
-+	  return read_index;
- 	if (count > dev->buffer_size)
- 		count = dev->buffer_size;
- 	b = &dev->buffers[read_index].buffer;
-@@ -2034,20 +2037,20 @@ static void init_buffers(struct v4l2_loopback_device *dev)
- 
- 	for (i = 0; i < dev->buffers_number; ++i) {
- 		struct v4l2_buffer *b = &dev->buffers[i].buffer;
--		b->index             = i;
--		b->bytesused         = bytesused;
--		b->length            = buffer_size;
--		b->field             = V4L2_FIELD_NONE;
--		b->flags             = 0;
-+		b->index	     = i;
-+		b->bytesused	     = bytesused;
-+		b->length	     = buffer_size;
-+		b->field	     = V4L2_FIELD_NONE;
-+		b->flags	     = 0;
- #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 1)
--		b->input             = 0;
-+		b->input	     = 0;
- #endif
--		b->m.offset          = i * buffer_size;
--		b->memory            = V4L2_MEMORY_MMAP;
--		b->sequence          = 0;
-+		b->m.offset	     = i * buffer_size;
-+		b->memory	     = V4L2_MEMORY_MMAP;
-+		b->sequence	     = 0;
- 		b->timestamp.tv_sec  = 0;
- 		b->timestamp.tv_usec = 0;
--		b->type              = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+		b->type		     = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- 
- 		v4l2l_get_timestamp(b);
- 	}
-@@ -2077,29 +2080,29 @@ static void init_vdev(struct video_device *vdev, int nr)
- 	vidioc_fill_name(vdev->name, sizeof(vdev->name), nr);
- 
- #ifdef V4L2LOOPBACK_WITH_STD
--	vdev->tvnorms      = V4L2_STD_ALL;
-+	vdev->tvnorms	   = V4L2_STD_ALL;
- #endif /* V4L2LOOPBACK_WITH_STD */
- 
--	vdev->vfl_type     = VFL_TYPE_VIDEO;
--	vdev->fops         = &v4l2_loopback_fops;
--	vdev->ioctl_ops    = &v4l2_loopback_ioctl_ops;
--	vdev->release      = &video_device_release;
--	vdev->minor        = -1;
-+	vdev->vfl_type	   = VFL_TYPE_VIDEO;
-+	vdev->fops	   = &v4l2_loopback_fops;
-+	vdev->ioctl_ops	   = &v4l2_loopback_ioctl_ops;
-+	vdev->release	   = &video_device_release;
-+	vdev->minor	   = -1;
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
- 	vdev->device_caps  =
--		V4L2_CAP_DEVICE_CAPS |
-+		V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT |
-+		V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
- #ifdef V4L2_CAP_VIDEO_M2M
--		V4L2_CAP_VIDEO_M2M |
--#endif
--                V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT |
--                V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
-+	vdev->device_caps  |= V4L2_CAP_VIDEO_M2M;
- #endif
-+#endif /* >=linux-4.7.0 */
-+
- 	if (debug > 1)
--		#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
- 			vdev->debug = V4L2_DEBUG_IOCTL | V4L2_DEBUG_IOCTL_ARG;
--		#else
-+#else
- 			vdev->dev_debug = V4L2_DEV_DEBUG_IOCTL | V4L2_DEV_DEBUG_IOCTL_ARG;
--		#endif
-+#endif
- 
- 	/* since kernel-3.7, there is a new field 'vfl_dir' that has to be
- 	 * set to VFL_DIR_M2M for bidrectional devices */
-@@ -2114,11 +2117,11 @@ static void init_vdev(struct video_device *vdev, int nr)
- static void init_capture_param(struct v4l2_captureparm *capture_param)
- {
- 	MARK();
--	capture_param->capability               = 0;
--	capture_param->capturemode              = 0;
--	capture_param->extendedmode             = 0;
--	capture_param->readbuffers              = max_buffers;
--	capture_param->timeperframe.numerator   = 1;
-+	capture_param->capability		= 0;
-+	capture_param->capturemode		= 0;
-+	capture_param->extendedmode		= 0;
-+	capture_param->readbuffers		= max_buffers;
-+	capture_param->timeperframe.numerator	= 1;
- 	capture_param->timeperframe.denominator = 30;
- }
- 
-@@ -2177,10 +2180,10 @@ static int v4l2_loopback_init(struct v4l2_loopback_device *dev, int nr)
- 	int ret;
- 	struct v4l2_ctrl_handler *hdl = &dev->ctrl_handler;
- 	snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name),
--                        "v4l2loopback-%03d", nr);
--        ret = v4l2_device_register(NULL, &dev->v4l2_dev);
--        if (ret)
--                return ret;
-+			"v4l2loopback-%03d", nr);
-+	ret = v4l2_device_register(NULL, &dev->v4l2_dev);
-+	if (ret)
-+		return ret;
- 
- 	MARK();
- 	dev->vdev = video_device_alloc();
-@@ -2230,7 +2233,7 @@ static int v4l2_loopback_init(struct v4l2_loopback_device *dev, int nr)
- 	setup_timer(&dev->sustain_timer, sustain_timer_clb, nr);
- 	setup_timer(&dev->timeout_timer, timeout_timer_clb, nr);
- #endif
--        dev->reread_count = 0;
-+	dev->reread_count = 0;
- 	dev->timeout_jiffies = 0;
- 	dev->timeout_image = NULL;
- 	dev->timeout_happened = 0;
-@@ -2242,10 +2245,10 @@ static int v4l2_loopback_init(struct v4l2_loopback_device *dev, int nr)
- 	v4l2_ctrl_new_custom(hdl, &v4l2loopback_ctrl_sustainframerate, NULL);
- 	v4l2_ctrl_new_custom(hdl, &v4l2loopback_ctrl_timeout, NULL);
- 	v4l2_ctrl_new_custom(hdl, &v4l2loopback_ctrl_timeoutimageio, NULL);
--        if (hdl->error) {
--                ret = hdl->error;
--                goto error;
--        }
-+	if (hdl->error) {
-+		ret = hdl->error;
-+		goto error;
-+	}
- 	dev->v4l2_dev.ctrl_handler = hdl;
- 
- 	/* FIXME set buffers to 0 */
-@@ -2267,55 +2270,55 @@ static int v4l2_loopback_init(struct v4l2_loopback_device *dev, int nr)
- 	return 0;
- 
- error:
--        v4l2_ctrl_handler_free(&dev->ctrl_handler);
--        v4l2_device_unregister(&dev->v4l2_dev);
-+	v4l2_ctrl_handler_free(&dev->ctrl_handler);
-+	v4l2_device_unregister(&dev->v4l2_dev);
- 	kfree(dev->vdev);
--        return ret;
-+	return ret;
- 
- };
- 
- /* LINUX KERNEL */
- static const struct v4l2_file_operations v4l2_loopback_fops = {
--	.owner   = THIS_MODULE,
--	.open    = v4l2_loopback_open,
-+	.owner	 = THIS_MODULE,
-+	.open	 = v4l2_loopback_open,
- 	.release = v4l2_loopback_close,
--	.read    = v4l2_loopback_read,
--	.write   = v4l2_loopback_write,
--	.poll    = v4l2_loopback_poll,
--	.mmap    = v4l2_loopback_mmap,
--	.unlocked_ioctl   = video_ioctl2,
-+	.read	 = v4l2_loopback_read,
-+	.write	 = v4l2_loopback_write,
-+	.poll	 = v4l2_loopback_poll,
-+	.mmap	 = v4l2_loopback_mmap,
-+	.unlocked_ioctl	  = video_ioctl2,
- };
- 
- static const struct v4l2_ioctl_ops v4l2_loopback_ioctl_ops = {
--	.vidioc_querycap         = &vidioc_querycap,
-+	.vidioc_querycap	 = &vidioc_querycap,
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
--	.vidioc_enum_framesizes  = &vidioc_enum_framesizes,
-+	.vidioc_enum_framesizes	 = &vidioc_enum_framesizes,
- 	.vidioc_enum_frameintervals = &vidioc_enum_frameintervals,
- #endif
- 
- #ifndef HAVE__V4L2_CTRLS
--	.vidioc_queryctrl         = &vidioc_queryctrl,
--	.vidioc_g_ctrl            = &vidioc_g_ctrl,
--	.vidioc_s_ctrl            = &vidioc_s_ctrl,
-+	.vidioc_queryctrl	  = &vidioc_queryctrl,
-+	.vidioc_g_ctrl		  = &vidioc_g_ctrl,
-+	.vidioc_s_ctrl		  = &vidioc_s_ctrl,
- #endif /* HAVE__V4L2_CTRLS */
- 
--	.vidioc_enum_output       = &vidioc_enum_output,
--	.vidioc_g_output          = &vidioc_g_output,
--	.vidioc_s_output          = &vidioc_s_output,
-+	.vidioc_enum_output	  = &vidioc_enum_output,
-+	.vidioc_g_output	  = &vidioc_g_output,
-+	.vidioc_s_output	  = &vidioc_s_output,
- 
--	.vidioc_enum_input       = &vidioc_enum_input,
--	.vidioc_g_input          = &vidioc_g_input,
--	.vidioc_s_input          = &vidioc_s_input,
-+	.vidioc_enum_input	 = &vidioc_enum_input,
-+	.vidioc_g_input		 = &vidioc_g_input,
-+	.vidioc_s_input		 = &vidioc_s_input,
- 
- 	.vidioc_enum_fmt_vid_cap = &vidioc_enum_fmt_cap,
--	.vidioc_g_fmt_vid_cap    = &vidioc_g_fmt_cap,
--	.vidioc_s_fmt_vid_cap    = &vidioc_s_fmt_cap,
--	.vidioc_try_fmt_vid_cap  = &vidioc_try_fmt_cap,
-+	.vidioc_g_fmt_vid_cap	 = &vidioc_g_fmt_cap,
-+	.vidioc_s_fmt_vid_cap	 = &vidioc_s_fmt_cap,
-+	.vidioc_try_fmt_vid_cap	 = &vidioc_try_fmt_cap,
- 
- 	.vidioc_enum_fmt_vid_out = &vidioc_enum_fmt_out,
--	.vidioc_s_fmt_vid_out    = &vidioc_s_fmt_out,
--	.vidioc_g_fmt_vid_out    = &vidioc_g_fmt_out,
--	.vidioc_try_fmt_vid_out  = &vidioc_try_fmt_out,
-+	.vidioc_s_fmt_vid_out	 = &vidioc_s_fmt_out,
-+	.vidioc_g_fmt_vid_out	 = &vidioc_g_fmt_out,
-+	.vidioc_try_fmt_vid_out	 = &vidioc_try_fmt_out,
- 
- #ifdef V4L2L_OVERLAY
- 	.vidioc_s_fmt_vid_overlay = &vidioc_s_fmt_overlay,
-@@ -2323,24 +2326,24 @@ static const struct v4l2_ioctl_ops v4l2_loopback_ioctl_ops = {
- #endif
- 
- #ifdef V4L2LOOPBACK_WITH_STD
--	.vidioc_s_std            = &vidioc_s_std,
--	.vidioc_g_std            = &vidioc_g_std,
--	.vidioc_querystd         = &vidioc_querystd,
-+	.vidioc_s_std		 = &vidioc_s_std,
-+	.vidioc_g_std		 = &vidioc_g_std,
-+	.vidioc_querystd	 = &vidioc_querystd,
- #endif /* V4L2LOOPBACK_WITH_STD */
- 
--	.vidioc_g_parm           = &vidioc_g_parm,
--	.vidioc_s_parm           = &vidioc_s_parm,
-+	.vidioc_g_parm		 = &vidioc_g_parm,
-+	.vidioc_s_parm		 = &vidioc_s_parm,
- 
--	.vidioc_reqbufs          = &vidioc_reqbufs,
--	.vidioc_querybuf         = &vidioc_querybuf,
--	.vidioc_qbuf             = &vidioc_qbuf,
--	.vidioc_dqbuf            = &vidioc_dqbuf,
-+	.vidioc_reqbufs		 = &vidioc_reqbufs,
-+	.vidioc_querybuf	 = &vidioc_querybuf,
-+	.vidioc_qbuf		 = &vidioc_qbuf,
-+	.vidioc_dqbuf		 = &vidioc_dqbuf,
- 
--	.vidioc_streamon         = &vidioc_streamon,
--	.vidioc_streamoff        = &vidioc_streamoff,
-+	.vidioc_streamon	 = &vidioc_streamon,
-+	.vidioc_streamoff	 = &vidioc_streamoff,
- 
- #ifdef CONFIG_VIDEO_V4L1_COMPAT
--	.vidiocgmbuf             = &vidiocgmbuf,
-+	.vidiocgmbuf		 = &vidiocgmbuf,
- #endif
- };
- 
-@@ -2459,10 +2462,10 @@ static void v4l2loopback_cleanup_module(void)
- #ifdef MODULE
- int __init init_module(void)
- {
--        return v4l2loopback_init_module();
-+	return v4l2loopback_init_module();
- }
- void __exit cleanup_module(void) {
--        return v4l2loopback_cleanup_module();
-+	return v4l2loopback_cleanup_module();
- }
- #else
- late_initcall(v4l2loopback_init_module);
diff --git a/system/v4l2loopback/v4l2loopback.SlackBuild b/system/v4l2loopback/v4l2loopback.SlackBuild
index 7d7fadd788..91726509ce 100644
--- a/system/v4l2loopback/v4l2loopback.SlackBuild
+++ b/system/v4l2loopback/v4l2loopback.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for v4l2loopback
 
-# Copyright 2020 Edward W. Koenig <kingbeowulf@gmail.com>
+# Copyright 2020 Edward W. Koenig <kingbeowulf@linuxgalaxy.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=v4l2loopback
-VERSION=${VERSION:-0.12.5}
+VERSION=${VERSION:-0.12.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+KERNEL=${KERNEL:-$(uname -r)}
+PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,18 +82,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
   
-# Fix for older kernels, etc...
-# https://github.com/umlaeute/v4l2loopback/commit/d26e624b4ead762d34152f9f825b3a51fb92fb9c
-# https://github.com/umlaeute/v4l2loopback/commit/7dced0f9e6641b7e9e54ced74c5c7611d10f729f
-# https://github.com/umlaeute/v4l2loopback/commit/72a32a67dee3a67dff76f565551907a2fc7e88e6
-# only set (struct video_device).device_caps on linux>=4.7.0 
-# Set device_caps in init_vdev() for all kernel-versions (not just >4.7.0)
-# Don't set the V4L2_CAP_DEVICE_CAPS on device_caps
-patch -p1 < $CWD/update_to_master_17JUN2020.patch
-
-make
-
-install -D -m 644 $PRGNAM.ko $PKG/lib/modules/$(uname -r)/kernel/extra/$PRGNAM.ko
+make KERNELRELEASE=$KERNEL
+
+install -D -m 644 $PRGNAM.ko $PKG/lib/modules/$KERNEL/kernel/extra/$PRGNAM.ko
 install -D -m 755 utils/$PRGNAM-ctl $PKG/usr/bin/$PRGNAM-ctl
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -95,4 +99,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/v4l2loopback/v4l2loopback.info b/system/v4l2loopback/v4l2loopback.info
index f475983a79..4493c338a9 100644
--- a/system/v4l2loopback/v4l2loopback.info
+++ b/system/v4l2loopback/v4l2loopback.info
@@ -1,10 +1,10 @@
 PRGNAM="v4l2loopback"
-VERSION="0.12.5"
+VERSION="0.12.7"
 HOMEPAGE="https://github.com/umlaeute/v4l2loopback/"
-DOWNLOAD="https://github.com/umlaeute/v4l2loopback/archive/v0.12.5/v4l2loopback-0.12.5.tar.gz"
-MD5SUM="4b0aaae5dd8c4f5dd0f9e2142e92e390"
+DOWNLOAD="https://github.com/umlaeute/v4l2loopback/archive/v0.12.7/v4l2loopback-0.12.7.tar.gz"
+MD5SUM="c3f043931e4d196754ad61346496ccde"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
+EMAIL="kingbeowulf@linuxgalaxy.org"
diff --git a/system/v7sh/README b/system/v7sh/README
new file mode 100644
index 0000000000..6c8b1e743d
--- /dev/null
+++ b/system/v7sh/README
@@ -0,0 +1,18 @@
+v7sh (port of the original Steve Bourne shell from 1978)
+
+This is Nikola Vladov's port of the V7 Unix Bourne shell to
+modern systems, based on Geoff Collyer's port. It functions
+almost identically to the original Bourne shell, with some slight
+differences, and one major one: The original V7 shell didn't support
+comments with the # character, but this one does.
+
+Installing this package adds /bin/v7sh to /etc/shells. The man page is
+also called v7sh, though it calls itself "sh" in the text.
+
+See https://www.in-ulm.de/~mascheck/bourne/ for more information.
+
+See also:
+
+system/etsh - Ken Thompson's shell, from V6 (~1975).
+system/heirloom-sh - newer Bourne shell, based on SVr4 (~1988).
+system/csh - historical version of the C shell.
diff --git a/system/v7sh/doinst.sh b/system/v7sh/doinst.sh
new file mode 100644
index 0000000000..edbdb7ab36
--- /dev/null
+++ b/system/v7sh/doinst.sh
@@ -0,0 +1 @@
+grep -q '^/bin/v7sh$' etc/shells 2>/dev/null || echo '/bin/v7sh' >> etc/shells
diff --git a/system/v7sh/slack-desc b/system/v7sh/slack-desc
new file mode 100644
index 0000000000..ea1e04db41
--- /dev/null
+++ b/system/v7sh/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+v7sh: v7sh (port of the original Steve Bourne shell from 1978)
+v7sh:
+v7sh: This is Nikola Vladov's port of the V7 Unix Bourne shell to
+v7sh: modern systems, based on Geoff Collyer's port. It functions
+v7sh: almost identically to the original Bourne shell, with some
+v7sh: slight differences, and one major one: The original V7 shell
+v7sh: didn't support comments with the # character, but this one does.
+v7sh:
+v7sh: See https://www.in-ulm.de/~mascheck/bourne/ for more information.
+v7sh:
+v7sh:
diff --git a/system/v7sh/v7sh.SlackBuild b/system/v7sh/v7sh.SlackBuild
new file mode 100644
index 0000000000..590838062d
--- /dev/null
+++ b/system/v7sh/v7sh.SlackBuild
@@ -0,0 +1,91 @@
+#!/bin/bash
+
+# Slackware build script for v7sh
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Notes:
+
+# - The source tarball is called v7_sh, but the existing FreeBSD
+#   port of the Version 7 shell is called v7sh. I prefer the name
+#   without the underscore, if only because it's easier to type.
+
+# - I put the shell in /bin/v7sh, and add it to /etc/shells in doinst.sh,
+#   meaning it'll work as a login shell (if anyone's feeling *that*
+#   nostalgic...)
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=v7sh
+SRCNAM=v7_sh
+VERSION=${VERSION:-20100108}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM
+tar xvf $CWD/$SRCNAM.tar.gz
+cd $SRCNAM
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# add timestamp and section/header info to man page
+sed -i \
+    -e '/^\.TH/s|$| "January 8, 2010" "SlackBuilds.org" "UNIX 7th Edition"|' \
+    sh.1
+
+make CFLAGS="$SLKCFLAGS -fcommon"
+
+# no 'make install' target. it's just the binary, man page, and docs.
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/{bin,usr/man/man1} $PKGDOC
+install -s sh $PKG/bin/$PRGNAM
+gzip -9c < sh.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+install -m0644 CHANGES NOTICE.pdf README Version changes_since_v7 $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/v7sh/v7sh.info b/system/v7sh/v7sh.info
new file mode 100644
index 0000000000..6d1b939f74
--- /dev/null
+++ b/system/v7sh/v7sh.info
@@ -0,0 +1,10 @@
+PRGNAM="v7sh"
+VERSION="20100108"
+HOMEPAGE="https://web.archive.org/web/20150805115723/http://riemann.fmi.uni-sofia.bg/sh/"
+DOWNLOAD="https://web.archive.org/web/20150805115723/http://riemann.fmi.uni-sofia.bg/sh/v7_sh.tar.gz"
+MD5SUM="e503e6110a95a8387421f5c938e0ce92"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/vagrant-public-key/vagrant-public-key.SlackBuild b/system/vagrant-public-key/vagrant-public-key.SlackBuild
index 88d40182ad..28fd1abf76 100644
--- a/system/vagrant-public-key/vagrant-public-key.SlackBuild
+++ b/system/vagrant-public-key/vagrant-public-key.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script to package the Vagrant insecure public key.
 
@@ -22,13 +22,23 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=vagrant-public-key
 VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -57,4 +67,4 @@ cp $CWD/vagrant.pub $PKG/etc/vagrant
 chmod 644 $PKG/etc/vagrant
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/vagrant/README b/system/vagrant/README
index ef54445e52..d9d6951f3a 100644
--- a/system/vagrant/README
+++ b/system/vagrant/README
@@ -1,6 +1,7 @@
-Vagrant is a tool for building complete virtualised development environments.
+Vagrant is a tool for building complete virtualised development
+environments.
 
-Vagrant was originally written as a wrapper around VirtualBox, but it now
-supports plugins for Amazon EC2, VMware and other virtualisation software.
-Vagrant also integrates with provisioning software such as Chef, Puppet
-and Ansible.
+Vagrant was originally written as a wrapper around VirtualBox, but it
+now supports plugins for Amazon EC2, VMware and other virtualisation
+software. Vagrant also integrates with provisioning software such as
+Chef, Puppet and Ansible.
diff --git a/system/vagrant/vagrant.SlackBuild b/system/vagrant/vagrant.SlackBuild
index cd8e09f74c..c56726df01 100644
--- a/system/vagrant/vagrant.SlackBuild
+++ b/system/vagrant/vagrant.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # SlackBuild script for vagrant
 
-# Copyright 2013-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
+# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=vagrant
-VERSION=${VERSION:-2.2.14}
+VERSION=${VERSION:-2.2.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 case "$( uname -m )" in
   i?86) ARCH=i586 ;;
@@ -34,7 +37,14 @@ case "$( uname -m )" in
      *) ARCH=$( uname -m ) ;;
 esac
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -63,4 +73,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/vagrant/vagrant.info b/system/vagrant/vagrant.info
index 2c7357aab1..a9f104a145 100644
--- a/system/vagrant/vagrant.info
+++ b/system/vagrant/vagrant.info
@@ -1,10 +1,10 @@
 PRGNAM="vagrant"
-VERSION="2.2.14"
+VERSION="2.2.15"
 HOMEPAGE="https://www.vagrantup.com"
-DOWNLOAD="https://releases.hashicorp.com/vagrant/2.2.14/vagrant_2.2.14_i686.rpm"
-MD5SUM="b0d028b61fb626d8b75ffb7dd0784488"
-DOWNLOAD_x86_64="https://releases.hashicorp.com/vagrant/2.2.14/vagrant_2.2.14_x86_64.rpm"
-MD5SUM_x86_64="e5533e512f43d7e2cae299e25ba019eb"
+DOWNLOAD="https://releases.hashicorp.com/vagrant/2.2.15/vagrant_2.2.15_i686.rpm"
+MD5SUM="ae0d97049ecc03275b12eea6e92c6c91"
+DOWNLOAD_x86_64="https://releases.hashicorp.com/vagrant/2.2.15/vagrant_2.2.15_x86_64.rpm"
+MD5SUM_x86_64="68f7629a4fb363031cc95e00f4c17980"
 REQUIRES=""
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"
diff --git a/system/valkey/README b/system/valkey/README
new file mode 100644
index 0000000000..c722723c10
--- /dev/null
+++ b/system/valkey/README
@@ -0,0 +1,27 @@
+Valkey is an advanced key-value store.
+It is similar to memcached but the dataset is not volatile, and values
+can be strings, exactly like in memcached, but also lists, sets, and
+ordered sets.
+These data types can be manipulated with atomic operations to push/pop
+elements, add/remove elements, perform server side union, intersection,
+difference between sets, and so forth.
+Valkey supports different kinds of sorting abilities.
+
+Valkey is a fork of Redis after licence went proprietary.
+
+Default port for starting the instance can be set with
+VALKEY_PORT=16379
+Defaults remains the Redis port at 6379, hence making it incompatible
+out-of-the-package with a parallel Redis instance running.
+
+valkey-cli is (for now) fully compatible with redis-cli, and defaults
+to redis port 6379.
+
+Valkey still uses, by default, redis binary names, but this script
+replaces them with valkey names: valkey-server, valkey-cli and
+valkey-benchmark, for having it installed alongside Redis.
+Data are also moved to /var/lib/valkey
+This can be reversed by setting the VALKEY_BIN environment variable to
+anything but ON.
+Logs will always be in /var/log/valkey, and RC script is always
+/etc/rc.d/rc.valkey
diff --git a/system/valkey/doinst.sh b/system/valkey/doinst.sh
new file mode 100644
index 0000000000..e4271147e9
--- /dev/null
+++ b/system/valkey/doinst.sh
@@ -0,0 +1,28 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+config etc/valkey/valkey.conf.new
+config etc/valkey/sentinel.conf.new
+config etc/logrotate.d/valkey.new
+preserve_perms etc/rc.d/rc.valkey.new
diff --git a/system/valkey/rc.valkey.new b/system/valkey/rc.valkey.new
new file mode 100644
index 0000000000..aca97e59a7
--- /dev/null
+++ b/system/valkey/rc.valkey.new
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# Valkey startup script for Slackware Linux
+
+PORT=6379
+SERV=/usr/bin/valkey-server
+CLI=/usr/bin/valkey-cli
+PIDFILE=/var/run/valkey_${PORT}.pid
+CONF=/etc/valkey/valkey.conf
+
+valkey_start() {
+  if [ ! -r $CONF ]; then
+    echo "$CONF does not appear to exist.  Abort."
+    exit 1
+  fi
+
+  if [ -s $PIDFILE ]; then
+    echo "Valkey appears to be already running?"
+    exit 1
+  fi
+
+  echo "Starting Valkey server..."
+  $SERV $CONF
+}
+
+valkey_stop() {
+  if [ ! -s $PIDFILE ]; then
+    echo "$PIDFILE does not exist or is empty."
+    exit 1
+  fi
+
+  PID=$(cat $PIDFILE)
+  echo -n "Stopping Valkey server..."
+  $CLI -p $PORT shutdown
+  while [ -d /proc/$PID ]; do
+    sleep 1
+    echo -n "."
+  done
+  echo " done"
+}
+
+valkey_restart() {
+  valkey_stop
+  sleep 3
+  valkey_start
+}
+
+case "$1" in
+  start)
+    valkey_start
+    ;;
+  stop)
+    valkey_stop
+    ;;
+  restart)
+    valkey_restart
+    ;;
+  *)
+    echo "Usage: $0 {start|stop|restart}"
+    exit 1
+esac
diff --git a/system/valkey/slack-desc b/system/valkey/slack-desc
new file mode 100644
index 0000000000..ee7692036d
--- /dev/null
+++ b/system/valkey/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+valkey: valkey (Key-Value Store)
+valkey:
+valkey: Valkey is an advanced key-value store.  It is similar to memcached but
+valkey: the dataset is not volatile, and values can be strings, exactly like
+valkey: in memcached, but also lists, sets, and ordered sets.  These data
+valkey: types can be manipulated with atomic operations to push/pop elements,
+valkey: add/remove elements, perform server side union, intersection,
+valkey: Records are organized in hash table, B+ tree, or a fixed-length array.
+valkey: Valkey supports different kinds of sorting abilities.
+valkey:
+valkey: Homepage: https://valkey.io/
diff --git a/system/valkey/valkey.SlackBuild b/system/valkey/valkey.SlackBuild
new file mode 100644
index 0000000000..a49545716f
--- /dev/null
+++ b/system/valkey/valkey.SlackBuild
@@ -0,0 +1,140 @@
+#!/bin/bash
+
+# Slackware build script for valkey
+
+# Copyright 2024 Yth | Pont-en-Royans, France | yth@ythogtha.org
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=valkey
+VERSION=${VERSION:-7.2.5}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Use our CFLAGS.
+sed -i "s|-O3||" deps/Makefile deps/hiredis/Makefile
+
+# No ./configure necessary.
+#
+# http://lists.slackbuilds.org/pipermail/slackbuilds-users/2013-January/010042.html
+( unset ARCH ; CFLAGS="$SLKCFLAGS" make )
+make install PREFIX=$PKG/usr
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Use sample config and set some sane defaults.
+install -D -m 0644 valkey.conf $PKG/etc/valkey/valkey.conf.new
+sed -i \
+  -e 's|^daemonize no|daemonize yes|' \
+  -e 's|^dir \.|dir /var/lib/valkey|' \
+  -e 's|^logfile ""|logfile /var/log/valkey/valkey.log|' \
+  $PKG/etc/valkey/valkey.conf.new
+install -D -m 0644 sentinel.conf $PKG/etc/valkey/sentinel.conf.new
+
+# Create data directory.
+mkdir -p $PKG/var/lib/valkey
+chmod 0700 $PKG/var/lib/valkey
+
+# Create log directory.
+mkdir -p $PKG/var/log/valkey
+
+# Install init script.
+mkdir -p $PKG/etc/rc.d
+cat $CWD/rc.valkey.new > $PKG/etc/rc.d/rc.valkey.new
+
+# Install logrotate script.
+mkdir -p $PKG/etc/logrotate.d
+cat $CWD/valkey.logrotate > $PKG/etc/logrotate.d/valkey.new
+
+# Specify default port number
+if [ ! -z "$VALKEY_PORT" ]; then
+ sed -i 's/6379/'$VALKEY_PORT'/' $PKG/etc/rc.d/rc.valkey.new
+ sed -i 's/6379/'$VALKEY_PORT'/' $PKG/etc/valkey/valkey.conf.new
+ sed -i 's/default is '$VALKEY_PORT'/default is 6379/' $PKG/etc/valkey/valkey.conf.new
+ sed -i 's/6379/'$VALKEY_PORT'/' $PKG/etc/valkey/sentinel.conf.new
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  *RELEASENOTES* BUGS* CONTRIBUTING* COPYING* MANIFESTO* README* CODE_OF_CONDUCT* SECURITY* TLS* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/valkey/valkey.info b/system/valkey/valkey.info
new file mode 100644
index 0000000000..6101b0c7ae
--- /dev/null
+++ b/system/valkey/valkey.info
@@ -0,0 +1,10 @@
+PRGNAM="valkey"
+VERSION="7.2.5"
+HOMEPAGE="https://valkey.io/"
+DOWNLOAD="https://github.com/valkey-io/valkey/archive/refs/tags/7.2.5/valkey-7.2.5.tar.gz"
+MD5SUM="ecaa4406b2a825ad1d82482354a656e6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/system/valkey/valkey.logrotate b/system/valkey/valkey.logrotate
new file mode 100644
index 0000000000..6db0353540
--- /dev/null
+++ b/system/valkey/valkey.logrotate
@@ -0,0 +1,9 @@
+/var/log/valkey/valkey.log {
+    daily
+    rotate 7
+    copytruncate
+    delaycompress
+    compress
+    notifempty
+    missingok
+}
diff --git a/system/vbindiff/vbindiff.SlackBuild b/system/vbindiff/vbindiff.SlackBuild
index 1e4b96f38d..63486d194d 100644
--- a/system/vbindiff/vbindiff.SlackBuild
+++ b/system/vbindiff/vbindiff.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for vbindiff
 
 # Copyright 2013-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
@@ -19,10 +19,13 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=vbindiff
 VERSION=${VERSION:-3.0_beta5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -32,7 +35,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -97,4 +107,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/vcp/README b/system/vcp/README
index a3839670cc..56fa364378 100644
--- a/system/vcp/README
+++ b/system/vcp/README
@@ -1,6 +1,8 @@
+vcp (copy files via a curses interface)
+
 vcp copies files and directories in a curses interface, with text only
-output available. its options and output are similar to BSD's cp while
-adding some new features.  It provides information on:
+output available. Its options and output are similar to BSD's cp while
+adding some new features. It provides information on:
 
 - files copied and left to copy
 
@@ -8,5 +10,5 @@ adding some new features.  It provides information on:
 
 - data being written every second
 
-- two status bars, one showing current file status, the other total status
-(except with 1 file, both show current), and percentage
+- two status bars, one showing current file status, the other total
+  status (except with 1 file, both show current), and percentage
diff --git a/system/vcp/slack-desc b/system/vcp/slack-desc
index 10dbbbf6ac..ad9f1ad902 100644
--- a/system/vcp/slack-desc
+++ b/system/vcp/slack-desc
@@ -9,8 +9,8 @@
 vcp: vcp (copy files via a curses interface)
 vcp:
 vcp: vcp copies files and directories in a curses interface, with text
-vcp: only output available. its options and output are similar to BSD's
-vcp: cp while adding some new features.  It provides information on:
+vcp: only output available. Its options and output are similar to BSD's
+vcp: cp while adding some new features. It provides information on:
 vcp:
 vcp: - files copied and left to copy
 vcp: - data written and total data size
diff --git a/system/vcp/vcp.SlackBuild b/system/vcp/vcp.SlackBuild
index 29a5f501f7..2b28b63955 100644
--- a/system/vcp/vcp.SlackBuild
+++ b/system/vcp/vcp.SlackBuild
@@ -1,15 +1,23 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for vcp
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20221228 bkw: BUILD=2: use -fcommon rather than
+# -Wl,--allow-multiple-definitions. It probably doesn't matter,
+# but -fcommon is more standard (and easier to grep for).
+# Also tweak the slack-desc slightly.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=vcp
 VERSION=${VERSION:-2.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +27,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,13 +59,10 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-make CFLAGS="$SLKCFLAGS"
+make CFLAGS="$SLKCFLAGS -fcommon"
 
 # "make install" is a mess, do it ourselves:
 mkdir -p $PKG/usr/bin $PKG/etc $PKG/usr/man/man1 $PKG/usr/man/pl/man1
@@ -71,4 +80,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/vcp/vcp.info b/system/vcp/vcp.info
index 6df3d322f7..18ae4e21d4 100644
--- a/system/vcp/vcp.info
+++ b/system/vcp/vcp.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/veracrypt/veracrypt.SlackBuild b/system/veracrypt/veracrypt.SlackBuild
index cb8ff97d09..530c4fa8fb 100644
--- a/system/veracrypt/veracrypt.SlackBuild
+++ b/system/veracrypt/veracrypt.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for VeraCrypt
 
@@ -22,10 +22,20 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+# 20220426 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - don't include empty /usr/share/doc in package.
+
+# 20220209 bkw: Modified by SlackBuilds.org: updated for v1.25.7 since
+# the previous version wouldn't build on 15.0. Also, always use the
+# correct wx-config version.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=veracrypt
-VERSION=${VERSION:-1.22}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.25.7}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +45,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -67,12 +81,12 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 cd src
-make
+make WX_CONFIG=/usr/lib$LIBDIRSUFFIX/wx/config/gtk3-unicode-3.0
 make package
 cp -av Setup/Linux/usr $PKG
 rm -f $PKG/usr/bin/veracrypt-uninstall.sh
@@ -82,9 +96,9 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  $PKG/usr/share/veracrypt/doc/* \
+  $PKG/usr/share/doc/veracrypt/* \
   $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/veracrypt
+rm -rf $PKG/usr/share/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -92,4 +106,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/veracrypt/veracrypt.info b/system/veracrypt/veracrypt.info
index 2c9fd1db86..7d86631c14 100644
--- a/system/veracrypt/veracrypt.info
+++ b/system/veracrypt/veracrypt.info
@@ -1,8 +1,8 @@
 PRGNAM="veracrypt"
-VERSION="1.22"
+VERSION="1.25.7"
 HOMEPAGE="https://www.veracrypt.fr/"
-DOWNLOAD="https://launchpad.net/veracrypt/trunk/1.22/+download/VeraCrypt_1.22_Source.tar.bz2"
-MD5SUM="54dd43d2d9155cf54504dbc57984e822"
+DOWNLOAD="https://launchpad.net/veracrypt/trunk/1.25.7/+download/VeraCrypt_1.25.7_Source.tar.bz2"
+MD5SUM="0a874ac3d109974de33cf10c9860b03f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxGTK3 makeself"
diff --git a/system/vhba-module/README b/system/vhba-module/README
index 9fbdbeab2e..5af5103d89 100644
--- a/system/vhba-module/README
+++ b/system/vhba-module/README
@@ -1,8 +1,12 @@
-This is VHBA (Virtual SCSI Host Bus adapter), a Linux kernel module which
-acts as a low-level SCSI driver and which provides the SCSI layer with a
-virtual SCSI adapter which can have multiple virtual devices.  It is part
-of the userspace-cdemu suite, a free GPL CD/DVD-ROM device emulator for
-linux.
+This is VHBA (Virtual SCSI Host Bus adapter), a Linux kernel module
+which acts as a low-level SCSI driver and which provides the SCSI
+layer with a virtual SCSI adapter which can have multiple virtual
+devices. It is part of the userspace-cdemu suite, a free GPL
+CD/DVD-ROM device emulator for linux.
 
 NOTE:
 The resulting package will be specific for the kernel it was built on.
+
+It is possible to build package for a different kernel version by
+setting the KERNEL variable as in:
+    KERNEL=5.15.94 ./vhba-module.SlackBuild
diff --git a/system/vhba-module/doinst.sh b/system/vhba-module/doinst.sh
index f61efdf685..766ff48186 100644
--- a/system/vhba-module/doinst.sh
+++ b/system/vhba-module/doinst.sh
@@ -1,2 +1 @@
-chroot . /sbin/depmod -a
-
+chroot . /sbin/depmod -a @KERNEL@
diff --git a/system/vhba-module/vhba-module.SlackBuild b/system/vhba-module/vhba-module.SlackBuild
index 64d9365316..f5a8f66431 100644
--- a/system/vhba-module/vhba-module.SlackBuild
+++ b/system/vhba-module/vhba-module.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for vhba-module
 
 # Copyright 2008-2009 Heinz Wiesinger, Amsterdam, The Netherlands
 # Copyright 2010-2012 Niels Horn, Rio de Janeiro, RJ, Brazil <niels.horn@gmail.com>
-# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2018-2024 Isaac Yu <isaacyu@protonmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,25 +24,34 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=vhba-module
-VERSION=${VERSION:-20200106}
+VERSION=${VERSION:-20240202}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-# Setting ARCH is not supported (and the build crashes if ARCH is exported).
-unset ARCH
 case "$( uname -m )" in
-  i?86) SLKARCH=i586 ;;
-  arm*) SLKARCH=arm ;;
-     *) SLKARCH=$( uname -m ) ;;
+  i?86) ARCH=i586 ;;
+  arm*) ARCH=arm ;;
+     *) ARCH=$( uname -m ) ;;
 esac
 
+# Setting ARCH is not supported (and the build crashes if ARCH is exported).
+SLKARCH="$ARCH"
+unset ARCH
+
 KERNEL=${KERNEL:-$(uname -r)}
 PKGKERNEL=$(echo $KERNEL | tr - _)
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-${VERSION}_${PKGKERNEL}-$SLKARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$PRGNAM}
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 set -e
@@ -51,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -60,20 +69,22 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+sed -i "s|\ -Werror||" Makefile
+
 make KERNELRELEASE=$KERNEL
 
 mkdir -p $PKG/lib/modules/$KERNEL/extra
 install -m 0644 vhba.ko $PKG/lib/modules/$KERNEL/extra/
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION"_"$KERNEL
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+  AUTHORS COPYING ChangeLog README \
+  $PKG/usr/doc/$PRGNAM-$VERSION"_"$KERNEL/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION"_"$KERNEL/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_$PKGKERNEL-$SLKARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_$PKGKERNEL-$SLKARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/vhba-module/vhba-module.info b/system/vhba-module/vhba-module.info
index 0662c11db8..40f53d95bb 100644
--- a/system/vhba-module/vhba-module.info
+++ b/system/vhba-module/vhba-module.info
@@ -1,10 +1,10 @@
 PRGNAM="vhba-module"
-VERSION="20200106"
+VERSION="20240202"
 HOMEPAGE="https://cdemu.sourceforge.io/about/vhba/"
-DOWNLOAD="https://downloads.sourceforge.net/cdemu/vhba-module-20200106.tar.bz2"
-MD5SUM="0f0b6d9647197e43929310594afece5f"
+DOWNLOAD="https://downloads.sourceforge.net/cdemu/vhba-module-20240202.tar.xz"
+MD5SUM="ba66d25b257daba715d4870addbd131c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Isaac Yu"
-EMAIL="isaacyu1@isaacyu1.com"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/vice/README b/system/vice/README
index cf93780f1a..7b9ba9f87d 100644
--- a/system/vice/README
+++ b/system/vice/README
@@ -4,5 +4,12 @@ VICE is the one and only Versatile Commodore Emulator. It provides
 emulation of the Commodore C64, C128, VIC20, PET, PLUS4 and CBM-II
 computers.
 
-See README_SBo.txt for build options. The defaults should be fine for
-most users.
+This build includes both the GTK+3 and SDL2[*] menu-based user
+interfaces. The SDL2 binaries are installed with -sdl2 suffix,
+e.g. x64-sdl2 and x128-sdl2.
+
+[*] If you'd rather build with SDL 1.x for some reason, set SDL=1 in
+the environment. The SDL1 binaries are installed with -sdl1 suffix.
+It's also possible to omit the SDL binaries entirely with SDL=no.
+
+To build without PulseAudio, set PULSE=no in the environment.
diff --git a/system/vice/README_SBo.txt b/system/vice/README_SBo.txt
deleted file mode 100644
index e8fd15f8de..0000000000
--- a/system/vice/README_SBo.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Optional dependencies: ffmpeg and SDL2.
-
-Vice can use ffmpeg to record videos of the emulated machine. If
-ffmpeg is installed, it will be autodetected. If you have ffmpeg
-installed but don't want ffmpeg support, you'll have to removepkg
-ffmpeg before building (there's no way to override the autodetection).
-
-By default, vice will be built with SDL2 if it's installed, otherwise
-SDL1. You can set SDL=1 to force building with SDL1 even if SDL2 is
-installed.
-
-If you want to build without PulseAudio, set PULSE=no in the environment.
-
-Note: To use the standard application menu instead of the in-emulator
-PETSCII menu, GTK3 v3.22 is required. Slackware 14.2 ships with 3.18
-and there is no upgrade package for this. Slackware -current has
-3.22. So to use the normal application menus, either use Slackware
--current or find a way to upgrade your Slackware 14.2's GTK3 to
-v3.22. The SlackBuild maintainer has NOT tested this build with
-Slackware -current, you're on your own if it doesn't work (fix it and
-send me a patch if you can).
diff --git a/system/vice/config/vice.png b/system/vice/config/vice.png
deleted file mode 100644
index e001fc8620..0000000000
--- a/system/vice/config/vice.png
+++ /dev/null
diff --git a/system/vice/config/vsid.desktop b/system/vice/config/vsid.desktop
deleted file mode 100644
index c1dfd32f55..0000000000
--- a/system/vice/config/vsid.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=VICE SID Player
-Comment=A SID Player
-StartupNotify=true
-Exec=vsid
-Icon=vice
-Terminal=false
-Type=Application
-Categories=System
diff --git a/system/vice/config/x128.desktop b/system/vice/config/x128.desktop
deleted file mode 100644
index 92ab76c637..0000000000
--- a/system/vice/config/x128.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=VICE C128 emulator
-Comment=A Commodore 128 emulator
-StartupNotify=true
-Exec=x128
-Icon=vice
-Terminal=false
-Type=Application
-Categories=System
diff --git a/system/vice/config/x64.desktop b/system/vice/config/x64.desktop
deleted file mode 100644
index 7991b5ecd9..0000000000
--- a/system/vice/config/x64.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=VICE C64 emulator
-Comment=A fast Commodore 64 emulator
-StartupNotify=true
-Exec=x64
-Icon=vice
-Terminal=false
-Type=Application
-Categories=System
diff --git a/system/vice/config/x64dtv.desktop b/system/vice/config/x64dtv.desktop
deleted file mode 100644
index f3d82b642d..0000000000
--- a/system/vice/config/x64dtv.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=VICE C64DTV emulator
-Comment=A C64DTV emulator
-StartupNotify=true
-Exec=x64dtv
-Icon=vice
-Terminal=false
-Type=Application
-Categories=System
diff --git a/system/vice/config/x64sc.desktop b/system/vice/config/x64sc.desktop
deleted file mode 100644
index 46d5b89ee0..0000000000
--- a/system/vice/config/x64sc.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=VICE C64 emulator
-Comment=An accurate Commodore 64 emulator
-StartupNotify=true
-Exec=x64sc
-Icon=vice
-Terminal=false
-Type=Application
-Categories=System
diff --git a/system/vice/config/xcbm2.desktop b/system/vice/config/xcbm2.desktop
deleted file mode 100644
index 1411e41883..0000000000
--- a/system/vice/config/xcbm2.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=VICE CBM-II emulator
-Comment=A Commodore CBM-II (6x0/7x0) emulator
-StartupNotify=true
-Exec=xcbm2
-Icon=vice
-Terminal=false
-Type=Application
-Categories=System
diff --git a/system/vice/config/xcbm5x0.desktop b/system/vice/config/xcbm5x0.desktop
deleted file mode 100644
index 2acabe36d5..0000000000
--- a/system/vice/config/xcbm5x0.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=VICE CBM-II emulator
-Comment=A Commodore CBM-II (5x0) emulator
-StartupNotify=true
-Exec=xcbm5x0
-Icon=vice
-Terminal=false
-Type=Application
-Categories=System
diff --git a/system/vice/config/xpet.desktop b/system/vice/config/xpet.desktop
deleted file mode 100644
index 1efabc6b61..0000000000
--- a/system/vice/config/xpet.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=VICE PET emulator
-Comment=A Commodore PET emulator
-StartupNotify=true
-Exec=xpet
-Icon=vice
-Terminal=false
-Type=Application
-Categories=System
diff --git a/system/vice/config/xplus4.desktop b/system/vice/config/xplus4.desktop
deleted file mode 100644
index 63f095c95a..0000000000
--- a/system/vice/config/xplus4.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=VICE Plus4 emulator
-Comment=A Commodore Plus4 emulator
-StartupNotify=true
-Exec=xplus4
-Icon=vice
-Terminal=false
-Type=Application
-Categories=System
diff --git a/system/vice/config/xscpu64.desktop b/system/vice/config/xscpu64.desktop
deleted file mode 100644
index 295643f0c8..0000000000
--- a/system/vice/config/xscpu64.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=VICE C64 SuperCPU emulator
-Comment=An accurate SuperCPU64 emulator
-StartupNotify=true
-Exec=xscpu64
-Icon=vice
-Terminal=false
-Type=Application
-Categories=System
diff --git a/system/vice/config/xvic.desktop b/system/vice/config/xvic.desktop
deleted file mode 100644
index d06423e8be..0000000000
--- a/system/vice/config/xvic.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=VICE VIC-20 emulator
-Comment=A Commodore VIC-20 emulator
-StartupNotify=true
-Exec=xvic
-Icon=vice
-Terminal=false
-Type=Application
-Categories=System
diff --git a/system/vice/doinst.sh b/system/vice/doinst.sh
index 2dde7a5cb4..4079257f08 100644
--- a/system/vice/doinst.sh
+++ b/system/vice/doinst.sh
@@ -1,15 +1,13 @@
+if [ -x /usr/bin/xdg-desktop-menu ]; then
+  /usr/bin/xdg-desktop-menu install \
+    usr/share/desktop-directories/vice-org-vice-org.directory \
+    usr/share/applications/vice-org-*.desktop
+fi
+
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
-if [ -x /usr/bin/mkfontdir ]; then
-  ( cd /usr/share/fonts/TTF
-    mkfontscale .
-    mkfontdir .
-  )
+if [ -x /usr/bin/install-info -a -e usr/info/vice.info.gz ]; then
+  /usr/bin/install-info usr/info/vice.info.gz usr/info/dir
 fi
-if [ -x /usr/bin/fc-cache ]; then
-  /usr/bin/fc-cache -f
-fi
-
-chroot . /usr/bin/install-info --info-dir=/usr/info /usr/info/vice.info.gz
diff --git a/system/vice/douninst.sh b/system/vice/douninst.sh
new file mode 100644
index 0000000000..1bef502028
--- /dev/null
+++ b/system/vice/douninst.sh
@@ -0,0 +1,6 @@
+if [ -x /usr/bin/install-info -a -d usr/info ]; then
+  ( cd usr/info
+    rm -f dir
+    for i in *.info*; do /usr/bin/install-info $i dir 2>/dev/null; done
+  )
+fi
diff --git a/system/vice/fix_texi.diff b/system/vice/fix_texi.diff
new file mode 100644
index 0000000000..c1a264538a
--- /dev/null
+++ b/system/vice/fix_texi.diff
@@ -0,0 +1,79 @@
+diff -Naur vice-3.8/doc/vice.texi vice-3.8.patched/doc/vice.texi
+--- vice-3.8/doc/vice.texi	2023-12-24 12:42:36.000000000 -0500
++++ vice-3.8.patched/doc/vice.texi	2024-02-13 20:17:44.907985392 -0500
+@@ -1486,7 +1486,7 @@
+ * Romset files::                Files defining the machine's ROM set.
+ @end menu
+ 
+-@node ROM files, Keymap files, Gtk3 Hotkeys files, System files, System files
++@node ROM files, Keymap files, Hotkeys files, System files
+ @section ROM files
+ 
+ Every emulator requires its own ROM set.  For the VIC20 and the C64, the
+@@ -2415,17 +2415,6 @@
+ Directives are special commands for the parser. They start with
+ @strong{@code{!}} and are case-insensitive.
+ 
+-@menu
+-* !CLEAR::
+-* !DEBUG::
+-* !ELSE::
+-* !ENDIF::
+-* !IF::
+-* !INCLUDE::
+-* !UNDEF::
+-* !WARNING::
+-@end menu
+-
+ @strong{!CLEAR}
+ @quotation
+ 
+@@ -4954,7 +4943,7 @@
+ 
+ xplus4 control ports and devices:
+ 
+-@multitable @columnfractions .05 .33 .05 .05 .05 .05 .05 .05 .05 .05 .05
++@multitable @columnfractions .05 .33 .05 .05 .05 .05 .05 .05 .05 .05 .05 .05 .05
+ @headitem nr
+ @tab device
+ @tab N1
+@@ -8005,8 +7994,8 @@
+ 
+ The windows driver understands various options passed in the so called "mode string"
+ after a colon after the ports name: @code{COMx[:]} @code{[baud=b]} @code{[parity=p]}
+-@code{[data=d]} @code{[stop=s]} @code{[to={on|off}]} @code{[xon={on|off}]} @code{[odsr={on|off}]}
+-@code{[octs={on|off}]} @code{[dtr={on|off|hs}]} @code{[rts={on|off|hs|tg}]} @code{[idsr={on|off}]}
++@code{[data=d]} @code{[stop=s]} @code{[to=on|off]} @code{[xon=on|off]} @code{[odsr=on|off]}
++@code{[octs=on|off]} @code{[dtr=on|off|hs]} @code{[rts=on|off|hs|tg]} @code{[idsr=on|off]}
+ @end table
+ 
+ @table @code
+@@ -8142,8 +8131,8 @@
+ 
+ The windows driver understands various options passed in the so called "mode string"
+ after a colon after the ports name: @code{COMx[:]} @code{[baud=b]} @code{[parity=p]}
+-@code{[data=d]} @code{[stop=s]} @code{[to={on|off}]} @code{[xon={on|off}]} @code{[odsr={on|off}]}
+-@code{[octs={on|off}]} @code{[dtr={on|off|hs}]} @code{[rts={on|off|hs|tg}]} @code{[idsr={on|off}]}
++@code{[data=d]} @code{[stop=s]} @code{[to=on|off]} @code{[xon=on|off]} @code{[odsr=on|off]}
++@code{[octs=on|off]} @code{[dtr=on|off|hs]} @code{[rts=on|off|hs|tg]} @code{[idsr=on|off]}
+ @end table
+ 
+ @table @code
+@@ -9332,7 +9321,7 @@
+ 
+ @c ----------------------------------------------------------------
+ 
+-@c @node Misc settings,  , Monitor settings, Settings and resources
++@node Misc settings,  , Monitor settings, Settings and resources
+ @c @section Miscellaneous settings
+ 
+ @node Machine-specific features, Platform-specific features, Settings and resources, Top
+@@ -20784,7 +20773,7 @@
+ @end table
+ 
+ 
+-@c @node Miscellaneous commands,  , Profiling commands, Monitor
++@node Miscellaneous commands,  , Profiling commands, Monitor
+ @section Resources commands
+ 
+ @table @code
diff --git a/system/vice/man/c1541.1 b/system/vice/man/c1541.1
new file mode 100644
index 0000000000..5182a99e46
--- /dev/null
+++ b/system/vice/man/c1541.1
@@ -0,0 +1,162 @@
+.TH C1541 1 "May 2018" "VICE"
+.SH NAME
+c1541 \- a stand alone disk image maintenance program
+.SH SYNOPSIS
+.IR c1541
+[options] [image]
+.SH DESCRIPTION
+.IR c1541
+is a stand alone program that can be used for D64, D71, D81, X64 and G64
+disk image file maintenance.  It is part of the
+.IR VICE
+emulator.
+.P
+.IR c1541
+can be used both in interactive and batch mode.  It will start in interactive
+mode if no images and no options are specified or if one image is specified;
+when started in interactive mode, command line editing and command history
+are available.
+.P
+Each command line option for use in batch mode has an interactive mode
+counterpart, that is shown in parenthesis.
+.TP 8
+.B \-@ \fIcommand\fR
+execute CBM DOS command
+.TP
+.B \-attach \fIimage\fR (attach \fIimage\fR)
+attach \fIimage\fR for use.  All consequent commands in interactive mode will
+refer to this image.
+.TP
+.B \-bam [\fIunit\fR] | \fItrack-min\fR \fItrack_max\fR [\fIunit\fR] (bam [\fIunit\fR] | \fItrack-min\fR \fItrack_max\fR [\fIunit\fR])
+show bam bitmap of an imagem optionally specifying unit and/or a slice of the tracks using \fItrack-min\fR and \fItrack-max\fR.
+.TP
+.B \-bcopy \fIsrc_trk\fR \fIsrc_sec\fR \fIdst_trk\fR \fIdst_sec\fR [\fIsrc_unit\fR [\fIdst_unit\fR]] (bcopy \fIsrc_trk\fR \fIsrc_sec\fR \fIdst_trk\fR \fIdst_sec\fR [\fIsrc_unit\fR [\fIdst_unit\fR]])
+copy a block to another block. When not using the optional unit numbers, the block is copied among the current unit. If one unit (\fIsrc_unit\fR) is specified that unit is used for both source and destination. Using both unit number allows copying blocks between different units.
+.TP
+.B \-bfill \fItrack\fR \fIsector\fR \fIvalue\fR \fI[unit]\fR (bfill \fItrack\fR \fIsector\fR \fIvalue\fR \fI[unit]\fR)
+fill a block with a single value.
+.TP
+.B \-block \fItrack\fR \fIsector\fR \fI[offset]\fR \fI[unit]\fR (block \fItrack\fR \fIsector\fR \fI[offset]\fR \fI[unit]\fR)
+show disk blocks in hex format.
+.TP
+.B \-bpoke [\fI[@unit:]\fR \fItrack\fR \fIsector\fR \fIoffset\fR \fIdata\fR (bpoke [\fI[@unit:]\fR \fItrack\fR \fIsector\fR \fIoffset\fR \fIdata\fR)
+poke data into a block. The \fIdata\fR list should be at least a single byte. Multiple prefixes for the data are supported: 0x/$ for hex, 0b/% for binary, & for octal and unadorned for plain decimal.
+.TP
+.B \-bread \fIfilename\fR \fItrack\fR \fIsector\fR [\fIunit\fR] (bread \fIfilename\fR \fItrack\fR \fIsector\fR [\fIunit\fR])
+read a block from the disk image at (\fItrack\fR,\fIsector\fR) and write it to the host file system as \fIfilename\fR.
+.TP
+.B \-bwrite \fIfilename\fR \fItrack\fR \fIsector\fR [\fIunit\fR] (bwrite \fIfilename\fR \fItrack\fR \fIsector\fR [\fIunit\fR])
+write a block from \fIfilename\fR on the host file system to a disk image at (\fItrack\fR,\fIsector\fR).
+.TP
+.B \-chain \fItrack\fR \fIsector\fR \fi[unit]\fR (chain \fItrack\fR \fIsector\fR \fI[unit]\fR)
+show block chain starting at (\fItrack\fR,\fIsector\fR). The last number shown is the number of bytes in the final block.
+.TP
+.B \-copy \fIimage\fR \fIoldname1\fR \fI[oldname2...]\fR \fInewname\fR (copy \fIoldname1\fR \fI[oldname2...]\fR \fInewname\fR)
+concatenate \fIoldname1\fR, \fIoldname2\fR... into \fInewname\fR on \fIimage\fR
+(can be used to copy files).
+.TP
+.B \-delete \fIimage\fR \fIfiles...\fR (delete \fIfiles...\fR)
+delete \fIfiles\fR from \fIimage\fR
+.TP
+.B \-dir \fI[pattern]\fR (dir \fI[pattern]\fR)
+list directory. See the \fBlist\fR command for details.
+.TP
+.B \-extract \fIimage\fR (extract \fIimage\fR)
+extract all files from \fIimage\fR.
+.TP
+.B \-format \fIimage\fR (format \fIimage\fR '\fIname,id\fR')
+format the disk image \fIimage\fR with the specified label.  \fIimage\fR is
+created if it does not exist.
+.TP
+.B \-geosextract \fIsource\fR (geosextract \fIsource\fR)
+extract all the files to the file system and GEOS Convert them.
+.TP
+.B \-geosread \fIsource\fR \fI[destination]\fR (geosread \fIsource\fR \fI[destination]\fR)
+read GEOS \fIsource\fR from the disk image and copy it as a Convert file into
+\fIdestination\fR in the file system. If \fIdestination\fR is not specified,
+copy it into a file with the same name as \fIsource\fR.
+Please note that since GEOS files are stored in ASCII, violating CBMDOS
+conventions, the filename should be given in inverted case.
+.TP
+.B \-geoswrite \fIsource\fR (geoswrite \fIsource\fR)
+write GEOS Convert file \fIsource\fR from the file system on a disk image.
+.TP
+.B \-help \fI[command]\fR (help)
+show help on all commands or more detailed help on a specific \fIcommand\fR
+.TP
+.B \-info \fIimage\fR \fI[unit]\fR (info \fI[unit]\fR)
+show information about image (format, geometry, error-block, write-protect)
+.TP
+.B \-list \fI[pattern]\fR (list)
+list directory. The optional \fIpattern\fR accepts the usual
+CBM DOS wildcards (\fB*\fR and \fB?\fR) and also supports file type selection
+with '=X', where \fBX\fR is one of \fBS\fR, \fBP\fR, \fBU\fR or \fBR\fR.
+Multiple sub patterns can be specified by using comma's.
+.TP
+.B \-name \fIdiskname[,id]\fR \fI[unit]\fR (name \fIdiskname[,id]\fR \fI[unit]\fR)
+set diskname and optionally id.
+.TP
+.B \-p00save \fIenable\fR \fI[unit]\fR (p00save \fIenable\fR \fI[unit\fR)
+save P00 files to the file system.
+.TP
+.B \-read \fIimage\fR \fI1541name\fR \fI[fsname]\fR (read \fI1541name\fR \fI[fsname]\fR)
+extract \fI1541name\fR from the disk image into \fIfsname\fR (\fI1541name\fR
+by default) from \fIimage\fR.
+.TP
+.B \-rename \fIoldname\fR \fInewname\fR (rename \fIoldname\fR \fInewname\fR)
+rename files. The files must be on the same drive.
+.TP
+.B \-show \fI'copying'\fR|\fI'warranty'\fR (show \fI'copying'\fR|\fI'warranty'\fR)
+show license or warranty information.
+.TP
+.B \-tape \fIimage\fR \fItapeimage\fR \fI[files...]\fR (tape \fIimage\fR \fItapeimage\fR \fI[files...]\fR)
+transfer \fIfiles\fR from \fItapeimage\fR to \fIimage\fR (default is all files).
+.TP
+.B \-unlynx \fIarchive\fR \fI[unit]\fR (unlynx \fIarchive\fR \fI[unit]\fR)
+dissolve Lynx \fIarchive\fR.
+.TP
+.B \-validate \fIimage\fR (validate)
+validate \fImage\fR.
+.TP
+.B \-verbose \fR[off] (verbose [off])
+set verbose mode. Output extra logging information, disable with \fBverbose off\fR.
+.TP
+.B \-write \fIimage\fR \fIfsname\fR \fI[1541name]\fR (write \fIfsname\fR \fI[1541name]\fR)
+write \fIfsname\fR to \fIimage\fR as \fI1541name\fR (\fIfsname\fR by default).
+(works with \fIP00\fR files as well).
+.TP
+.B \-zcreate \fIx64name\fR \fIzipname\fR [\fIlabel,id\fR] (zcreate \fIx64name\fR \fIzipname\fR [\fIlabel,id\fR]
+create an X64 disk image from four Zipcoded files named \fI1!zipname\fR through
+\fI4!zipname\fR.
+.P
+When more than one command is specified in batch mode, all of them are
+executed in the same order they have on the command line.
+.P
+If you use
+.B \-
+as a file name, it stands for \fIstdin\fR or \fIstdout\fR.
+.P
+Exit interactive mode with either \fBexit\fR or \fBquit\fR.
+.SH SEE ALSO
+.BR vice(1),
+.BR cartconv(1),
+.BR petcat(1)
+.P
+@HTMLDOC@
+.SH AUTHORS
+Teemu Rantanen <tvr@cs.hut.fi>
+.br
+Ettore Perazzoli <ettore@comm2000.it>
+.br
+Andreas Boose <boose@linux.rz.fh-hannover.de>
+.br
+Jouko Valta <jopi@stekt.oulu.fi>
+.P
+with improvements by
+.P
+.br
+Olaf Seibert <rhialto@mbfys.kun.nl>
+.br
+Gerhard Wesp <gwesp@cosy.sbg.ac.at>
+.br
+Bas Wassink <b.wassink@ziggo.nl>
diff --git a/system/vice/man/cartconv.1 b/system/vice/man/cartconv.1
new file mode 100644
index 0000000000..4bf0a7dae8
--- /dev/null
+++ b/system/vice/man/cartconv.1
@@ -0,0 +1,247 @@
+.TH CARTCONV 1 "March 2017" "VICE"
+.SH NAME
+cartconv \- a stand alone cartridge conversion program
+.SH SYNOPSIS
+.IR cartconv
+[options]
+.SH DESCRIPTION
+.IR cartconv
+is a cartridge conversion utility, it can convert between binary and .crt
+images and it can 'insert' binary and/or .crt images into the EPROM type of
+cartridges. It is part of the
+.IR VICE
+emulator.
+.TP 8
+.B \-i \fIinput name\fR
+This parameter is mandatory, it should contain the name of the binary/.crt
+file you want to convert. For the EPROM type of cartridges this parameter
+can be used multiple times to insert images into the resulting file.
+.TP
+.B \-o \fIoutput name\fR
+This parameter is mandatory, it should contain the name of the binary/.crt
+file you want to convert the input file to.
+.TP
+.B \-t \fIcarttype\fR
+This parameter is optional. It is only needed when converting to a .crt
+file. See below for the supported cartridge types.
+.TP
+.B \-n \fIcart name\fR
+This parameter is optional and is used as the cartridge name when creating
+a .crt file.
+.TP
+.B \-l \fIloadaddress\fR
+This parameter is optional and is used as the load-address when converting
+a .crt file to a .prg file, or when converting to a generic type .crt file.
+.TP
+.B \-f \fIinput name\fR
+This parameter is optional, and is meant to output information about the
+named file. It can't be used in conjuction with any of the other parameters.
+.TP
+.B \-r
+This parameter is optional, it enables repair mode (accept broken input files)
+.TP
+.B \-q
+This parameter is optional, it disables all non-error messages
+.P
+
+The following cartridge types are supported:
+
+.TP
+.B bin
+Binary .bin file (Default crt->bin)
+.TP
+.B normal
+Generic 8kB/12kB/16kB .crt file (Default bin->crt)
+.TP
+.B prg
+Binary C64 .prg file with load-address
+.TP
+.B ulti
+Ultimax mode 4kB/8kB/16kB .crt file
+.TP
+.B ap
+Atomic Power .crt file
+.TP
+.B ar2
+Action Replay MK2 .crt file
+.TP
+.B ar3
+Action Replay MK3 .crt file
+.TP
+.B ar4
+Action Replay MK4 .crt file
+.TP
+.B ar5
+Action Replay V5 .crt file
+.TP
+.B cap
+Capture .crt file
+.TP
+.B comal
+Comal 80 .crt file
+.TP
+.B dep256
+Dela EP256 .crt file, extra files can be inserted
+.TP
+.B dep64
+Dela EP64 .crt file, extra files can be inserted
+.TP
+.B dep7x8
+Dela EP7x8 .crt file, extra files can be inserted
+.TP
+.B din
+Dinamic .crt file
+.TP
+.B dsm
+Diashow-Maker .crt file
+.TP
+.B easy
+EasyFlash .crt file
+.TP
+.B ecr
+Easy Calc Result .crt file
+.TP
+.B epyx
+Epyx FastLoad .crt file
+.TP
+.B exos
+EXOS .crt file
+.TP
+.B expert
+Expert Cartridge .crt file
+.TP
+.B f64
+Formel 64 .crt file
+.TP
+.B fc1
+The Final Cartridge .crt file
+.TP
+.B fc3
+The Final Cartridge III .crt file
+.TP
+.B fcp
+Final Cartridge Plus .crt file
+.TP
+.B ff
+Freeze Frame .crt file
+.TP
+.B fm
+Freeze Machine .crt file
+.TP
+.B fp
+Fun Play .crt file
+.TP
+.B gk
+Game Killer .crt file
+.TP
+.B gmod2
+GMod2 .crt file
+.TP
+.B gs
+C64 Games System .crt file
+.TP
+.B ide64
+IDE64 .crt file
+.TP
+.B ieee
+IEEE-488 Interface .crt file
+.TP
+.B kcs
+KCS Power Cartridge .crt file
+.TP
+.B ks
+Kingsoft .crt file
+.TP
+.B mach5
+MACH 5 .crt file
+.TP
+.B md
+Magic Desk .crt file
+.TP
+.B mf
+Magic Formel .crt file
+.TP
+.B mikro
+Mikro Assembler .crt file
+.TP
+.B mmc64
+MMC64 .crt file
+.TP
+.B mmcr
+MMC Replay .crt file
+.TP
+.B mv
+Magic Voice .crt file
+.TP
+.B ocean
+Ocean .crt file
+.TP
+.B p64
+Prophet64 .crt file
+.TP
+.B pf
+Pagefox .crt file
+.TP
+.B rep256
+REX 256k EPROM Cart .crt file, extra files can be inserted
+.TP
+.B rgcd
+RGCD .crt file
+.TP
+.B ross
+ROSS .crt file
+.TP
+.B rr
+Retro Replay .crt file
+.TP
+.B rrnet
+RR-Net MK3 .crt file
+.TP
+.B ru
+REX Utility .crt file
+.TP
+.B s64
+Snapshot 64 .crt file
+.TP
+.B sb
+Structured BASIC .crt file
+.TP
+.B se5
+Super Explode V5.0 .crt file
+.TP
+.B sg
+Super Games .crt file
+.TP
+.B silver
+Silverrock 128K Cartridge .crt file
+.TP
+.B simon
+Simons' BASIC .crt file
+.TP
+.B ss4
+Super Snapshot V4 .crt file
+.TP
+.B ss5
+Super Snapshot V5 .crt file
+.TP
+.B star
+Stardos .crt file
+.TP
+.B wl
+Westermann Learning .crt file
+.TP
+.B ws
+Warp Speed .crt file
+.TP
+.B zaxxon
+Zaxxon .crt file
+@end table
+
+.SH SEE ALSO
+.BR vice(1),
+.BR c1541(1),
+.BR petcat(1)
+.P
+@HTMLDOC@
+.SH AUTHORS
+Marco van den Heuvel <blackystardust68@yahoo.com>
diff --git a/system/vice/man/petcat.1 b/system/vice/man/petcat.1
new file mode 100644
index 0000000000..e49cc3afc5
--- /dev/null
+++ b/system/vice/man/petcat.1
@@ -0,0 +1,219 @@
+.TH PETCAT 1 "March 2017" "VICE" "C64 Program Development"
+.nr X
+.SH NAME
+petcat \- convert and display PETSCII or BASIC files
+.SH SYNOPSIS
+.IR petcat
+[
+.B \-text
+|
+\-<\fIversion\fR>
+|
+.B \-w<\fIversion\fR>
+|
+.B \-k<\fIversion\fR>
+] [
+.B \-l \fIhexaddr\fR
+] [
+.B \-c
+|
+.B \-nc
+] [
+.B \-o \fIoutfile\fR
+] [
+.B \-skip \fIoffset\fR
+] [
+\--
+] [
+.B file list
+]
+.SH DESCRIPTION
+.IR petcat
+converts input files from the most common CBM file formats into
+printable ASCII form and writes to standard output. The type
+of input file is determined automatically, if possible, and
+appropriate conversion is performed.
+Since a few of the BASIC versions have keywords defined differently,
+the right conversion has to be selected on the command line.
+Where such confusion cannot happen, automatical recognition of input
+is used. This is useful when expanding several files at once or if
+the program contains code for several versions, selected according to
+the hardware; eg. Simons' Basic vs. Basic 7.0.
+.br
+Please note that each input file is converted individually,
+but the output is produced as continuous flow. Also, all input
+files that are read trough a pipe, are concatenated before they
+reach
+.IR petcat
+so any machine language section in between the BASIC programs causes
+all consecutive files to be taken as one machine language program.
+For that reason files containing machine language parts attached to
+them must be input separately, otherwise the remaining files won't
+be expanded.
+.IR petcat
+recognizes normal PETSCII text files (SEQ), program files containing
+directory listing, and BASIC programs. Both the original CBM files and
+files with a PC64 `P00' header are accepted. The different BASIC versions
+are not automatically distinguished, but standard C64 and C128 versions
+are used as default.
+.br
+In order to tokenize a text file into a BASIC binary file the desired
+BASIC version must be exclusively specified so that correct set of
+keywords will be used.
+If line numbers are not found in the beginning of each program line,
+the cruncher creates the missing line numbers by adding 2 to the numeric
+value of previous one.
+Since also line numbers deviating from strictly ascendind order are
+accepted, care must be taken when editing such a program on a C64 again.
+.SS Clarification
+.LP
+Since CBM programs usually contain unprintable characters, a way to
+specify them has been created.
+Normally,
+.IR petcat
+uses the same codes as most printers, but for tokenizing programs
+scanned from magazines, it can use the following convention:
+.br
+.TP 12
+.BR "{DOWN}"
+stands for single control code
+.TP
+.BR "{6 RIGHT}"
+contains amout of consecutive codes
+.TP
+List of valid mnemonics:
+.br
+{wht} {dish} {ensh} {swlc} {down} {rvon} {home} {del} {esc} {red}
+{rght} {grn} {blu} {orng} {F1} {F3} {F5} {F7} {F2} {F4} {F6} {F8}
+{sret} {swuc} {blk} {up} {rvof} {clr} {inst} {brn} {lred} {gry1}
+{gry2} {lgrn} {lblu} {gry3} {pur} {left} {yel} {cyn}
+.TP
+List of alternate mnemonics:
+.br
+{wht} {up/lo lock on} {up/lo lock off} {return} {lower case} {down}
+{rvs on} {home} {delete} {esc} {red} {right} {grn} {blu} {orange}
+{f1} {f3} {f5} {f7} {f2} {f4} {f6} {f8} {shift return} {upper case}
+{blk} {up} {rvs off} {clr} {insert} {brown} {lt red} {grey1} {grey2}
+{lt green} {lt blue} {grey3} {pur} {left} {yel} {cyn}
+.SH OPTIONS
+.TP 8
+.B \-l \fIload_address\fR
+Specify \fIload_address\fR (in hex) for tokenized program.
+.TP
+.B \-c
+Causes
+.IR petcat
+to interpret also control characters.
+By default, these strings are the same as used by printers. However,
+an alternate set is attempted whenever none within the primary set
+matches. Default is ON, unless text mode is selected.
+.TP
+.B \-nc
+Suppress control codes.
+.TP
+.B \-f
+Force overwrite of existing output file. Default true.
+.TP
+.B \-h
+Print filename and start address for each Basic file expanded. Default true.
+.TP
+.B \-nh
+Suppress file header in printout.
+.TP
+.B \-o \fIfile\fR
+Redirect output to the specified \fIfile\fR. This option overrules -h.
+When \fIfile\fP has extension `.P00' and also -w option is specified, the PC64
+file header is written automatically. .P00 file cannot be written on stdout
+but to a file only.
+.TP
+.B \-skip \fIoffset\fR
+Skip \fIoffset\fR bytes in the beginning of input file.
+.TP
+.B \-text
+Force text mode even if the input file looks like a Basic program, i.e.
+the first byte in file is 01.
+.TP
+.B \-k<\fIversion\fR>
+Just prints all valid keywords for the specified Basic \fIversion\fR.
+Without any \fIversion\fR, all names of supported BASIC versions are
+listed instead.
+.TP
+.B \-w<\fIversion\fR>
+Tokenise program listing using keywords set from the specified Basic
+\fIversion\fR.
+.TP
+\-<\fIversion\fR>
+Changes the set of keywords for the specified Basic \fIversion\fR and
+expands tokenized input file.
+Without this option
+.IR petcat
+uses V7.0 keywords in expanding.
+.SS Versions
+.TP 14
+.B 1
+Basic 1.0
+.TP
+.B 2
+Basic 2.0
+.TP
+.B a
+Basic 2.0 with AtBasic
+.TP
+.B t
+Basic 2.0 with Turtle Basic
+.TP
+.B super su se
+Basic 2.0 with Super Expander
+.TP
+.B simon si
+Basic 2.0 and Simons' Basic
+.TP
+.B speech sp
+Basic 2.0 with Speech Basic v2.7
+.TP
+.B 4
+Basic 4.0
+.TP
+.B 4e
+Basic 4.0 Extension
+.TP
+.B 3
+Basic 3.5
+.TP
+.B 7
+Basic 7.0
+.TP
+.B 10
+Basic 10.0
+.SH RESTRICTIONS
+.LP
+Line numbers must be less than 65536.
+Maximum line length is 255 bytes. Leading white space is ignored.
+Blank lines and line numbers not followed by any text are rejected.
+While expanding, Machine Language section concatenated to a BASIC
+program is ignored.
+While crunching, control codes that appear outside quotes are not
+interpreted.
+The low order byte of load address must be "01".
+.SH SEE ALSO
+.BR cat(1),
+.BR tr(1),
+.BR sed(1),
+.BR fvcbm(1),
+.BR petlp(1),
+.BR cbmconvert(1),
+.BR iso2asc(1),
+.BR ascii(7),
+.BR "\fICBM Tokens Documentation\fP",
+.BR "CBM's \fIProgrammers' Reference Guide\fP series"
+.P
+@HTMLDOC@
+.SH AUTHOR
+  Jouko Valta    (jopi@stekt.oulu.fi)
+.SH Thanks to
+  Frederik Ekman (d91fe@lelle.pt.hk-r.se)
+  Marko M\(:akel\(:a   (msmakela@nic.funet.fi)
+  Russell Alphey (r.alphey@dce.vic.gov.au)
+  Andr\('e Fachat   (a.fachat@physik.tu-chemnitz.de)
+  Onno Ebbinge   (ebbin200@hio.tem.NHL.NL)
+  Frank Kontros  (jeno@kontr.uzhgorod.ua)
diff --git a/system/vice/man/vice.1 b/system/vice/man/vice.1
new file mode 100644
index 0000000000..b15ee17c81
--- /dev/null
+++ b/system/vice/man/vice.1
@@ -0,0 +1,183 @@
+.TH VICE 1 "August 2021" VICE "SlackBuilds.org"
+.SH NAME
+VICE - Versatile Commodore Emulator and Virtual Commodore Environment
+.SH DESCRIPTION
+.I VICE
+is a multi-platform emulator of the Commodore PET, CBM-II,
+VIC20, C64, C64DTV, C128 and Plus4 8-bit computers. The emulators run as
+separate programs, but have the same user interface, share the same
+settings and support the same file formats. Also some external
+utilities are provided.
+.P
+VICE is made up of the following programs:
+.TP 8
+.B x64
+a fast Commodore 64 emulator
+.TP
+.B x64sc
+an accurate Commodore 64 emulator
+.TP
+.B xscpu64
+an accurate SCPU64 emulator
+.TP
+.B x64dtv
+a C64DTV emulator
+.TP
+.B x128
+a Commodore 128 emulator
+.TP
+.B xvic
+a Commodore VIC20 emulator
+.TP
+.B xpet
+a Commodore PET emulator
+.TP
+.B xplus4
+a Commodore Plus4 emulator
+.TP
+.B xcbm2
+a Commodore CBM-II (6x0/7x0) emulator
+.TP
+.B xcbm5x0
+a Commodore CBM-II (5x0) emulator
+.TP
+.B vsid \fI[*]\fR
+a SID player
+.TP
+.B c1541 \fI[*]\fR
+a stand-alone disk image maintenance utility;
+.TP
+.B petcat \fI[*]\fR
+a Commodore BASIC (de)tokenizer;
+.TP
+.B cartconv \fI[*]\fR
+a cartridge file (bin<--->crt) converter;
+.PP
+Programs marked with \fI[*]\fR have their own man pages.
+.PP
+Any of the above programs can be run with the \fB\-\-help\fR option to
+get a list of command\-line options; there are too many to list here.
+You might want to pipe the output through a pager, e.g.
+.PP
+.B
+x64 \-\-help | less
+.PP
+The whole documentation for these programs is available in HTML
+format; the main file should be installed on your system as
+@HTMLDOC@
+.P
+The same documentation is available in PDF form as
+@PDFDOC@, or by selecting \fIHelp \-> Browse Manual\fR from within the emulator.
+.P
+For up to date news about VICE, have a look at the official home page
+at
+.P
+.RS
+http://vice-emu.sourceforge.net/
+.SH SEE ALSO
+.BR petcat(1),
+.BR cartconv(1),
+.BR c1541(1)
+.SH AUTHORS
+Marco van den Heuvel <blackystardust68@yahoo.com>
+.br
+Fabrizio Gennari <fabrizio.ge@tiscalinet.it>
+.br
+Groepaz <groepaz@gmx.net>
+.br
+Errol Smith <strobey@users.sourceforge.net>
+.br
+Olaf Seibert <rhialto@falu.nl>
+.br
+Marcus Sutton <loggedoubt@gmail.com>
+.br
+Kajtar Zsolt <soci@c64.rulez.org>
+.br
+AreaScout <areascout@gmx.at>
+.br
+Bas Wassink <b.wassink@ziggo.nl>
+.br
+Michael C. Martin <mcmartin@gmail.com>
+.br
+David Hogan <david.q.hogan@gmail.com>
+.br
+Martin Pottendorfer <pottendo@gmx.net>
+.br
+Stefan Haubenthal <polluks@users.sourceforge.net>
+.br
+BSzili <col.lawrence@gmail.com>
+.br
+Andreas Matthies <andreas.matthies@gmx.net>
+.br
+Daniel Kahlin <daniel@kahlin.net>
+.br
+Benjamin 'BeRo' Rosseaux <benjamin@rosseaux.com>
+.br
+Ulrich Schulz <peiselulli@t-online.de>
+.br
+Thomas Giesel <skoe@directbox.com>
+.br
+Ingo Korb <ingo@akana.de>
+.br
+Antti S. Lankila <alankila@bel.fi>
+.br
+Christian Vogelgsang <chris@vogelgsang.org>
+.br
+Dag Lem <resid@nimrod.no>
+.br
+Spiro Trikaliotis <Spiro.Trikaliotis@gmx.de>
+.br
+Hannu Nuotio <hannu.nuotio@tut.fi>
+.br
+Andreas Boose <viceteam@t-online.de>
+.br
+Tibor Biczo <crown@mail.matav.hu>
+.br
+M. Kiesel <mayne@users.sourceforge.net>
+.br
+Andreas Dehmel <zarquon@t-online.de>
+.br
+David Hansel <david@hansels.net>
+.br
+Markus Brenner <markus@brenner.de>
+.br
+Thomas Bretz <tbretz@ph.tum.de>
+.br
+Daniel Sladic <sladic@eecg.toronto.edu>
+.br
+Andr\('e Fachat <fachat@physik.tu-chemnitz.de>
+.br
+Ettore Perazzoli <ettore@comm2000.it>
+.br
+Teemu Rantanen <tvr@cs.hut.fi>
+.br
+Jouko Valta <jopi@stekt.oulu.fi>
+.br
+Jarkko Sonninen <sonninen@lut.fi>
+.br
+Mikkel Holm Olsen <vice-dk@symlink.dk>
+.br
+Manuel Antonio Rodriguez Bas <formater@winuaespanol.com>
+.br
+Paul Dub\('e 
+.br
+Czirkos Zoltan <cirix@fw.hu>
+.br
+Karai Csaba <cskarai@freemail.hu>
+.br
+Andrea Musuruane <musuruan@bmm.it>
+.br
+Jesse Lee <interpreters.jesse@gmail.com>
+.br
+Jarek Sobolewski <r@sledinmay.com>
+.br
+Michael Litvinov <litvinov.m@i.ua>
+.br
+Peter Krefting <peter@softwolves.pp.se>
+.br
+Emir Akaydin (aka: Skate) <emir@akaydin.com>
+.br
+with several contributions from other people around the world; see the
+HTML documentation for more information.
+
+
diff --git a/system/vice/man/vsid.1 b/system/vice/man/vsid.1
new file mode 100644
index 0000000000..705dc75415
--- /dev/null
+++ b/system/vice/man/vsid.1
@@ -0,0 +1,24 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.TH VSID 1 "August 19, 2021" SlackBuilds.org
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.SH NAME
+vsid \- Play Commdore 64 SID music files
+.SH SYNOPSIS
+.B vsid
+.RI [vice-options]
+.RI musicfile.sid
+.SH DESCRIPTION
+.B vsid
+passes a Commodore 64 SID music file to the VICE x64 emulator, which
+then plays the default song. Any options given will also be passed to
+the emulator; in particular, use \fB\-sounddev <pulse|alsa|sdl>\fR
+to choose audio driver.
+.SH SEE ALSO
+.BR x64 (1),
+.BR sidplay (1).
+.SH AUTHOR
+This manual page was written by Zed Pobre <zed@debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
+It was modified by B. Watson <urchlay@slackware.uk> for the
+SlackBuilds.org project.
diff --git a/system/vice/slack-desc b/system/vice/slack-desc
index 589a2077b8..01173caf15 100644
--- a/system/vice/slack-desc
+++ b/system/vice/slack-desc
@@ -14,6 +14,6 @@ vice: VIC20, practically all PET models, the PLUS4 and the CBM-II (aka
 vice: C610/C510). An extra emulator is provided for C64 expanded with
 vice: the CMD SuperCPU.
 vice:
-vice: Build options: ffpmeg=@FF@, sdl=@SDL@, pulse=@PA@
+vice: Build options: SDL=@SDL@, PulseAudio=@PA@
 vice:
 vice: Homepage: http://vice-emu.sourceforge.io
diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild
index 0b1d3f9e64..e67c0fd235 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -1,27 +1,49 @@
-#!/bin/sh
+#!/bin/bash
 
-# Slackware build script for VICE
+# Slackware build script for vice
 
 # Copyright 2008 Mauro Giachero (email removed)
-# Copyright 2020 B. Watson (yalhcru@gmail.com)
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Copyright 2020, 2021, 2022, 2023 B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20240213 bkw: update for v3.8.
+# - had to add --disable-parsid to the configure command. it was breaking
+#   the build. also, do you really have a SID chip connected to your
+#   parallel port? (do you even *have* a parallel port?)... if so, either
+#   send me a patch, or wait until upstream does another release.
+# - LAME is no longer supported, remove --enable-lame.
+# - add --enable-catweasel.
+
+# 20230504 bkw: BUILD=2.
+# - fix vice.texi so the GNU info file gets generated.
+# - remove old ./configure arguments and fix a couple of wrong ones.
+#   thanks to Franzen for sending a patch to fix this.
+# - changed -Wl,--allow-multiple-definition to -fcommon, which does
+#   basically the same thing but matches how other builds do it.
+# - fix doinst.sh silliness.
+# - add douninst.sh, to clean up /usr/info/dir after the package is removed.
+
+# 20221228 bkw: update for v3.7.1.
+
+# 20221129 bkw: update for v3.6.1.
+# - can't build our own HTML or plaintext docs from vice.texi.
+# - include upstream's HTML docs in package.
+
+# 20210809 bkw: update for v3.5, many changes, can't build old versions.
+# - Relicense as WTFPL, with permission from the original author.
+# - Build & install the actual HTML docs (not the bundled copy of
+#   the upstream website).
+# - Don't install fonts. They were part of the above.
+# - Use upstream's .desktop files instead of our own.
+# - Upstream removed the man pages; restore them (for now).
+# - Build the gtk+3 UI. Also build the SDL2 UI, unless the user's
+#   requested the SDL1 one (or disabled SDL).
+# - Really fix the paths in the documentation.
+# - ffmpeg now included in Slackware (pre-15.0 -current). Still
+#   autodetected, but the docs no longer mention it.
+# - Get rid of README_SBo.txt as the build options are simpler
+#   and "fit" in the regular README now.
 
 # 20200801 bkw:
 # - Take over maintenance
@@ -35,10 +57,13 @@
 # - Re-enable the old x64 emulator
 # - BUILD=3
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=vice
-VERSION=${VERSION:-3.4}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-3.8}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -48,7 +73,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,143 +101,222 @@ fi
 
 set -e
 
-# The "--enable-shared-ffmpeg" option creates conflicts with external
-# ffmpeg libraries, so we don't use it here. Static would be OK, but
-# it won't build, so it's not an option for now either: I don't care
-# enough about it to spend any more time trying to fix it. If you do
-# care, come up with a way to build with --enable-static-ffmpeg, send
-# me a patch, and I'll include it here.
-
-[ -x /usr/bin/ffmpeg ] && ffmpeg="--enable-external-ffmpeg"
-
-SDL="${SDL:-auto}"
-if [ "$SDL" = "auto" ]; then
-  SDL=1
-  pkg-config --exists sdl2 && SDL=2
-fi
-
-case "$SDL" in
-  1)   sdlopt="--enable-sdlui"  ;;
-  2)   sdlopt="--enable-sdlui2" ;;
-  *)   echo -e "$( basename $0 ):" \
-               "invalid SDL option '$SDL'." \
-               "Valid options are:\n  auto 1 2" \
-               1>&2
-       exit 1 ;;
-esac
+# ffmpeg is included in the base OS on post-14.2 -current, but leave
+# this here in case someone's doing something clever.
+[ -x /usr/bin/ffmpeg ] && ffmpeg="--enable-ffmpeg"
+ffmpeg="" # ...but with ffmpeg 5.x is broken ATM
 
 # Anticipating 15.0's pure-alsa-system
+# 20240214 bkw: which sadly never materialized. I keep this here for
+# my own use, anyway.
 if [ "${PULSE:-yes}" != "yes" ]; then
   pulseopt="--without-pulse"
 fi
 
-echo "=== sdlopt '$sdlopt', ffmpeg '$ffmpeg', pulseopt '$pulseopt'"
+echo "=== pulseopt='$pulseopt'"
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+
 cd $PRGNAM-$VERSION
 chown -R root:root .
+chmod 644 doc/html/fonts/OFL.txt # this file shouldn't be +x
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# Set proper paths in documentation.
-sed -i "s/\/usr\/local\/lib\//\/usr\/lib${LIBDIRSUFFIX}\//g" \
-  man/vice.1
-sed -i 's/"\/vice_toc\.html"/"\/html\/vice_toc\.html"/g' \
-  src/arch/gtk3/uicommands.c
-sed -i "s/\/usr\/local/\/usr/g" doc/vice.* doc/html/*html
-sed -i "s/\/usr\/lib\//\/usr\/lib${LIBDIRSUFFIX}\//g" doc/vice.* doc/html/*html
-
-# Avoid the need for xa. It's only used to generate a small C header
-# file, which we include a prebuilt version of here. There's nothing
-# dynamic about this header, it's just a small chunk of 6502 object
-# code as a C array, and for a given version of vice it'll always be
-# the same code.
-cat $CWD/psiddrv.h.prebuilt.$VERSION > src/c64/psiddrv.h
-
-autoreconf -vif
+# Fix some mildly broken constructs in vice.texi, so we can generate
+# the vice.info doc.
+patch -p1 < $CWD/fix_texi.diff
 
 DOCDIR=/usr/doc/$PRGNAM-$VERSION
 PKGDOC=$PKG/$DOCDIR
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-XA=/bin/true \
-./configure \
-  $sdlopt \
-  $ffmpeg \
-  $pulseopt \
-  --enable-x64 \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=$DOCDIR \
-  --with-x \
-  --enable-quicktime \
-  --enable-ethernet \
-  --enable-parsid \
-  --enable-cpuhistory \
-  --build=$ARCH-slackware-linux
+# setting TEXMFVAR prevents writing to /root, which SlackBuilds
+# really shouldn't do.
+export TEXMFVAR=$( pwd )/.texmf-var
+
+# Set proper paths in documentation.
+rm -rf doc/vice.pdf # will be rebuilt, along with the HTML doc.
+sed -i -e "s/\/usr\/local/\/usr/g" \
+       -e "s,/lib/vice/,/share/vice/,Ig" \
+     doc/vice.texi
+autoreconf -vif
+
+# We build up to 3 times with slightly different ./configure args,
+# so make it a function.
+config() {
+  local configarg="$1"
 
+  # Avoid the need for xa. It's only used to generate a small C header
+  # file, which we include a prebuilt version of here. There's nothing
+  # dynamic about this header, it's just a small chunk of 6502 object
+  # code as a C array, and for a given version of vice it'll always be
+  # the same code. It didn't change between vice 3.4 and 3.5, either.
+  cat $CWD/psiddrv.h.prebuilt.3.4 > src/c64/psiddrv.h
+
+  # 20210809 bkw: in 3.5, upstream added dos2unix as a required dep,
+  # but it's *only used* if you run "make dist" or "make dist-gzip",
+  # which we don't do. DOS2UNIX=/bin/true bypasses the autodetection.
+  # XDG_DESKTOP_MENU=/bin/true prevents installing .desktop files,
+  # because those don't respect $DESTDIR. We can't just disable them
+  # with a configure argument, because that stops them being built
+  # at all.
+
+  # 20230504 bkw: note to self: -w means disable all warnings.
+  CFLAGS="$SLKCFLAGS -w -fcommon" \
+  CXXFLAGS="$SLKCFLAGS" \
+  DOS2UNIX=/bin/true \
+  XA=/bin/true \
+  XDG_DESKTOP_MENU=/bin/true \
+  ./configure \
+    $configarg \
+    $ffmpeg \
+    $pulseopt \
+    --enable-html-docs \
+    --enable-platformdox \
+    --enable-x64 \
+    --enable-x64-image \
+    --prefix=/usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --infodir=/usr/info \
+    --docdir=$DOCDIR \
+    --enable-ethernet \
+    --disable-parsid \
+    --enable-cpuhistory \
+    --with-mpg123 \
+    --with-flac \
+    --with-vorbis \
+    --with-gif \
+    --with-png \
+    --enable-midi \
+    --enable-catweasel \
+    --build=$ARCH-slackware-linux
+
+  make
+}
+
+# SDL UI: *Only* build/install the binaries (not the docs or ROMs),
+# rename them to <whatever>-sdl2 (or -sdl1).
+buildsdl() {
+  local exesuf="-sdl$1"
+  local configarg="--disable-pdf-docs --enable-sdl${1}ui"
+
+  config "$configarg"
+  make -C src install-binPROGRAMS \
+              DESTDIR="$PKG" \
+              EXEEXT="$exesuf" \
+              INSTALL_PROGRAM="install -s -m0755"
+
+  # get rid of the non-graphical tools (the gtk3 build will
+  # install them again without -$exesuf).
+  rm -f $PKG/usr/bin/[cp]*$exesuf
+
+  make distclean
+}
+
+# Build the SDL binaries, unless disabled.
+# Be generous in what we accept for SDL in the env. "both" isn't
+# mentioned in README, it's probably only useful to me.
+case "${SDL:-2}" in
+  ""|2*|y*|Y*|t*|T*) buildsdl 2 ;;
+  1*)                buildsdl 1 ;;
+  both)              buildsdl 1 ; buildsdl 2 ;;
+  n*|N*|f*|F*|0*)    ;; # NOP
+  *) cat <<EOF
+
+***
+$0: invalid value for SDL environment variable.
+Allowed values: "1", "2", "no", "both", or empty/unset (same as "2").
+***
+EOF
+     exit 1 ;;
+esac
+
+# Now build & install the whole project with the gtk3 UI.
+config "--enable-gtk3ui --enable-desktop-files"
 make
 make install-strip DESTDIR=$PKG
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/man/man?/*.?  $PKG/usr/info/*
 
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-install -D -m 0644 $CWD/config/*.desktop $PKG/usr/share/applications
-install -D -m 0644 $CWD/config/vice.png $PKG/usr/share/pixmaps
-
-# Move the docs to the Slackware standard place, symlink to where vice
-# expects it to be.
+# 20240214 bkw: in 3.8, 'make install' no longer installs any of
+# the docs. Do it manually. Leave out building/ (we don't need to
+# care about building on fedora, windows, mac OS).
 mkdir -p $PKGDOC
-mv $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/doc/* $PKGDOC
-( cd $PKGDOC
-  chmod 644 *
-  mkdir html
-  mv *.html *.png *.gif *.css html/ )
-( cd $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
-  rmdir doc
-  ln -s $DOCDIR doc )
-
-# 20200728 bkw: when I inherited this build, it was installing the
-# fonts to the doc dir (where they can't be used), but updating
-# the font cache in doinst.sh. I'm not so sure the fonts are
-# really necessary, but in case they are, I've moved them to
-# /usr/share/fonts/TTF (and gotten rid of the non-TTF ones).
-mkdir -p $PKG/usr/share/fonts/TTF
-mv $PKGDOC/*.ttf $PKG/usr/share/fonts/TTF
-rm -f $PKGDOC/Lato-*
-
-# This would install Commodore font where other software can use it.
-# However, the characters in the font are in PETSCII order, not ASCII
-# or Unicode, so it's not all that useful.
-#ln -s ../../../lib$LIBDIRSUFFIX/$PRGNAM/common/CBM.ttf $PKG/usr/share/fonts/TTF
-
-cp -a AUTHORS ChangeLog COPYING FEEDBACK NEWS README $PKGDOC
+cp -a doc/*.txt $PKGDOC
+
+# Install desktop files manually.
+mkdir -p $PKG/usr/share/desktop-directories \
+         $PKG/usr/share/applications
+install -m0644 src/arch/gtk3/data/unix/vice*desktop \
+        $PKG/usr/share/applications
+install -m0644 src/arch/gtk3/data/unix/vice*directory \
+        $PKG/usr/share/desktop-directories
+
+# Documentation. vice.pdf has already been installed to the doc dir.
+# Generate info, plaintext, and HTML versions here. The text doc is
+# harder to navigate, but easier to grep, so it's worth having IMO.
+# 20221130 bkw: vice.texi no longer works with makeinfo, as of
+# vice-3.6.1. Not sure whether this is because we have an
+# outdated texinfo package in Slackware 15.0, or because upstream
+# broke some kind of rule... regardless, it's disabled for now.
+# 20230504 bkw: Patched vice.texi, so this is now enabled by default.
+if [ "${MAKEINFO:-yes}" = "yes" ]; then
+	makeinfo doc/$PRGNAM.texi
+	mkdir -p $PKG/usr/info
+	mv $PRGNAM.info* $PKG/usr/info
+	gzip -9 $PKG/usr/info/*
+
+	makeinfo --plaintext doc/$PRGNAM.texi > $PKGDOC/$PRGNAM.txt
+fi
+
+# 20221130 bkw: HTML docs do get built, but never installed.
+mkdir -p $PKGDOC/html
+cp -a doc/html/{NEWS,COPYING,fonts/,images/,*.{html,css,ico}} $PKGDOC/html
+ln -s html/NEWS $PKGDOC/NEWS
+ln -s html/COPYING $PKGDOC/COPYING
+
+# 20210810 bkw: as of 3.5, upstream dropped the man pages. I'm
+# including the man pages from 3.4 in the 3.5 package. Edited them
+# slightly to add correct paths to the HTML and PDF docs, also
+# convert the iso-8859-1 characters into troff escapes. Also
+# added (and expanded) vsid.1 from Debian.
+mkdir -p $PKG/usr/man/man1
+for i in $CWD/man/*.?; do
+  sed -e "s,@HTMLDOC@,$DOCDIR/html/index.html," \
+      -e "s,@PDFDOC@,$DOCDIR/$PRGNAM.pdf," \
+      < $i > $PKG/usr/man/man1/$( basename $i )
+done
+gzip -9 $PKG/usr/man/man?/*.?
+for i in x64 x64sc xscpu64 x64dtv x128 xvic xpet xplus4 xcbm2 xcbm5x0; do
+  ln -s vice.1.gz $PKG/usr/man/man1/$i.1.gz
+done
+
+cp -a NEWS README $PKGDOC
 cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 # Make the slack-desc reflect the build options.
-FF=no; SDL=1.2; PA=no
-
-# We can't use ldd to detect whether ffmpeg is built in since it
-# gets loaded with dlopen(). Hence this stuff:
-grep -q '^#define USE_SDLUI2\>'  src/config.h && SDL=2.0
-grep -q '^#define HAVE_FFMPEG\>' src/config.h && FF=yes
-grep -q '^#define USE_PULSE\>'   src/config.h && PA=yes
+PA=no
+if [ "$SDL" = "both" ]; then
+  SDL="1.2 and 2.0"
+else
+  SDL=no
+  [ -x $PKG/usr/bin/x128-sdl1 ] && SDL=1.2
+  [ -x $PKG/usr/bin/x128-sdl2 ] && SDL=2.0
+fi
+grep -q '^#define USE_PULSE\>' src/config.h && PA=yes
 
 mkdir -p $PKG/install
-sed -e "s,@FF@,$FF," \
-    -e "s,@PA@,$PA," \
+sed -e "s,@PA@,$PA,"   \
     -e "s,@SDL@,$SDL," \
- $CWD/slack-desc > $PKG/install/slack-desc
+  $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/douninst.sh > $PKG/install/douninst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/vice/vice.info b/system/vice/vice.info
index 481d98ad3f..f3ab5a74cb 100644
--- a/system/vice/vice.info
+++ b/system/vice/vice.info
@@ -1,10 +1,10 @@
 PRGNAM="vice"
-VERSION="3.4"
-HOMEPAGE="http://vice-emu.sourceforge.io"
-DOWNLOAD="https://downloads.sourceforge.net/project/vice-emu/releases/vice-3.4.tar.gz"
-MD5SUM="24d83f692910f5d87de19857e8095f0b"
+VERSION="3.8"
+HOMEPAGE="https://vice-emu.sourceforge.io"
+DOWNLOAD="https://downloads.sourceforge.net/project/vice-emu/releases/vice-3.8.tar.gz"
+MD5SUM="023febe71bef57ff2537b6b5e961bd7a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/victor-mono-fonts/doinst.sh b/system/victor-mono-fonts/doinst.sh
index ca4c042169..887f9240a8 100644
--- a/system/victor-mono-fonts/doinst.sh
+++ b/system/victor-mono-fonts/doinst.sh
@@ -1,10 +1,10 @@
 # Update the X font indexes:
 if [ -x /usr/bin/mkfontdir ]; then
-  ( cd /usr/share/fonts/TTF
+  ( cd usr/share/fonts/TTF
     /usr/bin/mkfontscale .
     /usr/bin/mkfontdir .
   )
-  ( cd /usr/share/fonts/OTF
+  ( cd usr/share/fonts/OTF
     /usr/bin/mkfontscale .
     /usr/bin/mkfontdir .
   )
diff --git a/system/victor-mono-fonts/victor-mono-fonts.SlackBuild b/system/victor-mono-fonts/victor-mono-fonts.SlackBuild
index 91bfcfc617..3ea007bdd0 100644
--- a/system/victor-mono-fonts/victor-mono-fonts.SlackBuild
+++ b/system/victor-mono-fonts/victor-mono-fonts.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for victor-mono-fonts
 
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=victor-mono-fonts
 SRCNAM=VictorMonoAll
-VERSION=${VERSION:-20210217}
+VERSION=${VERSION:-1.5.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -39,9 +49,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-unzip -d $SRCNAM-$VERSION $CWD/$SRCNAM.zip
-cd $SRCNAM-$VERSION
+rm -rf ${PRGNAM%-fonts}-$VERSION
+tar xvf $CWD/${PRGNAM%-fonts}-$VERSION.tar.gz
+cd ${PRGNAM%-fonts}-$VERSION
+unzip public/$SRCNAM
 chown -R root:root .
 find -L . \
   \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -64,4 +75,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/victor-mono-fonts/victor-mono-fonts.info b/system/victor-mono-fonts/victor-mono-fonts.info
index 17fb750950..426436aaeb 100644
--- a/system/victor-mono-fonts/victor-mono-fonts.info
+++ b/system/victor-mono-fonts/victor-mono-fonts.info
@@ -1,8 +1,8 @@
 PRGNAM="victor-mono-fonts"
-VERSION="20210217"
+VERSION="1.5.5"
 HOMEPAGE="https://rubjo.github.io/victor-mono/"
-DOWNLOAD="https://rubjo.github.io/victor-mono/VictorMonoAll.zip"
-MD5SUM="3cb943dc7667f43190bb48721c5873ac"
+DOWNLOAD="https://github.com/rubjo/victor-mono/archive/v1.5.5/victor-mono-1.5.5.tar.gz"
+MD5SUM="2d87cffb4fbc08fcc6929d5fca899c89"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/vifm/slack-desc b/system/vifm/slack-desc
index 2160c75bee..36bffe226a 100644
--- a/system/vifm/slack-desc
+++ b/system/vifm/slack-desc
@@ -10,7 +10,7 @@ vifm: vifm (a ncurses-based file manager with vi-like keybindings)
 vifm:
 vifm: If you use vi, vifm gives you complete keyboard control over your
 vifm: files without having to learn a new set of commands.
-vifm: The configuration for vifm sits in ~/.vifm.
+vifm: The configuration for vifm sits in ~/.config/vifm.
 vifm:
 vifm: Vim users: A vifm.vim plugin is included in /usr/share/vifm/vim/.
 vifm: Read /usr/doc/vifm-$VERSION/README_vim.txt for usage information.
diff --git a/system/vifm/vifm.SlackBuild b/system/vifm/vifm.SlackBuild
index 5974e05a88..f4a4218101 100644
--- a/system/vifm/vifm.SlackBuild
+++ b/system/vifm/vifm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for vifm.
 
@@ -6,10 +6,12 @@
 # Modified by Charles E. Kauffman
 # Modified by B. Watson
 
-# Now maintained by B. Watson <yalhcru@gmail.com>. Original version
+# Now maintained by B. Watson <urchlay@slackware.uk>. Original version
 # had no license; modified version is licensed under the WTFPL.
 # See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230510 bkw: updated for v0.13.
+# 20221228 bkw: updated for v0.12.1.
 # 20200101 bkw:
 # - take over maintenance
 # - update for v0.10.1
@@ -17,10 +19,13 @@
 #   script tested with 0.10, 0.10.1-beta, and 0.10.1. I can't be
 #   bothered to support older versions (you're on your own).
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=vifm
-VERSION=${VERSION:-0.10.1}
+VERSION=${VERSION:-0.13}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -30,7 +35,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -73,11 +82,13 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+# note: configure script appends $PRGNAM to sysconfdir.
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
+  --sysconfdir=/etc \
   --build=$ARCH-slackware-linux
 
 make
@@ -92,7 +103,8 @@ rm -rf $PKG/usr/share/doc
 # Include only the vim instructions from INSTALL, nobody cares about compile
 # instructions (especially not Windows ones) when using a binary package.
 rm -f $DOCDIR/INSTALL
-sed -n '/^Vim Specific/,$p' INSTALL > $DOCDIR/README_vim.txt
+sed -n '/^Vim Specific/,/Building with broken/p' INSTALL | \
+   sed '$d' > $DOCDIR/README_vim.txt
 
 cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$PRGNAM.SlackBuild
 
@@ -101,4 +113,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/vifm/vifm.info b/system/vifm/vifm.info
index b006ebeac7..565e1b1817 100644
--- a/system/vifm/vifm.info
+++ b/system/vifm/vifm.info
@@ -1,10 +1,10 @@
 PRGNAM="vifm"
-VERSION="0.10.1"
+VERSION="0.13"
 HOMEPAGE="https://vifm.info"
-DOWNLOAD="https://downloads.sourceforge.net/vifm/vifm-0.10.1.tar.bz2"
-MD5SUM="0afde44205424355ec5f90957971bb07"
+DOWNLOAD="https://downloads.sourceforge.net/vifm/vifm-0.13.tar.bz2"
+MD5SUM="bd7ae0bc6ddf82d1b19c5b88fbfc6292"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/vim-airline-themes/README b/system/vim-airline-themes/README
new file mode 100644
index 0000000000..019c3f4e3a
--- /dev/null
+++ b/system/vim-airline-themes/README
@@ -0,0 +1 @@
+This package contains themes for vim-airline.
diff --git a/system/vim-airline-themes/slack-desc b/system/vim-airline-themes/slack-desc
new file mode 100644
index 0000000000..2ae5be524e
--- /dev/null
+++ b/system/vim-airline-themes/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                  |-----handy-ruler------------------------------------------------------|
+vim-airline-themes: vim-airline-themes (themes for vim-airline)
+vim-airline-themes:
+vim-airline-themes: This package contains themes for vim-airline.
+vim-airline-themes:
+vim-airline-themes:
+vim-airline-themes:
+vim-airline-themes:
+vim-airline-themes:
+vim-airline-themes:
+vim-airline-themes:
+vim-airline-themes:
diff --git a/system/vim-airline-themes/vim-airline-themes.SlackBuild b/system/vim-airline-themes/vim-airline-themes.SlackBuild
new file mode 100644
index 0000000000..957569adfb
--- /dev/null
+++ b/system/vim-airline-themes/vim-airline-themes.SlackBuild
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+# Slackware build script for vim-airline-themes
+
+# Copyright 2023 Isaac Yu <isaacyu@protonmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=vim-airline-themes
+VERSION=${VERSION:-20221108}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+COMMIT=${COMMIT:-dd81554c2231e438f6d0e8056ea38fd0e80ac02a}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$COMMIT
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
+cd $PRGNAM-$COMMIT
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+INSTALLPATH=$PKG/usr/share/vim/vimfiles
+mkdir -p $INSTALLPATH
+cp -r -t $INSTALLPATH autoload doc plugin
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/vim-airline-themes/vim-airline-themes.info b/system/vim-airline-themes/vim-airline-themes.info
new file mode 100644
index 0000000000..215c0eb092
--- /dev/null
+++ b/system/vim-airline-themes/vim-airline-themes.info
@@ -0,0 +1,10 @@
+PRGNAM="vim-airline-themes"
+VERSION="20221108"
+HOMEPAGE="https://github.com/vim-airline/vim-airline-themes"
+DOWNLOAD="https://github.com/vim-airline/vim-airline-themes/archive/dd81554/vim-airline-themes-dd81554c2231e438f6d0e8056ea38fd0e80ac02a.tar.gz"
+MD5SUM="c730e4ad77d008705f727117fdf6a667"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/vim-airline/README b/system/vim-airline/README
new file mode 100644
index 0000000000..8be29b1c92
--- /dev/null
+++ b/system/vim-airline/README
@@ -0,0 +1,4 @@
+vim-airline is a lean & mean status/tabline for vim that's light as air.
+
+vim-airline-themes provides additional themes for vim-airline.
+powerline-fonts provides fancy arrow symbols for vim-airline.
diff --git a/system/vim-airline/slack-desc b/system/vim-airline/slack-desc
new file mode 100644
index 0000000000..650c96c1e7
--- /dev/null
+++ b/system/vim-airline/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+vim-airline: vim-airline (status bar for vim)
+vim-airline:
+vim-airline: vim-airline is a lean & mean status/tabline for vim that's light as
+vim-airline: air.
+vim-airline:
+vim-airline:
+vim-airline:
+vim-airline:
+vim-airline:
+vim-airline:
+vim-airline:
diff --git a/system/vim-airline/vim-airline.SlackBuild b/system/vim-airline/vim-airline.SlackBuild
new file mode 100644
index 0000000000..269fa89f34
--- /dev/null
+++ b/system/vim-airline/vim-airline.SlackBuild
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# Slackware build script for vim-airline
+
+# Copyright 2023 Isaac Yu <isaacyu@protonmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=vim-airline
+VERSION=${VERSION:-0.11}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+INSTALLPATH=$PKG/usr/share/vim/vimfiles
+mkdir -p $INSTALLPATH
+cp -r -t $INSTALLPATH autoload doc plugin t
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/vim-airline/vim-airline.info b/system/vim-airline/vim-airline.info
new file mode 100644
index 0000000000..9cc6b3318f
--- /dev/null
+++ b/system/vim-airline/vim-airline.info
@@ -0,0 +1,10 @@
+PRGNAM="vim-airline"
+VERSION="0.11"
+HOMEPAGE="https://github.com/vim-airline/vim-airline"
+DOWNLOAD="https://github.com/vim-airline/vim-airline/archive/v0.11/vim-airline-0.11.tar.gz"
+MD5SUM="6d6daf831ed726dc06a22ede69f5cbb1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Isaac Yu"
+EMAIL="isaacyu@protonmail.com"
diff --git a/system/vinterm/README b/system/vinterm/README
index 8541b3c1f3..c8020a332b 100644
--- a/system/vinterm/README
+++ b/system/vinterm/README
@@ -1,18 +1,18 @@
 vinterm (terminal emulator that simulates 1980s CRT appearance)
 
-Use a terminal in style, like in the good old days! Vintage Terminal is
-a terminal emulator that simulates the looks of a 1980s monitor.
+Use a terminal in style, like in the good old days! Vintage Terminal
+is a terminal emulator that simulates the looks of a 1980s monitor.
 
 Vintage Terminal has the following features:
 
-- Full terminal capabilities implemented;
-- Scaling (zoom) with the argument -s;
-- Window resize/maximize;
-- Full screen (CTRL+F11) and full screen with 80 columns (CTRL+SHIFT+F11);
-- UNICODE support (no unicode font yet);
-- Terminal rollback;
-- Mouse support (new in 0.5.0);
-- Has a authentic old look based on a IBM 5151 monitor.
+- Full terminal capabilities implemented
+- Scaling (zoom) with the argument -s
+- Window resize/maximize
+- Full screen (CTRL+F11) and fullscreen with 80 columns (CTRL+SHIFT+F11)
+- UNICODE support (no unicode font yet)
+- Terminal rollback
+- Mouse support (new in 0.5.0)
+- Has a authentic old look based on a IBM 5151 monitor
 
 The package includes a vim color scheme by the vinterm author that's
 meant to make vim's syntax highlighting look better in vinterm. To use
diff --git a/system/vinterm/includes.diff b/system/vinterm/includes.diff
new file mode 100644
index 0000000000..28b9096c59
--- /dev/null
+++ b/system/vinterm/includes.diff
@@ -0,0 +1,10 @@
+--- vinterm-0.5.0/terminal/pty.h	2013-08-20 01:34:06.000000000 +0900
++++ vinterm-0.5.0.patched/terminal/pty.h	2023-07-01 09:41:53.057899502 +0900
+@@ -3,6 +3,7 @@
+ 
+ #include <string>
+ #include <ostream>
++#include <cstdint>
+ using namespace std;
+ 
+ class Options;
diff --git a/system/vinterm/vinterm.SlackBuild b/system/vinterm/vinterm.SlackBuild
index 0bf689559d..5d88b5236d 100644
--- a/system/vinterm/vinterm.SlackBuild
+++ b/system/vinterm/vinterm.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for vinterm
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
@@ -11,10 +11,13 @@
 # - include icons/desktop in the package instead of spamming them
 #   to /usr (!)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=vinterm
 VERSION=${VERSION:-0.5.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -24,7 +27,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -52,16 +59,15 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 sed -i -e "s,-Os,$SLKCFLAGS," -e "s,usr/lib,usr/lib$LIBDIRSUFFIX," config.mk
 
 # GRR. "make install" respects DESTDIR... except for the icons and .desktop.
 patch -p1 < $CWD/fix_destdir.diff
+# Add an include statement for GCC compatibility.
+patch -p1 < $CWD/includes.diff
 
 export TERMINFO=$PKG/usr/share/terminfo
 mkdir -p $TERMINFO
@@ -91,4 +97,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/vinterm/vinterm.info b/system/vinterm/vinterm.info
index 39175b37a3..12b32acd9f 100644
--- a/system/vinterm/vinterm.info
+++ b/system/vinterm/vinterm.info
@@ -9,4 +9,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libconfig"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/virt-manager/Add-Slackware-to-OS-choices.patch b/system/virt-manager/Add-Slackware-to-OS-choices.patch
deleted file mode 100644
index 18aadb62cf..0000000000
--- a/system/virt-manager/Add-Slackware-to-OS-choices.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Nur virt-manager-1.5.0.orig/virtinst/osdict.py virt-manager-1.5.0/virtinst/osdict.py
---- virt-manager-1.5.0.orig/virtinst/osdict.py	2018-01-27 14:57:20.000000000 -0600
-+++ virt-manager-1.5.0/virtinst/osdict.py	2018-02-19 00:52:00.750416744 -0600
-@@ -159,6 +159,7 @@
-         "rhel5": "rhel5.0",
-         "rhel6": "rhel6.0",
-         "rhel7": "rhel7.0",
-+        "slackware": "slackware14.2",
-         "ubuntuhardy": "ubuntu8.04",
-         "ubuntuintrepid": "ubuntu8.10",
-         "ubuntujaunty": "ubuntu9.04",
-@@ -373,7 +374,7 @@
-         # EOL date. So assume None == EOL, add some manual work arounds.
-         # We should fix this in a new libosinfo version, and then drop
-         # this hack
--        if self._is_related_to(["fedora24", "rhel7.0", "debian6",
-+        if self._is_related_to(["slackware14.2", "fedora24", "rhel7.0", "debian6",
-             "ubuntu13.04", "win8", "win2k12", "mageia5", "centos7.0"],
-             check_clones=False, check_derives=False):
-             return True
-diff -Nur virt-manager-1.5.0.orig/virtinst/urlfetcher.py virt-manager-1.5.0/virtinst/urlfetcher.py
---- virt-manager-1.5.0.orig/virtinst/urlfetcher.py	2018-01-27 14:57:20.000000000 -0600
-+++ virt-manager-1.5.0/virtinst/urlfetcher.py	2018-02-19 00:52:00.751416752 -0600
-@@ -1379,6 +1379,43 @@
-         return False
- 
- 
-+class SlackwareDistro(Distro):
-+    # slackware doesn't have installable URLs, so this is just for a
-+    # mounted ISO
-+    name = "Slackware"
-+    urldistro = "slackware"
-+    os_variant = "linux"
-+
-+    _boot_iso_paths = []
-+    _xen_kernel_paths = []
-+
-+    def __init__(self, *args, **kwargs):
-+        Distro.__init__(self, *args, **kwargs)
-+        if re.match(r'i[4-9]86', self.arch):
-+            self.arch = 'i486'
-+            self.kname = 'hugesmp.s'
-+        else:
-+            self.arch = 'x86_64'
-+            self.kname = 'huge.s'
-+
-+        self._hvm_kernel_paths = [("kernels/%s/bzImage" % self.kname,
-+                                    "isolinux/initrd.img")]
-+
-+    def isValidStore(self):
-+        # Don't support any paravirt installs
-+        if self.type is not None and self.type != "hvm":
-+            return False
-+
-+        # Slackware website / media appear to have a Slackware-HOWTO
-+        # file in top level which we can use as our 'magic'
-+        # check for validity
-+        if not self.fetcher.hasFile("Slackware-HOWTO"):
-+            return False
-+
-+        logging.debug("Regex didn't match, not a %s distro", self.name)
-+        return False
-+
-+
- # Build list of all *Distro classes
- def _build_distro_list():
-     allstores = []
diff --git a/system/virt-manager/README b/system/virt-manager/README
index f2b2ee4838..36d4d791a0 100644
--- a/system/virt-manager/README
+++ b/system/virt-manager/README
@@ -1,11 +1,9 @@
 virt-manager is a gtk interface that connects to libvirt.
 
-If you have networking problems, make sure you have the tun module loaded.
+If you have networking problems, make sure you have the tun module
+loaded.
 
 To run virt-manager as a normal user, you need to configure libvirt
-to have the correct permissions.  Uncomment the unix_sock_group and
+to have the correct permissions. Uncomment the unix_sock_group and
 unix_sock_rw_perms in /etc/libvirt/libvirtd.conf and add the user to the
 group libvirt uses.
-
-If you have python3 installed at build-time, this probably won't work,
-so you'll need to temporarily uninstall python3 for the build process.
diff --git a/system/virt-manager/virt-manager.SlackBuild b/system/virt-manager/virt-manager.SlackBuild
index 3a8402bd75..3aa3b5aa90 100644
--- a/system/virt-manager/virt-manager.SlackBuild
+++ b/system/virt-manager/virt-manager.SlackBuild
@@ -1,15 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for virt-manager
 
 # Written by Ash Wiren  ash@spooksoftware.com # Released to public domain.
 # Modified by Zoran Stojakovic
-# Lots of mods by rworkman for 1.x
+# Lots of mods by rworkman for 1.x and (later) 2.x
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=virt-manager
-VERSION=${VERSION:-1.5.1}
+VERSION=${VERSION:-4.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +22,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -53,11 +63,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Add Slackware support
-patch -p1 < $CWD/Add-Slackware-to-OS-choices.patch
-
-python setup.py configure
-python setup.py install --root=$PKG
+python3 setup.py configure
+python3 setup.py install --root=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -68,7 +75,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-    COPYING HACKING.md INSTALL.md NEWS.md README.md \
+    CONTRIBUTING.md COPYING INSTALL.md NEWS.md README.md \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -77,4 +84,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/virt-manager/virt-manager.info b/system/virt-manager/virt-manager.info
index 6bdff3b232..5db29afd1f 100644
--- a/system/virt-manager/virt-manager.info
+++ b/system/virt-manager/virt-manager.info
@@ -1,10 +1,10 @@
 PRGNAM="virt-manager"
-VERSION="1.5.1"
+VERSION="4.1.0"
 HOMEPAGE="http://virt-manager.org/"
-DOWNLOAD="http://virt-manager.org/download/sources/virt-manager/virt-manager-1.5.1.tar.gz"
-MD5SUM="32a929fd91fca9767730abaefb94661d"
+DOWNLOAD="https://releases.pagure.org/virt-manager/virt-manager-4.1.0.tar.gz"
+MD5SUM="8bf86bcc7e43a956ff94ebdaf4d7d399"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libosinfo libvirt-glib libvirt-python gnome-python2-gconf tunctl ipaddr-py python-requests gtk-vnc spice-gtk vte3"
+REQUIRES="libosinfo libvirt-glib libvirt-python gtk-vnc spice-gtk"
 MAINTAINER="Robby Workman"
 EMAIL="rworkman@slackbuilds.org"
diff --git a/system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch b/system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch
new file mode 100644
index 0000000000..46c708b9d3
--- /dev/null
+++ b/system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch
@@ -0,0 +1,36 @@
+https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/117.patch
+https://bugs.gentoo.org/831963
+
+From 41cc016278e713d3db156761fce6437dff81a53a Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 22 Jan 2022 23:28:20 +0100
+Subject: [PATCH] meson: fix build with meson 0.61
+
+i18n.merge_file doesn't accept positional arguments
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ if host_machine.system() != 'windows'
+   desktop = 'remote-viewer.desktop'
+ 
+   i18n.merge_file (
+-    desktop,
+     type: 'desktop',
+     input: desktop + '.in',
+     output: desktop,
+@@ -14,7 +13,6 @@ if host_machine.system() != 'windows'
+   mimetypes = 'virt-viewer-mime.xml'
+ 
+   i18n.merge_file (
+-    mimetypes,
+     type: 'xml',
+     input: mimetypes + '.in',
+     output: mimetypes,
+@@ -27,7 +25,6 @@ if host_machine.system() != 'windows'
+   metainfo = 'remote-viewer.appdata.xml'
+ 
+   i18n.merge_file (
+-    metainfo,
+     type: 'xml',
+     input: metainfo + '.in',
+     output: metainfo,
+GitLab
diff --git a/system/virt-viewer/virt-viewer.SlackBuild b/system/virt-viewer/virt-viewer.SlackBuild
index 7966171cf5..01d6ef5068 100644
--- a/system/virt-viewer/virt-viewer.SlackBuild
+++ b/system/virt-viewer/virt-viewer.SlackBuild
@@ -1,13 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for virt-viewer
 
 # Written by Zak B. Elep, <zakame@zakame.net>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=virt-viewer
-VERSION=${VERSION:-7.0}
+VERSION=${VERSION:-10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -17,7 +20,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -48,7 +58,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 
 chown -R root:root .
@@ -58,19 +68,23 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux \
-  --disable-update-mimedb \
-  --enable-static=no \
-  $SPICEGTK
-
-make
-make install-strip DESTDIR=$PKG
+patch -p1 < $CWD/virt-viewer-10.0_p20210730-meson-0.61.patch
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --prefix=/usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --infodir=/usr/info \
+    --buildtype=release
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -92,4 +106,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/virt-viewer/virt-viewer.info b/system/virt-viewer/virt-viewer.info
index d6be327cd1..7e66d77ddb 100644
--- a/system/virt-viewer/virt-viewer.info
+++ b/system/virt-viewer/virt-viewer.info
@@ -1,8 +1,8 @@
 PRGNAM="virt-viewer"
-VERSION="7.0"
+VERSION="10.0"
 HOMEPAGE="http://virt-manager.org"
-DOWNLOAD="https://virt-manager.org/download/sources/virt-viewer/virt-viewer-7.0.tar.gz"
-MD5SUM="64c9c4045a7a941a0be4050fc33fc6f5"
+DOWNLOAD="https://releases.pagure.org/virt-viewer/virt-viewer-10.0.tar.xz"
+MD5SUM="59617841716d5bdcaa9006f0649679f1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gtk-vnc libvirt-glib"
diff --git a/system/virtiofsd/README b/system/virtiofsd/README
new file mode 100644
index 0000000000..45d12f2526
--- /dev/null
+++ b/system/virtiofsd/README
@@ -0,0 +1,19 @@
+virtiofsd is a vhost-user virtio-fs device backend written in Rust.
+
+This won't work on a 32bit operating system.
+
+NOTE: if you wish to update virtiofsd yourself you need to create a
+tarball first with the vendored versions of the rust dependencies:
+to create the "vendor" source dir yourself unpack the virtiofsd
+tarball, enter its directory and execute these three commands
+
+  export LD_LIBRARY_PATH="/opt/rust16/lib64:$LD_LIBRARY_PATH"
+  export PATH="/opt/rust16/bin:$PATH"
+  cargo vendor
+
+then you can create a tarball with
+
+  tar Jcf ../virtiofsd-vendor-$VERSION.tar.xz vendor
+
+this is necessary to avoid downloading stuff during execution of
+the SlackBuild.
diff --git a/system/virtiofsd/slack-desc b/system/virtiofsd/slack-desc
new file mode 100644
index 0000000000..a1e87c22f0
--- /dev/null
+++ b/system/virtiofsd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+virtiofsd: virtiofsd (vhost-user virtio-fs device backend)
+virtiofsd:
+virtiofsd: virtiofsd is a vhost-user virtio-fs device backend written in Rust.
+virtiofsd:
+virtiofsd: homepage: https://virtio-fs.gitlab.io
+virtiofsd:
+virtiofsd:
+virtiofsd:
+virtiofsd:
+virtiofsd:
+virtiofsd:
diff --git a/system/virtiofsd/virtiofsd.SlackBuild b/system/virtiofsd/virtiofsd.SlackBuild
new file mode 100644
index 0000000000..fa42211bc3
--- /dev/null
+++ b/system/virtiofsd/virtiofsd.SlackBuild
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+# Slackware build script for virtiofsd
+
+# Copyright 2023-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=virtiofsd
+VERSION=${VERSION:-1.10.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    x86_64) ARCH=x86_64 ;;
+#      arm*) ARCH=arm ;;
+         *) echo "ARCH $(uname -m) is unsupported."; exit 1 ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-v$VERSION
+tar xvf $CWD/$PRGNAM-v$VERSION.tar.?z*
+cd $PRGNAM-v$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION-vendor.tar.xz
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
+mkdir .cargo
+cat <<EOT >>.cargo/config.toml
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
+EOT
+
+cargo build --release
+install -D -p -s -m 0755 target/release/$PRGNAM $PKG/usr/libexec/$PRGNAM
+install -D -p -m 0644 50-virtiofsd.json $PKG/usr/share/qemu/vhost-user/50-virtiofsd.json
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.md doc/*.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/virtiofsd/virtiofsd.info b/system/virtiofsd/virtiofsd.info
new file mode 100644
index 0000000000..4f10e98319
--- /dev/null
+++ b/system/virtiofsd/virtiofsd.info
@@ -0,0 +1,12 @@
+PRGNAM="virtiofsd"
+VERSION="1.10.1"
+HOMEPAGE="https://virtio-fs.gitlab.io"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://gitlab.com/virtio-fs/virtiofsd/-/archive/v1.10.1/virtiofsd-v1.10.1.tar.bz2 \
+                 https://ponce.cc/slackware/sources/repo/virtiofsd-1.10.1-vendor.tar.xz"
+MD5SUM_x86_64="c6fd3f5b7a83c908f9e08127ec92edc6 \
+               d4538be9ccd5f48561e9dc5d98981eb6"
+REQUIRES="rust16"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/virtualbox-addons/LocalConfig.kmk b/system/virtualbox-addons/LocalConfig.kmk
index 3a2f6880d3..9a5a3df598 100644
--- a/system/virtualbox-addons/LocalConfig.kmk
+++ b/system/virtualbox-addons/LocalConfig.kmk
@@ -7,7 +7,5 @@ KBUILD_MSG_STYLE     := brief
 
 VBOX_OSE             := 1
 
-VBOX_WITH_PAM        =
-
 # do not fail on warning
 VBOX_WITH_WARNINGS_AS_ERRORS :=
diff --git a/system/virtualbox-addons/README.SLACKWARE b/system/virtualbox-addons/README.SLACKWARE
index 2def33125c..0c7eb9a867 100644
--- a/system/virtualbox-addons/README.SLACKWARE
+++ b/system/virtualbox-addons/README.SLACKWARE
@@ -1,10 +1,5 @@
 You'll need to add the following lines to /etc/rc.d/rc.local:
 
-	# Start vboxadd
-	if [ -x /etc/rc.d/rc.vboxadd ]; then
-	  /etc/rc.d/rc.vboxadd start
-	fi
-
 	# Start vboxadd-service
 	if [ -x /etc/rc.d/rc.vboxadd-service ]; then
 	  /etc/rc.d/rc.vboxadd-service start
@@ -15,11 +10,6 @@ configuration for VirtualBox.
 
 You should then add the following to /etc/rc.d/rc.local_shutdown:
 
-	# Stop vboxadd
-	if [ -x /etc/rc.d/rc.vboxadd ]; then
-	  /etc/rc.d/rc.vboxadd stop
-	fi
-
 	# Stop vboxadd-service
 	if [ -x /etc/rc.d/rc.vboxadd-service ]; then
 	  /etc/rc.d/rc.vboxadd-service stop
diff --git a/system/virtualbox-addons/doinst.sh b/system/virtualbox-addons/doinst.sh
index 97afad9c3e..57d62138c3 100644
--- a/system/virtualbox-addons/doinst.sh
+++ b/system/virtualbox-addons/doinst.sh
@@ -22,24 +22,13 @@ preserve_perms() {
   config $NEW
 }
 
-# Fix starting of kde within virtualbox
+# Old kwin update to fix starting kde in virtualbox.
+# No longer necessary
 BLACKLIST="usr/share/apps/kconf_update/kwin_blacklist.upd"
 
 if [ -f "$BLACKLIST" ]; then
-  VBOX_TEST=$(grep -c "Blacklist-virtualbox" $BLACKLIST)
-else
-  VBOX_TEST="0"
+  rm -f "$BLACKLIST"
 fi
 
-if [ "$VBOX_TEST" = "0" ]; then
-cat << EOF >> $BLACKLIST
-Id=Blacklist-virtualbox
-Options=overwrite
-File=kwinrc
-Script=kwin_blacklist_vbox.sh,sh
-EOF
-fi
-
-preserve_perms etc/rc.d/rc.vboxadd.new
 preserve_perms etc/rc.d/rc.vboxadd-service.new
 
diff --git a/system/virtualbox-addons/gcc13.patch b/system/virtualbox-addons/gcc13.patch
new file mode 100644
index 0000000000..40701d717f
--- /dev/null
+++ b/system/virtualbox-addons/gcc13.patch
@@ -0,0 +1,11 @@
+--- Config.kmk.orig     2023-04-13 03:15:13.000000000 -0600
++++ Config.kmk  2023-06-16 09:59:19.820597642 -0600
+@@ -7485,7 +7485,7 @@
+  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64   = -m elf_x86_64
+ endif
+ TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS  = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-pie -fno-merge-constants -std=c99 -ffreestanding
+-TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-pie -fno-merge-constants -ffreestanding
++TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-pie -fno-merge-constants
+ TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS.linux  = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h
+ TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS.linux = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h
+ TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o
diff --git a/system/virtualbox-addons/kwin_blacklist_vbox.sh b/system/virtualbox-addons/kwin_blacklist_vbox.sh
deleted file mode 100644
index ed7d07fe1d..0000000000
--- a/system/virtualbox-addons/kwin_blacklist_vbox.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-while read line; do
-    echo $line
-done
-
-echo ""
-echo "[Compositing]"
-echo "OpenGLIsUnsafe=true"
-echo ""
diff --git a/system/virtualbox-addons/kwinrc b/system/virtualbox-addons/kwinrc
deleted file mode 100644
index 6f70d2c9d3..0000000000
--- a/system/virtualbox-addons/kwinrc
+++ /dev/null
@@ -1,2 +0,0 @@
-[Compositing]
-OpenGLIsUnsafe=true
diff --git a/system/virtualbox-addons/plasma_enable_kscreen.sh b/system/virtualbox-addons/plasma_enable_kscreen.sh
new file mode 100644
index 0000000000..1feca38b8a
--- /dev/null
+++ b/system/virtualbox-addons/plasma_enable_kscreen.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+kwriteconfig5 --file kded5rc --group "Module-kscreen" --key autoload --type bool true
diff --git a/system/virtualbox-addons/rc.vboxadd.diff b/system/virtualbox-addons/rc.vboxadd.diff
deleted file mode 100644
index f0b3acddd0..0000000000
--- a/system/virtualbox-addons/rc.vboxadd.diff
+++ /dev/null
@@ -1,280 +0,0 @@
---- vboxadd.sh.orig	2016-11-23 16:24:46.000000000 +0100
-+++ vboxadd.sh	2016-12-27 16:06:46.413895799 +0100
-@@ -154,42 +154,9 @@
- 
- dev=/dev/vboxguest
- userdev=/dev/vboxuser
--config=/var/lib/VBoxGuestAdditions/config
- owner=vboxadd
- group=1
- 
--test_for_gcc_and_make()
--{
--    which make > /dev/null 2>&1 || printf "\nThe make utility was not found. If the following module compilation fails then\nthis could be the reason and you should try installing it.\n"
--    which gcc > /dev/null 2>&1 || printf "\nThe gcc utility was not found. If the following module compilation fails then\nthis could be the reason and you should try installing it.\n"
--}
--
--test_sane_kernel_dir()
--{
--    KERN_VER=`uname -r`
--    KERN_DIR="/lib/modules/$KERN_VER/build"
--    if [ -d "$KERN_DIR" ]; then
--        KERN_REL=`make -sC $KERN_DIR --no-print-directory kernelrelease 2>/dev/null || true`
--        if [ -z "$KERN_REL" -o "x$KERN_REL" = "x$KERN_VER" ]; then
--            return 0
--        fi
--    fi
--    printf "\nThe headers for the current running kernel were not found. If the following\nmodule compilation fails then this could be the reason.\n"
--    if [ "$system" = "redhat" ]; then
--        if echo "$KERN_VER" | grep -q "uek"; then
--            printf "The missing package can be probably installed with\nyum install kernel-uek-devel-$KERN_VER\n"
--        else
--            printf "The missing package can be probably installed with\nyum install kernel-devel-$KERN_VER\n"
--        fi
--    elif [ "$system" = "suse" ]; then
--        KERN_VER_SUSE=`echo "$KERN_VER" | sed 's/.*-\([^-]*\)/\1/g'`
--        KERN_VER_BASE=`echo "$KERN_VER" | sed 's/\(.*\)-[^-]*/\1/g'`
--        printf "The missing package can be probably installed with\nzypper install kernel-$KERN_VER_SUSE-devel-$KERN_VER_BASE\n"
--    elif [ "$system" = "debian" ]; then
--        printf "The missing package can be probably installed with\napt-get install linux-headers-$KERN_VER\n"
--    fi
--}
--
- running_vboxguest()
- {
-     lsmod | grep -q "vboxguest[^_-]"
-@@ -261,13 +228,6 @@
- start()
- {
-     begin "Starting the VirtualBox Guest Additions ";
--    if test -r $config; then
--      . $config
--    else
--      fail "Configuration file $config not found"
--    fi
--    test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
--      fail "Configuration file $config not complete"
-     uname -r | grep -q -E '^2\.6|^3|^4' 2>/dev/null &&
-         ps -A -o comm | grep -q '/*udevd$' 2>/dev/null ||
-         no_udev=1
-@@ -378,218 +338,16 @@
-     return 0
- }
- 
--## Update the initramfs.  Debian and Ubuntu put the graphics driver in, and
--# need the touch(1) command below.  Everyone else that I checked just need
--# the right module alias file from depmod(1) and only use the initramfs to
--# load the root filesystem, not the boot splash.  update-initramfs works
--# for the first two and dracut for every one else I checked.  We are only
--# interested in distributions recent enough to use the KMS vboxvideo driver.
--## @param $1  kernel version to update for.
--update_module_dependencies()
--{
--    depmod "${1}"
--    rm -f "/lib/modules/${1}/initrd/vboxvideo"
--    test -d "/lib/modules/${1}/initrd" &&
--        test -f "/lib/modules/${1}/misc/vboxvideo.ko" &&
--        touch "/lib/modules/${1}/initrd/vboxvideo"
--    test -n "${QUICKSETUP}" && return
--    if type dracut >/dev/null 2>&1; then
--        dracut -f "/boot/initramfs-${1}.img" "${1}"
--    elif type update-initramfs >/dev/null 2>&1; then
--        update-initramfs -u -k "${1}"
--    fi
--}
--
--# Remove any existing VirtualBox guest kernel modules from the disk, but not
--# from the kernel as they may still be in use
--cleanup_modules()
--{
--    if [ -n "$(which dkms 2>/dev/null)" ]; then
--        begin "Removing existing VirtualBox DKMS kernel modules"
--        $DODKMS uninstall $OLDMODULES > $LOG
--        succ_msg
--    fi
--    begin "Removing existing VirtualBox non-DKMS kernel modules"
--    for i in $OLDMODULES; do
--        find /lib/modules -name $i\* | xargs rm 2>/dev/null
--    done
--    succ_msg
--}
--
--# Build and install the VirtualBox guest kernel modules
--setup_modules()
--{
--    # don't stop the old modules here -- they might be in use
--    cleanup_modules
--    begin "Building the VirtualBox Guest Additions kernel modules"
--
--    # Short cut out if a dkms build succeeds
--    if [ -n "$(which dkms 2>/dev/null)" ] &&
--       $DODKMS install vboxguest $INSTALL_VER >> $LOG 2>&1; then
--        succ_msg
--        return 0
--    fi
--
--    test_for_gcc_and_make
--    test_sane_kernel_dir
--
--    echo
--    begin "Building the main Guest Additions module"
--    if ! $BUILDINTMP \
--        --save-module-symvers /tmp/vboxguest-Module.symvers \
--        --module-source $MODULE_SRC/vboxguest \
--        --no-print-directory install >> $LOG 2>&1; then
--        show_error "Look at $LOG to find out what went wrong"
--        return 1
--    fi
--    succ_msg
--    begin "Building the shared folder support module"
--    if ! $BUILDINTMP \
--        --use-module-symvers /tmp/vboxguest-Module.symvers \
--        --module-source $MODULE_SRC/vboxsf \
--        --no-print-directory install >> $LOG 2>&1; then
--        show_error  "Look at $LOG to find out what went wrong"
--        return 1
--    fi
--    succ_msg
--    begin "Building the graphics driver module"
--    if ! $BUILDINTMP \
--        --use-module-symvers /tmp/vboxguest-Module.symvers \
--        --module-source $MODULE_SRC/vboxvideo \
--        --no-print-directory install >> $LOG 2>&1; then
--        show_error "Look at $LOG to find out what went wrong"
--    fi
--    succ_msg
--    update_module_dependencies "${KERN_VER}"
--    return 0
--}
--
--# Do non-kernel bits needed for the kernel modules to work properly (user
--# creation, udev, mount helper...)
--extra_setup()
--{
--    begin "Doing non-kernel setup of the Guest Additions"
--    echo "Creating user for the Guest Additions." >> $LOG
--    # This is the LSB version of useradd and should work on recent
--    # distributions
--    useradd -d /var/run/vboxadd -g 1 -r -s /bin/false vboxadd >/dev/null 2>&1
--    # And for the others, we choose a UID ourselves
--    useradd -d /var/run/vboxadd -g 1 -u 501 -o -s /bin/false vboxadd >/dev/null 2>&1
--
--    # Add a group "vboxsf" for Shared Folders access
--    # All users which want to access the auto-mounted Shared Folders have to
--    # be added to this group.
--    groupadd -r -f vboxsf >/dev/null 2>&1
--
--    # Create udev description file
--    if [ -d /etc/udev/rules.d ]; then
--        echo "Creating udev rule for the Guest Additions kernel module." >> $LOG
--        udev_call=""
--        udev_app=`which udevadm 2> /dev/null`
--        if [ $? -eq 0 ]; then
--            udev_call="${udev_app} version 2> /dev/null"
--        else
--            udev_app=`which udevinfo 2> /dev/null`
--            if [ $? -eq 0 ]; then
--                udev_call="${udev_app} -V 2> /dev/null"
--            fi
--        fi
--        udev_fix="="
--        if [ "${udev_call}" != "" ]; then
--            udev_out=`${udev_call}`
--            udev_ver=`expr "$udev_out" : '[^0-9]*\([0-9]*\)'`
--            if [ "$udev_ver" = "" -o "$udev_ver" -lt 55 ]; then
--               udev_fix=""
--            fi
--        fi
--        ## @todo 60-vboxadd.rules -> 60-vboxguest.rules ?
--        echo "KERNEL=${udev_fix}\"vboxguest\", NAME=\"vboxguest\", OWNER=\"vboxadd\", MODE=\"0660\"" > /etc/udev/rules.d/60-vboxadd.rules
--        echo "KERNEL=${udev_fix}\"vboxuser\", NAME=\"vboxuser\", OWNER=\"vboxadd\", MODE=\"0666\"" >> /etc/udev/rules.d/60-vboxadd.rules
--    fi
--
--    # Put mount.vboxsf in the right place
--    ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin
--    # And an rc file to re-build the kernel modules and re-set-up the X server.
--    ln -sf "$lib_path/$PACKAGE/vboxadd" /sbin/rcvboxadd
--    ln -sf "$lib_path/$PACKAGE/vboxadd-x11" /sbin/rcvboxadd-x11
--    # SELinux security context for the mount helper.
--    if test -e /etc/selinux/config; then
--        # This is correct.  semanage maps this to the real path, and it aborts
--        # with an error, telling you what you should have typed, if you specify
--        # the real path.  The "chcon" is there as a back-up in case this is
--        # different on old guests.
--        semanage fcontext -a -t mount_exec_t "/usr/lib/$PACKAGE/mount.vboxsf"
--        chcon -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf"
--    fi
--    succ_msg
--}
--
- # setup_script
- setup()
- {
--    if test -r $config; then
--      . $config
--    else
--      fail "Configuration file $config not found"
--    fi
--    test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
--      fail "Configuration file $config not complete"
--    export BUILD_TYPE
--    export USERNAME
--
--    rm -f $LOG
--    MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER"
--    BUILDINTMP="$MODULE_SRC/build_in_tmp"
--    DODKMS="$MODULE_SRC/do_dkms"
--    chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1
--    chcon -t bin_t "$DODKMS"     > /dev/null 2>&1
--
--    setup_modules
--    mod_succ="$?"
--    extra_setup
--    if [ "$mod_succ" -eq "0" ]; then
--        if running_vboxguest || running_vboxadd; then
--            printf "You should restart your guest to make sure the new modules are actually used\n\n"
--        else
--            start
--        fi
--    fi
-+    echo "Not implemented! Please use the virtualbox-kernel-addons.SlackBuild available at SlackBuilds.org instead."
- }
- 
- # cleanup_script
- cleanup()
- {
--    if test -r $config; then
--      . $config
--      test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
--        fail "Configuration file $config not complete"
--      DODKMS="$INSTALL_DIR/src/vboxguest-$INSTALL_VER/do_dkms"
--    elif test -x ./do_dkms; then  # Executing as part of the installer...
--      DODKMS=./do_dkms
--    else
--      fail "Configuration file $config not found"
--    fi
--
--    # Delete old versions of VBox modules.
--    cleanup_modules
--    for i in /lib/modules/*; do
--        update_module_dependencies "${i#/lib/modules/}"
--    done
--
--    # Remove old module sources
--    for i in $OLDMODULES; do
--      rm -rf /usr/src/$i-*
--    done
--
--    # Clean-up X11-related bits
--    /sbin/rcvboxadd-x11 cleanup
--
--    # Remove other files
--    rm /sbin/mount.vboxsf 2>/dev/null
--    rm /sbin/rcvboxadd 2>/dev/null
--    rm /sbin/rcvboxadd-x11 2>/dev/null
--    rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
--    rm -f /lib/modules/*/initrd/vboxvideo
-+    echo "Not implemented! Please use removepkg or pkgtool to remove virtualbox-addons and/or virtualbox-kernel-addons instead."
- }
- 
- dmnstatus()
diff --git a/system/virtualbox-addons/vbox-uninstall-guest-additions b/system/virtualbox-addons/vbox-uninstall-guest-additions
index afa4e98ccd..71555a6a51 100644
--- a/system/virtualbox-addons/vbox-uninstall-guest-additions
+++ b/system/virtualbox-addons/vbox-uninstall-guest-additions
@@ -7,4 +7,4 @@
 # provided by the distribution kernel package in place is acceptable if the
 # location does not clash with the VirtualBox-provided module location (misc).
 
-/sbin/removepkg virtualbox-addons virtualbox-kernel-addons
+/sbin/removepkg virtualbox-addons
diff --git a/system/virtualbox-addons/virtualbox-addons.SlackBuild b/system/virtualbox-addons/virtualbox-addons.SlackBuild
index 063fa71844..14b11d6e33 100644
--- a/system/virtualbox-addons/virtualbox-addons.SlackBuild
+++ b/system/virtualbox-addons/virtualbox-addons.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for virtualbox-addons
 
-# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2023 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,32 +11,42 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=virtualbox-addons
 SRCNAM=VirtualBox
-VERSION=${VERSION:-5.0.40}
+VERSION=${VERSION:-6.1.44}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -50,11 +60,8 @@ fi
 # kmk doesn't support MAKEFLAGS, so we use JOBS here
 JOBS=${JOBS:-3}
 
-# set xorg-server version
-XSERVER=$(X -version 2>&1 | grep Server | cut -d " " -f 4 | sed "s/\.//" | cut -d "." -f 1)
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
   TARGET="x86"
 elif [ "$ARCH" = "i686" ]; then
@@ -82,43 +89,32 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# We don't want an init-script building kernel modules.
-# Use virtualbox-kernel-addons.SlackBuild for this.
-patch -d src/VBox/Additions/linux/installer/ -i $CWD/rc.vboxadd.diff
-
-# We set the environment variables manually to avoid dependency on acpica
-export BUILD_PLATFORM="linux"
-export BUILD_PLATFORM_ARCH="$TARGET"
-export BUILD_TARGET="linux"
-export BUILD_TARGET_ARCH="$TARGET"
-export BUILD_TARGET_CPU="$ARCH"
-export BUILD_TYPE="release"
-export PATH_KBUILD="$TMP/$SRCNAM-${VERSION}/kBuild"
-export PATH_DEVTOOLS="$TMP/$SRCNAM-${VERSION}/tools"
-path_kbuild_bin="$PATH_KBUILD/bin/$BUILD_TARGET.$BUILD_PLATFORM_ARCH"
-export PATH_KBUILD_BIN="$path_kbuild_bin"
-path_dev_bin="$PATH_DEVTOOLS/$BUILD_TARGET.$BUILD_PLATFORM_ARCH"/bin
-echo "$PATH" | grep -q "$path_kbuild_bin" || PATH="$path_kbuild_bin:$PATH"
-echo "$PATH" | grep -q "$path_dev_bin" || PATH="$path_dev_bin:$PATH"
-export PATH
-unset path_kbuild_bin path_dev_bin
+patch -p0 < $CWD/gcc13.patch
+
+./configure \
+  --only-additions \
+  --disable-kmods \
+  --with-makeself=/usr/bin/echo
+
+. ./env.sh
 
 kmk -j ${JOBS} LOCALCFG=$CWD/LocalConfig.kmk
 
 mkdir -p $PKG/lib/udev/rules.d $PKG/sbin \
-  $PKG/etc/{xdg/autostart,rc.d} \
-  $PKG/usr/{src,bin,sbin,share/autostart} \
-  $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers
+  $PKG/lib$LIBDIRSUFFIX/security \
+  $PKG/etc/rc.d \
+  $PKG/usr/{bin,sbin}
 
-cp -f src/VBox/Additions/linux/installer/vboxadd.sh \
-  $PKG/etc/rc.d/rc.vboxadd.new
 cp -f src/VBox/Additions/linux/installer/vboxadd-service.sh \
   $PKG/etc/rc.d/rc.vboxadd-service.new
 
+mkdir -p $PKG/etc/xdg/autostart \
+  $PKG/usr/share/autostart
 cp -f src/VBox/Additions/x11/Installer/vboxclient.desktop \
   $PKG/etc/xdg/autostart/
 cp -f src/VBox/Additions/x11/Installer/vboxclient.desktop \
   $PKG/usr/share/autostart/
+
 install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient \
   $PKG/usr/bin/VBoxClient-all
 
@@ -128,35 +124,22 @@ echo "KERNEL==\"vboxuser\", NAME=\"vboxuser\", OWNER=\"vboxadd\", MODE=\"0666\""
  >> $PKG/lib/udev/rules.d/60-vboxadd.rules
 
 cd out/linux.$TARGET/release/bin/additions
-  cp -rf src/vboxguest $PKG/usr/src/vboxguest-$VERSION
-  cp -rf src/vboxsf $PKG/usr/src/vboxsf-$VERSION
-  cp -rf src/vboxvideo $PKG/usr/src/vboxvideo-$VERSION
   install -m 755 VBoxControl $PKG/usr/bin/
   install -m 755 VBoxClient $PKG/usr/bin/
+  install -m 4755 VBoxDRMClient $PKG/usr/bin/
   install -m 755 VBoxService $PKG/usr/sbin/
   install -m 4755 mount.vboxsf $PKG/sbin/mount.vboxsf
-  install -m 644 vboxvideo_drv_$XSERVER.so \
-    $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/vboxvideo_drv.so
-
-  install -m 644 VBoxOGLcrutil.so $PKG/usr/lib$LIBDIRSUFFIX
-  install -m 644 VBoxOGLerrorspu.so $PKG/usr/lib$LIBDIRSUFFIX
-  install -m 644 VBoxOGLarrayspu.so $PKG/usr/lib$LIBDIRSUFFIX
-  install -m 644 VBoxOGLfeedbackspu.so $PKG/usr/lib$LIBDIRSUFFIX
-  install -m 644 VBoxOGLpackspu.so $PKG/usr/lib$LIBDIRSUFFIX
-  install -m 644 VBoxOGLpassthroughspu.so $PKG/usr/lib$LIBDIRSUFFIX
-  install -m 644 VBoxOGL.so $PKG/usr/lib$LIBDIRSUFFIX
+  install -m 755 pam_vbox.so $PKG/lib$LIBDIRSUFFIX/security/pam_vbox.so
 
   install -m 755 $CWD/vbox-uninstall-guest-additions $PKG/usr/sbin/
-
-  mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/dri
-  ln -s /usr/lib$LIBDIRSUFFIX/VBoxOGL.so \
-    $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/dri/vboxvideo_dri.so
 cd -
 
-# kconf_update script to disable OpenGL within KDE
-mkdir -p $PKG/usr/share/apps/kconf_update $PKG/usr/share/config/
-install -m 644 $CWD/kwin_blacklist_vbox.sh $PKG/usr/share/apps/kconf_update/
-install -m 644 $CWD/kwinrc $PKG/usr/share/config/
+# We disabled kscreen in earlier versions of the package
+# This kconf_update script re-enabled it
+# See bug at https://bugs.kde.org/show_bug.cgi?id=407058
+mkdir -p $PKG/usr/share/kconf_update
+install -m 755 $CWD/plasma_enable_kscreen.sh $PKG/usr/share/kconf_update/
+install -m 644 $CWD/virtualbox_plasma_enable_kscreen.upd $PKG/usr/share/kconf_update/
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -171,4 +154,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/virtualbox-addons/virtualbox-addons.info b/system/virtualbox-addons/virtualbox-addons.info
index bf313e7e8d..1cfc3d8b53 100644
--- a/system/virtualbox-addons/virtualbox-addons.info
+++ b/system/virtualbox-addons/virtualbox-addons.info
@@ -1,10 +1,10 @@
 PRGNAM="virtualbox-addons"
-VERSION="5.0.40"
+VERSION="6.1.44"
 HOMEPAGE="https://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/5.0.40/VirtualBox-5.0.40.tar.bz2"
-MD5SUM="53b259e48a137b0185c169590e2dcb77"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/6.1.44/VirtualBox-6.1.44.tar.bz2"
+MD5SUM="309f868297447291db980a1d8fa11ec6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+EMAIL="pprkut@slackbuilds.org"
diff --git a/system/virtualbox-addons/virtualbox_plasma_enable_kscreen.upd b/system/virtualbox-addons/virtualbox_plasma_enable_kscreen.upd
new file mode 100644
index 0000000000..804ad42f74
--- /dev/null
+++ b/system/virtualbox-addons/virtualbox_plasma_enable_kscreen.upd
@@ -0,0 +1,6 @@
+Version=5
+
+# Enable kscreen inside virtualbox
+Id=virtualbox-plasma-enable-kscreen
+File=kded5rc
+Script=plasma_enable_kscreen.sh,sh
diff --git a/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild b/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild
index 9115605537..c4d107b2cf 100644
--- a/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild
+++ b/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for virtualbox-extension-pack
 
 # Originally written by Vliegendehuiskat, vliegendehuiskat [at] gmail [dot] com
 
-# Copyright 2014-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2014-2023 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,26 +24,36 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=virtualbox-extension-pack
-VERSION=${VERSION:-5.0.40}
+VERSION=${VERSION:-6.1.44}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -94,4 +104,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/virtualbox-extension-pack/virtualbox-extension-pack.info b/system/virtualbox-extension-pack/virtualbox-extension-pack.info
index 701af5aaef..2f4dc9dda0 100644
--- a/system/virtualbox-extension-pack/virtualbox-extension-pack.info
+++ b/system/virtualbox-extension-pack/virtualbox-extension-pack.info
@@ -1,10 +1,10 @@
 PRGNAM="virtualbox-extension-pack"
-VERSION="5.0.40"
+VERSION="6.1.44"
 HOMEPAGE="https://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/5.0.40/Oracle_VM_VirtualBox_Extension_Pack-5.0.40.vbox-extpack"
-MD5SUM="6991b332555f07a14189478486d4aae6"
+DOWNLOAD="http://download.virtualbox.org/virtualbox/6.1.44/Oracle_VM_VirtualBox_Extension_Pack-6.1.44.vbox-extpack"
+MD5SUM="bbd4fb48b1e3494247163fd61de35bc4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+EMAIL="pprkut@slackbuilds.org"
diff --git a/system/virtualbox-kernel-addons/COPYING b/system/virtualbox-kernel-addons/COPYING
deleted file mode 100644
index f9272174bc..0000000000
--- a/system/virtualbox-kernel-addons/COPYING
+++ /dev/null
@@ -1,365 +0,0 @@
-The majority of code in VirtualBox Open Source Edition (OSE) is
-copyrighted by Sun Microsystems, Inc. This code is combined with
-third-party code that was originally released under the Apache
-License 2.0, the OpenSSL license, the Mozilla Public License (MPL)
-and the Slirp license, all of which the Free Software Foundation
-considers to be incompatible with the GPL, as well as the X11, zlib,
-liblzf and LGPL licenses. As a special exception to the terms and
-conditions of the GPL listed below, Sun gives you explicit
-permission to combine its GPL code contained in VirtualBox OSE with
-third-party code under the aforementioned licenses. You may copy
-and distribute such a combination provided that you adhere to the
-terms and conditions of all of the GPL and the licenses of the
-third-party code; in particular, you must include the source code of
-the entire combination insofar as the GPL requires distribution of
-source code.
-
-Note that whoever creates or distributes a derived work based on
-VirtualBox OSE is not obligated to grant this special exception for
-such a version. The GPL allows for releasing a modified version
-without the above exception; Sun also allows you to release a modified
-version which carries forward this exception.
-
----
-
-
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/system/virtualbox-kernel-addons/COPYING.CDDL b/system/virtualbox-kernel-addons/COPYING.CDDL
deleted file mode 100644
index 5329e917ce..0000000000
--- a/system/virtualbox-kernel-addons/COPYING.CDDL
+++ /dev/null
@@ -1,381 +0,0 @@
-Some source files in the VirtualBox Open Source Edition (OSE) are
-dual-licensed under both the GNU General Public License V2.0 (GPL2, see
-the COPYING file) and the Common Development and Distribution License,
-Version 1.0 (CDDL), as shown below. This applies only to source files
-where this dual-licensing is explicitly worded in the file's header.
-
----
-
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0
-
-1. Definitions.
-
-    1.1. "Contributor" means each individual or entity that creates
-         or contributes to the creation of Modifications.
-
-    1.2. "Contributor Version" means the combination of the Original
-         Software, prior Modifications used by a Contributor (if any),
-         and the Modifications made by that particular Contributor.
-
-    1.3. "Covered Software" means (a) the Original Software, or (b)
-         Modifications, or (c) the combination of files containing
-         Original Software with files containing Modifications, in
-         each case including portions thereof.
-
-    1.4. "Executable" means the Covered Software in any form other
-         than Source Code.
-
-    1.5. "Initial Developer" means the individual or entity that first
-         makes Original Software available under this License.
-
-    1.6. "Larger Work" means a work which combines Covered Software or
-         portions thereof with code not governed by the terms of this
-         License.
-
-    1.7. "License" means this document.
-
-    1.8. "Licensable" means having the right to grant, to the maximum
-         extent possible, whether at the time of the initial grant or
-         subsequently acquired, any and all of the rights conveyed
-         herein.
-
-    1.9. "Modifications" means the Source Code and Executable form of
-         any of the following:
-
-        A. Any file that results from an addition to, deletion from or
-           modification of the contents of a file containing Original
-           Software or previous Modifications;
-
-        B. Any new file that contains any part of the Original
-           Software or previous Modifications; or
-
-        C. Any new file that is contributed or otherwise made
-           available under the terms of this License.
-
-    1.10. "Original Software" means the Source Code and Executable
-          form of computer software code that is originally released
-          under this License.
-
-    1.11. "Patent Claims" means any patent claim(s), now owned or
-          hereafter acquired, including without limitation, method,
-          process, and apparatus claims, in any patent Licensable by
-          grantor.
-
-    1.12. "Source Code" means (a) the common form of computer software
-          code in which modifications are made and (b) associated
-          documentation included in or with such code.
-
-    1.13. "You" (or "Your") means an individual or a legal entity
-          exercising rights under, and complying with all of the terms
-          of, this License.  For legal entities, "You" includes any
-          entity which controls, is controlled by, or is under common
-          control with You.  For purposes of this definition,
-          "control" means (a) the power, direct or indirect, to cause
-          the direction or management of such entity, whether by
-          contract or otherwise, or (b) ownership of more than fifty
-          percent (50%) of the outstanding shares or beneficial
-          ownership of such entity.
-
-2. License Grants.
-
-    2.1. The Initial Developer Grant.
-
-    Conditioned upon Your compliance with Section 3.1 below and
-    subject to third party intellectual property claims, the Initial
-    Developer hereby grants You a world-wide, royalty-free,
-    non-exclusive license:
-
-        (a) under intellectual property rights (other than patent or
-            trademark) Licensable by Initial Developer, to use,
-            reproduce, modify, display, perform, sublicense and
-            distribute the Original Software (or portions thereof),
-            with or without Modifications, and/or as part of a Larger
-            Work; and
-
-        (b) under Patent Claims infringed by the making, using or
-            selling of Original Software, to make, have made, use,
-            practice, sell, and offer for sale, and/or otherwise
-            dispose of the Original Software (or portions thereof).
-
-        (c) The licenses granted in Sections 2.1(a) and (b) are
-            effective on the date Initial Developer first distributes
-            or otherwise makes the Original Software available to a
-            third party under the terms of this License.
-
-        (d) Notwithstanding Section 2.1(b) above, no patent license is
-            granted: (1) for code that You delete from the Original
-            Software, or (2) for infringements caused by: (i) the
-            modification of the Original Software, or (ii) the
-            combination of the Original Software with other software
-            or devices.
-
-    2.2. Contributor Grant.
-
-    Conditioned upon Your compliance with Section 3.1 below and
-    subject to third party intellectual property claims, each
-    Contributor hereby grants You a world-wide, royalty-free,
-    non-exclusive license:
-
-        (a) under intellectual property rights (other than patent or
-            trademark) Licensable by Contributor to use, reproduce,
-            modify, display, perform, sublicense and distribute the
-            Modifications created by such Contributor (or portions
-            thereof), either on an unmodified basis, with other
-            Modifications, as Covered Software and/or as part of a
-            Larger Work; and
-
-        (b) under Patent Claims infringed by the making, using, or
-            selling of Modifications made by that Contributor either
-            alone and/or in combination with its Contributor Version
-            (or portions of such combination), to make, use, sell,
-            offer for sale, have made, and/or otherwise dispose of:
-            (1) Modifications made by that Contributor (or portions
-            thereof); and (2) the combination of Modifications made by
-            that Contributor with its Contributor Version (or portions
-            of such combination).
-
-        (c) The licenses granted in Sections 2.2(a) and 2.2(b) are
-            effective on the date Contributor first distributes or
-            otherwise makes the Modifications available to a third
-            party.
-
-        (d) Notwithstanding Section 2.2(b) above, no patent license is
-            granted: (1) for any code that Contributor has deleted
-            from the Contributor Version; (2) for infringements caused
-            by: (i) third party modifications of Contributor Version,
-            or (ii) the combination of Modifications made by that
-            Contributor with other software (except as part of the
-            Contributor Version) or other devices; or (3) under Patent
-            Claims infringed by Covered Software in the absence of
-            Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
-    3.1. Availability of Source Code.
-
-    Any Covered Software that You distribute or otherwise make
-    available in Executable form must also be made available in Source
-    Code form and that Source Code form must be distributed only under
-    the terms of this License.  You must include a copy of this
-    License with every copy of the Source Code form of the Covered
-    Software You distribute or otherwise make available.  You must
-    inform recipients of any such Covered Software in Executable form
-    as to how they can obtain such Covered Software in Source Code
-    form in a reasonable manner on or through a medium customarily
-    used for software exchange.
-
-    3.2. Modifications.
-
-    The Modifications that You create or to which You contribute are
-    governed by the terms of this License.  You represent that You
-    believe Your Modifications are Your original creation(s) and/or
-    You have sufficient rights to grant the rights conveyed by this
-    License.
-
-    3.3. Required Notices.
-
-    You must include a notice in each of Your Modifications that
-    identifies You as the Contributor of the Modification.  You may
-    not remove or alter any copyright, patent or trademark notices
-    contained within the Covered Software, or any notices of licensing
-    or any descriptive text giving attribution to any Contributor or
-    the Initial Developer.
-
-    3.4. Application of Additional Terms.
-
-    You may not offer or impose any terms on any Covered Software in
-    Source Code form that alters or restricts the applicable version
-    of this License or the recipients' rights hereunder.  You may
-    choose to offer, and to charge a fee for, warranty, support,
-    indemnity or liability obligations to one or more recipients of
-    Covered Software.  However, you may do so only on Your own behalf,
-    and not on behalf of the Initial Developer or any Contributor.
-    You must make it absolutely clear that any such warranty, support,
-    indemnity or liability obligation is offered by You alone, and You
-    hereby agree to indemnify the Initial Developer and every
-    Contributor for any liability incurred by the Initial Developer or
-    such Contributor as a result of warranty, support, indemnity or
-    liability terms You offer.
-
-    3.5. Distribution of Executable Versions.
-
-    You may distribute the Executable form of the Covered Software
-    under the terms of this License or under the terms of a license of
-    Your choice, which may contain terms different from this License,
-    provided that You are in compliance with the terms of this License
-    and that the license for the Executable form does not attempt to
-    limit or alter the recipient's rights in the Source Code form from
-    the rights set forth in this License.  If You distribute the
-    Covered Software in Executable form under a different license, You
-    must make it absolutely clear that any terms which differ from
-    this License are offered by You alone, not by the Initial
-    Developer or Contributor.  You hereby agree to indemnify the
-    Initial Developer and every Contributor for any liability incurred
-    by the Initial Developer or such Contributor as a result of any
-    such terms You offer.
-
-    3.6. Larger Works.
-
-    You may create a Larger Work by combining Covered Software with
-    other code not governed by the terms of this License and
-    distribute the Larger Work as a single product.  In such a case,
-    You must make sure the requirements of this License are fulfilled
-    for the Covered Software.
-
-4. Versions of the License.
-
-    4.1. New Versions.
-
-    Sun Microsystems, Inc. is the initial license steward and may
-    publish revised and/or new versions of this License from time to
-    time.  Each version will be given a distinguishing version number.
-    Except as provided in Section 4.3, no one other than the license
-    steward has the right to modify this License.
-
-    4.2. Effect of New Versions.
-
-    You may always continue to use, distribute or otherwise make the
-    Covered Software available under the terms of the version of the
-    License under which You originally received the Covered Software.
-    If the Initial Developer includes a notice in the Original
-    Software prohibiting it from being distributed or otherwise made
-    available under any subsequent version of the License, You must
-    distribute and make the Covered Software available under the terms
-    of the version of the License under which You originally received
-    the Covered Software.  Otherwise, You may also choose to use,
-    distribute or otherwise make the Covered Software available under
-    the terms of any subsequent version of the License published by
-    the license steward.
-
-    4.3. Modified Versions.
-
-    When You are an Initial Developer and You want to create a new
-    license for Your Original Software, You may create and use a
-    modified version of this License if You: (a) rename the license
-    and remove any references to the name of the license steward
-    (except to note that the license differs from this License); and
-    (b) otherwise make it clear that the license contains terms which
-    differ from this License.
-
-5. DISCLAIMER OF WARRANTY.
-
-    COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
-    BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-    INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-    SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-    PURPOSE OR NON-INFRINGING.  THE ENTIRE RISK AS TO THE QUALITY AND
-    PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU.  SHOULD ANY
-    COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-    INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
-    NECESSARY SERVICING, REPAIR OR CORRECTION.  THIS DISCLAIMER OF
-    WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE.  NO USE OF
-    ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-    DISCLAIMER.
-
-6. TERMINATION.
-
-    6.1. This License and the rights granted hereunder will terminate
-    automatically if You fail to comply with terms herein and fail to
-    cure such breach within 30 days of becoming aware of the breach.
-    Provisions which, by their nature, must remain in effect beyond
-    the termination of this License shall survive.
-
-    6.2. If You assert a patent infringement claim (excluding
-    declaratory judgment actions) against Initial Developer or a
-    Contributor (the Initial Developer or Contributor against whom You
-    assert such claim is referred to as "Participant") alleging that
-    the Participant Software (meaning the Contributor Version where
-    the Participant is a Contributor or the Original Software where
-    the Participant is the Initial Developer) directly or indirectly
-    infringes any patent, then any and all rights granted directly or
-    indirectly to You by such Participant, the Initial Developer (if
-    the Initial Developer is not the Participant) and all Contributors
-    under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
-    notice from Participant terminate prospectively and automatically
-    at the expiration of such 60 day notice period, unless if within
-    such 60 day period You withdraw Your claim with respect to the
-    Participant Software against such Participant either unilaterally
-    or pursuant to a written agreement with Participant.
-
-    6.3. In the event of termination under Sections 6.1 or 6.2 above,
-    all end user licenses that have been validly granted by You or any
-    distributor hereunder prior to termination (excluding licenses
-    granted to You by any distributor) shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
-    UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-    (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-    INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-    COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-    LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-    CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-    LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-    STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-    COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-    INFORMED OF THE POSSIBILITY OF SUCH DAMAGES.  THIS LIMITATION OF
-    LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-    INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-    APPLICABLE LAW PROHIBITS SUCH LIMITATION.  SOME JURISDICTIONS DO
-    NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-    CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-    APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
-    The Covered Software is a "commercial item," as that term is
-    defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-    computer software" (as that term is defined at 48
-    C.F.R. 252.227-7014(a)(1)) and "commercial computer software
-    documentation" as such terms are used in 48 C.F.R. 12.212
-    (Sept. 1995).  Consistent with 48 C.F.R. 12.212 and 48
-    C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all
-    U.S. Government End Users acquire Covered Software with only those
-    rights set forth herein.  This U.S. Government Rights clause is in
-    lieu of, and supersedes, any other FAR, DFAR, or other clause or
-    provision that addresses Government rights in computer software
-    under this License.
-
-9. MISCELLANEOUS.
-
-    This License represents the complete agreement concerning subject
-    matter hereof.  If any provision of this License is held to be
-    unenforceable, such provision shall be reformed only to the extent
-    necessary to make it enforceable.  This License shall be governed
-    by the law of the jurisdiction specified in a notice contained
-    within the Original Software (except to the extent applicable law,
-    if any, provides otherwise), excluding such jurisdiction's
-    conflict-of-law provisions.  Any litigation relating to this
-    License shall be subject to the jurisdiction of the courts located
-    in the jurisdiction and venue specified in a notice contained
-    within the Original Software, with the losing party responsible
-    for costs, including, without limitation, court costs and
-    reasonable attorneys' fees and expenses.  The application of the
-    United Nations Convention on Contracts for the International Sale
-    of Goods is expressly excluded.  Any law or regulation which
-    provides that the language of a contract shall be construed
-    against the drafter shall not apply to this License.  You agree
-    that You alone are responsible for compliance with the United
-    States export administration regulations (and the export control
-    laws and regulation of any other countries) when You use,
-    distribute or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
-    As between Initial Developer and the Contributors, each party is
-    responsible for claims and damages arising, directly or
-    indirectly, out of its utilization of rights under this License
-    and You agree to work with Initial Developer and Contributors to
-    distribute such responsibility on an equitable basis.  Nothing
-    herein is intended or shall be deemed to constitute any admission
-    of liability.
-
---------------------------------------------------------------------
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
-DISTRIBUTION LICENSE (CDDL)
-
-For Covered Software in this distribution, this License shall be
-governed by the laws of Germany. Legal venue shall be Stuttgart,
-Germany.
diff --git a/system/virtualbox-kernel-addons/README b/system/virtualbox-kernel-addons/README
deleted file mode 100644
index 5e6ad5464e..0000000000
--- a/system/virtualbox-kernel-addons/README
+++ /dev/null
@@ -1,14 +0,0 @@
-This are the supplementary kernel drivers for the VirtualBox
-virtualization environment to be used within a guest.
-
-To build the package for a kernel different from the running one,
-start the script setting the KERNEL variable as in
-  KERNEL=2.6.38.8 ./virtualbox-kernel.SlackBuild
-
-If you want to build a kernel module for an other virtualbox version
-you can use the included "virtualbox-kernel-addons-mksrctarball.sh"
-which will generate the needed source package for you. You will need
-to have the coresponding virtualbox-ose-addons version already installed.
-
-This package is intended to be used on GUEST / VIRTUAL MACHINES running
-Slackware, NOT the host system.
diff --git a/system/virtualbox-kernel-addons/doinst.sh b/system/virtualbox-kernel-addons/doinst.sh
deleted file mode 100644
index 766ff48186..0000000000
--- a/system/virtualbox-kernel-addons/doinst.sh
+++ /dev/null
@@ -1 +0,0 @@
-chroot . /sbin/depmod -a @KERNEL@
diff --git a/system/virtualbox-kernel-addons/slack-desc b/system/virtualbox-kernel-addons/slack-desc
deleted file mode 100644
index 1f5674d804..0000000000
--- a/system/virtualbox-kernel-addons/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-                        |-----handy-ruler------------------------------------------------------|
-virtualbox-kernel-addons: virtualbox-kernel-addons (VirtualBox guest additions - kernel modules)
-virtualbox-kernel-addons:
-virtualbox-kernel-addons: This are the supplementary kernel drivers for the VirtualBox
-virtualbox-kernel-addons: virtualisation environment, to be used within in a guest.
-virtualbox-kernel-addons:
-virtualbox-kernel-addons: Homepage: https://www.virtualbox.org
-virtualbox-kernel-addons:
-virtualbox-kernel-addons:
-virtualbox-kernel-addons:
-virtualbox-kernel-addons:
-virtualbox-kernel-addons:
diff --git a/system/virtualbox-kernel-addons/virtualbox-kernel-addons-mksrctarball.sh b/system/virtualbox-kernel-addons/virtualbox-kernel-addons-mksrctarball.sh
deleted file mode 100644
index f888c3b611..0000000000
--- a/system/virtualbox-kernel-addons/virtualbox-kernel-addons-mksrctarball.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-# This script helps you to make the source package
-# of the virtualbox guest additions kernel modules.
-# IMPORTANT: The virtualbox-ose-addons version you want to use
-# must already be installed!
-
-# Based on the ffmpeg-mksrctarball.sh from the SlackBuilds.org repository
-
-set -e
-
-PRGNAM=virtualbox-kernel-addons
-VERSION=$(VBoxControl -V | grep -e '^[0-9].[0-9].[0-9]*r[0-9]*' | cut -d "r" -f 1)
-
-mkdir $PRGNAM
-
-echo "--> Copying sourcecode from /usr/src"
-cp -rf /usr/src/vboxguest-$VERSION $PRGNAM/vboxguest
-cp -rf /usr/src/vboxsf-$VERSION $PRGNAM/vboxsf
-cp -rf /usr/src/vboxvideo-$VERSION $PRGNAM/vboxvideo
-
-echo "--> Making the sourcecode tarball: $PRGNAM-src-$VERSION.tar.xz"
-tar -cJf $PRGNAM-$VERSION.tar.xz $PRGNAM
-
-echo "--> Erasing the sourcecode directory: $PRGNAM/"
-rm -rf $PRGNAM/
-
-echo "--> Sourcecode tarball for $PRGNAM: $PRGNAM-$VERSION.tar.xz"
diff --git a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild b/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild
deleted file mode 100644
index 722e60c9b8..0000000000
--- a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for virtualbox-kernel-addons
-
-# Copyright 2008-2019 Heinz Wiesinger, Amsterdam, The Netherlands
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=virtualbox-kernel-addons
-VERSION=${VERSION:-5.0.40}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-KERNEL=${KERNEL:-$(uname -r)}
-KERNELPATH=${KERNELPATH:-/lib/modules/$KERNEL/build}
-PKG_VERS=${VERSION}_$(echo $KERNEL| tr - _)
-
-unset ARCH
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-PKG_ARCH=$ARCH
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$PRGNAM}
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p $PKG/lib/modules/$KERNEL/misc
-
-KERNEL_LOCALVERSION=$(zgrep "CONFIG_LOCALVERSION=" /proc/config.gz | cut -d '"' -f 2)
-if [ -z "$KERNEL_LOCALVERSION" ]; then
-  KERNEL_MINOR=$(echo $KERNEL | cut -d "." -f 2)
-  KERNEL_PATCH=$(echo $KERNEL | cut -d "." -f 3)
-else
-  KERNEL_MINOR=$(echo $KERNEL | sed "s|$KERNEL_LOCALVERSION||" | cut -d "." -f 2)
-  KERNEL_PATCH=$(echo $KERNEL | sed "s|$KERNEL_LOCALVERSION||" | cut -d "." -f 3)
-fi
-
-# Work around API break introduced in kernel 4.4.168
-if [ "$KERNEL_MINOR" = 4 -a "$KERNEL_PATCH" -ge 168 ]; then
-  sed -i "s|KERNEL_VERSION(4, 9, 0)|KERNEL_VERSION(4, 4, 168)|" vboxguest/r0drv/linux/memobj-r0drv-linux.c
-fi
-
-for i in vboxguest vboxsf vboxvideo; do
-  cd $i
-    make KERN_DIR=$KERNELPATH
-    install -m 0644 $i.ko $PKG/lib/modules/$KERNEL/misc/
-  cd -
-done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$PKG_VERS
-cat $CWD/COPYING > $PKG/usr/doc/$PRGNAM-$PKG_VERS/COPYING
-cat $CWD/COPYING.CDDL > $PKG/usr/doc/$PRGNAM-$PKG_VERS/COPYING.CDDL
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKG_VERS/$PRGNAM.SlackBuild
-chown -R root:root $PKG/usr/doc
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERS-$PKG_ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.info b/system/virtualbox-kernel-addons/virtualbox-kernel-addons.info
deleted file mode 100644
index 33c005b4fe..0000000000
--- a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="virtualbox-kernel-addons"
-VERSION="5.0.40"
-HOMEPAGE="https://www.virtualbox.org"
-DOWNLOAD="http://www.liwjatan.at/files/src/virtualbox-kernel-addons/virtualbox-kernel-addons-5.0.40.tar.xz"
-MD5SUM="6146afd44b37c65bd7acc01e067b6e86"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
diff --git a/system/virtualbox-kernel/README b/system/virtualbox-kernel/README
index 6ce574997c..a9145eed0c 100644
--- a/system/virtualbox-kernel/README
+++ b/system/virtualbox-kernel/README
@@ -5,10 +5,10 @@ To build the package for a kernel different from the running one,
 start the script setting the KERNEL variable as in
   KERNEL=2.6.38.8 ./virtualbox-kernel.SlackBuild
 
-Note that if you have built virtualbox with HARDENING=no, then you
-have to do the same for virtualbox-kernel.
-
 If you want to build a kernel module for an other virtualbox version
 you can use the included "virtualbox-kernel-mksrctarball.sh" which will
 generate the needed source package for you. You will need to have
 the coresponding virtualbox-ose version already installed.
+
+Note to 32-bit users: VirtualBox no longer supports 32-bit x86, as of
+version 6.0.
diff --git a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild
index d879686802..3db6cb3351 100644
--- a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild
+++ b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for virtualbox-kernel
 
-# Copyright 2008-2019 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2023 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,23 +11,26 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Modified by SlackBuilds.org
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=virtualbox-kernel
-VERSION=${VERSION:-5.0.40}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-6.1.44}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 KERNEL=${KERNEL:-$(uname -r)}
 KERNELPATH=${KERNELPATH:-/lib/modules/$KERNEL/build}
@@ -37,7 +40,7 @@ unset ARCH
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -45,9 +48,16 @@ fi
 
 PKG_ARCH=$ARCH
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKG_VERS-$PKG_ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$PRGNAM}
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 set -e
@@ -65,24 +75,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-if ! [ "${HARDENING:-yes}" = "yes" ]; then
-  sed -i "s/ -DVBOX_WITH_HARDENING//g" \
-   {vboxdrv,vboxnetadp,vboxnetflt,vboxpci}/Makefile
-fi
-
-KERNEL_LOCALVERSION=$(zgrep "CONFIG_LOCALVERSION=" /proc/config.gz | cut -d '"' -f 2)
-if [ -z "$KERNEL_LOCALVERSION" ]; then
-  KERNEL_MINOR=$(echo $KERNEL | cut -d "." -f 2)
-  KERNEL_PATCH=$(echo $KERNEL | cut -d "." -f 3)
-else
-  KERNEL_MINOR=$(echo $KERNEL | sed "s|$KERNEL_LOCALVERSION||" | cut -d "." -f 2)
-  KERNEL_PATCH=$(echo $KERNEL | sed "s|$KERNEL_LOCALVERSION||" | cut -d "." -f 3)
-fi
-
-# Work around API break introduced in kernel 4.4.168
-if [ "$KERNEL_MINOR" = 4 -a "$KERNEL_PATCH" -ge 168 ]; then
-  sed -i "s|KERNEL_VERSION(4, 9, 0)|KERNEL_VERSION(4, 4, 168)|" vboxdrv/r0drv/linux/memobj-r0drv-linux.c
-fi
+# Fix compatibility with 5.18.x
+sed -i "s|netif_rx_ni|netif_rx|g" vboxnetflt/linux/VBoxNetFlt-linux.c
 
 make KERN_DIR=${KERNELPATH}
 
@@ -90,7 +84,8 @@ mkdir -p $PKG/lib/modules/$KERNEL/misc
 install -m 0644 vboxdrv.ko $PKG/lib/modules/$KERNEL/misc/
 install -m 0644 vboxnetflt.ko $PKG/lib/modules/$KERNEL/misc/
 install -m 0644 vboxnetadp.ko $PKG/lib/modules/$KERNEL/misc/
-install -m 0644 vboxpci.ko $PKG/lib/modules/$KERNEL/misc/
+
+find $PKG -name "*.ko" -exec strip --strip-debug "{}" \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$PKG_VERS
 cat $CWD/COPYING > $PKG/usr/doc/$PRGNAM-$PKG_VERS/COPYING
@@ -102,4 +97,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERS-$PKG_ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERS-$PKG_ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/virtualbox-kernel/virtualbox-kernel.info b/system/virtualbox-kernel/virtualbox-kernel.info
index deded0026e..e27edacdce 100644
--- a/system/virtualbox-kernel/virtualbox-kernel.info
+++ b/system/virtualbox-kernel/virtualbox-kernel.info
@@ -1,10 +1,10 @@
 PRGNAM="virtualbox-kernel"
-VERSION="5.0.40"
+VERSION="6.1.44"
 HOMEPAGE="https://www.virtualbox.org"
-DOWNLOAD="http://www.liwjatan.at/files/src/virtualbox-kernel/virtualbox-kernel-5.0.40.tar.xz"
-MD5SUM="475de2d0a915ce7c0c623ac50696bb79"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://sources.liwjatan.org/virtualbox-kernel/virtualbox-kernel-6.1.44.tar.xz"
+MD5SUM_x86_64="61f3a59cea124459bd6d760a9ed5ac19"
 REQUIRES=""
 MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+EMAIL="pprkut@slackbuilds.org"
diff --git a/system/virtualbox/006-rdesktop-vrdp-keymap-path.patch b/system/virtualbox/006-rdesktop-vrdp-keymap-path.patch
index 46c72c1ccf..217aa4970b 100644
--- a/system/virtualbox/006-rdesktop-vrdp-keymap-path.patch
+++ b/system/virtualbox/006-rdesktop-vrdp-keymap-path.patch
@@ -1,6 +1,6 @@
 # 2015 © Sébastien Luttringer
---- a/src/VBox/RDP/client-1.8.3/Makefile.kmk 2013-02-19 23:12:20.207464901 +0100
-+++ b/src/VBox/RDP/client-1.8.3/Makefile.kmk 2014-01-04 04:17:26.700618600 +0100
+--- a/src/VBox/RDP/client-1.8.4/Makefile.kmk 2013-02-19 23:12:20.207464901 +0100
++++ b/src/VBox/RDP/client-1.8.4/Makefile.kmk 2014-01-04 04:17:26.700618600 +0100
 @@ -41,7 +41,7 @@
  	EGD_SOCKET=\"/var/run/egd-pool\" WITH_RDPSND=1 HAVE_DIRENT_H=1 \
  	HAVE_ICONV=1 HAVE_SYS_STATVFS_H=1 \
diff --git a/system/virtualbox/10-virtualbox.rules b/system/virtualbox/10-virtualbox.rules
index cdddafb97c..db7ade9e0a 100644
--- a/system/virtualbox/10-virtualbox.rules
+++ b/system/virtualbox/10-virtualbox.rules
@@ -1,7 +1,8 @@
 KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660"
 KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root", GROUP="root", MODE="0666"
 KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660"
-SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+
+SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
 SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
 SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
diff --git a/system/virtualbox/LocalConfig.kmk b/system/virtualbox/LocalConfig.kmk
index 379c93fb45..8003032c10 100644
--- a/system/virtualbox/LocalConfig.kmk
+++ b/system/virtualbox/LocalConfig.kmk
@@ -5,6 +5,7 @@ DEFS += RTPATH_APP_PRIVATE=\"/usr/share/virtualbox\"
 # don't build testcases to save time, they are not needed for the package
 VBOX_WITH_TESTCASES     :=
 VBOX_WITH_TESTSUITE     :=
+VBOX_WITH_VALIDATIONKIT :=
 
 # don't build guest-additions, they will come in a separate build
 VBOX_WITHOUT_ADDITIONS  := 1
@@ -32,3 +33,13 @@ VBOX_JAVA_HOME := /usr/LIBDIR/java
 
 # Do not build docs from source. Depends on texlive...
 VBOX_WITHOUT_DOCS := 1
+
+# Use our CFLAGS
+VBOX_GCC_OPT := CXXFLAGS
+
+# Don't display update requests as we manage updates via packages
+VBOX_WITH_UPDATE_REQUEST :=
+
+# Build useful tools linked to testcases
+VBOX_WITH_VBOX_IMG     := 1
+VBOX_WITH_VBOXIMGMOUNT := 1
diff --git a/system/virtualbox/README b/system/virtualbox/README
index f8a9c427e8..9d3e7f6171 100644
--- a/system/virtualbox/README
+++ b/system/virtualbox/README
@@ -1,21 +1,14 @@
 VirtualBox Open Source Edition (OSE) is a general-purpose full
 virtualizer for x86 hardware.
 
-By default VirtualBox will be compiled with hardening enabled. That
-means all binaries will be run suid root, which is the default
-behaviour of upstream packages. However, you are still able
-to disable this by passing HARDENING=no to the script.
-
 You have to create a vboxusers group, e.g. "groupadd -g 215 vboxusers"
 and make your user a member of that group.
 
-To compile a headless virtualbox pass HEADLESS=yes to the script.
-
 To enable the webservice pass WEBSERVICE=yes to the script. This will
 require gsoap as optional dependency.
 
 If you want to build the java bindings, pass JAVA=yes to the script.
-This will require jdk as optional dependency.
+This will require zulu-openjdk8 as optional dependency.
 
 On x86_64, this by default builds without software virtualization. This
 means you need hardware virtualization in order to run 32bit guests on
@@ -27,3 +20,6 @@ stock x86_64 system. This switch has no effect on x86 systems.
 If you want to attach VirtualBox to a VDE network you will need vde2.
 
 See README.SLACKWARE for some setup notes.
+
+Note to 32-bit users: VirtualBox no longer supports 32-bit x86, as of
+version 6.0.
diff --git a/system/virtualbox/vboxdrv.sh-setup.diff b/system/virtualbox/vboxdrv.sh-setup.diff
index 0adf8ec237..97e0d0af23 100644
--- a/system/virtualbox/vboxdrv.sh-setup.diff
+++ b/system/virtualbox/vboxdrv.sh-setup.diff
@@ -1,93 +1,548 @@
---- VirtualBox-4.3.4.orig/src/VBox/Installer/linux/vboxdrv.sh.in	2013-11-29 20:24:07.000000000 +0100
-+++ VirtualBox-4.3.4/src/VBox/Installer/linux/vboxdrv.sh.in	2013-12-08 18:08:09.667571974 +0100
-@@ -44,17 +44,13 @@
+--- vboxdrv.sh.orig	2023-01-11 18:59:15.000000000 +0100
++++ vboxdrv.sh	2023-03-11 16:35:46.673798632 +0100
+@@ -45,39 +45,13 @@
+   MODPROBE="$MODPROBE --allow-unsupported-modules"
+ fi
+ 
+-setup_log()
+-{
+-    test -n "${LOG}" && return 0
+-    # Rotate log files
+-    LOG="/var/log/vbox-setup.log"
+-    mv "${LOG}.3" "${LOG}.4" 2>/dev/null
+-    mv "${LOG}.2" "${LOG}.3" 2>/dev/null
+-    mv "${LOG}.1" "${LOG}.2" 2>/dev/null
+-    mv "${LOG}" "${LOG}.1" 2>/dev/null
+-}
+-
+ [ -f /etc/vbox/vbox.cfg ] && . /etc/vbox/vbox.cfg
+ export VBOX_KBUILD_TYPE
+ export USERNAME
+ export USER=$USERNAME
  
- if [ -n "$INSTALL_DIR" ]; then
-     VBOXMANAGE="$INSTALL_DIR/VBoxManage"
--    MODULE_SRC="$INSTALL_DIR/src/vboxhost"
- else
-     VBOXMANAGE="/usr/lib/virtualbox/VBoxManage"
+-if test -n "${INSTALL_DIR}" && test -x "${INSTALL_DIR}/VirtualBox"; then
+-    MODULE_SRC="${INSTALL_DIR}/src/vboxhost"
+-elif test -x /usr/lib/virtualbox/VirtualBox; then
+-    INSTALL_DIR=/usr/lib/virtualbox
 -    MODULE_SRC="/usr/share/virtualbox/src/vboxhost"
- fi
--BUILDINTMP="$MODULE_SRC/build_in_tmp"
--DODKMS="$MODULE_SRC/do_dkms"
+-elif test -x "${SCRIPT_DIR}/VirtualBox"; then
+-    # Executing from the build directory
+-    INSTALL_DIR="${SCRIPT_DIR}"
+-    MODULE_SRC="${INSTALL_DIR}/src"
+-else
+-    # Silently exit if the package was uninstalled but not purged.
+-    # Applies to Debian packages only (but shouldn't hurt elsewhere)
+-    exit 0
+-fi
+ VIRTUALBOX="${INSTALL_DIR}/VirtualBox"
+ VBOXMANAGE="${INSTALL_DIR}/VBoxManage"
+-BUILDINTMP="${MODULE_SRC}/build_in_tmp"
+ if test -u "${VIRTUALBOX}"; then
+     GROUP=root
+     DEVICE_MODE=0600
+@@ -173,299 +147,12 @@
+     lsmod | grep -q "$1[^_-]"
+ }
+ 
+-log()
+-{
+-    setup_log
+-    echo "${1}" >> "${LOG}"
+-}
+-
+-module_build_log()
+-{
+-    setup_log
+-    echo "${1}" | egrep -v \
+-        "^test -e include/generated/autoconf.h|^echo >&2|^/bin/false\)$" \
+-        >> "${LOG}"
+-}
+-
+ # Detect VirtualBox version info or report error.
+ VBOX_VERSION="`"$VBOXMANAGE" -v | cut -d r -f1`"
+ [ -n "$VBOX_VERSION" ] || failure 'Cannot detect VirtualBox version number'
+ VBOX_REVISION="r`"$VBOXMANAGE" -v | cut -d r -f2`"
+ [ "$VBOX_REVISION" != "r" ] || failure 'Cannot detect VirtualBox revision number'
+ 
+-## Output the vboxdrv part of our udev rule.  This is redirected to the right file.
+-udev_write_vboxdrv() {
+-    VBOXDRV_GRP="$1"
+-    VBOXDRV_MODE="$2"
+-
+-    echo "KERNEL==\"vboxdrv\", NAME=\"vboxdrv\", OWNER=\"root\", GROUP=\"$VBOXDRV_GRP\", MODE=\"$VBOXDRV_MODE\""
+-    echo "KERNEL==\"vboxdrvu\", NAME=\"vboxdrvu\", OWNER=\"root\", GROUP=\"root\", MODE=\"0666\""
+-    echo "KERNEL==\"vboxnetctl\", NAME=\"vboxnetctl\", OWNER=\"root\", GROUP=\"$VBOXDRV_GRP\", MODE=\"$VBOXDRV_MODE\""
+-}
+-
+-## Output the USB part of our udev rule.  This is redirected to the right file.
+-udev_write_usb() {
+-    INSTALLATION_DIR="$1"
+-    USB_GROUP="$2"
+-
+-    echo "SUBSYSTEM==\"usb_device\", ACTION==\"add\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass}${USB_GROUP}\""
+-    echo "SUBSYSTEM==\"usb\", ACTION==\"add\", ENV{DEVTYPE}==\"usb_device\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass}${USB_GROUP}\""
+-    echo "SUBSYSTEM==\"usb_device\", ACTION==\"remove\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh --remove \$major \$minor\""
+-    echo "SUBSYSTEM==\"usb\", ACTION==\"remove\", ENV{DEVTYPE}==\"usb_device\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh --remove \$major \$minor\""
+-}
+-
+-## Generate our udev rule file.  This takes a change in udev rule syntax in
+-## version 55 into account.  It only creates rules for USB for udev versions
+-## recent enough to support USB device nodes.
+-generate_udev_rule() {
+-    VBOXDRV_GRP="$1"      # The group owning the vboxdrv device
+-    VBOXDRV_MODE="$2"     # The access mode for the vboxdrv device
+-    INSTALLATION_DIR="$3" # The directory VirtualBox is installed in
+-    USB_GROUP="$4"        # The group that has permission to access USB devices
+-    NO_INSTALL="$5"       # Set this to "1" to remove but not re-install rules
+-
+-    # Extra space!
+-    case "$USB_GROUP" in ?*) USB_GROUP=" $USB_GROUP" ;; esac
+-    case "$NO_INSTALL" in "1") return ;; esac
+-    udev_write_vboxdrv "$VBOXDRV_GRP" "$VBOXDRV_MODE"
+-    udev_write_usb "$INSTALLATION_DIR" "$USB_GROUP"
+-}
+-
+-## Install udev rule (disable with INSTALL_NO_UDEV=1 in
+-## /etc/default/virtualbox).
+-install_udev() {
+-    VBOXDRV_GRP="$1"      # The group owning the vboxdrv device
+-    VBOXDRV_MODE="$2"     # The access mode for the vboxdrv device
+-    INSTALLATION_DIR="$3" # The directory VirtualBox is installed in
+-    USB_GROUP="$4"        # The group that has permission to access USB devices
+-    NO_INSTALL="$5"       # Set this to "1" to remove but not re-install rules
+-
+-    if test -d /etc/udev/rules.d; then
+-        generate_udev_rule "$VBOXDRV_GRP" "$VBOXDRV_MODE" "$INSTALLATION_DIR" \
+-                           "$USB_GROUP" "$NO_INSTALL"
+-    fi
+-    # Remove old udev description file
+-    rm -f /etc/udev/rules.d/10-vboxdrv.rules 2> /dev/null
+-}
+-
+-## Create a usb device node for a given sysfs path to a USB device.
+-install_create_usb_node_for_sysfs() {
+-    path="$1"           # sysfs path for the device
+-    usb_createnode="$2" # Path to the USB device node creation script
+-    usb_group="$3"      # The group to give ownership of the node to
+-    if test -r "${path}/dev"; then
+-        dev="`cat "${path}/dev" 2> /dev/null`"
+-        major="`expr "$dev" : '\(.*\):' 2> /dev/null`"
+-        minor="`expr "$dev" : '.*:\(.*\)' 2> /dev/null`"
+-        class="`cat ${path}/bDeviceClass 2> /dev/null`"
+-        sh "${usb_createnode}" "$major" "$minor" "$class" \
+-              "${usb_group}" 2>/dev/null
+-    fi
+-}
+-
+-udev_rule_file=/etc/udev/rules.d/60-vboxdrv.rules
+-sysfs_usb_devices="/sys/bus/usb/devices/*"
+-
+-## Install udev rules and create device nodes for usb access
+-setup_usb() {
+-    VBOXDRV_GRP="$1"      # The group that should own /dev/vboxdrv
+-    VBOXDRV_MODE="$2"     # The mode to be used for /dev/vboxdrv
+-    INSTALLATION_DIR="$3" # The directory VirtualBox is installed in
+-    USB_GROUP="$4"        # The group that should own the /dev/vboxusb device
+-                          # nodes unless INSTALL_NO_GROUP=1 in
+-                          # /etc/default/virtualbox.  Optional.
+-    usb_createnode="$INSTALLATION_DIR/VBoxCreateUSBNode.sh"
+-    # install udev rule (disable with INSTALL_NO_UDEV=1 in
+-    # /etc/default/virtualbox)
+-    if [ "$INSTALL_NO_GROUP" != "1" ]; then
+-        usb_group=$USB_GROUP
+-        vboxdrv_group=$VBOXDRV_GRP
+-    else
+-        usb_group=root
+-        vboxdrv_group=root
+-    fi
+-    install_udev "${vboxdrv_group}" "$VBOXDRV_MODE" \
+-                 "$INSTALLATION_DIR" "${usb_group}" \
+-                 "$INSTALL_NO_UDEV" > ${udev_rule_file}
+-    # Build our device tree
+-    for i in ${sysfs_usb_devices}; do  # This line intentionally without quotes.
+-        install_create_usb_node_for_sysfs "$i" "${usb_createnode}" \
+-                                          "${usb_group}"
+-    done
+-}
+-
+-cleanup_usb()
+-{
+-    # Remove udev description file
+-    rm -f /etc/udev/rules.d/60-vboxdrv.rules
+-    rm -f /etc/udev/rules.d/10-vboxdrv.rules
+-
+-    # Remove our USB device tree
+-    rm -rf /dev/vboxusb
+-}
+-
+-# Returns path to module file as seen by modinfo(8) or empty string.
+-module_path()
+-{
+-    mod="$1"
+-    [ -n "$mod" ] || return
+-
+-    modinfo "$mod" 2>/dev/null | grep -e "^filename:" | tr -s ' ' | cut -d " " -f2
+-}
+-
+-# Returns module version if module is available or empty string.
+-module_version()
+-{
+-    mod="$1"
+-    [ -n "$mod" ] || return
+-
+-    modinfo "$mod" 2>/dev/null | grep -e "^version:" | tr -s ' ' | cut -d " " -f2
+-}
+-
+-# Returns module revision if module is available in the system or empty string.
+-module_revision()
+-{
+-    mod="$1"
+-    [ -n "$mod" ] || return
+-
+-    modinfo "$mod" 2>/dev/null | grep -e "^version:" | tr -s ' ' | cut -d " " -f3
+-}
+-
+-# Reads kernel configuration option.
+-kernel_get_config_opt()
+-{
+-    opt_name="$1"
+-    [ -n "$opt_name" ] || return
+-
+-    # Check if there is a kernel tool which can extract config option.
+-    if test -x /lib/modules/"$KERN_VER"/build/scripts/config; then
+-        /lib/modules/"$KERN_VER"/build/scripts/config \
+-            --file /lib/modules/"$KERN_VER"/build/.config \
+-            --state "$opt_name" 2>/dev/null
+-    elif test -f /lib/modules/"$KERN_VER"/build/.config; then
+-        # Extract config option manually.
+-        grep "$opt_name" /lib/modules/"$KERN_VER"/build/.config | sed -e "s/^$opt_name=//" -e "s/\"//g"
+-    fi
+-}
+-
+-# Reads CONFIG_MODULE_SIG_HASH from kernel config.
+-kernel_module_sig_hash()
+-{
+-    kernel_get_config_opt "CONFIG_MODULE_SIG_HASH"
+-}
+-
+-# Returns "1" if kernel module signature hash algorithm
+-# is supported by us. Or empty string otherwise.
+-module_sig_hash_supported()
+-{
+-    sig_hashalgo="$1"
+-    [ -n "$sig_hashalgo" ] || return
+-
+-    # Go through supported list.
+-    [    "$sig_hashalgo" = "sha1"   \
+-      -o "$sig_hashalgo" = "sha224" \
+-      -o "$sig_hashalgo" = "sha256" \
+-      -o "$sig_hashalgo" = "sha384" \
+-      -o "$sig_hashalgo" = "sha512" ] || return
+-
+-    echo "1"
+-}
+-
+-# Returns "1" if module is signed and signature can be verified
+-# with public key provided in DEB_PUB_KEY. Or empty string otherwise.
+-module_signed()
+-{
+-    mod="$1"
+-    [ -n "$mod" ] || return
+-
+-    extraction_tool=/lib/modules/"$(uname -r)"/build/scripts/extract-module-sig.pl
+-    mod_path=$(module_path "$mod" 2>/dev/null)
+-    openssl_tool=$(which openssl 2>/dev/null)
+-    # Do not use built-in printf!
+-    printf_tool=$(which printf 2>/dev/null)
+-
+-    # Make sure all the tools required for signature validation are available.
+-    [ -x "$extraction_tool" ] || return
+-    [ -n "$mod_path"        ] || return
+-    [ -n "$openssl_tool"    ] || return
+-    [ -n "$printf_tool"     ] || return
+-
+-    # Make sure openssl can handle hash algorithm.
+-    sig_hashalgo=$(modinfo -F sig_hashalgo "$mod" 2>/dev/null)
+-    [ "$(module_sig_hash_supported $sig_hashalgo)" = "1" ] || return
+-
+-    # Generate file names for temporary stuff.
+-    mod_pub_key=$(mktemp -u)
+-    mod_signature=$(mktemp -u)
+-    mod_unsigned=$(mktemp -u)
+-
+-    # Convert public key in DER format into X509 certificate form.
+-    "$openssl_tool" x509 -pubkey -inform DER -in "$DEB_PUB_KEY" -out "$mod_pub_key" 2>/dev/null
+-    # Extract raw module signature and convert it into binary format.
+-    "$printf_tool" \\x$(modinfo -F signature "$mod" | sed -z 's/[ \t\n]//g' | sed -e "s/:/\\\x/g") 2>/dev/null > "$mod_signature"
+-    # Extract unsigned module for further digest calculation.
+-    "$extraction_tool" -0 "$mod_path" 2>/dev/null > "$mod_unsigned"
+-
+-    # Verify signature.
+-    rc=""
+-    "$openssl_tool" dgst "-$sig_hashalgo" -binary -verify "$mod_pub_key" -signature "$mod_signature" "$mod_unsigned" 2>&1 >/dev/null && rc="1"
+-    # Clean up.
+-    rm -f $mod_pub_key $mod_signature $mod_unsigned
+-
+-    # Check result.
+-    [ "$rc" = "1" ] || return
+-
+-    echo "1"
+-}
+-
+-# Returns "1" if externally built module is available in the system and its
+-# version and revision number do match to current VirtualBox installation.
+-# Or empty string otherwise.
+-module_available()
+-{
+-    mod="$1"
+-    [ -n "$mod" ] || return
+-
+-    [ "$VBOX_VERSION" = "$(module_version "$mod")" ] || return
+-    [ "$VBOX_REVISION" = "$(module_revision "$mod")" ] || return
+-
+-    # Check if module belongs to VirtualBox installation.
+-    #
+-    # We have a convention that only modules from /lib/modules/*/misc
+-    # belong to us. Modules from other locations are treated as
+-    # externally built.
+-    mod_path="$(module_path "$mod")"
+-
+-    # If module path points to a symbolic link, resolve actual file location.
+-    [ -L "$mod_path" ] && mod_path="$(readlink -e -- "$mod_path")"
+-
+-    # File exists?
+-    [ -f "$mod_path" ] || return
+-
+-    # Extract last component of module path and check whether it is located
+-    # outside of /lib/modules/*/misc.
+-    mod_dir="$(dirname "$mod_path" | sed 's;^.*/;;')"
+-    [ "$mod_dir" = "misc" ] || return
+-
+-    # In case if system is running in Secure Boot mode, check if module is signed.
+-    if test -n "$HAVE_SEC_BOOT"; then
+-        [ "$(module_signed "$mod")" = "1" ] || return
+-    fi
+-
+-    echo "1"
+-}
+-
+-# Check if required modules are installed in the system and versions match.
+-setup_complete()
+-{
+-    [ "$(module_available vboxdrv)"    = "1" ] || return
+-    [ "$(module_available vboxnetflt)" = "1" ] || return
+-    [ "$(module_available vboxnetadp)" = "1" ] || return
+-
+-    # All modules are in place.
+-    echo "1"
+-}
+-
+ start()
+ {
+     begin_msg "Starting VirtualBox services" console
+@@ -483,10 +170,6 @@
+     fi
  
- # silently exit if the package was uninstalled but not purged,
- # applies to Debian packages only (but shouldn't hurt elsewhere)
--[ ! -f /etc/debian_release -o -x $VBOXMANAGE -a -x $BUILDINTMP ] || exit 0
-+[ ! -f /etc/debian_release -o -x $VBOXMANAGE ] || exit 0
+     if ! running vboxdrv; then
+-
+-        # Check if system already has matching modules installed.
+-        [ "$(setup_complete)" = "1" ] || setup
+-
+         if ! rm -f $DEVICE; then
+             failure "Cannot remove $DEVICE"
+         fi
+@@ -538,8 +221,6 @@
+         mkdir -p -m 0750 /dev/vboxusb 2>/dev/null
+         chown root:vboxusers /dev/vboxusb 2>/dev/null
+     fi
+-    # Remove any kernel modules left over from previously installed kernels.
+-    cleanup only_old
+     succ_msg "VirtualBox services started"
+ }
+ 
+@@ -620,153 +301,10 @@
+     fi
+ }
  
- if [ -n "$NOLSB" ]; then
-     if [ -f /etc/redhat-release ]; then
-@@ -295,70 +291,7 @@
+-cleanup()
+-{
+-    # If this is set, only remove kernel modules for no longer installed
+-    # kernels.  Note that only generated kernel modules should be placed
+-    # in /lib/modules/*/misc.  Anything that we should not remove automatically
+-    # should go elsewhere.
+-    only_old="${1}"
+-    for i in /lib/modules/*; do
+-        # Check whether we are only cleaning up for uninstalled kernels.
+-        test -n "${only_old}" && test -e "${i}/kernel/drivers" && continue
+-
+-        unset do_update
+-        for j in $MODULE_LIST; do
+-            for mod_ext in ko ko.gz ko.xz ko.zst; do
+-                test -f "${i}/misc/${j}.${mod_ext}" && do_update=1 && rm -f "${i}/misc/${j}.${mod_ext}"
+-            done
+-        done
+-
+-        # Trigger depmod(8) only in case if directory content was modified
+-        # and save a bit of run time.
+-        test -n "$do_update" && depmod -a "$(basename "$i")" && sync
+-
+-        # Remove the kernel version folder if it was empty except for us.
+-        test   "`echo ${i}/misc/* ${i}/misc/.?* ${i}/* ${i}/.?*`" \
+-             = "${i}/misc/* ${i}/misc/.. ${i}/misc ${i}/.." &&
+-            rmdir "${i}/misc" "${i}"  # We used to leave empty folders.
+-    done
+-}
+-
  # setup_script
  setup()
  {
--    stop
--    DKMS=`which dkms 2>/dev/null`
--    if [ -n "$DKMS" ]; then
--      begin_msg "Uninstalling old VirtualBox DKMS kernel modules"
--      $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG
--      succ_msg
+-    begin_msg "Building VirtualBox kernel modules" console
+-    log "Building the main VirtualBox module."
+-
+-    # Detect if kernel was built with clang.
+-    unset LLVM
+-    vbox_cc_is_clang=$(kernel_get_config_opt "CONFIG_CC_IS_CLANG")
+-    if test "${vbox_cc_is_clang}" = "y"; then
+-        log "Using clang compiler."
+-        export LLVM=1
 -    fi
--    if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then
--        begin_msg "Removing old VirtualBox pci kernel module"
--        find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null
--        succ_msg
--    fi  
--    if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then
--        begin_msg "Removing old VirtualBox netadp kernel module"
--        find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null
--        succ_msg
--    fi  
--    if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then
--        begin_msg "Removing old VirtualBox netflt kernel module"
--        find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null
--        succ_msg
--    fi  
--    if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then
--        begin_msg "Removing old VirtualBox kernel module"
--        find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null
--        succ_msg
+-
+-    if ! myerr=`$BUILDINTMP \
+-        --save-module-symvers /tmp/vboxdrv-Module.symvers \
+-        --module-source "$MODULE_SRC/vboxdrv" \
+-        --no-print-directory install 2>&1`; then
+-        "${INSTALL_DIR}/check_module_dependencies.sh" || exit 1
+-        log "Error building the module:"
+-        module_build_log "$myerr"
+-        failure "Look at $LOG to find out what went wrong"
 -    fi
--    if [ -n "$DKMS" ]; then
--      begin_msg "Trying to register the VirtualBox kernel modules using DKMS"
--      if ! $DODKMS install vboxhost $VERSION >> $LOG; then
--        fail_msg "Failed, trying without DKMS"
--        DKMS=""
--      fi
+-    log "Building the net filter module."
+-    if ! myerr=`$BUILDINTMP \
+-        --use-module-symvers /tmp/vboxdrv-Module.symvers \
+-        --module-source "$MODULE_SRC/vboxnetflt" \
+-        --no-print-directory install 2>&1`; then
+-        log "Error building the module:"
+-        module_build_log "$myerr"
+-        failure "Look at $LOG to find out what went wrong"
 -    fi
--    if [ -z "$DKMS" ]; then
--      begin_msg "Recompiling VirtualBox kernel modules"
--      if ! $BUILDINTMP \
--          --save-module-symvers /tmp/vboxdrv-Module.symvers \
--          --module-source "$MODULE_SRC/vboxdrv" \
--          --no-print-directory install >> $LOG 2>&1; then
--          failure "Look at $LOG to find out what went wrong"
--      fi
--      if ! $BUILDINTMP \
--          --use-module-symvers /tmp/vboxdrv-Module.symvers \
--          --module-source "$MODULE_SRC/vboxnetflt" \
--          --no-print-directory install >> $LOG 2>&1; then
--          failure "Look at $LOG to find out what went wrong"
--      fi
--      if ! $BUILDINTMP \
--          --use-module-symvers /tmp/vboxdrv-Module.symvers \
--          --module-source "$MODULE_SRC/vboxnetadp" \
--          --no-print-directory install >> $LOG 2>&1; then
--          failure "Look at $LOG to find out what went wrong"
--      fi
--      if ! $BUILDINTMP \
--          --use-module-symvers /tmp/vboxdrv-Module.symvers \
--          --module-source "$MODULE_SRC/vboxpci" \
--          --no-print-directory install >> $LOG 2>&1; then
--          failure "Look at $LOG to find out what went wrong"
--      fi
+-    log "Building the net adaptor module."
+-    if ! myerr=`$BUILDINTMP \
+-        --use-module-symvers /tmp/vboxdrv-Module.symvers \
+-        --module-source "$MODULE_SRC/vboxnetadp" \
+-        --no-print-directory install 2>&1`; then
+-        log "Error building the module:"
+-        module_build_log "$myerr"
+-        failure "Look at $LOG to find out what went wrong"
+-    fi
+-    if test -e "$MODULE_SRC/vboxpci"; then
+-        log "Building the PCI pass-through module."
+-        if ! myerr=`$BUILDINTMP \
+-            --use-module-symvers /tmp/vboxdrv-Module.symvers \
+-            --module-source "$MODULE_SRC/vboxpci" \
+-            --no-print-directory install 2>&1`; then
+-            log "Error building the module:"
+-            module_build_log "$myerr"
+-            failure "Look at $LOG to find out what went wrong"
+-        fi
 -    fi
 -    rm -f /etc/vbox/module_not_compiled
--    succ_msg
--    start
+-    depmod -a
+-    sync
+-    succ_msg "VirtualBox kernel modules built"
+-
+-    # Secure boot on Ubuntu, Debian and Oracle Linux.
+-    if test -n "$HAVE_SEC_BOOT"; then
+-        begin_msg "Signing VirtualBox kernel modules" console
+-
+-        # Generate new signing key if needed.
+-        [ -n "$HAVE_UPDATE_SECUREBOOT_POLICY_TOOL" ] && SHIM_NOTRIGGER=y update-secureboot-policy --new-key
+-
+-        # Check if signing keys are in place.
+-        if test ! -f "$DEB_PUB_KEY" || ! test -f "$DEB_PRIV_KEY"; then
+-            # update-secureboot-policy tool present in the system, but keys were not generated.
+-            [ -n "$HAVE_UPDATE_SECUREBOOT_POLICY_TOOL" ] && fail_msg "
+-
+-update-secureboot-policy tool does not generate signing keys
+-in your distribution, see below on how to generate them manually
+-"
+-
+-            # update-secureboot-policy not present in the system, recommend generate keys manually.
+-            failure "
+-
+-System is running in Secure Boot mode, however your distribution
+-does not provide tools for automatic generation of keys needed for
+-modules signing. Please consider to generate and enroll them manually:
+-
+-    sudo mkdir -p /var/lib/shim-signed/mok
+-    sudo openssl req -nodes -new -x509 -newkey rsa:2048 -outform DER -addext \"extendedKeyUsage=codeSigning\" -keyout $DEB_PRIV_KEY -out $DEB_PUB_KEY
+-    sudo mokutil --import $DEB_PUB_KEY
+-    sudo reboot
+-
+-Restart \"rcvboxdrv setup\" after system is rebooted
+-"
+-        fi
+-
+-        # Check if signing tool is available.
+-        [ -n "$SIGN_TOOL" ] || failure "Unable to find signing tool"
+-
+-        # Get kernel signature hash algorithm from kernel config and validate it.
+-        sig_hashalgo=$(kernel_module_sig_hash)
+-        [ "$(module_sig_hash_supported $sig_hashalgo)" = "1" ] \
+-            || failure "Unsupported kernel signature hash algorithm $sig_hashalgo"
+-
+-        # Sign modules.
+-        for i in $MODULE_LIST; do
+-            "$SIGN_TOOL" "$sig_hashalgo" "$DEB_PRIV_KEY" "$DEB_PUB_KEY" \
+-                /lib/modules/"$KERN_VER"/misc/"$i".ko 2>/dev/null || failure "Unable to sign $i.ko"
+-        done
+-
+-        # Enroll signing key if needed.
+-        if test -n "$HAVE_UPDATE_SECUREBOOT_POLICY_TOOL"; then
+-            # update-secureboot-policy "expects" DKMS modules.
+-            # Work around this and talk to the authors as soon
+-            # as possible to fix it.
+-            mkdir -p /var/lib/dkms/vbox-temp
+-            update-secureboot-policy --enroll-key 2>/dev/null ||
+-                begin_msg "Failed to enroll secure boot key." console
+-            rmdir -p /var/lib/dkms/vbox-temp 2>/dev/null
+-
+-            # Indicate that key has been enrolled and reboot is needed.
+-            HAVE_DEB_KEY=true
+-        fi
+-        succ_msg "Signing completed"
+-    fi
 +    echo "Not implemented! Please use the virtualbox-kernel.SlackBuild available at SlackBuilds.org instead."
  }
  
  dmnstatus()
+@@ -816,20 +354,7 @@
+     stop && start
+     ;;
+ setup)
+-    test -n "${2}" && export KERN_VER="${2}"
+-    # Create udev rule and USB device nodes.
+-    ## todo Wouldn't it make more sense to install the rule to /lib/udev?  This
+-    ## is not a user-created configuration file after all.
+-    ## todo Do we need a udev rule to create /dev/vboxdrv[u] at all?  We have
+-    ## working fall-back code here anyway, and the "right" code is more complex
+-    ## than the fall-back.  Unnecessary duplication?
+-    stop && cleanup
+-    setup_usb "$GROUP" "$DEVICE_MODE" "$INSTALL_DIR"
+-    start
+-    ;;
+-cleanup)
+-    stop && cleanup
+-    cleanup_usb
++    setup
+     ;;
+ force-reload)
+     stop
+@@ -839,7 +364,7 @@
+     dmnstatus
+     ;;
+ *)
+-    echo "Usage: $0 {start|stop|stop_vms|restart|setup|cleanup|force-reload|status}"
++    echo "Usage: $0 {start|stop|stop_vms|restart|setup|force-reload|status}"
+     exit 1
+ esac
+ 
diff --git a/system/virtualbox/virtualbox-gsoap.patch b/system/virtualbox/virtualbox-gsoap.patch
deleted file mode 100644
index a8ba6f549c..0000000000
--- a/system/virtualbox/virtualbox-gsoap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -u -r VirtualBox-5.0.10.orig/src/VBox/Main/webservice/Makefile.kmk VirtualBox-5.0.10/src/VBox/Main/webservice/Makefile.kmk
---- VirtualBox-5.0.10.orig/src/VBox/Main/webservice/Makefile.kmk	2015-11-10 18:06:29.000000000 +0100
-+++ VirtualBox-5.0.10/src/VBox/Main/webservice/Makefile.kmk	2015-11-22 09:58:21.669118291 +0100
-@@ -159,7 +159,6 @@
- RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT)
- 
- PATH_TARGET_SOAPDEMOXML       := $(VBOXWEB_OUT_DIR)/demo_soapxml
--PATH_TARGET_SOAPDEMOHEADERS   := $(VBOXWEB_OUT_DIR)/demo_headers
- PATH_TARGET_SOAPDEMONSMAPS    := $(VBOXWEB_OUT_DIR)/demo_namespacemaps
- PATH_TARGET_WEBTEST           := $(VBOXWEB_OUT_DIR)/webtest
- 
-@@ -515,8 +514,6 @@
- 	$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \
- 	$(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \
- 	$(PATH_TARGET_SOAPDEMOXML)/dummy_file \
--	$(wildcard $(PATH_TARGET_SOAPDEMOHEADERS)/*) \
--	$(PATH_TARGET_SOAPDEMOHEADERS)/dummy_file \
- 	$(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \
- 	$(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file
- 
-@@ -695,17 +692,14 @@
- # any more. Ignoring the exit code is the simple solution, accepting the error.
- $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts: $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts | $$(dir $$@)
- 	$(RM) -f $@
--	$(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMOHEADERS) $(PATH_TARGET_SOAPDEMONSMAPS)
-+	$(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMONSMAPS)
- ifdef VBOX_GSOAP_VERBOSE
- 	$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/*.req.xml $(VBOXWEB_OUT_DIR)/*.res.xml $(PATH_TARGET_SOAPDEMOXML)/
- endif
--	-$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/soapvbox*.h $(PATH_TARGET_SOAPDEMOHEADERS)/
- 	$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/vboxBinding.nsmap $(PATH_TARGET_SOAPDEMONSMAPS)/
- 	$(APPEND) $@ done
- 
--$(PATH_TARGET_SOAPDEMONSMAPS) \
--$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingProxy.h \
--$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingObject.h: $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
-+$(PATH_TARGET_SOAPDEMONSMAPS): $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
- 
- # soapcpp2 -2: generate SOAP 1.2 calls
- # soapcpp2 -S: server-side code only
diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild
index 1048ea0771..665cb7aeab 100644
--- a/system/virtualbox/virtualbox.SlackBuild
+++ b/system/virtualbox/virtualbox.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
-# Slackware build script for virtualbox-ose
+# Slackware build script for virtualbox
 
-# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2023 Heinz Wiesinger, Amsterdam, The Netherlands
 # Copyright 2008 Mauro Giachero <mauro.giachero@gmail.com>
 # All rights reserved.
 #
@@ -12,32 +12,42 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=virtualbox
 SRCNAM=VirtualBox
-VERSION=${VERSION:-5.0.40}
+VERSION=${VERSION:-6.1.44}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -45,9 +55,6 @@ OUTPUT=${OUTPUT:-/tmp}
 # kmk doesn't support MAKEFLAGS, so we use JOBS here
 JOBS=${JOBS:-3}
 
-# Define Variable Names
-gui=""
-
 # Check for vboxusers group here
 if ! grep ^vboxusers: /etc/group 2>&1 > /dev/null; then
   echo "  You must have a vboxusers group to run this script."
@@ -55,21 +62,6 @@ if ! grep ^vboxusers: /etc/group 2>&1 > /dev/null; then
   exit 1
 fi
 
-# Enable Hardening - Defaulting to yes as requested by upstream
-if [ "${HARDENING:-yes}" = "yes" ]; then
-  harden="--enable-hardening"
-else
-  harden="--disable-hardening"
-fi
-
-# Support for the qt4-frontend
-if [ "${HEADLESS:-no}" = "no" ]; then
-  guiapp="VirtualBox VBoxSDL"
-else
-  gui+=" --build-headless"
-  guiapp=""
-fi
-
 # Enable building of java bindings
 if [ "${JAVA:-no}" = "no" ]; then
   java="--disable-java"
@@ -96,8 +88,8 @@ else
     sw_virt=""
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
   BUILDDIR="x86"
 elif [ "$ARCH" = "i686" ]; then
@@ -132,25 +124,22 @@ MODE="755"
 # Use virtualbox-kernel.SlackBuild for this.
 patch -d src/VBox/Installer/linux -i $CWD/vboxdrv.sh-setup.diff
 
-# Fix building against newer versions of gsoap
-patch -p1 -i $CWD/virtualbox-gsoap.patch
-
 # Fix wrong path to rdesktop-vrdp-keymaps
 patch -p1 -i $CWD/006-rdesktop-vrdp-keymap-path.patch
 
-# Remove gcc version check
-sed -i 's/^check_gcc$/#check_gcc/' ./configure
+# Skip python2 detection and cheat about python-3.10 support
+sed -i 's|python2.7 python2.6 |python3.10 |' ./configure
+
+# Use our CFLAGS
+sed -i "s|CXX_FLAGS=\"\"|CXX_FLAGS=\"$SLKCFLAGS -std=c++11\"|" ./configure
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --disable-kmods \
   --enable-vde \
   --enable-vnc \
   --with-makeself=/usr/bin/echo \
+  --enable-hardening \
   $web_service \
-  $harden \
-  $gui \
   $sw_virt \
   $java
 
@@ -158,20 +147,16 @@ CXXFLAGS="$SLKCFLAGS" \
 
 cp $CWD/LocalConfig.kmk .
 sed -i "s|LIBDIR|lib$LIBDIRSUFFIX|" ./LocalConfig.kmk
+sed -i "s|CXXFLAGS|$SLKCFLAGS -std=c++11|" ./LocalConfig.kmk
 
 kmk -j ${JOBS} LOCALCFG=./LocalConfig.kmk
 
-# build VBoxFUSE
-cd src/VBox/ImageMounter/VBoxFUSE
-  kmk -j ${JOBS}
-cd -
-
 mkdir -p $PKG/usr/{lib$LIBDIRSUFFIX,share,include}/virtualbox \
   $PKG/usr/{bin,src} \
   $PKG/usr/share/{pixmaps,mime/packages} \
   $PKG/etc/{default,rc.d,vbox}
 
-for i in vboxdrv.sh.in vboxballoonctrl-service.sh vboxautostart-service.sh; do
+for i in vboxdrv.sh vboxballoonctrl-service.sh vboxautostart-service.sh; do
   SCRIPT=$(echo $i | cut -d "." -f 1)
   cp -f src/VBox/Installer/linux/$i $PKG/etc/rc.d/rc.$SCRIPT.new
   sed -i "s/%PACKAGE%/virtualbox/g" $PKG/etc/rc.d/rc.$SCRIPT.new
@@ -210,7 +195,7 @@ cd out/linux.$BUILDDIR/release/bin/
 
   export VBOX_INSTALL_PATH=/usr/lib$LIBDIRSUFFIX/virtualbox
   cd sdk/installer
-    python ./vboxapisetup.py install --prefix "/usr" --root $PKG
+    python3 ./vboxapisetup.py install --prefix "/usr" --root $PKG
   cd -
   rm -rf sdk/installer
 
@@ -218,17 +203,18 @@ cd out/linux.$BUILDDIR/release/bin/
   install -m $MODE -g $GROUP VBoxSysInfo.sh $PKG/usr/share/virtualbox/
   install -m $MODE -g $GROUP VBoxCreateUSBNode.sh $PKG/usr/share/virtualbox/
   install -m $MODE -g $GROUP VBoxTunctl $PKG/usr/bin/
-  install -m $MODE -g $GROUP VBoxFUSE $PKG/usr/bin/
-  rm -f VBoxSysInfo.sh VBoxCreateUSBNode.sh VBoxTunctl VBoxFUSE
+  rm -f VBoxSysInfo.sh VBoxCreateUSBNode.sh VBoxTunctl
   mv * $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/
   chown -R root:$GROUP $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/
   chmod -R $MODE $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/
   mv $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/VBox.sh $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/VBox
 cd $TMP/$SRCNAM-${VERSION}
 
-for i in VBoxManage vboxmanage VBoxHeadless \
-  vboxheadless VBoxVRDP VBoxBalloonCtrl vboxballoonctrl \
-  VBoxAutostart vboxautostart $guiapp $vboxwebsrv; do
+# Drop broken symlink
+rm -f $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/components/VBoxREM.so
+
+for i in VBoxManage VBoxHeadless VBoxVRDP VBoxBalloonCtrl VBoxBugReport \
+  VBoxAutostart VirtualBox VirtualBoxVM VBoxSDL $vboxwebsrv; do
   ln -s /usr/lib$LIBDIRSUFFIX/virtualbox/VBox $PKG/usr/bin/$i
 done
 
@@ -238,6 +224,9 @@ if [ "${HEADLESS:-no}" = "no" ]; then
   done
 fi
 
+ln -s /usr/lib$LIBDIRSUFFIX/virtualbox/vbox-img $PKG/usr/bin/
+ln -s /usr/lib$LIBDIRSUFFIX/virtualbox/vboximg-mount $PKG/usr/bin/
+
 if [ "$vboxwebsrv" = "vboxwebsrv" ]; then
   mkdir -p $PKG/var/{lib,log}/vboxweb
   chown vboxweb:vboxusers $PKG/var/{lib,log}/vboxweb
@@ -248,15 +237,14 @@ if [ "$vboxwebsrv" = "vboxwebsrv" ]; then
   sed -i "s/\[ -z \"\$DEBIAN\"/#\[ -z \"\$DEBIAN\"/" $PKG/etc/rc.d/rc.vboxweb-service.new
 fi
 
-if [ "$harden" = "--enable-hardening" ]; then
-  for i in VBoxHeadless $guiapp VBoxNetDHCP VBoxNetAdpCtl; do
-    chmod 4711 $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/$i
-  done
-fi
+for i in VBoxHeadless VirtualBoxVM VBoxSDL VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT; do
+  chmod 4711 $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/$i
+done
 
 # install headers. Needed by some third party tools
 cp -rf include/* $PKG/usr/include/virtualbox/
 rm -f $PKG/usr/include/virtualbox/Makefile.kmk
+find $PKG/usr/include/virtualbox -name "Makefile.kup" -print0 | xargs -0 rm -f
 
 cp -f $CWD/VBoxGuestAdditions_$VERSION.iso \
   $PKG/usr/share/virtualbox/VBoxGuestAdditions.iso
@@ -302,4 +290,4 @@ if [ "$vboxwebsrv" = "vboxwebsrv" ]; then
 fi
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/virtualbox/virtualbox.info b/system/virtualbox/virtualbox.info
index 11fef8a32a..adbeae3452 100644
--- a/system/virtualbox/virtualbox.info
+++ b/system/virtualbox/virtualbox.info
@@ -1,16 +1,16 @@
 PRGNAM="virtualbox"
-VERSION="5.0.40"
+VERSION="6.1.44"
 HOMEPAGE="https://www.virtualbox.org"
-DOWNLOAD="http://download.virtualbox.org/virtualbox/5.0.40/VirtualBox-5.0.40.tar.bz2 \
-          http://download.virtualbox.org/virtualbox/5.0.40/VBoxGuestAdditions_5.0.40.iso \
-          http://download.virtualbox.org/virtualbox/5.0.40/UserManual.pdf \
-          http://download.virtualbox.org/virtualbox/5.0.40/SDKRef.pdf"
-MD5SUM="53b259e48a137b0185c169590e2dcb77 \
-        71afc65e09d1d4d02020f0403ac47622 \
-        bdc4bf38dd3ed786385044841a4af147 \
-        684ac3f7d17532cd8396ea83ba1d57ea"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="http://download.virtualbox.org/virtualbox/6.1.44/VirtualBox-6.1.44.tar.bz2 \
+          http://download.virtualbox.org/virtualbox/6.1.44/VBoxGuestAdditions_6.1.44.iso \
+          http://download.virtualbox.org/virtualbox/6.1.44/UserManual.pdf \
+          http://download.virtualbox.org/virtualbox/6.1.44/SDKRef.pdf"
+MD5SUM_x86_64="309f868297447291db980a1d8fa11ec6 \
+        282a2d395eac07d7bcde128b529f2bc9 \
+        8b4b2dccba569cba4a82b7441010d86f \
+        62847ffd60056b3377c9974ca98791c7"
 REQUIRES="acpica virtualbox-kernel"
 MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+EMAIL="pprkut@slackbuilds.org"
diff --git a/system/virtualxt/README b/system/virtualxt/README
new file mode 100644
index 0000000000..afffbd9b00
--- /dev/null
+++ b/system/virtualxt/README
@@ -0,0 +1,70 @@
+VirtualXT is an IBM PC/XT (8088/V20) emulator that runs on modern
+hardware and operating systems. It is designed to be simple and
+lightweight yet still capable enough to run a large library of old
+applications and games.
+
+VirtualXT uses a module system that loads dynamic plugins, which are
+files that end with an extension of .vxt. By default, all modules will
+be built. Modules may be excluded by using the EXCLUDE_MODULES variable.
+
+For example:
+
+EXCLUDE_MODULES=network ./virtualxt.SlackBuild
+
+More than one module can be excluded as long as each module is separated
+by a comma.
+
+For example:
+
+EXCLUDE_MODULES=serial,network ./virtualxt.SlackBuild
+
+The following modules cannot be excluded:
+
+adlib
+arstech_isa
+bios
+cga
+ch36x_isa
+chipset
+covox
+ctrl
+disk
+ems
+joystick
+mouse
+rifs
+rtc
+uart
+
+The virtualxt binary is built with an SDL2 frontend and meant to be run
+by a non-root user. The user will need to be added to the "users"
+group because the binary will open the provided boot images in read-
+write mode, and "users" has write access to those images.
+
+For example:
+
+usermod -aG users bob
+
+Either the LD_LIBRARY_PATH or LD_PRELOAD variable must be configured
+to point to /usr/lib64/virtualxt. For bash users, this can be
+accomplished as follows:
+
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/virtualxt
+echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64/virtualxt" \
+ >> ~/.bashrc
+
+...or...
+
+LD_PRELOAD=/usr/lib64/virtualxt/libvxt.so virtualxt
+
+The path to the boot image must be specified when running virtualxt.
+
+For example:
+
+virtualxt -a /usr/share/virtualxt/boot/freedos.img
+
+If after upgrading from a previous version of virtualxt the console 
+fails to start, then you may need to generate a new config file as 
+follows:
+
+virtualxt --clean
diff --git a/system/virtualxt/slack-desc b/system/virtualxt/slack-desc
new file mode 100644
index 0000000000..35290f026b
--- /dev/null
+++ b/system/virtualxt/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+virtualxt: virtualxt (IBM PC/XT emulator)
+virtualxt:
+virtualxt: VirtualXT is an IBM PC/XT (8088/V20) emulator that runs on modern
+virtualxt: hardware and operating systems. It is designed to be simple and
+virtualxt: lightweight yet still capable enough to run a large library of old
+virtualxt: applications and games.
+virtualxt:
+virtualxt:
+virtualxt:
+virtualxt:
+virtualxt: https://phix.itch.io/virtualxt
diff --git a/system/virtualxt/virtualxt.SlackBuild b/system/virtualxt/virtualxt.SlackBuild
new file mode 100644
index 0000000000..40dc3fe8de
--- /dev/null
+++ b/system/virtualxt/virtualxt.SlackBuild
@@ -0,0 +1,131 @@
+#!/bin/bash
+
+# Slackware build script for virtualxt
+
+# Copyright 2023 Sean Eubanks <seanmeu@protonmail.com>, Cheraw, SC, USA
+# All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy 
+# of this software and associated documentation files (the "Software"), to 
+# deal in the Software without restriction, including without limitation the 
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or 
+# sell copies of the Software, and to permit persons to whom the Software is 
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in 
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=virtualxt
+VERSION=${VERSION:-0.11}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+DOCS="LICENSE README.md"
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf virtualxt-$VERSION
+unzip $CWD/virtualxt-$VERSION.zip
+cd virtualxt-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# Build virtualxt with SDL2 frontend
+which premake5
+if [ "$?" -ne 0 ]; then
+  echo "ERROR: Cannot find required premake5 binary!"
+  exit 1
+fi 
+if [ -z "$EXCLUDE_MODULES" ]; then
+  # Build all modules
+  premake5 --modules gmake
+else
+  # Build all modules except those specified in EXCLUDE_MODULES
+  premake5 --modules=-$EXCLUDE_MODULES gmake
+fi
+make sdl2-frontend modules
+
+install -D -m 0755 build/bin/virtualxt $PKG/usr/bin/virtualxt
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/virtualxt
+install -D -m 0755 build/bin/libvxt.so $PKG/usr/lib$LIBDIRSUFFIX/virtualxt/libvxt.so
+
+# Install BIOS, disk images, and modules
+DSTDIR=$PKG/usr/share/$PRGNAM
+mkdir -p $DSTDIR
+mkdir $DSTDIR/bios && cp bios/*.bin bios/*.ROM $DSTDIR/bios/
+mkdir $DSTDIR/boot && cp boot/*.img $DSTDIR/boot/
+mkdir $DSTDIR/modules && cp modules/*.vxt $DSTDIR/modules/
+
+# Allow all users read access
+if [ "$(grep ^users /etc/group)" = "" ]; then
+  echo "ERROR: The users group is missing!"
+  exit 1
+fi
+chgrp -R users $DSTDIR
+
+# All users need write access to boot images
+# otherwise image fails to boot
+chmod g+w $DSTDIR/boot/*.img
+
+# Copy README, LICENSE, and this script
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/virtualxt/virtualxt.info b/system/virtualxt/virtualxt.info
new file mode 100644
index 0000000000..8129787045
--- /dev/null
+++ b/system/virtualxt/virtualxt.info
@@ -0,0 +1,10 @@
+PRGNAM="virtualxt"
+VERSION="0.11"
+HOMEPAGE="https://phix.itch.io/virtualxt"
+DOWNLOAD="https://github.com/andreas-jonsson/virtualxt/archive/v0.11/virtualxt-0.11.zip"
+MD5SUM="27859bdd3a9667035a7524503d5c7c3d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="premake5"
+MAINTAINER="Sean Eubanks"
+EMAIL="seanmeu@protonmail.com"
diff --git a/system/vlock/README b/system/vlock/README
index ed377a4e41..80863aaaf5 100644
--- a/system/vlock/README
+++ b/system/vlock/README
@@ -1,16 +1,17 @@
 vlock is a program to lock one or more sessions on the Linux console.
 
-This is especially useful for Linux machines which have multiple users with
-access to the console. One user may lock his or her session(s) while still
-allowing other users to use the system on other virtual consoles.
+This is especially useful for Linux machines which have multiple users
+with access to the console. One user may lock his or her session(s)
+while still allowing other users to use the system on other virtual
+consoles.
 
-If desired, the entire console may be locked and virtual console switching
-disabled.
+If desired, the entire console may be locked and virtual console
+switching disabled.
 
 There's also a screensaver, based on libcaca.
 
-vlock has two particular options that this SlackBuild reserves to the wheel
-group:
+vlock has two particular options that this SlackBuild reserves to the
+wheel group:
 
   -n,--new
 
@@ -24,7 +25,7 @@ and
         kernels) while consoles are locked. This option only works if
         the -a, --all option given.
 
-If you would like to set an alternative group, you may pass the VLOCK_GROUP 
-variable to the SlackBuild like this:
+If you would like to set an alternative group, you may pass the
+VLOCK_GROUP variable to the SlackBuild like this:
 
 VLOCK_GROUP=users ./vlock.SlackBuild
diff --git a/system/vlock/vlock.SlackBuild b/system/vlock/vlock.SlackBuild
index 3060b98aaf..95ff35feed 100644
--- a/system/vlock/vlock.SlackBuild
+++ b/system/vlock/vlock.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for vlock
 # Written by Menno E. Duursma <druiloor@zonnet.nl>
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 # Modified by Chris Abela <kristofru@gmail.com>
-# Modified by B. Watson <yalhcru@gmail.com>
+# Modified by B. Watson <urchlay@slackware.uk>
 #
 # Copyright 2014  Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
 #
@@ -27,6 +27,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20240416 bkw: BUILD=4, fix build with latest libcaca from 15.0's patches/.
+
 # 20170716 bkw: switch to github homepage/download.
 
 # 20170621 bkw: fix build on -current.
@@ -38,10 +40,13 @@
 # - patches to make caca screensaver actually *work*
 # - BUILD=3
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=vlock
 VERSION=${VERSION:-2.2.3}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -51,7 +56,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -81,15 +90,12 @@ rm -rf $PRGNAM-$PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# recent libcaca in -current no longer has the compatibility symlink
-# cucul.h => caca.h, so:
-sed -i 's,<cucul.h>,<caca.h>,' modules/caca.c
+# 20240416 bkw: Sometime after Slackware 15.0 was released, a patched
+# libcaca broke this.
+sed -i -e 's,cucul,caca,g' -e 's,CUCUL,CACA,g' modules/caca.c
 
 # patch by B. Watson, fixes the shell script wrapper so it loads
 # the caca plugin when the -t/--timeout option is passed.
@@ -120,4 +126,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/vlock/vlock.info b/system/vlock/vlock.info
index 9401a5b6f6..c60004d8e7 100644
--- a/system/vlock/vlock.info
+++ b/system/vlock/vlock.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/vmfs-tools/vmfs-tools.SlackBuild b/system/vmfs-tools/vmfs-tools.SlackBuild
index 84faa6ef91..c12c82daa2 100644
--- a/system/vmfs-tools/vmfs-tools.SlackBuild
+++ b/system/vmfs-tools/vmfs-tools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for vmfs-tools
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=vmfs-tools
 VERSION=${VERSION:-0.2.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -100,4 +110,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/vms/vms.SlackBuild b/system/vms/vms.SlackBuild
index de5c7ee09b..12426eaa77 100644
--- a/system/vms/vms.SlackBuild
+++ b/system/vms/vms.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for vms
 # Copyright 2018 Nikos Giotis, Athens, Greece
@@ -21,38 +21,28 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=vms
 VERSION=${VERSION:-0.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -90,4 +80,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-noarch-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/vms/vms.info b/system/vms/vms.info
index 2bca067d48..f8ab5b760c 100644
--- a/system/vms/vms.info
+++ b/system/vms/vms.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://bitbucket.org/yotis/vms/downloads/vms-0.2.1.tar.gz"
 MD5SUM="7e882cda99360da6c6c804ed62246669"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qemu socat vde2"
+REQUIRES="qemu vde2"
 MAINTAINER="Nikos Giotis"
 EMAIL="nikos.giotis@gmail.com"
diff --git a/system/volatility/README b/system/volatility/README
index f193110dfb..704828958d 100644
--- a/system/volatility/README
+++ b/system/volatility/README
@@ -3,9 +3,10 @@ Volatility Framework - Volatile memory extraction utility framework.
 The Volatility Framework is a completely open collection of tools,
 implemented in Python under the GNU General Public License, for the
 extraction of digital artifacts from volatile memory (RAM) samples.
-The extraction techniques are performed completely independent of the
-system being investigated but offer visibilty into the runtime state
-of the system. The framework is intended to introduce people to the
-techniques and complexities associated with extracting digital artifacts
-from volatile memory samples and provide a platform for further work into
-this exciting area of research.
+
+The extraction techniques are performed completely independent of
+the system being investigated but offer visibilty into the runtime
+state of the system. The framework is intended to introduce people to
+the techniques and complexities associated with extracting digital
+artifacts from volatile memory samples and provide a platform for
+further work into this exciting area of research.
diff --git a/system/volatility/volatility.SlackBuild b/system/volatility/volatility.SlackBuild
index fde5d80ace..48a357200d 100644
--- a/system/volatility/volatility.SlackBuild
+++ b/system/volatility/volatility.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for volatility
 # Copyright 2014-2019  Barry Grundy <bgrundy[at]linuxleo.com>
@@ -21,12 +21,15 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# Updated to v2.6.1, March 2019
+# Updated deps and explicit call to python2 - v2.6.1, May, 2022
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=volatility
 VERSION=${VERSION:-2.6.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -70,7 +80,7 @@ find -L . \
 \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+python2 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -87,4 +97,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/volatility/volatility.info b/system/volatility/volatility.info
index 6a43b3c3c7..1130e081ae 100644
--- a/system/volatility/volatility.info
+++ b/system/volatility/volatility.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/volatilityfoundation/volatility/archive/2.6.1/volat
 MD5SUM="53319b202ac6fb6c3a5422bdf0a9f7a0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="distorm pycrypto yara-python"
+REQUIRES="python2-distorm python2-pycrypto python2-yara"
 MAINTAINER="Barry J. Grundy"
 EMAIL="bgrundy AT linuxleo.com"
diff --git a/system/volatility3/README b/system/volatility3/README
new file mode 100644
index 0000000000..84e96b75a4
--- /dev/null
+++ b/system/volatility3/README
@@ -0,0 +1,18 @@
+Volatility Framework - Volatile memory extraction utility framework.
+
+Volatility is the world's most widely used framework for extracting 
+digit artifacts from volatile memory (RAM) samples. The extraction 
+techniques are performed completely independent of the system being 
+investigated but offer visibility into the runtime state of the system.
+The framework is intended to introduce people to the techniques and 
+complexities associated with extracting digital artifacts from volatile
+memory samples and provide a platform for further work into this 
+exciting area of research.
+
+In 2019, the Volatility Foundation released a complete rewrite of the
+framework, Volatility3. 
+
+The following are optional dependancies:
+  - capstone
+  - jsonschema
+
diff --git a/system/volatility3/slack-desc b/system/volatility3/slack-desc
new file mode 100644
index 0000000000..bef7201ed3
--- /dev/null
+++ b/system/volatility3/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+           |-----handy-ruler------------------------------------------------------|
+volatility3: volatility3 (memory extraction utility framework.)
+volatility3:
+volatility3: volatility3 is the world's most widely used framework for extracting 
+volatility3: digit artifacts from volatile memory (RAM) samples. The extraction 
+volatility3: techniques are performed completely independent of the system being 
+volatility3: investigated but offer visibility into the runtime state of the 
+volatility3: system.
+volatility3:
+volatility3: Volatility3 is a complete rewrite of the original Volatility 
+volatility3: Framework.
+volatility3:
diff --git a/system/volatility3/volatility3.SlackBuild b/system/volatility3/volatility3.SlackBuild
new file mode 100644
index 0000000000..7032c3831a
--- /dev/null
+++ b/system/volatility3/volatility3.SlackBuild
@@ -0,0 +1,96 @@
+#!/bin/bash
+
+# Slackware build script for volatility3
+# Copyright 2022-2023 Barry Grundy <bgrundy[at]linuxleo.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Updated for 2.4.1, July 2023
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=volatility3
+VERSION=${VERSION:-2.4.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+python3 setup.py install --root=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/volatility3/volatility3.info b/system/volatility3/volatility3.info
new file mode 100644
index 0000000000..f16a2434af
--- /dev/null
+++ b/system/volatility3/volatility3.info
@@ -0,0 +1,10 @@
+PRGNAM="volatility3"
+VERSION="2.4.1"
+HOMEPAGE="https://github.com/volatilityfoundation/volatility3"
+DOWNLOAD="https://github.com/volatilityfoundation/volatility3/archive/v2.4.1/volatility3-2.4.1.tar.gz"
+MD5SUM="5172c1eb8063a2d774359ebb7ebc2a49"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="pefile python3-pycrypto pycryptodomex python3-yara"
+MAINTAINER="Barry J. Grundy"
+EMAIL="bgrundy AT linuxleo.com"
diff --git a/system/vtcol/vtcol.SlackBuild b/system/vtcol/vtcol.SlackBuild
index b32862aeef..61e00ec311 100644
--- a/system/vtcol/vtcol.SlackBuild
+++ b/system/vtcol/vtcol.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for vtcol
 
 # Copyright 2017-2020 Andrew Clemons, Wellington New Zealand
+# Copyright 2023 Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=vtcol
 VERSION=${VERSION:-0.42.2}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -41,20 +45,24 @@ if [ -z "$ARCH" ]; then
   fi
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  CARGOTARGET="--target i586-unknown-linux-gnu"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  CARGOTARGET="--target i686-unknown-linux-gnu"
-elif [ "$ARCH" = "x86_64" ]; then
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
+elif [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "aarch64" ] ; then
   SLKCFLAGS="-O2 -fPIC"
-  CARGOTARGET="--target x86_64-unknown-linux-gnu"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
 else
   SLKCFLAGS="-O2"
   CARGOTARGET=""
@@ -77,7 +85,7 @@ zcat $CWD/f00fed1f947dcd372a598f1e2905ae9d4c8a1b0c.patch.gz | patch -p1
 # configuration tells cargo to use the configured directory
 # for dependencies instead of downloading from crates.io
 mkdir .cargo
-cat << EOF >> .cargo/config
+cat << EOF > .cargo/config
 [source.crates-io]
 registry = 'https://github.com/rust-lang/crates.io-index'
 replace-with = 'vendored-sources'
@@ -130,6 +138,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+CARGO_HOME=.cargo \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 cargo build --release $CARGOTARGET
@@ -149,4 +158,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/vtcol/vtcol.info b/system/vtcol/vtcol.info
index e55ba739e6..2380fb7f32 100644
--- a/system/vtcol/vtcol.info
+++ b/system/vtcol/vtcol.info
@@ -2,9 +2,9 @@ PRGNAM="vtcol"
 VERSION="0.42.2"
 HOMEPAGE="https://gitlab.com/phgsng/vtcol"
 DOWNLOAD="https://gitlab.com/phgsng/vtcol/-/archive/v0.42.2/vtcol-v0.42.2.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/getopts/getopts-0.2.21.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.19.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate"
+          https://static.crates.io/crates/getopts/getopts-0.2.21.crate \
+          https://static.crates.io/crates/libc/libc-0.2.19.crate \
+          https://static.crates.io/crates/unicode-width/unicode-width-0.1.8.crate"
 MD5SUM="94ec72b7b2cc7d1a2ed80d2a08a70761 \
         c3ec5977ecc0f6244ef3be87f5325e72 \
         604a2edfd52c6e87d8903ef2795da387 \
diff --git a/system/vwm/README b/system/vwm/README
new file mode 100644
index 0000000000..9040a52c86
--- /dev/null
+++ b/system/vwm/README
@@ -0,0 +1,18 @@
+vwm (console text-based window manager)
+
+Viper Window Manager (VWM) is a lightweight, extensible window manager
+for the console. Originally, VWM was designed to be the reference
+implementation of libviper. In fact, the two projects were initially
+one before public release.
+
+From conception, VWM was designed to be both lightweight and ssh
+friendly. Character based line-art compresses very well as do the
+escape sequences which handle cursor manipulation. This makes VWM quite
+suitable for low-bandwidth, remote connectivity over ssh.
+
+It is also very easy to extend the functionality of VWM. By following
+a few simple API rules, anyone can create a "native application"
+which will appear on the VWM Main Menu. The mechanism for this is very
+similar to Mozilla-style plugins.
+
+See /usr/doc/$VERSION/samples/vwmrc for information on customising VWM.
diff --git a/system/vwm/git2tarxz.sh b/system/vwm/git2tarxz.sh
new file mode 100644
index 0000000000..5dd951db3c
--- /dev/null
+++ b/system/vwm/git2tarxz.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# This git2tarxz's output is a tarball with 2 separate projects.
+# Upstream doesn't use tags. The version number of the tarball is the
+# version of vwm, taken from vwm.h, plus the commit date and hash of
+# the vwm tree. The libvterm version isn't included in the version
+# number.
+
+PRGNAM=vwm
+PRGURL=https://github.com/TragicWarrior/vwm
+LIBURL1=https://github.com/TragicWarrior/libvterm
+LIBURL2=https://github.com/TragicWarrior/libviper
+
+set -e
+
+CWD="$( pwd )"
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+mkdir -p $GITDIR
+
+cd $GITDIR
+
+git clone $PRGURL
+git clone $LIBURL1
+git clone $LIBURL2
+
+cd $PRGNAM
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+RELVER="$( grep '#define *VWM_VERSION' vwm.h | cut -d'"' -f2 )"
+VERSION=$RELVER+${DATE}_${GIT_SHA}
+
+cd -
+
+rm -rf */.git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/system/vwm/slack-desc b/system/vwm/slack-desc
new file mode 100644
index 0000000000..428b5afcc7
--- /dev/null
+++ b/system/vwm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+vwm: vwm (console text-based window manager)
+vwm:
+vwm: Viper Window Manager (VWM) is a lightweight, extensible window manager
+vwm: for the console. Originally, VWM was designed to be the reference
+vwm: implementation of libviper. In fact, the two projects were initially
+vwm: one before public release.
+vwm: From conception, VWM was designed to be both lightweight and ssh
+vwm: friendly. Character based line-art compresses very well as do the
+vwm: escape sequences which handle cursor manipulation. This makes VWM
+vwm: quite suitable for low-bandwidth, remote connectivity over ssh.
+vwm:
diff --git a/system/vwm/vwm.SlackBuild b/system/vwm/vwm.SlackBuild
new file mode 100644
index 0000000000..86494cf397
--- /dev/null
+++ b/system/vwm/vwm.SlackBuild
@@ -0,0 +1,172 @@
+#!/bin/bash
+
+# SlackBuild script for vwm.
+
+# Originally written by Pierre Cazenave <email removed>
+# Previously maintained by Gerardo Zamudio.
+# Now maintained by B. Watson <urchlay@slackware.uk>.
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20211118 bkw:
+# - relicense as WTFPL, with permission from Pierre.
+# - Move to system/ category.
+
+# 20210908 bkw:
+# - Update this stale build. It compiled on -current, but failed to
+#   run properly. Upstream never updated the old sourceforge page to
+#   let us know he moved to github, so I just now found it out...
+#   Upstream doesn't use tags for releases, I used latest git for
+#   all 3 projects (vwm, libviper, libvterm).
+# - Bundle libviper. The old libviper build is gone (nothing else used it).
+# - Bundled libs are now shared, not static, and are included in the
+#   built package (along with their includes).
+# - Upstream switched to cmake, many changes because of that.
+
+# 20170825 bkw:
+# - Take over maintenance.
+# - Update for v2.1.3.
+# - slack-desc cosmetics.
+# - Don't install useless INSTALL to doc dir.
+# - Remove -j1 from the make commands, except the one for keycodes. seems
+#   not to be needed any longer.
+# - Simplify script a bit.
+# - Build a private static 'libvterm', which is NOT the same libvterm as
+#   libraries/libvterm on SBo. Unfortunately this adds a lot of complexity
+#   back to the script :(
+# - Rebase patches/*.diff against 2.1.3 and combine into one patch.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=vwm
+VERSION=${VERSION:-3.3.2+20200112_207d888}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+
+set -e
+
+rm -rf $PKG $TMP/$PRGNAM-$VERSION
+mkdir -p $PKG $OUTPUT
+cd $TMP
+
+# The tarball includes all 3 projects (vwm, libviper, libvterm) and
+# was created by git2tarxz.sh.
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+BASEDIR=$( pwd )
+
+# First, we build the two libraries vwm needs. These are by the same
+# author as vwm. The one called libvterm is *not* related to the
+# libvterm on SBo (two projects happened to pick the same name).
+# These have to be shared libs (or anyway, libvterm has to be, as
+# vwm's vwmterm module loads it via dlopen()).
+
+buildlib() {
+  cd $BASEDIR/lib$1
+  mkdir -p build
+  cd build
+
+  # Note: the cmake stuff here ignores any attempt to install to lib64.
+  # We'll fix it later.
+  cmake \
+    -DCMAKE_C_FLAGS_RELEASE="$SLKCFLAGS -DNDEBUG" \
+    -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS -DNDEBUG" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make VERBOSE=1
+  make install/strip DESTDIR=$PKG
+}
+
+buildlib vterm
+buildlib viper
+
+# no way to disable static libs via cmake, so...
+rm -f $PKG/usr/lib/*.a
+
+# Finally, we can build vwm. Easier to force-override the autodetect
+# for the libs, than it would be to make the autodetect actually work.
+cd $BASEDIR/$PRGNAM
+
+  # why is this hardcoded?
+  sed -i "s,/usr/local/lib/vwm/,/usr/lib$LIBDIRSUFFIX/vwm/," vwm.h
+
+  mkdir -p build
+  cd build
+  cmake \
+    -DCMAKE_C_FLAGS_RELEASE="$SLKCFLAGS -DNDEBUG -I$PKG/usr/include" \
+    -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS -DNDEBUG -I$PKG/usr/include" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DVTERM_LIBRARY=$PKG/usr/lib/libvterm.so \
+    -DVIPER_LIBRARY=$PKG/usr/lib/libviper.so \
+    -DVTERM_INCLUDE_DIR=$PKG/usr/include \
+    -DVIPER_INCLUDE_DIR=$PKG/usr/include \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make VERBOSE=1
+  make install/strip DESTDIR=$PKG
+cd -
+
+# *Now* we can fix the lib=>lib64 mess, if needed.
+[ "$LIBDIRSUFFIX" != "" ] && mv $PKG/usr/lib $PKG/usr/lib$LIBDIRSUFFIX
+
+# Build and install the keycodes tool to determine codes for remapping
+# keystrokes in '~/.vwm/vwmrc'. Don't think we need the non-wide version,
+# since the main program uses wide ncurses.
+make -j1 -C keycodes keycodes_wide
+install -s -m0755 keycodes/keycodes_wide $PKG/usr/bin/keycodes
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
+# upstream's README.md is mostly install instructions.
+mkdir -p $PKGDOC
+cp -a BUGS CHANGELOG LICENSE NEWS* README* TODO samples $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+cat $CWD/README > $PKGDOC/README$TAG
+
+# include docs for the libraries too.
+cd $BASEDIR
+mkdir -p $PKGDOC/{libviper,libvterm}
+cp -a libviper/{CHANGELOG,LICENSE,README.md,TODO} $PKGDOC/libviper
+cp -a libvterm/{API,CHANGELOG,COPY*,LIC*,*.md} $PKGDOC/libvterm
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/vwm/vwm.info b/system/vwm/vwm.info
new file mode 100644
index 0000000000..1579f3be69
--- /dev/null
+++ b/system/vwm/vwm.info
@@ -0,0 +1,10 @@
+PRGNAM="vwm"
+VERSION="3.3.2+20200112_207d888"
+HOMEPAGE="https://github.com/TragicWarrior/vwm"
+DOWNLOAD="https://slackware.uk/~urchlay/src/vwm-3.3.2+20200112_207d888.tar.xz"
+MD5SUM="096673cc32536c0e170d02fb7aef5322"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libconfig"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/wacomtablet/README b/system/wacomtablet/README
deleted file mode 100644
index 7e0960d536..0000000000
--- a/system/wacomtablet/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This module implements a GUI for the Wacom Linux Drivers and extends it
-with profile support to handle different button / pen layouts per profile.
diff --git a/system/wacomtablet/slack-desc b/system/wacomtablet/slack-desc
deleted file mode 100644
index e025263648..0000000000
--- a/system/wacomtablet/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-           |-----handy-ruler------------------------------------------------------|
-wacomtablet: wacomtablet (KDE Wacom Tablet)
-wacomtablet:
-wacomtablet: This module implements a GUI for the Wacom Linux Drivers and extends
-wacomtablet: it with profile support to handle different button / pen layouts
-wacomtablet: per profile.
-wacomtablet:
-wacomtablet: https://github.com/KDE/wacomtablet
-wacomtablet:
-wacomtablet:
-wacomtablet:
-wacomtablet:
diff --git a/system/wacomtablet/wacomtablet.SlackBuild b/system/wacomtablet/wacomtablet.SlackBuild
deleted file mode 100644
index 35cb3a5246..0000000000
--- a/system/wacomtablet/wacomtablet.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for KDE wacomtablet
-
-# Copyright 2013  Giorgio Peron Campodarsego, PD, Italy giorgio.peron@gmail.com
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=wacomtablet
-VERSION=${VERSION:-2.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Fixes based on Arch Linux patch (thanks!)
-sed -i \
-  -e 's/cmake_minimum_required(VERSION 2.6)/cmake_minimum_required(VERSION 3.0.0)/' \
-  CMakeLists.txt
-sed -i \
-  -e 's/XsetWacomAdaptor/XinputWacomAdaptor/' \
-  autotests/kded/xinputadaptor/CMakeLists.txt
-
-mkdir build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
-cd ..
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
-cp -a AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/wacomtablet/wacomtablet.info b/system/wacomtablet/wacomtablet.info
deleted file mode 100644
index f424ef99b0..0000000000
--- a/system/wacomtablet/wacomtablet.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="wacomtablet"
-VERSION="2.1"
-HOMEPAGE="https://github.com/KDE/wacomtablet"
-DOWNLOAD="https://github.com/KDE/wacomtablet/archive/v2.1.tar.gz"
-MD5SUM="54f080ba51567585d8ba8791b28e357b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Giorgio Peron"
-EMAIL="giorgio.peron@gmail.com"
diff --git a/system/wangfonts/README b/system/wangfonts/README
index 3905dbad2d..a294821c72 100644
--- a/system/wangfonts/README
+++ b/system/wangfonts/README
@@ -1,2 +1,2 @@
-Free Chinese TrueType fonts donated by Prof. Hann-Tzong WANG in 2000 and 2004.
-The license is GPL 2.0.
+Free Chinese TrueType fonts donated by Prof. Hann-Tzong WANG in 2000
+and 2004. The license is GPL 2.0.
diff --git a/system/wangfonts/wangfonts.SlackBuild b/system/wangfonts/wangfonts.SlackBuild
index 4054c3a161..648b692dca 100644
--- a/system/wangfonts/wangfonts.SlackBuild
+++ b/system/wangfonts/wangfonts.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wangfonts
 
@@ -22,13 +22,23 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wangfonts
 VERSION=${VERSION:-1.3.0}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,4 +70,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/warp-terminal/README b/system/warp-terminal/README
new file mode 100644
index 0000000000..eaa9208859
--- /dev/null
+++ b/system/warp-terminal/README
@@ -0,0 +1,5 @@
+A blazingly-fast modern Rust based GPU-accelerated terminal
+built to make you and your team more productive.
+
+This script repackages the Debian package provided by Warp
+Project.
diff --git a/system/warp-terminal/doinst.sh b/system/warp-terminal/doinst.sh
new file mode 100644
index 0000000000..1d55db074f
--- /dev/null
+++ b/system/warp-terminal/doinst.sh
@@ -0,0 +1,15 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
+DEST="/bin/warp-terminal"
+
+if [ ! -L ${DEST} -a ! -e ${DEST} ]; then
+  /usr/bin/ln -s /opt/warpdotdev/warp-terminal/warp ${DEST}
+fi
diff --git a/system/warp-terminal/douninst.sh b/system/warp-terminal/douninst.sh
new file mode 100644
index 0000000000..edc5d753dc
--- /dev/null
+++ b/system/warp-terminal/douninst.sh
@@ -0,0 +1,5 @@
+DEST="/bin/warp-terminal"
+
+if [ -L ${DEST} ]; then
+  /usr/bin/rm -f ${DEST}
+fi
diff --git a/system/warp-terminal/slack-desc b/system/warp-terminal/slack-desc
new file mode 100644
index 0000000000..2d9df236a8
--- /dev/null
+++ b/system/warp-terminal/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+warp-terminal: warp-terminal (Your terminal, reimagined)
+warp-terminal:
+warp-terminal: warp-terminal -  blazingly-fast modern Rust based GPU-accelerated
+warp-terminal: terminal built to make you and your team more productive.
+warp-terminal:
+warp-terminal: Homepage: https://www.warp.dev/
+warp-terminal:
+warp-terminal:
+warp-terminal:
+warp-terminal:
+warp-terminal:
diff --git a/system/warp-terminal/warp-terminal.SlackBuild b/system/warp-terminal/warp-terminal.SlackBuild
new file mode 100644
index 0000000000..4e668e83f4
--- /dev/null
+++ b/system/warp-terminal/warp-terminal.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+# Slackware build script for warp
+
+# Copyright 2024  Dimitar Nikov, Alfreton, United Kingdom
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=warp-terminal
+VERSION=${VERSION:-0.2024.02.20.08.01}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" != "x86_64" ]; then
+  echo "$ARCH is not supported."
+  exit 1
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $PKG
+ar p $CWD/${PRGNAM}_${VERSION}.stable.02_amd64.deb data.tar.xz | tar -xvJ
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/douninst.sh > $PKG/install/douninst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/warp-terminal/warp-terminal.info b/system/warp-terminal/warp-terminal.info
new file mode 100644
index 0000000000..4266303ab4
--- /dev/null
+++ b/system/warp-terminal/warp-terminal.info
@@ -0,0 +1,10 @@
+PRGNAM="warp-terminal"
+VERSION="0.2024.02.20.08.01"
+HOMEPAGE="https://www.warp.dev/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://releases.warp.dev/stable/v0.2024.02.20.08.01.stable_02/warp-terminal_0.2024.02.20.08.01.stable.02_amd64.deb"
+MD5SUM_x86_64="2df4c0844ed983ac84a25f2341b77a05"
+REQUIRES="%README%"
+MAINTAINER="Dimitar Nikov"
+EMAIL="dimitar at nikov dot net"
diff --git a/system/watch-fs/watch-fs.SlackBuild b/system/watch-fs/watch-fs.SlackBuild
index 38a9eb7135..1169ba33a8 100644
--- a/system/watch-fs/watch-fs.SlackBuild
+++ b/system/watch-fs/watch-fs.SlackBuild
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for watch-fs
 
+# Copyright 2022  fourtysixandtwo <fourtysixandtwo@sliderr.net>
 # Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
@@ -22,10 +23,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220512 46and2: Added python3 support, shorten DOWNLOAD url, New maintainer.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=watch-fs
 VERSION=${VERSION:-1.5.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,7 +82,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+python3 setup.py install --root=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -83,4 +96,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/watch-fs/watch-fs.info b/system/watch-fs/watch-fs.info
index 158da99e4a..70cdf087bf 100644
--- a/system/watch-fs/watch-fs.info
+++ b/system/watch-fs/watch-fs.info
@@ -1,10 +1,10 @@
 PRGNAM="watch-fs"
 VERSION="1.5.0"
 HOMEPAGE="https://github.com/borntyping/watch-fs"
-DOWNLOAD="https://pypi.python.org/packages/a9/3a/154aae88e64c4cca6ab546a378a8eed21ee429720e4b2375bec8aec8531a/watch-fs-1.5.0.tar.gz"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/w/watch-fs/watch-fs-1.5.0.tar.gz"
 MD5SUM="134d697e0911e6bcdf75150a4de7c379"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="click pyinotify"
-MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+REQUIRES="click python3-pyinotify"
+MAINTAINER="fourtysixandtwo"
+EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/system/watchdog/README b/system/watchdog/README
new file mode 100644
index 0000000000..d39c8c35ab
--- /dev/null
+++ b/system/watchdog/README
@@ -0,0 +1,15 @@
+watchdog is a daemon that periodically pokes a hardware chip,
+ and if it fails to do so (presumaby because the system got stuck),
+ the chip would reboot the system. A somehow working software
+ emulation of this chip, called "softdog" also exists in Linux.
+ A reboot can be triggered by some other criteria too.
+
+This script installs a RedHat-style initscript, but you can run it from
+/etc/rc.d/rc.local too.
+
+This daemon needs a proper kernel driver to work.
+Some machines, such as raspberry pi 4b, provide /dev/wachdog by default.
+Intel systems might require editing /etc/sysconfig/watchdog to have
+START_MOD_CMD="modprobe iTCO_wdt" and
+
+You can try "softdog" if nothing better is available.
diff --git a/system/watchdog/doinst.sh b/system/watchdog/doinst.sh
new file mode 100644
index 0000000000..4dd02e02a2
--- /dev/null
+++ b/system/watchdog/doinst.sh
@@ -0,0 +1,31 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+
+
+preserve_perms etc/rc.d/init.d/watchdog.new
+
+config etc/watchdog.conf.new
+config etc/sysconfig/watchdog.new
+
diff --git a/system/watchdog/slack-desc b/system/watchdog/slack-desc
new file mode 100644
index 0000000000..15fc3a4bb8
--- /dev/null
+++ b/system/watchdog/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+watchdog: watchdog (the userspace daemon for watchdog support)
+watchdog:
+watchdog: watchdog is a daemon that periodically pokes a hardware chip,
+watchdog: and if it fails to do so (presumaby because the system got stuck),
+watchdog: the chip would reboot the system. A somehow working software
+watchdog: emulation of this chip, called "softdog" also exists in Linux.
+watchdog: A reboot can be triggered by some other criteria too.
+watchdog:
+watchdog:
+watchdog:
+watchdog:
diff --git a/system/watchdog/watchdog.SlackBuild b/system/watchdog/watchdog.SlackBuild
new file mode 100644
index 0000000000..3c5e994a33
--- /dev/null
+++ b/system/watchdog/watchdog.SlackBuild
@@ -0,0 +1,121 @@
+#!/bin/bash
+
+# Slackware build script for watchdog
+
+# Copyright 2022 lockywolf from somewhere
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd "$(dirname $0)" ; CWD=$(pwd)
+
+PRGNAM=watchdog
+VERSION=${VERSION:-5.16}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" -o "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+mv $PKG/etc/watchdog.conf $PKG/etc/watchdog.conf.new
+mkdir -p $PKG/etc/sysconfig
+mkdir -p $PKG/etc/rc.d/init.d
+cp redhat/sysconf.redhat $PKG/etc/sysconfig/watchdog.new
+cp redhat/watchdog.init $PKG/etc/rc.d/init.d/watchdog.new
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -ar \
+  AUTHORS INSTALL README COPYING README.watchdog.ipmi ChangeLog examples \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/watchdog/watchdog.info b/system/watchdog/watchdog.info
new file mode 100644
index 0000000000..cc3f6501de
--- /dev/null
+++ b/system/watchdog/watchdog.info
@@ -0,0 +1,10 @@
+PRGNAM="watchdog"
+VERSION="5.16"
+HOMEPAGE="https://sourceforge.net/projects/watchdog/"
+DOWNLOAD="https://prdownloads.sourceforge.net/watchdog/watchdog-5.16.tar.gz"
+MD5SUM="1b4f51cabc64d1bee2fce7cdd626831f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Lockywolf"
+EMAIL="slackbuilds_watchdog_2022-04-03_45cc54ac-b35f-11ec-834e-cf2c364267f5@lockywolf.net"
diff --git a/system/wayland-utils/README b/system/wayland-utils/README
new file mode 100644
index 0000000000..5686305595
--- /dev/null
+++ b/system/wayland-utils/README
@@ -0,0 +1,9 @@
+wayland-info is a utility for displaying information about the Wayland
+protocols supported by a Wayland compositor.
+
+It can be used to check which Wayland protocols and versions are 
+advertised by the Wayland compositor.
+
+wayland-info also provides additional information for a subset of 
+Wayland protocols it knows about, namely Linux DMABUF, 
+presentation time, tablet and XDG output protocols.
diff --git a/system/wayland-utils/slack-desc b/system/wayland-utils/slack-desc
new file mode 100644
index 0000000000..2a739c39e3
--- /dev/null
+++ b/system/wayland-utils/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+wayland-utils: wayland-utils (utility for displaying information about the Wayland)
+wayland-utils:
+wayland-utils: It can be used to check which Wayland protocols and versions are 
+wayland-utils: advertised by the Wayland compositor.
+wayland-utils:
+wayland-utils: wayland-info also provides additional information for a subset of 
+wayland-utils: Wayland protocols it knows about, namely Linux DMABUF, 
+wayland-utils: presentation time, tablet and XDG output protocols.
+wayland-utils:
+wayland-utils:
+wayland-utils:
diff --git a/system/wayland-utils/wayland-utils.SlackBuild b/system/wayland-utils/wayland-utils.SlackBuild
new file mode 100644
index 0000000000..bf432fafbf
--- /dev/null
+++ b/system/wayland-utils/wayland-utils.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# Slackware build script for wayland-utils
+
+# Copyright 2023
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=wayland-utils
+VERSION=${VERSION:-1.2.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson setup .. \
+    --prefix=/usr \
+    --mandir=/usr/man 
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/wayland-utils/wayland-utils.info b/system/wayland-utils/wayland-utils.info
new file mode 100644
index 0000000000..e2d519e476
--- /dev/null
+++ b/system/wayland-utils/wayland-utils.info
@@ -0,0 +1,10 @@
+PRGNAM="wayland-utils"
+VERSION="1.2.0"
+HOMEPAGE="https://gitlab.freedesktop.org/wayland/wayland-utils"
+DOWNLOAD="https://gitlab.freedesktop.org/wayland/wayland-utils/-/archive/1.2.0/wayland-utils-1.2.0.tar.gz"
+MD5SUM="e6e6e41e9a36c5ead8daa3dba64d9b21"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="marav"
+EMAIL="marav8@free.fr"
diff --git a/system/waypipe/README b/system/waypipe/README
new file mode 100644
index 0000000000..a344915ec7
--- /dev/null
+++ b/system/waypipe/README
@@ -0,0 +1,20 @@
+Waypipe
+
+waypipe is a proxy for Wayland[0] clients. It forwards Wayland
+messages and serializes changes to shared memory buffers over a single
+socket. This makes application forwarding similar to ssh -X [1]
+feasible.
+
+aypipe should be installed on both the local and remote computers.
+There is a user-friendly command line pattern which prefixes a call to
+ssh and automatically sets up a reverse tunnel for protocol data. For
+example,
+
+waypipe ssh user@theserver weston-terminal
+
+
+will run ssh, connect to theserver, and remotely run weston-terminal,
+using local and remote waypipe processes to synchronize the shared
+memory buffers used by Wayland clients between both computers. Command
+line arguments before ssh apply only to waypipe; those after ssh
+belong to ssh.
diff --git a/system/waypipe/slack-desc b/system/waypipe/slack-desc
new file mode 100644
index 0000000000..c84496a730
--- /dev/null
+++ b/system/waypipe/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+waypipe: waypipe (Network transparency with Wayland)
+waypipe:
+waypipe: waypipe is a proxy for Wayland[0] clients. It forwards Wayland
+waypipe: messages and serializes changes to shared memory buffers over a
+waypipe: single socket. This makes application forwarding similar to
+waypipe: ssh -X [1] feasible.
+waypipe:
+waypipe:
+waypipe:
+waypipe:
+waypipe:
diff --git a/system/waypipe/waypipe.SlackBuild b/system/waypipe/waypipe.SlackBuild
new file mode 100644
index 0000000000..1503d02251
--- /dev/null
+++ b/system/waypipe/waypipe.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/bash
+
+# Slackware build script for waypipe
+
+# Copyright 2024, Lockywolf
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=waypipe
+VERSION=${VERSION:-0.8.6}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-v$VERSION
+tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz
+cd $PRGNAM-v$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CONTRIBUTING.md  COPYING  README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/waypipe/waypipe.info b/system/waypipe/waypipe.info
new file mode 100644
index 0000000000..ca70bd9a79
--- /dev/null
+++ b/system/waypipe/waypipe.info
@@ -0,0 +1,10 @@
+PRGNAM="waypipe"
+VERSION="0.8.6"
+HOMEPAGE="https://gitlab.freedesktop.org/mstoeckl/waypipe"
+DOWNLOAD="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v0.8.6/waypipe-v0.8.6.tar.gz"
+MD5SUM="f2424303f0e9309f60da6b5ca2c63494"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="scdoc weston"
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo.waypipe_2024-01-29@lockywolf.net"
diff --git a/system/wdfs/wdfs.SlackBuild b/system/wdfs/wdfs.SlackBuild
index 268cdeea67..3ab46bfb05 100644
--- a/system/wdfs/wdfs.SlackBuild
+++ b/system/wdfs/wdfs.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wdfs
 
 # Written by Jean-Yves Didier (jean-yves.didier@ibisc.univ-evry.fr)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wdfs
 VERSION=${VERSION:-1.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -78,4 +88,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/wdiff/README b/system/wdiff/README
index 4529bc8c0c..2067f6fbb7 100644
--- a/system/wdiff/README
+++ b/system/wdiff/README
@@ -1,9 +1,9 @@
 wdiff (display word differences between text files)
 
-The GNU wdiff program is a front end to diff for comparing files on a word
-per word basis. A word is anything between whitespace. This is useful for
-comparing two texts in which a few words have been changed and for which
-paragraphs have been refilled. It works by creating two temporary files,
-one word per line, and then executes diff on these files. It collects the
-diff output and uses it to produce a nicer display of word differences
-between the original files.
+The GNU wdiff program is a front end to diff for comparing files on
+a word per word basis. A word is anything between whitespace. This is
+useful for comparing two texts in which a few words have been changed
+and for which paragraphs have been refilled. It works by creating two
+temporary files, one word per line, and then executes diff on these
+files. It collects the diff output and uses it to produce a nicer
+display of word differences between the original files.
diff --git a/system/wdiff/doinst.sh b/system/wdiff/doinst.sh
new file mode 100644
index 0000000000..1bef502028
--- /dev/null
+++ b/system/wdiff/doinst.sh
@@ -0,0 +1,6 @@
+if [ -x /usr/bin/install-info -a -d usr/info ]; then
+  ( cd usr/info
+    rm -f dir
+    for i in *.info*; do /usr/bin/install-info $i dir 2>/dev/null; done
+  )
+fi
diff --git a/system/wdiff/wdiff.SlackBuild b/system/wdiff/wdiff.SlackBuild
index dc7e353457..3a41095028 100644
--- a/system/wdiff/wdiff.SlackBuild
+++ b/system/wdiff/wdiff.SlackBuild
@@ -1,15 +1,21 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wdiff
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230708 bkw: BUILD=3, add doinst/douninst for .info files.
+# 20210809 bkw: BUILD=2, --enable-experimental
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wdiff
 VERSION=${VERSION:-1.2.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +25,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,15 +57,15 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
+# The --enable-experimental option builds mdiff, wdiff2, and unify. These
+# look useful enough to include in the build.
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
+  --enable-experimental \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -68,15 +78,17 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+gzip -9 $PKG/usr/man/man1/*.1 $PKG/usr/info/*
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS BACKLOG COPYING ChangeLog NEWS README THANKS TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS BACKLOG COPYING ChangeLog NEWS README THANKS TODO $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/doinst.sh > $PKG/install/douninst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/wdiff/wdiff.info b/system/wdiff/wdiff.info
index 34dc1f18b6..e90e800950 100644
--- a/system/wdiff/wdiff.info
+++ b/system/wdiff/wdiff.info
@@ -1,10 +1,10 @@
 PRGNAM="wdiff"
 VERSION="1.2.2"
 HOMEPAGE="https://www.gnu.org/software/wdiff/"
-DOWNLOAD="http://ftp.gnu.org/gnu/wdiff/wdiff-1.2.2.tar.gz"
+DOWNLOAD="https://ftp.gnu.org/gnu/wdiff/wdiff-1.2.2.tar.gz"
 MD5SUM="1c6ddd1f3106139ff9fe00e934df715f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/webcore-fonts/README b/system/webcore-fonts/README
index b4cf54fadb..2e6575f85f 100644
--- a/system/webcore-fonts/README
+++ b/system/webcore-fonts/README
@@ -13,13 +13,15 @@ That file causes Slackware to display Liberation fonts in the place of
 Microsoft fonts. If you have Microsoft fonts, you don't need the
 substitutions.
 
-FontForge is an optional dependency. The distribution includes the Cambria
-font as a .TTC file consisting of two fonts: cambria.ttf and cambria-math.ttf.
-If FontForge is available, then the Cambria font will be installed as these two
-TTF files. If not, then it will be installed as a single TTC file.
+FontForge is an optional dependency. The distribution includes the
+Cambria font as a .TTC file consisting of two fonts: cambria.ttf and
+cambria-math.ttf. If FontForge is available, then the Cambria font
+will be installed as these two TTF files. If not, then it will be
+installed as a single TTC file.
 
-The following Fontconfig setting (taken from infinality.net) is recommended.
-Put it in /etc/fonts/local.conf or ~/.config/fontconfig/fonts.conf:
+The following Fontconfig setting (taken from infinality.net)
+is recommended. Put it in /etc/fonts/local.conf or
+~/.config/fontconfig/fonts.conf:
 
    <!-- Disable embedded bitmaps in fonts like Calibri -->
   <match target="font" >
@@ -27,4 +29,3 @@ Put it in /etc/fonts/local.conf or ~/.config/fontconfig/fonts.conf:
       <bool>false</bool>
     </edit>
   </match>
-
diff --git a/system/webcore-fonts/webcore-fonts.SlackBuild b/system/webcore-fonts/webcore-fonts.SlackBuild
index 63bf0e808b..95d854fe78 100644
--- a/system/webcore-fonts/webcore-fonts.SlackBuild
+++ b/system/webcore-fonts/webcore-fonts.SlackBuild
@@ -1,17 +1,27 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for webcore-fonts
 
 # Written by Dugan Chen (dugan [underscore] c [at] fastmail [dot] fm)
 # Modified by SlackBuilds.org
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=webcore-fonts
 VERSION=${VERSION:-3.0}
 ARCH=noarch
 BUILD=${BUILD:-5}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -58,4 +68,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/webcore-fonts/webcore-fonts.info b/system/webcore-fonts/webcore-fonts.info
index e517530c02..efb4073db5 100644
--- a/system/webcore-fonts/webcore-fonts.info
+++ b/system/webcore-fonts/webcore-fonts.info
@@ -1,8 +1,8 @@
 PRGNAM="webcore-fonts"
 VERSION="3.0"
 HOMEPAGE="http://avi.alkalay.net/linux/docs/font-howto/Font.html#msfonts"
-DOWNLOAD="http://avi.alkalay.net/software/webcore-fonts/webcore-fonts-3.0.tar.gz \
-          http://ponce.cc/slackware/sources/repo/symbol.gz"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/webcore-fonts-3.0.tar.gz \
+          https://ponce.cc/slackware/sources/repo/symbol.gz"
 MD5SUM="0ca029d7135f7afdba00be6280ff96c6 \
         04fe09507552b16ac40a1738c87a23ff"
 DOWNLOAD_x86_64=""
diff --git a/system/webmin/README b/system/webmin/README
index 4d9cc33687..da3bf9c895 100644
--- a/system/webmin/README
+++ b/system/webmin/README
@@ -4,19 +4,21 @@ DNS, file sharing, and much more.  Webmin removes the need to manually
 edit Unix configuration files like /etc/passwd and lets you manage
 a system from the console or remotely.
 
-Webmin consists of a simple web server and a number of CGI programs
-which directly update system files like /etc/inetd.conf and /etc/passwd.
-The web server and all CGI programs are written in Perl version 5, and use
-only the standard perl modules. 
+Webmin consists of a simple web server and a number of CGI
+programs which directly update system files like /etc/inetd.conf and
+/etc/passwd. The web server and all CGI programs are written in Perl
+version 5, and use only the standard perl modules.
 
 Some modules will require manual configuration from within webmin.
 Login with root and root's password.
 
-If you need to start webmin at boot.
-The recommended way is to add the following to your /etc/rc.d/rc.local
-script and make sure rc.webmin has executable permissions set:
+If you need to start webmin at boot, the recommended way is to add the
+following to your /etc/rc.d/rc.local script and make sure rc.webmin
+has executable permissions set:
+
   if [ -x /etc/rc.d/rc.webmin ]; then
     /etc/rc.d/rc.webmin start
   fi
+
 After the webmin service is started, point your web browser to 
 http://localhost:10000 and login as root to use webmin.
diff --git a/system/webmin/doinst.sh b/system/webmin/doinst.sh
index 74d778aaeb..9eb3f70183 100644
--- a/system/webmin/doinst.sh
+++ b/system/webmin/doinst.sh
@@ -22,6 +22,5 @@ preserve_perms() {
   config $NEW
 }
 
-# Signal the startup script to do some post install configuration  
+# Signal the startup script to do some post install configuration
 touch etc/webmin/FIRSTRUN
-
diff --git a/system/webmin/reload.new b/system/webmin/reload.new
new file mode 100644
index 0000000000..a345c0c1ee
--- /dev/null
+++ b/system/webmin/reload.new
@@ -0,0 +1,4 @@
+#!/bin/sh
+echo Reloading Webmin server in /usr/libexec/webmin
+pidfile=`grep "^pidfile=" /etc/webmin/miniserv.conf | sed -e 's/pidfile=//g'`
+kill -USR1 `cat $pidfile`
diff --git a/system/webmin/restart-by-force-kill.new b/system/webmin/restart-by-force-kill.new
new file mode 100644
index 0000000000..5aab610e96
--- /dev/null
+++ b/system/webmin/restart-by-force-kill.new
@@ -0,0 +1,3 @@
+#!/bin/sh
+/etc/webmin/stop --kill
+/etc/webmin/start
diff --git a/system/webmin/restart.new b/system/webmin/restart.new
new file mode 100644
index 0000000000..f1511b017b
--- /dev/null
+++ b/system/webmin/restart.new
@@ -0,0 +1,3 @@
+#!/bin/sh
+/etc/webmin/stop
+/etc/webmin/start
diff --git a/system/webmin/start.new b/system/webmin/start.new
new file mode 100644
index 0000000000..72f55ae6a7
--- /dev/null
+++ b/system/webmin/start.new
@@ -0,0 +1,10 @@
+#!/bin/sh
+echo Starting Webmin server in /usr/libexec/webmin
+trap '' 1
+LANG=
+export LANG
+unset PERLIO
+export PERLIO
+PERLLIB=/usr/libexec/webmin
+export PERLLIB
+exec '/usr/libexec/webmin/miniserv.pl' $* /etc/webmin/miniserv.conf
diff --git a/system/webmin/stop.new b/system/webmin/stop.new
new file mode 100644
index 0000000000..a540974bdd
--- /dev/null
+++ b/system/webmin/stop.new
@@ -0,0 +1,21 @@
+#!/bin/sh
+if [ "$1" = "--kill" ]; then
+  echo Force stopping Webmin server in /usr/libexec/webmin
+else
+  echo Stopping Webmin server in /usr/libexec/webmin
+fi
+pidfile=`grep "^pidfile=" /etc/webmin/miniserv.conf | sed -e 's/pidfile=//g'`
+pid=`cat $pidfile 2>/dev/null`
+if [ "$pid" != "" ]; then
+  kill $pid || exit 1
+  touch /var/log/webmin/stop-flag
+  if [ "$1" = "--kill" ]; then
+    sleep 1
+    ((ps axf | grep "/usr/libexec/webmin\/miniserv\.pl" | awk '{print "kill -9 -- -" $1}' | bash) || kill -9 -- -$pid || kill -9 $pid) 2>/dev/null
+  fi
+  exit 0
+else
+  if [ "$1" = "--kill" ]; then
+    (ps axf | grep "/usr/libexec/webmin\/miniserv\.pl" | awk '{print "kill -9 -- -" $1}' | bash) 2>/dev/null
+  fi
+fi
diff --git a/system/webmin/webmin.SlackBuild b/system/webmin/webmin.SlackBuild
index 4f761b65aa..da8e6f77ad 100644
--- a/system/webmin/webmin.SlackBuild
+++ b/system/webmin/webmin.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Webmin http://www.webmin.com
 
@@ -22,14 +22,21 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=webmin
-VERSION=${VERSION:-1.970}
+VERSION=${VERSION:-2.105}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=${TMP}/package-${PRGNAM}
 OUTPUT=${OUTPUT:-/tmp}
@@ -131,8 +138,11 @@ if [ -e $PKG/etc ]; then
   get_config_files $PKG/etc
 fi
 
+rm -f $PKG/etc/webmin/{reload.new,.reload-init,restart-by-force-kill.new,.restart-by-force-kill-init,restart.new,.restart-init,start.new,.start-init,stop.new,.stop-init}
+install -m 0755 $CWD/*.new $PKG/etc/webmin
+
 # Fix a few ownership issues
 chown -R root:root $PKG/etc $PKG/var
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/webmin/webmin.info b/system/webmin/webmin.info
index 4d6c4473fd..79ff5a17e7 100644
--- a/system/webmin/webmin.info
+++ b/system/webmin/webmin.info
@@ -1,10 +1,10 @@
 PRGNAM="webmin"
-VERSION="1.970"
+VERSION="2.105"
 HOMEPAGE="https://www.webmin.com/"
-DOWNLOAD="https://downloads.sf.net/project/webadmin/webmin/1.970/webmin-1.970.tar.gz"
-MD5SUM="c031146469feb972fcd3ef47e982f19f"
+DOWNLOAD="https://downloads.sf.net/project/webadmin/webmin/2.105/webmin-2.105.tar.gz"
+MD5SUM="b518ad1a5750fd92647613d707478403"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="David Somero"
 EMAIL="dsomero@hotmail.com"
diff --git a/system/wezterm/README b/system/wezterm/README
new file mode 100644
index 0000000000..da773115df
--- /dev/null
+++ b/system/wezterm/README
@@ -0,0 +1,2 @@
+A GPU-accelerated cross-platform terminal emulator and
+multiplexer written by @wez and implemented in Rust
diff --git a/system/wezterm/doinst.sh b/system/wezterm/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/system/wezterm/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/wezterm/slack-desc b/system/wezterm/slack-desc
new file mode 100644
index 0000000000..05ac835809
--- /dev/null
+++ b/system/wezterm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+wezterm: wezterm (terminal emulator and multiplexer)
+wezterm:
+wezterm: A GPU-accelerated cross-platform terminal emulator and multiplexer
+wezterm: written by @wez and implemented in Rust
+wezterm:
+wezterm:
+wezterm:
+wezterm:
+wezterm:
+wezterm:
+wezterm: https://wezfurlong.org/wezterm/
diff --git a/system/wezterm/wezterm.SlackBuild b/system/wezterm/wezterm.SlackBuild
new file mode 100644
index 0000000000..ad337fa667
--- /dev/null
+++ b/system/wezterm/wezterm.SlackBuild
@@ -0,0 +1,203 @@
+#!/bin/bash
+
+# Slackware build script for wezterm
+
+# Copyright 2022 Julian Grinblat <julian@dotcore.co.il>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=wezterm
+VERSION=${VERSION:-20240203_110809_5046fc22}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+
+  if [ "$ARCH" = "i586" ]; then
+    if rustc -Vv | grep host | grep i686 > /dev/null ; then
+      ARCH=i686
+    fi
+  fi
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "aarch64" ] ; then
+  SLKCFLAGS="-O2 -fPIC"
+  CARGOTARGET="--target $ARCH-unknown-linux-gnu"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  CARGOTARGET=""
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-${VERSION//_/-}.tar.gz
+mv $PRGNAM-${VERSION//_/-} $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+tar xvf $CWD/harfbuzz-8.3.0.tar.gz -C deps/harfbuzz/harfbuzz --strip-components=1
+tar xvf $CWD/zlib-1.2.11.tar.gz -C deps/freetype/zlib --strip-components=1
+tar xvf $CWD/libpng-8439534daa1d3a5705ba92e653eda9251246dd61.tar.gz -C deps/freetype/libpng --strip-components=1
+tar xvf $CWD/freetype2-e4586d960f339cf75e2e0b34aee30a0ed8353c0d.tar.gz -C deps/freetype/freetype2 --strip-components=1
+
+mkdir xcb-imdkit-rs-215ce4b08ac9c482
+tar xvf $CWD/xcb-imdkit-rs-215ce4b08ac9c4822e541efd4f4ffb1062806051.tar.gz -C xcb-imdkit-rs-215ce4b08ac9c482 --strip-components=1
+touch xcb-imdkit-rs-215ce4b08ac9c482/.cargo-ok
+
+tar xvf $CWD/xcb-imdkit-30e2f16f9a8b0e338e25ce5e3643809a07ad41f0.tar.gz -C xcb-imdkit-rs-215ce4b08ac9c482/deps/xcb-imdkit --strip-components=1
+
+cat << EOF >> Cargo.toml
+[patch."https://github.com/wez/xcb-imdkit-rs"]
+xcb-imdkit = { path = "xcb-imdkit-rs-215ce4b08ac9c482" }
+EOF
+
+# build offline
+# configuration tells cargo to use the configured directory
+# for dependencies instead of downloading from crates.io
+cat << EOF >> .cargo/config
+[source.crates-io]
+registry = 'https://github.com/rust-lang/crates.io-index'
+replace-with = 'vendored-sources'
+
+[source.vendored-sources]
+directory = '$(pwd)/vendor'
+EOF
+
+# deps and versions come from Cargo.lock
+mkdir vendor
+(
+  cd vendor
+
+  grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
+    sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
+    awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \
+    grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do
+
+    ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
+    dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
+
+    tar xvf $CWD/$dep-$ver.crate
+
+    touch $dep-$ver/.cargo-ok
+
+    # generate checksum
+    {
+      printf "{\n"
+      printf '    "files": {\n'
+
+      (
+        cd $dep-$ver
+        find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/'
+      ) | sed '$ s/,$//'
+
+      printf "    },\n"
+      printf '    "package": "'
+
+      sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
+
+      printf "}\n"
+    } > $dep-$ver/.cargo-checksum.json
+  done
+)
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
+CARGO_HOME=.cargo \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+cargo build --release $CARGOTARGET
+
+mkdir -p $PKG/usr/bin/
+find target -name $PRGNAM -exec install -m 755 {} $PKG/usr/bin/$PRGNAM \;
+find target -name $PRGNAM-gui -exec install -m 755 {} $PKG/usr/bin/$PRGNAM-gui \;
+find target -name $PRGNAM-mux-server -exec install -m 755 {} $PKG/usr/bin/$PRGNAM-mux-server \;
+find target -name strip-ansi-escapes -exec install -m 755 {} $PKG/usr/bin/strip-ansi-escapes \;
+
+install -Dm 644 assets/icon/terminal.png $PKG/usr/share/icons/hicolor/128x128/apps/org.wezfurlong.$PRGNAM.png
+install -Dm 644 assets/$PRGNAM.desktop $PKG/usr/share/applications/org.wezfurlong.$PRGNAM.desktop
+install -Dm 644 assets/$PRGNAM.appdata.xml $PKG/usr/share/metainfo/org.wezfurlong.$PRGNAM.appdata.xml
+install -Dm 644 assets/$PRGNAM-nautilus.py $PKG/usr/share/nautilus-python/extensions/$PRGNAM-nautilus.py
+install -Dm 755 assets/open-$PRGNAM-here -t $PKG/usr/bin
+install -Dm 644 assets/shell-completion/bash $PKG/usr/share/bash-completion/completions/$PRGNAM
+install -Dm 644 assets/shell-completion/fish $PKG/usr/share/fish/vendor_completions.d/$PRGNAM.fish
+install -Dm 644 assets/shell-completion/zsh $PKG/usr/share/zsh/site-functions/_$PRGNAM
+
+install -Dm 644 assets/shell-integration/* -t $PKG/etc/profile.d
+
+mkdir -p $PKG/usr/share/terminfo
+tic -x -o $PKG/usr/share/terminfo termwiz/data/$PRGNAM.terminfo
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md \
+  LICENSE.md \
+  CONTRIBUTING.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/wezterm/wezterm.info b/system/wezterm/wezterm.info
new file mode 100644
index 0000000000..5ae2f037c9
--- /dev/null
+++ b/system/wezterm/wezterm.info
@@ -0,0 +1,1308 @@
+PRGNAM="wezterm"
+VERSION="20240203_110809_5046fc22"
+HOMEPAGE="https://wezfurlong.org/wezterm"
+DOWNLOAD="https://github.com/wez/wezterm/archive/20240203-110809-5046fc22/wezterm-20240203-110809-5046fc22.tar.gz \
+          https://github.com/harfbuzz/harfbuzz/archive/8.3.0/harfbuzz-8.3.0.tar.gz \
+          https://github.com/madler/zlib/archive/v1.2.11/zlib-1.2.11.tar.gz \
+          https://github.com/glennrp/libpng/archive/8439534daa1d3a5705ba92e653eda9251246dd61/libpng-8439534daa1d3a5705ba92e653eda9251246dd61.tar.gz \
+          https://github.com/wez/freetype2/archive/e4586d960f339cf75e2e0b34aee30a0ed8353c0d/freetype2-e4586d960f339cf75e2e0b34aee30a0ed8353c0d.tar.gz \
+          https://github.com/wez/xcb-imdkit-rs/archive/215ce4b08ac9c4822e541efd4f4ffb1062806051/xcb-imdkit-rs-215ce4b08ac9c4822e541efd4f4ffb1062806051.tar.gz \
+          https://github.com/fcitx/xcb-imdkit/archive/30e2f16f9a8b0e338e25ce5e3643809a07ad41f0/xcb-imdkit-30e2f16f9a8b0e338e25ce5e3643809a07ad41f0.tar.gz \
+          https://static.crates.io/crates/addr2line/addr2line-0.21.0.crate \
+          https://static.crates.io/crates/adler/adler-1.0.2.crate \
+          https://static.crates.io/crates/adler32/adler32-1.2.0.crate \
+          https://static.crates.io/crates/ahash/ahash-0.7.7.crate \
+          https://static.crates.io/crates/ahash/ahash-0.8.7.crate \
+          https://static.crates.io/crates/aho-corasick/aho-corasick-1.1.2.crate \
+          https://static.crates.io/crates/allocator-api2/allocator-api2-0.2.16.crate \
+          https://static.crates.io/crates/android-tzdata/android-tzdata-0.1.1.crate \
+          https://static.crates.io/crates/android_system_properties/android_system_properties-0.1.5.crate \
+          https://static.crates.io/crates/anes/anes-0.1.6.crate \
+          https://static.crates.io/crates/anstream/anstream-0.6.11.crate \
+          https://static.crates.io/crates/anstyle/anstyle-1.0.5.crate \
+          https://static.crates.io/crates/anstyle-parse/anstyle-parse-0.2.3.crate \
+          https://static.crates.io/crates/anstyle-query/anstyle-query-1.0.2.crate \
+          https://static.crates.io/crates/anstyle-wincon/anstyle-wincon-3.0.2.crate \
+          https://static.crates.io/crates/anyhow/anyhow-1.0.79.crate \
+          https://static.crates.io/crates/arrayref/arrayref-0.3.7.crate \
+          https://static.crates.io/crates/arrayvec/arrayvec-0.7.4.crate \
+          https://static.crates.io/crates/as-raw-xcb-connection/as-raw-xcb-connection-1.0.1.crate \
+          https://static.crates.io/crates/ash/ash-0.37.3+1.3.251.crate \
+          https://static.crates.io/crates/assert_fs/assert_fs-1.1.1.crate \
+          https://static.crates.io/crates/async-broadcast/async-broadcast-0.5.1.crate \
+          https://static.crates.io/crates/async-channel/async-channel-1.9.0.crate \
+          https://static.crates.io/crates/async-channel/async-channel-2.1.1.crate \
+          https://static.crates.io/crates/async-executor/async-executor-1.8.0.crate \
+          https://static.crates.io/crates/async-fs/async-fs-1.6.0.crate \
+          https://static.crates.io/crates/async-io/async-io-1.13.0.crate \
+          https://static.crates.io/crates/async-io/async-io-2.3.1.crate \
+          https://static.crates.io/crates/async-lock/async-lock-2.8.0.crate \
+          https://static.crates.io/crates/async-lock/async-lock-3.3.0.crate \
+          https://static.crates.io/crates/async-net/async-net-1.8.0.crate \
+          https://static.crates.io/crates/async-process/async-process-1.8.1.crate \
+          https://static.crates.io/crates/async-recursion/async-recursion-1.0.5.crate \
+          https://static.crates.io/crates/async-signal/async-signal-0.2.5.crate \
+          https://static.crates.io/crates/async-task/async-task-4.7.0.crate \
+          https://static.crates.io/crates/async-trait/async-trait-0.1.77.crate \
+          https://static.crates.io/crates/atomic/atomic-0.5.3.crate \
+          https://static.crates.io/crates/atomic-waker/atomic-waker-1.1.2.crate \
+          https://static.crates.io/crates/atty/atty-0.2.14.crate \
+          https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \
+          https://static.crates.io/crates/az/az-1.2.1.crate \
+          https://static.crates.io/crates/backtrace/backtrace-0.3.69.crate \
+          https://static.crates.io/crates/base64/base64-0.13.1.crate \
+          https://static.crates.io/crates/base64/base64-0.21.7.crate \
+          https://static.crates.io/crates/benchmarking/benchmarking-0.4.12.crate \
+          https://static.crates.io/crates/bit-set/bit-set-0.5.3.crate \
+          https://static.crates.io/crates/bit-vec/bit-vec-0.6.3.crate \
+          https://static.crates.io/crates/bit_field/bit_field-0.10.2.crate \
+          https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \
+          https://static.crates.io/crates/bitflags/bitflags-2.4.2.crate \
+          https://static.crates.io/crates/block/block-0.1.6.crate \
+          https://static.crates.io/crates/block-buffer/block-buffer-0.10.4.crate \
+          https://static.crates.io/crates/blocking/blocking-1.5.1.crate \
+          https://static.crates.io/crates/bstr/bstr-0.1.4.crate \
+          https://static.crates.io/crates/bstr/bstr-1.9.0.crate \
+          https://static.crates.io/crates/bumpalo/bumpalo-3.14.0.crate \
+          https://static.crates.io/crates/bytemuck/bytemuck-1.14.1.crate \
+          https://static.crates.io/crates/bytemuck_derive/bytemuck_derive-1.5.0.crate \
+          https://static.crates.io/crates/byteorder/byteorder-1.5.0.crate \
+          https://static.crates.io/crates/bytes/bytes-1.5.0.crate \
+          https://static.crates.io/crates/cairo-rs/cairo-rs-0.18.5.crate \
+          https://static.crates.io/crates/camino/camino-1.1.6.crate \
+          https://static.crates.io/crates/cassowary/cassowary-0.3.0.crate \
+          https://static.crates.io/crates/cast/cast-0.3.0.crate \
+          https://static.crates.io/crates/cc/cc-1.0.83.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://static.crates.io/crates/cgl/cgl-0.3.2.crate \
+          https://static.crates.io/crates/chrono/chrono-0.4.33.crate \
+          https://static.crates.io/crates/ciborium/ciborium-0.2.2.crate \
+          https://static.crates.io/crates/ciborium-io/ciborium-io-0.2.2.crate \
+          https://static.crates.io/crates/ciborium-ll/ciborium-ll-0.2.2.crate \
+          https://static.crates.io/crates/clap/clap-2.34.0.crate \
+          https://static.crates.io/crates/clap/clap-3.2.25.crate \
+          https://static.crates.io/crates/clap/clap-4.4.18.crate \
+          https://static.crates.io/crates/clap_builder/clap_builder-4.4.18.crate \
+          https://static.crates.io/crates/clap_complete/clap_complete-4.4.9.crate \
+          https://static.crates.io/crates/clap_complete_fig/clap_complete_fig-4.4.2.crate \
+          https://static.crates.io/crates/clap_derive/clap_derive-4.4.7.crate \
+          https://static.crates.io/crates/clap_lex/clap_lex-0.2.4.crate \
+          https://static.crates.io/crates/clap_lex/clap_lex-0.6.0.crate \
+          https://static.crates.io/crates/clipboard-win/clipboard-win-2.2.0.crate \
+          https://static.crates.io/crates/cocoa/cocoa-0.20.2.crate \
+          https://static.crates.io/crates/cocoa/cocoa-0.25.0.crate \
+          https://static.crates.io/crates/cocoa-foundation/cocoa-foundation-0.1.2.crate \
+          https://static.crates.io/crates/codespan-reporting/codespan-reporting-0.11.1.crate \
+          https://static.crates.io/crates/color_quant/color_quant-1.1.0.crate \
+          https://static.crates.io/crates/colorchoice/colorchoice-1.0.0.crate \
+          https://static.crates.io/crates/colored/colored-1.9.4.crate \
+          https://static.crates.io/crates/colored/colored-2.1.0.crate \
+          https://static.crates.io/crates/colorgrad/colorgrad-0.6.2.crate \
+          https://static.crates.io/crates/com-rs/com-rs-0.2.1.crate \
+          https://static.crates.io/crates/concurrent-queue/concurrent-queue-2.4.0.crate \
+          https://static.crates.io/crates/core-foundation/core-foundation-0.7.0.crate \
+          https://static.crates.io/crates/core-foundation/core-foundation-0.9.4.crate \
+          https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.7.0.crate \
+          https://static.crates.io/crates/core-foundation-sys/core-foundation-sys-0.8.6.crate \
+          https://static.crates.io/crates/core-graphics/core-graphics-0.19.2.crate \
+          https://static.crates.io/crates/core-graphics/core-graphics-0.23.1.crate \
+          https://static.crates.io/crates/core-graphics-types/core-graphics-types-0.1.3.crate \
+          https://static.crates.io/crates/core-text/core-text-20.1.0.crate \
+          https://static.crates.io/crates/core2/core2-0.4.0.crate \
+          https://static.crates.io/crates/cpufeatures/cpufeatures-0.2.12.crate \
+          https://static.crates.io/crates/crc32fast/crc32fast-1.3.2.crate \
+          https://static.crates.io/crates/criterion/criterion-0.3.6.crate \
+          https://static.crates.io/crates/criterion/criterion-0.4.0.crate \
+          https://static.crates.io/crates/criterion-plot/criterion-plot-0.4.5.crate \
+          https://static.crates.io/crates/criterion-plot/criterion-plot-0.5.0.crate \
+          https://static.crates.io/crates/crossbeam/crossbeam-0.8.4.crate \
+          https://static.crates.io/crates/crossbeam-channel/crossbeam-channel-0.5.11.crate \
+          https://static.crates.io/crates/crossbeam-deque/crossbeam-deque-0.8.5.crate \
+          https://static.crates.io/crates/crossbeam-epoch/crossbeam-epoch-0.9.18.crate \
+          https://static.crates.io/crates/crossbeam-queue/crossbeam-queue-0.3.11.crate \
+          https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.19.crate \
+          https://static.crates.io/crates/crunchy/crunchy-0.2.2.crate \
+          https://static.crates.io/crates/crypto-common/crypto-common-0.1.6.crate \
+          https://static.crates.io/crates/csscolorparser/csscolorparser-0.6.2.crate \
+          https://static.crates.io/crates/csv/csv-1.3.0.crate \
+          https://static.crates.io/crates/csv-core/csv-core-0.1.11.crate \
+          https://static.crates.io/crates/d3d12/d3d12-0.7.0.crate \
+          https://static.crates.io/crates/darling/darling-0.20.3.crate \
+          https://static.crates.io/crates/darling_core/darling_core-0.20.3.crate \
+          https://static.crates.io/crates/darling_macro/darling_macro-0.20.3.crate \
+          https://static.crates.io/crates/dary_heap/dary_heap-0.3.6.crate \
+          https://static.crates.io/crates/data-encoding/data-encoding-2.5.0.crate \
+          https://static.crates.io/crates/deltae/deltae-0.3.2.crate \
+          https://static.crates.io/crates/deranged/deranged-0.3.11.crate \
+          https://static.crates.io/crates/derivative/derivative-2.2.0.crate \
+          https://static.crates.io/crates/dhat/dhat-0.3.2.crate \
+          https://static.crates.io/crates/diff/diff-0.1.13.crate \
+          https://static.crates.io/crates/difflib/difflib-0.4.0.crate \
+          https://static.crates.io/crates/digest/digest-0.10.7.crate \
+          https://static.crates.io/crates/dirs/dirs-4.0.0.crate \
+          https://static.crates.io/crates/dirs-next/dirs-next-2.0.0.crate \
+          https://static.crates.io/crates/dirs-sys/dirs-sys-0.3.7.crate \
+          https://static.crates.io/crates/dirs-sys-next/dirs-sys-next-0.1.2.crate \
+          https://static.crates.io/crates/dlib/dlib-0.5.2.crate \
+          https://static.crates.io/crates/doc-comment/doc-comment-0.3.3.crate \
+          https://static.crates.io/crates/downcast-rs/downcast-rs-1.2.0.crate \
+          https://static.crates.io/crates/dwrote/dwrote-0.11.0.crate \
+          https://static.crates.io/crates/either/either-1.9.0.crate \
+          https://static.crates.io/crates/embed-resource/embed-resource-1.8.0.crate \
+          https://static.crates.io/crates/emojis/emojis-0.6.1.crate \
+          https://static.crates.io/crates/encoding_rs/encoding_rs-0.8.33.crate \
+          https://static.crates.io/crates/enum-display-derive/enum-display-derive-0.1.1.crate \
+          https://static.crates.io/crates/enumflags2/enumflags2-0.7.8.crate \
+          https://static.crates.io/crates/enumflags2_derive/enumflags2_derive-0.7.8.crate \
+          https://static.crates.io/crates/env_filter/env_filter-0.1.0.crate \
+          https://static.crates.io/crates/env_logger/env_logger-0.10.2.crate \
+          https://static.crates.io/crates/env_logger/env_logger-0.11.1.crate \
+          https://static.crates.io/crates/equivalent/equivalent-1.0.1.crate \
+          https://static.crates.io/crates/errno/errno-0.3.8.crate \
+          https://static.crates.io/crates/euclid/euclid-0.22.9.crate \
+          https://static.crates.io/crates/event-listener/event-listener-2.5.3.crate \
+          https://static.crates.io/crates/event-listener/event-listener-3.1.0.crate \
+          https://static.crates.io/crates/event-listener/event-listener-4.0.3.crate \
+          https://static.crates.io/crates/event-listener-strategy/event-listener-strategy-0.4.0.crate \
+          https://static.crates.io/crates/exr/exr-1.6.4.crate \
+          https://static.crates.io/crates/fallible-iterator/fallible-iterator-0.2.0.crate \
+          https://static.crates.io/crates/fallible-streaming-iterator/fallible-streaming-iterator-0.1.9.crate \
+          https://static.crates.io/crates/fancy-regex/fancy-regex-0.11.0.crate \
+          https://static.crates.io/crates/fastrand/fastrand-1.9.0.crate \
+          https://static.crates.io/crates/fastrand/fastrand-2.0.1.crate \
+          https://static.crates.io/crates/fdeflate/fdeflate-0.3.4.crate \
+          https://static.crates.io/crates/filenamegen/filenamegen-0.2.4.crate \
+          https://static.crates.io/crates/filetime/filetime-0.2.23.crate \
+          https://static.crates.io/crates/finl_unicode/finl_unicode-1.2.0.crate \
+          https://static.crates.io/crates/fixed/fixed-1.24.0.crate \
+          https://static.crates.io/crates/fixedbitset/fixedbitset-0.4.2.crate \
+          https://static.crates.io/crates/flate2/flate2-1.0.28.crate \
+          https://static.crates.io/crates/float-cmp/float-cmp-0.9.0.crate \
+          https://static.crates.io/crates/flume/flume-0.10.14.crate \
+          https://static.crates.io/crates/flume/flume-0.11.0.crate \
+          https://static.crates.io/crates/fnv/fnv-1.0.7.crate \
+          https://static.crates.io/crates/foreign-types/foreign-types-0.3.2.crate \
+          https://static.crates.io/crates/foreign-types/foreign-types-0.5.0.crate \
+          https://static.crates.io/crates/foreign-types-macros/foreign-types-macros-0.2.3.crate \
+          https://static.crates.io/crates/foreign-types-shared/foreign-types-shared-0.1.1.crate \
+          https://static.crates.io/crates/foreign-types-shared/foreign-types-shared-0.3.1.crate \
+          https://static.crates.io/crates/form_urlencoded/form_urlencoded-1.2.1.crate \
+          https://static.crates.io/crates/fsevent-sys/fsevent-sys-4.1.0.crate \
+          https://static.crates.io/crates/futures/futures-0.3.30.crate \
+          https://static.crates.io/crates/futures-channel/futures-channel-0.3.30.crate \
+          https://static.crates.io/crates/futures-core/futures-core-0.3.30.crate \
+          https://static.crates.io/crates/futures-executor/futures-executor-0.3.30.crate \
+          https://static.crates.io/crates/futures-io/futures-io-0.3.30.crate \
+          https://static.crates.io/crates/futures-lite/futures-lite-1.13.0.crate \
+          https://static.crates.io/crates/futures-lite/futures-lite-2.2.0.crate \
+          https://static.crates.io/crates/futures-macro/futures-macro-0.3.30.crate \
+          https://static.crates.io/crates/futures-sink/futures-sink-0.3.30.crate \
+          https://static.crates.io/crates/futures-task/futures-task-0.3.30.crate \
+          https://static.crates.io/crates/futures-timer/futures-timer-3.0.2.crate \
+          https://static.crates.io/crates/futures-util/futures-util-0.3.30.crate \
+          https://static.crates.io/crates/fuzzy-matcher/fuzzy-matcher-0.3.7.crate \
+          https://static.crates.io/crates/generic-array/generic-array-0.14.7.crate \
+          https://static.crates.io/crates/gethostname/gethostname-0.4.3.crate \
+          https://static.crates.io/crates/getopts/getopts-0.2.21.crate \
+          https://static.crates.io/crates/getrandom/getrandom-0.2.12.crate \
+          https://static.crates.io/crates/gif/gif-0.12.0.crate \
+          https://static.crates.io/crates/gimli/gimli-0.28.1.crate \
+          https://static.crates.io/crates/git2/git2-0.16.1.crate \
+          https://static.crates.io/crates/gl_generator/gl_generator-0.14.0.crate \
+          https://static.crates.io/crates/glium/glium-0.31.0.crate \
+          https://static.crates.io/crates/glob/glob-0.3.1.crate \
+          https://static.crates.io/crates/globset/globset-0.4.14.crate \
+          https://static.crates.io/crates/globwalk/globwalk-0.9.1.crate \
+          https://static.crates.io/crates/glow/glow-0.13.1.crate \
+          https://static.crates.io/crates/glutin_wgl_sys/glutin_wgl_sys-0.5.0.crate \
+          https://static.crates.io/crates/governor/governor-0.5.1.crate \
+          https://static.crates.io/crates/gpu-alloc/gpu-alloc-0.6.0.crate \
+          https://static.crates.io/crates/gpu-alloc-types/gpu-alloc-types-0.3.0.crate \
+          https://static.crates.io/crates/gpu-allocator/gpu-allocator-0.23.0.crate \
+          https://static.crates.io/crates/gpu-descriptor/gpu-descriptor-0.2.4.crate \
+          https://static.crates.io/crates/gpu-descriptor-types/gpu-descriptor-types-0.1.2.crate \
+          https://static.crates.io/crates/guillotiere/guillotiere-0.6.2.crate \
+          https://static.crates.io/crates/h2/h2-0.3.24.crate \
+          https://static.crates.io/crates/half/half-1.8.2.crate \
+          https://static.crates.io/crates/half/half-2.3.1.crate \
+          https://static.crates.io/crates/hashbrown/hashbrown-0.11.2.crate \
+          https://static.crates.io/crates/hashbrown/hashbrown-0.12.3.crate \
+          https://static.crates.io/crates/hashbrown/hashbrown-0.13.2.crate \
+          https://static.crates.io/crates/hashbrown/hashbrown-0.14.3.crate \
+          https://static.crates.io/crates/hashlink/hashlink-0.7.0.crate \
+          https://static.crates.io/crates/hassle-rs/hassle-rs-0.10.0.crate \
+          https://static.crates.io/crates/hdrhistogram/hdrhistogram-7.5.4.crate \
+          https://static.crates.io/crates/heck/heck-0.4.1.crate \
+          https://static.crates.io/crates/hermit-abi/hermit-abi-0.1.19.crate \
+          https://static.crates.io/crates/hermit-abi/hermit-abi-0.3.4.crate \
+          https://static.crates.io/crates/hex/hex-0.4.3.crate \
+          https://static.crates.io/crates/hexf-parse/hexf-parse-0.2.1.crate \
+          https://static.crates.io/crates/home/home-0.5.9.crate \
+          https://static.crates.io/crates/hostname/hostname-0.3.1.crate \
+          https://static.crates.io/crates/http/http-0.2.11.crate \
+          https://static.crates.io/crates/http-body/http-body-0.4.6.crate \
+          https://static.crates.io/crates/http_req/http_req-0.10.2.crate \
+          https://static.crates.io/crates/httparse/httparse-1.8.0.crate \
+          https://static.crates.io/crates/httpdate/httpdate-1.0.3.crate \
+          https://static.crates.io/crates/humansize/humansize-2.1.3.crate \
+          https://static.crates.io/crates/humantime/humantime-2.1.0.crate \
+          https://static.crates.io/crates/hyper/hyper-0.14.28.crate \
+          https://static.crates.io/crates/hyper-tls/hyper-tls-0.5.0.crate \
+          https://static.crates.io/crates/iana-time-zone/iana-time-zone-0.1.59.crate \
+          https://static.crates.io/crates/iana-time-zone-haiku/iana-time-zone-haiku-0.1.2.crate \
+          https://static.crates.io/crates/ident_case/ident_case-1.0.1.crate \
+          https://static.crates.io/crates/idna/idna-0.5.0.crate \
+          https://static.crates.io/crates/ignore/ignore-0.4.22.crate \
+          https://static.crates.io/crates/image/image-0.24.8.crate \
+          https://static.crates.io/crates/indexmap/indexmap-1.9.3.crate \
+          https://static.crates.io/crates/indexmap/indexmap-2.2.1.crate \
+          https://static.crates.io/crates/inotify/inotify-0.9.6.crate \
+          https://static.crates.io/crates/inotify-sys/inotify-sys-0.1.5.crate \
+          https://static.crates.io/crates/instant/instant-0.1.12.crate \
+          https://static.crates.io/crates/intrusive-collections/intrusive-collections-0.9.6.crate \
+          https://static.crates.io/crates/io-lifetimes/io-lifetimes-1.0.11.crate \
+          https://static.crates.io/crates/ioctl-rs/ioctl-rs-0.1.6.crate \
+          https://static.crates.io/crates/ipnet/ipnet-2.9.0.crate \
+          https://static.crates.io/crates/is-terminal/is-terminal-0.4.10.crate \
+          https://static.crates.io/crates/itertools/itertools-0.10.5.crate \
+          https://static.crates.io/crates/itoa/itoa-1.0.10.crate \
+          https://static.crates.io/crates/jobserver/jobserver-0.1.27.crate \
+          https://static.crates.io/crates/jpeg-decoder/jpeg-decoder-0.3.1.crate \
+          https://static.crates.io/crates/js-sys/js-sys-0.3.67.crate \
+          https://static.crates.io/crates/k9/k9-0.11.6.crate \
+          https://static.crates.io/crates/k9/k9-0.12.0.crate \
+          https://static.crates.io/crates/khronos-egl/khronos-egl-6.0.0.crate \
+          https://static.crates.io/crates/khronos_api/khronos_api-3.1.0.crate \
+          https://static.crates.io/crates/kqueue/kqueue-1.0.8.crate \
+          https://static.crates.io/crates/kqueue-sys/kqueue-sys-1.0.4.crate \
+          https://static.crates.io/crates/lab/lab-0.11.0.crate \
+          https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \
+          https://static.crates.io/crates/lazycell/lazycell-1.3.0.crate \
+          https://static.crates.io/crates/leb128/leb128-0.2.5.crate \
+          https://static.crates.io/crates/lebe/lebe-0.5.2.crate \
+          https://static.crates.io/crates/libc/libc-0.2.152.crate \
+          https://static.crates.io/crates/libflate/libflate-2.0.0.crate \
+          https://static.crates.io/crates/libflate_lz77/libflate_lz77-2.0.0.crate \
+          https://static.crates.io/crates/libgit2-sys/libgit2-sys-0.14.2+1.5.1.crate \
+          https://static.crates.io/crates/libloading/libloading-0.6.7.crate \
+          https://static.crates.io/crates/libloading/libloading-0.7.4.crate \
+          https://static.crates.io/crates/libloading/libloading-0.8.1.crate \
+          https://static.crates.io/crates/libm/libm-0.2.8.crate \
+          https://static.crates.io/crates/libredox/libredox-0.0.1.crate \
+          https://static.crates.io/crates/libsqlite3-sys/libsqlite3-sys-0.24.2.crate \
+          https://static.crates.io/crates/libssh-rs/libssh-rs-0.2.2.crate \
+          https://static.crates.io/crates/libssh-rs-sys/libssh-rs-sys-0.2.2.crate \
+          https://static.crates.io/crates/libssh2-sys/libssh2-sys-0.3.0.crate \
+          https://static.crates.io/crates/libz-sys/libz-sys-1.1.15.crate \
+          https://static.crates.io/crates/line-wrap/line-wrap-0.1.1.crate \
+          https://static.crates.io/crates/line_drawing/line_drawing-0.8.1.crate \
+          https://static.crates.io/crates/linked-hash-map/linked-hash-map-0.5.6.crate \
+          https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.3.8.crate \
+          https://static.crates.io/crates/linux-raw-sys/linux-raw-sys-0.4.13.crate \
+          https://static.crates.io/crates/lock_api/lock_api-0.4.11.crate \
+          https://static.crates.io/crates/log/log-0.4.20.crate \
+          https://static.crates.io/crates/lru/lru-0.7.8.crate \
+          https://static.crates.io/crates/lua-src/lua-src-546.0.2.crate \
+          https://static.crates.io/crates/luajit-src/luajit-src-210.5.5+f2336c4.crate \
+          https://static.crates.io/crates/mac_address/mac_address-1.1.5.crate \
+          https://static.crates.io/crates/mach/mach-0.3.2.crate \
+          https://static.crates.io/crates/malloc_buf/malloc_buf-0.0.6.crate \
+          https://static.crates.io/crates/maplit/maplit-1.0.2.crate \
+          https://static.crates.io/crates/match_cfg/match_cfg-0.1.0.crate \
+          https://static.crates.io/crates/memchr/memchr-2.7.1.crate \
+          https://static.crates.io/crates/memmap2/memmap2-0.2.3.crate \
+          https://static.crates.io/crates/memmap2/memmap2-0.5.10.crate \
+          https://static.crates.io/crates/memmap2/memmap2-0.8.0.crate \
+          https://static.crates.io/crates/memmem/memmem-0.1.1.crate \
+          https://static.crates.io/crates/memoffset/memoffset-0.6.5.crate \
+          https://static.crates.io/crates/memoffset/memoffset-0.7.1.crate \
+          https://static.crates.io/crates/memoffset/memoffset-0.9.0.crate \
+          https://static.crates.io/crates/metal/metal-0.27.0.crate \
+          https://static.crates.io/crates/metrics/metrics-0.17.1.crate \
+          https://static.crates.io/crates/metrics-macros/metrics-macros-0.4.1.crate \
+          https://static.crates.io/crates/mime/mime-0.3.17.crate \
+          https://static.crates.io/crates/minimal-lexical/minimal-lexical-0.2.1.crate \
+          https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.4.4.crate \
+          https://static.crates.io/crates/miniz_oxide/miniz_oxide-0.7.1.crate \
+          https://static.crates.io/crates/mintex/mintex-0.1.3.crate \
+          https://static.crates.io/crates/mio/mio-0.8.10.crate \
+          https://static.crates.io/crates/mlua/mlua-0.9.5.crate \
+          https://static.crates.io/crates/mlua-sys/mlua-sys-0.5.1.crate \
+          https://static.crates.io/crates/naga/naga-0.14.2.crate \
+          https://static.crates.io/crates/names/names-0.12.0.crate \
+          https://static.crates.io/crates/nanorand/nanorand-0.7.0.crate \
+          https://static.crates.io/crates/native-tls/native-tls-0.2.11.crate \
+          https://static.crates.io/crates/nix/nix-0.23.2.crate \
+          https://static.crates.io/crates/nix/nix-0.24.3.crate \
+          https://static.crates.io/crates/nix/nix-0.25.1.crate \
+          https://static.crates.io/crates/nix/nix-0.26.4.crate \
+          https://static.crates.io/crates/no-std-compat/no-std-compat-0.4.1.crate \
+          https://static.crates.io/crates/nom/nom-7.1.3.crate \
+          https://static.crates.io/crates/nonzero_ext/nonzero_ext-0.3.0.crate \
+          https://static.crates.io/crates/normalize-line-endings/normalize-line-endings-0.3.0.crate \
+          https://static.crates.io/crates/notify/notify-5.2.0.crate \
+          https://static.crates.io/crates/ntapi/ntapi-0.4.1.crate \
+          https://static.crates.io/crates/num/num-0.3.1.crate \
+          https://static.crates.io/crates/num-bigint/num-bigint-0.3.3.crate \
+          https://static.crates.io/crates/num-complex/num-complex-0.3.1.crate \
+          https://static.crates.io/crates/num-derive/num-derive-0.3.3.crate \
+          https://static.crates.io/crates/num-integer/num-integer-0.1.45.crate \
+          https://static.crates.io/crates/num-iter/num-iter-0.1.43.crate \
+          https://static.crates.io/crates/num-rational/num-rational-0.3.2.crate \
+          https://static.crates.io/crates/num-traits/num-traits-0.2.17.crate \
+          https://static.crates.io/crates/num_cpus/num_cpus-1.16.0.crate \
+          https://static.crates.io/crates/objc/objc-0.2.7.crate \
+          https://static.crates.io/crates/objc_exception/objc_exception-0.1.2.crate \
+          https://static.crates.io/crates/object/object-0.32.2.crate \
+          https://static.crates.io/crates/once_cell/once_cell-1.19.0.crate \
+          https://static.crates.io/crates/oorandom/oorandom-11.1.3.crate \
+          https://static.crates.io/crates/openssl/openssl-0.10.63.crate \
+          https://static.crates.io/crates/openssl-macros/openssl-macros-0.1.1.crate \
+          https://static.crates.io/crates/openssl-probe/openssl-probe-0.1.5.crate \
+          https://static.crates.io/crates/openssl-src/openssl-src-300.2.1+3.2.0.crate \
+          https://static.crates.io/crates/openssl-sys/openssl-sys-0.9.99.crate \
+          https://static.crates.io/crates/ordered-float/ordered-float-4.2.0.crate \
+          https://static.crates.io/crates/ordered-stream/ordered-stream-0.2.0.crate \
+          https://static.crates.io/crates/os_str_bytes/os_str_bytes-6.6.1.crate \
+          https://static.crates.io/crates/parking/parking-2.2.0.crate \
+          https://static.crates.io/crates/parking_lot/parking_lot-0.11.2.crate \
+          https://static.crates.io/crates/parking_lot/parking_lot-0.12.1.crate \
+          https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.8.6.crate \
+          https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.9.9.crate \
+          https://static.crates.io/crates/paste/paste-1.0.14.crate \
+          https://static.crates.io/crates/pem/pem-3.0.3.crate \
+          https://static.crates.io/crates/percent-encoding/percent-encoding-2.3.1.crate \
+          https://static.crates.io/crates/pest/pest-2.7.6.crate \
+          https://static.crates.io/crates/pest_derive/pest_derive-2.7.6.crate \
+          https://static.crates.io/crates/pest_generator/pest_generator-2.7.6.crate \
+          https://static.crates.io/crates/pest_meta/pest_meta-2.7.6.crate \
+          https://static.crates.io/crates/phf/phf-0.11.2.crate \
+          https://static.crates.io/crates/phf_codegen/phf_codegen-0.11.2.crate \
+          https://static.crates.io/crates/phf_generator/phf_generator-0.11.2.crate \
+          https://static.crates.io/crates/phf_macros/phf_macros-0.11.2.crate \
+          https://static.crates.io/crates/phf_shared/phf_shared-0.11.2.crate \
+          https://static.crates.io/crates/pin-project/pin-project-1.1.4.crate \
+          https://static.crates.io/crates/pin-project-internal/pin-project-internal-1.1.4.crate \
+          https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.13.crate \
+          https://static.crates.io/crates/pin-utils/pin-utils-0.1.0.crate \
+          https://static.crates.io/crates/piper/piper-0.2.1.crate \
+          https://static.crates.io/crates/pkg-config/pkg-config-0.3.29.crate \
+          https://static.crates.io/crates/plist/plist-1.6.0.crate \
+          https://static.crates.io/crates/plotters/plotters-0.3.5.crate \
+          https://static.crates.io/crates/plotters-backend/plotters-backend-0.3.5.crate \
+          https://static.crates.io/crates/plotters-svg/plotters-svg-0.3.5.crate \
+          https://static.crates.io/crates/png/png-0.17.11.crate \
+          https://static.crates.io/crates/polling/polling-2.8.0.crate \
+          https://static.crates.io/crates/polling/polling-3.3.2.crate \
+          https://static.crates.io/crates/powerfmt/powerfmt-0.2.0.crate \
+          https://static.crates.io/crates/ppv-lite86/ppv-lite86-0.2.17.crate \
+          https://static.crates.io/crates/predicates/predicates-3.1.0.crate \
+          https://static.crates.io/crates/predicates-core/predicates-core-1.0.6.crate \
+          https://static.crates.io/crates/predicates-tree/predicates-tree-1.0.9.crate \
+          https://static.crates.io/crates/presser/presser-0.3.1.crate \
+          https://static.crates.io/crates/proc-macro-crate/proc-macro-crate-1.3.1.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.78.crate \
+          https://static.crates.io/crates/profiling/profiling-1.0.13.crate \
+          https://static.crates.io/crates/pulldown-cmark/pulldown-cmark-0.9.6.crate \
+          https://static.crates.io/crates/pure-rust-locales/pure-rust-locales-0.7.0.crate \
+          https://static.crates.io/crates/qoi/qoi-0.4.1.crate \
+          https://static.crates.io/crates/quick-xml/quick-xml-0.30.0.crate \
+          https://static.crates.io/crates/quick-xml/quick-xml-0.31.0.crate \
+          https://static.crates.io/crates/quote/quote-1.0.35.crate \
+          https://static.crates.io/crates/rand/rand-0.8.5.crate \
+          https://static.crates.io/crates/rand_chacha/rand_chacha-0.3.1.crate \
+          https://static.crates.io/crates/rand_core/rand_core-0.6.4.crate \
+          https://static.crates.io/crates/range-alloc/range-alloc-0.1.3.crate \
+          https://static.crates.io/crates/raw-window-handle/raw-window-handle-0.5.2.crate \
+          https://static.crates.io/crates/rayon/rayon-1.8.1.crate \
+          https://static.crates.io/crates/rayon-core/rayon-core-1.12.1.crate \
+          https://static.crates.io/crates/rcgen/rcgen-0.12.1.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.2.16.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.4.1.crate \
+          https://static.crates.io/crates/redox_users/redox_users-0.4.4.crate \
+          https://static.crates.io/crates/regex/regex-1.10.3.crate \
+          https://static.crates.io/crates/regex-automata/regex-automata-0.1.10.crate \
+          https://static.crates.io/crates/regex-automata/regex-automata-0.4.5.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.2.crate \
+          https://static.crates.io/crates/relative-path/relative-path-1.9.2.crate \
+          https://static.crates.io/crates/renderdoc-sys/renderdoc-sys-1.0.0.crate \
+          https://static.crates.io/crates/reqwest/reqwest-0.11.23.crate \
+          https://static.crates.io/crates/resize/resize-0.5.5.crate \
+          https://static.crates.io/crates/rgb/rgb-0.8.37.crate \
+          https://static.crates.io/crates/ring/ring-0.17.7.crate \
+          https://static.crates.io/crates/rle-decode-fast/rle-decode-fast-1.0.3.crate \
+          https://static.crates.io/crates/rstest/rstest-0.18.2.crate \
+          https://static.crates.io/crates/rstest_macros/rstest_macros-0.18.2.crate \
+          https://static.crates.io/crates/rusqlite/rusqlite-0.27.0.crate \
+          https://static.crates.io/crates/rustc-demangle/rustc-demangle-0.1.23.crate \
+          https://static.crates.io/crates/rustc-hash/rustc-hash-1.1.0.crate \
+          https://static.crates.io/crates/rustc_version/rustc_version-0.4.0.crate \
+          https://static.crates.io/crates/rustix/rustix-0.37.27.crate \
+          https://static.crates.io/crates/rustix/rustix-0.38.30.crate \
+          https://static.crates.io/crates/ryu/ryu-1.0.16.crate \
+          https://static.crates.io/crates/safemem/safemem-0.3.3.crate \
+          https://static.crates.io/crates/same-file/same-file-1.0.6.crate \
+          https://static.crates.io/crates/schannel/schannel-0.1.23.crate \
+          https://static.crates.io/crates/scoped-tls/scoped-tls-1.0.1.crate \
+          https://static.crates.io/crates/scopeguard/scopeguard-1.2.0.crate \
+          https://static.crates.io/crates/security-framework/security-framework-2.9.2.crate \
+          https://static.crates.io/crates/security-framework-sys/security-framework-sys-2.9.1.crate \
+          https://static.crates.io/crates/semver/semver-0.11.0.crate \
+          https://static.crates.io/crates/semver/semver-1.0.21.crate \
+          https://static.crates.io/crates/semver-parser/semver-parser-0.10.2.crate \
+          https://static.crates.io/crates/serde/serde-1.0.196.crate \
+          https://static.crates.io/crates/serde_cbor/serde_cbor-0.11.2.crate \
+          https://static.crates.io/crates/serde_derive/serde_derive-1.0.196.crate \
+          https://static.crates.io/crates/serde_json/serde_json-1.0.113.crate \
+          https://static.crates.io/crates/serde_repr/serde_repr-0.1.18.crate \
+          https://static.crates.io/crates/serde_spanned/serde_spanned-0.6.5.crate \
+          https://static.crates.io/crates/serde_urlencoded/serde_urlencoded-0.7.1.crate \
+          https://static.crates.io/crates/serde_with/serde_with-2.3.3.crate \
+          https://static.crates.io/crates/serde_with_macros/serde_with_macros-2.3.3.crate \
+          https://static.crates.io/crates/serde_yaml/serde_yaml-0.9.31.crate \
+          https://static.crates.io/crates/serial/serial-0.4.0.crate \
+          https://static.crates.io/crates/serial-core/serial-core-0.4.0.crate \
+          https://static.crates.io/crates/serial-unix/serial-unix-0.4.0.crate \
+          https://static.crates.io/crates/serial-windows/serial-windows-0.4.0.crate \
+          https://static.crates.io/crates/sha1/sha1-0.10.6.crate \
+          https://static.crates.io/crates/sha2/sha2-0.10.8.crate \
+          https://static.crates.io/crates/shared_library/shared_library-0.1.9.crate \
+          https://static.crates.io/crates/shell-words/shell-words-1.1.0.crate \
+          https://static.crates.io/crates/shlex/shlex-1.3.0.crate \
+          https://static.crates.io/crates/signal-hook/signal-hook-0.3.17.crate \
+          https://static.crates.io/crates/signal-hook-registry/signal-hook-registry-1.4.1.crate \
+          https://static.crates.io/crates/simd-adler32/simd-adler32-0.3.7.crate \
+          https://static.crates.io/crates/siphasher/siphasher-0.3.11.crate \
+          https://static.crates.io/crates/slab/slab-0.4.9.crate \
+          https://static.crates.io/crates/slotmap/slotmap-1.0.7.crate \
+          https://static.crates.io/crates/smallvec/smallvec-1.13.1.crate \
+          https://static.crates.io/crates/smawk/smawk-0.3.2.crate \
+          https://static.crates.io/crates/smithay-client-toolkit/smithay-client-toolkit-0.16.1.crate \
+          https://static.crates.io/crates/smol/smol-1.3.0.crate \
+          https://static.crates.io/crates/smol-potat/smol-potat-1.1.2.crate \
+          https://static.crates.io/crates/smol-potat-macro/smol-potat-macro-0.6.0.crate \
+          https://static.crates.io/crates/socket2/socket2-0.4.10.crate \
+          https://static.crates.io/crates/socket2/socket2-0.5.5.crate \
+          https://static.crates.io/crates/spa/spa-0.3.1.crate \
+          https://static.crates.io/crates/spin/spin-0.9.8.crate \
+          https://static.crates.io/crates/spirv/spirv-0.2.0+1.5.4.crate \
+          https://static.crates.io/crates/sqlite-cache/sqlite-cache-0.1.3.crate \
+          https://static.crates.io/crates/ssh2/ssh2-0.9.4.crate \
+          https://static.crates.io/crates/starship-battery/starship-battery-0.7.9.crate \
+          https://static.crates.io/crates/static_assertions/static_assertions-1.1.0.crate \
+          https://static.crates.io/crates/strict-num/strict-num-0.1.1.crate \
+          https://static.crates.io/crates/strsim/strsim-0.10.0.crate \
+          https://static.crates.io/crates/svg_fmt/svg_fmt-0.4.1.crate \
+          https://static.crates.io/crates/syn/syn-1.0.109.crate \
+          https://static.crates.io/crates/syn/syn-2.0.48.crate \
+          https://static.crates.io/crates/system-configuration/system-configuration-0.5.1.crate \
+          https://static.crates.io/crates/system-configuration-sys/system-configuration-sys-0.5.0.crate \
+          https://static.crates.io/crates/takeable-option/takeable-option-0.5.0.crate \
+          https://static.crates.io/crates/tar/tar-0.4.40.crate \
+          https://static.crates.io/crates/tempfile/tempfile-3.9.0.crate \
+          https://static.crates.io/crates/term_size/term_size-0.3.2.crate \
+          https://static.crates.io/crates/termcolor/termcolor-1.4.1.crate \
+          https://static.crates.io/crates/terminal_size/terminal_size-0.2.6.crate \
+          https://static.crates.io/crates/terminal_size/terminal_size-0.3.0.crate \
+          https://static.crates.io/crates/terminfo/terminfo-0.8.0.crate \
+          https://static.crates.io/crates/termios/termios-0.2.2.crate \
+          https://static.crates.io/crates/termios/termios-0.3.3.crate \
+          https://static.crates.io/crates/termtree/termtree-0.4.1.crate \
+          https://static.crates.io/crates/textwrap/textwrap-0.11.0.crate \
+          https://static.crates.io/crates/textwrap/textwrap-0.16.0.crate \
+          https://static.crates.io/crates/thiserror/thiserror-1.0.56.crate \
+          https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.56.crate \
+          https://static.crates.io/crates/thousands/thousands-0.2.0.crate \
+          https://static.crates.io/crates/thread_local/thread_local-1.1.7.crate \
+          https://static.crates.io/crates/tiff/tiff-0.9.1.crate \
+          https://static.crates.io/crates/time/time-0.3.31.crate \
+          https://static.crates.io/crates/time-core/time-core-0.1.2.crate \
+          https://static.crates.io/crates/time-macros/time-macros-0.2.16.crate \
+          https://static.crates.io/crates/tiny-skia/tiny-skia-0.11.3.crate \
+          https://static.crates.io/crates/tiny-skia-path/tiny-skia-path-0.11.3.crate \
+          https://static.crates.io/crates/tinytemplate/tinytemplate-1.2.1.crate \
+          https://static.crates.io/crates/tinyvec/tinyvec-1.6.0.crate \
+          https://static.crates.io/crates/tinyvec_macros/tinyvec_macros-0.1.1.crate \
+          https://static.crates.io/crates/tokio/tokio-1.35.1.crate \
+          https://static.crates.io/crates/tokio-macros/tokio-macros-2.2.0.crate \
+          https://static.crates.io/crates/tokio-native-tls/tokio-native-tls-0.3.1.crate \
+          https://static.crates.io/crates/tokio-util/tokio-util-0.7.10.crate \
+          https://static.crates.io/crates/toml/toml-0.5.11.crate \
+          https://static.crates.io/crates/toml/toml-0.8.8.crate \
+          https://static.crates.io/crates/toml_datetime/toml_datetime-0.6.5.crate \
+          https://static.crates.io/crates/toml_edit/toml_edit-0.19.15.crate \
+          https://static.crates.io/crates/toml_edit/toml_edit-0.21.0.crate \
+          https://static.crates.io/crates/tower-service/tower-service-0.3.2.crate \
+          https://static.crates.io/crates/tracing/tracing-0.1.40.crate \
+          https://static.crates.io/crates/tracing-attributes/tracing-attributes-0.1.27.crate \
+          https://static.crates.io/crates/tracing-core/tracing-core-0.1.32.crate \
+          https://static.crates.io/crates/try-lock/try-lock-0.2.5.crate \
+          https://static.crates.io/crates/typenum/typenum-1.17.0.crate \
+          https://static.crates.io/crates/ucd-trie/ucd-trie-0.1.6.crate \
+          https://static.crates.io/crates/uds_windows/uds_windows-1.1.0.crate \
+          https://static.crates.io/crates/unicase/unicase-2.7.0.crate \
+          https://static.crates.io/crates/unicode-bidi/unicode-bidi-0.3.15.crate \
+          https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.12.crate \
+          https://static.crates.io/crates/unicode-linebreak/unicode-linebreak-0.1.5.crate \
+          https://static.crates.io/crates/unicode-normalization/unicode-normalization-0.1.22.crate \
+          https://static.crates.io/crates/unicode-segmentation/unicode-segmentation-1.10.1.crate \
+          https://static.crates.io/crates/unicode-width/unicode-width-0.1.11.crate \
+          https://static.crates.io/crates/unicode-xid/unicode-xid-0.2.4.crate \
+          https://static.crates.io/crates/unsafe-libyaml/unsafe-libyaml-0.2.10.crate \
+          https://static.crates.io/crates/untrusted/untrusted-0.9.0.crate \
+          https://static.crates.io/crates/uom/uom-0.30.0.crate \
+          https://static.crates.io/crates/url/url-2.5.0.crate \
+          https://static.crates.io/crates/utf8parse/utf8parse-0.2.1.crate \
+          https://static.crates.io/crates/uuid/uuid-1.7.0.crate \
+          https://static.crates.io/crates/varbincode/varbincode-0.1.0.crate \
+          https://static.crates.io/crates/vcpkg/vcpkg-0.2.15.crate \
+          https://static.crates.io/crates/version_check/version_check-0.9.4.crate \
+          https://static.crates.io/crates/vswhom/vswhom-0.1.0.crate \
+          https://static.crates.io/crates/vswhom-sys/vswhom-sys-0.1.2.crate \
+          https://static.crates.io/crates/waker-fn/waker-fn-1.1.1.crate \
+          https://static.crates.io/crates/walkdir/walkdir-2.4.0.crate \
+          https://static.crates.io/crates/want/want-0.3.1.crate \
+          https://static.crates.io/crates/wasi/wasi-0.11.0+wasi-snapshot-preview1.crate \
+          https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.90.crate \
+          https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.90.crate \
+          https://static.crates.io/crates/wasm-bindgen-futures/wasm-bindgen-futures-0.4.40.crate \
+          https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.90.crate \
+          https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.90.crate \
+          https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.90.crate \
+          https://static.crates.io/crates/wayland-client/wayland-client-0.29.5.crate \
+          https://static.crates.io/crates/wayland-commons/wayland-commons-0.29.5.crate \
+          https://static.crates.io/crates/wayland-cursor/wayland-cursor-0.29.5.crate \
+          https://static.crates.io/crates/wayland-egl/wayland-egl-0.29.5.crate \
+          https://static.crates.io/crates/wayland-protocols/wayland-protocols-0.29.5.crate \
+          https://static.crates.io/crates/wayland-scanner/wayland-scanner-0.29.5.crate \
+          https://static.crates.io/crates/wayland-sys/wayland-sys-0.29.5.crate \
+          https://static.crates.io/crates/web-sys/web-sys-0.3.64.crate \
+          https://static.crates.io/crates/weezl/weezl-0.1.8.crate \
+          https://static.crates.io/crates/wgpu/wgpu-0.18.0.crate \
+          https://static.crates.io/crates/wgpu-core/wgpu-core-0.18.1.crate \
+          https://static.crates.io/crates/wgpu-hal/wgpu-hal-0.18.1.crate \
+          https://static.crates.io/crates/wgpu-types/wgpu-types-0.18.0.crate \
+          https://static.crates.io/crates/which/which-5.0.0.crate \
+          https://static.crates.io/crates/whoami/whoami-1.4.1.crate \
+          https://static.crates.io/crates/widestring/widestring-1.0.2.crate \
+          https://static.crates.io/crates/winapi/winapi-0.3.9.crate \
+          https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi-util/winapi-util-0.1.6.crate \
+          https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/windows/windows-0.33.0.crate \
+          https://static.crates.io/crates/windows/windows-0.51.1.crate \
+          https://static.crates.io/crates/windows-core/windows-core-0.51.1.crate \
+          https://static.crates.io/crates/windows-core/windows-core-0.52.0.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.45.0.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.48.0.crate \
+          https://static.crates.io/crates/windows-sys/windows-sys-0.52.0.crate \
+          https://static.crates.io/crates/windows-targets/windows-targets-0.42.2.crate \
+          https://static.crates.io/crates/windows-targets/windows-targets-0.48.5.crate \
+          https://static.crates.io/crates/windows-targets/windows-targets-0.52.0.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.42.2.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.48.5.crate \
+          https://static.crates.io/crates/windows_aarch64_gnullvm/windows_aarch64_gnullvm-0.52.0.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.33.0.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.42.2.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.48.5.crate \
+          https://static.crates.io/crates/windows_aarch64_msvc/windows_aarch64_msvc-0.52.0.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.33.0.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.42.2.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.48.5.crate \
+          https://static.crates.io/crates/windows_i686_gnu/windows_i686_gnu-0.52.0.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.33.0.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.42.2.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.48.5.crate \
+          https://static.crates.io/crates/windows_i686_msvc/windows_i686_msvc-0.52.0.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.33.0.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.42.2.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_gnu/windows_x86_64_gnu-0.52.0.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.42.2.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.52.0.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.33.0.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.42.2.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.5.crate \
+          https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.52.0.crate \
+          https://static.crates.io/crates/winnow/winnow-0.5.35.crate \
+          https://static.crates.io/crates/winreg/winreg-0.10.1.crate \
+          https://static.crates.io/crates/winreg/winreg-0.50.0.crate \
+          https://static.crates.io/crates/wio/wio-0.2.2.crate \
+          https://static.crates.io/crates/x11/x11-2.21.0.crate \
+          https://static.crates.io/crates/xattr/xattr-1.3.1.crate \
+          https://static.crates.io/crates/xcb/xcb-1.3.0.crate \
+          https://static.crates.io/crates/xcursor/xcursor-0.3.5.crate \
+          https://static.crates.io/crates/xdg-home/xdg-home-1.0.0.crate \
+          https://static.crates.io/crates/xkbcommon/xkbcommon-0.7.0.crate \
+          https://static.crates.io/crates/xkeysym/xkeysym-0.2.0.crate \
+          https://static.crates.io/crates/xml-rs/xml-rs-0.8.19.crate \
+          https://static.crates.io/crates/yaml-rust/yaml-rust-0.4.5.crate \
+          https://static.crates.io/crates/yasna/yasna-0.5.2.crate \
+          https://static.crates.io/crates/zbus/zbus-3.14.1.crate \
+          https://static.crates.io/crates/zbus_macros/zbus_macros-3.14.1.crate \
+          https://static.crates.io/crates/zbus_names/zbus_names-2.6.0.crate \
+          https://static.crates.io/crates/zerocopy/zerocopy-0.7.32.crate \
+          https://static.crates.io/crates/zerocopy-derive/zerocopy-derive-0.7.32.crate \
+          https://static.crates.io/crates/zstd/zstd-0.11.2+zstd.1.5.2.crate \
+          https://static.crates.io/crates/zstd-safe/zstd-safe-5.0.2+zstd.1.5.2.crate \
+          https://static.crates.io/crates/zstd-sys/zstd-sys-2.0.9+zstd.1.5.5.crate \
+          https://static.crates.io/crates/zune-inflate/zune-inflate-0.2.54.crate \
+          https://static.crates.io/crates/zvariant/zvariant-3.15.0.crate \
+          https://static.crates.io/crates/zvariant_derive/zvariant_derive-3.15.0.crate \
+          https://static.crates.io/crates/zvariant_utils/zvariant_utils-1.0.1.crate"
+MD5SUM="da014a91bf67d58076fa446e91a47fae \
+        695b66f27dd3abbddce526e0b5aef74f \
+        0095d2d2d1f3442ce1318336637b695f \
+        be0fd7ed978023dbc6dfb0485ed7ae64 \
+        02e40b0f03633461d521d90bbd4d622e \
+        5eb2e09ac813c6a57cd45ab93f69f5ad \
+        f5ad6d69842265a1becc4eb3efb7ec77 \
+        55e15000c4c210f0bb2aca6f38fbe424 \
+        669215548c64019c08c92b2c1afd3deb \
+        d5898ddb1e496ff0ac50b79829311e76 \
+        9651c5e4f543baa1936451ff40d8a322 \
+        1e5f1d1c6887e4b84ae33559faec5fa7 \
+        95e5f8d0b7ab37171b8d3118542ba06a \
+        a2d3656a58d89472063fd35db901f137 \
+        e0a03581a6aea080315323651f272d65 \
+        bf23cd323c33a8c283c41bb9b79e4ce4 \
+        a5edbb16fb71d6000e6978cba3dbce14 \
+        4b4d7f148688efba960f4fbf13445101 \
+        bcca84e8c81f65d826523a3fcd396789 \
+        e188f6de00a35235da008cd39e1a003d \
+        b06d6c6d9a7bdcdd9bf78f20f2d08f01 \
+        87cc1a50f0dcc09d7223df42eae95119 \
+        707d92b6f4d9920a0b25f69f5291c826 \
+        ff41a5b5c2364747a7ff11f6bdeee406 \
+        504b5d258d68bdb980c997b93f0c6e6e \
+        7646c7582d8b97443a94c12d30e60d99 \
+        dbf871d55f2835246dfc8d293ed589d7 \
+        7c8f8c974b5c80a011699a5dbd91d67b \
+        0a9683d589167088b7d5519666a5e326 \
+        a0d6ed43a08cf8e4f459123d1e51c644 \
+        8fa38e264ddc4db9f7d9a10bd621f5b4 \
+        60e2db3f9e5fd2e325f5a28f6ced0cc8 \
+        42908f71e8d117a5e514de14d1bf5963 \
+        85e67aace07fa2fc176e690c75109365 \
+        d63a2ab8c4c66f06878a96ceea4feca0 \
+        f50aaa27a2bbd416782ea6b61cd81315 \
+        559877ca7fc385e26a5254e7419412c6 \
+        ad9b12a40171febc113a87c3d2c12e6e \
+        bf10e845ce70eb1feb9bbc05b6d4d7be \
+        8bca24dc9cea888011800d36f762a396 \
+        bebdbb31b24c90e4fdc7968e49ae1878 \
+        4acda95b55f5362a5c53a26cf076161f \
+        3ea0c87cfee0860b38e12742efe2dc17 \
+        c4dd9f7ee3c09dcc0396ff0022907074 \
+        6a44afda654777d2930b93366bdfc7f3 \
+        142cb4b9a653e56e56311f0c883b8582 \
+        05d77ef52e90ad161fdd41b252420467 \
+        a5835e403734b7b881048fc30a254454 \
+        66c5beb5a77eccb0d86ce626651f393b \
+        3d192a852cb456a965c5d64db624c915 \
+        5a5f45206802441161524e1be576da1f \
+        ca7405e2031b9fccfbedacd28687d199 \
+        b174984f0ec889f5c32e90bddb80f674 \
+        45a867175c81501378699f80724393c0 \
+        521abf54ccebb983d14c40f47a908a97 \
+        a295edb6953237ebbdfa8e731229f9a3 \
+        fcc84166b0f45067743bd0820f1d92e5 \
+        ea2d23ceb9f98853a7dffc6c02884464 \
+        023b03cf9968b29253a5dfe62051008d \
+        e4c2006f438a7eeace52a686a4d90d79 \
+        bdd0cb583407668640d0429cc673162e \
+        20f5631bb8dce73c1388fd70feb9192a \
+        d8cacbb844fca8c0ca102c7576946131 \
+        c4fae13a1010d1808e0a0b8df334106e \
+        888aa57b8e44b519111814536f8e09bf \
+        45339d90b2b3a4f123af5ec459954102 \
+        51ed49380bb7d086c005208e805983b2 \
+        b2ce641bbe33f8abcf5d2e1d46e89344 \
+        86af8d8f378d997f6fde77fc5c33f557 \
+        2c186ae5cf4d2d548d0f1cc901111e69 \
+        f686e99053239b98e9aca46c3e06c6f9 \
+        9241fa90ea8b17c00010be46c9aa1ac5 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        5739f950bcce803d986d189b128861b0 \
+        7a0c18114379608274b4e30e36d5bf5c \
+        4d2c28da884edabfe980fba47fa94320 \
+        8c0f8406dac1f424be269365c8b59111 \
+        d04455148fcb2108d061500a6144eb86 \
+        59ae9122b2946d4d52bc48a1da5c5e06 \
+        f74bde8201e1c944db1108f1014dfb8e \
+        6230cff5fdde45d45e4aa7090a42d433 \
+        b61d730801d64819497125178ed37d95 \
+        bc88ae08f6b9c6dbf2ee0cd823219871 \
+        8ea5e7f9035c435ad1c4ecd0c119ce54 \
+        08b9a34eadbb01ac16e36694e53eb254 \
+        a2e1b64489b6bdae548ec08f883eaecf \
+        8f177f61a37d63f805acb925b30a0e58 \
+        eb6e4217d79aefec36a4d1068b4ae278 \
+        ba429acd253b580c5a8eead20dc5439b \
+        d8424867e97cd067b3d96929f845d546 \
+        c9ea02f41a58ccc02bf4bbe6c73f9085 \
+        faa32da3be14130a4525bb7ba601c62e \
+        ee1260862a62c0d8824b664a1abda7b8 \
+        010f6d0e98cc2a2b99907a23c6cd6bbc \
+        c121fa1ae439cb2ba3bea9446b57de91 \
+        a5027128be1d4cf8495c2a7465b4fa05 \
+        1a6f3f4b357455b8e4e1f3687f16b52f \
+        59f76ae1c7d7e09a434e1d4f086a7e39 \
+        59e2ac3afb27356dae5b252b6792e73c \
+        f0682cfdc40af509c98f46f6350c1ba5 \
+        4d7e3bc6c42f8a875a87246ed14d9948 \
+        9754db1eb3e8b15807f05a3540d2ab39 \
+        d7624e4ff046ae83eda8e82d90887bdb \
+        26e66e8b2c52fdbc7bc466aec5608712 \
+        1f2aefb269a8a9d8a86160c67a10c0b0 \
+        58ee9a40577f5086ec1f22dc238b9c60 \
+        407b8e24ec9b7a2921414e8e22267d45 \
+        db8e2dc37d47edb8a35fc2ec560a15c7 \
+        162407e4c09897085d00344230f375a0 \
+        a9d6492a1bd21d93dbc27c32eabd0c70 \
+        32be72017e0ba32fa8fcf0caf00f485a \
+        cda939889f8a6ccc34cce6e8e510569d \
+        d3046451ef675b277062ea31ee34e55d \
+        4cb359fe1ce3ec8463a78cabc468037e \
+        852778f7d6efdb9009f9539bf1966b29 \
+        4093130fbcb4cc266e967cf25d744db8 \
+        396f4f63322338c26d76b2f638646178 \
+        44505199ec0964feb5488051b4ac92d5 \
+        8479d87e6c3e396334e8701475e085bf \
+        398f4cce1d3067cc7a56662e52a33384 \
+        32e5a346cb92729cf6c2d8d0e8202c73 \
+        89e88633cab0e4b6f3d3878b84dffe8b \
+        8576051f11e476ef4969afd07b9336c5 \
+        73172b0f30760db4394e2055ed807f4e \
+        78268e46c45706dae81c672ce95a1043 \
+        7e46da183fa5decf78c4f8ac725a25f4 \
+        eac471e90594669e38fc4c750396e80b \
+        fe7fe37249fdf14782b21191485399e9 \
+        5778ab8b55e25e2fbdac8263f1e10584 \
+        7a48ed333e568a92a4e85bfb4923acf1 \
+        51773970fa42f802815cb95b727d368d \
+        013112337737bd795953c7e311e99d7b \
+        d022bc79e1931c2bd4ebbe65cf3d2309 \
+        59978ef7bcea7bc55e24d06a2d32a32c \
+        846c4b0106cc5e90efcf8f31a75a1c4b \
+        434e2423f372fed80f69ed8873fdd2a3 \
+        bebc8338ae113a87a04564c97c1e3f0c \
+        3d62bfbbe08bdcee55fcb8cda85554d9 \
+        889fdcd1499ef5939caaafab5c09729e \
+        3681f813c502d911e9eea940dddd26a5 \
+        4c21da37e71a52f26c8c5490f3ec4837 \
+        056c8d712ee146347c412b72f4077b2f \
+        7c8ef8b5fc652fa97d3629d1ec8b18e8 \
+        dd1e49c76e9d5853e673a3b41ba02917 \
+        09b520d03e86d50e3ac39d856d5aec32 \
+        a1544bff9ea95274369bf38508f8266a \
+        3c3ab76bd9ed94de350152f1af4c61e8 \
+        0f0e1711014abcbc3cf31c4b249bc7bc \
+        e0bce212371ff3e7a36f2c4c51754c1e \
+        5f9a3a8b7213c055342b2f423a213b3a \
+        805fe68ea5f53a2ac1e83cc5a7185244 \
+        402bca18e24e5ee8e11132d2487b889c \
+        388c77658c34d64fc273b19b0d1b5ac7 \
+        58e8b1a054114f5be68ae0f1a65d25d7 \
+        955bb3f01413f4ea8fbaf6a523890178 \
+        364a9dfc824d00e75cdd554470527c19 \
+        bdf329a72ecd0605c296f25e53136706 \
+        349e0ae5420f0b7e6ff835cd03cc7428 \
+        dcaeb9aea867bc7f8e79abe6e385446f \
+        65934957ea79137686ded549467e1329 \
+        d35d620cdadc14088709fa48f53a6001 \
+        91b29dfbb9dfe1320493e45f3e27a89f \
+        44e892b391b9b0b73c12e579da410648 \
+        060466dc8b71e71789cf55c04cb42dc6 \
+        e43e22ba1741e5cfa00482591ae324c7 \
+        7543e8639ad2e29866b522e20c35152a \
+        b02aa8103c4fc902751fd580043943f1 \
+        06e723078de46119c270eea21ec4344e \
+        80e1c1b89d858c93fc5946b4a8266504 \
+        b1e2ff2b24e7c0840bb0cb1174beedfd \
+        575b166f2df3a2e10806a3089769759b \
+        bc4c2f203d616e83fae2c9648578c618 \
+        34a112781d26301fa8b3628087a905bd \
+        ebe35f0531749fa497ca3d453e4e57c8 \
+        a1e1c92075e77d61acf61a094a68fa61 \
+        110e56f20886997bc288b6fea8617ce1 \
+        94f11861c538d1a2fd56c86d140e4358 \
+        8701f92ac138af6c3972bf8d1a8bd5fa \
+        2c9754b065f8893f33da00711a2a03dd \
+        8dab3b3ec00dc56cffde0b0c410d47b5 \
+        78c898fdaa3968e23904bf8538c4a271 \
+        24210500b0b946ed658dd20037cdf5b4 \
+        38f845b095b4ca30f93e034c7bd5ab14 \
+        667e86b8b8d96ab4e9605627ce7dcc9a \
+        0b1834c2de5aeb930998c0f41e1e5ac7 \
+        c3e51926c9853b714191ef1bec90e2ce \
+        724696d583d5c24321c62a5e443d241f \
+        b4da4608c9fa5193dc25539c7677ac6a \
+        f6af880cfdb0c579b698586d841c664b \
+        44df381323008413e1624a79c6975ca8 \
+        9633f45ef555c994bba8f8ad04735fff \
+        bb90dd58c7107a6f586b04588404b0ff \
+        c5aab47b001d43b71b542984f783b4b3 \
+        a7253a50bf5054e85dae5bd8aae62bf2 \
+        c410caa0c9f52fcf9da29688e3ea2974 \
+        163296a9672a36cb46d9a78bae592c66 \
+        259efb88f74fd1612ea748f3347ff56d \
+        23e8b9cc40cb6247022c1265fb95505b \
+        e667ddded881e4892208a3ea7087c655 \
+        39767ee14933b0006f02f295314668af \
+        64a6d8fe0c9a450bcefa41894e17d7ac \
+        cbb52c723c94c83804912cde945b4510 \
+        c3ec5977ecc0f6244ef3be87f5325e72 \
+        ba5684833f6b40a3aa32ae4989c40f79 \
+        5e2a09fb91d9ed36ce153664a54ea3ff \
+        fbc6f6d82084b19c006198508b1ac489 \
+        2c94354dff5ae2870327df7b15fd6bac \
+        cd6875725af793cd82db47d68b00ee93 \
+        38be23c5509c429e6b9ea54b80fc9b14 \
+        2d6d28ec311884da69bcaf320ada8ad5 \
+        423ea3c18df8759400c3d0a381738c64 \
+        7b8257e056ddd1633f8526e8492fb831 \
+        482961c4aed3db614324032662d15ccd \
+        8f6832ae66ce3c13c0f5da9f585f60e8 \
+        f33ee076284835df275adfb867b84fdf \
+        7408001e14fa57680e29eed3f8bf866e \
+        c6d40d9ee992d3e513752fc18aeb8da9 \
+        824e8bcdf5e5c144a5bf939d10a73614 \
+        fe4d88efd7c9e240bde1b4169b32cb78 \
+        2c0b1ffed05d506bf3f9000e001266fd \
+        9b51229ae5911be636cf3736bc0aa3ec \
+        f8d17c98def1d7d057d2f5da3d29bc9b \
+        fea840ce07a32bdace46c59c41362f3b \
+        1c5130ef94d44cec6f63f13c80ae6ece \
+        62b3edf8c2db7fccb1a6a41134b84e62 \
+        1b41b97d982520b7364a87a39e2a1ed8 \
+        d88bf8eec9baf123a8a829615b06fd0d \
+        3451a2e54a12d567bbb1bf2815aedc37 \
+        2d3a03453ad32f77cc226e4be25444e5 \
+        435c94888b3835d9e1476219cd0a6c76 \
+        556480914365c515118df88b57972f87 \
+        b92fa50f56a1e06a7f1bf665442d4a73 \
+        0b7994d1256215201bdfb810a357ffa2 \
+        186aa8c881ed98f450b1471ec18dba5f \
+        1d3e530a3410fc95a6987d70f84a6332 \
+        c840150c8fa6e192f8c6ad34cba5eb65 \
+        d81f9251921f8a289dcf69fe4ccc3788 \
+        d15066ccf2d33bbd8afdb9036ba47da5 \
+        de2b70e20ea3a85c7b92b356869a47f1 \
+        54cbd8850aebe933b8f1214d8e916d1e \
+        b653d3b4ba8cce61a8b0994cf415d7a5 \
+        92968aee56cb2f162a55008fedddbb78 \
+        580b311bafe0447ebc9ca2e646d9b0e7 \
+        26570de3ac165280c441fb77ecd68ede \
+        c01022fe0357c10ca1d48b16187f81bd \
+        4b1be643ffa9aa296972683f97bb34bf \
+        6540f0c2d7dce570f06661292fc68cab \
+        0a5a704f263144f17b1493d3303c371e \
+        87b1b7cb12ef4dfe842c212b98263048 \
+        fe77a3f609b6fd8d5b08f3b2ef14d2ad \
+        b5305bde14813da51d536a9df564db69 \
+        b0e8879bc367bdad1fea51407ae22380 \
+        5ca7ad43fb5844f1ac5099618ffa706a \
+        11ce8b5f52cd315e8f52985b834b87eb \
+        f7211fe1c4b2de4b1e8a0c1c43dcdd96 \
+        1c69490f9cefc24e2119217039c61dda \
+        639af0cca65c012e6a028acfb657e417 \
+        5f153f7135dceb02f88266121c836b4e \
+        14857d0d864e41338320bb04a09b587e \
+        c6612f34c3ee98ced239da95fbede236 \
+        a4ef732855fb607da8e30b9a3357b315 \
+        411fc2fb6b6fac5d46a936f2d3001478 \
+        dfdd094e13ba782ccdea70f0867b66d9 \
+        20b9f5d97aaf06b0f580f12860b67ba8 \
+        0403f58e42c94609207c40a310cfe78a \
+        9aaf13d622cd02548feaaca35687da9c \
+        df8968a2a066697d5ccb744045c09c7f \
+        857401353f378f986e6d06856a44e1a2 \
+        1ad91393b8940f75e53dc776cf1818cc \
+        4cbf38e0b1434a55169a339a21d4e01f \
+        8d32bb26f7c1f0bc492745a5a6201c20 \
+        8bc92e2d422193be1d498146e34a0b85 \
+        e646c59e9a7da5308afd8e43149bcfef \
+        8234d20b9a5ea5e7087bb5ddb414011c \
+        6e07b9fe1df76f96f75843ad332d4b7e \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        23cc9e52c52465f5b225e62ab7cc3457 \
+        89d8a613ac761ddcc91cbec9ef059da9 \
+        2db26dd3b5201776a36e40217bfdfe26 \
+        9260aed7d90428c1a4d04b0d0efcae47 \
+        ed1847d07bd3a49a8e1415f162a0c894 \
+        74c3a364a386680ae656adab50a7bcad \
+        bcd6b6c28ea4a619dd02a810686c49c1 \
+        ea215774b9829da196e0bf3663758db1 \
+        02e14c7718a87f6c90ba05b62fd5c706 \
+        feb5919f3a98172d047e10b0bc1ea5ae \
+        23fb13a7f6fb7b25a42d71c3bcaa5d7c \
+        4d3764b253ae871241c2f327e519f382 \
+        8a1b5da53f2f9a87ad08706ace83bf40 \
+        80451acde88f1e412d7aa60d787301f8 \
+        1f64f0626af1e4ef3a6d6580414e5505 \
+        73c81da3754295e39ea4a99517b1e794 \
+        ce87e08a8d14d9d5704664e31f87efcb \
+        651dd38020e02806ccadcc41df89c7dc \
+        e02c6b53a6d124d858ae29c3458a3692 \
+        ef352de59e1b26277213640319c87e88 \
+        18fa61f2d92d4df309c67cb3f3197987 \
+        f2d8f01a4e5c5236ab55240d09c6e82f \
+        cc1b0e90e372869ad03ef40bd53fa30f \
+        8ee79b4fe4c43d9ab09f16344612a656 \
+        058feefa4935a76dd6ae9512af8c3eef \
+        a590677a4678040dc2efb227c4ac6849 \
+        1d861298095dd8a097b28bc30ea8a07a \
+        fbf034d9ed86bbed64b0ab7c4828c26c \
+        7b3195612bc6090f0fa759e747a9e91c \
+        7c81e7a61ec172a229d6fdbc553e883d \
+        47580fad08273a52e998f84ef404912e \
+        ccc5ff9ff4a431e36c0b6dd9f640ab58 \
+        f8cc1978aae22df3e656d12810cdf994 \
+        801b74dcdd5e3ffb56e63a78d9518392 \
+        ddbd5203d6b18f74ea40a4a498cb3b83 \
+        6ee0fb0d4e89e65996d856e05f239922 \
+        67bb39571fc311c857c8b8e6c33f7906 \
+        76124c2327f642cddf19a4aa50cbcb7d \
+        48e7cc866f45af55ea3f627e29a2cd98 \
+        fb6241893b457ed69fae5c1ae19920da \
+        c4a7db25b17a6b5144981ae8fb28c919 \
+        7f7ef2d05d2abc5ab0a5cb7b290f36db \
+        e6bcb2585d27466887198696f636badc \
+        dfdf2484a5545f51cf6b1f5f23b9f92e \
+        8b708bc4b33c5e1683467444c9ed41b0 \
+        084881559fa038861d17e7b0aa76f54e \
+        eb7e04508518ed8f29935ec874e1740a \
+        75f0312c1df29f7c46d3d957d93da092 \
+        47628a42562928b85cd28cb50e08d8bb \
+        d11ba1b45f5feb9e26eb9d7bad34da39 \
+        8464ab1c43f5c74ebf49fe602d51b9ea \
+        dec9a9a7c5c6d5fb88e97e1880572f8e \
+        da09b1e851678f3dead227542b259022 \
+        28a4dbc0158bdb2fa806d97dd55fba2e \
+        790ae5bbcccc91d97517bb1bde7ecd8e \
+        e3bd46e4620b19864b2dd3542bb14c1c \
+        6a307d628f32a1522f0791053b546136 \
+        b97a98b82065343e45f160671f6ffe8e \
+        44ab2701d152b855941648698cd7a99e \
+        1ec040c5f481967b8fe8f57d40021e3e \
+        f17aecb8887cf0ecd823623160aed7db \
+        8c04e550d6feb392bb437ec2e2ab514f \
+        f9ddf92ded75c1df47b2dd1379a482fd \
+        d494bad82f8da981c14d0efec336f8d0 \
+        01c0964cfb7b3653fd6f07f2d94255a5 \
+        ebe381c6ee4281c78701e79a2cf90bc8 \
+        0ce3cb22636a6b7992a2cd5b106f54ea \
+        4b8c01a755ea55d3344d9ccb07c093ca \
+        56c34619687723fa3fc23213471e8545 \
+        073b4c53e303ccf2a807dfce7f5e986a \
+        44ef8a2279dadf391881a69c60d29197 \
+        d631c116041b5f68abc8680fa82feedf \
+        512bcd4470f351b2049adeb39cfcdec4 \
+        d443cbf9907b31a0f396fb13489d6cd0 \
+        b4dcac855af5df71f3383d86c4a96b78 \
+        8ed784b5a389926034ed8bf09fda036f \
+        0d98aaf27d3cace75f9959c04b910891 \
+        8390247ae7126c00e162732b249be9d7 \
+        6b79a1dbccc9351cbc297cfa3d98d651 \
+        2fdeee70015b6b97d8ddaeec712ca0cd \
+        28d34115cfbbe0e8f80333591f2cdd84 \
+        907244c0d3791f3f981c7cc8e4cad0a3 \
+        d0e0a4a00d5ef980888f48cf1e5b0bed \
+        1ba56c47c7d8e97da24c62f1d0dbf4d8 \
+        35a58db39adde75e17fd441035f5dbf1 \
+        481cc7357cb8bfd6a728e7b47dee84b1 \
+        99df7a151e861c988b41f2d5e8b8ca08 \
+        1c81a692573ebbe22b81c1107d0ab518 \
+        12e4ba5909e1f30b9142932571eaa4da \
+        1be45f99109d447849f4244b58c5a470 \
+        b1713fb3ae03d434680cff5fb4c14144 \
+        7502c2f15026ee3e6a01f57b92942771 \
+        1781b204ec7b6b1ef9232d429e6a973a \
+        ad44cdb87e3c0b5cd6c3f26059971546 \
+        0ba30a94d7b8865c23e86d4d64e5b91e \
+        50b6a6f9e4b7b117c0840023d40daa09 \
+        098ac4f14246b72f421bcc7ccc0b207d \
+        970531d10792503983d83208cfe3cc7e \
+        102432530c5f83b343f0719430047159 \
+        12613f90aab930b5317557b1b0a21e30 \
+        60e558c4bb478462efdb5b3a925897dc \
+        d8b1713b722c482c78ceb961cf994d38 \
+        0981e58fddd9ca649d338c51c0f4c5a4 \
+        3cbb110e799c18366fd19d05c66df6d7 \
+        35cfbf0be7d8994f2c5e6e657415235c \
+        50e02e4e92e6d5083af353fdf012ebbc \
+        ffc7c4e1b2639ba6c8579a1c47c5f97c \
+        07c75fec267864bcbb800ca7709ceae2 \
+        564286699e80741f7c24b16c9a1a5f58 \
+        c8db86a96054352dd0006f8f1c84daf6 \
+        c25f21a750f624dc078f37f9d5113e69 \
+        24171d9c31ec6e5ccb4cb2ab5494d0c0 \
+        bd8a914851fd9e6351082f98b7e7fa84 \
+        a6b32988425a3fcfa02e2330d47715a1 \
+        343d8d7b7be25966e9def95a72893926 \
+        343b2fab0e168b874bc0d070034988b5 \
+        b071197c72affb64fb3db99c31309a67 \
+        30eb4de1c1a3bd214d7649b891abf444 \
+        5c69337d37e58a380e00eac9ce0373bb \
+        c53da10df6d399239c5869a292065557 \
+        be08d75820c528ad6143e9e42efccee0 \
+        175aaa67c5c9a4c8de2b944d51d0753d \
+        800b75bba2dc1620ac98931c7b00385b \
+        b5012003220ca5bf1512946914dfe295 \
+        76570d89c59a2d7221c27bab424b299a \
+        1148019c3131495e0b5d21f758c6ee74 \
+        26687fb9d309a56ae6e71f95ce16f8ce \
+        dc298e7602ea0eef73abc8a96ee75679 \
+        a712320c0a3c6440c9a5b85cdd3f0c78 \
+        fc70d4884e65f1c29086807a9aaad534 \
+        5d249ea25d57d9e5b051a504a2f62a62 \
+        0358b31bf59c7915bb03f9e66f2d1ea3 \
+        ee7a5f842c39bc47c474196e83b0df5f \
+        e30085994bbeb4b7f4895d48216d5476 \
+        a1626b8f4d165b1b60d960862eba4cf0 \
+        2ea8b6d9814a7531509dfcb59213bc99 \
+        6150a7bb6ddc7aaa6aba6130de9fd2b8 \
+        bef9dfe51e35df0f909fb7671cf25317 \
+        7604a19f6ff2021e9fc02f9bce604494 \
+        2ef74c31969d6527edaac06b368b405c \
+        16111f31a29feae4ce4a324b83dc0189 \
+        ff1d093069cfc9eb161907e17a51208b \
+        bca57d7079177ca0aa651d452c7099fe \
+        6ddcf897328f065168420b7d4ea9d43b \
+        95f4b6766a27d814b4e54d1ccb3b7fc9 \
+        15c6f3215da128bc1e31562b8513131c \
+        91b60a71d44302a8b05bd398eca56c37 \
+        e1856fa94162ef4f6778c8398a575c3a \
+        18c4aadbf9718e9db9bd59f26022488a \
+        641efef108b91c74103cfef9fdb2c481 \
+        7f07186c7909b91b80574365ed72503f \
+        c030fc13239cdae2e725b3c78fc07c54 \
+        1ff5bbd9fa5ebc6ee449f9699c28f9ce \
+        836969c6cd8387b8937800288ebe8e91 \
+        0643d5949f80b6e187ef39a5f9a325c0 \
+        7bd723f44b24fc491c1923c7a59bc364 \
+        b88eeafde7ed6a985ec8f6cf95d419c9 \
+        24fcbc2986fad09b25c9a4f9aef0a9e4 \
+        7b1261ea730a9314bc9bcdf4a379bf98 \
+        fdf3aa5e1f6c33e4f68b0f7b08e1e94e \
+        44eb6c30c79e4213a42dc2d1c1f3d345 \
+        4a9843bceb2ffecb4c4f3befc9ce0cc9 \
+        ca664d757b2c95424cf3465e412cce90 \
+        994b165f971ecfc09dc13fca8d394691 \
+        2d8d8b377d144f5e32b4f65a69eb0b24 \
+        6a0950fa3775d755dbbdbd24a2841786 \
+        b898bcf321bba46ecd15c9279cdbb290 \
+        f1358be8c98b98837cbd2cf51e75f8b3 \
+        151939b0b34c1580b44863b7713be586 \
+        2acfe0c857811f38afc675dd79f308e2 \
+        d2cc4e584ed64165fc56d2c9081eb3ee \
+        d5a0497966ae82c3135c35dcb4adb2ce \
+        42408be0352a76b14f1e77a6b8858a77 \
+        85ef5a8271021a5dcbcac7f33231cd74 \
+        30f8c7ce8e7a3a98039d34a07556435d \
+        cb2f5953f9d61ee0824ad1eb0ef40442 \
+        30ca17ea2ef894cf98f6d2d9e97a0b47 \
+        954a19d3469bee5e680c189a1e0ecf36 \
+        fa0d5d4e1e3bd20a9ca9aef473fc3665 \
+        47151b766b6b73e638fabe6fae7b723d \
+        6dc7f4fc0fed7d7187b74e8f2977e38e \
+        d516b127a4b04ee8ed146384efac046e \
+        4ea6328eff993ba018118a36a787512b \
+        a9b06a1b8281a3b693b8f79ad58eaf1e \
+        9cea0147d1eb10e6578e7efe0e58f292 \
+        d8631e3e211e3f5f6de2827cfd59cc78 \
+        de7ee02032e90745ec668c0686e3d37f \
+        d7602381c0bc21d10603cc940a837b06 \
+        289b776935f2184c6ba2974877285013 \
+        e0a0f1fa737110ffd0b04af8d1062edd \
+        ce622fdb8d18cd1c13ed8fadc5400c10 \
+        6c623a8eed8450399ec323a72e96855c \
+        f60ab8537f924a65fbc0961e958d375b \
+        22e95901b912671da26457ac33e36a23 \
+        d0116882bd495f2b993495a8cf01f6fe \
+        6cda2bbb58357a02de1074d4ac9e3ab9 \
+        5d8c25fc51ffebca67935516c2325860 \
+        ea132e2fca43714b70161592455c5440 \
+        f50e12db5ae8860e3f067d5dcb4471a6 \
+        ea275797b6ebf7a4089a9b005ced5e6e \
+        e5eb165c50e615eca40f9c764d17727a \
+        40d4cb07c88d22975d0a19afb9b1fdf9 \
+        fad9db65f56233c9faafd9add60abdc3 \
+        fd67c6cb5a13027953feaa631e96e15e \
+        e23a09ecbf1aab486b90dfbc3bbae657 \
+        ef0a7adcab0bd982289543110cd070b4 \
+        732fc57f959b8ebb4a94c79afe3be1d3 \
+        ae0a9c293bf6cb72cd62d6b9486356c0 \
+        82964c7ec2d88e8da8ba15f622e05218 \
+        d022d2c60583626ef3612ba028943e00 \
+        cfb357477a4e3e4d6a67a40cc6d2143c \
+        6c1a7565b5e2043bb7ac6ad1cb5118b7 \
+        c9defe80406280bcfce4ecf31c0200b3 \
+        eb8ac974a85ac3219c8c66b17bf5d0f5 \
+        82d98dc87dc8503400aa095f5aa70f13 \
+        b84a9460061e023f16c5c4adc1d2e0e1 \
+        64d9f46e9ba78f68c30c486be3d8b7df \
+        5651bc86f3df47d241d2ae58dc4b89a5 \
+        d2cef4c78c44c8513136a8b07d648824 \
+        a84637b0865bd9435a575d770f4fea30 \
+        b34c70a76aafcbd42b97c9577d69950f \
+        08a17e86dfb5bf21d557636f2a545ebe \
+        646144c0ae30a40e7f346f89800632b4 \
+        73d602cc41e3e431bf4fabd129ae1616 \
+        b83e3c4eee8862b3cd0dc8570da6d0c0 \
+        1c4b4529618d2208937f63d3a4418003 \
+        b7eae58d7a80112442643ee2ff481ef7 \
+        c44750b000a2331d26e4a2a0b1c133c8 \
+        11d1a5039ed99992a6e66458d6c792d7 \
+        de58bff8ca81ad6e4401cf69d6b1ad23 \
+        b1372e62f53f0ad8d19a2be135c10c9d \
+        a8de006fe0c7e373c560dd51599287a8 \
+        9c4f3ba15578559f5c511cfc2620d0c5 \
+        b1331d546ad9e4097c50abb592251043 \
+        ca563eabbf7fc0b717b5d2bcc28ae60c \
+        eca4f78f2f4293611dccd41ad47a3be9 \
+        4375c6756918c2e9080870b4a7489d4e \
+        4d878f78fc54e274f89bd4731ae605b4 \
+        d635114cd0ad5cb7669bef8d0a86d26e \
+        7818a75208424a6d05d1d868559f0adf \
+        7f9da8cc19556449a240e51ed4dc16fd \
+        4726ea3b77caf0028375236c677e9a82 \
+        11ccfbb001a8e067c18843864e21e033 \
+        a160b14e423954c978ca95aa78ca4210 \
+        5f0470696baaa4e5953bddbf196998f9 \
+        c678a7da0ee4b850ebde0474144a0415 \
+        0ca8ac60db6a8306c05d75ab43083335 \
+        bf33e2d27126b29c8a9b1239c688a424 \
+        9e2f7831d5c7d8bd2f430984e47c3065 \
+        075e0746cd75038f031f06f1ff00e2d1 \
+        b21820f2664242498beba7783b32bef4 \
+        b7a1b93f85587ed99e0a46d141f26528 \
+        9aecd5ff283534a21d7cd51266abfe89 \
+        467f480ef05d416ac677d12315214f59 \
+        8184f2020a3a5c78844485260ec49a36 \
+        60d7c3a9f75ac64cffbb9ccda7c1c8e5 \
+        0a906c03436ec2dcc4c311c21fee0da2 \
+        9dd610282e23bbd40016697350c1babb \
+        a6655e5e9845cb569991e87b5b38a1fc \
+        6f09120aa341d58ea072539176058a00 \
+        6ebb8deee5a5a0d1c26b20eeee1926b3 \
+        b35d8775fbf3034e7012f05d60b80e6d \
+        1bb0f07f67939ce667f8f1a000dbec38 \
+        05fc1fbfb646a394e35043182c63b5de \
+        8a607889ac525c2286e2f7c88f89d931 \
+        ca65153603a1a7240bbd9d2ce19f2d67 \
+        8b76b9f2069aad02cce54546381fc94b \
+        c12d182417999fc365f952e701f6071f \
+        b145fb66e71c48f5f7b5b7ad98de963b \
+        908ec8a89821b72f3a35726bab24461f \
+        1fcc5c68ddd2899481f89c74a6f35ea6 \
+        428fc5d72716c000ce20267887878be2 \
+        674e5a6b49cf5e0ebb1d6cc85f6ec786 \
+        13ab398bf8d1f1667a9e17dd27936b41 \
+        e547b0e754cd61f24f9ef8c9e26fcd95 \
+        ceee1159c41351d05f4cf705490867b3 \
+        4e0e5834b7c5634e2465cb1779f78b33 \
+        bb8abd9c6a47535194459f940eb98e70 \
+        e900a384ac7dbb320fe6a7279fbfef89 \
+        d18d362345c4fe512ef67b738b239fb8 \
+        32222c3df2805eabcfe92432db2aee8f \
+        1ad539bb397aab6bb7c261d5b421a1a6 \
+        daf3b42c3d8b457bfdaf677ae13316ef \
+        96481ed810273371ed8b87f062a0dcda \
+        4daa973c57624dc3d88eaa49dd86d3e1 \
+        e972ea58ec203bfa6c79c1207852298b \
+        6e6b5efce87c034ea01d85a9ce673754 \
+        5455377b21c1988534c366fec10aa1de \
+        522e1e9a25a73c9a6adf84ef7ce3f856 \
+        0a015f799a37e1db7d2353f22695c925 \
+        d76d7c111ff717bb149c87dfe8b96584 \
+        f750089073d844d99b96a1fce3b4bb02 \
+        15d7c360722c3886379edae674d8c3a0 \
+        629acb55962c936f5183a0879f53aa50 \
+        48dcf78e61bc4ce50fe25246c22351d3 \
+        662dc4cd3d8922891482eba8d72ef8a0 \
+        f1735beb9a92405721b1abe7ce872268 \
+        089d99f8286e47aec45e2783c214d383 \
+        e2c4b4a8ff4c3c788d37468b249fe9bc \
+        1f1e8b52fa04ca808c0bf41caf93d1f0 \
+        3463b870b51ee10369d6b1a5139ad166 \
+        47fc382796b66b91649e03fed563cb07 \
+        34dc18c5784abc856abf17fdc65bd5a3 \
+        a175ca69db6f36098efc0fd604a828ff \
+        e4ab08655f2e89c9939b87f0a95db460 \
+        5c795a4c888f29f9ea32f204bf471be9 \
+        cd9af84eb3044b7fdfe2ef003d6d50f7 \
+        923b0b8738e502839b45fceb53a51a3e \
+        0498c4a11448bfc35dc7bb2caa64c753 \
+        db96b50050277bf05a3c68534bbb9586 \
+        306c0281447d1876e8220007b7a7e053 \
+        09de9d01e7331ff3da11f58be8bef0df \
+        02fa4fd7684acfa3d178919a2d40f168 \
+        1447eb72d5d00bdc8a8dd897cd327541 \
+        d343f3cc25259c518e594b7bcd4f144b \
+        6fea8456dac26da1a185af6b0318dce1 \
+        b58284cb8ce52b8de07e09f4f8fb9653 \
+        f2797ade0e36f1e5d6be9d11b5076582 \
+        2376de634160158ece40c4bc2ab3eb41 \
+        a369d510325342310c7ab159bd181dae \
+        24c64817e85ef77765ed0f26c31c9b4c \
+        7ff44db201b805c60b7894e6e51a5580 \
+        7968284877e481b58df1569b68b5dc26 \
+        dae6d89034a6988042fd8be4cf5e037d \
+        cd2efc4af413b9d1380761255c7a22ff \
+        15d6a025ba24aaccce5a99cdf5e9d4fc \
+        34d06a94727c506c11e4710160e90f32 \
+        de2839e16d9d7a9fd1c397da62f62b4a \
+        5b2c6ccb94c770d0ed85f7a844bf001e \
+        302351f6041a0265f3439c63f3ee0ecc \
+        017691b927b405669e1139b054a35f4a \
+        e0c35ffb8cfdb74a39bf799811f79304 \
+        467f51d4cfb646d0c8fecfa008dbf52d \
+        b0d6c3868e26a7c0874031b8ee230fe6 \
+        f56c70fbae23f08fb0912284333f7851 \
+        d990172b607020701f9e84ca8e1c043c \
+        9afb70c460db38399bf95ec015f07435 \
+        1f3acb8c08931a5c99e9aeb1969cb5a8 \
+        d20c2b0f45a62cc15c503ea610706a8f \
+        0a68848588e847ceccf504891584d00b \
+        f34ea4d81690ec402b6f0d9e54e8baa4 \
+        ec7e437088dc741e6a0653e553abca4e \
+        45b469ad607b912256b7c80141fa2d17 \
+        591c68ecc1dded36344429f427bbfabc \
+        a7cb2a4ca50a41ced19f20de7bd033d0 \
+        8cec8a187df7a7b971009a7693f60140 \
+        7799baff9a5664205d9110a2624e8989 \
+        29bbf3d9160d2545d528d0b2d7492333 \
+        48a5f3056365da123ec13e1da59e904f \
+        8aa3cbf525ad9e68c3619664a3401dbe \
+        f7ee9de65306cc4e1f8ce02790ca089e \
+        4396bc1704f7337718352f0e6ec2d391 \
+        95ac9eb53ba561546a5dce72778c99a4 \
+        c0c9fb0065f11496c222ba3cd7212b08 \
+        015fc889cb9aa243d18261a91b072e1a \
+        5a19e54d2580e4c0d72c281df8f54ae6 \
+        58a7859c6d99f6f743e95c13fa71e432 \
+        dc40d2dd1bc2eac31fdc9c2696671342 \
+        423da0bc6c03a22a8c3181feec42c09b \
+        f7e1624bbb0598683388e7820bbae8c4 \
+        331d07cdd036d528ede2f69c7ff0beb6 \
+        aacb7214f194a80a1c4ebccde7c83170 \
+        7a0e12a2375ab6ed7f8fd583cfc83cae \
+        50b8693a90afe621d860e0348c16496a \
+        6051d7c766160109c53290defcf1e6ca \
+        ae2ca148274c581aa6ee8a8e292ca2af \
+        936257597fbe2fd02d954a5db53c687a \
+        073a49c0bbf42567732c431ac924d9d1 \
+        b350c3e0b227a09407205fd823287959 \
+        76e956e5c982c54090c8ee056e9ce275 \
+        6a4f97b7e9ca29b701116862f3ca41c4 \
+        7b18a2563fc4f01365351f78ed546f72 \
+        17cb73d14c3bec083befc766394f33a7 \
+        34437d4130faec448d42eca071d0e6fd"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="rust16"
+MAINTAINER="Julian Grinblat"
+EMAIL="julian@dotcore.co.il"
diff --git a/system/whowatch/whowatch.SlackBuild b/system/whowatch/whowatch.SlackBuild
index 436bf2d1e2..57bafc4f23 100644
--- a/system/whowatch/whowatch.SlackBuild
+++ b/system/whowatch/whowatch.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for whowatch
 
@@ -23,26 +23,35 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220212 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=whowatch
 VERSION=${VERSION:-1.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -66,11 +75,11 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -80,10 +89,7 @@ CFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
 
 gzip -9 $PKG/usr/man/man?/*.?
 
@@ -95,4 +101,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/whowatch/whowatch.info b/system/whowatch/whowatch.info
index e2f22892a9..6c02d42394 100644
--- a/system/whowatch/whowatch.info
+++ b/system/whowatch/whowatch.info
@@ -1,7 +1,7 @@
 PRGNAM="whowatch"
 VERSION="1.6.1"
 HOMEPAGE="http://whowatch.sourceforge.net/"
-DOWNLOAD="http://download.sourceforge.net/whowatch/whowatch-1.6.1.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/whowatch-1.6.1.tar.gz"
 MD5SUM="6ed1e17df50746845c694a41c11e1765"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/wiimms-iso-tools/README b/system/wiimms-iso-tools/README
index de7ec11843..c1bc7b1d28 100644
--- a/system/wiimms-iso-tools/README
+++ b/system/wiimms-iso-tools/README
@@ -11,10 +11,10 @@ wit (Wiimms ISO Tool):
 
 wwt (Wiimms WBFS Tool):
 
-    This is the main WBFS manipulation tool (WBFS manager). It can create,
-    check, repair, verify and clone WBFS files and partitions. It can
-    list, add, extract, remove, rename and recover ISO images as part
-    of a WBFS.
+    This is the main WBFS manipulation tool (WBFS manager). It
+    can create, check, repair, verify and clone WBFS files and
+    partitions. It can list, add, extract, remove, rename and recover
+    ISO images as part of a WBFS.
 
 wdf (Wiimms WDF Tool):
 
diff --git a/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild b/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild
index d10239ff94..58df4b17f5 100644
--- a/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild
+++ b/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Wiimms ISO Tools
 #
@@ -23,10 +23,15 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220209 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wiimms-iso-tools
 VERSION=${VERSION:-3.02a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -72,7 +84,15 @@ find -L . \
 
 patch -p0 < $CWD/cflags.diff
 
-make CFLAGS="$SLKCFLAGS"
+# 20220209 bkw: I need to see the compile/link commands!
+sed -i 's,@\$(CC),$(CC),g' Makefile
+
+# 20220209 bkw: overriding in the environment or as make args just
+# wasn't working, so I nuked it from orbit. It's the only way to be sure.
+SLKCFLAGS+=" -Wl,--allow-multiple-definition -fcommon"
+sed -i "s|-O3|$SLKCFLAGS|" Makefile test-libwbfs/Makefile
+
+make
 
 # Fix the install directory
 sed -i "s|/usr/local|$PKG/usr|" templates.sed
@@ -90,4 +110,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/wiimms-iso-tools/wiimms-iso-tools.info b/system/wiimms-iso-tools/wiimms-iso-tools.info
index c15948fdb0..69633ddded 100644
--- a/system/wiimms-iso-tools/wiimms-iso-tools.info
+++ b/system/wiimms-iso-tools/wiimms-iso-tools.info
@@ -1,7 +1,7 @@
 PRGNAM="wiimms-iso-tools"
 VERSION="3.02a"
 HOMEPAGE="https://wit.wiimm.de/"
-DOWNLOAD="https://download.wiimm.de/source/wiimms-iso-tools/wiimms-iso-tools.source-3.02a.txz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/wiimms-iso-tools.source-3.02a.txz"
 MD5SUM="a49c0fe7e5cf7fff7dd13fbdacb946eb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/wine-staging/0001-winhlp32-Workaround-a-bug-in-Flex.patch b/system/wine-staging/0001-winhlp32-Workaround-a-bug-in-Flex.patch
deleted file mode 100644
index d674ead817..0000000000
--- a/system/wine-staging/0001-winhlp32-Workaround-a-bug-in-Flex.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From cf6bdd7b7dc1dc1ba31bd48171c218ba3503eb76 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 14 Jan 2017 05:48:28 +0100
-Subject: winhlp32: Workaround a bug in Flex.
-
----
- programs/winhlp32/macro.lex.l | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l
-index 8f6945ca988..da2dd22e447 100644
---- a/programs/winhlp32/macro.lex.l
-+++ b/programs/winhlp32/macro.lex.l
-@@ -20,7 +20,7 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- %}
--%option noinput nounput never-interactive 8bit
-+%option noinput nounput never-interactive 8bit noyywrap
- %x quote
- %{
- #include "config.h"
-@@ -367,7 +367,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void)
- {
-     return lex_data ? lex_data->window : Globals.active_win;
- }
--
--#ifndef yywrap
--int yywrap(void) { return 1; }
--#endif
--- 
-2.11.0
-
diff --git a/system/wine-staging/README b/system/wine-staging/README
index eab14d1e07..e9b882a9b8 100644
--- a/system/wine-staging/README
+++ b/system/wine-staging/README
@@ -1,90 +1,39 @@
-wine-staging (Wine Staging is the testing area of winehq.org)
+Wine is an Open Source implementation of the Windows API on top of X
+for Linux and Unix.
 
-It contains bug fixes and features, which have not been integrated
-into the development branch yet. The idea of Wine Staging is to
-provide experimental features faster to end users and to give
-developers the possibility to discuss and improve their patches
-before they are integrated into the main branch.
+wine-staging is the current development branch of wine appended with
+full patches of the staging branch.
 
-This is a current development branch of Wine appended with full
-patches of the Staging branch.
+It contains bug fixes and features, which have not been integrated into
+the development branch yet. The idea of wine-staging is to provide
+experimental features faster to end users and to give developers the
+possibility to discuss and improve their patches before they are
+integrated into the main branch.
 
-NOTE
+NOTE: This builds the cutting-edge version of wine. If you need
+something more stable then you may want to check out wine.
 
-libusb in Slackware 14.2 is too old for this version of wine, and
-consequently, USB isn't supported.
-
-============================================================
-
-OPTIONS
-
-With no options this SlackBuild will build a 32 bit package,
-for which you need to have either have multilib installed, or
-building in a 32 OS, or in a 32 bit chroot.
-
-To enable 64 bit support use:
-
-  WIN64=yes ./wine.SlackBuild
-
-To disable win32 support, use:
-
-  WIN32=no ./wine.SlackBuild
-
-To disable OpenGL support, use:
-
-  OPENGL=no ./wine.SlackBuild
-
-The above options can be combined.
-
-============================================================
+=======================================================================
 
 OPTIONAL DEPENDENCIES
 
-fontforge: To build tahoma, tahomabd, and marlett fonts.
+fontforge:     To build tahoma, tahomabd, and marlett fonts.
 webcore-fonts: For MS fonts for the web and Windows Vista.
-oss
-SDL2
-FAudio
-libcapi20
-gsm
-krb5
-OpenAL
-vulkan-sdk
-
-============================================================
-
-MULTILIB
-
-To build the 32 bit wine on x86_64 you will need to have
-multilib packages installed, unless you want to build for
-Windows 64 bit applications only (using WIN64=yes WIN32=no.)
 
-alienBOB's multilib readme and repo:
+=======================================================================
 
-https://docs.slackware.com/slackware:multilib
-http://www.slackware.com/~alien/multilib/
-
-A script that rsyncs with alienBOB's repo and installs the
-multilib packages which can be found here:
-
-http://tty1.uk/scripts/slackware/alien-multilib-rsync.sh
+OPTIONS
 
-Be sure to read the short instructions at the top.  If you
-use slackpkg then you will also want to blacklist his
-packages in /etc/slackpkg/blacklist:
+If your video card does not support hardware accelerated OpenGL,
+you may disable OpenGL support by using:
 
-[0-9]+alien
-[0-9]+compat32
+  OPENGL=no ./wine.SlackBuild
 
-============================================================
+=======================================================================
 
 NOTES
 
-With 64 bit support you would use the wine64 binary.  If you
-have a combined 32 and 64 bit package you need to set the
-environmental variable WINEPREFIX to point to the 64 bit
-wine directory when running wine64, which should be
-different to the 32 bit directory (~/.wine by default).
-Example:
-
-WINEPREFIX=~/.wine64 wine64 notepad
+64bit systems now default to the new WOW64 mode which builds both 64bit
+and 32bit PE dlls. This has removed the multilib dependency that was
+pereviously required and will allow execution of both 64bit and 32bit
+binaries. No multilib required.
diff --git a/system/wine-staging/README.MULTILIB b/system/wine-staging/README.MULTILIB
new file mode 100644
index 0000000000..d14bd8b2ad
--- /dev/null
+++ b/system/wine-staging/README.MULTILIB
@@ -0,0 +1,31 @@
+The legacy method to build 32 bit wine on x86_64 will will require
+a multilib installation.
+
+Please read up alienBOB's multilib readme and repo:
+
+https://docs.slackware.com/slackware:multilib
+http://www.slackware.com/~alien/multilib/
+
+A script that rsyncs with alienBOB's repo and installs the multilib
+packages which can be found here:
+
+https://slackware.uk/~dive/scripts/alien-multilib-rsync.sh
+
+Be sure to read the short instructions at the top.  If you use slackpkg
+then you will also want to blacklist his packages in
+/etc/slackpkg/blacklist:
+
+[0-9]+alien
+[0-9]+compat32
+
+If you have a combined 32 and 64 bit package you need to set the
+environmental variable WINEPREFIX to point to the 64 bit wine directory
+when running wine64, which should be different to the 32 bit directory
+(~/.wine by default).
+
+Example:
+
+WINEPREFIX=~/.wine64 wine64 notepad
+
+To build wine using the legacy method, pass MULTILIB=yes to the build
+script.
diff --git a/system/wine-staging/README.SLACKWARE b/system/wine-staging/README.SLACKWARE
index 5b02735897..1885540021 100644
--- a/system/wine-staging/README.SLACKWARE
+++ b/system/wine-staging/README.SLACKWARE
@@ -15,11 +15,11 @@ List:
  |      |------ + glib2-compat32
  |      |       |------ + libffi-compat32
  |      |------ + pixman-compat32
- |      |------ + gtk+3-compat32  (Self conversion)
+ |      |------ + gtk+3-compat32
  |      |       |------ + atk-compat32
- |      |       |------ + at-spi2-atk (current only)
+ |      |       |------ + at-spi2-atk
  |      |       |------ + gdk-pixbuf2-compat32
- |      |       |------ + libepoxy-compat32  (current only)
+ |      |       |------ + libepoxy-compat32
  |      |       |------ + libICE-compat32
  |      |       |------ + libSM-compat32
  |      |       |       |------ + at-spi2-atk-compat32
@@ -29,7 +29,6 @@ List:
  |      |       |------ + pango-compat32
  |      |       |       |------ + harfbuzz-compat32
  |      |       |       |------ + libXft-compat32
- |      |       |------ + udev-compat32
  |      |------ ? This is only needed if you care about GTK3 theme support.
  |----- x dbus-compat32
  |----- + fontconfig-compat32
@@ -40,7 +39,7 @@ List:
  |      |         to spit out error messages of it missing.
  |----- + gnutls-compat32
  |      |------ + gmp-compat32
- |      |------ + libidn-compat32  (current only)
+ |      |------ + libidn-compat32
  |      |------ + nettle-compat32
  |      |------ + p11-kit-compat32
  |      |------ + zlib-compat32
@@ -53,6 +52,8 @@ List:
  |      |------ ? Needed by some programs but compiles without it.
  |----- + libjpeg-turbo-compat32
  |----- + libpng-compat32
+ |----- x libva-compat32
+ |      |------ ? VAAPI backend for DXVA2 GPU decoding.
  |----- + libXcomposite-compat32
  |----- + libXcursor-compat32
  |      |------ + libXfixes-compat32
@@ -68,14 +69,12 @@ List:
  |----- + libXxf86dga-compat32
  |----- + libXxf86vm-compat32
  |----- x libxml2-compat32
- |      |------ + aaa_elflibs-compat32
+ |      |------ + aaa_libraries-compat32
  |      |------ ? This is needed for .NET to work correctly.
- |----- x libva-compat32
- |      |------ ? VAAPI backend for DXVA2 GPU decoding.
  |----- + mesa-compat32
  |----- + mpg123-compat32
  |      |------ + libtool-compat32
- |----- + OpenAL-compat32
- |----- x oss
+ |----- + openal-soft-compat32
+ |----- x oss (self conversion)
  |----- + openjpeg-compat32
- |----- x PulseAudio
+ |----- x pulseaudio
diff --git a/system/wine-staging/flex.patch b/system/wine-staging/flex.patch
new file mode 100644
index 0000000000..52fc3ff53a
--- /dev/null
+++ b/system/wine-staging/flex.patch
@@ -0,0 +1,31 @@
+From cf6bdd7b7dc1dc1ba31bd48171c218ba3503eb76 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sat, 14 Jan 2017 05:48:28 +0100
+Subject: winhlp32: Workaround a bug in Flex.
+
+---
+ programs/winhlp32/macro.lex.l | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l
+index 8f6945ca988..da2dd22e447 100644
+--- a/programs/winhlp32/macro.lex.l
++++ b/programs/winhlp32/macro.lex.l
+@@ -20,7 +20,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+ %}
+-%option noinput nounput never-interactive 8bit
++%option noinput nounput never-interactive 8bit noyywrap
+ %x quote
+ %{
+ #include <assert.h>
+@@ -366,7 +366,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void)
+ {
+     return lex_data ? lex_data->window : Globals.active_win;
+ }
+-
+-#ifndef yywrap
+-int yywrap(void) { return 1; }
+-#endif
+-- 
diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild
index 8bcb1853b5..4c669faaec 100644
--- a/system/wine-staging/wine-staging.SlackBuild
+++ b/system/wine-staging/wine-staging.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for wine-staging.
 #
-# Copyright 2016-2019  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2023-2024 Steven Voges <Oregon, USA>
+# Copyright 2016-2019 Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
 #
 # All rights reserved.
@@ -29,13 +30,20 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Now maintained by Dave Woodfall <dave@slackbuilds.org>
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=wine-staging
-VERSION=${VERSION:-6.0}
-WINEVERSION=${WINEVERSION:-6.0}
+VERSION=${VERSION:-9.6}
+WINEVERSION=$VERSION
+STAGINGVERSION=$VERSION
+ARCHS="i386,x86_64"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -45,56 +53,71 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-WIN32=${WIN32:-yes}
-WIN64=${WIN64:-no}
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-# If your video card does not support hardware accelerated OpenGL,
-# run the script like:   OPENGL=NO ./wine.SlackBuild
-if [ "${OPENGL:-YES}" = "YES" ]; then
+OPENGL=${OPENGL@L}
+if [ "${OPENGL:-yes}" = "yes" ]; then
   do_opengl="with"
 else
   do_opengl="without"
 fi
-if [ "$WIN32" = "no" ] && [ "$WIN64" = "no" ]; then
-  echo "Both 64 and 32 bit builds disabled. Nothing to do."
-  exit 1
-fi
 
-# These should work for anything not specified below
 BUILD_ARCH="$ARCH-slackware-linux"
 SLKCFLAGS="-O2"
 
 case "$ARCH" in
-  arm)
-    BUILD_ARCH="$ARCH-slackware-linux-gnueabi"
-    ;;
-  i?86)
-    # -Os was -O2, fix for:
-    # https://bugs.winehq.org/show_bug.cgi?id=42406
-    # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78911
-    # https://bugs.gentoo.org/613128
-    SLKCFLAGS="-Os -march=$ARCH -mtune=i686"
-    ;;
-  x86_64)
-    SLKCFLAGS="-O2 -fPIC"
-    LIBDIRSUFFIX="64"
-    ;;
+ arm)
+  BUILD_ARCH="$ARCH-slackware-linux-gnueabi"
+  SLKCFLAGS="-O2"
+  ;;
+ i?86)
+  # -Os was -O2, fix for:
+  # https://bugs.winehq.org/show_bug.cgi?id=42406
+  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78911
+  # https://bugs.gentoo.org/613128
+  SLKCFLAGS="-Os -march=$ARCH -mtune=i686"
+  WINE32="yes"
+  ;;
+ x86_64)
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  WINE64="yes"
+  ;;
 esac
 
+MULTILIB=${MULTILIB@L}
+if [[ "$ARCH" != "x86_64" && "$MULTILIB" = "yes" ]]; then
+  echo "Cannot build for multilib on non-64bit systems."
+  exit 1
+elif [[ "$ARCH" = "x86_64" && "$MULTILIB" = "yes"  ]]; then
+  WINETMP="$( mktemp -d $TMP/wine-test-XXXXXX )"
+  echo "int main(void) {; return(0); }" > "$WINETMP/test.c"
+  gcc -m32 "$WINETMP/test.c" -o /dev/null >/dev/null 2>&1 && WINE32TEST=${WINE32TEST:-yes}
+  rm -rf "$WINETMP"
+  if [[ $WINE32TEST = "yes" ]]; then
+    ARCHS="x86_64"
+    WINE32="yes"
+  else
+    echo "MULTILIB was requested, however the multilib test has failed."
+    echo "Have the compat32 libraries been installed?"
+    echo "Please see README.MULTILIB"
+    exit 1
+  fi
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION wine-$WINEVERSION
+rm -rf $PRGNAM-$STAGINGVERSION wine-$WINEVERSION
 tar xvf $CWD/wine-$WINEVERSION.tar.xz
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$STAGINGVERSION.tar.gz
 
-cd $PRGNAM-$VERSION/patches
+cd $PRGNAM-$STAGINGVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -102,9 +125,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-./patchinstall.sh DESTDIR=$TMP/wine-$WINEVERSION --all
-
 cd $TMP/wine-$WINEVERSION
+python3 $TMP/$PRGNAM-$STAGINGVERSION/staging/patchinstall.py --all
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -113,12 +135,11 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Fix for flex.
-patch -p1 --verbose < $CWD/0001-winhlp32-Workaround-a-bug-in-Flex.patch
-
-# fix path of opencl headers.
+patch -p1 < $CWD/flex.patch
+# Fix path of opencl headers.
 sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*
 
-if [ "$WIN64" = "yes" ]; then
+if [ "$WINE64" = "yes" ]; then
   wine64="--with-wine64=../wine64"
   mkdir wine64
   cd wine64
@@ -127,12 +148,13 @@ if [ "$WIN64" = "yes" ]; then
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   ../configure \
-    --enable-win64 \
     --prefix=/usr \
     --libdir=/usr/lib64 \
     --localstatedir=/var \
     --sysconfdir=/etc \
     --mandir=/usr/man \
+    --enable-win64 \
+    --enable-archs=$ARCHS \
     --with-x \
     --with-gnutls \
     --${do_opengl}-opengl \
@@ -140,17 +162,15 @@ if [ "$WIN64" = "yes" ]; then
     --program-suffix= \
     --disable-tests \
     --build=$BUILD_ARCH
-
   make depend
   make
   make install DESTDIR=$PKG
   cd ..
 fi
 
-if [ "$WIN32" = "yes" ]; then
+if [ "$WINE32" = "yes" ]; then
   mkdir wine32
   cd wine32
-
   export PKG_CONFIG_PATH="/usr/lib/pkgconfig:$PKG_CONFIG_PATH"
 
   LDFLAGS="-L/usr/lib -ldl" \
@@ -170,7 +190,6 @@ if [ "$WIN32" = "yes" ]; then
     --program-suffix= \
     --disable-tests \
     --build=$BUILD_ARCH
-
   make depend
   make
   make install DESTDIR=$PKG
@@ -187,7 +206,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 install -d $PKG/etc/fonts/conf.{avail,d}
 install -m644 $CWD/30-win32-aliases.conf $PKG/etc/fonts/conf.avail
 ln -sf /etc/fonts/conf.avail/30-win32-aliases.conf $PKG/etc/fonts/conf.d/30-win32-aliases.conf
-install -Dm 644 $CWD/wine-binfmt.conf $PKG/usr/lib/binfmt.d/wine.conf
+install -Dm 644 $CWD/wine-binfmt.conf $PKG/usr/lib$LIBDIRSUFFIX/binfmt.d/wine.conf
 
 # Create Wine menu structure:
 mkdir -p $PKG/etc/xdg/menus/applications-merged
@@ -206,13 +225,9 @@ convert $CWD/winecfg.png -scale 64 $PKG/usr/share/pixmaps/wine-uninstaller.png
 cp programs/winecfg/winecfg.svg $PKG/usr/share/icons/hicolor/scalable/apps/
 cp $CWD/*.desktop $PKG/usr/share/applications/
 
-DOCS="ANNOUNCE AUTHORS COPYING.LIB LICENSE* MAINTAINERS README VERSION"
-FONTS_LICENSE="COPYING.arial COPYING.cour COPYING.msyh COPYING.times"
-
-VERSION=$( printf %s $VERSION | tr - _ )
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp $DOCS $FONTS_LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ANNOUNCE.md AUTHORS COPYING.* LICENSE* MAINTAINERS README.md VERSION \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -220,4 +235,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info
index 8bd895f0d6..9eba5cc053 100644
--- a/system/wine-staging/wine-staging.info
+++ b/system/wine-staging/wine-staging.info
@@ -1,12 +1,12 @@
 PRGNAM="wine-staging"
-VERSION="6.0"
+VERSION="9.6"
 HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
-DOWNLOAD="https://dl.winehq.org/wine/source/6.0/wine-6.0.tar.xz \
-          https://github.com/wine-staging/wine-staging/archive/v6.0/wine-staging-6.0.tar.gz"
-MD5SUM="1c8b7e1642a9e532106b88a7b1932ef3 \
-        1c1c78c356abc0b1da925f410c38ca2b"
+DOWNLOAD="https://dl.winehq.org/wine/source/9.x/wine-9.6.tar.xz \
+          https://github.com/wine-staging/wine-staging/archive/v9.6/wine-staging-9.6.tar.gz"
+MD5SUM="9bc6c11d200b717fa2ad33be31d91da2 \
+        ab997f4aded3004ed736d0bdbf114fb3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@slackbuilds.org"
+MAINTAINER="Steven Voges"
+EMAIL="svoges.sbo@gmail.com"
diff --git a/system/wine/0001-winhlp32-Workaround-a-bug-in-Flex.patch b/system/wine/0001-winhlp32-Workaround-a-bug-in-Flex.patch
deleted file mode 100644
index d674ead817..0000000000
--- a/system/wine/0001-winhlp32-Workaround-a-bug-in-Flex.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From cf6bdd7b7dc1dc1ba31bd48171c218ba3503eb76 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 14 Jan 2017 05:48:28 +0100
-Subject: winhlp32: Workaround a bug in Flex.
-
----
- programs/winhlp32/macro.lex.l | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l
-index 8f6945ca988..da2dd22e447 100644
---- a/programs/winhlp32/macro.lex.l
-+++ b/programs/winhlp32/macro.lex.l
-@@ -20,7 +20,7 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- %}
--%option noinput nounput never-interactive 8bit
-+%option noinput nounput never-interactive 8bit noyywrap
- %x quote
- %{
- #include "config.h"
-@@ -367,7 +367,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void)
- {
-     return lex_data ? lex_data->window : Globals.active_win;
- }
--
--#ifndef yywrap
--int yywrap(void) { return 1; }
--#endif
--- 
-2.11.0
-
diff --git a/system/wine/30-win32-aliases.conf b/system/wine/30-win32-aliases.conf
new file mode 100644
index 0000000000..99ae1f7b83
--- /dev/null
+++ b/system/wine/30-win32-aliases.conf
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias binding="same">
+    <family>MS Shell Dlg</family>
+    <accept><family>Microsoft Sans Serif</family></accept>
+    <default><family>sans-serif</family></default>
+  </alias>
+  <alias binding="same">
+    <family>MS Shell Dlg 2</family>
+    <accept><family>Tahoma</family></accept>
+    <default><family>sans-serif</family></default>
+  </alias>
+
+  <alias binding="same">
+    <family>MS Sans Serif</family>
+    <prefer><family>Microsoft Sans Serif</family></prefer>
+    <default><family>sans-serif</family></default>
+  </alias>
+</fontconfig>
diff --git a/system/wine/README b/system/wine/README
index a5830f6347..d0cb2a2c44 100644
--- a/system/wine/README
+++ b/system/wine/README
@@ -1,72 +1,30 @@
-Wine is an Open Source implementation of the Windows API on
-top of X for Linux and Unix.
+Wine is an Open Source implementation of the Windows API on top of X
+for Linux and Unix.
 
-NOTE: This builds the stable version of wine.  If you need
-cutting-edge then you may want to check out wine-staging.
+NOTE: This builds the stable version of wine. If you need something
+more cutting-edge then you may want to check out wine-staging.
 
-OPTIONS
-
-With no options this SlackBuild will build a 32 bit package,
-for which you need to have either have multilib installed, or
-building in a 32 OS, or in a 32 bit chroot.
-
-To enable 64 bit support use:
-
-  WIN64=yes ./wine.SlackBuild
-
-To disable win32 support, use:
-
-  WIN32=no ./wine.SlackBuild
-
-To disable OpenGL support, use:
-
-  OPENGL=no ./wine.SlackBuild
-
-The above options can be combined.
+=======================================================================
 
 OPTIONAL DEPENDENCIES
 
-fontforge: To build tahoma, tahomabd, and marlett fonts.
+fontforge:     To build tahoma, tahomabd, and marlett fonts.
 webcore-fonts: For MS fonts for the web and Windows Vista.
-oss
-SDL2
-FAudio
-libcapi20
-gsm
-krb5
-OpenAL
-vulkan-sdk
-
-============================================================
-
-NOTES
-
-With 64 bit support you would use the wine64 binary.  If you
-have a combined 32 and 64 bit package you need to set the
-environmental variable WINEPREFIX to point to the 64 bit
-wine directory when running wine64, which should be
-different to the 32 bit directory (~/.wine by default).
-Example:
 
-WINEPREFIX=~/.wine64 wine64 notepad
+=======================================================================
 
-To build the 32 bit wine on x86_64 you will need to have
-multilib packages installed, unless you want to build for
-Windows 64 bit applications only (using WIN64=yes WIN32=no.)
-
-AlienBOB's multilib readme and repo:
+OPTIONS
 
-https://docs.slackware.com/slackware:multilib
-http://www.slackware.com/~alien/multilib/
+If your video card does not support hardware accelerated OpenGL,
+you may disable OpenGL support by using:
 
-I have a script that rsyncs with alienBOB's repo and
-installs the multilib packages which can be found here:
+  OPENGL=no ./wine.SlackBuild
 
-http://tty1.uk/scripts/slackware/alien-multilib-rsync.sh
+=======================================================================
 
-Be sure to read the short instructions at the top.  If you
-use slackpkg then you will also want to blacklist his
-packages in /etc/slackpkg/blacklist:
+NOTES
 
-[0-9]+alien
-[0-9]+compat32
+64bit systems now default to the new WOW64 mode which builds both 64bit
+and 32bit PE dlls. This has removed the multilib dependency that was
+pereviously required and will allow execution of both 64bit and 32bit
+binaries. No multilib required.
diff --git a/system/wine/README.MULTILIB b/system/wine/README.MULTILIB
new file mode 100644
index 0000000000..d14bd8b2ad
--- /dev/null
+++ b/system/wine/README.MULTILIB
@@ -0,0 +1,31 @@
+The legacy method to build 32 bit wine on x86_64 will will require
+a multilib installation.
+
+Please read up alienBOB's multilib readme and repo:
+
+https://docs.slackware.com/slackware:multilib
+http://www.slackware.com/~alien/multilib/
+
+A script that rsyncs with alienBOB's repo and installs the multilib
+packages which can be found here:
+
+https://slackware.uk/~dive/scripts/alien-multilib-rsync.sh
+
+Be sure to read the short instructions at the top.  If you use slackpkg
+then you will also want to blacklist his packages in
+/etc/slackpkg/blacklist:
+
+[0-9]+alien
+[0-9]+compat32
+
+If you have a combined 32 and 64 bit package you need to set the
+environmental variable WINEPREFIX to point to the 64 bit wine directory
+when running wine64, which should be different to the 32 bit directory
+(~/.wine by default).
+
+Example:
+
+WINEPREFIX=~/.wine64 wine64 notepad
+
+To build wine using the legacy method, pass MULTILIB=yes to the build
+script.
diff --git a/system/wine/doinst.sh b/system/wine/doinst.sh
index 392c12adb9..726ffe403b 100644
--- a/system/wine/doinst.sh
+++ b/system/wine/doinst.sh
@@ -2,3 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/wine/flex.patch b/system/wine/flex.patch
new file mode 100644
index 0000000000..52fc3ff53a
--- /dev/null
+++ b/system/wine/flex.patch
@@ -0,0 +1,31 @@
+From cf6bdd7b7dc1dc1ba31bd48171c218ba3503eb76 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sat, 14 Jan 2017 05:48:28 +0100
+Subject: winhlp32: Workaround a bug in Flex.
+
+---
+ programs/winhlp32/macro.lex.l | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l
+index 8f6945ca988..da2dd22e447 100644
+--- a/programs/winhlp32/macro.lex.l
++++ b/programs/winhlp32/macro.lex.l
+@@ -20,7 +20,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+ %}
+-%option noinput nounput never-interactive 8bit
++%option noinput nounput never-interactive 8bit noyywrap
+ %x quote
+ %{
+ #include <assert.h>
+@@ -366,7 +366,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void)
+ {
+     return lex_data ? lex_data->window : Globals.active_win;
+ }
+-
+-#ifndef yywrap
+-int yywrap(void) { return 1; }
+-#endif
+-- 
diff --git a/system/wine/wine-binfmt.conf b/system/wine/wine-binfmt.conf
new file mode 100644
index 0000000000..4d43073365
--- /dev/null
+++ b/system/wine/wine-binfmt.conf
@@ -0,0 +1,2 @@
+# Start WINE on Windows executables
+:DOSWin:M::MZ::/usr/bin/wine:
diff --git a/system/wine/wine-browsedrive.desktop b/system/wine/wine-browsedrive.desktop
new file mode 100644
index 0000000000..4454f7abd7
--- /dev/null
+++ b/system/wine/wine-browsedrive.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Browse C: Drive
+Comment=Browse your virtual C: drive
+Exec=wine winebrowser c:
+Terminal=false
+Type=Application
+Icon=folder-wine
+Categories=System;X-Wine;
diff --git a/system/wine/wine-uninstaller.desktop b/system/wine/wine-uninstaller.desktop
new file mode 100644
index 0000000000..0a26ce2c4a
--- /dev/null
+++ b/system/wine/wine-uninstaller.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Uninstall Wine Software
+Comment=Uninstall Windows applications for Wine
+Exec=wine uninstaller
+Terminal=false
+Type=Application
+Icon=wine-uninstaller
+Categories=System;X-Wine;
diff --git a/system/wine/wine.SlackBuild b/system/wine/wine.SlackBuild
index 64ae4f4275..7cc898ef39 100644
--- a/system/wine/wine.SlackBuild
+++ b/system/wine/wine.SlackBuild
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wine
 
+# Copyright 2023-2024 Steven Voges <Oregon, USA>
 # Copyright 2011 David Woodfall
 # Copyright 2006-2009  Robby Workman  Northport, AL, USA
 # All rights reserved.
@@ -23,59 +24,81 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wine
-VERSION=${VERSION:-6.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-9.0}
+ARCHS="i386,x86_64"
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
-CWD=$(pwd)
+PKGTYPE=${PKGTYPE:-tgz}
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
-WIN32=${WIN32:-yes}
-WIN64=${WIN64:-no}
 
-# If your video card does not support hardware accelerated OpenGL,
-# then run the script like:   OPENGL=NO ./wine.SlackBuild
-if [ "${OPENGL:-yes}" = "yes" ]; then
-	do_opengl="with"
-else
-	do_opengl="without"
+if [ -z "$ARCH" ]; then
+ case "$(uname -m)" in
+  i?86) ARCH=i586 ;;
+  arm*) ARCH=arm ;;
+  *) ARCH=$(uname -m) ;;
+ esac
 fi
 
-if [ -z "$ARCH" ]; then
-	case "$(uname -m)" in
-		i?86) ARCH=i586 ;;
-		arm*) ARCH=arm ;;
-		*) ARCH=$(uname -m) ;;
-	esac
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-if [ "$WIN32" = "no" ] && [ "$WIN64" = "no" ]; then
-	echo "Both 64 and 32 bit builds disabled. Nothing to do."
-	exit 1
+OPENGL=${OPENGL@L}
+if [ "${OPENGL:-yes}" = "yes" ]; then
+ do_opengl="with"
+else
+ do_opengl="without"
 fi
 
-# These should work for anything not specified below
 BUILD_ARCH="$ARCH-slackware-linux"
 SLKCFLAGS="-O2"
 
 case "$ARCH" in
-	arm)
-		BUILD_ARCH="$ARCH-slackware-linux-gnueabi"
-		;;
-	i?86)
-		# -Os was -O2, fix for:
-		# https://bugs.winehq.org/show_bug.cgi?id=42406
-		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78911
-		# https://bugs.gentoo.org/613128
-		SLKCFLAGS="-Os -march=$ARCH -mtune=i686"
-		;;
-	x86_64)
-		SLKCFLAGS="-O2 -fPIC"
-		LIBDIRSUFFIX="64"
-		;;
+ arm)
+  BUILD_ARCH="$ARCH-slackware-linux-gnueabi"
+  ;;
+ i?86)
+  # -Os was -O2, fix for:
+  # https://bugs.winehq.org/show_bug.cgi?id=42406
+  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78911
+  # https://bugs.gentoo.org/613128
+  SLKCFLAGS="-Os -march=$ARCH -mtune=i686"
+  WINE32="yes"
+  ;;
+ x86_64)
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  WINE64="yes"
+  ;;
 esac
 
+MULTILIB=${MULTILIB@L}
+if [[ "$ARCH" != "x86_64" && "$MULTILIB" = "yes" ]]; then
+  echo "Cannot build for multilib on non-64bit systems."
+  exit 1
+elif [[ "$ARCH" = "x86_64" && "$MULTILIB" = "yes"  ]]; then
+  WINETMP="$( mktemp -d $TMP/wine-test-XXXXXX )"
+  echo "int main(void) {; return(0); }" > "$WINETMP/test.c"
+  gcc -m32 "$WINETMP/test.c" -o /dev/null >/dev/null 2>&1 && WINE32TEST=${WINE32TEST:-yes}
+  rm -rf "$WINETMP"
+  if [[ $WINE32TEST = "yes" ]]; then
+    ARCHS="x86_64"
+    WINE32="yes"
+  else
+    echo "MULTILIB was requested, however the multilib test has failed."
+    echo "Have the compat32 libraries been installed?"
+    echo "Please see README.MULTILIB"
+    exit 1
+  fi
+fi
+
 set -e
 
 rm -rf $PKG
@@ -86,84 +109,106 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
-	\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-	-o -perm 511 \) -exec chmod 755 {} \; -o \
-	\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-	-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Fix for flex
-patch -p1 --verbose < $CWD/0001-winhlp32-Workaround-a-bug-in-Flex.patch
-
-if [ "$WIN64" = "yes" ]; then
-	wine64="--with-wine64=../wine64"
-	mkdir wine64
-	cd wine64
-
-	LDFLAGS="-L/usr/lib64 -ldl" \
-	CFLAGS="$SLKCFLAGS" \
-	CXXFLAGS="$SLKCFLAGS" \
-	../configure \
-		--prefix=/usr \
-		--libdir=/usr/lib64 \
-		--localstatedir=/var \
-		--sysconfdir=/etc \
-		--mandir=/usr/man \
-		--enable-win64 \
-		--with-x \
-		--with-gnutls \
-		--${do_opengl}-opengl \
-		--program-prefix= \
-		--program-suffix= \
-		--disable-tests \
-		--build=$BUILD_ARCH
-
-	make depend
-	make
-	make install DESTDIR=$PKG
-	cd ..
+patch -p1 --verbose < $CWD/flex.patch
+# WriteCopy Fix
+patch -p1 < $CWD/writecopy.patch
+# Fix path of opencl headers.
+sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*
+
+if [ "$WINE64" = "yes" ]; then
+  wine64="--with-wine64=../wine64"
+  mkdir wine64
+  cd wine64
+
+  LDFLAGS="-L/usr/lib64 -ldl" \
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+    ../configure \
+     --prefix=/usr \
+     --libdir=/usr/lib64 \
+     --localstatedir=/var \
+     --sysconfdir=/etc \
+     --mandir=/usr/man \
+     --enable-win64 \
+     --enable-archs=$ARCHS \
+     --with-x \
+     --with-gnutls \
+     --${do_opengl}-opengl \
+     --program-prefix= \
+     --program-suffix= \
+     --disable-tests \
+     --build=$BUILD_ARCH
+  make depend
+  make
+  make install DESTDIR=$PKG
+  cd ..
 fi
 
-
-if [ "$WIN32" = "yes" ]; then
-	mkdir wine32
-	cd wine32
-
-	export PKG_CONFIG_PATH="/usr/lib/pkgconfig:$PKG_CONFIG_PATH"
-
-	LDFLAGS="-L/usr/lib -ldl" \
-	CFLAGS="$SLKCFLAGS" \
-	CXXFLAGS="$SLKCFLAGS" \
-	../configure \
-		$wine64 \
-		--prefix=/usr \
-		--libdir=/usr/lib \
-		--localstatedir=/var \
-		--sysconfdir=/etc \
-		--mandir=/usr/man \
-		--with-x \
-		--with-gnutls \
-		--${do_opengl}-opengl \
-		--program-prefix= \
-		--program-suffix= \
-		--disable-tests \
-		--build=$BUILD_ARCH
-
-	make depend
-	make
-	make install DESTDIR=$PKG
-	cd ..
+if [ "$WINE32" = "yes" ]; then
+  mkdir wine32
+  cd wine32
+  export PKG_CONFIG_PATH="/usr/lib/pkgconfig:$PKG_CONFIG_PATH"
+
+  LDFLAGS="-L/usr/lib -ldl" \
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+    ../configure \
+     $wine64 \
+     --prefix=/usr \
+     --libdir=/usr/lib \
+     --localstatedir=/var \
+     --sysconfdir=/etc \
+     --mandir=/usr/man \
+     --with-x \
+     --with-gnutls \
+     --${do_opengl}-opengl \
+     --program-prefix=testpre32 \
+     --program-suffix=testsuf32 \
+     --disable-tests \
+     --build=$BUILD_ARCH
+  make depend
+  make
+  make install DESTDIR=$PKG
+  cd ..
 fi
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-	| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-VERSION=$( printf %s $VERSION | tr - _ )
+# Add font configuration:
+install -d $PKG/etc/fonts/conf.{avail,d}
+install -m644 $CWD/30-win32-aliases.conf $PKG/etc/fonts/conf.avail
+ln -sf /etc/fonts/conf.avail/30-win32-aliases.conf $PKG/etc/fonts/conf.d/30-win32-aliases.conf
+install -Dm 644 $CWD/wine-binfmt.conf $PKG/usr/lib$LIBDIRSUFFIX/binfmt.d/wine.conf
+
+# Create Wine menu structure:
+mkdir -p $PKG/etc/xdg/menus/applications-merged
+cp $CWD/wine.menu $PKG/etc/xdg/menus/applications-merged
+
+# Add a desktop menu for winecfg, wine-uninstaller and wine-browsedrive:
+mkdir -p $PKG/usr/share/{applications,icons/hicolor/scalable/apps,pixmaps}
+
+convert $CWD/wine.svg -scale 64 $PKG/usr/share/pixmaps/wine.png
+cp $CWD/wine.svg $PKG/usr/share/icons/hicolor/scalable/apps/
+
+convert $CWD/winecfg.png -scale 64 $PKG/usr/share/pixmaps/winecfg.png
+convert $CWD/winecfg.png -scale 64 $PKG/usr/share/pixmaps/folder-wine.png
+convert $CWD/winecfg.png -scale 64 $PKG/usr/share/pixmaps/wine-uninstaller.png
+
+cp programs/winecfg/winecfg.svg $PKG/usr/share/icons/hicolor/scalable/apps/
+cp $CWD/*.desktop $PKG/usr/share/applications/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ANNOUNCE AUTHORS COPYING.LIB LICENSE* README VERSION \
+cp -a ANNOUNCE.md AUTHORS COPYING.* LICENSE* README.md VERSION \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -172,4 +217,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/wine/wine.info b/system/wine/wine.info
index 44d7b362ae..da336cab9d 100644
--- a/system/wine/wine.info
+++ b/system/wine/wine.info
@@ -1,10 +1,10 @@
 PRGNAM="wine"
-VERSION="6.0"
+VERSION="9.0"
 HOMEPAGE="http://www.winehq.com/"
-DOWNLOAD="https://dl.winehq.org/wine/source/6.0/wine-6.0.tar.xz"
-MD5SUM="1c8b7e1642a9e532106b88a7b1932ef3"
+DOWNLOAD="https://dl.winehq.org/wine/source/9.0/wine-9.0.tar.xz"
+MD5SUM="78e1cb8d77d20b44820461b056a15069"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Dave Woodfall"
-EMAIL="dave@slackbuilds.org"
+MAINTAINER="Steven Voges"
+EMAIL="svoges.sbo@gmail.com"
diff --git a/system/wine/wine.menu b/system/wine/wine.menu
new file mode 100644
index 0000000000..cf32bd67b0
--- /dev/null
+++ b/system/wine/wine.menu
@@ -0,0 +1,12 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+"http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
+<Menu>
+  <Name>Applications</Name>
+  <Menu>
+    <Name>wine-wine</Name>
+    <Directory>wine-wine.directory</Directory>
+    <Include>
+      <Category>Wine</Category>
+    </Include>
+  </Menu>
+</Menu>
\ No newline at end of file
diff --git a/system/wine/wine.svg b/system/wine/wine.svg
new file mode 100644
index 0000000000..15fa028df2
--- /dev/null
+++ b/system/wine/wine.svg
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="48"
+   height="48"
+   id="svg2211">
+  <defs
+     id="defs2214">
+    <linearGradient
+       id="linearGradient16837">
+      <stop
+         style="stop-color:#830000;stop-opacity:1"
+         offset="0"
+         id="stop16839" />
+      <stop
+         style="stop-color:#830000;stop-opacity:0"
+         offset="1"
+         id="stop16841" />
+    </linearGradient>
+    <linearGradient
+       x1="-28.128548"
+       y1="34.637081"
+       x2="15.779508"
+       y2="34.637081"
+       id="linearGradient16843"
+       xlink:href="#linearGradient16837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(20.517241,0.9655172)" />
+    <linearGradient
+       x1="-28.128548"
+       y1="34.637081"
+       x2="15.779508"
+       y2="34.637081"
+       id="linearGradient17343"
+       xlink:href="#linearGradient16837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(20.657279,0.6042969)" />
+    <linearGradient
+       x1="-28.128548"
+       y1="34.637081"
+       x2="15.779508"
+       y2="34.637081"
+       id="linearGradient18759"
+       xlink:href="#linearGradient16837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(47.310344,-4.1379303e-8)" />
+    <filter
+       id="filter22949">
+      <feGaussianBlur
+         id="feGaussianBlur22951"
+         stdDeviation="1.7303666"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       x1="-28.128548"
+       y1="34.637081"
+       x2="15.779508"
+       y2="34.637081"
+       id="linearGradient22955"
+       xlink:href="#linearGradient16837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(47.209002,-0.119841)" />
+    <filter
+       id="filter23926">
+      <feGaussianBlur
+         id="feGaussianBlur23928"
+         stdDeviation="0.84094198"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       x1="-28.128548"
+       y1="34.637081"
+       x2="15.779508"
+       y2="34.637081"
+       id="linearGradient23958"
+       xlink:href="#linearGradient16837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(20.657279,0.6042969)" />
+    <linearGradient
+       x1="-28.128548"
+       y1="34.637081"
+       x2="15.779508"
+       y2="34.637081"
+       id="linearGradient23960"
+       xlink:href="#linearGradient16837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(47.310344,-4.1379303e-8)" />
+    <linearGradient
+       x1="-28.128548"
+       y1="34.637081"
+       x2="15.779508"
+       y2="34.637081"
+       id="linearGradient23962"
+       xlink:href="#linearGradient16837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(47.209002,-0.119841)" />
+  </defs>
+  <g
+     transform="matrix(0.5709735,0,0,0.5588143,8.1495857,-0.1431587)"
+     id="g23930">
+    <path
+       d="M 29.375,0.28125 C 28.102103,0.3649462 27.19036,0.66296531 26.8125,1.21875 C 21.42803,15.481257 14.693639,34.678782 19.03125,45.8125 C 23.30836,56.790927 22.212627,60.814566 19.53125,67.28125 C 15.12592,77.9056 10.006399,70.959231 2.40625,73.3125 C -5.3428301,75.711882 38.921067,91.52207 33.28125,84.25 C 27.455426,76.738091 19.97962,78.175374 22.65625,67.8125 C 25.516537,56.738587 26.630107,58.503996 36.90625,50.4375 C 47.42111,42.183617 49.312423,23.876037 54.03125,10.21875 C 53.631317,5.5825943 36.248645,-0.1707095 29.375,0.28125 z M 29.9375,2.15625 C 35.935385,1.8655695 53.047474,7.9445948 52.09375,11.1875 C 47.566036,24.291666 44.719193,42.892821 34.3125,50.34375 C 29.495544,53.792568 22.601138,50.398337 20.40625,45.8125 C 16.244311,35.129697 22.7711,16.716126 27.9375,3.03125 C 28.100316,2.4826998 28.826781,2.2100797 29.9375,2.15625 z "
+       style="opacity:1;fill:#0a0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter17327)"
+       id="path17048" />
+    <path
+       d="M 20.926735,45.656177 C 23.121623,50.242013 29.794442,53.351015 34.806492,50.192415 C 42.799392,45.15528 46.633208,32.337272 50.195406,19.715865 C 48.346783,17.311385 44.321959,15.129119 36.032026,19.943794 C 27.37856,24.969602 26.07073,19.707848 23.135927,17.842519 C 18.935044,30.561877 18.213073,39.318202 20.926735,45.656177 z "
+       style="fill:url(#linearGradient23958);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter17361)"
+       id="path17341" />
+    <path
+       d="M 20.786698,46.017397 C 22.981586,50.603233 29.654405,53.712235 34.666455,50.553635 C 42.659355,45.5165 46.493171,32.698492 50.055369,20.077085 C 48.206746,17.672605 44.181922,15.490339 35.891989,20.305014 C 27.238523,25.330822 25.930693,20.069068 22.99589,18.203739 C 18.795007,30.923097 18.073036,39.679422 20.786698,46.017397 z "
+       style="fill:url(#linearGradient23960);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path14897" />
+    <path
+       d="M 20.685356,45.897556 C 22.880244,50.483392 29.553063,53.592394 34.565113,50.433794 C 42.558013,45.396659 46.391829,32.578651 49.954027,19.957244 C 48.105404,17.552764 44.08058,15.370498 35.790647,20.185173 C 27.137181,25.210981 25.829351,19.949227 22.894548,18.083898 C 18.693665,30.803256 17.971694,39.559581 20.685356,45.897556 z "
+       style="fill:url(#linearGradient23962);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter23926)"
+       id="path22953" />
+    <path
+       d="M 29.37158,0.28649562 C 28.098683,0.37019162 27.18694,0.66821162 26.80908,1.2239956 C 21.42461,15.486503 14.690219,34.684028 19.02783,45.817746 C 23.30494,56.796173 22.209207,60.819812 19.52783,67.286496 C 15.1225,77.910846 10.002979,70.964477 2.40283,73.317746 C -5.3462499,75.717128 38.917647,91.527319 33.27783,84.255246 C 27.452006,76.743337 19.9762,78.18062 22.65283,67.817746 C 25.513117,56.743833 26.626687,58.509242 36.90283,50.442746 C 47.41769,42.188863 49.309003,23.881283 54.02783,10.223996 C 53.627897,5.5878406 36.245225,-0.16546338 29.37158,0.28649562 z M 29.93408,2.1614956 C 35.931965,1.8708156 53.044054,7.9498406 52.09033,11.192746 C 47.562616,24.296912 44.715773,42.898067 34.30908,50.348996 C 29.492124,53.797814 22.597718,50.403583 20.40283,45.817746 C 16.240891,35.134943 22.76768,16.721372 27.93408,3.0364956 C 28.096896,2.4879456 28.823361,2.2153256 29.93408,2.1614956 z "
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter22949)"
+       id="path20995" />
+  </g>
+</svg>
diff --git a/system/wine/winecfg.desktop b/system/wine/winecfg.desktop
new file mode 100644
index 0000000000..16999d8ba1
--- /dev/null
+++ b/system/wine/winecfg.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Exec=winecfg
+Icon=winecfg
+Terminal=false
+Name=Wine Configuration
+Comment=Configure Wine
+Type=Application
+Categories=Settings;
diff --git a/system/wine/winecfg.png b/system/wine/winecfg.png
new file mode 100644
index 0000000000..48812f040a
--- /dev/null
+++ b/system/wine/winecfg.png
diff --git a/system/wine/writecopy.patch b/system/wine/writecopy.patch
new file mode 100644
index 0000000000..d067dccd92
--- /dev/null
+++ b/system/wine/writecopy.patch
@@ -0,0 +1,18 @@
+@@ -, +, @@ 
+---
+ dlls/kernelbase/memory.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+--- a/dlls/kernelbase/memory.c	
++++ a/dlls/kernelbase/memory.c	
+@@ -481,7 +481,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH  VirtualLock( void *addr, SIZE_T size )
+  */
+ BOOL WINAPI DECLSPEC_HOTPATCH VirtualProtect( void *addr, SIZE_T size, DWORD new_prot, DWORD *old_prot )
+ {
+-    return VirtualProtectEx( GetCurrentProcess(), addr, size, new_prot, old_prot );
++    BOOL ret = VirtualProtectEx( GetCurrentProcess(), addr, size, new_prot, old_prot );
++    if (*old_prot == PAGE_WRITECOPY) *old_prot = PAGE_READWRITE;
++    return ret;
+ }
+ 
+ 
+-- 
diff --git a/system/winetricks/winetricks.SlackBuild b/system/winetricks/winetricks.SlackBuild
index 161db2cbcb..873c4383bf 100644
--- a/system/winetricks/winetricks.SlackBuild
+++ b/system/winetricks/winetricks.SlackBuild
@@ -1,10 +1,13 @@
-#!/bin/sh
+#!/bin/bash
+
 # Slackware build script for winetricks
 # Copyright 2017-2019 Donald Cooley South Haven, Indiana USA
+# Copyright 2022-2023 Isaac Yu <isaacyu@protonmail.com>
 
 # Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
 
 # Copyright 2011 by Giovanne Castro, Campinas, Sao Paulo, Brazil <giovannefc@ig.com.br>
+# Copyright 2023 Yth | Pont-en-Royans, France | yth@ythogtha.org
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,14 +27,21 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=winetricks
-VERSION=${VERSION:-20190615}
+VERSION=${VERSION:-20240105}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -73,4 +83,4 @@ mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/winetricks/winetricks.info b/system/winetricks/winetricks.info
index 9fbaf51e53..d41b8e7e03 100644
--- a/system/winetricks/winetricks.info
+++ b/system/winetricks/winetricks.info
@@ -1,10 +1,10 @@
 PRGNAM="winetricks"
-VERSION="20190615"
+VERSION="20240105"
 HOMEPAGE="https://github.com/Winetricks/winetricks"
-DOWNLOAD="https://github.com/Winetricks/winetricks/archive/20190615/winetricks-20190615.tar.gz"
-MD5SUM="6aab44e45da90fc53890b472dd499c81"
+DOWNLOAD="https://github.com/Winetricks/winetricks/archive/20240105/winetricks-20240105.tar.gz"
+MD5SUM="3d21aa2867a0f638f36ffb9a33d3ed5f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cabextract wine"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"
diff --git a/system/winusb/winusb.SlackBuild b/system/winusb/winusb.SlackBuild
index 458576d261..07069abc5a 100644
--- a/system/winusb/winusb.SlackBuild
+++ b/system/winusb/winusb.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for winusb
 
@@ -22,28 +22,38 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220208 bkw: Modified by SlackBuilds.org, to fix the build on 15.0
+# and work around the /usr/bin/wx-config brain damage.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=winusb
 VERSION=${VERSION:-1.0.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 DOCS="AUTHORS ChangeLog COPYING INSTALL README"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -78,6 +88,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --with-wx-config=/usr/lib$LIBDIRSUFFIX/wx/config/gtk2-unicode-release-2.8 \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
@@ -101,12 +112,12 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 # For pkexec configuration
 mkdir -p $PKG/usr/share/polkit-1/actions
 sed -i 's/^\(Exec\)=winusbgui$/\1=winusbgui_polkit/' $PKG/usr/share/applications/winusbgui.desktop
-install -m0755 -o 0:0 $CWD/winusbgui_polkit $PKG/usr/bin
-install -m0644 -o 0:0 $CWD/com.slackware.pkexec.winusb.policy $PKG/usr/share/polkit-1/actions
+install -m0755 -o root -g root $CWD/winusbgui_polkit $PKG/usr/bin
+install -m0644 -o root -g root $CWD/com.slackware.pkexec.winusb.policy $PKG/usr/share/polkit-1/actions
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/wipe/README b/system/wipe/README
deleted file mode 100644
index a9185491fc..0000000000
--- a/system/wipe/README
+++ /dev/null
@@ -1,4 +0,0 @@
-wipe (Secure data destruction).
-
-Wipe  is a file and block device wiping utility. It is based on  work
-by Peter Gutmann.
diff --git a/system/wipe/slack-desc b/system/wipe/slack-desc
deleted file mode 100644
index 09ce1bbae7..0000000000
--- a/system/wipe/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-    |-----handy-ruler------------------------------------------------------|
-wipe: wipe (Secure data destruction)
-wipe:
-wipe: Wipe  is a file and block device wiping utility. It is based on  work
-wipe: by Peter Gutmann.
-wipe:
-wipe: Home page: https://sourceforge.net/projects/wipe/
-wipe:
-wipe:
-wipe:
-wipe:
-wipe:
diff --git a/system/wipe/wipe.SlackBuild b/system/wipe/wipe.SlackBuild
deleted file mode 100644
index 0db357d199..0000000000
--- a/system/wipe/wipe.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for wipe.
-#
-# Copyright 2015-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=wipe
-VERSION=${VERSION:-2.3.1}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --build=$ARCH-slackware-linux
-
-make
-make install prefix=$PKG/usr mandir=$PKG/usr/man
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-DOCS="CHANGES copyright INSTALL LICENSE README TESTING TODO"
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/wipe/wipe.info b/system/wipe/wipe.info
deleted file mode 100644
index 2d7bb3d47a..0000000000
--- a/system/wipe/wipe.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="wipe"
-VERSION="2.3.1"
-HOMEPAGE="https://sourceforge.net/projects/wipe/"
-DOWNLOAD="https://sourceforge.net/projects/wipe/files/wipe/2.3.1/wipe-2.3.1.tar.bz2"
-MD5SUM="3aed00711e0490edbec115bc283b8544"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
diff --git a/system/wmconfig/README b/system/wmconfig/README
index 1f6e92448a..1943aaf850 100644
--- a/system/wmconfig/README
+++ b/system/wmconfig/README
@@ -1,23 +1,26 @@
 wmconfig is a free tool for automatically generating menus for various
-X window managers. It uses a very simple configuration, it's fast and small.
-A special toolkit (Gtk or Qt / KDE) is not required and the menu entries may
-be edited with the text editor of your choice.
+X window managers. It uses a very simple configuration, it's fast and
+small. A special toolkit (Gtk or Qt/KDE) is not required and the menu
+entries may be edited with the text editor of your choice.
 
-wmconfig will read the application template files located in /etc/wmconfig
-and add an entry into the menu if that application is found on your system.
-It will also read the application template files from the .wmconfig directory
-in the user's home directory.  Therefore, the user's settings will override
-the system-wide settings. If optionally any extra files are given as an
-argument on the command line, those will be read last and merged with the
-others (possibly overriding the settings in system and user home dir files).
+wmconfig will read the application template files located in
+/etc/wmconfig and add an entry into the menu if that application is
+found on your system.  It will also read the application template
+files from the .wmconfig directory in the user's home directory.
+Therefore, the user's settings will override the system-wide
+settings. If optionally any extra files are given as an argument on
+the command line, those will be read last and merged with the others
+(possibly overriding the settings in system and user home dir files).
 
-To set a default terminal other than xterm for programs that require it, pass
-TERMINAL=urxvt (or any other terminal) to the build script.  The terminal
-option (--terminal) can also be set at runtime.
+To set a default terminal other than xterm for programs that require
+it, pass TERMINAL=urxvt (or any other terminal) to the build script.
+The terminal option (--terminal) can also be set at runtime.
 
-wmconfig creates menus for the following window managers/desktop environments:
-debug, fvwm95, fvwm2, afterstep, mwm, icewm, blackbox, wmaker, twm, olwm,
-olvwm, fvwm, mlvwm, kde1, kde2, kde3, kde4, qvwm, pekwm, golem, fluxbox, ctwm,
-gnome, openbox, aewm, amiwm, kahakai, pwm, sapphire, e16, e17, e19,
-enlightenment, epiwm, ede, equinox, ude, xfce, wmx, flwm, tvtwm, vtwm, piewm,
-freedesktop, lxde, jwm, sithwm, sawfish
+wmconfig creates menus for the following window managers/desktop
+environments:
+
+debug, fvwm95, fvwm2, afterstep, mwm, icewm, blackbox, wmaker, twm,
+olwm, olvwm, fvwm, mlvwm, kde1, kde2, kde3, kde4, qvwm, pekwm, golem,
+fluxbox, ctwm, gnome, openbox, aewm, amiwm, kahakai, pwm, sapphire,
+e16, e17, e19, enlightenment, epiwm, ede, equinox, ude, xfce, wmx,
+flwm, tvtwm, vtwm, piewm, freedesktop, lxde, jwm, sithwm, sawfish
diff --git a/system/wmconfig/wmconfig.SlackBuild b/system/wmconfig/wmconfig.SlackBuild
index c7fb383a68..1294091779 100644
--- a/system/wmconfig/wmconfig.SlackBuild
+++ b/system/wmconfig/wmconfig.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wmconfig
 #
@@ -22,29 +22,39 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wmconfig
 VERSION=${VERSION:-1.4.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 # Set which terminal to use for programs that require it (Mutt, Lynx, etc)
 TERMINAL=${TERMINAL:-xterm}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -103,4 +113,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/wmfsm/README b/system/wmfsm/README
index a18f5f2564..712f2ccf45 100644
--- a/system/wmfsm/README
+++ b/system/wmfsm/README
@@ -1,6 +1,9 @@
-Nice graphical "df", showing you to what degree the mounted filesystems are used.
+Nice graphical "df", showing you to what degree the mounted
+filesystems are used.
 
-Copy "sample.wmfsmrc" to "~/.wmfsmrc" and edit it for custom configuration.
+Copy "sample.wmfsmrc" to "~/.wmfsmrc" and edit it for custom
+configuration.
 
-There are 3 available themes: "cyan", "highcolor" (default) and "lowcolor"
-Find and edit "--with-xpm=" in "wmfsm.SlackBuild" to change the theme if wanted.
+There are 3 available themes: "cyan", "highcolor" (default) and
+"lowcolor" Find and edit "--with-xpm=" in "wmfsm.SlackBuild" to change
+the theme if wanted.
diff --git a/system/wmfsm/wmfsm.SlackBuild b/system/wmfsm/wmfsm.SlackBuild
index c57fc1c384..98c937b1d6 100644
--- a/system/wmfsm/wmfsm.SlackBuild
+++ b/system/wmfsm/wmfsm.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wmfsm
 
@@ -22,11 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220414 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - remove 0-byte NEWS from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wmfsm
 SRCDIR=dockapps-83c2c40
 VERSION=${VERSION:-0.36}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,9 +76,9 @@ cd $SRCDIR
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p $PKG/usr/bin
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -84,19 +94,16 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-xpm=highcolor      # Choices are:cyan highcolor lowcolor
 
 make
+strip $PRGNAM/$PRGNAM
 make install DESTDIR=$PKG PREFIX=$PKG/usr MANDIR=$PKG/usr/man
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip $PKG/usr/man/man*/*
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cp -v AUTHORS ChangeLog COPYING NEWS README wmfsm/wmfsmrc.sample $PKG/usr/doc/$PRGNAM-$VERSION/
+install -m0644 AUTHORS ChangeLog COPYING README wmfsm/wmfsmrc.sample \
+               $PKG/usr/doc/$PRGNAM-$VERSION/
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/wmgtemp/fixes.diff b/system/wmgtemp/fixes.diff
new file mode 100644
index 0000000000..591e5494de
--- /dev/null
+++ b/system/wmgtemp/fixes.diff
@@ -0,0 +1,192 @@
+diff -Naur wmgtemp-1.2/src/wmgtemp.c wmgtemp-1.2.work/src/wmgtemp.c
+--- wmgtemp-1.2/src/wmgtemp.c	2017-02-01 21:56:50.000000000 -0500
++++ wmgtemp-1.2.work/src/wmgtemp.c	2021-08-09 17:22:46.640646642 -0400
+@@ -691,19 +691,19 @@
+ 	 "                          [Default: autodetect]\n" \
+ 	 "   -s, --scale=SCALE      Display temperatures in SCALE\n" \
+ 	 "                          SCALE=kelvin, fahrenheit\n" \
+-	 "                          [Default: celcius]\n" \
++	 "                          [Default: celsius]\n" \
+ 	 "   -g, --graph=STYLE      Display graph as STYLE\n" \
+ 	 "                          STYLE=line, block\n" \
+ 	 "                          [Default: line]\n" \
+-	 "   -H, --high=TEMP        Display red warning light at TEMP degrees celcius\n" \
++	 "   -H, --high=TEMP        Display red warning light at TEMP degrees celsius\n" \
+ 	 "                          [Default: 50]\n" \
+-	 "   -w, --warn=TEMP        Display amber warning light at TEMP degrees celcius\n" \
++	 "   -w, --warn=TEMP        Display amber warning light at TEMP degrees celsius\n" \
+ 	 "                          [Default: 45]\n" \
+ 	 "   -u, --update=SEC       Update the display every SEC seconds\n" \
+ 	 "                          [Default: 1]\n" \
+-	 "   -m, --min=TEMP         Set lower bound of the graph to TEMP degrees celcius\n" \
++	 "   -m, --min=TEMP         Set lower bound of the graph to TEMP degrees celsius\n" \
+ 	 "                          [Default: 20]\n" \
+-	 "   -M, --max=TEMP         Set upper bound of the graph to TEMP degrees celcius\n" \
++	 "   -M, --max=TEMP         Set upper bound of the graph to TEMP degrees celsius\n" \
+ 	 "                          [Default: 35]\n" \
+ 	 "   -1, --feature1=F1      Set the feature for CPU\n" \
+ 	 "                          [Default: temp1]\n" \
+@@ -711,7 +711,7 @@
+ 	 "                          [Default: temp2]\n" \
+ 	 "   -c, --chip=NAME        Use sensor chip matching NAME\n" \
+ 	 "                          [Default: use any]\n" \
+-	 "   -a, --execat=TEMP      Execute a command at TEMP degrees celcius\n" \
++	 "   -a, --execat=TEMP      Execute a command at TEMP degrees celsius\n" \
+ 	 "   -e, --exec=COMMAND     Execute COMMAND when 'execat' temperature is reached\n" \
+ 	 "   -t, --swap             Swap CPU and SYS temps\n" \
+ 	 "   -q, --quiet            Don't display any messages\n" \
+@@ -874,6 +874,7 @@
+   };
+   
+   p = getenv("HOME");
++  if(!p) p = ".";
+   strcpy(temp, p);
+   strcat(temp, "/.wmgtemprc");
+   parse_rcfile(temp, wmgtemp_keys);
+@@ -992,7 +993,7 @@
+     }
+     else {
+       if(quiet == 0)
+-	printf("wmgtemp: high temp set to %d degrees celcius.\n", (int)high_temp);
++	printf("wmgtemp: high temp set to %d degrees celsius.\n", (int)high_temp);
+     }
+   }
+   if(rc_warn != NULL) {
+@@ -1003,7 +1004,7 @@
+     }
+     else {
+       if(quiet == 0)
+-	printf("wmgtemp: warning temp set to %d degrees celcius.\n", (int)warn_temp);
++	printf("wmgtemp: warning temp set to %d degrees celsius.\n", (int)warn_temp);
+     }
+   }
+   if(rc_max != NULL) {
+@@ -1014,7 +1015,7 @@
+     }
+     else {
+       if(quiet == 0)
+-	printf("wmgtemp: Upper range set to %d degrees celcius.\n", (int)range_upper);
++	printf("wmgtemp: Upper range set to %d degrees celsius.\n", (int)range_upper);
+     }
+   }
+   if(rc_min != NULL) {
+@@ -1025,7 +1026,7 @@
+     }
+     else {
+       if(quiet == 0)
+-	printf("wmgtemp: Lower range set to %d degrees celcius.\n", (int)range_lower);
++	printf("wmgtemp: Lower range set to %d degrees celsius.\n", (int)range_lower);
+     }
+   }
+   if(rc_delay != NULL) {
+@@ -1049,15 +1050,15 @@
+       if(rc_exec != NULL) {
+ 	if(strcmp(rc_exec, "")) {
+ 	  exec_app = strdup(rc_exec);
+-	  printf("wmgtemp: Executing \"%s\" at %d degrees celcius.\n", exec_app, (int)execat);
++	  printf("wmgtemp: Executing \"%s\" at %d degrees celsius.\n", exec_app, (int)execat);
+ 	}
+ 	else {
+-	  printf("You must supply an command to execute\n");
++	  printf("You must supply a command to execute\n");
+ 	  parse_ok = 0;
+ 	}
+       }
+       else {
+-	printf("You must supply an command to execute\n");
++	printf("You must supply a command to execute\n");
+ 	parse_ok = 0;
+       }
+     }
+diff -Naur wmgtemp-1.2/wmgtemp.1 wmgtemp-1.2.work/wmgtemp.1
+--- wmgtemp-1.2/wmgtemp.1	2017-02-01 21:56:50.000000000 -0500
++++ wmgtemp-1.2.work/wmgtemp.1	2021-08-09 17:24:25.928637617 -0400
+@@ -21,9 +21,9 @@
+ display the usage information
+ .TP
+ .B \-s, \-\-scale=SCALE
+-show temperatures using SCALE temperature scale. SCALE=celcius, fahrenheit or kelvin.
++show temperatures using SCALE temperature scale. SCALE=celsius, fahrenheit or kelvin. Only the first character is significant (you can just say c for celsius, etc).
+ .br
+-\fBDefault\fP: celcius
++\fBDefault\fP: celsius
+ .TP
+ .B \-S, \-\-sensorconf=PATH
+ specify the PATH to the lm_sensors config
+@@ -37,13 +37,13 @@
+ .TP
+ 
+ .B \-H, \-\-high=TEMP
+-display red warning light at TEMP degrees celcius.
++display red warning light at TEMP degrees celsius.
+ .br
+ \fBDefault\fP: 50
+ .TP
+ 
+ .B \-w, \-\-warn=TEMP
+-display amber warning light at TEMP degrees celcius.
++display amber warning light at TEMP degrees celsius.
+ .br
+ \fBDefault\fP: 45
+ 
+@@ -55,13 +55,13 @@
+ 
+ .TP
+ .B \-m, \-\-min=TEMP
+-set the lower bound of the graph to TEMP degrees celcius.
++set the lower bound of the graph to TEMP degrees celsius.
+ .br
+ \fBDefault\fP: 20
+ 
+ .TP
+ .B \-M, \-\-max=TEMP
+-set the upper bound of the graph to TEMP degrees celcius.
++set the upper bound of the graph to TEMP degrees celsius.
+ .br
+ \fBDefault\fP: 35
+ 
+@@ -85,7 +85,7 @@
+ 
+ .TP
+ .B \-a, \-\-execat=TEMP
+-execute a command at TEMP degrees celcius.
++execute a command at TEMP degrees celsius.
+ .br
+ \fBDefault\fP: none
+ 
+@@ -111,7 +111,7 @@
+ .nf
+ .IP
+ # wmgtemp example config
+-scale:celcius
++scale:celsius
+ graph:line
+ high:50
+ warn:45
+@@ -130,24 +130,19 @@
+ You can cycle through the graph types by clicking on the graph display area.
+ .PP
+ .SS High Temperature Toggle
+-You can toggle the displaying of high temperatures by click on the temperature for the corrosponding temperature. The viewing of high temperatures is indicated by an amber arrow to the left of the temperature. The current temperatures will continue to be displayed on the graph.
++You can toggle the displaying of high temperatures by click on the temperature for the corresponding temperature. The viewing of high temperatures is indicated by an amber arrow to the left of the temperature. The current temperatures will continue to be displayed on the graph.
+ .PP
+ .SH
+ .SS Temperature display TOGGLE
+-You may toggle the displaying of a temperature on the graph by clicking on the corrosponding type. e.g To toggle the display of the CPU temperature click on CPU. The type indicator (CPU or SYS) will disappear and the temperature will not be displayed on the graph, although the temperature value will continue to be displayed.
++You may toggle the displaying of a temperature on the graph by clicking on the corresponding type. E.g. to toggle the display of the CPU temperature, click on CPU. The type indicator (CPU or SYS) will disappear and the temperature will not be displayed on the graph, although the temperature value will continue to be displayed.
+ .PP
+ .SH
+ .SS Temperature Scale Cycling
+ You may change the scale the temperatures are displayed in by clicking on either of the CPU or SYS scale indicators. The cycle order is \fBC\fP -> \fBK\fP -> \fBF\fP
+ .PP
+-.SH BUGS
+-Blank lines in the config file cause a Segmentation Fault.
+-.PP
+ .SH SEE ALSO
+ .BR sensors.conf (5),
+ .BR libsensors (3),
+ .BR wmaker (1x)
+ .SH AUTHOR
+ wmgtemp was written by Roger Dunce <kronos@fluxcode.net>
+-
+-
diff --git a/system/wmgtemp/wmgtemp.SlackBuild b/system/wmgtemp/wmgtemp.SlackBuild
index f8c546215f..063cb57317 100644
--- a/system/wmgtemp/wmgtemp.SlackBuild
+++ b/system/wmgtemp/wmgtemp.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wmgtemp
 #
 # Copyright 2015 Gethyn ThomasQuail <email removed>
-# Copyright 2020 B. Watson <yalhcru@gmail.com>
+# Copyright 2020 B. Watson <urchlay@slackware.uk>
 # All rights reserved.
 #
 # Based on:
@@ -26,9 +26,15 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Now maintained by B. Watson <yalhcru@gmail.com>
+# Now maintained by B. Watson <urchlay@slackware.uk>
+
+# 20210809 bkw: minor fixes, BUILD=2
+# - manpage: fix typo, corrosponding => corresponding
+# - manpage: remove BUGS section since it no longer applies
+# - don't segfault if HOME not set in environment
 
 # 20200609 bkw: update for v1.2, add libdockapp dep
+
 # 20160816 bkw:
 # - take over maintenance
 # - BUILD=2
@@ -38,10 +44,13 @@
 # - default to the correct .conf for Slack's lm_sensors 3.x
 # - don't install INSTALL to doc dir
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wmgtemp
 VERSION=${VERSION:-1.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -51,7 +60,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -82,6 +95,9 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+# Various minor fixes by SlackBuild author
+patch -p1 < $CWD/fixes.diff
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -105,4 +121,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/wmgtemp/wmgtemp.info b/system/wmgtemp/wmgtemp.info
index 0ead6258c1..1c85a54209 100644
--- a/system/wmgtemp/wmgtemp.info
+++ b/system/wmgtemp/wmgtemp.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libdockapp"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/worker/worker.SlackBuild b/system/worker/worker.SlackBuild
index 2fbcab7f62..f759f6d62a 100644
--- a/system/worker/worker.SlackBuild
+++ b/system/worker/worker.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # This script creates a Slackware package from the worker source
 
 # Copyright 2006,2009  Robby Workman, Northport, Alabama, USA
@@ -26,10 +26,13 @@
 # Modified by Andrey Maraev <andrew dot maraev60 at yandex dot ru>
 # Modified by Eugene M., <damagedone at gmx dot com
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=worker
-VERSION=${VERSION:-4.7.0}
+VERSION=${VERSION:-5.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -39,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -94,7 +101,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README README_LARGEFILES THANKS \
+cp -a AUTHORS COPYING ChangeLog NEWS README README_LARGEFILES THANKS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -103,4 +110,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/worker/worker.info b/system/worker/worker.info
index f959e35ebf..75110db1a0 100644
--- a/system/worker/worker.info
+++ b/system/worker/worker.info
@@ -1,8 +1,8 @@
 PRGNAM="worker"
-VERSION="4.7.0"
+VERSION="5.0.2"
 HOMEPAGE="http://www.boomerangsworld.de/worker/"
-DOWNLOAD="http://www.boomerangsworld.de/cms/worker/downloads/worker-4.7.0.tar.bz2"
-MD5SUM="97247f5ea8575e010abaa9b356258efa"
+DOWNLOAD="http://www.boomerangsworld.de/cms/worker/downloads/worker-5.0.2.tar.bz2"
+MD5SUM="d1e74423e4fb6632972f97cac0323e10"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="avfs"
diff --git a/system/wqy-microhei-font-ttf/65-wqy-microhei.conf b/system/wqy-microhei-font-ttf/65-wqy-microhei.conf
index 37e15f1b90..cbd97fff8b 100644
--- a/system/wqy-microhei-font-ttf/65-wqy-microhei.conf
+++ b/system/wqy-microhei-font-ttf/65-wqy-microhei.conf
@@ -6,7 +6,11 @@
 <match target="font">
 	<test qual="any" name="family">
 		<string>WenQuanYi Micro Hei</string>
+	</test>
+	<test qual="any" name="family">
 		<string>文泉驿微米黑</string>
+	</test>
+	<test qual="any" name="family">
 		<string>文泉驛微米黑</string>
 	</test>
 		<edit name="globaladvance"><bool>false</bool></edit>
diff --git a/system/wqy-microhei-font-ttf/README b/system/wqy-microhei-font-ttf/README
index 1830628ed0..d7897fec03 100644
--- a/system/wqy-microhei-font-ttf/README
+++ b/system/wqy-microhei-font-ttf/README
@@ -1,8 +1,7 @@
-WenQuanYi Micro Hei font family is a Sans-Serif style (also known as Hei,
-Gothic or Dotum among the Chinese/Japanese/Korean users) high quality
-CJK outline font. It was derived from "Droid Sans Fallback", "Droid
-Sans" and "Droid Sans Mono" released by Google Corp.
+WenQuanYi Micro Hei font family is a Sans-Serif style (also known as
+Hei, Gothic or Dotum among the Chinese/Japanese/Korean users) high
+quality CJK outline font. It was derived from "Droid Sans Fallback",
+"Droid Sans" and "Droid Sans Mono" released by Google Corp.
 
 This package installs /etc/fonts/conf.avail/65-wqy-microhei.conf and
 symlinks it to /etc/fonts/conf.d/.
-
diff --git a/system/wqy-microhei-font-ttf/wqy-microhei-font-ttf.SlackBuild b/system/wqy-microhei-font-ttf/wqy-microhei-font-ttf.SlackBuild
index 1a07f47c67..cb6d8b8d4c 100644
--- a/system/wqy-microhei-font-ttf/wqy-microhei-font-ttf.SlackBuild
+++ b/system/wqy-microhei-font-ttf/wqy-microhei-font-ttf.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for WenQuanYi Micro Hei
 
@@ -27,17 +27,28 @@
 #   SUCH DAMAGE.
 # -----------------------------------------------------------------------------
 
+# 20220218 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - stop all fontconfig-using apps from spewing warnings about bad
+#   syntax in 65-wqy-microhei.conf.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wqy-microhei-font-ttf
 VERSION=${VERSION:-0.2.0_beta}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
 SRCNAM=wqy-microhei
 SRCVERSION=$(echo $VERSION | tr _ -)
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,16 +65,16 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 mkdir -p $PKG/usr/share/fonts/TTF
 cp -a *.ttc $PKG/usr/share/fonts/TTF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS.txt  ChangeLog.txt  INSTALL.txt  LICENSE_Apache2.txt  LICENSE_GPLv3.txt  README.txt \
+  AUTHORS.txt ChangeLog.txt LICENSE_Apache2.txt LICENSE_GPLv3.txt README.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -76,5 +87,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
 
diff --git a/system/wterm/wterm.SlackBuild b/system/wterm/wterm.SlackBuild
index 833c63f5f6..c28b1efd7e 100644
--- a/system/wterm/wterm.SlackBuild
+++ b/system/wterm/wterm.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Wterm
 
-# Copyright (c) 2014, Yanes Checcacci Balod <yanes@pobox.com>, Brazil
+# Copyright (c) 2014, Yanes Checcacci Balod <email removed>, Brazil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,36 +22,48 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230613 bkw: BUILD=4, modified by SlackBuilds.org:
+# - fix it so it actually compiles.
+# - clean up the docs a bit.
+# - *not* taking over maintainership. if nobody on the mailing list wants
+#   this build, it will get marked as orphaned and eventually removed,
+#   probably during our dev cycle after 15.1 release.
+# Note: This looks like a fork of rxvt. Some of its docs refer to it
+# as rxvt, still. Not going to patch them.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wterm
 VERSION=${VERSION:-6.2.9}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -63,12 +75,10 @@ rm -rf $PRGNAM-$VERSION
 tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
+SLKCFLAGS+=" -fcommon"
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -84,22 +94,27 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-xpm-background \
 
 make
+strip src/$PRGNAM
 make install DESTDIR=$PKG
+gzip $PKG/usr/man/man*/*
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# 20230613 bkw: include the terminfo entry in the package.
+mkdir -p $PKG/usr/share/terminfo
+tic -o $PKG/usr/share/terminfo doc/etc/wterm.terminfo
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
-### FIX! Create Utils in /usr/doc/wterm-$VERSION!
-cp -rv doc/* $PKG/usr/doc/$PRGNAM-$VERSION/
+# 20230613 bkw: don't install everything from doc/, some of it's
+# Makefiles and the source for the HTML, etc. Don't install anything
+# in the doc dir with execute permission.
+cd doc
+chmod -x menu/*
+cp -a BUGS FAQ README* TODO *.txt *.html menu $PKGDOC
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/wterm/wterm.info b/system/wterm/wterm.info
index aac7bc98c4..ddd0410dc1 100644
--- a/system/wterm/wterm.info
+++ b/system/wterm/wterm.info
@@ -6,5 +6,5 @@ MD5SUM="2d9f1de4c30fb637053dbceb3400aa3d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Yanes Checcacci Balod"
-EMAIL="yanes@pobox.com"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/x86_energy_perf_policy/README b/system/x86_energy_perf_policy/README
index 6dd1134082..1de66d4c4c 100644
--- a/system/x86_energy_perf_policy/README
+++ b/system/x86_energy_perf_policy/README
@@ -1,4 +1,5 @@
-x86_energy_perf_policy allows software to convey its policy for the relative
-importance of performance versus energy savings to the processor. The processor
-uses this information in model-specific ways when it must select trade-offs
-between performance and energy efficiency.
+x86_energy_perf_policy allows software to convey its policy for the
+relative importance of performance versus energy savings to the
+processor. The processor uses this information in model-specific
+ways when it must select trade-offs between performance and energy
+efficiency.
diff --git a/system/x86_energy_perf_policy/x86_energy_perf_policy.SlackBuild b/system/x86_energy_perf_policy/x86_energy_perf_policy.SlackBuild
index 54a4d7d4db..c242acff93 100644
--- a/system/x86_energy_perf_policy/x86_energy_perf_policy.SlackBuild
+++ b/system/x86_energy_perf_policy/x86_energy_perf_policy.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for x86_energy_perf_policy
 
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=x86_energy_perf_policy
 SRCNAM=linux
 VERSION=${VERSION:-4.4.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -92,4 +102,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xar/README b/system/xar/README
new file mode 100644
index 0000000000..3bc8e854ed
--- /dev/null
+++ b/system/xar/README
@@ -0,0 +1,21 @@
+xar (eXtensible ARchiver)
+
+The XAR project aims to provide an easily extensible archive
+format. Important design decisions include an easily extensible XML
+table of contents (TOC) for random access to archived files, storing
+the TOC at the beginning of the archive to allow for efficient
+handling of streamed archives, the ability to handle files of
+arbitrarily large sizes, the ability to choose independent encodings
+for individual files in the archive, the ability to store checksums
+for individual files in both compressed and uncompressed form, and the
+ability to query the table of content's rich meta-data.
+
+xar is used primarily for software install packages (.pkg files) for
+macOS X.
+
+To actually extract a .pkg file, do something like:
+
+$ xar -x -f filename.pkg
+$ zcat base.pkg/Payload | cpio -iv
+
+You'll end up with Applications/ Library/ Resources/, etc.
diff --git a/system/xar/patches/series b/system/xar/patches/series
new file mode 100644
index 0000000000..49d45200fe
--- /dev/null
+++ b/system/xar/patches/series
@@ -0,0 +1,7 @@
+xar-1.6.1-ext2.patch
+xar-1.8-safe_dirname.patch
+xar-1.8-arm-ppc.patch
+xar-1.8-openssl-1.1.patch
+xar-1.8.0.0.452-linux.patch
+xar-1.8.0.0.487-non-darwin.patch
+xar-1.8.0.0.487-variable-sized-object.patch
diff --git a/system/xar/patches/xar-1.6.1-ext2.patch b/system/xar/patches/xar-1.6.1-ext2.patch
new file mode 100644
index 0000000000..da413b03e5
--- /dev/null
+++ b/system/xar/patches/xar-1.6.1-ext2.patch
@@ -0,0 +1,24 @@
+--- a/lib/ext2.c.orig
++++ b/lib/ext2.c
+@@ -139,8 +139,10 @@
+ 	if(! (flags & ~EXT2_NOCOMPR_FL) )
+ 		x_addprop(f, "NoCompBlock");
+ #endif
++#ifdef EXT2_ECOMPR_FL
+ 	if(! (flags & ~EXT2_ECOMPR_FL) )
+ 		x_addprop(f, "CompError");
++#endif
+ 	if(! (flags & ~EXT2_BTREE_FL) )
+ 		x_addprop(f, "BTree");
+ 	if(! (flags & ~EXT2_INDEX_FL) )
+@@ -225,8 +227,10 @@
+ 	if( e2prop_get(f, "NoCompBlock", (char **)&tmp) == 0 )
+ 		flags |= EXT2_NOCOMPR_FL ;
+ #endif
++#ifdef EXT2_ECOMPR_FL
+ 	if( e2prop_get(f, "CompError", (char **)&tmp) == 0 )
+ 		flags |= EXT2_ECOMPR_FL ;
++#endif
+ 	if( e2prop_get(f, "BTree", (char **)&tmp) == 0 )
+ 		flags |= EXT2_BTREE_FL ;
+ 	if( e2prop_get(f, "HashIndexed", (char **)&tmp) == 0 )
diff --git a/system/xar/patches/xar-1.8-arm-ppc.patch b/system/xar/patches/xar-1.8-arm-ppc.patch
new file mode 100644
index 0000000000..b2eec5a96e
--- /dev/null
+++ b/system/xar/patches/xar-1.8-arm-ppc.patch
@@ -0,0 +1,23 @@
+--- a/lib/archive.c
++++ b/lib/archive.c
+@@ -387,7 +387,8 @@
+ 			return NULL;
+ 		}
+         
+-		XAR(ret)->heap_offset = xar_get_heap_offset(ret) + offset;
++		XAR(ret)->heap_offset =
++			XAR(ret)->toc_count + sizeof(xar_header_t) + offset;
+ 		if( lseek(XAR(ret)->fd, XAR(ret)->heap_offset, SEEK_SET) == -1 ) {
+ 			xar_close(ret);
+ 			return NULL;
+--- a/src/xar.c
++++ a/src/xar.c
+@@ -783,7 +783,7 @@
+ int main(int argc, char *argv[]) {
+ 	int ret;
+ 	char *filename = NULL;
+-	char command = 0, c;
++	signed char command = 0, c;
+ 	char **args;
+ 	const char *tocfile = NULL;
+ 	int arglen, i, err;
diff --git a/system/xar/patches/xar-1.8-openssl-1.1.patch b/system/xar/patches/xar-1.8-openssl-1.1.patch
new file mode 100644
index 0000000000..f811d99d07
--- /dev/null
+++ b/system/xar/patches/xar-1.8-openssl-1.1.patch
@@ -0,0 +1,45 @@
+lib/hash.c: fix compilation with OpenSSL-1.1+
+
+EVP_MD_CTX has become an anonymous struct now, so can't allocate size
+for it anymore.
+
+--- a/lib/hash.c	2015-06-09 03:22:07.000000000 +0000
++++ b/lib/hash.c	2019-01-01 14:37:01.487775958 +0000
+@@ -102,7 +102,7 @@
+ #ifdef __APPLE__
+ 	CCDigestRef digest;
+ #else
+-	EVP_MD_CTX digest;
++	EVP_MD_CTX *digest;
+ 	const EVP_MD *type;
+ #endif
+ 	unsigned int length;
+@@ -123,7 +123,8 @@
+ #else
+ 	OpenSSL_add_all_digests();
+ 	HASH_CTX(hash)->type = EVP_get_digestbyname(digest_name);
+-	EVP_DigestInit(&HASH_CTX(hash)->digest, HASH_CTX(hash)->type);
++	HASH_CTX(hash)->digest = EVP_MD_CTX_create();
++	EVP_DigestInit(HASH_CTX(hash)->digest, HASH_CTX(hash)->type);
+ #endif
+ 	
+ 	HASH_CTX(hash)->digest_name = strdup(digest_name);
+@@ -143,7 +143,7 @@
+ #ifdef __APPLE__
+ 	CCDigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte);
+ #else
+-	EVP_DigestUpdate(&HASH_CTX(hash)->digest, buffer, nbyte);
++	EVP_DigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte);
+ #endif
+ }
+ 
+@@ -160,7 +160,8 @@
+ 	CCDigestFinal(HASH_CTX(hash)->digest, buffer);
+ 	CCDigestDestroy(HASH_CTX(hash)->digest);
+ #else
+-	EVP_DigestFinal(&HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length);
++	EVP_DigestFinal(HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length);
++	EVP_MD_CTX_destroy(HASH_CTX(hash)->digest);
+ #endif
+ 	
+ 	*nbyte = HASH_CTX(hash)->length;
diff --git a/system/xar/patches/xar-1.8-safe_dirname.patch b/system/xar/patches/xar-1.8-safe_dirname.patch
new file mode 100644
index 0000000000..eb2f5f071b
--- /dev/null
+++ b/system/xar/patches/xar-1.8-safe_dirname.patch
@@ -0,0 +1,16 @@
+linuxattr: fix missing symbol safe_dirname
+
+This one was probably missed when they did a global rename to xar_
+prefixed variants.
+
+--- a/lib/linuxattr.c
++++ b/lib/linuxattr.c
+@@ -223,7 +223,7 @@
+ 	if( statfs(file, &sfs) != 0 ) {
+ 		char *tmp, *bname;
+ 		tmp = strdup(file);
+-		bname = safe_dirname(tmp);
++		bname = xar_safe_dirname(tmp);
+ 		statfs(bname, &sfs);
+ 		free(tmp);
+ 		free(bname);
diff --git a/system/xar/patches/xar-1.8.0.0.452-linux.patch b/system/xar/patches/xar-1.8.0.0.452-linux.patch
new file mode 100644
index 0000000000..ccfc68369a
--- /dev/null
+++ b/system/xar/patches/xar-1.8.0.0.452-linux.patch
@@ -0,0 +1,104 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -183,7 +183,7 @@
+ 
+ AC_TRY_COMPILE([#include <sys/types.h> 
+ #include <sys/acl.h>], [acl_t a], [AC_DEFINE([HAVE_SYS_ACL_H],[1], [define if you have sys/acl.h and it has a working acl_t type])])
+-AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h)
++AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/vfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h)
+ AC_CHECK_FUNCS(lgetxattr)
+ AC_CHECK_FUNCS(lsetxattr)
+ AC_CHECK_FUNCS(getxattr)
+@@ -199,7 +199,22 @@
+ 
+ AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[#include <sys/types.h>
+ #include <sys/param.h>
+-#include <sys/mount.h>])
++#include <sys/mount.h>
++#ifdef HAVE_SYS_VFS_H
++#include <sys/vfs.h>
++#endif])
++AC_CHECK_MEMBERS([struct statfs.f_iosize],,,[#include <sys/types.h>
++#include <sys/param.h>
++#include <sys/mount.h>
++#ifdef HAVE_SYS_VFS_H
++#include <sys/vfs.h>
++#endif])
++AC_CHECK_MEMBERS([struct statfs.f_bsize],,,[#include <sys/types.h>
++#include <sys/param.h>
++#include <sys/mount.h>
++#ifdef HAVE_SYS_VFS_H
++#include <sys/vfs.h>
++#endif])
+ AC_CHECK_MEMBERS([struct statvfs.f_fstypename],,,[#include <sys/statvfs.h>])
+ AC_CHECK_MEMBERS([struct stat.st_flags])
+ 
+--- a/lib/util.c
++++ b/lib/util.c
+@@ -35,6 +35,8 @@
+  * Christopher Ryan <ryanc@apple.com>
+ */
+ 
++#include "config.h"
++
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <sys/types.h>
+@@ -40,6 +40,9 @@
+ #include <sys/types.h>
+ #include <sys/mount.h>
+ #include <sys/param.h>
++#ifdef HAVE_SYS_VFS_H
++# include <sys/vfs.h>
++#endif
+ #include <arpa/inet.h>
+ #include <string.h>
+ #include <unistd.h>
+@@ -467,6 +467,14 @@
+ 	return tmp;
+ }
+ 
++#ifndef HAVE_STRUCT_STATFS_F_IOSIZE
++# ifdef HAVE_STRUCT_STATFS_F_BSIZE
++#  define f_iosize f_bsize
++# else
++#  error need a field to get optimal transfer block size
++# endif
++#endif
++
+ size_t xar_optimal_io_size_at_path(const char *path)
+ {
+ 	// Start at 1MiB
+@@ -491,6 +491,7 @@
+ 			fs_iosize = optimal_rsize;
+ 		}
+ 		
++#ifdef MNT_LOCAL
+ 		// If we're a remote filesystem, never let us go below the optimal size above of 1MiB
+ 		// NFS is horrible and lies that the optimal size is 512 bytes.
+ 		// Whereas SMB in my testing returns 7MiBs (far more practicle)
+@@ -503,6 +504,7 @@
+ 			}
+ 		}
+ 		else
++#endif
+ 		{
+ 			optimal_rsize = fs_iosize;
+ 		}
+--- a/include/config.h.in
++++ b/include/config.h.in
+@@ -1,4 +1,5 @@
+ #undef HAVE_SYS_STATFS_H
++#undef HAVE_SYS_VFS_H
+ #undef HAVE_SYS_XATTR_H
+ #undef HAVE_SYS_EXTATTR_H
+ #undef HAVE_SYS_PARAM_H
+@@ -15,6 +15,8 @@
+ #undef HAVE_STRUCT_STAT_ST_FLAGS
+ #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME
+ #undef HAVE_STRUCT_STATFS_F_FSTYPENAME
++#undef HAVE_STRUCT_STATFS_F_IOSIZE
++#undef HAVE_STRUCT_STATFS_F_BSIZE
+ #undef HAVE_SYS_ACL_H
+ #undef HAVE_LIBUTIL_H
+ #undef HAVE_LIBPTHREAD
diff --git a/system/xar/patches/xar-1.8.0.0.487-non-darwin.patch b/system/xar/patches/xar-1.8.0.0.487-non-darwin.patch
new file mode 100644
index 0000000000..c350f69f4c
--- /dev/null
+++ b/system/xar/patches/xar-1.8.0.0.487-non-darwin.patch
@@ -0,0 +1,12 @@
+don't do availability stuff on non-Darwin
+
+--- a/include/xar.h.in
++++ b/include/xar.h.in
+@@ -52,6 +52,7 @@
+ #import <os/availability.h>
+ #else
+ #define API_DEPRECATED(...)
++#define API_AVAILABLE(...)
+ #endif
+ 
+ #pragma pack(4)
diff --git a/system/xar/patches/xar-1.8.0.0.487-variable-sized-object.patch b/system/xar/patches/xar-1.8.0.0.487-variable-sized-object.patch
new file mode 100644
index 0000000000..8779c1129c
--- /dev/null
+++ b/system/xar/patches/xar-1.8.0.0.487-variable-sized-object.patch
@@ -0,0 +1,18 @@
+GCC doesn't like this:
+
+filetree.c:744:9: error: variable-sized object may not be initialized
+
+Since there's nothing changing at runtime at all, just make the compiler
+see it's always going to be 1.
+
+--- a/lib/filetree.c
++++ b/lib/filetree.c
+@@ -740,7 +740,7 @@
+ 	size_t fspath1_size = 0, fspath2_size = 0;
+ 	size_t ns1_size = 0, ns2_size = 0;
+ 	const struct __xar_file_t * child1 = NULL, * child2 = NULL;
+-	const uint keys_to_ignore_count = 1;
++#define keys_to_ignore_count 1
+ 	char * keys_to_ignore[keys_to_ignore_count] = { "id" }; // ID is allowed ot mismatch
+ 	
+ 	// If the two pointers match, call it the same.
diff --git a/system/xar/slack-desc b/system/xar/slack-desc
new file mode 100644
index 0000000000..1e2dc082cb
--- /dev/null
+++ b/system/xar/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+   |-----handy-ruler------------------------------------------------------|
+xar: xar (eXtensible ARchiver)
+xar:
+xar: The XAR project aims to provide an easily extensible archive
+xar: format. Important design decisions include an easily extensible XML
+xar: table of contents (TOC) for random access to archived files, storing
+xar: the TOC at the beginning of the archive to allow for efficient
+xar: handling of streamed archives, the ability to handle files of
+xar: arbitrarily large sizes, the ability to choose independent encodings
+xar: for individual files in the archive, the ability to store checksums
+xar: for individual files in both compressed and uncompressed form, and the
+xar: ability to query the table of content's rich meta-data.
diff --git a/system/xar/xar.SlackBuild b/system/xar/xar.SlackBuild
new file mode 100644
index 0000000000..242854f5c9
--- /dev/null
+++ b/system/xar/xar.SlackBuild
@@ -0,0 +1,146 @@
+#!/bin/bash
+
+# Slackware build script for xar
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# Notes:
+
+# Man page says xar is no longer actively developed. I added this to
+# SBo in order to extract old archives I ran into, so this doesn't
+# bother me.
+
+# The original google code project is dead, and so is mackyle's github
+# project. The Apple github project might be deprecated, but it's
+# still being updated (as of August 2023).
+
+# For some reason, gentoo and other distros want to give this version
+# numbers like "1.8.0.0.452". Dunno where the extra zeroes come from.
+# "xar --version" reports "1.8dev", the tarball's version number
+# is the SVN revision (452, 498, etc).
+
+# 20231118 bkw: update for v498.
+
+# 20230711 bkw: no script changes, just a note to myself: there's now
+# a 496 tag, and it won't compile either.
+
+# 20230106 bkw: apple quit hosting their own tarball, old URL is now
+# a redirect to a github generated one, script has to change to handle it.
+
+# 20221229 bkw: this is still being developed, code is at
+# https://github.com/apple-oss-distributions/xar/ but the latest tag
+# (494) won't compile, and I don't love this enough to spend time on
+# it right now. If it bothers you, fix it and send me a patch.
+
+# 20221229 bkw: BUILD=2, strip library (derp!)
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=xar
+VERSION=${VERSION:-1.8dev+498}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+SRCVER="$( echo $VERSION | cut -d+ -f2 )"
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$PRGNAM-$SRCVER
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+cd $PRGNAM
+
+# Patches came from liguros:
+# https://gitlab.com/liguros/liguros-repo/-/tree/stable/app-arch/xar
+for i in $( cat $CWD/patches/series ); do
+  patch -p1 < $CWD/patches/$i
+done
+
+# This bit comes from liguros's xar-498.ebuild.
+sed -i 's/__APPLE__/__NO_APPLE__/' lib/hash.c lib/archive.h
+cp lib/*.h include
+
+# Make #include <xar/xar.h> include the one in the build dir, not
+# any system-wide one in /usr/include.
+mkdir include/xar
+ln -sf ../xar.h include/xar/xar.h
+
+# -I doesn't affect #include "blah.h".
+sed -i 's,"\(\(util\|filetree\)\.h\)",<\1>,' src/xar.c
+
+# xar executable, library, and includes. have to manually add
+# openssl's libs, and jigger the include path for <util.h> and
+# <filetree.h>.
+sh autogen.sh --noconfigure
+
+LIBS="$( pkg-config --libs openssl )" \
+CFLAGS="$SLKCFLAGS -Wl,-s -I$(pwd)/lib" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+gzip $PKG/usr/man/man?/*
+rm -f $PKG/usr/lib*/*.la
+strip $PKG/usr/lib*/*.so*
+
+cd -
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README xar.txt xar/{ChangeLog,LICENSE,TODO} $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xar/xar.info b/system/xar/xar.info
new file mode 100644
index 0000000000..86abd2cf83
--- /dev/null
+++ b/system/xar/xar.info
@@ -0,0 +1,10 @@
+PRGNAM="xar"
+VERSION="1.8dev+498"
+HOMEPAGE="https://opensource.apple.com/source/xar/"
+DOWNLOAD="https://github.com/apple-oss-distributions/xar/archive/xar-498/xar-xar-498.tar.gz"
+MD5SUM="4a4bcc060d8e9a1678c39ee3b701c44b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/xarchiver/xarchiver.SlackBuild b/system/xarchiver/xarchiver.SlackBuild
index 396eef049c..6cae31e1cb 100644
--- a/system/xarchiver/xarchiver.SlackBuild
+++ b/system/xarchiver/xarchiver.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Xarchiver
 
@@ -23,10 +23,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xarchiver
-VERSION=${VERSION:-0.5.4.16}
+VERSION=${VERSION:-0.5.4.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -96,4 +106,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xarchiver/xarchiver.info b/system/xarchiver/xarchiver.info
index d4f247fb7c..f99069d9e9 100644
--- a/system/xarchiver/xarchiver.info
+++ b/system/xarchiver/xarchiver.info
@@ -1,10 +1,10 @@
 PRGNAM="xarchiver"
-VERSION="0.5.4.16"
+VERSION="0.5.4.21"
 HOMEPAGE="https://github.com/ib/xarchiver"
-DOWNLOAD="https://github.com/ib/xarchiver/archive/0.5.4.16/xarchiver-0.5.4.16.tar.gz"
-MD5SUM="d453da75498b8085adc768e926179d5a"
+DOWNLOAD="https://github.com/ib/xarchiver/archive/0.5.4.21/xarchiver-0.5.4.21.tar.gz"
+MD5SUM="94621a793a45521ef55702e940442552"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
+EMAIL="kingbeowulf@linuxgalaxy.org"
diff --git a/system/xautolock/xautolock.SlackBuild b/system/xautolock/xautolock.SlackBuild
index 22f0bc386f..439ed3af54 100644
--- a/system/xautolock/xautolock.SlackBuild
+++ b/system/xautolock/xautolock.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xautolock
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xautolock
 VERSION=${VERSION:-2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -89,4 +99,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xautomation/030_xmousepos-add-xautomation-manpage.patch b/system/xautomation/030_xmousepos-add-xautomation-manpage.patch
new file mode 100644
index 0000000000..06617f21b4
--- /dev/null
+++ b/system/xautomation/030_xmousepos-add-xautomation-manpage.patch
@@ -0,0 +1,33 @@
+Description: xmousepos added to the xautomation manpage.
+Author: Francisco Vilmar Cardoso Ruviaro <francisco.ruviaro@riseup.net>
+Last-Update: 2020-06-05
+
+--- xautomation-1.09.orig/xautomation.7
++++ xautomation-1.09/xautomation.7
+@@ -9,7 +9,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH XAUTOMATION 7 "August 08, 2005"
++.TH XAUTOMATION 7 "June 05, 2020"
+ .\" Please adjust this date whenever revising the manpage.
+ .\"
+ .\" Some roff macros, for reference:
+@@ -51,6 +51,9 @@ Converts an image file from 24-bit RGB t
+ .B visgrep
+ Visual grep, greps for images in another image.
+ .TP
++.B xmousepos
++Gets and prints the current mouse position.
++.TP
+ .B xte
+ Generates fake input using the XTest extension.
+ 
+@@ -63,6 +66,7 @@ For more information, please see the ind
+ .BR png2pat (1),
+ .BR rgb2pat (1),
+ .BR visgrep (1),
++.BR xmousepos (1),
+ .BR xte (1).
+ 
+ .SH AUTHOR
diff --git a/system/xautomation/README b/system/xautomation/README
index dd2e6f9417..f7d72e974d 100644
--- a/system/xautomation/README
+++ b/system/xautomation/README
@@ -1,6 +1,7 @@
-xautomation contains tools to control the X server from the command line.
+xautomation (control the X server from the command line)
 
-The tools will be useful for scripting, and for doing "visual scraping"
-to find things on the screen. These programs allow scripted mouse movement,
-clicking, button up/down, key up/down, etc., and use the XTest extension.
-The visgrep program finds images inside of images and reports their coordinates.
+The tools will be useful for scripting, and for doing "visual
+scraping" to find things on the screen. These programs allow scripted
+mouse movement, clicking, button up/down, key up/down, etc., and
+use the XTest extension. The visgrep program finds images inside of
+images and reports their coordinates.
diff --git a/system/xautomation/slack-desc b/system/xautomation/slack-desc
index 7ca5772751..dd44fff293 100644
--- a/system/xautomation/slack-desc
+++ b/system/xautomation/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
            |-----handy-ruler------------------------------------------------------|
-xautomation: xautomation (Tools to control the X server from the command line)
+xautomation: xautomation (control the X server from the command line)
 xautomation:
 xautomation: Control X from the command line for scripts, and do
 xautomation: "visual scraping" to find things on the screen. The control
diff --git a/system/xautomation/xautomation.SlackBuild b/system/xautomation/xautomation.SlackBuild
index a0ed0d5377..c6a399473f 100644
--- a/system/xautomation/xautomation.SlackBuild
+++ b/system/xautomation/xautomation.SlackBuild
@@ -1,14 +1,26 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xautomation.
 
-# Written by V'yacheslav Stetskevych
-# Modified by B. Watson
+# Originally written by V'yacheslav Stetskevych.  Modified by
+# B. Watson. Original version had no license. Modified version
+# released under the WTFPL. See http://www.wtfpl.net/txt/copying/
+# for details.
+
+# 20210809 bkw: BUILD=2
+# - make README validate (no >=72 char lines)
+# - fix typos and grammar in man pages
+# - don't install useless INSTALL in doc dir
+# - *do* install ChangeLog in doc dir
+# - use https URLs in .info file
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xautomation
 VERSION=${VERSION:-1.09}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -18,7 +30,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -46,15 +62,19 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+sed -i '/set of/s,\(command line\)s,\1,' $PRGNAM.7
+sed -i 's,^\\&\. *,&\n,' visgrep.1
+sed -i 's,occured,occured,' visgrep.1
+sed -i 's,charactes,characters,' xte.1
+
+# patch comes from Debian
+patch -p1 < $CWD/030_xmousepos-add-xautomation-manpage.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="-lX11" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -70,15 +90,14 @@ make
 # regular make install is OK, strip them afterwards.
 make install DESTDIR=$PKG
 strip $PKG/usr/bin/*
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+gzip -9 $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xautomation/xautomation.info b/system/xautomation/xautomation.info
index e7805ba27c..e14649c790 100644
--- a/system/xautomation/xautomation.info
+++ b/system/xautomation/xautomation.info
@@ -1,10 +1,10 @@
 PRGNAM="xautomation"
 VERSION="1.09"
-HOMEPAGE="http://hoopajoo.net/projects/xautomation.html"
-DOWNLOAD="http://hoopajoo.net/static/projects/xautomation-1.09.tar.gz"
+HOMEPAGE="https://hoopajoo.net/projects/xautomation.html"
+DOWNLOAD="https://hoopajoo.net/static/projects/xautomation-1.09.tar.gz"
 MD5SUM="16b973fdb525feed876471225bba30ed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/xbattmon/xbattmon.SlackBuild b/system/xbattmon/xbattmon.SlackBuild
index ee85027c0b..8422e0c900 100644
--- a/system/xbattmon/xbattmon.SlackBuild
+++ b/system/xbattmon/xbattmon.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xbattmon
 
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xbattmon
 VERSION=${VERSION:-1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -108,4 +118,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xbindkeys/README b/system/xbindkeys/README
index 7fbbd7a9e4..3ee2225d1a 100644
--- a/system/xbindkeys/README
+++ b/system/xbindkeys/README
@@ -1,4 +1,4 @@
-xbindkeys is a program that allows you to launch shell commands with your 
-keyboard or your mouse under X Windows.  It links commands to keys or mouse 
-buttons, using a configuration file.  It's independant of the window manager 
-and can capture all keyboard keys (ex: Power, Wake...).
+xbindkeys is a program that allows you to launch shell commands with
+your keyboard or your mouse under X Windows. It links commands to keys
+or mouse buttons, using a configuration file. It's independant of the
+window manager and can capture all keyboard keys (ex: Power, Wake...).
diff --git a/system/xbindkeys/xbindkeys.SlackBuild b/system/xbindkeys/xbindkeys.SlackBuild
index 97b61cf59e..9d66578e8e 100644
--- a/system/xbindkeys/xbindkeys.SlackBuild
+++ b/system/xbindkeys/xbindkeys.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for xbindkeys
 #
-# Copyright 2009-2015  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009-2022  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xbindkeys
-VERSION=${VERSION:-1.8.6}
+VERSION=${VERSION:-1.8.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -94,4 +104,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xbindkeys/xbindkeys.info b/system/xbindkeys/xbindkeys.info
index b9128f4b0d..2856be1820 100644
--- a/system/xbindkeys/xbindkeys.info
+++ b/system/xbindkeys/xbindkeys.info
@@ -1,10 +1,10 @@
 PRGNAM="xbindkeys"
-VERSION="1.8.6"
+VERSION="1.8.7"
 HOMEPAGE="http://www.nongnu.org/xbindkeys/xbindkeys.html"
-DOWNLOAD="http://www.nongnu.org/xbindkeys/xbindkeys-1.8.6.tar.gz"
-MD5SUM="c6ea9db56e075dae0697497e2ed390cc"
+DOWNLOAD="http://www.nongnu.org/xbindkeys/xbindkeys-1.8.7.tar.gz"
+MD5SUM="b5e1a9668ba13ff8673836d1d965d951"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="guile2.2"
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
diff --git a/system/xboxdrv-linux/fix-60-sec-delay.patch b/system/xboxdrv-linux/fix-60-sec-delay.patch
new file mode 100644
index 0000000000..da543d2cfa
--- /dev/null
+++ b/system/xboxdrv-linux/fix-60-sec-delay.patch
@@ -0,0 +1,27 @@
+From 7326421eeaadbc2aeb3828628c2e65bb7be323a9 Mon Sep 17 00:00:00 2001
+From: buxit <buti@bux.at>
+Date: Wed, 2 Nov 2016 16:25:14 +0100
+Subject: [PATCH] fix 60 seconds delay
+
+use `libusb_handle_events_timeout_completed()` instead of `libusb_handle_events()`
+should fix #144
+---
+ src/usb_gsource.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/usb_gsource.cpp b/src/usb_gsource.cpp
+index 00bf1315..afb38f65 100644
+--- a/src/usb_gsource.cpp
++++ b/src/usb_gsource.cpp
+@@ -174,7 +174,10 @@ USBGSource::on_source_dispatch(GSource* source, GSourceFunc callback, gpointer u
+ gboolean
+ USBGSource::on_source()
+ {
+-  libusb_handle_events(NULL);
++  struct timeval to;
++  to.tv_sec = 0;
++  to.tv_usec = 0;
++  libusb_handle_events_timeout_completed(NULL, &to, NULL);
+   return TRUE;
+ }
+ 
diff --git a/system/xboxdrv-linux/scons-py3.patch b/system/xboxdrv-linux/scons-py3.patch
new file mode 100644
index 0000000000..4aa6fa6193
--- /dev/null
+++ b/system/xboxdrv-linux/scons-py3.patch
@@ -0,0 +1,63 @@
+From 17bd43a7d3ef86216abc36b42b4e6a1f70aa9979 Mon Sep 17 00:00:00 2001
+From: xnick <xnick@users.noreply.github.com>
+Date: Thu, 12 Oct 2017 20:34:35 +0300
+Subject: [PATCH] Update SConstruct
+
+python3 compatible
+---
+ SConstruct | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 4cd79704..c0007054 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -19,7 +19,7 @@ def build_dbus_glue(target, source, env):
+     xml = re.sub(r"callback = \(([A-Za-z_]+)\) \(marshal_data \? marshal_data : cc->callback\);",
+                  r"union { \1 fn; void* obj; } conv;\n  "
+                  "conv.obj = (marshal_data ? marshal_data : cc->callback);\n  "
+-                 "callback = conv.fn;", xml)
++                 "callback = conv.fn;", xml.decode('utf-8'))
+ 
+     with open(target[0].get_path(), "w") as f:
+         f.write(xml)
+@@ -29,10 +29,10 @@ def build_bin2h(target, source, env):
+     Takes a list of files and converts them into a C source that can be included
+     """
+     def c_escape(str): 
+-        return str.translate(string.maketrans("/.-", "___"))
++        return str.translate(bytes.maketrans(b"/.-", b"___"))
+     
+-    print target
+-    print source
++    print(target)
++    print(source)
+     with open(target[0].get_path(), "w") as fout:
+         fout.write("// autogenerated by scons Bin2H builder, do not edit by hand!\n\n")
+ 
+@@ -45,8 +45,8 @@ def build_bin2h(target, source, env):
+                 data = fin.read()
+                 fout.write("// \"%s\"\n" % src.get_path())
+                 fout.write("const char %s[] = {" % c_escape(src.get_path()))
+-                bytes_arr = ["0x%02x" % ord(c) for c in data]
+-                for i in xrange(len(bytes_arr)):
++                bytes_arr = ["0x%02x" % c for c in data]
++                for i in range(len(bytes_arr)):
+                     if i % 13 == 0:
+                         fout.write("\n  ")
+                     fout.write(bytes_arr[i])
+@@ -131,12 +131,12 @@ env.Append(CPPDEFINES = { 'PACKAGE_VERSION': "'\"%s\"'" % package_version })
+ conf = Configure(env)
+ 
+ if not conf.env['CXX']:
+-    print "g++ must be installed!"
++    print('g++ must be installed!')
+     Exit(1)
+ 
+ # X11 checks
+ if not conf.CheckLibWithHeader('X11', 'X11/Xlib.h', 'C++'):
+-    print 'libx11-dev must be installed!'
++    print('libx11-dev must be installed!')
+     Exit(1)
+ 
+ env = conf.Finish()
diff --git a/system/xboxdrv-linux/scons-v4.2.0.patch b/system/xboxdrv-linux/scons-v4.2.0.patch
new file mode 100644
index 0000000000..04b05e8d6f
--- /dev/null
+++ b/system/xboxdrv-linux/scons-v4.2.0.patch
@@ -0,0 +1,20 @@
+--- a/SConstruct	2021-10-31 20:42:44.232084185 -0400
++++ b/SConstruct	2021-10-31 20:42:54.063024444 -0400
+@@ -36,7 +36,7 @@
+     with open(target[0].get_path(), "w") as fout:
+         fout.write("// autogenerated by scons Bin2H builder, do not edit by hand!\n\n")
+ 
+-        if env.has_key("BIN2H_NAMESPACE"):
++        if "BIN2H_NAMESPACE" in env:
+             fout.write("namespace %s {\n\n" % env["BIN2H_NAMESPACE"])
+             
+         # write down data
+@@ -62,7 +62,7 @@
+                                     for src in source], ",\n"))
+             fout.write("\n}\n\n")
+ 
+-        if env.has_key("BIN2H_NAMESPACE"):
++        if "BIN2H_NAMESPACE" in env:
+             fout.write("} // namespace %s\n\n" % env["BIN2H_NAMESPACE"])
+                 
+         fout.write("/* EOF */\n")
diff --git a/system/xboxdrv-linux/slack-desc b/system/xboxdrv-linux/slack-desc
index ad6b55a2ac..17d6a22d47 100644
--- a/system/xboxdrv-linux/slack-desc
+++ b/system/xboxdrv-linux/slack-desc
@@ -13,7 +13,7 @@ xboxdrv-linux: userspace. It is an alternative to the xpad kernel driver and has
 xboxdrv-linux: support for Xbox1 gamepads, Xbox360 USB gamepads and Xbox360 wireless
 xboxdrv-linux: gamepads, both first and third party.
 xboxdrv-linux:
-xboxdrv-linux: Homepage: https://pingus.seul.org/~grumbel/xboxdrv/
+xboxdrv-linux: Homepage: https://xboxdrv.gitlab.io/
 xboxdrv-linux:
 xboxdrv-linux:
 xboxdrv-linux:
diff --git a/system/xboxdrv-linux/xboxdrv-linux.SlackBuild b/system/xboxdrv-linux/xboxdrv-linux.SlackBuild
index 3c62fb1969..731080f529 100644
--- a/system/xboxdrv-linux/xboxdrv-linux.SlackBuild
+++ b/system/xboxdrv-linux/xboxdrv-linux.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xboxdrv-linux
 
@@ -23,26 +23,42 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220209 bkw: Modified by SlackBuilds.org: handle both possibilities for
+# the tarball filename. However, this is *still broken* due to scons issues.
+
+# 20220218 acl: Modified by SlackBuilds.org: fix scons issues with arch
+# patches. Update homepage to gitlab.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xboxdrv-linux
 VERSION=${VERSION:-0.8.8}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,15 +77,19 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
-tar xvf $CWD/6e5e8a57628095d8d0c8bbb38187afb0f3a42112.tar.gz --strip-components 1 -C $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
+# thanks arch maintainers
+patch -p1 < "$CWD/fix-60-sec-delay.patch"
+patch -p1 < "$CWD/scons-py3.patch"
+patch -p1 < "$CWD/scons-v4.2.0.patch"
+patch -p1 < "$CWD/xboxdrvctl-py3.patch"
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 scons \
   CFLAGS="$SLKCFLAGS" \
@@ -96,4 +116,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xboxdrv-linux/xboxdrv-linux.info b/system/xboxdrv-linux/xboxdrv-linux.info
index 467f0b7a1d..fb8f4aecae 100644
--- a/system/xboxdrv-linux/xboxdrv-linux.info
+++ b/system/xboxdrv-linux/xboxdrv-linux.info
@@ -1,8 +1,8 @@
 PRGNAM="xboxdrv-linux"
 VERSION="0.8.8"
-HOMEPAGE="https://pingus.seul.org/~grumbel/xboxdrv/"
-DOWNLOAD="https://github.com/chewi/xboxdrv/archive/6e5e8a57628095d8d0c8bbb38187afb0f3a42112.tar.gz"
-MD5SUM="f0cfa15f509a3858ccae94a0d0da3d6a"
+HOMEPAGE="https://xboxdrv.gitlab.io/"
+DOWNLOAD="https://xboxdrv.gitlab.io/xboxdrv-linux-0.8.8.tar.bz2"
+MD5SUM="a62703eda7d59393538b2f22d5b0c791"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/xboxdrv-linux/xboxdrvctl-py3.patch b/system/xboxdrv-linux/xboxdrvctl-py3.patch
new file mode 100644
index 0000000000..71d8762cb9
--- /dev/null
+++ b/system/xboxdrv-linux/xboxdrvctl-py3.patch
@@ -0,0 +1,73 @@
+--- a/xboxdrvctl	2021-06-21 19:39:51.000000000 -0400
++++ b/xboxdrvctl 19:43:27.467984928 -0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2
++#!/usr/bin/env python3
+ 
+ ##  Xbox360 USB Gamepad Userspace Driver
+ ##  Copyright (C) 2011 Ingo Ruhnke <grumbel@gmail.com>
+@@ -37,23 +37,23 @@
+                   help="print controller status")
+ 
+ group.add_option("-s", "--slot", metavar="SLOT", type="int",
+-                  dest="slot", 
++                  dest="slot",
+                   help="use slot SLOT for actions")
+ 
+ group.add_option("-l", "--led", metavar="NUM", type="int",
+-                  dest="led", 
++                  dest="led",
+                   help="set LED")
+ 
+-group.add_option("-r", "--rumble", metavar="L:R", 
+-                  dest="rumble", 
++group.add_option("-r", "--rumble", metavar="L:R",
++                  dest="rumble",
+                   help="print controller status")
+ 
+ group.add_option("-c", "--config", metavar="NUM", type="int",
+-                  dest="config", 
++                  dest="config",
+                   help="switches to controller configuration NUM")
+ 
+ group.add_option("--shutdown", action="store_true",
+-                  dest="shutdown", 
++                  dest="shutdown",
+                   help="shuts down the daemon")
+ 
+ parser.add_option_group(group)
+@@ -69,9 +69,9 @@
+     try:
+         bus.get_object("org.seul.Xboxdrv", '/org/seul/Xboxdrv/Daemon')
+     except dbus.exceptions.DBusException:
+-				bus = dbus.SystemBus()
++        bus = dbus.SystemBus()
+ else:
+-    print "Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'"
++    print("Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'")
+     exit()
+ 
+ if options.status:
+@@ -82,19 +82,19 @@
+     daemon.Shutdown()
+ else:
+     if (options.led or options.rumble or options.config) and options.slot == None:
+-        print "Error: --slot argument required"
++        print("Error: --slot argument required")
+         exit()
+     else:
+         if options.slot != None:
+             slot = bus.get_object("org.seul.Xboxdrv", '/org/seul/Xboxdrv/ControllerSlots/%d' % options.slot)
+-    
++
+             if options.led != None:
+                 slot.SetLed(options.led)
+ 
+             if options.rumble:
+                 m = re.match('^(\d+):(\d+)$', options.rumble)
+                 if not m:
+-                    print "Error: invalid argument to --rumble"
++                    print("Error: invalid argument to --rumble")
+                     exit()
+                 else:
+                     left  = int(m.group(1))
diff --git a/system/xbrightness/xbrightness.SlackBuild b/system/xbrightness/xbrightness.SlackBuild
index 9d39906776..1bc2f073a5 100644
--- a/system/xbrightness/xbrightness.SlackBuild
+++ b/system/xbrightness/xbrightness.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xbrightness
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xbrightness
 VERSION=${VERSION:-0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -86,4 +96,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xcdroast/README b/system/xcdroast/README
index 72bb5a0d7d..136f717b0a 100644
--- a/system/xcdroast/README
+++ b/system/xcdroast/README
@@ -4,3 +4,6 @@ X-CD-Roast tries to be the most flexible CD and DVD burning software
 ever. It allows even the unexperienced user to create or copy a CD or a
 DVD with a few mouse clicks in a intuitive and nice looking graphical
 user interface.
+
+Note:
+Upon start, you may need to manually specify your device, e.g /dev/sr0
diff --git a/system/xcdroast/xcdroast.SlackBuild b/system/xcdroast/xcdroast.SlackBuild
index c0feb67938..3a387fdb8d 100644
--- a/system/xcdroast/xcdroast.SlackBuild
+++ b/system/xcdroast/xcdroast.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xcdroast
 # GUI frontend for optical disc authoring.
@@ -27,11 +27,15 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Revision date: 2020/Nov/22
+# A few fixes: 2023/Sep/24; Petar Petrov
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xcdroast
 VERSION=${VERSION:-1.19}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -41,7 +45,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -92,9 +103,7 @@ make XCDRLIB_PREFIX=/usr/lib${LIBDIRSUFFIX}/$PRGNAM install DESTDIR=$PKG
 
 mkdir -p $PKG/usr/share/{applications,pixmaps}
 cat $CWD/xcdroast.desktop > $PKG/usr/share/applications/xcdroast.desktop
-( cd $PKG/usr/share/pixmaps
-  ln -s ../../lib${LIBDIRSUFFIX}/xcdroast/icons/xcdricon.png xcdroast.png
-)
+cp xpms/ico_cdwriter.xpm $PKG/usr/share/pixmaps/xcdroast.xpm
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -102,10 +111,13 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+# empty
+rm -rf $PKG/etc
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING ChangeLog INSTALL README AUTHORS NEWS \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+  COPYING ChangeLog README AUTHORS \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -113,4 +125,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xcdroast/xcdroast.desktop b/system/xcdroast/xcdroast.desktop
index 40f9bcf8c5..e5f479235f 100644
--- a/system/xcdroast/xcdroast.desktop
+++ b/system/xcdroast/xcdroast.desktop
@@ -4,3 +4,4 @@ Type=Application
 Exec=xcdroast
 Icon=xcdroast
 Comment=CD creation tool
+Categories=System;
diff --git a/system/xchm/xchm.SlackBuild b/system/xchm/xchm.SlackBuild
index 4a581b958d..3ac57e98a1 100644
--- a/system/xchm/xchm.SlackBuild
+++ b/system/xchm/xchm.SlackBuild
@@ -1,28 +1,38 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for xchm
 # Written by Michael Gehring <mg@ebfe.org>
 
+# 20220209 bkw: Modified by SlackBuilds.org, fix the build when wxGTK3
+# was installed after wxPython.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xchm
 VERSION=${VERSION:-1.23}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686 -fno-strict-aliasing"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fno-strict-aliasing"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fno-strict-aliasing"
@@ -53,6 +63,7 @@ find -L . \
 CFLAGS=$SLKCFLAGS \
 CXXFLAGS=$SLKCFLAGS \
 ./configure  \
+  --with-wx-config=/usr/lib$LIBDIRSUFFIX/wx/config/gtk2-unicode-release-2.8 \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --build=$ARCH-slackware-linux \
@@ -72,4 +83,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xchm/xchm.info b/system/xchm/xchm.info
index 9b1979c711..c8429ae450 100644
--- a/system/xchm/xchm.info
+++ b/system/xchm/xchm.info
@@ -1,7 +1,7 @@
 PRGNAM="xchm"
 VERSION="1.23"
 HOMEPAGE="http://xchm.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/xchm/xchm-1.23.tar.gz"
+DOWNLOAD="http://ftp.netbsd.org/pub/pkgsrc/distfiles/xchm-1.23.tar.gz"
 MD5SUM="486d029bd81071a2d04e7181909b1602"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/xdg-dbus-proxy/README b/system/xdg-dbus-proxy/README
new file mode 100644
index 0000000000..dfc102324e
--- /dev/null
+++ b/system/xdg-dbus-proxy/README
@@ -0,0 +1,3 @@
+xdg-dbus-proxy is a filtering proxy for D-Bus connections.
+It was originally part of the flatpak project, but it has been broken
+out as a standalone module to facilitate using it in other contexts.
diff --git a/system/xdg-dbus-proxy/slack-desc b/system/xdg-dbus-proxy/slack-desc
new file mode 100644
index 0000000000..1868fd972c
--- /dev/null
+++ b/system/xdg-dbus-proxy/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+              |-----handy-ruler------------------------------------------------------|
+xdg-dbus-proxy: xdg-dbus-proxy (D-Bus proxy)
+xdg-dbus-proxy:
+xdg-dbus-proxy: xdg-dbus-proxy is a filtering proxy for D-Bus connections.
+xdg-dbus-proxy: It was originally part of the flatpak project, but it has been broken
+xdg-dbus-proxy: out as a standalone module to facilitate using it in other contexts.
+xdg-dbus-proxy:
+xdg-dbus-proxy: homepage: https://github.com/flatpak/xdg-dbus-proxy
+xdg-dbus-proxy:
+xdg-dbus-proxy:
+xdg-dbus-proxy:
+xdg-dbus-proxy:
diff --git a/system/xdg-dbus-proxy/xdg-dbus-proxy.SlackBuild b/system/xdg-dbus-proxy/xdg-dbus-proxy.SlackBuild
new file mode 100644
index 0000000000..58fffc2fb5
--- /dev/null
+++ b/system/xdg-dbus-proxy/xdg-dbus-proxy.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/bash
+
+# Slackware build script for xdg-dbus-proxy
+
+# Copyright 2019-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=xdg-dbus-proxy
+VERSION=${VERSION:-0.1.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xdg-dbus-proxy/xdg-dbus-proxy.info b/system/xdg-dbus-proxy/xdg-dbus-proxy.info
new file mode 100644
index 0000000000..ceaa66e7f8
--- /dev/null
+++ b/system/xdg-dbus-proxy/xdg-dbus-proxy.info
@@ -0,0 +1,10 @@
+PRGNAM="xdg-dbus-proxy"
+VERSION="0.1.4"
+HOMEPAGE="https://github.com/flatpak/xdg-dbus-proxy/"
+DOWNLOAD="https://github.com/flatpak/xdg-dbus-proxy/releases/download/0.1.4/xdg-dbus-proxy-0.1.4.tar.xz"
+MD5SUM="89d166170e871b3288e8980aee599ae4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/xdg-desktop-portal-gnome/README b/system/xdg-desktop-portal-gnome/README
new file mode 100644
index 0000000000..c0dac469b8
--- /dev/null
+++ b/system/xdg-desktop-portal-gnome/README
@@ -0,0 +1,5 @@
+A backend implementation for xdg-desktop-portal that is using GTK and
+various pieces of GNOME infrastructure, such as the 
+org.gnome.Shell.Screenshot or org.gnome.SessionManager D-Bus 
+interfaces.
+
diff --git a/system/xdg-desktop-portal-gnome/doinst.sh b/system/xdg-desktop-portal-gnome/doinst.sh
new file mode 100644
index 0000000000..f6a6676883
--- /dev/null
+++ b/system/xdg-desktop-portal-gnome/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
+fi
+
diff --git a/system/xdg-desktop-portal-gnome/slack-desc b/system/xdg-desktop-portal-gnome/slack-desc
new file mode 100644
index 0000000000..e88c7ae45c
--- /dev/null
+++ b/system/xdg-desktop-portal-gnome/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                        |-----handy-ruler------------------------------------------------------|
+xdg-desktop-portal-gnome: xdg-desktop-portal-gnome (GNOME's xdg-desktop-portal Backend)
+xdg-desktop-portal-gnome:
+xdg-desktop-portal-gnome: A backend implementation for xdg-desktop-portal that is using GTK and 
+xdg-desktop-portal-gnome: various pieces of GNOME infrastructure, such as the 
+xdg-desktop-portal-gnome: org.gnome.Shell.Screenshot or org.gnome.SessionManager D-Bus 
+xdg-desktop-portal-gnome: interfaces. 
+xdg-desktop-portal-gnome:
+xdg-desktop-portal-gnome:
+xdg-desktop-portal-gnome:
+xdg-desktop-portal-gnome: https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome
+xdg-desktop-portal-gnome:
diff --git a/system/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome.SlackBuild b/system/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome.SlackBuild
new file mode 100644
index 0000000000..e66fff454d
--- /dev/null
+++ b/system/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+# Slackware build script for xdg-desktop-portal-gnome
+
+# Copyright 2023 Bob Funk, Winnipeg Canada
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=xdg-desktop-portal-gnome
+VERSION=${VERSION:-41.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dsystemduserunitdir=none \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING NEWS README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome.info b/system/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome.info
new file mode 100644
index 0000000000..6c051bcfcb
--- /dev/null
+++ b/system/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome.info
@@ -0,0 +1,10 @@
+PRGNAM="xdg-desktop-portal-gnome"
+VERSION="41.2"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome"
+DOWNLOAD="https://download.gnome.org/core/41/41.8/sources/xdg-desktop-portal-gnome-41.2.tar.xz"
+MD5SUM="c1d5d0f41c9a8f112e544036cd31c724"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="xdg-desktop-portal-gtk"
+MAINTAINER="Bob Funk"
+EMAIL="bobfunk11@gmail.com"
diff --git a/system/xdg-desktop-portal-wlr/README b/system/xdg-desktop-portal-wlr/README
new file mode 100644
index 0000000000..9ccdba4d5f
--- /dev/null
+++ b/system/xdg-desktop-portal-wlr/README
@@ -0,0 +1,7 @@
+xdg-desktop-portal-wlr (portal backend for wlroots)
+
+xdg-desktop-portal backend for wlroots.
+
+Optional dependancy of 'scdoc' to build manpage.
+
+Useful for sway, nwg-shell, flatpaks, etc..
diff --git a/system/xdg-desktop-portal-wlr/slack-desc b/system/xdg-desktop-portal-wlr/slack-desc
new file mode 100644
index 0000000000..564855b5b9
--- /dev/null
+++ b/system/xdg-desktop-portal-wlr/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+                      |-----handy-ruler------------------------------------------------------|
+xdg-desktop-portal-wlr: xdg-desktop-portal-wlr (portal backend for wlroots)
+xdg-desktop-portal-wlr:
+xdg-desktop-portal-wlr: xdg-desktop-portal backend for wlroots.
+xdg-desktop-portal-wlr:
+xdg-desktop-portal-wlr: Homepage: https://github.com/emersion/xdg-desktop-portal-wlr
+xdg-desktop-portal-wlr:
+xdg-desktop-portal-wlr:
+xdg-desktop-portal-wlr:
+xdg-desktop-portal-wlr:
+xdg-desktop-portal-wlr:
+xdg-desktop-portal-wlr:
diff --git a/system/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr.SlackBuild b/system/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr.SlackBuild
new file mode 100644
index 0000000000..8cc2bcedd9
--- /dev/null
+++ b/system/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr.SlackBuild
@@ -0,0 +1,130 @@
+#!/bin/bash
+
+# Slackware build script for xdg-desktop-portal-wlr
+
+# Copyright 2022 Jay Lanagan (j@lngn.net), Detroit, MI, USA.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=xdg-desktop-portal-wlr
+VERSION=${VERSION:-0.6.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir meson-build
+cd meson-build
+ CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
+  meson setup .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --libexecdir=/usr/libexec \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dsd-bus-provider=libelogind \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.*
+      )
+    done
+  )
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTING.md LICENSE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr.info b/system/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr.info
new file mode 100644
index 0000000000..b3bafb3674
--- /dev/null
+++ b/system/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr.info
@@ -0,0 +1,10 @@
+PRGNAM="xdg-desktop-portal-wlr"
+VERSION="0.6.0"
+HOMEPAGE="https://github.com/emersion/xdg-desktop-portal-wlr"
+DOWNLOAD="https://github.com/emersion/xdg-desktop-portal-wlr/releases/download/v0.6.0/xdg-desktop-portal-wlr-0.6.0.tar.gz"
+MD5SUM="6a67da450a1e6f931695941892d80eb1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Jay Lanagan"
+EMAIL="j@lngn.net"
diff --git a/system/xdg-ninja/README b/system/xdg-ninja/README
new file mode 100644
index 0000000000..e619af0356
--- /dev/null
+++ b/system/xdg-ninja/README
@@ -0,0 +1,26 @@
+A shell script wich checks your $HOME for unwanted files
+and directories. When it encounters a file it knows
+about, it will tell  you weather it is possible to move this
+file to an appropriate location and how to do it.
+
+The configuration is done in the programs/ directory, which 
+should be located in the same working directory as the xdg-ninja.sh 
+script. This can be overriden with the XN_PROGRAMS_DIR environment 
+variable.
+
+You define a program, and then a list of files and directories 
+which this program ruthlessly puts into your $HOME directory.
+
+For each file/directory, you specify if it can be (re)moved.
+
+If this is the case, you also specify instructions 
+on how to accomplish this in Markdown.
+
+Files in this directory can have any name, but using the 
+name of the program is encouraged.
+
+bashrc file should be in your $HOME directory for it to work properly
+and expects XDG environment variables to be in your bashrc.
+set XN_PROGRAMS_DIR=/opt/$PRGNAM-$VERSION/programs in your bashrc.
+This program is installed in /opt/$PRGNAM-$VERSION/ update $PATH
+accordingly.
diff --git a/system/xdg-ninja/changelog b/system/xdg-ninja/changelog
new file mode 100644
index 0000000000..bd32a1dddb
--- /dev/null
+++ b/system/xdg-ninja/changelog
@@ -0,0 +1,10 @@
+Changelog for xdg-ninja SlackBuild Script
+--------------------------------------------------------------------
+
+27/05/2023:
+
+Submitted to slackbuilds.org
+
+20/02/2024:
+
+Updated to version 0.2.0.2
diff --git a/system/xdg-ninja/slack-desc b/system/xdg-ninja/slack-desc
new file mode 100644
index 0000000000..d6a1d50699
--- /dev/null
+++ b/system/xdg-ninja/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+         |-----handy-ruler------------------------------------------------------|
+xdg-ninja: xdg-ninja ($HOME Dir Cleaner)
+xdg-ninja:
+xdg-ninja: A shell script wich checks your $HOME for unwanted files
+xdg-ninja: and directories. When it encounters a file it knows
+xdg-ninja: about, it will tell  you weather it is possible to move this
+xdg-ninja: file to an appropriate location and how to do it.
+xdg-ninja:
+xdg-ninja: Homepage:https://github.com/b3nj5m1n
+xdg-ninja:
+xdg-ninja:
+xdg-ninja:
diff --git a/system/xdg-ninja/xdg-ninja.SlackBuild b/system/xdg-ninja/xdg-ninja.SlackBuild
new file mode 100644
index 0000000000..8a92dad043
--- /dev/null
+++ b/system/xdg-ninja/xdg-ninja.SlackBuild
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+# Slackware build script for xdg-ninja
+
+# Copyright 2023-2024  Vijay Marcel
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=xdg-ninja
+VERSION=${VERSION:-0.2.0.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}"  ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a  $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -pv $PKG/opt/$PRGNAM-$VERSION/
+mkdir -pv $PKG/opt/$PRGNAM-$VERSION/programs
+
+install -vm0755 xdg-ninja.sh -T $PKG/opt/$PRGNAM-$VERSION/xdg-ninja
+install -vDm0644 programs/*  -t $PKG/opt/$PRGNAM-$VERSION/programs
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded --remove-section=.comment --remove-section=.note 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xdg-ninja/xdg-ninja.info b/system/xdg-ninja/xdg-ninja.info
new file mode 100644
index 0000000000..de8dd32453
--- /dev/null
+++ b/system/xdg-ninja/xdg-ninja.info
@@ -0,0 +1,10 @@
+PRGNAM="xdg-ninja"
+VERSION="0.2.0.2"
+HOMEPAGE="https://github.com/b3nj5m1n/xdg-ninja/"
+DOWNLOAD="https://github.com/b3nj5m1n/xdg-ninja/archive/v0.2.0.2/xdg-ninja-0.2.0.2.tar.gz"
+MD5SUM="9d68d889b98be229282e83bf40a51d0e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="jq glow"
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/xdg-utils-cxx/README b/system/xdg-utils-cxx/README
new file mode 100644
index 0000000000..a61148d85c
--- /dev/null
+++ b/system/xdg-utils-cxx/README
@@ -0,0 +1,6 @@
+Implementation of the Free Desktop
+Standards in C++.This project was started
+to fulfill the need of a reliable
+implementations of such standards in the
+AppImage project. It is totally standalone and only
+depends on the standard c++ libraries (stdlib).
diff --git a/system/xdg-utils-cxx/slack-desc b/system/xdg-utils-cxx/slack-desc
new file mode 100644
index 0000000000..f4da593b19
--- /dev/null
+++ b/system/xdg-utils-cxx/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+             |-----handy-ruler------------------------------------------------------|
+xdg-utils-cxx: xdg-utils-cxx (XDG utils in C++)
+xdg-utils-cxx:
+xdg-utils-cxx: xdg-utils-cxx is an implementation of xdg in c++ to
+xdg-utils-cxx: fullfill the needs of a reliable standard in appimage
+xdg-utils-cxx: project.It is totally standalone and depends on stdlib.
+xdg-utils-cxx:
+xdg-utils-cxx: Homepage:https://github.com/azubieta/xdg-utils-cxx
+xdg-utils-cxx:
+xdg-utils-cxx:
+xdg-utils-cxx:
+xdg-utils-cxx:
diff --git a/system/xdg-utils-cxx/xdg-utils-cxx.SlackBuild b/system/xdg-utils-cxx/xdg-utils-cxx.SlackBuild
new file mode 100644
index 0000000000..68b8e71719
--- /dev/null
+++ b/system/xdg-utils-cxx/xdg-utils-cxx.SlackBuild
@@ -0,0 +1,110 @@
+#!/bin/bash
+
+# Slackware build script for xdg-utils-cxx
+
+# Copyright 2022 Vijay Marcel
+
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=xdg-utils-cxx
+VERSION=${VERSION:-1.0.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee -a $OUTPUT/error-${PRGNAM}.log' ERR
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+cmake -B build -S $TMP/$PRGNAM-$VERSION \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_BINDIR=/usr/bin \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DXDG_UTILS_TESTS=OFF \
+    -DXDG_UTILS_SHARED=ON
+
+cmake --build build
+DESTDIR=$PKG cmake --install build
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xdg-utils-cxx/xdg-utils-cxx.info b/system/xdg-utils-cxx/xdg-utils-cxx.info
new file mode 100644
index 0000000000..62c0a6800e
--- /dev/null
+++ b/system/xdg-utils-cxx/xdg-utils-cxx.info
@@ -0,0 +1,10 @@
+PRGNAM="xdg-utils-cxx"
+VERSION="1.0.1"
+HOMEPAGE="https://github.com/azubieta/xdg-utils-cxx"
+DOWNLOAD="https://github.com/azubieta/xdg-utils-cxx/archive/v1.0.1/xdg-utils-cxx-1.0.1.tar.gz"
+MD5SUM="e5d04b809e58670187083eedc3b3caca"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Vijay Marcel"
+EMAIL="vijaymarcel@outlook.com"
diff --git a/system/xdiskusage/xdiskusage.SlackBuild b/system/xdiskusage/xdiskusage.SlackBuild
index f123b54b63..3458444f33 100644
--- a/system/xdiskusage/xdiskusage.SlackBuild
+++ b/system/xdiskusage/xdiskusage.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xdiskusage
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xdiskusage
 VERSION=${VERSION:-1.51}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -99,4 +109,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Make package
 cd $PKG
-/sbin/makepkg -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xen-nox/README b/system/xen-nox/README
new file mode 100644
index 0000000000..84979ecdaa
--- /dev/null
+++ b/system/xen-nox/README
@@ -0,0 +1,6 @@
+The xen-nox package contains the XEN micro-kernel and tools for PV and
+PVH modes, including the good old xenstore daemon written in C.
+
+QEMU-XEN is built without X11 support (no GTK, SDL nor OpenGL).
+
+NOTE: this conflicts with the system/xen package.
diff --git a/system/xen-nox/slack-desc b/system/xen-nox/slack-desc
new file mode 100644
index 0000000000..a95620fb8b
--- /dev/null
+++ b/system/xen-nox/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+xen-nox: xen-nox (Xen Project Hypervisor)
+xen-nox:
+xen-nox: The xen-nox package contains the XEN micro-kernel and tools for PV
+xen-nox: and PVH modes, including the good old xenstore daemon written in C.
+xen-nox:
+xen-nox: QEMU-XEN is built without X11 support (no GTK, SDL nor OpenGL).
+xen-nox:
+xen-nox:
+xen-nox:
+xen-nox:
+xen-nox:
diff --git a/system/xen-nox/xen-nox.SlackBuild b/system/xen-nox/xen-nox.SlackBuild
new file mode 100644
index 0000000000..f2da845728
--- /dev/null
+++ b/system/xen-nox/xen-nox.SlackBuild
@@ -0,0 +1,125 @@
+#!/bin/bash
+
+# Slackware build script for xen-nox
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=xen-nox
+SRCNAM=xen
+VERSION=${VERSION:-4.17.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+
+cd $TMP
+rm -rf $SRCNAM
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  --with-initddir=/etc/rc.d/init.d \
+  --disable-stubdom \
+  --disable-ioemu-stubdom \
+  --disable-pv-grub \
+  --disable-xenstore-stubdom \
+  --disable-ocamltools \
+  --disable-xsmpolicy \
+  --disable-seabios \
+  --disable-golang \
+  --disable-qemu-traditional \
+  --disable-ipxe \
+  --disable-systemd \
+  --with-xenstored=xenstored \
+  --with-extra-qemuu-configure-args="--sysconfdir=/etc \
+		--audio-drv-list= \
+		--disable-slirp \
+		--disable-blobs \
+		--disable-plugins \
+		--disable-gtk \
+		--disable-sdl \
+		--disable-sdl-image \
+		--disable-opengl \
+		--disable-capstone \
+		--disable-slirp-smbd \
+		--disable-spice-protocol \
+		--disable-fuse \
+		--disable-fuse-lseek"
+
+mkdir -p $PKG/usr/man
+make install-xen DESTDIR=$PKG
+make install-tools DESTDIR=$PKG
+make install-docs DESTDIR=$PKG
+
+# /usr/lib/xen/bin/pygrub
+rm -f $PKG/usr/bin/pygrub
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md CODING_STYLE CONTRIBUTING COPYING CREDITS MAINTAINERS SUPPORT.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xen-nox/xen-nox.info b/system/xen-nox/xen-nox.info
new file mode 100644
index 0000000000..989df54a12
--- /dev/null
+++ b/system/xen-nox/xen-nox.info
@@ -0,0 +1,10 @@
+PRGNAM="xen-nox"
+VERSION="4.17.0"
+HOMEPAGE="https://xenproject.org/xen-project-archives/"
+DOWNLOAD="https://downloads.xenproject.org/release/xen/4.17.0/xen-4.17.0.tar.gz"
+MD5SUM="b215062ff053378eed41e4a3e05081df"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="acpica yajl"
+MAINTAINER="Pierre-Philipp Braun"
+EMAIL="pbraun@nethence.com"
diff --git a/system/xen/README b/system/xen/README
index 2999a8e54d..f81830ae55 100644
--- a/system/xen/README
+++ b/system/xen/README
@@ -1,8 +1,9 @@
 The Xen hypervisor, a powerful open source industry standard for
-virtualization, offers a powerful, efficient, and secure feature set for
-virtualization of x86, x86_64, IA64, ARM, and other CPU architectures. It
-supports a wide range of guest operating systems including Windows, Linux,
-Solaris, and various versions of the BSD operating systems.
+virtualization, offers a powerful, efficient, and secure feature
+set for virtualization of x86, x86_64, IA64, ARM, and other CPU
+architectures. It supports a wide range of guest operating systems
+including Windows, Linux, Solaris, and various versions of the BSD
+operating systems.
 
 This script has a few optional dependencies:
 
@@ -14,7 +15,6 @@ This script has a few optional dependencies:
 
 Linking with the stock libraries:
 
-  bluez - enable with USE_BLUEZ=yes
   gtk - enable with USE_GTK=yes
   audio - enable with USE_AUDIO=yes
           (or a comma-delimited list: oss alsa sdl pa)
diff --git a/system/xen/doinst.sh b/system/xen/doinst.sh
index 51c573cb0c..712b2ddc17 100644
--- a/system/xen/doinst.sh
+++ b/system/xen/doinst.sh
@@ -31,3 +31,6 @@ find etc/default -type f -name 'xen*.new' \
 find etc/xen -type f -name '*.new' \
   | while read new ; do config $new ; done
 
+[ -d etc/sysconfig ] && find etc/sysconfig -type f -name 'xen*.new' \
+  | while read new ; do config $new ; done
+
diff --git a/system/xen/dom0/README.dom0 b/system/xen/dom0/README.dom0
index 68dbf815fb..804d0efb00 100644
--- a/system/xen/dom0/README.dom0
+++ b/system/xen/dom0/README.dom0
@@ -1,77 +1,89 @@
 kernel-xen.sh: This script builds the Linux Kernel for a Xen Hypervisor.
 
-Kernel configuration files included here are based on generic Slackware config
-files. For 32bit systems, SMP config was used. To run "make menuconfig" before
-compiling Xen kernel, use:
+* Kernel config files found here are based on generic Slackware ones with
+  some Xen settings enabled to get it going. Only x86_64 architecture is now
+  supported because Xen no longer builds a 32-bit VMM image. This readme is
+  by no means complete or a replacement for Linux Kernel and Xen docs.
+
+* To run "make menuconfig" before compiling Xen kernel, use:
 
   MENUCONFIG=yes ./kernel-xen.sh
 
-Originally, booting Xen kernel with LILO bootloader is not supported, and GRUB
-has to be used. With mbootpack this has changed, and LILO can be used as well.
-Basically, mbootpack takes Linux kernel, initrd and Xen VMM, and packages them
-up into a file that looks like a bzImage Linux kernel. This script will select
-LILO by default, changing to GRUB is easy:
+* This script will also create an initrd image, with the following defaults:
+
+  ROOTMOD=ext4 ROOTFS=ext4 ROOTDEV=/dev/sda2 ./kernel-xen.sh
+
+* Booting LILO with mbootpack has shown to be unreliable, and the easiest
+  method is to use EXTLINUX from Syslinux package. In this example, device
+  /dev/sda1 would have an ext2 filesystem mounted to /boot.
+
+  !!! Make sure to understand what are you doing at this point, you could
+      easily lose your data. Always create backups !!!
+
+  * To check and set the legacy BIOS bootable flag (bit 2 attribute):
+
+    sgdisk /dev/sda --attributes=1:show
+    sgdisk /dev/sda --attributes=1:set:2
 
-  BOOTLOADER=grub ./kernel-xen.sh
+  * Install the binary:
 
-Slackware generic kernel requires initrd image, this script assumes root is on
-/dev/sda2 and filesystem is ext4, changes are made with:
+    mkdir /boot/extlinux
+    extlinux --install /boot/extlinux
+    dd if=/usr/share/syslinux/gptmbr.bin of=/dev/sda
+    cp -a /usr/share/syslinux/mboot.c32 /boot/extlinux/
 
-  ROOTMOD=ext3 ROOTFS=ext3 ROOTDEV=/dev/sda5 ./kernel-xen.sh
+  * Edit the /boot/extlinux/extlinux.conf file:
 
-When using LILO bootloader, this is what the lilo.conf should have:
+    default XenLinux
+    prompt 1
+    timeout 50
+    label XenLinux
+      kernel mboot.c32
+      append /xen.gz --- /vmlinuz-xen root=/dev/sda2 nomodeset --- /initrd-xen.gz
 
-  image = /boot/vmlinuz-xen
-    root = /dev/sda2
-    label = XenLinux
-    append="dom0_mem=512M -- nomodeset"
-    read-only
+* When using GRUB, /boot/grub/menu.lst should looks something like this:
 
-Everything on the left side of "--" is passed to Xen kernel, and what's on the
-right, goes to Linux kernel.
+  title Slackware XenLinux 15.0
+    root (hd0,0)
+    kernel /boot/xen.gz dom0_mem=524288 console=vga
+    module /boot/vmlinuz-xen root=/dev/sda2 ro console=tty0 nomodeset
+    module /boot/initrd-xen.gz
 
-When using GRUB, /boot/grub/menu.lst should have these:
+* Booting Xen on a native EFI system (non-BIOS legacy mode) is probably the
+  best option, but the only clean solution at this time requires a modified
+  binutils package. More experienced user can add "x86_64-pep" to the list of
+  enabled targets and build/replace binutils on their system. Subsequently,
+  building Xen will then also create a Xen EFI binary.
 
-  title Slackware XenLinux 14.2
-           root (hd0,0)
-           kernel /boot/xen.gz dom0_mem=524288 console=vga
-           module /boot/vmlinuz-xen root=/dev/sda2 ro console=tty0 nomodeset
-           module /boot/initrd-xen.gz
+  * To make things a bit easier, a copy of Xen EFI binary can be found here:
 
-Booting Xen on a native EFI system is also an option, but the only clean
-solution at this time requires a modified binutils package. More experienced
-user can add "x86_64-pep" to the list of enabled targets and build/replace
-binutils on their system. Subsequently, building Xen will now also create a
-Xen EFI binary.
+    http://slackware.hr/~mario/xen/xen-4.17.1.efi.gz
 
-To make things a bit easier, a copy of Xen EFI binary can be found here:
+  !!! Make sure to understand what are you doing at this point, you could
+      easily lose your data. Always create backups !!!
 
-  http://slackware.hr/~mario/xen/xen-4.13.1.efi.gz
+  * In this example, partition /dev/sda1 with EF or EF00 type, and do:
 
-If an automatic boot to Xen kernel is desired, the binary should be renamed and
-copied to the following location: /boot/efi/EFI/BOOT/bootx64.efi
-Downloaded binary should be unpacked first, and the config file should be
-present in the same directory (same file name, minus the suffix).
-For example: "xen.cfg" or "bootx64.cfg", and its contents:
+    mkfs.vfat /dev/sda1
+    mkdir /boot/efi
+    mount /dev/sda1 /boot/efi
 
-  [global]
-  default=xen
+  * Copy/unpack EFI binary to /boot/efi/EFI/BOOT/bootx64.efi and edit
+    /boot/efi/EFI/BOOT/bootx64.cfg file to add these:
 
-  [xen]
-  options=dom0_mem=min:512M,max:512M,512M
-  kernel=vmlinuz-xen root=/dev/sda2 ro console=tty0 nomodeset
-  ramdisk=initrd-xen.gz
+    [global]
+    default=XenLinux
+    [XenLinux]
+    options=dom0_mem=min:512M,max:512M,512M
+    kernel=vmlinuz-xen root=/dev/sda2 ro console=tty0 nomodeset
+    ramdisk=initrd-xen.gz
 
-There are some other EFI bootloaders, for example ELILO comes with the support
-for VMM images, but their x86 support is lacking. GRUB2 apparently supports
-only the chainloader method; however, the stock Slackware version is too old
-for this task. rEFInd should work, but the Xen EFI method was satisfactory to
-the author :-)
+* Many more boot options are supported, this readme covers only some examples!
 
-Troubleshooting dom0 crashes, freezes, blank screen and such:
+* Troubleshooting dom0 crashes, freezes, blank screen at boot, etc:
 
-  * Use /proc/fb to find an out of range device id, for example this can be
-    added to Linux kernel: fbcon=map:9
-  * Look in dmesg/lsmod for potential framebuffer devices to blacklist
+  * Set an out-of-range device id, eg. fbcon=map:9 (Look for more in /proc/fb)
+  * Blacklist framebuffer devices (Look in dmesg/lsmod)
   * Compile Linux kernel with CONFIG_FB=n
+  * Use a serial cable to see early boot messages
   * Use another VGA card :-)
diff --git a/system/xen/dom0/config-4.4.240-xen.i686 b/system/xen/dom0/config-4.4.240-xen.i686
deleted file mode 100644
index 4bc001ee58..0000000000
--- a/system/xen/dom0/config-4.4.240-xen.i686
+++ /dev/null
@@ -1,7450 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.4.240 Kernel Configuration
-#
-# CONFIG_64BIT is not set
-CONFIG_X86_32=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_PERF_EVENTS_INTEL_UNCORE=y
-CONFIG_OUTPUT_FORMAT="elf32-i386"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_X86_32_SMP=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=3
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-xen"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="darkstar"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_FHANDLE=y
-# CONFIG_USELIB is not set
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-# CONFIG_TASKS_RCU is not set
-CONFIG_RCU_STALL_COMMON=y
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_EXPEDITE_BOOT is not set
-CONFIG_BUILD_BIN2C=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=18
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
-CONFIG_CGROUP_WRITEBACK=y
-# CONFIG_CHECKPOINT_RESTORE is not set
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-# CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_MULTIUSER=y
-CONFIG_SGETMASK_SYSCALL=y
-CONFIG_SYSFS_SYSCALL=y
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-# CONFIG_BPF_SYSCALL is not set
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_USERFAULTFD=y
-CONFIG_PCI_QUIRKS=y
-CONFIG_MEMBARRIER=y
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLUB_CPU_PARTIAL=y
-# CONFIG_SYSTEM_DATA_VERIFICATION is not set
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-CONFIG_HAVE_OPROFILE=y
-CONFIG_OPROFILE_NMI_TIMER=y
-# CONFIG_KPROBES is not set
-# CONFIG_JUMP_LABEL is not set
-# CONFIG_UPROBES is not set
-# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_KPROBES_ON_FTRACE=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_CC_STACKPROTECTOR=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_NONE is not set
-CONFIG_CC_STACKPROTECTOR_REGULAR=y
-# CONFIG_CC_STACKPROTECTOR_STRONG is not set
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_HUGE_VMAP=y
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_OLD_SIGACTION=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_LBDAF=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_CMDLINE_PARSER is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_AIX_PARTITION=y
-CONFIG_OSF_PARTITION=y
-CONFIG_AMIGA_PARTITION=y
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-CONFIG_SGI_PARTITION=y
-# CONFIG_ULTRIX_PARTITION is not set
-CONFIG_SUN_PARTITION=y
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_CMDLINE_PARTITION is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_FREEZER=y
-
-#
-# Processor type and features
-#
-CONFIG_ZONE_DMA=y
-CONFIG_SMP=y
-CONFIG_X86_FEATURE_NAMES=y
-CONFIG_X86_FAST_FEATURE_TESTS=y
-CONFIG_X86_MPPARSE=y
-CONFIG_X86_BIGSMP=y
-CONFIG_RETPOLINE=y
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_X86_INTEL_LPSS=y
-CONFIG_X86_AMD_PLATFORM_DEVICE=y
-CONFIG_IOSF_MBI=m
-# CONFIG_IOSF_MBI_DEBUG is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_X86_32_IRIS=m
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_DEBUG is not set
-CONFIG_PARAVIRT_SPINLOCKS=y
-CONFIG_XEN=y
-CONFIG_XEN_DOM0=y
-CONFIG_XEN_PVHVM=y
-CONFIG_XEN_SAVE_RESTORE=y
-# CONFIG_XEN_DEBUG_FS is not set
-CONFIG_KVM_GUEST=y
-# CONFIG_KVM_DEBUG_FS is not set
-# CONFIG_LGUEST_GUEST is not set
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_NO_BOOTMEM=y
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
-# CONFIG_MPENTIUMII is not set
-CONFIG_MPENTIUMIII=y
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MELAN is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_X86_GENERIC=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
-CONFIG_X86_DEBUGCTLMSR=y
-# CONFIG_PROCESSOR_SELECT is not set
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_CYRIX_32=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
-CONFIG_NR_CPUS=32
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-CONFIG_X86_ANCIENT_MCE=y
-CONFIG_X86_MCE_THRESHOLD=y
-CONFIG_X86_MCE_INJECT=m
-CONFIG_X86_THERMAL_VECTOR=y
-# CONFIG_X86_LEGACY_VM86 is not set
-# CONFIG_VM86 is not set
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX32=y
-CONFIG_TOSHIBA=m
-CONFIG_I8K=m
-CONFIG_X86_REBOOTFIXUPS=y
-CONFIG_MICROCODE=y
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=y
-CONFIG_X86_CPUID=y
-# CONFIG_NOHIGHMEM is not set
-# CONFIG_HIGHMEM4G is not set
-CONFIG_HIGHMEM64G=y
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_HIGHMEM=y
-CONFIG_X86_PAE=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_NUMA=y
-# CONFIG_NUMA_EMU is not set
-CONFIG_NODES_SHIFT=3
-CONFIG_ARCH_HAVE_MEMORY_PRESENT=y
-CONFIG_NEED_NODE_MEMMAP_SIZE=y
-CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
-CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ILLEGAL_POINTER_VALUE=0
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_DISCONTIGMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_DISCONTIGMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_STATIC=y
-CONFIG_HAVE_MEMBLOCK=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_ARCH_DISCARD_MEMBLOCK=y
-# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=98304
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-# CONFIG_MEMORY_FAILURE is not set
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
-# CONFIG_CMA is not set
-CONFIG_ZPOOL=m
-# CONFIG_ZBUD is not set
-CONFIG_ZSMALLOC=m
-# CONFIG_PGTABLE_MAPPING is not set
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
-# CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_FRAME_VECTOR=y
-CONFIG_X86_PMEM_LEGACY_DEVICE=y
-CONFIG_X86_PMEM_LEGACY=y
-CONFIG_HIGHPTE=y
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW=64
-CONFIG_MATH_EMULATION=y
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
-# CONFIG_X86_INTEL_MPX is not set
-CONFIG_X86_INTEL_TSX_MODE_OFF=y
-# CONFIG_X86_INTEL_TSX_MODE_ON is not set
-# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
-CONFIG_EFI=y
-# CONFIG_EFI_STUB is not set
-CONFIG_SECCOMP=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-CONFIG_HZ_1000=y
-CONFIG_HZ=1000
-CONFIG_SCHED_HRTICK=y
-# CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-# CONFIG_RELOCATABLE is not set
-CONFIG_PHYSICAL_ALIGN=0x100000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_MODIFY_LDT_SYSCALL=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION="\"\""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=100
-CONFIG_PM_WAKELOCKS_GC=y
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_CLK=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_ACPI=y
-CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
-CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
-CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
-# CONFIG_ACPI_DEBUGGER is not set
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
-CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_CPU_FREQ_PSS=y
-CONFIG_ACPI_PROCESSOR_IDLE=y
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-# CONFIG_ACPI_NUMA is not set
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HOTPLUG_IOAPIC=y
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=y
-# CONFIG_ACPI_CUSTOM_METHOD is not set
-CONFIG_ACPI_BGRT=y
-# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
-CONFIG_ACPI_NFIT=m
-CONFIG_HAVE_ACPI_APEI=y
-CONFIG_HAVE_ACPI_APEI_NMI=y
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_APEI_EINJ=m
-CONFIG_ACPI_APEI_ERST_DEBUG=m
-CONFIG_ACPI_EXTLOG=m
-CONFIG_PMIC_OPREGION=y
-CONFIG_SFI=y
-# CONFIG_APM is not set
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-
-#
-# CPU frequency scaling drivers
-#
-CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ_CPB=y
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=m
-CONFIG_X86_POWERNOW_K7_ACPI=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-CONFIG_X86_GX_SUSPMOD=m
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-CONFIG_X86_SPEEDSTEP_ICH=m
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_CPUFREQ_NFORCE2=m
-CONFIG_X86_LONGRUN=m
-CONFIG_X86_LONGHAUL=m
-CONFIG_X86_E_POWERSAVER=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
-CONFIG_INTEL_IDLE=y
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_XEN=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEAER_INJECT=m
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-CONFIG_PCI_BUS_ADDR_T_64BIT=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-CONFIG_PCI_STUB=m
-CONFIG_XEN_PCIDEV_FRONTEND=y
-CONFIG_HT_IRQ=y
-CONFIG_PCI_ATS=y
-CONFIG_PCI_IOV=y
-# CONFIG_PCI_PRI is not set
-CONFIG_PCI_PASID=y
-CONFIG_PCI_LABEL=y
-
-#
-# PCI host controller drivers
-#
-CONFIG_ISA_DMA_API=y
-CONFIG_ISA=y
-# CONFIG_EISA is not set
-CONFIG_SCx200=m
-CONFIG_SCx200HR_TIMER=m
-CONFIG_ALIX=y
-# CONFIG_NET5501 is not set
-# CONFIG_GEOS is not set
-CONFIG_AMD_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_I82365=m
-CONFIG_TCIC=m
-CONFIG_PCMCIA_PROBE=y
-CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_COMPAQ=m
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
-# CONFIG_RAPIDIO is not set
-# CONFIG_X86_SYSFB is not set
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_HAVE_AOUT=y
-CONFIG_BINFMT_AOUT=m
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-CONFIG_HAVE_ATOMIC_IOMAP=y
-CONFIG_PMC_ATOM=y
-CONFIG_NET=y
-CONFIG_NET_INGRESS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_DIAG=m
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=y
-CONFIG_XFRM_USER=y
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-CONFIG_NET_FOU_IP_TUNNELS=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=m
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_NETLABEL is not set
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NET_PTP_CLASSIFY=y
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CONNTRACK_PROCFS is not set
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_TIMEOUT is not set
-# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=m
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_INET=m
-CONFIG_NF_TABLES_NETDEV=m
-CONFIG_NFT_EXTHDR=m
-CONFIG_NFT_META=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_TABLES_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NF_TABLES_ARP=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NF_NAT_MASQUERADE_IPV4=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_NF_TABLES_IPV6=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NF_NAT_MASQUERADE_IPV6=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_REDIR_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-
-#
-# DECnet: Netfilter Configuration
-#
-# CONFIG_DECNET_NF_GRABULATOR is not set
-CONFIG_NF_TABLES_BRIDGE=m
-CONFIG_NFT_BRIDGE_META=m
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-# CONFIG_IP_DCCP_CCID3 is not set
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-CONFIG_RDS=m
-CONFIG_RDS_RDMA=m
-CONFIG_RDS_TCP=m
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-CONFIG_TIPC_MEDIA_IB=y
-CONFIG_TIPC_MEDIA_UDP=y
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-CONFIG_L2TP_DEBUGFS=m
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_GARP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_HAVE_NET_DSA=y
-CONFIG_NET_DSA=m
-CONFIG_NET_DSA_HWMON=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-# CONFIG_VLAN_8021Q_MVRP is not set
-CONFIG_DECNET=m
-# CONFIG_DECNET_ROUTER is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_LTPC=m
-CONFIG_COPS=m
-CONFIG_COPS_DAYNA=y
-CONFIG_COPS_TANGENT=y
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_PHONET is not set
-CONFIG_6LOWPAN=m
-CONFIG_6LOWPAN_NHC=m
-CONFIG_6LOWPAN_NHC_DEST=m
-CONFIG_6LOWPAN_NHC_FRAGMENT=m
-CONFIG_6LOWPAN_NHC_HOP=m
-CONFIG_6LOWPAN_NHC_IPV6=m
-CONFIG_6LOWPAN_NHC_MOBILITY=m
-CONFIG_6LOWPAN_NHC_ROUTING=m
-CONFIG_6LOWPAN_NHC_UDP=m
-CONFIG_IEEE802154=m
-# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
-CONFIG_IEEE802154_SOCKET=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=y
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_CANID=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=y
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_CLS_IND is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-CONFIG_BATMAN_ADV=m
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-CONFIG_BATMAN_ADV_NC=y
-CONFIG_BATMAN_ADV_MCAST=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_NETLINK_DIAG=m
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_HSR=m
-CONFIG_NET_SWITCHDEV=y
-# CONFIG_NET_L3_MASTER_DEV is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
-CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
-CONFIG_AX25=m
-# CONFIG_AX25_DAMA_SLAVE is not set
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-#
-# AX.25 network device drivers
-#
-CONFIG_MKISS=m
-CONFIG_6PACK=m
-CONFIG_BPQETHER=m
-CONFIG_SCC=m
-CONFIG_SCC_DELAY=y
-CONFIG_SCC_TRXECHO=y
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_BAYCOM_PAR=m
-CONFIG_BAYCOM_EPP=m
-CONFIG_YAM=m
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_GW=m
-
-#
-# CAN Device Drivers
-#
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_SLCAN=m
-CONFIG_CAN_DEV=m
-CONFIG_CAN_CALC_BITTIMING=y
-# CONFIG_CAN_LEDS is not set
-CONFIG_CAN_JANZ_ICAN3=m
-CONFIG_PCH_CAN=m
-CONFIG_CAN_SJA1000=m
-CONFIG_CAN_SJA1000_ISA=m
-CONFIG_CAN_SJA1000_PLATFORM=m
-CONFIG_CAN_EMS_PCMCIA=m
-CONFIG_CAN_EMS_PCI=m
-CONFIG_CAN_PEAK_PCMCIA=m
-CONFIG_CAN_PEAK_PCI=m
-CONFIG_CAN_PEAK_PCIEC=y
-CONFIG_CAN_KVASER_PCI=m
-CONFIG_CAN_PLX_PCI=m
-CONFIG_CAN_TSCAN1=m
-CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PLATFORM=m
-CONFIG_CAN_C_CAN_PCI=m
-CONFIG_CAN_M_CAN=m
-CONFIG_CAN_CC770=m
-CONFIG_CAN_CC770_ISA=m
-CONFIG_CAN_CC770_PLATFORM=m
-
-#
-# CAN USB interfaces
-#
-CONFIG_CAN_EMS_USB=m
-CONFIG_CAN_ESD_USB2=m
-CONFIG_CAN_GS_USB=m
-CONFIG_CAN_KVASER_USB=m
-CONFIG_CAN_PEAK_USB=m
-CONFIG_CAN_8DEV_USB=m
-CONFIG_CAN_SOFTING=m
-CONFIG_CAN_SOFTING_CS=m
-# CONFIG_CAN_DEBUG_DEVICES is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-# CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_TOSHIBA_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_SELFTEST is not set
-# CONFIG_BT_DEBUGFS is not set
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_QCA=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_BCM=y
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-CONFIG_CFG80211_CRDA_SUPPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-# CONFIG_MAC80211_RC_MINSTREL_VHT is not set
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_REGULATOR=m
-CONFIG_RFKILL_GPIO=m
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-CONFIG_NET_9P_RDMA=m
-# CONFIG_NET_9P_DEBUG is not set
-# CONFIG_CAIF is not set
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
-CONFIG_NFC=m
-CONFIG_NFC_DIGITAL=m
-CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_UART is not set
-CONFIG_NFC_HCI=m
-# CONFIG_NFC_SHDLC is not set
-
-#
-# Near Field Communication (NFC) devices
-#
-CONFIG_NFC_PN533=m
-CONFIG_NFC_WILINK=m
-# CONFIG_NFC_MEI_PHY is not set
-CONFIG_NFC_SIM=m
-CONFIG_NFC_PORT100=m
-# CONFIG_NFC_FDP is not set
-CONFIG_NFC_MRVL=m
-CONFIG_NFC_MRVL_USB=m
-# CONFIG_NFC_MRVL_I2C is not set
-CONFIG_NFC_ST21NFCA=m
-# CONFIG_NFC_ST_NCI is not set
-CONFIG_NFC_NXP_NCI=m
-CONFIG_NFC_NXP_NCI_I2C=m
-# CONFIG_NFC_S3FWRN5_I2C is not set
-CONFIG_LWTUNNEL=y
-CONFIG_DST_CACHE=y
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
-CONFIG_WANT_DEV_COREDUMP=y
-CONFIG_ALLOW_DEV_COREDUMP=y
-CONFIG_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-CONFIG_SYS_HYPERVISOR=y
-# CONFIG_GENERIC_CPU_DEVICES is not set
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_MMIO=y
-CONFIG_REGMAP_IRQ=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_FENCE_TRACE is not set
-
-#
-# Bus devices
-#
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-CONFIG_MTD_CMDLINE_PARTS=m
-CONFIG_MTD_AR7_PARTS=m
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-CONFIG_SM_FTL=m
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_SWAP=m
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_GEOMETRY=y
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_MAP_BANK_WIDTH_8=y
-CONFIG_MTD_MAP_BANK_WIDTH_16=y
-CONFIG_MTD_MAP_BANK_WIDTH_32=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_I4=y
-CONFIG_MTD_CFI_I8=y
-CONFIG_MTD_OTP=y
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-CONFIG_MTD_SBC_GXX=m
-CONFIG_MTD_SCx200_DOCFLASH=m
-CONFIG_MTD_AMD76XROM=m
-CONFIG_MTD_ICHXROM=m
-CONFIG_MTD_ESB2ROM=m
-CONFIG_MTD_CK804XROM=m
-CONFIG_MTD_SCB2_FLASH=m
-CONFIG_MTD_NETtel=m
-CONFIG_MTD_L440GX=m
-CONFIG_MTD_PCI=m
-CONFIG_MTD_PCMCIA=m
-# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
-CONFIG_MTD_GPIO_ADDR=m
-CONFIG_MTD_INTEL_VR_NOR=m
-CONFIG_MTD_PLATRAM=m
-CONFIG_MTD_LATCH_ADDR=m
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-CONFIG_MTD_PMC551_BUGFIX=y
-# CONFIG_MTD_PMC551_DEBUG is not set
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_DOCG3=m
-CONFIG_BCH_CONST_M=14
-CONFIG_BCH_CONST_T=4
-CONFIG_MTD_NAND_ECC=m
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND=m
-CONFIG_MTD_NAND_BCH=m
-CONFIG_MTD_NAND_ECC_BCH=y
-CONFIG_MTD_SM_COMMON=m
-CONFIG_MTD_NAND_DENALI=m
-CONFIG_MTD_NAND_DENALI_PCI=m
-CONFIG_MTD_NAND_DENALI_DT=m
-CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
-CONFIG_MTD_NAND_GPIO=m
-# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
-CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
-CONFIG_MTD_NAND_DOCG4=m
-CONFIG_MTD_NAND_CAFE=m
-CONFIG_MTD_NAND_CS553X=m
-CONFIG_MTD_NAND_NANDSIM=m
-CONFIG_MTD_NAND_PLATFORM=m
-CONFIG_MTD_NAND_HISI504=m
-CONFIG_MTD_ONENAND=m
-CONFIG_MTD_ONENAND_VERIFY_WRITE=y
-CONFIG_MTD_ONENAND_GENERIC=m
-CONFIG_MTD_ONENAND_OTP=y
-CONFIG_MTD_ONENAND_2X_PROGRAM=y
-
-#
-# LPDDR & LPDDR2 PCM memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-# CONFIG_MTD_SPI_NOR is not set
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-CONFIG_MTD_UBI_GLUEBI=m
-# CONFIG_MTD_UBI_BLOCK is not set
-# CONFIG_OF is not set
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-CONFIG_PNP_DEBUG_MESSAGES=y
-
-#
-# Protocols
-#
-CONFIG_ISAPNP=y
-# CONFIG_PNPBIOS is not set
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_NULL_BLK=m
-CONFIG_BLK_DEV_FD=y
-CONFIG_PARIDE=m
-
-#
-# Parallel IDE high-level drivers
-#
-CONFIG_PARIDE_PD=m
-CONFIG_PARIDE_PCD=m
-CONFIG_PARIDE_PF=m
-CONFIG_PARIDE_PT=m
-CONFIG_PARIDE_PG=m
-
-#
-# Parallel IDE protocol modules
-#
-CONFIG_PARIDE_ATEN=m
-CONFIG_PARIDE_BPCK=m
-CONFIG_PARIDE_BPCK6=m
-CONFIG_PARIDE_COMM=m
-CONFIG_PARIDE_DSTR=m
-CONFIG_PARIDE_FIT2=m
-CONFIG_PARIDE_FIT3=m
-CONFIG_PARIDE_EPAT=m
-CONFIG_PARIDE_EPATC8=y
-CONFIG_PARIDE_EPIA=m
-CONFIG_PARIDE_FRIQ=m
-CONFIG_PARIDE_FRPW=m
-CONFIG_PARIDE_KBIC=m
-CONFIG_PARIDE_KTTI=m
-CONFIG_PARIDE_ON20=m
-CONFIG_PARIDE_ON26=m
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_LZ4_COMPRESS is not set
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_CISS_SCSI_TAPE=y
-CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_UMEM=m
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_BLK_DEV_RAM_DAX=y
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_BLKDEV_BACKEND=y
-CONFIG_VIRTIO_BLK=m
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_RBD=m
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_BLK_DEV_NVME=m
-
-#
-# Misc devices
-#
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_DUMMY_IRQ=m
-CONFIG_IBM_ASM=m
-CONFIG_PHANTOM=m
-CONFIG_SGI_IOC4=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_CS5535_MFGPT=m
-CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-CONFIG_HP_ILO=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1780=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
-CONFIG_BMP085_I2C=m
-CONFIG_PCH_PHUB=m
-CONFIG_USB_SWITCH_FSA9480=m
-# CONFIG_SRAM is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-CONFIG_SENSORS_LIS3_I2C=m
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_INTEL_MEI_TXE=m
-CONFIG_VMWARE_VMCI=m
-
-#
-# Intel MIC Bus Driver
-#
-
-#
-# SCIF Bus Driver
-#
-
-#
-# Intel MIC Host Driver
-#
-
-#
-# Intel MIC Card Driver
-#
-
-#
-# SCIF Driver
-#
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-# CONFIG_ECHO is not set
-# CONFIG_CXL_BASE is not set
-# CONFIG_CXL_KERNEL_API is not set
-# CONFIG_CXL_EEH is not set
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-CONFIG_RAID_ATTRS=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-# CONFIG_SCSI_MQ_DEFAULT is not set
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=y
-CONFIG_SCSI_SAS_LIBSAS=y
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=y
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_7000FASST=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AHA152X=m
-CONFIG_SCSI_AHA1542=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=4
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_MVSAS_TASKLET is not set
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_IN2000=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ESAS2R=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_FLASHPOINT=y
-CONFIG_VMWARE_PVSCSI=m
-# CONFIG_XEN_SCSI_FRONTEND is not set
-CONFIG_HYPERV_STORAGE=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-CONFIG_SCSI_SNIC=m
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_DTC3280=m
-CONFIG_SCSI_EATA=m
-# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
-# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_GENERIC_NCR5380=m
-CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
-CONFIG_SCSI_GENERIC_NCR53C400=y
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_NCR53C406A=m
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_PAS16=m
-CONFIG_SCSI_QLOGIC_FAS=m
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_SYM53C416=m
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_T128=m
-CONFIG_SCSI_U14_34F=m
-# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set
-# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set
-CONFIG_SCSI_U14_34F_MAX_TAGS=8
-CONFIG_SCSI_ULTRASTOR=m
-CONFIG_SCSI_NSP32=m
-CONFIG_SCSI_WD719X=m
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_NINJA_SCSI=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=y
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_ATA=y
-# CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-# CONFIG_SATA_ZPODD is not set
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=y
-CONFIG_SATA_AHCI_PLATFORM=y
-CONFIG_SATA_INIC162X=y
-CONFIG_SATA_ACARD_AHCI=y
-CONFIG_SATA_SIL24=y
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=y
-CONFIG_SATA_QSTOR=y
-CONFIG_SATA_SX4=y
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=y
-CONFIG_SATA_MV=y
-CONFIG_SATA_NV=y
-CONFIG_SATA_PROMISE=y
-CONFIG_SATA_SIL=y
-CONFIG_SATA_SIS=y
-CONFIG_SATA_SVW=y
-CONFIG_SATA_ULI=y
-CONFIG_SATA_VIA=y
-CONFIG_SATA_VITESSE=y
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=y
-CONFIG_PATA_AMD=y
-CONFIG_PATA_ARTOP=y
-CONFIG_PATA_ATIIXP=y
-CONFIG_PATA_ATP867X=y
-CONFIG_PATA_CMD64X=y
-CONFIG_PATA_CS5520=y
-CONFIG_PATA_CS5530=y
-CONFIG_PATA_CS5535=y
-CONFIG_PATA_CS5536=y
-CONFIG_PATA_CYPRESS=y
-CONFIG_PATA_EFAR=y
-CONFIG_PATA_HPT366=y
-CONFIG_PATA_HPT37X=y
-CONFIG_PATA_HPT3X2N=y
-CONFIG_PATA_HPT3X3=y
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_IT8213=y
-CONFIG_PATA_IT821X=y
-CONFIG_PATA_JMICRON=y
-CONFIG_PATA_MARVELL=y
-CONFIG_PATA_NETCELL=y
-CONFIG_PATA_NINJA32=y
-CONFIG_PATA_NS87415=y
-CONFIG_PATA_OLDPIIX=y
-CONFIG_PATA_OPTIDMA=y
-CONFIG_PATA_PDC2027X=y
-CONFIG_PATA_PDC_OLD=y
-CONFIG_PATA_RADISYS=y
-CONFIG_PATA_RDC=y
-CONFIG_PATA_SC1200=y
-CONFIG_PATA_SCH=y
-CONFIG_PATA_SERVERWORKS=y
-CONFIG_PATA_SIL680=y
-CONFIG_PATA_SIS=y
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=y
-CONFIG_PATA_VIA=y
-CONFIG_PATA_WINBOND=y
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=y
-CONFIG_PATA_ISAPNP=y
-CONFIG_PATA_MPIIX=y
-CONFIG_PATA_NS87410=y
-CONFIG_PATA_OPTI=y
-CONFIG_PATA_PCMCIA=m
-# CONFIG_PATA_PLATFORM is not set
-CONFIG_PATA_QDI=y
-CONFIG_PATA_RZ1000=y
-CONFIG_PATA_WINBOND_VLB=y
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_PATA_ACPI=y
-CONFIG_ATA_GENERIC=y
-CONFIG_PATA_LEGACY=y
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_AUTODETECT=y
-CONFIG_MD_LINEAR=y
-CONFIG_MD_RAID0=y
-CONFIG_MD_RAID1=y
-CONFIG_MD_RAID10=y
-CONFIG_MD_RAID456=y
-CONFIG_MD_MULTIPATH=y
-CONFIG_MD_FAULTY=m
-CONFIG_MD_CLUSTER=m
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=y
-# CONFIG_DM_MQ_DEFAULT is not set
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-CONFIG_DM_CRYPT=y
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_MQ=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_CACHE_CLEANER=m
-CONFIG_DM_ERA=m
-CONFIG_DM_MIRROR=y
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-# CONFIG_DM_DELAY is not set
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-CONFIG_DM_SWITCH=m
-CONFIG_DM_LOG_WRITES=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_TCM_USER2=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_SBP_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LAN=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=m
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-CONFIG_NET_FC=y
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN=m
-CONFIG_VXLAN=m
-CONFIG_GENEVE=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NTB_NETDEV=m
-CONFIG_TUN=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_SUNGEM_PHY=m
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-CONFIG_ARCNET_COM90xx=m
-CONFIG_ARCNET_COM90xxIO=m
-CONFIG_ARCNET_RIM_I=m
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_ISA=m
-CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_ARCNET_COM20020_CS=m
-CONFIG_ATM_DRIVERS=y
-CONFIG_ATM_DUMMY=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_RING=m
-CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-
-#
-# Distributed Switch Architecture drivers
-#
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
-CONFIG_NET_DSA_MV88E6131=m
-CONFIG_NET_DSA_MV88E6123_61_65=m
-CONFIG_NET_DSA_MV88E6171=m
-CONFIG_NET_DSA_MV88E6352=m
-CONFIG_NET_DSA_BCM_SF2=m
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL3=m
-CONFIG_3C515=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_AGERE=y
-# CONFIG_ET131X is not set
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_ALTERA_TSE=m
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_AMD8111_ETH=m
-CONFIG_LANCE=m
-CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_NI65=m
-CONFIG_NET_VENDOR_ARC=y
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_ALX=m
-CONFIG_NET_VENDOR_AURORA=y
-CONFIG_AURORA_NB8800=m
-CONFIG_NET_CADENCE=y
-CONFIG_MACB=m
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_BCMGENET=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_TIGON3=m
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-CONFIG_BNX2X_VXLAN=y
-CONFIG_BNXT=m
-CONFIG_BNXT_SRIOV=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
-CONFIG_NET_VENDOR_CAVIUM=y
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_NET_VENDOR_CIRRUS=y
-CONFIG_CS89x0=m
-# CONFIG_CS89x0_PLATFORM is not set
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-CONFIG_CX_ECAT=m
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-CONFIG_TULIP_MMIO=y
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET_VXLAN=y
-CONFIG_NET_VENDOR_EZCHIP=y
-CONFIG_NET_VENDOR_EXAR=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_NET_VENDOR_HP=y
-CONFIG_HP100=m
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IGB=m
-CONFIG_IGB_HWMON=y
-CONFIG_IGBVF=m
-CONFIG_IXGB=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_VXLAN=y
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBEVF=m
-CONFIG_I40E=m
-# CONFIG_I40E_VXLAN is not set
-CONFIG_I40EVF=m
-CONFIG_FM10K=m
-CONFIG_FM10K_VXLAN=y
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_MVMDIO=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_VXLAN=y
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX5_CORE=m
-CONFIG_MLX5_CORE_EN=y
-CONFIG_MLXSW_CORE=m
-CONFIG_MLXSW_PCI=m
-CONFIG_MLXSW_SWITCHX2=m
-CONFIG_MLXSW_SPECTRUM=m
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
-CONFIG_NE2000=m
-CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_ULTRA=m
-CONFIG_WD80x3=m
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=m
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_PCH_GBE=m
-CONFIG_ETHOC=m
-CONFIG_NET_PACKET_ENGINE=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLCNIC_VXLAN=y
-CONFIG_QLCNIC_HWMON=y
-CONFIG_QLGE=m
-CONFIG_NETXEN_NIC=m
-CONFIG_QED=m
-CONFIG_QEDE=m
-CONFIG_NET_VENDOR_QUALCOMM=y
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_ATP=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
-CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_ROCKER=y
-CONFIG_ROCKER=m
-CONFIG_NET_VENDOR_SAMSUNG=y
-CONFIG_SXGBE_ETH=m
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-# CONFIG_SFC_MCDI_LOGGING is not set
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_SMC9194=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_EPIC100=m
-CONFIG_SMSC911X=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC9420=m
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_DWMAC_GENERIC=m
-# CONFIG_STMMAC_PCI is not set
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_SYNOPSYS=y
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-CONFIG_TI_CPSW_ALE=m
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_FDDI=y
-CONFIG_DEFXX=m
-# CONFIG_DEFXX_MMIO is not set
-CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
-CONFIG_NET_SB1000=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_AQUANTIA_PHY=m
-CONFIG_AT803X_PHY=m
-CONFIG_AMD_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_MICROCHIP_PHY=m
-CONFIG_FIXED_PHY=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_GPIO=m
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-# CONFIG_SLIP_MODE_SLIP6 is not set
-CONFIG_USB_NET_DRIVERS=y
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_KC2190 is not set
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_USB_NET_CH9200=m
-CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AIRO=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_ADM8211=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_ATH_COMMON=m
-CONFIG_ATH_CARDS=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-# CONFIG_ATH9K_AHB is not set
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_DYNACK is not set
-CONFIG_ATH9K_WOW=y
-CONFIG_ATH9K_RFKILL=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-# CONFIG_CARL9170_HWRNG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-# CONFIG_ATH6KL_DEBUG is not set
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-# CONFIG_WIL6210_TRACING is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K_DEBUGFS=y
-# CONFIG_ATH10K_TRACING is not set
-CONFIG_WCN36XX=m
-CONFIG_WCN36XX_DEBUGFS=y
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMFMAC_PCIE=y
-CONFIG_BRCM_TRACING=y
-# CONFIG_BRCMDBG is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLDVM=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-# CONFIG_IWLWIFI_BCAST_FILTERING is not set
-# CONFIG_IWLWIFI_UAPSD is not set
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-# CONFIG_IWLWIFI_DEVICE_TRACING is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-
-#
-# iwl3945 / iwl4965 Debugging Options
-#
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_HERMES=m
-# CONFIG_HERMES_PRISM is not set
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_LEDS=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WL_MEDIATEK=y
-CONFIG_MT7601U=m
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8821AE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL8XXXU=m
-CONFIG_RTL8XXXU_UNTESTED=y
-CONFIG_WL_TI=y
-CONFIG_WL1251=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_RSI_91X=m
-CONFIG_RSI_DEBUGFS=y
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-CONFIG_WAN=y
-CONFIG_HOSTESS_SV11=m
-CONFIG_COSA=m
-CONFIG_LANMEDIA=m
-CONFIG_SEALEVEL_4021=m
-CONFIG_HDLC=m
-CONFIG_HDLC_RAW=m
-CONFIG_HDLC_RAW_ETH=m
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC_PPP=m
-
-#
-# X.25/LAPB support is disabled
-#
-CONFIG_PCI200SYN=m
-CONFIG_WANXL=m
-# CONFIG_PC300TOO is not set
-CONFIG_N2=m
-CONFIG_C101=m
-CONFIG_FARSYNC=m
-CONFIG_DSCC4=m
-# CONFIG_DSCC4_PCISYNC is not set
-# CONFIG_DSCC4_PCI_RST is not set
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
-CONFIG_SDLA=m
-CONFIG_SBNI=m
-# CONFIG_SBNI_MULTILINE is not set
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKELB=m
-CONFIG_IEEE802154_ATUSB=m
-CONFIG_XEN_NETDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_BACKEND=y
-CONFIG_VMXNET3=m
-CONFIG_FUJITSU_ES=m
-CONFIG_HYPERV_NET=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-CONFIG_HISAX_NO_SENDCOMPLETE=y
-CONFIG_HISAX_NO_LLC=y
-CONFIG_HISAX_NO_KEYPAD=y
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_0=y
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_AVM_A1=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_IX1MICROR2=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_ASUSCOM=y
-CONFIG_HISAX_TELEINT=y
-CONFIG_HISAX_HFCS=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_SPORTSTER=y
-CONFIG_HISAX_MIC=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_ISURF=y
-CONFIG_HISAX_HSTSAPHIR=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-#
-# Active cards
-#
-CONFIG_ISDN_DRV_ICN=m
-CONFIG_ISDN_DRV_PCBIT=m
-CONFIG_ISDN_DRV_SC=m
-CONFIG_ISDN_DRV_ACT2000=m
-CONFIG_ISDN_CAPI=m
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPIDRV=m
-# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-# CONFIG_GIGASET_CAPI is not set
-CONFIG_GIGASET_I4L=y
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-# CONFIG_GIGASET_M101 is not set
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-CONFIG_ISDN_HDLC=m
-CONFIG_NVM=y
-# CONFIG_NVM_DEBUG is not set
-# CONFIG_NVM_GENNVM is not set
-# CONFIG_NVM_RRPC is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_LEDS=y
-CONFIG_INPUT_FF_MEMLESS=y
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_QT1070=m
-CONFIG_KEYBOARD_QT2160=m
-# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_GPIO_POLLED=m
-CONFIG_KEYBOARD_TCA6416=m
-CONFIG_KEYBOARD_TCA8418=m
-CONFIG_KEYBOARD_MATRIX=m
-CONFIG_KEYBOARD_LM8323=m
-CONFIG_KEYBOARD_LM8333=m
-CONFIG_KEYBOARD_MAX7359=m
-CONFIG_KEYBOARD_MCS=m
-CONFIG_KEYBOARD_MPR121=m
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_KEYBOARD_OPENCORES=m
-CONFIG_KEYBOARD_SAMSUNG=m
-CONFIG_KEYBOARD_STOWAWAY=m
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_KEYBOARD_CROS_EC=m
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_CYPRESS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_PS2_FOCALTECH=y
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-CONFIG_MOUSE_INPORT=m
-CONFIG_MOUSE_ATIXL=y
-CONFIG_MOUSE_LOGIBM=m
-CONFIG_MOUSE_PC110PAD=m
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_HANWANG=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_SERIAL_WACOM4=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_PROPERTIES=y
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
-CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_FT6236=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GOODIX=m
-CONFIG_TOUCHSCREEN_ILI210X=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELAN=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_WACOM_I2C=m
-CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MMS114=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_HTCPEN=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-CONFIG_TOUCHSCREEN_TSC200X_CORE=m
-CONFIG_TOUCHSCREEN_TSC2004=m
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_ST1232=m
-CONFIG_TOUCHSCREEN_SUR40=m
-CONFIG_TOUCHSCREEN_SX8654=m
-CONFIG_TOUCHSCREEN_TPS6507X=m
-CONFIG_TOUCHSCREEN_ZFORCE=m
-CONFIG_TOUCHSCREEN_ROHM_BU21023=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_E3X0_BUTTON=m
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MC13783_PWRBUTTON=m
-CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_MPU3050=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_GP2A=m
-CONFIG_INPUT_GPIO_BEEPER=m
-CONFIG_INPUT_GPIO_TILT_POLLED=m
-CONFIG_INPUT_WISTRON_BTNS=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-CONFIG_INPUT_KXTJ9_POLLED_MODE=y
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_REGULATOR_HAPTIC=m
-CONFIG_INPUT_RETU_PWRBUTTON=m
-CONFIG_INPUT_TPS65218_PWRBUTTON=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_IMS_PCU=m
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
-CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_INPUT_DRV260X_HAPTICS=m
-CONFIG_INPUT_DRV2665_HAPTICS=m
-CONFIG_INPUT_DRV2667_HAPTICS=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-CONFIG_SERIO_ARC_PS2=m
-CONFIG_HYPERV_KEYBOARD=m
-CONFIG_USERIO=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=32
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-CONFIG_MOXA_INTELLIO=m
-CONFIG_MOXA_SMARTIO=m
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_SYNCLINK_GT=m
-CONFIG_NOZOMI=m
-CONFIG_ISI=m
-CONFIG_N_HDLC=m
-CONFIG_N_GSM=m
-CONFIG_TRACE_ROUTER=m
-CONFIG_TRACE_SINK=m
-CONFIG_LDISC_AUTOLOAD=y
-CONFIG_DEVMEM=y
-CONFIG_DEVKMEM=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_FOURPORT=m
-CONFIG_SERIAL_8250_ACCENT=m
-CONFIG_SERIAL_8250_BOCA=m
-CONFIG_SERIAL_8250_EXAR_ST16C554=m
-CONFIG_SERIAL_8250_HUB6=m
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_RSA=y
-# CONFIG_SERIAL_8250_FSL is not set
-CONFIG_SERIAL_8250_DW=m
-CONFIG_SERIAL_8250_RT288X=y
-CONFIG_SERIAL_8250_FINTEK=m
-CONFIG_SERIAL_8250_MID=m
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_UARTLITE=m
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_SCCNXP=m
-CONFIG_SERIAL_SC16IS7XX=m
-# CONFIG_SERIAL_SC16IS7XX_I2C is not set
-CONFIG_SERIAL_TIMBERDALE=m
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_PCH_UART=m
-CONFIG_SERIAL_ARC=m
-CONFIG_SERIAL_ARC_NR_PORTS=1
-CONFIG_SERIAL_RP2=m
-CONFIG_SERIAL_RP2_NR_UARTS=32
-CONFIG_SERIAL_FSL_LPUART=m
-# CONFIG_TTY_PRINTK is not set
-CONFIG_PRINTER=m
-CONFIG_LP_CONSOLE=y
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_HVC_XEN_FRONTEND=y
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set
-CONFIG_IPMI_SSIF=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_GEODE=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_TPM=m
-CONFIG_NVRAM=m
-CONFIG_DTLK=m
-CONFIG_APPLICOM=m
-CONFIG_SONYPI=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
-CONFIG_MWAVE=m
-CONFIG_SCx200_GPIO=m
-CONFIG_PC8736x_GPIO=m
-CONFIG_NSC_GPIO=m
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=256
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HPET_MMAP_DEFAULT=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_TCG_TIS=m
-CONFIG_TCG_TIS_I2C_ATMEL=m
-CONFIG_TCG_TIS_I2C_INFINEON=m
-CONFIG_TCG_TIS_I2C_NUVOTON=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
-# CONFIG_TCG_XEN is not set
-CONFIG_TCG_CRB=m
-CONFIG_TCG_TIS_ST33ZP24=m
-CONFIG_TCG_TIS_ST33ZP24_I2C=m
-CONFIG_TELCLOCK=m
-CONFIG_DEVPORT=y
-# CONFIG_XILLYBUS is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_GPIO=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_I2C_MUX_REG=m
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_ISMT=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_CBUS_GPIO is not set
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_EG20T=m
-CONFIG_I2C_EMEV2=m
-CONFIG_I2C_GPIO=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-# CONFIG_I2C_PXA_PCI is not set
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_XILINX=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_DLN2=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_ROBOTFUZZ_OSIF=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIPERBOARD=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_PCA_ISA=m
-CONFIG_I2C_CROS_EC_TUNNEL=m
-CONFIG_SCx200_ACB=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SLAVE_EEPROM=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_SPI is not set
-# CONFIG_SPMI is not set
-CONFIG_HSI=m
-CONFIG_HSI_BOARDINFO=y
-
-#
-# HSI controllers
-#
-
-#
-# HSI clients
-#
-CONFIG_HSI_CHAR=m
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
-CONFIG_PPS_CLIENT_GPIO=m
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=m
-
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PINCTRL=y
-
-#
-# Pin controllers
-#
-CONFIG_PINMUX=y
-CONFIG_PINCONF=y
-CONFIG_GENERIC_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
-CONFIG_PINCTRL_AMD=y
-CONFIG_PINCTRL_BAYTRAIL=y
-CONFIG_PINCTRL_CHERRYVIEW=m
-CONFIG_PINCTRL_INTEL=m
-CONFIG_PINCTRL_BROXTON=m
-CONFIG_PINCTRL_SUNRISEPOINT=m
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_DEVRES=y
-CONFIG_GPIO_ACPI=y
-CONFIG_GPIOLIB_IRQCHIP=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC=m
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO drivers
-#
-# CONFIG_GPIO_AMDPT is not set
-CONFIG_GPIO_DWAPB=m
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_ICH=m
-CONFIG_GPIO_LYNXPOINT=y
-CONFIG_GPIO_VX855=m
-# CONFIG_GPIO_ZX is not set
-
-#
-# Port-mapped I/O GPIO drivers
-#
-# CONFIG_GPIO_104_IDIO_16 is not set
-CONFIG_GPIO_F7188X=m
-# CONFIG_GPIO_IT87 is not set
-CONFIG_GPIO_SCH=m
-CONFIG_GPIO_SCH311X=m
-
-#
-# I2C GPIO expanders
-#
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-
-#
-# MFD GPIO expanders
-#
-CONFIG_GPIO_ARIZONA=m
-CONFIG_GPIO_CS5535=m
-CONFIG_GPIO_DLN2=m
-CONFIG_GPIO_JANZ_TTL=m
-CONFIG_GPIO_LP3943=m
-# CONFIG_GPIO_TIMBERDALE is not set
-# CONFIG_GPIO_UCB1400 is not set
-CONFIG_GPIO_WM8994=m
-
-#
-# PCI GPIO expanders
-#
-CONFIG_GPIO_AMD8111=m
-# CONFIG_GPIO_INTEL_MID is not set
-CONFIG_GPIO_ML_IOH=m
-CONFIG_GPIO_PCH=m
-CONFIG_GPIO_RDC321X=m
-
-#
-# SPI or I2C GPIO expanders
-#
-# CONFIG_GPIO_MCP23S08 is not set
-
-#
-# USB GPIO expanders
-#
-CONFIG_GPIO_VIPERBOARD=m
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_DS1WM=m
-CONFIG_W1_MASTER_GPIO=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2408=m
-# CONFIG_W1_SLAVE_DS2408_READBACK is not set
-CONFIG_W1_SLAVE_DS2413=m
-CONFIG_W1_SLAVE_DS2406=m
-CONFIG_W1_SLAVE_DS2423=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-CONFIG_W1_SLAVE_DS2433_CRC=y
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_DS2780=m
-CONFIG_W1_SLAVE_DS2781=m
-CONFIG_W1_SLAVE_DS28E04=m
-CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_GENERIC_ADC_BATTERY=m
-CONFIG_TEST_POWER=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2780=m
-CONFIG_BATTERY_DS2781=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_SBS=m
-CONFIG_BATTERY_BQ27XXX=m
-CONFIG_BATTERY_BQ27XXX_I2C=y
-CONFIG_BATTERY_BQ27XXX_PLATFORM=y
-CONFIG_BATTERY_MAX17040=m
-CONFIG_BATTERY_MAX17042=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_CHARGER_MAX8903=m
-CONFIG_CHARGER_LP8727=m
-CONFIG_CHARGER_GPIO=m
-# CONFIG_CHARGER_MANAGER is not set
-CONFIG_CHARGER_BQ2415X=m
-CONFIG_CHARGER_BQ24190=m
-CONFIG_CHARGER_BQ24257=m
-CONFIG_CHARGER_BQ24735=m
-CONFIG_CHARGER_BQ25890=m
-CONFIG_CHARGER_SMB347=m
-CONFIG_CHARGER_TPS65217=m
-CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_CHARGER_RT9455=m
-CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_RESTART is not set
-CONFIG_POWER_AVS=y
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_DELL_SMM=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_MC13783_ADC=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_HIH6130=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IIO_HWMON=m
-CONFIG_SENSORS_I5500=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_HTU21=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_MENF21BMC_HWMON=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_LTC2978_REGULATOR=y
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX20751=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_TPS40422=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_INA209=m
-CONFIG_SENSORS_INA2XX=m
-CONFIG_SENSORS_TC74=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-# CONFIG_SENSORS_W83795_FANCTRL is not set
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_THERMAL=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
-CONFIG_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
-CONFIG_THERMAL_EMULATION=y
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_X86_PKG_TEMP_THERMAL=m
-CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
-CONFIG_INTEL_SOC_DTS_THERMAL=m
-CONFIG_INT340X_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
-CONFIG_INTEL_PCH_THERMAL=m
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_MENF21BMC_WATCHDOG=m
-# CONFIG_XILINX_WATCHDOG is not set
-CONFIG_CADENCE_WATCHDOG=m
-CONFIG_DW_WATCHDOG=m
-CONFIG_RN5T618_WATCHDOG=m
-CONFIG_MAX63XX_WATCHDOG=m
-CONFIG_RETU_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_F71808E_WDT=m
-CONFIG_SP5100_TCO=m
-CONFIG_GEODE_WDT=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_IE6XX_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_HPWDT_NMI_DECODING=y
-CONFIG_SC1200_WDT=m
-CONFIG_SCx200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_NV_TCO=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_SBC7240_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_VIA_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_BCM7038_WDT=m
-CONFIG_MEN_A21_WDT=m
-# CONFIG_XEN_WDT is not set
-
-#
-# ISA-based Watchdog Cards
-#
-CONFIG_PCWATCHDOG=m
-CONFIG_MIXCOMWD=m
-CONFIG_WDT=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_HOST_SOC=y
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-# CONFIG_SSB_DRIVER_GPIO is not set
-CONFIG_BCMA_POSSIBLE=y
-
-#
-# Broadcom specific AMBA
-#
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_HOST_SOC is not set
-CONFIG_BCMA_DRIVER_PCI=y
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-# CONFIG_BCMA_DRIVER_GPIO is not set
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-CONFIG_MFD_CS5535=m
-CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_CROS_EC=m
-CONFIG_MFD_CROS_EC_I2C=m
-CONFIG_MFD_DLN2=m
-CONFIG_MFD_MC13XXX=m
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_HTC_PASIC3=m
-CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
-CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
-CONFIG_MFD_JANZ_CMODIO=m
-# CONFIG_MFD_KEMPLD is not set
-CONFIG_MFD_MT6397=m
-CONFIG_MFD_MENF21BMC=m
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_RETU=m
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_RTSX_PCI=m
-CONFIG_MFD_RTSX_USB=m
-CONFIG_MFD_RN5T618=m
-CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SM501=m
-# CONFIG_MFD_SM501_GPIO is not set
-CONFIG_MFD_SKY81452=m
-# CONFIG_ABX500_CORE is not set
-CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_MFD_LP3943=m
-CONFIG_TPS6105X=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_MFD_TPS65217=m
-CONFIG_MFD_TPS65218=m
-# CONFIG_MFD_TPS65912 is not set
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MFD_LM3533=m
-CONFIG_MFD_TIMBERDALE=m
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_ARIZONA=y
-CONFIG_MFD_ARIZONA_I2C=m
-CONFIG_MFD_WM5102=y
-CONFIG_MFD_WM5110=y
-CONFIG_MFD_WM8997=y
-# CONFIG_MFD_WM8998 is not set
-CONFIG_MFD_WM8994=m
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-CONFIG_REGULATOR_ACT8865=m
-CONFIG_REGULATOR_AD5398=m
-CONFIG_REGULATOR_ANATOP=m
-CONFIG_REGULATOR_BCM590XX=m
-CONFIG_REGULATOR_DA9210=m
-CONFIG_REGULATOR_DA9211=m
-CONFIG_REGULATOR_FAN53555=m
-CONFIG_REGULATOR_GPIO=m
-CONFIG_REGULATOR_ISL9305=m
-CONFIG_REGULATOR_ISL6271A=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_LP872X=m
-CONFIG_REGULATOR_LP8755=m
-CONFIG_REGULATOR_LTC3589=m
-CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_MAX8649=m
-CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_MAX8973=m
-CONFIG_REGULATOR_MC13XXX_CORE=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_MC13892=m
-CONFIG_REGULATOR_MT6311=m
-CONFIG_REGULATOR_MT6397=m
-CONFIG_REGULATOR_PCF50633=m
-CONFIG_REGULATOR_PFUZE100=m
-CONFIG_REGULATOR_RN5T618=m
-CONFIG_REGULATOR_SKY81452=m
-CONFIG_REGULATOR_TPS51632=m
-CONFIG_REGULATOR_TPS6105X=m
-CONFIG_REGULATOR_TPS62360=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_REGULATOR_TPS65217=m
-CONFIG_REGULATOR_WM8994=m
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-# CONFIG_MEDIA_SDR_SUPPORT is not set
-CONFIG_MEDIA_RC_SUPPORT=y
-# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2=m
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_DVB_CORE=m
-CONFIG_DVB_NET=y
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-
-#
-# Media drivers
-#
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_RC_DECODERS=y
-CONFIG_LIRC=m
-CONFIG_IR_LIRC_CODEC=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_SHARP_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_XMP_DECODER=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_HIX5HD2=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_IR_IGORPLUGUSB=m
-CONFIG_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_VIDEO_USBTV=m
-
-#
-# Analog TV USB devices
-#
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160_AC97=y
-CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_GO7007 is not set
-
-#
-# Analog/digital TV USB devices
-#
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-CONFIG_VIDEO_AU0828_RC=y
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG=y
-CONFIG_DVB_AS102=m
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-#
-# Media capture support
-#
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_TW68=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-
-#
-# Media capture/analog TV support
-#
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_IVTV_ALSA=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_DT3155=m
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_ENABLE_VP3054=y
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_BT848=m
-CONFIG_DVB_BT8XX=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7164=m
-
-#
-# Media digital TV PCI Adapters
-#
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-CONFIG_DVB_PT3=m
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_DDBRIDGE=m
-CONFIG_DVB_SMIPCIE=m
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_VIA_CAMERA=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
-CONFIG_VIDEO_SH_VEU=m
-CONFIG_V4L_TEST_DRIVERS=y
-CONFIG_VIDEO_VIVID=m
-CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_VIDEO_VIM2M=m
-# CONFIG_DVB_PLATFORM_DRIVERS is not set
-
-#
-# Supported MMC/SDIO adapters
-#
-CONFIG_SMS_SDIO_DRV=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_TEA575X=m
-# CONFIG_RADIO_SI470X is not set
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_SI4713=m
-CONFIG_PLATFORM_SI4713=m
-CONFIG_I2C_SI4713=m
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_SHARK=m
-CONFIG_RADIO_SHARK2=m
-CONFIG_USB_KEENE=m
-CONFIG_USB_RAREMONO=m
-CONFIG_USB_MA901=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_TIMBERDALE=m
-CONFIG_RADIO_WL1273=m
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-CONFIG_RADIO_WL128X=m
-CONFIG_V4L_RADIO_ISA_DRIVERS=y
-CONFIG_RADIO_ISA=m
-CONFIG_RADIO_CADET=m
-CONFIG_RADIO_RTRACK=m
-# CONFIG_RADIO_RTRACK2 is not set
-CONFIG_RADIO_AZTECH=m
-CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_MIROPCM20=m
-CONFIG_RADIO_SF16FMI=m
-CONFIG_RADIO_SF16FMR2=m
-CONFIG_RADIO_TERRATEC=m
-CONFIG_RADIO_TRUST=m
-CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_ZOLTRIX=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-
-#
-# common driver options
-#
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_DEBUG=y
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_SMS_SIANO_MDTV=m
-CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
-
-#
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
-#
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-
-#
-# Flash devices
-#
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Audio/Video compression chips
-#
-CONFIG_VIDEO_SAA6752HS=m
-
-#
-# Miscellaneous helper chips
-#
-CONFIG_VIDEO_M52790=m
-
-#
-# Sensors used on soc_camera driver
-#
-
-#
-# soc_camera sensor drivers
-#
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV5642=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_M88RS6000T=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_MXL301RF=m
-CONFIG_MEDIA_TUNER_QM1D1C0042=m
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_M88DS3103=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_SI2165=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24117=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_TS2020=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_SI2168=m
-CONFIG_DVB_AS102_FE=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT3306A=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_TC90522=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_DRX39XYJ=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_SP2=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-CONFIG_AGP_ALI=m
-CONFIG_AGP_ATI=m
-CONFIG_AGP_AMD=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_NVIDIA=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_SWORKS=m
-CONFIG_AGP_VIA=m
-CONFIG_AGP_EFFICEON=m
-CONFIG_INTEL_GTT=m
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM=m
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_TTM=m
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_ADV7511=m
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_USERPTR=y
-# CONFIG_DRM_RADEON_UMS is not set
-CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_CIK is not set
-CONFIG_DRM_AMDGPU_USERPTR=y
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_I810=m
-CONFIG_DRM_I915=m
-# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_VGEM=m
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_UDL=m
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_QXL=m
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-CONFIG_DRM_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_DDC=m
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=y
-CONFIG_FB_SYS_COPYAREA=y
-CONFIG_FB_SYS_IMAGEBLIT=y
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=y
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_HECUBA=m
-CONFIG_FB_SVGALIB=m
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_PM2=m
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-CONFIG_FB_CYBER2000=m
-CONFIG_FB_CYBER2000_DDC=y
-CONFIG_FB_ARC=m
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-# CONFIG_FB_UVESA is not set
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
-CONFIG_FB_N411=m
-CONFIG_FB_HGA=m
-CONFIG_FB_OPENCORES=m
-CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_I740=m
-CONFIG_FB_I810=m
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-CONFIG_FB_LE80578=m
-CONFIG_FB_CARILLO_RANCH=m
-# CONFIG_FB_INTEL is not set
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_VIA=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-CONFIG_FB_VIA_X_COMPATIBILITY=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-CONFIG_FB_ARK=m
-CONFIG_FB_PM3=m
-CONFIG_FB_CARMINE=m
-CONFIG_FB_CARMINE_DRAM_EVAL=y
-# CONFIG_CARMINE_DRAM_CUSTOM is not set
-CONFIG_FB_GEODE=y
-CONFIG_FB_GEODE_LX=m
-CONFIG_FB_GEODE_GX=m
-CONFIG_FB_GEODE_GX1=m
-# CONFIG_FB_SM501 is not set
-CONFIG_FB_SMSCUFX=m
-CONFIG_FB_UDL=m
-CONFIG_FB_IBM_GXT4500=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_XEN_FBDEV_FRONTEND=y
-CONFIG_FB_METRONOME=m
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-CONFIG_FB_MB862XX_I2C=y
-CONFIG_FB_BROADSHEET=m
-CONFIG_FB_AUO_K190X=m
-CONFIG_FB_AUO_K1900=m
-CONFIG_FB_AUO_K1901=m
-# CONFIG_FB_HYPERV is not set
-# CONFIG_FB_SIMPLE is not set
-CONFIG_FB_SM712=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_PM8941_WLED=m
-CONFIG_BACKLIGHT_SAHARA=m
-CONFIG_BACKLIGHT_ADP8860=m
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_PCF50633=m
-CONFIG_BACKLIGHT_LM3639=m
-CONFIG_BACKLIGHT_OT200=m
-CONFIG_BACKLIGHT_SKY81452=m
-CONFIG_BACKLIGHT_TPS65217=m
-CONFIG_BACKLIGHT_GPIO=m
-CONFIG_BACKLIGHT_LV5207LP=m
-CONFIG_BACKLIGHT_BD6107=m
-CONFIG_VGASTATE=m
-CONFIG_HDMI=y
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-CONFIG_MDA_CONSOLE=m
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_PCM_TIMER=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=32
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_PROC_FS=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_OPL4_LIB_SEQ=m
-CONFIG_SND_SBAWE_SEQ=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL4_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCSP is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_WSS_LIB=m
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SB8_DSP=m
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_ISA=y
-CONFIG_SND_ADLIB=m
-CONFIG_SND_AD1816A=m
-CONFIG_SND_AD1848=m
-CONFIG_SND_ALS100=m
-CONFIG_SND_AZT1605=m
-CONFIG_SND_AZT2316=m
-CONFIG_SND_AZT2320=m
-CONFIG_SND_CMI8328=m
-CONFIG_SND_CMI8330=m
-CONFIG_SND_CS4231=m
-CONFIG_SND_CS4236=m
-CONFIG_SND_ES1688=m
-CONFIG_SND_ES18XX=m
-CONFIG_SND_SC6000=m
-CONFIG_SND_GUSCLASSIC=m
-CONFIG_SND_GUSEXTREME=m
-CONFIG_SND_GUSMAX=m
-CONFIG_SND_INTERWAVE=m
-CONFIG_SND_INTERWAVE_STB=m
-CONFIG_SND_JAZZ16=m
-CONFIG_SND_OPL3SA2=m
-CONFIG_SND_OPTI92X_AD1848=m
-CONFIG_SND_OPTI92X_CS4231=m
-CONFIG_SND_OPTI93X=m
-CONFIG_SND_MIRO=m
-CONFIG_SND_SB8=m
-CONFIG_SND_SB16=m
-CONFIG_SND_SBAWE=m
-CONFIG_SND_SB16_CSP=y
-CONFIG_SND_SSCAPE=m
-CONFIG_SND_WAVEFRONT=m
-CONFIG_SND_MSND_PINNACLE=m
-CONFIG_SND_MSND_CLASSIC=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968_RADIO=y
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SIS7019=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-
-#
-# HD-Audio
-#
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-# CONFIG_SND_HDA_INPUT_BEEP is not set
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_I915=y
-CONFIG_SND_HDA_PREALLOC_SIZE=2048
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_BCD2000=m
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_DICE=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_SCS1X=m
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_BEBOB=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-# CONFIG_SND_SOC is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=m
-CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=m
-CONFIG_HID_APPLEIR=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_BETOP_FF=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CORSAIR=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CP2112=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_GEMBIRD=m
-CONFIG_HID_GFRM=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HOLTEK_FF=y
-CONFIG_HID_GT683R=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PLANTRONICS=m
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_SONY_FF=y
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_HYPERV_MOUSE=m
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-
-#
-# I2C HID support
-#
-CONFIG_I2C_HID=m
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG_FSM is not set
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_MON=y
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=m
-CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_FOTG210_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_SSB=y
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-# CONFIG_USB_SL811_HCD_ISO is not set
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-# CONFIG_USB_HCD_BCMA is not set
-CONFIG_USB_HCD_SSB=m
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_MUSB_HOST=y
-
-#
-# Platform Glue Layer
-#
-
-#
-# MUSB DMA mode
-#
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_DWC3=m
-# CONFIG_USB_DWC3_ULPI is not set
-CONFIG_USB_DWC3_HOST=y
-
-#
-# Platform Glue Driver Support
-#
-CONFIG_USB_DWC3_PCI=m
-# CONFIG_USB_DWC2 is not set
-CONFIG_USB_CHIPIDEA=m
-# CONFIG_USB_CHIPIDEA_HOST is not set
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
-CONFIG_USB_ISP1760=m
-CONFIG_USB_ISP1760_HCD=y
-CONFIG_USB_ISP1760_HOST_ROLE=y
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MXUPORT=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_DEBUG=m
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_LINK_LAYER_TEST=m
-CONFIG_USB_CHAOSKEY=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_USB_PHY is not set
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_TAHVO_USB is not set
-# CONFIG_USB_ISP1301 is not set
-# CONFIG_USB_GADGET is not set
-CONFIG_USB_LED_TRIG=y
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-CONFIG_MMC_USDHI6ROL0=m
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_TOSHIBA_PCI=m
-CONFIG_MMC_MTK=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-# CONFIG_MS_BLOCK is not set
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_CLASS_FLASH=m
-
-#
-# LED drivers
-#
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM3533=m
-CONFIG_LEDS_LM3642=m
-CONFIG_LEDS_NET48XX=m
-CONFIG_LEDS_WRAP=m
-CONFIG_LEDS_PCA9532=m
-# CONFIG_LEDS_PCA9532_GPIO is not set
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-CONFIG_LEDS_LP8501=m
-CONFIG_LEDS_LP8860=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA963X=m
-CONFIG_LEDS_REGULATOR=m
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_TLC591XX=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_OT200=m
-CONFIG_LEDS_MENF21BMC=m
-
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-CONFIG_LEDS_BLINKM=m
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-# CONFIG_LEDS_TRIGGER_CPU is not set
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-# CONFIG_INFINIBAND_CXGB3 is not set
-CONFIG_INFINIBAND_CXGB4=m
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_MLX5_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
-CONFIG_INFINIBAND_OCRDMA=m
-CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SRPT=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_ISERT=m
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_EDAC=y
-CONFIG_EDAC_LEGACY_SYSFS=y
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=y
-# CONFIG_EDAC_MM_EDAC is not set
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_HCTOSYS is not set
-# CONFIG_RTC_SYSTOHC is not set
-# CONFIG_RTC_DEBUG is not set
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_ABB5ZES3=m
-CONFIG_RTC_DRV_ABX80X=m
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1374_WDT=y
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_ISL12057=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF85063=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
-CONFIG_RTC_DRV_RV3029C2=m
-CONFIG_RTC_DRV_RV8803=m
-
-#
-# SPI RTC drivers
-#
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1685_FAMILY=m
-CONFIG_RTC_DRV_DS1685=y
-# CONFIG_RTC_DRV_DS1689 is not set
-# CONFIG_RTC_DRV_DS17285 is not set
-# CONFIG_RTC_DRV_DS17485 is not set
-# CONFIG_RTC_DRV_DS17885 is not set
-# CONFIG_RTC_DS1685_PROC_REGS is not set
-# CONFIG_RTC_DS1685_SYSFS_REGS is not set
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_PCF50633=m
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_MC13XXX=m
-CONFIG_RTC_DRV_MT6397=m
-
-#
-# HID Sensor RTC drivers
-#
-CONFIG_RTC_DRV_HID_SENSOR_TIME=m
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_VIRTUAL_CHANNELS=m
-CONFIG_DMA_ACPI=y
-CONFIG_INTEL_IDMA64=m
-CONFIG_PCH_DMA=m
-CONFIG_TIMB_DMA=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-CONFIG_HSU_DMA=m
-
-#
-# DMA Clients
-#
-# CONFIG_ASYNC_TX_DMA is not set
-CONFIG_DMATEST=m
-CONFIG_AUXDISPLAY=y
-# CONFIG_KS0108 is not set
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_DMEM_GENIRQ=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-CONFIG_UIO_PRUSS=m
-CONFIG_UIO_MF624=m
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO_VIRQFD=m
-CONFIG_VFIO=m
-CONFIG_VFIO_PCI=m
-# CONFIG_VFIO_PCI_VGA is not set
-CONFIG_VFIO_PCI_MMAP=y
-CONFIG_VFIO_PCI_INTX=y
-CONFIG_IRQ_BYPASS_MANAGER=m
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=m
-
-#
-# Virtio drivers
-#
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_HYPERV=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
-
-#
-# Xen driver support
-#
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DEV_EVTCHN=y
-CONFIG_XEN_BACKEND=y
-CONFIG_XENFS=y
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_XENBUS_FRONTEND=y
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_PCIDEV_BACKEND=m
-# CONFIG_XEN_SCSI_BACKEND is not set
-CONFIG_XEN_PRIVCMD=y
-CONFIG_XEN_ACPI_PROCESSOR=m
-CONFIG_XEN_HAVE_PVMMU=y
-CONFIG_XEN_AUTO_XLATE=y
-CONFIG_XEN_ACPI=y
-CONFIG_XEN_SYMS=y
-CONFIG_XEN_HAVE_VPMU=y
-CONFIG_STAGING=y
-# CONFIG_SLICOSS is not set
-# CONFIG_PRISM2_USB is not set
-# CONFIG_COMEDI is not set
-# CONFIG_PANEL is not set
-CONFIG_RTL8192U=m
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
-CONFIG_R8188EU=m
-CONFIG_88EU_AP_MODE=y
-CONFIG_R8723AU=m
-CONFIG_8723AU_AP_MODE=y
-CONFIG_8723AU_BT_COEXIST=y
-CONFIG_RTS5208=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-
-#
-# IIO staging drivers
-#
-
-#
-# Accelerometers
-#
-
-#
-# Analog to digital converters
-#
-CONFIG_AD7606=m
-CONFIG_AD7606_IFACE_PARALLEL=m
-
-#
-# Analog digital bi-direction converters
-#
-CONFIG_ADT7316=m
-CONFIG_ADT7316_I2C=m
-
-#
-# Capacitance to digital converters
-#
-CONFIG_AD7150=m
-CONFIG_AD7152=m
-CONFIG_AD7746=m
-
-#
-# Direct Digital Synthesis
-#
-
-#
-# Digital gyroscope sensors
-#
-
-#
-# Network Analyzer, Impedance Converters
-#
-CONFIG_AD5933=m
-
-#
-# Light sensors
-#
-CONFIG_SENSORS_ISL29018=m
-CONFIG_SENSORS_ISL29028=m
-CONFIG_TSL2583=m
-CONFIG_TSL2x7x=m
-
-#
-# Magnetometer sensors
-#
-CONFIG_SENSORS_HMC5843=m
-CONFIG_SENSORS_HMC5843_I2C=m
-
-#
-# Active energy metering IC
-#
-CONFIG_ADE7854=m
-CONFIG_ADE7854_I2C=m
-
-#
-# Resolver to digital converters
-#
-
-#
-# Triggers - standalone
-#
-CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
-# CONFIG_IIO_SIMPLE_DUMMY is not set
-CONFIG_FB_SM750=m
-CONFIG_FB_XGI=m
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_DECPC=m
-CONFIG_SPEAKUP_SYNTH_DTLK=m
-CONFIG_SPEAKUP_SYNTH_KEYPC=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_STAGING_MEDIA=y
-CONFIG_I2C_BCM2048=m
-CONFIG_DVB_CXD2099=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_BT829=m
-CONFIG_LIRC_IMON=m
-CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SERIAL=m
-CONFIG_LIRC_SERIAL_TRANSMITTER=y
-CONFIG_LIRC_SIR=m
-CONFIG_LIRC_ZILOG=m
-# CONFIG_STAGING_RDMA is not set
-
-#
-# Android
-#
-CONFIG_WIMAX_GDM72XX=m
-# CONFIG_WIMAX_GDM72XX_QOS is not set
-# CONFIG_WIMAX_GDM72XX_K_MODE is not set
-CONFIG_WIMAX_GDM72XX_WIMAX2=y
-CONFIG_WIMAX_GDM72XX_USB=y
-# CONFIG_WIMAX_GDM72XX_SDIO is not set
-# CONFIG_WIMAX_GDM72XX_USB_PM is not set
-CONFIG_LTE_GDM724X=m
-CONFIG_FIREWIRE_SERIAL=m
-CONFIG_FWTTY_MAX_TOTAL_PORTS=64
-CONFIG_FWTTY_MAX_CARD_PORTS=32
-# CONFIG_LUSTRE_FS is not set
-# CONFIG_DGNC is not set
-# CONFIG_DGAP is not set
-# CONFIG_GS_FPGABOOT is not set
-# CONFIG_WILC1000_DRIVER is not set
-# CONFIG_MOST is not set
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ALIENWARE_WMI=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_DELL_SMO8800=m
-CONFIG_DELL_RBTN=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_FUJITSU_TABLET=m
-CONFIG_AMILO_RFKILL=m
-CONFIG_TC1100_WMI=m
-CONFIG_HP_ACCEL=m
-CONFIG_HP_WIRELESS=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_SENSORS_HDAPS=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
-CONFIG_ACPI_WMI=m
-CONFIG_MSI_WMI=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_TOSHIBA_HAPS=m
-CONFIG_TOSHIBA_WMI=m
-CONFIG_ACPI_CMPC=m
-CONFIG_INTEL_IPS=m
-CONFIG_IBM_RTL=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_MXM_WMI=m
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_SAMSUNG_Q10=m
-CONFIG_APPLE_GMUX=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=m
-CONFIG_PVPANIC=m
-CONFIG_INTEL_PMC_IPC=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_CHROME_PLATFORMS=y
-CONFIG_CHROMEOS_LAPTOP=m
-CONFIG_CHROMEOS_PSTORE=m
-CONFIG_CROS_EC_CHARDEV=m
-CONFIG_CROS_EC_LPC=m
-CONFIG_CROS_EC_PROTO=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-
-#
-# Common Clock Framework
-#
-CONFIG_COMMON_CLK_SI5351=m
-# CONFIG_COMMON_CLK_PXA is not set
-CONFIG_COMMON_CLK_CDCE706=m
-
-#
-# Hardware Spinlock drivers
-#
-
-#
-# Clock Source drivers
-#
-CONFIG_CLKSRC_I8253=y
-CONFIG_CLKEVT_I8253=y
-CONFIG_I8253_LOCK=y
-CONFIG_CLKBLD_I8253=y
-# CONFIG_ATMEL_PIT is not set
-# CONFIG_SH_TIMER_CMT is not set
-# CONFIG_SH_TIMER_MTU2 is not set
-# CONFIG_SH_TIMER_TMU is not set
-# CONFIG_EM_TIMER_STI is not set
-# CONFIG_MAILBOX is not set
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-CONFIG_IOMMU_IOVA=y
-CONFIG_DMAR_TABLE=y
-CONFIG_INTEL_IOMMU=y
-CONFIG_INTEL_IOMMU_SVM=y
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-
-#
-# Remoteproc drivers
-#
-CONFIG_REMOTEPROC=m
-CONFIG_STE_MODEM_RPROC=m
-
-#
-# Rpmsg drivers
-#
-
-#
-# SOC (System On Chip) specific Drivers
-#
-# CONFIG_SUNXI_SRAM is not set
-# CONFIG_SOC_TI is not set
-CONFIG_PM_DEVFREQ=y
-
-#
-# DEVFREQ Governors
-#
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
-CONFIG_DEVFREQ_GOV_PERFORMANCE=y
-CONFIG_DEVFREQ_GOV_POWERSAVE=y
-CONFIG_DEVFREQ_GOV_USERSPACE=y
-
-#
-# DEVFREQ Drivers
-#
-CONFIG_PM_DEVFREQ_EVENT=y
-CONFIG_EXTCON=m
-
-#
-# Extcon Device Drivers
-#
-CONFIG_EXTCON_ADC_JACK=m
-CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_RT8973A=m
-CONFIG_EXTCON_SM5502=m
-CONFIG_EXTCON_USB_GPIO=m
-CONFIG_MEMORY=y
-CONFIG_IIO=m
-CONFIG_IIO_BUFFER=y
-# CONFIG_IIO_BUFFER_CB is not set
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
-CONFIG_IIO_TRIGGER=y
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-
-#
-# Accelerometers
-#
-CONFIG_BMA180=m
-CONFIG_BMC150_ACCEL=m
-CONFIG_BMC150_ACCEL_I2C=m
-CONFIG_HID_SENSOR_ACCEL_3D=m
-CONFIG_IIO_ST_ACCEL_3AXIS=m
-CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
-CONFIG_KXCJK1013=m
-CONFIG_MMA8452=m
-CONFIG_MMA9551_CORE=m
-CONFIG_MMA9551=m
-CONFIG_MMA9553=m
-CONFIG_MXC4005=m
-CONFIG_STK8312=m
-CONFIG_STK8BA50=m
-
-#
-# Analog to digital converters
-#
-CONFIG_AD7291=m
-CONFIG_AD799X=m
-CONFIG_CC10001_ADC=m
-CONFIG_MAX1363=m
-CONFIG_MCP3422=m
-CONFIG_NAU7802=m
-CONFIG_TI_ADC081C=m
-CONFIG_TI_AM335X_ADC=m
-CONFIG_VIPERBOARD_ADC=m
-
-#
-# Amplifiers
-#
-
-#
-# Chemical Sensors
-#
-# CONFIG_VZ89X is not set
-
-#
-# Hid Sensor IIO Common
-#
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-CONFIG_IIO_MS_SENSORS_I2C=m
-
-#
-# SSP Sensor Common
-#
-CONFIG_IIO_ST_SENSORS_I2C=m
-CONFIG_IIO_ST_SENSORS_CORE=m
-
-#
-# Digital to analog converters
-#
-CONFIG_AD5064=m
-CONFIG_AD5380=m
-CONFIG_AD5446=m
-CONFIG_M62332=m
-CONFIG_MAX517=m
-CONFIG_MCP4725=m
-
-#
-# Frequency Synthesizers DDS/PLL
-#
-
-#
-# Clock Generator/Distribution
-#
-
-#
-# Phase-Locked Loop (PLL) frequency synthesizers
-#
-
-#
-# Digital gyroscope sensors
-#
-CONFIG_BMG160=m
-CONFIG_BMG160_I2C=m
-CONFIG_HID_SENSOR_GYRO_3D=m
-CONFIG_IIO_ST_GYRO_3AXIS=m
-CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
-CONFIG_ITG3200=m
-
-#
-# Humidity sensors
-#
-CONFIG_DHT11=m
-CONFIG_HDC100X=m
-CONFIG_HTU21=m
-CONFIG_SI7005=m
-CONFIG_SI7020=m
-
-#
-# Inertial measurement units
-#
-CONFIG_KMX61=m
-CONFIG_INV_MPU6050_IIO=m
-
-#
-# Light sensors
-#
-CONFIG_ACPI_ALS=m
-CONFIG_ADJD_S311=m
-CONFIG_AL3320A=m
-CONFIG_APDS9300=m
-CONFIG_APDS9960=m
-CONFIG_BH1750=m
-CONFIG_CM32181=m
-CONFIG_CM3232=m
-CONFIG_CM3323=m
-CONFIG_CM36651=m
-CONFIG_GP2AP020A00F=m
-CONFIG_ISL29125=m
-CONFIG_HID_SENSOR_ALS=m
-CONFIG_HID_SENSOR_PROX=m
-CONFIG_JSA1212=m
-CONFIG_RPR0521=m
-CONFIG_SENSORS_LM3533=m
-CONFIG_LTR501=m
-CONFIG_OPT3001=m
-CONFIG_PA12203001=m
-CONFIG_STK3310=m
-CONFIG_TCS3414=m
-CONFIG_TCS3472=m
-CONFIG_SENSORS_TSL2563=m
-CONFIG_TSL4531=m
-CONFIG_US5182D=m
-CONFIG_VCNL4000=m
-
-#
-# Magnetometer sensors
-#
-CONFIG_AK8975=m
-CONFIG_AK09911=m
-CONFIG_BMC150_MAGN=m
-CONFIG_MAG3110=m
-CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
-CONFIG_MMC35240=m
-CONFIG_IIO_ST_MAGN_3AXIS=m
-CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
-
-#
-# Inclinometer sensors
-#
-CONFIG_HID_SENSOR_INCLINOMETER_3D=m
-CONFIG_HID_SENSOR_DEVICE_ROTATION=m
-
-#
-# Triggers - standalone
-#
-CONFIG_IIO_INTERRUPT_TRIGGER=m
-CONFIG_IIO_SYSFS_TRIGGER=m
-
-#
-# Digital potentiometers
-#
-CONFIG_MCP4531=m
-
-#
-# Pressure sensors
-#
-CONFIG_BMP280=m
-CONFIG_HID_SENSOR_PRESS=m
-CONFIG_MPL115=m
-CONFIG_MPL3115=m
-CONFIG_MS5611=m
-CONFIG_MS5611_I2C=m
-CONFIG_MS5637=m
-CONFIG_IIO_ST_PRESS=m
-CONFIG_IIO_ST_PRESS_I2C=m
-CONFIG_T5403=m
-
-#
-# Lightning sensors
-#
-
-#
-# Proximity sensors
-#
-# CONFIG_LIDAR_LITE_V2 is not set
-CONFIG_SX9500=m
-
-#
-# Temperature sensors
-#
-CONFIG_MLX90614=m
-CONFIG_TMP006=m
-CONFIG_TSYS01=m
-CONFIG_TSYS02D=m
-CONFIG_NTB=m
-CONFIG_NTB_PINGPONG=m
-CONFIG_NTB_TOOL=m
-CONFIG_NTB_TRANSPORT=m
-# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
-# CONFIG_IPACK_BUS is not set
-CONFIG_RESET_CONTROLLER=y
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
-
-#
-# PHY Subsystem
-#
-CONFIG_GENERIC_PHY=y
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_TUSB1210 is not set
-CONFIG_POWERCAP=y
-CONFIG_INTEL_RAPL=m
-# CONFIG_MCB is not set
-
-#
-# Performance monitor support
-#
-CONFIG_RAS=y
-# CONFIG_AMD_MCE_INJ is not set
-CONFIG_THUNDERBOLT=m
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-CONFIG_LIBNVDIMM=y
-CONFIG_BLK_DEV_PMEM=m
-CONFIG_ND_BLK=m
-CONFIG_ND_CLAIM=y
-CONFIG_ND_BTT=m
-CONFIG_BTT=y
-CONFIG_NVMEM=m
-CONFIG_STM=m
-CONFIG_STM_DUMMY=m
-CONFIG_STM_SOURCE_CONSOLE=m
-CONFIG_INTEL_TH=m
-CONFIG_INTEL_TH_PCI=m
-CONFIG_INTEL_TH_GTH=m
-CONFIG_INTEL_TH_STH=m
-CONFIG_INTEL_TH_MSU=m
-CONFIG_INTEL_TH_PTI=m
-# CONFIG_INTEL_TH_DEBUG is not set
-
-#
-# FPGA Configuration Support
-#
-# CONFIG_FPGA is not set
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-CONFIG_EDD_OFF=y
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=m
-CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
-CONFIG_ISCSI_IBFT_FIND=y
-CONFIG_ISCSI_IBFT=m
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-# CONFIG_EFI_FAKE_MEMMAP is not set
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_UEFI_CPER=y
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=m
-CONFIG_EXT4_FS_ENCRYPTION=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-# CONFIG_OCFS2_FS_STATS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-# CONFIG_F2FS_FS_SECURITY is not set
-# CONFIG_F2FS_CHECK_FS is not set
-CONFIG_F2FS_FS_ENCRYPTION=y
-# CONFIG_F2FS_IO_TRACE is not set
-CONFIG_FS_DAX=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_OVERLAY_FS=m
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_PROC_CHILDREN=y
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_CONFIGFS_FS=y
-CONFIG_EFIVAR_FS=m
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_ADFS_FS=m
-# CONFIG_ADFS_FS_RW is not set
-CONFIG_AFFS_FS=m
-CONFIG_ECRYPT_FS=m
-CONFIG_ECRYPT_FS_MESSAGING=y
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-# CONFIG_HFSPLUS_FS_POSIX_ACL is not set
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-CONFIG_BFS_FS=m
-CONFIG_EFS_FS=m
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_ATIME_SUPPORT=y
-CONFIG_LOGFS=m
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-CONFIG_SQUASHFS_DECOMP_MULTI=y
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-CONFIG_SQUASHFS_EMBEDDED=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_VXFS_FS=m
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-CONFIG_HPFS_FS=m
-CONFIG_QNX4FS_FS=m
-CONFIG_QNX6FS_FS=m
-# CONFIG_QNX6FS_DEBUG is not set
-CONFIG_ROMFS_FS=y
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
-CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-# CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EXOFS_FS=m
-# CONFIG_EXOFS_DEBUG is not set
-CONFIG_ORE=m
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V2=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
-CONFIG_NFS_SWAP=y
-# CONFIG_NFS_V4_1 is not set
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-# CONFIG_NFSD_V4_SECURITY_LABEL is not set
-# CONFIG_NFSD_FAULT_INJECTION is not set
-CONFIG_GRACE_PERIOD=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_SUNRPC_SWAP=y
-CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_SUNRPC_DEBUG is not set
-CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CEPH_FS_POSIX_ACL=y
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-# CONFIG_CIFS_UPCALL is not set
-# CONFIG_CIFS_XATTR is not set
-CONFIG_CIFS_DEBUG=y
-# CONFIG_CIFS_DEBUG2 is not set
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_SMB2=y
-# CONFIG_CIFS_SMB311 is not set
-CONFIG_CIFS_FSCACHE=y
-CONFIG_NCP_FS=m
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCPFS_STRONG=y
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-# CONFIG_AFS_FSCACHE is not set
-CONFIG_9P_FS=m
-# CONFIG_9P_FSCACHE is not set
-# CONFIG_9P_FS_POSIX_ACL is not set
-# CONFIG_9P_FS_SECURITY is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=0
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_READABLE_ASM is not set
-CONFIG_UNUSED_SYMBOLS=y
-# CONFIG_PAGE_OWNER is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_DEBUG_KERNEL=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Lockups and Hangs
-#
-# CONFIG_LOCKUP_DETECTOR is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-# CONFIG_TIMER_STATS is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_PI_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_PROVE_RCU is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_TORTURE_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
-CONFIG_BLK_DEV_IO_TRACE=y
-# CONFIG_UPROBE_EVENT is not set
-# CONFIG_PROBE_EVENTS is not set
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_MMIOTRACE is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-CONFIG_RING_BUFFER_BENCHMARK=m
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_TRACE_ENUM_MAP_FILE is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
-
-#
-# Runtime Testing
-#
-# CONFIG_LKDTM is not set
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_PERCPU_TEST is not set
-CONFIG_ATOMIC64_SELFTEST=y
-CONFIG_ASYNC_RAID6_TEST=m
-CONFIG_TEST_HEXDUMP=m
-# CONFIG_TEST_STRING_HELPERS is not set
-# CONFIG_TEST_KSTRTOX is not set
-# CONFIG_TEST_PRINTF is not set
-# CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_HASH is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_TEST_LKM=m
-CONFIG_TEST_USER_COPY=m
-CONFIG_TEST_BPF=m
-CONFIG_TEST_FIRMWARE=m
-CONFIG_TEST_UDELAY=m
-CONFIG_MEMTEST=y
-# CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-CONFIG_EARLY_PRINTK_EFI=y
-# CONFIG_X86_PTDUMP_CORE is not set
-# CONFIG_X86_PTDUMP is not set
-# CONFIG_EFI_PGT_DUMP is not set
-CONFIG_DEBUG_RODATA=y
-CONFIG_DEBUG_RODATA_TEST=y
-# CONFIG_DEBUG_WX is not set
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
-# CONFIG_DEBUG_NX_TEST is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-# CONFIG_X86_DECODER_SELFTEST is not set
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_ENTRY is not set
-# CONFIG_DEBUG_NMI_SELFTEST is not set
-CONFIG_X86_DEBUG_FPU=y
-# CONFIG_PUNIT_ATOM_DEBUG is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_SECURITY_DMESG_RESTRICT=y
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
-# CONFIG_SECURITY_PATH is not set
-# CONFIG_INTEL_TXT is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-# CONFIG_SECURITY_APPARMOR is not set
-# CONFIG_SECURITY_YAMA is not set
-# CONFIG_INTEGRITY is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_XOR_BLOCKS=y
-CONFIG_ASYNC_CORE=y
-CONFIG_ASYNC_MEMCPY=y
-CONFIG_ASYNC_XOR=y
-CONFIG_ASYNC_PQ=y
-CONFIG_ASYNC_RAID6_RECOV=y
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_PCOMP=m
-CONFIG_CRYPTO_PCOMP2=y
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=m
-CONFIG_CRYPTO_RSA=m
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_MCRYPTD=m
-CONFIG_CRYPTO_AUTHENC=y
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER=y
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=y
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_PCBC=y
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32C_INTEL=y
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_GHASH=y
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=y
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_TGR192=y
-CONFIG_CRYPTO_WP512=y
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_586=y
-CONFIG_CRYPTO_AES_NI_INTEL=y
-CONFIG_CRYPTO_ANUBIS=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_BLOWFISH_COMMON=y
-CONFIG_CRYPTO_CAMELLIA=y
-CONFIG_CRYPTO_CAST_COMMON=y
-CONFIG_CRYPTO_CAST5=y
-CONFIG_CRYPTO_CAST6=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_FCRYPT=y
-CONFIG_CRYPTO_KHAZAD=y
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_586=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_SEED=y
-CONFIG_CRYPTO_SERPENT=y
-CONFIG_CRYPTO_SERPENT_SSE2_586=m
-CONFIG_CRYPTO_TEA=y
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRYPTO_TWOFISH_COMMON=y
-CONFIG_CRYPTO_TWOFISH_586=y
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
-CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=y
-CONFIG_CRYPTO_DRBG_HMAC=y
-CONFIG_CRYPTO_DRBG_HASH=y
-CONFIG_CRYPTO_DRBG_CTR=y
-CONFIG_CRYPTO_DRBG=y
-CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-CONFIG_CRYPTO_HASH_INFO=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_GEODE=m
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-CONFIG_CRYPTO_DEV_QAT=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-CONFIG_ASYMMETRIC_KEY_TYPE=m
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
-CONFIG_PUBLIC_KEY_ALGO_RSA=m
-CONFIG_X509_CERTIFICATE_PARSER=m
-CONFIG_PKCS7_MESSAGE_PARSER=m
-CONFIG_PKCS7_TEST_KEY=m
-
-#
-# Certificates for signature checking
-#
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_KVM_VFIO=y
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_MMU_AUDIT=y
-CONFIG_KVM_DEVICE_ASSIGNMENT=y
-CONFIG_LGUEST=m
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=y
-CONFIG_BITREVERSE=y
-# CONFIG_HAVE_ARCH_BITREVERSE is not set
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_IO=y
-CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=y
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=y
-CONFIG_CRC8=m
-CONFIG_AUDIT_GENERIC=y
-# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_842_COMPRESS=m
-CONFIG_842_DECOMPRESS=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_BCH=m
-CONFIG_BCH_CONST_PARAMS=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_INTERVAL_TREE=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
-CONFIG_LRU_CACHE=m
-CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-# CONFIG_DDR is not set
-CONFIG_MPILIB=m
-CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_6x10 is not set
-CONFIG_FONT_SUN8x16=y
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-# CONFIG_SG_SPLIT is not set
-CONFIG_ARCH_HAS_SG_CHAIN=y
-CONFIG_ARCH_HAS_MMIO_FLUSH=y
diff --git a/system/xen/dom0/config-4.4.240-xen.x86_64 b/system/xen/dom0/config-4.4.240-xen.x86_64
deleted file mode 100644
index ea3a34d322..0000000000
--- a/system/xen/dom0/config-4.4.240-xen.x86_64
+++ /dev/null
@@ -1,7283 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.4.240 Kernel Configuration
-#
-CONFIG_64BIT=y
-CONFIG_X86_64=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_PERF_EVENTS_INTEL_UNCORE=y
-CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ZONE_DMA32=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_X86_64_SMP=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=4
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-xen"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="darkstar"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_FHANDLE=y
-# CONFIG_USELIB is not set
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-# CONFIG_TASKS_RCU is not set
-CONFIG_RCU_STALL_COMMON=y
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_EXPEDITE_BOOT is not set
-CONFIG_BUILD_BIN2C=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=18
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
-CONFIG_ARCH_SUPPORTS_INT128=y
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-# CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_MULTIUSER=y
-CONFIG_SGETMASK_SYSCALL=y
-CONFIG_SYSFS_SYSCALL=y
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-# CONFIG_BPF_SYSCALL is not set
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_USERFAULTFD=y
-CONFIG_PCI_QUIRKS=y
-CONFIG_MEMBARRIER=y
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLUB_CPU_PARTIAL=y
-# CONFIG_SYSTEM_DATA_VERIFICATION is not set
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_KEXEC_CORE=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-CONFIG_HAVE_OPROFILE=y
-CONFIG_OPROFILE_NMI_TIMER=y
-# CONFIG_KPROBES is not set
-# CONFIG_JUMP_LABEL is not set
-# CONFIG_UPROBES is not set
-# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_KPROBES_ON_FTRACE=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_CC_STACKPROTECTOR=y
-CONFIG_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_NONE is not set
-CONFIG_CC_STACKPROTECTOR_REGULAR=y
-# CONFIG_CC_STACKPROTECTOR_STRONG is not set
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_HUGE_VMAP=y
-CONFIG_HAVE_ARCH_SOFT_DIRTY=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_COMPAT_OLD_SIGACTION=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_CMDLINE_PARSER is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_AIX_PARTITION=y
-CONFIG_OSF_PARTITION=y
-CONFIG_AMIGA_PARTITION=y
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-CONFIG_SGI_PARTITION=y
-# CONFIG_ULTRIX_PARTITION is not set
-CONFIG_SUN_PARTITION=y
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_CMDLINE_PARTITION is not set
-CONFIG_BLOCK_COMPAT=y
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_CFQ_GROUP_IOSCHED=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_FREEZER=y
-
-#
-# Processor type and features
-#
-CONFIG_ZONE_DMA=y
-CONFIG_SMP=y
-CONFIG_X86_FEATURE_NAMES=y
-CONFIG_X86_FAST_FEATURE_TESTS=y
-CONFIG_X86_X2APIC=y
-CONFIG_X86_MPPARSE=y
-CONFIG_RETPOLINE=y
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_X86_INTEL_LPSS=y
-CONFIG_X86_AMD_PLATFORM_DEVICE=y
-CONFIG_IOSF_MBI=m
-# CONFIG_IOSF_MBI_DEBUG is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_DEBUG is not set
-CONFIG_PARAVIRT_SPINLOCKS=y
-CONFIG_XEN=y
-CONFIG_XEN_DOM0=y
-CONFIG_XEN_PVHVM=y
-CONFIG_XEN_512GB=y
-CONFIG_XEN_SAVE_RESTORE=y
-# CONFIG_XEN_DEBUG_FS is not set
-CONFIG_XEN_PVH=y
-CONFIG_KVM_GUEST=y
-# CONFIG_KVM_DEBUG_FS is not set
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_NO_BOOTMEM=y
-# CONFIG_MK8 is not set
-# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=64
-CONFIG_X86_DEBUGCTLMSR=y
-# CONFIG_PROCESSOR_SELECT is not set
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_GART_IOMMU=y
-# CONFIG_CALGARY_IOMMU is not set
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
-# CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS=256
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-CONFIG_X86_MCE_THRESHOLD=y
-CONFIG_X86_MCE_INJECT=m
-CONFIG_X86_THERMAL_VECTOR=y
-# CONFIG_VM86 is not set
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX64=y
-CONFIG_X86_VSYSCALL_EMULATION=y
-CONFIG_I8K=m
-CONFIG_MICROCODE=y
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=y
-CONFIG_X86_CPUID=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_X86_DIRECT_GBPAGES=y
-# CONFIG_NUMA is not set
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_MEMORY_PROBE=y
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_MEMBLOCK=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_ARCH_DISCARD_MEMBLOCK=y
-CONFIG_MEMORY_ISOLATION=y
-CONFIG_HAVE_BOOTMEM_INFO_NODE=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=98304
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-# CONFIG_MEMORY_FAILURE is not set
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
-# CONFIG_CMA is not set
-# CONFIG_MEM_SOFT_DIRTY is not set
-CONFIG_ZPOOL=m
-# CONFIG_ZBUD is not set
-CONFIG_ZSMALLOC=m
-# CONFIG_PGTABLE_MAPPING is not set
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
-# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_FRAME_VECTOR=y
-CONFIG_X86_PMEM_LEGACY_DEVICE=y
-CONFIG_X86_PMEM_LEGACY=y
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW=64
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
-# CONFIG_X86_INTEL_MPX is not set
-CONFIG_X86_INTEL_TSX_MODE_OFF=y
-# CONFIG_X86_INTEL_TSX_MODE_ON is not set
-# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
-CONFIG_EFI=y
-CONFIG_EFI_STUB=y
-CONFIG_EFI_MIXED=y
-CONFIG_SECCOMP=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-CONFIG_HZ_1000=y
-CONFIG_HZ=1000
-CONFIG_SCHED_HRTICK=y
-# CONFIG_KEXEC is not set
-CONFIG_KEXEC_FILE=y
-# CONFIG_KEXEC_VERIFY_SIG is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000
-CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_LEGACY_VSYSCALL_NATIVE is not set
-CONFIG_LEGACY_VSYSCALL_EMULATE=y
-# CONFIG_LEGACY_VSYSCALL_NONE is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_MODIFY_LDT_SYSCALL=y
-CONFIG_HAVE_LIVEPATCH=y
-CONFIG_LIVEPATCH=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION="\"\""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=100
-CONFIG_PM_WAKELOCKS_GC=y
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_CLK=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_ACPI=y
-CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
-CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
-CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
-# CONFIG_ACPI_DEBUGGER is not set
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
-CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_CPU_FREQ_PSS=y
-CONFIG_ACPI_PROCESSOR_IDLE=y
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HOTPLUG_MEMORY=y
-CONFIG_ACPI_HOTPLUG_IOAPIC=y
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=y
-# CONFIG_ACPI_CUSTOM_METHOD is not set
-CONFIG_ACPI_BGRT=y
-# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
-CONFIG_ACPI_NFIT=m
-CONFIG_HAVE_ACPI_APEI=y
-CONFIG_HAVE_ACPI_APEI_NMI=y
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_APEI_EINJ=m
-CONFIG_ACPI_APEI_ERST_DEBUG=m
-CONFIG_ACPI_EXTLOG=m
-CONFIG_PMIC_OPREGION=y
-CONFIG_SFI=y
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-
-#
-# CPU frequency scaling drivers
-#
-CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ_CPB=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_P4_CLOCKMOD=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
-CONFIG_INTEL_IDLE=y
-
-#
-# Memory power savings
-#
-CONFIG_I7300_IDLE_IOAT_CHANNEL=y
-CONFIG_I7300_IDLE=m
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_XEN=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEAER_INJECT=m
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-CONFIG_PCI_BUS_ADDR_T_64BIT=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-CONFIG_PCI_STUB=m
-CONFIG_XEN_PCIDEV_FRONTEND=y
-CONFIG_HT_IRQ=y
-CONFIG_PCI_ATS=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_LABEL=y
-
-#
-# PCI host controller drivers
-#
-CONFIG_ISA_DMA_API=y
-CONFIG_AMD_NB=y
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
-# CONFIG_RAPIDIO is not set
-# CONFIG_X86_SYSFB is not set
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-# CONFIG_HAVE_AOUT is not set
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-CONFIG_IA32_EMULATION=y
-# CONFIG_IA32_AOUT is not set
-CONFIG_X86_X32=y
-CONFIG_COMPAT=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_X86_DEV_DMA_OPS=y
-CONFIG_PMC_ATOM=y
-CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-CONFIG_NET_INGRESS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_DIAG=m
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=y
-CONFIG_XFRM_USER=y
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-CONFIG_NET_FOU_IP_TUNNELS=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=m
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_NETLABEL is not set
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NET_PTP_CLASSIFY=y
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NF_CONNTRACK_PROCFS is not set
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_TIMEOUT is not set
-# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=m
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_INET=m
-CONFIG_NF_TABLES_NETDEV=m
-CONFIG_NFT_EXTHDR=m
-CONFIG_NFT_META=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_TABLES_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NF_TABLES_ARP=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
-CONFIG_NF_NAT_MASQUERADE_IPV4=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_REDIR_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_NF_TABLES_IPV6=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_NF_NAT_IPV6=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NF_NAT_MASQUERADE_IPV6=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_REDIR_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-
-#
-# DECnet: Netfilter Configuration
-#
-# CONFIG_DECNET_NF_GRABULATOR is not set
-CONFIG_NF_TABLES_BRIDGE=m
-CONFIG_NFT_BRIDGE_META=m
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-# CONFIG_IP_DCCP_CCID3 is not set
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-CONFIG_RDS=m
-CONFIG_RDS_RDMA=m
-CONFIG_RDS_TCP=m
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-CONFIG_TIPC_MEDIA_IB=y
-CONFIG_TIPC_MEDIA_UDP=y
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-CONFIG_L2TP_DEBUGFS=m
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_GARP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_HAVE_NET_DSA=y
-CONFIG_NET_DSA=m
-CONFIG_NET_DSA_HWMON=y
-CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_DSA=y
-CONFIG_NET_DSA_TAG_EDSA=y
-CONFIG_NET_DSA_TAG_TRAILER=y
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-# CONFIG_VLAN_8021Q_MVRP is not set
-CONFIG_DECNET=m
-# CONFIG_DECNET_ROUTER is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_PHONET is not set
-CONFIG_6LOWPAN=m
-CONFIG_6LOWPAN_NHC=m
-CONFIG_6LOWPAN_NHC_DEST=m
-CONFIG_6LOWPAN_NHC_FRAGMENT=m
-CONFIG_6LOWPAN_NHC_HOP=m
-CONFIG_6LOWPAN_NHC_IPV6=m
-CONFIG_6LOWPAN_NHC_MOBILITY=m
-CONFIG_6LOWPAN_NHC_ROUTING=m
-CONFIG_6LOWPAN_NHC_UDP=m
-CONFIG_IEEE802154=m
-# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
-CONFIG_IEEE802154_SOCKET=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=y
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_CANID=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=y
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_CLS_IND is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-CONFIG_BATMAN_ADV=m
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-CONFIG_BATMAN_ADV_NC=y
-CONFIG_BATMAN_ADV_MCAST=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_NETLINK_DIAG=m
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_HSR=m
-CONFIG_NET_SWITCHDEV=y
-# CONFIG_NET_L3_MASTER_DEV is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
-CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
-CONFIG_AX25=m
-# CONFIG_AX25_DAMA_SLAVE is not set
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-#
-# AX.25 network device drivers
-#
-CONFIG_MKISS=m
-CONFIG_6PACK=m
-CONFIG_BPQETHER=m
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_BAYCOM_PAR=m
-CONFIG_YAM=m
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_GW=m
-
-#
-# CAN Device Drivers
-#
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_SLCAN=m
-CONFIG_CAN_DEV=m
-CONFIG_CAN_CALC_BITTIMING=y
-# CONFIG_CAN_LEDS is not set
-CONFIG_CAN_JANZ_ICAN3=m
-CONFIG_CAN_SJA1000=m
-CONFIG_CAN_SJA1000_ISA=m
-CONFIG_CAN_SJA1000_PLATFORM=m
-CONFIG_CAN_EMS_PCMCIA=m
-CONFIG_CAN_EMS_PCI=m
-CONFIG_CAN_PEAK_PCMCIA=m
-CONFIG_CAN_PEAK_PCI=m
-CONFIG_CAN_PEAK_PCIEC=y
-CONFIG_CAN_KVASER_PCI=m
-CONFIG_CAN_PLX_PCI=m
-CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PLATFORM=m
-CONFIG_CAN_C_CAN_PCI=m
-CONFIG_CAN_M_CAN=m
-CONFIG_CAN_CC770=m
-CONFIG_CAN_CC770_ISA=m
-CONFIG_CAN_CC770_PLATFORM=m
-
-#
-# CAN USB interfaces
-#
-CONFIG_CAN_EMS_USB=m
-CONFIG_CAN_ESD_USB2=m
-CONFIG_CAN_GS_USB=m
-CONFIG_CAN_KVASER_USB=m
-CONFIG_CAN_PEAK_USB=m
-CONFIG_CAN_8DEV_USB=m
-CONFIG_CAN_SOFTING=m
-CONFIG_CAN_SOFTING_CS=m
-# CONFIG_CAN_DEBUG_DEVICES is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-# CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_SELFTEST is not set
-# CONFIG_BT_DEBUGFS is not set
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_QCA=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_BCM=y
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-CONFIG_CFG80211_CRDA_SUPPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-# CONFIG_MAC80211_RC_MINSTREL_VHT is not set
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_REGULATOR=m
-CONFIG_RFKILL_GPIO=m
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-CONFIG_NET_9P_RDMA=m
-# CONFIG_NET_9P_DEBUG is not set
-# CONFIG_CAIF is not set
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
-CONFIG_NFC=m
-CONFIG_NFC_DIGITAL=m
-CONFIG_NFC_NCI=m
-# CONFIG_NFC_NCI_UART is not set
-CONFIG_NFC_HCI=m
-# CONFIG_NFC_SHDLC is not set
-
-#
-# Near Field Communication (NFC) devices
-#
-CONFIG_NFC_PN533=m
-CONFIG_NFC_WILINK=m
-# CONFIG_NFC_MEI_PHY is not set
-CONFIG_NFC_SIM=m
-CONFIG_NFC_PORT100=m
-# CONFIG_NFC_FDP is not set
-CONFIG_NFC_MRVL=m
-CONFIG_NFC_MRVL_USB=m
-# CONFIG_NFC_MRVL_I2C is not set
-CONFIG_NFC_ST21NFCA=m
-# CONFIG_NFC_ST_NCI is not set
-CONFIG_NFC_NXP_NCI=m
-CONFIG_NFC_NXP_NCI_I2C=m
-# CONFIG_NFC_S3FWRN5_I2C is not set
-CONFIG_LWTUNNEL=y
-CONFIG_DST_CACHE=y
-CONFIG_HAVE_BPF_JIT=y
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
-CONFIG_WANT_DEV_COREDUMP=y
-CONFIG_ALLOW_DEV_COREDUMP=y
-CONFIG_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-CONFIG_SYS_HYPERVISOR=y
-# CONFIG_GENERIC_CPU_DEVICES is not set
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_MMIO=y
-CONFIG_REGMAP_IRQ=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_FENCE_TRACE is not set
-
-#
-# Bus devices
-#
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-CONFIG_MTD_CMDLINE_PARTS=m
-CONFIG_MTD_AR7_PARTS=m
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-CONFIG_SM_FTL=m
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_SWAP=m
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_GEOMETRY=y
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_MAP_BANK_WIDTH_8=y
-CONFIG_MTD_MAP_BANK_WIDTH_16=y
-CONFIG_MTD_MAP_BANK_WIDTH_32=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_I4=y
-CONFIG_MTD_CFI_I8=y
-CONFIG_MTD_OTP=y
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-CONFIG_MTD_SBC_GXX=m
-CONFIG_MTD_AMD76XROM=m
-CONFIG_MTD_ICHXROM=m
-CONFIG_MTD_ESB2ROM=m
-CONFIG_MTD_CK804XROM=m
-CONFIG_MTD_SCB2_FLASH=m
-CONFIG_MTD_NETtel=m
-CONFIG_MTD_L440GX=m
-CONFIG_MTD_PCI=m
-CONFIG_MTD_PCMCIA=m
-# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
-CONFIG_MTD_GPIO_ADDR=m
-CONFIG_MTD_INTEL_VR_NOR=m
-CONFIG_MTD_PLATRAM=m
-CONFIG_MTD_LATCH_ADDR=m
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-CONFIG_MTD_PMC551_BUGFIX=y
-# CONFIG_MTD_PMC551_DEBUG is not set
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_DOCG3=m
-CONFIG_BCH_CONST_M=14
-CONFIG_BCH_CONST_T=4
-CONFIG_MTD_NAND_ECC=m
-CONFIG_MTD_NAND_ECC_SMC=y
-CONFIG_MTD_NAND=m
-CONFIG_MTD_NAND_BCH=m
-CONFIG_MTD_NAND_ECC_BCH=y
-CONFIG_MTD_SM_COMMON=m
-CONFIG_MTD_NAND_DENALI=m
-CONFIG_MTD_NAND_DENALI_PCI=m
-CONFIG_MTD_NAND_DENALI_DT=m
-CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
-CONFIG_MTD_NAND_GPIO=m
-# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
-CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
-CONFIG_MTD_NAND_DOCG4=m
-CONFIG_MTD_NAND_CAFE=m
-CONFIG_MTD_NAND_NANDSIM=m
-CONFIG_MTD_NAND_PLATFORM=m
-CONFIG_MTD_NAND_HISI504=m
-CONFIG_MTD_ONENAND=m
-CONFIG_MTD_ONENAND_VERIFY_WRITE=y
-CONFIG_MTD_ONENAND_GENERIC=m
-CONFIG_MTD_ONENAND_OTP=y
-CONFIG_MTD_ONENAND_2X_PROGRAM=y
-
-#
-# LPDDR & LPDDR2 PCM memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-# CONFIG_MTD_SPI_NOR is not set
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-CONFIG_MTD_UBI_GLUEBI=m
-# CONFIG_MTD_UBI_BLOCK is not set
-# CONFIG_OF is not set
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-CONFIG_PNP_DEBUG_MESSAGES=y
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_NULL_BLK=m
-CONFIG_BLK_DEV_FD=y
-CONFIG_PARIDE=m
-
-#
-# Parallel IDE high-level drivers
-#
-CONFIG_PARIDE_PD=m
-CONFIG_PARIDE_PCD=m
-CONFIG_PARIDE_PF=m
-CONFIG_PARIDE_PT=m
-CONFIG_PARIDE_PG=m
-
-#
-# Parallel IDE protocol modules
-#
-CONFIG_PARIDE_ATEN=m
-CONFIG_PARIDE_BPCK=m
-CONFIG_PARIDE_COMM=m
-CONFIG_PARIDE_DSTR=m
-CONFIG_PARIDE_FIT2=m
-CONFIG_PARIDE_FIT3=m
-CONFIG_PARIDE_EPAT=m
-CONFIG_PARIDE_EPATC8=y
-CONFIG_PARIDE_EPIA=m
-CONFIG_PARIDE_FRIQ=m
-CONFIG_PARIDE_FRPW=m
-CONFIG_PARIDE_KBIC=m
-CONFIG_PARIDE_KTTI=m
-CONFIG_PARIDE_ON20=m
-CONFIG_PARIDE_ON26=m
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_LZ4_COMPRESS is not set
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_CISS_SCSI_TAPE=y
-CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_UMEM=m
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_SKD=m
-CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_BLK_DEV_RAM_DAX=y
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_BLKDEV_BACKEND=y
-CONFIG_VIRTIO_BLK=m
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_RBD=m
-CONFIG_BLK_DEV_RSXX=m
-CONFIG_BLK_DEV_NVME=m
-
-#
-# Misc devices
-#
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_DUMMY_IRQ=m
-CONFIG_IBM_ASM=m
-CONFIG_PHANTOM=m
-CONFIG_SGI_IOC4=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_HP_ILO=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1780=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
-CONFIG_BMP085_I2C=m
-CONFIG_USB_SWITCH_FSA9480=m
-# CONFIG_SRAM is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-CONFIG_SENSORS_LIS3_I2C=m
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_INTEL_MEI_TXE=m
-CONFIG_VMWARE_VMCI=m
-
-#
-# Intel MIC Bus Driver
-#
-CONFIG_INTEL_MIC_BUS=m
-
-#
-# SCIF Bus Driver
-#
-CONFIG_SCIF_BUS=m
-
-#
-# Intel MIC Host Driver
-#
-CONFIG_INTEL_MIC_HOST=m
-
-#
-# Intel MIC Card Driver
-#
-CONFIG_INTEL_MIC_CARD=m
-
-#
-# SCIF Driver
-#
-CONFIG_SCIF=m
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-CONFIG_MIC_COSM=m
-CONFIG_GENWQE=m
-CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
-# CONFIG_ECHO is not set
-# CONFIG_CXL_BASE is not set
-# CONFIG_CXL_KERNEL_API is not set
-# CONFIG_CXL_EEH is not set
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-CONFIG_RAID_ATTRS=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-# CONFIG_SCSI_MQ_DEFAULT is not set
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=y
-CONFIG_SCSI_SAS_LIBSAS=y
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=y
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=4
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-# CONFIG_SCSI_MVSAS_TASKLET is not set
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ESAS2R=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-CONFIG_SCSI_UFSHCD_PLATFORM=m
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-CONFIG_SCSI_FLASHPOINT=y
-CONFIG_VMWARE_PVSCSI=m
-# CONFIG_XEN_SCSI_FRONTEND is not set
-CONFIG_HYPERV_STORAGE=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-CONFIG_SCSI_SNIC=m
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_EATA=m
-# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
-# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_WD719X=m
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=y
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=1
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_ATA=y
-# CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-# CONFIG_SATA_ZPODD is not set
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=y
-CONFIG_SATA_AHCI_PLATFORM=y
-CONFIG_SATA_INIC162X=y
-CONFIG_SATA_ACARD_AHCI=y
-CONFIG_SATA_SIL24=y
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=y
-CONFIG_SATA_QSTOR=y
-CONFIG_SATA_SX4=y
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=y
-CONFIG_SATA_MV=y
-CONFIG_SATA_NV=y
-CONFIG_SATA_PROMISE=y
-CONFIG_SATA_SIL=y
-CONFIG_SATA_SIS=y
-CONFIG_SATA_SVW=y
-CONFIG_SATA_ULI=y
-CONFIG_SATA_VIA=y
-CONFIG_SATA_VITESSE=y
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=y
-CONFIG_PATA_AMD=y
-CONFIG_PATA_ARTOP=y
-CONFIG_PATA_ATIIXP=y
-CONFIG_PATA_ATP867X=y
-CONFIG_PATA_CMD64X=y
-CONFIG_PATA_CYPRESS=y
-CONFIG_PATA_EFAR=y
-CONFIG_PATA_HPT366=y
-CONFIG_PATA_HPT37X=y
-CONFIG_PATA_HPT3X2N=y
-CONFIG_PATA_HPT3X3=y
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_IT8213=y
-CONFIG_PATA_IT821X=y
-CONFIG_PATA_JMICRON=y
-CONFIG_PATA_MARVELL=y
-CONFIG_PATA_NETCELL=y
-CONFIG_PATA_NINJA32=y
-CONFIG_PATA_NS87415=y
-CONFIG_PATA_OLDPIIX=y
-CONFIG_PATA_OPTIDMA=y
-CONFIG_PATA_PDC2027X=y
-CONFIG_PATA_PDC_OLD=y
-CONFIG_PATA_RADISYS=y
-CONFIG_PATA_RDC=y
-CONFIG_PATA_SCH=y
-CONFIG_PATA_SERVERWORKS=y
-CONFIG_PATA_SIL680=y
-CONFIG_PATA_SIS=y
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=y
-CONFIG_PATA_VIA=y
-CONFIG_PATA_WINBOND=y
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=y
-CONFIG_PATA_MPIIX=y
-CONFIG_PATA_NS87410=y
-CONFIG_PATA_OPTI=y
-CONFIG_PATA_PCMCIA=m
-# CONFIG_PATA_PLATFORM is not set
-CONFIG_PATA_RZ1000=y
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_PATA_ACPI=y
-CONFIG_ATA_GENERIC=y
-CONFIG_PATA_LEGACY=y
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_AUTODETECT=y
-CONFIG_MD_LINEAR=y
-CONFIG_MD_RAID0=y
-CONFIG_MD_RAID1=y
-CONFIG_MD_RAID10=y
-CONFIG_MD_RAID456=y
-CONFIG_MD_MULTIPATH=y
-CONFIG_MD_FAULTY=m
-CONFIG_MD_CLUSTER=m
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=y
-# CONFIG_DM_MQ_DEFAULT is not set
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-CONFIG_DM_CRYPT=y
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_MQ=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_CACHE_CLEANER=m
-CONFIG_DM_ERA=m
-CONFIG_DM_MIRROR=y
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-# CONFIG_DM_DELAY is not set
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-CONFIG_DM_SWITCH=m
-CONFIG_DM_LOG_WRITES=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_TCM_USER2=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_SBP_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LAN=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=m
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-CONFIG_NET_FC=y
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN=m
-CONFIG_VXLAN=m
-CONFIG_GENEVE=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NTB_NETDEV=m
-CONFIG_TUN=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_SUNGEM_PHY=m
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-CONFIG_ARCNET_COM90xx=m
-CONFIG_ARCNET_COM90xxIO=m
-CONFIG_ARCNET_RIM_I=m
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_ARCNET_COM20020_CS=m
-CONFIG_ATM_DRIVERS=y
-CONFIG_ATM_DUMMY=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_RING=m
-CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-
-#
-# Distributed Switch Architecture drivers
-#
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6060=m
-CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
-CONFIG_NET_DSA_MV88E6131=m
-CONFIG_NET_DSA_MV88E6123_61_65=m
-CONFIG_NET_DSA_MV88E6171=m
-CONFIG_NET_DSA_MV88E6352=m
-CONFIG_NET_DSA_BCM_SF2=m
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_AGERE=y
-# CONFIG_ET131X is not set
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_ALTERA_TSE=m
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_AMD8111_ETH=m
-CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_NET_VENDOR_ARC=y
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_ALX=m
-CONFIG_NET_VENDOR_AURORA=y
-CONFIG_AURORA_NB8800=m
-CONFIG_NET_CADENCE=y
-CONFIG_MACB=m
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_BCMGENET=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_TIGON3=m
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-CONFIG_BNX2X_VXLAN=y
-CONFIG_BNXT=m
-CONFIG_BNXT_SRIOV=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
-CONFIG_NET_VENDOR_CAVIUM=y
-CONFIG_THUNDER_NIC_PF=m
-CONFIG_THUNDER_NIC_VF=m
-CONFIG_THUNDER_NIC_BGX=m
-CONFIG_LIQUIDIO=m
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-CONFIG_CX_ECAT=m
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-CONFIG_TULIP_MMIO=y
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET_VXLAN=y
-CONFIG_NET_VENDOR_EZCHIP=y
-CONFIG_NET_VENDOR_EXAR=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_NET_VENDOR_HP=y
-CONFIG_HP100=m
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IGB=m
-CONFIG_IGB_HWMON=y
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_IXGB=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_VXLAN=y
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_I40E=m
-# CONFIG_I40E_VXLAN is not set
-CONFIG_I40EVF=m
-CONFIG_FM10K=m
-CONFIG_FM10K_VXLAN=y
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_MVMDIO=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_VXLAN=y
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX5_CORE=m
-CONFIG_MLX5_CORE_EN=y
-CONFIG_MLXSW_CORE=m
-CONFIG_MLXSW_PCI=m
-CONFIG_MLXSW_SWITCHX2=m
-CONFIG_MLXSW_SPECTRUM=m
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
-CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=m
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_ETHOC=m
-CONFIG_NET_PACKET_ENGINE=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLCNIC_VXLAN=y
-CONFIG_QLCNIC_HWMON=y
-CONFIG_QLGE=m
-CONFIG_NETXEN_NIC=m
-CONFIG_QED=m
-CONFIG_QEDE=m
-CONFIG_NET_VENDOR_QUALCOMM=y
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_ATP=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
-CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_ROCKER=y
-CONFIG_ROCKER=m
-CONFIG_NET_VENDOR_SAMSUNG=y
-CONFIG_SXGBE_ETH=m
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-# CONFIG_SFC_MCDI_LOGGING is not set
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_EPIC100=m
-CONFIG_SMSC911X=m
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
-CONFIG_SMSC9420=m
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_DWMAC_GENERIC=m
-# CONFIG_STMMAC_PCI is not set
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_SYNOPSYS=y
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-CONFIG_TI_CPSW_ALE=m
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_FDDI=y
-CONFIG_DEFXX=m
-# CONFIG_DEFXX_MMIO is not set
-CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
-CONFIG_NET_SB1000=m
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_AQUANTIA_PHY=m
-CONFIG_AT803X_PHY=m
-CONFIG_AMD_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_MICROCHIP_PHY=m
-CONFIG_FIXED_PHY=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_GPIO=m
-CONFIG_MDIO_OCTEON=m
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-# CONFIG_SLIP_MODE_SLIP6 is not set
-CONFIG_USB_NET_DRIVERS=y
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_KC2190 is not set
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_USB_NET_CH9200=m
-CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AIRO=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_ADM8211=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_ATH_COMMON=m
-CONFIG_ATH_CARDS=m
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-# CONFIG_ATH9K_AHB is not set
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_DYNACK is not set
-CONFIG_ATH9K_WOW=y
-CONFIG_ATH9K_RFKILL=y
-CONFIG_ATH9K_CHANNEL_CONTEXT=y
-CONFIG_ATH9K_PCOEM=y
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-# CONFIG_CARL9170_HWRNG is not set
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-# CONFIG_ATH6KL_DEBUG is not set
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-# CONFIG_WIL6210_TRACING is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH10K_DEBUG is not set
-CONFIG_ATH10K_DEBUGFS=y
-# CONFIG_ATH10K_TRACING is not set
-CONFIG_WCN36XX=m
-CONFIG_WCN36XX_DEBUGFS=y
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMFMAC_PCIE=y
-CONFIG_BRCM_TRACING=y
-# CONFIG_BRCMDBG is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLDVM=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-# CONFIG_IWLWIFI_BCAST_FILTERING is not set
-# CONFIG_IWLWIFI_UAPSD is not set
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-# CONFIG_IWLWIFI_DEVICE_TRACING is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-
-#
-# iwl3945 / iwl4965 Debugging Options
-#
-# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_HERMES=m
-# CONFIG_HERMES_PRISM is not set
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_LEDS=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-CONFIG_RT2800PCI_RT35XX=y
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WL_MEDIATEK=y
-CONFIG_MT7601U=m
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8821AE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL8XXXU=m
-CONFIG_RTL8XXXU_UNTESTED=y
-CONFIG_WL_TI=y
-CONFIG_WL1251=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_RSI_91X=m
-CONFIG_RSI_DEBUGFS=y
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-CONFIG_WAN=y
-CONFIG_LANMEDIA=m
-CONFIG_HDLC=m
-CONFIG_HDLC_RAW=m
-CONFIG_HDLC_RAW_ETH=m
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC_PPP=m
-
-#
-# X.25/LAPB support is disabled
-#
-CONFIG_PCI200SYN=m
-CONFIG_WANXL=m
-# CONFIG_PC300TOO is not set
-CONFIG_FARSYNC=m
-CONFIG_DSCC4=m
-# CONFIG_DSCC4_PCISYNC is not set
-# CONFIG_DSCC4_PCI_RST is not set
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
-CONFIG_SBNI=m
-# CONFIG_SBNI_MULTILINE is not set
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKELB=m
-CONFIG_IEEE802154_ATUSB=m
-CONFIG_XEN_NETDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_BACKEND=y
-CONFIG_VMXNET3=m
-CONFIG_FUJITSU_ES=m
-CONFIG_HYPERV_NET=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-CONFIG_HISAX_NO_SENDCOMPLETE=y
-CONFIG_HISAX_NO_LLC=y
-CONFIG_HISAX_NO_KEYPAD=y
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-#
-# Active cards
-#
-CONFIG_ISDN_CAPI=m
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPIDRV=m
-# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-# CONFIG_GIGASET_CAPI is not set
-CONFIG_GIGASET_I4L=y
-# CONFIG_GIGASET_DUMMYLL is not set
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-# CONFIG_GIGASET_M101 is not set
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-CONFIG_ISDN_HDLC=m
-CONFIG_NVM=y
-# CONFIG_NVM_DEBUG is not set
-# CONFIG_NVM_GENNVM is not set
-# CONFIG_NVM_RRPC is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_LEDS=y
-CONFIG_INPUT_FF_MEMLESS=y
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ADP5589=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_KEYBOARD_QT1070=m
-CONFIG_KEYBOARD_QT2160=m
-# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_GPIO_POLLED=m
-CONFIG_KEYBOARD_TCA6416=m
-CONFIG_KEYBOARD_TCA8418=m
-CONFIG_KEYBOARD_MATRIX=m
-CONFIG_KEYBOARD_LM8323=m
-CONFIG_KEYBOARD_LM8333=m
-CONFIG_KEYBOARD_MAX7359=m
-CONFIG_KEYBOARD_MCS=m
-CONFIG_KEYBOARD_MPR121=m
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_KEYBOARD_OPENCORES=m
-CONFIG_KEYBOARD_SAMSUNG=m
-CONFIG_KEYBOARD_STOWAWAY=m
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_KEYBOARD_CROS_EC=m
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_CYPRESS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_PS2_FOCALTECH=y
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_AS5011=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_HANWANG=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_SERIAL_WACOM4=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_PROPERTIES=y
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
-CONFIG_TOUCHSCREEN_BU21013=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
-CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
-CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_FT6236=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GOODIX=m
-CONFIG_TOUCHSCREEN_ILI210X=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELAN=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_WACOM_I2C=m
-CONFIG_TOUCHSCREEN_MAX11801=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MMS114=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_MC13783=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-CONFIG_TOUCHSCREEN_TSC200X_CORE=m
-CONFIG_TOUCHSCREEN_TSC2004=m
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_ST1232=m
-CONFIG_TOUCHSCREEN_SUR40=m
-CONFIG_TOUCHSCREEN_SX8654=m
-CONFIG_TOUCHSCREEN_TPS6507X=m
-CONFIG_TOUCHSCREEN_ZFORCE=m
-CONFIG_TOUCHSCREEN_ROHM_BU21023=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_BMA150=m
-CONFIG_INPUT_E3X0_BUTTON=m
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MC13783_PWRBUTTON=m
-CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_MPU3050=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_GP2A=m
-CONFIG_INPUT_GPIO_BEEPER=m
-CONFIG_INPUT_GPIO_TILT_POLLED=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-CONFIG_INPUT_KXTJ9_POLLED_MODE=y
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_REGULATOR_HAPTIC=m
-CONFIG_INPUT_RETU_PWRBUTTON=m
-CONFIG_INPUT_TPS65218_PWRBUTTON=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_IMS_PCU=m
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
-CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
-CONFIG_INPUT_SOC_BUTTON_ARRAY=m
-CONFIG_INPUT_DRV260X_HAPTICS=m
-CONFIG_INPUT_DRV2665_HAPTICS=m
-CONFIG_INPUT_DRV2667_HAPTICS=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-CONFIG_SERIO_ARC_PS2=m
-CONFIG_HYPERV_KEYBOARD=m
-CONFIG_USERIO=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=32
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-CONFIG_MOXA_INTELLIO=m
-CONFIG_MOXA_SMARTIO=m
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_SYNCLINK_GT=m
-CONFIG_NOZOMI=m
-CONFIG_ISI=m
-CONFIG_N_HDLC=m
-CONFIG_N_GSM=m
-CONFIG_TRACE_ROUTER=m
-CONFIG_TRACE_SINK=m
-CONFIG_LDISC_AUTOLOAD=y
-CONFIG_DEVMEM=y
-CONFIG_DEVKMEM=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_RSA=y
-# CONFIG_SERIAL_8250_FSL is not set
-CONFIG_SERIAL_8250_DW=m
-CONFIG_SERIAL_8250_RT288X=y
-CONFIG_SERIAL_8250_FINTEK=m
-CONFIG_SERIAL_8250_MID=m
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_UARTLITE=m
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_SCCNXP=m
-CONFIG_SERIAL_SC16IS7XX=m
-# CONFIG_SERIAL_SC16IS7XX_I2C is not set
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_ARC=m
-CONFIG_SERIAL_ARC_NR_PORTS=1
-CONFIG_SERIAL_RP2=m
-CONFIG_SERIAL_RP2_NR_UARTS=32
-CONFIG_SERIAL_FSL_LPUART=m
-# CONFIG_TTY_PRINTK is not set
-CONFIG_PRINTER=m
-CONFIG_LP_CONSOLE=y
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_HVC_XEN_FRONTEND=y
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set
-CONFIG_IPMI_SSIF=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_TPM=m
-CONFIG_NVRAM=m
-CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
-CONFIG_MWAVE=m
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=256
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HPET_MMAP_DEFAULT=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_TCG_TIS=m
-CONFIG_TCG_TIS_I2C_ATMEL=m
-CONFIG_TCG_TIS_I2C_INFINEON=m
-CONFIG_TCG_TIS_I2C_NUVOTON=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
-# CONFIG_TCG_XEN is not set
-CONFIG_TCG_CRB=m
-CONFIG_TCG_TIS_ST33ZP24=m
-CONFIG_TCG_TIS_ST33ZP24_I2C=m
-CONFIG_TELCLOCK=m
-CONFIG_DEVPORT=y
-# CONFIG_XILLYBUS is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_GPIO=m
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_I2C_MUX_REG=m
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_ISMT=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_CBUS_GPIO is not set
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_EMEV2=m
-CONFIG_I2C_GPIO=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-# CONFIG_I2C_PXA_PCI is not set
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_XILINX=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_DLN2=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_ROBOTFUZZ_OSIF=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_VIPERBOARD=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_CROS_EC_TUNNEL=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SLAVE_EEPROM=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_SPI is not set
-# CONFIG_SPMI is not set
-CONFIG_HSI=m
-CONFIG_HSI_BOARDINFO=y
-
-#
-# HSI controllers
-#
-
-#
-# HSI clients
-#
-CONFIG_HSI_CHAR=m
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
-CONFIG_PPS_CLIENT_GPIO=m
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=m
-
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-CONFIG_PINCTRL=y
-
-#
-# Pin controllers
-#
-CONFIG_PINMUX=y
-CONFIG_PINCONF=y
-CONFIG_GENERIC_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
-CONFIG_PINCTRL_AMD=y
-CONFIG_PINCTRL_BAYTRAIL=y
-CONFIG_PINCTRL_CHERRYVIEW=m
-CONFIG_PINCTRL_INTEL=m
-CONFIG_PINCTRL_BROXTON=m
-CONFIG_PINCTRL_SUNRISEPOINT=m
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_DEVRES=y
-CONFIG_GPIO_ACPI=y
-CONFIG_GPIOLIB_IRQCHIP=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC=m
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO drivers
-#
-# CONFIG_GPIO_AMDPT is not set
-CONFIG_GPIO_DWAPB=m
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_ICH=m
-CONFIG_GPIO_LYNXPOINT=y
-CONFIG_GPIO_VX855=m
-# CONFIG_GPIO_ZX is not set
-
-#
-# Port-mapped I/O GPIO drivers
-#
-# CONFIG_GPIO_104_IDIO_16 is not set
-CONFIG_GPIO_F7188X=m
-# CONFIG_GPIO_IT87 is not set
-CONFIG_GPIO_SCH=m
-CONFIG_GPIO_SCH311X=m
-
-#
-# I2C GPIO expanders
-#
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-
-#
-# MFD GPIO expanders
-#
-CONFIG_GPIO_ARIZONA=m
-CONFIG_GPIO_DLN2=m
-CONFIG_GPIO_JANZ_TTL=m
-CONFIG_GPIO_LP3943=m
-# CONFIG_GPIO_UCB1400 is not set
-CONFIG_GPIO_WM8994=m
-
-#
-# PCI GPIO expanders
-#
-CONFIG_GPIO_AMD8111=m
-# CONFIG_GPIO_INTEL_MID is not set
-CONFIG_GPIO_ML_IOH=m
-CONFIG_GPIO_RDC321X=m
-
-#
-# SPI or I2C GPIO expanders
-#
-# CONFIG_GPIO_MCP23S08 is not set
-
-#
-# USB GPIO expanders
-#
-CONFIG_GPIO_VIPERBOARD=m
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_DS1WM=m
-CONFIG_W1_MASTER_GPIO=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2408=m
-# CONFIG_W1_SLAVE_DS2408_READBACK is not set
-CONFIG_W1_SLAVE_DS2413=m
-CONFIG_W1_SLAVE_DS2406=m
-CONFIG_W1_SLAVE_DS2423=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-CONFIG_W1_SLAVE_DS2433_CRC=y
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_DS2780=m
-CONFIG_W1_SLAVE_DS2781=m
-CONFIG_W1_SLAVE_DS28E04=m
-CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_GENERIC_ADC_BATTERY=m
-CONFIG_TEST_POWER=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2780=m
-CONFIG_BATTERY_DS2781=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_SBS=m
-CONFIG_BATTERY_BQ27XXX=m
-CONFIG_BATTERY_BQ27XXX_I2C=y
-CONFIG_BATTERY_BQ27XXX_PLATFORM=y
-CONFIG_BATTERY_MAX17040=m
-CONFIG_BATTERY_MAX17042=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_CHARGER_MAX8903=m
-CONFIG_CHARGER_LP8727=m
-CONFIG_CHARGER_GPIO=m
-# CONFIG_CHARGER_MANAGER is not set
-CONFIG_CHARGER_BQ2415X=m
-CONFIG_CHARGER_BQ24190=m
-CONFIG_CHARGER_BQ24257=m
-CONFIG_CHARGER_BQ24735=m
-CONFIG_CHARGER_BQ25890=m
-CONFIG_CHARGER_SMB347=m
-CONFIG_CHARGER_TPS65217=m
-CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_CHARGER_RT9455=m
-CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_RESTART is not set
-CONFIG_POWER_AVS=y
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_DELL_SMM=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_MC13783_ADC=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_HIH6130=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IIO_HWMON=m
-CONFIG_SENSORS_I5500=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_HTU21=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_MENF21BMC_HWMON=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-CONFIG_SENSORS_LTC2978_REGULATOR=y
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX20751=m
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-CONFIG_SENSORS_TPS40422=m
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADS1015=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_INA209=m
-CONFIG_SENSORS_INA2XX=m
-CONFIG_SENSORS_TC74=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-# CONFIG_SENSORS_W83795_FANCTRL is not set
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_THERMAL=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
-CONFIG_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
-CONFIG_THERMAL_EMULATION=y
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_X86_PKG_TEMP_THERMAL=m
-CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
-CONFIG_INTEL_SOC_DTS_THERMAL=m
-CONFIG_INT340X_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
-CONFIG_INTEL_PCH_THERMAL=m
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_MENF21BMC_WATCHDOG=m
-# CONFIG_XILINX_WATCHDOG is not set
-CONFIG_CADENCE_WATCHDOG=m
-CONFIG_DW_WATCHDOG=m
-CONFIG_RN5T618_WATCHDOG=m
-CONFIG_MAX63XX_WATCHDOG=m
-CONFIG_RETU_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_F71808E_WDT=m
-CONFIG_SP5100_TCO=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_IE6XX_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_HPWDT_NMI_DECODING=y
-CONFIG_SC1200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_NV_TCO=m
-CONFIG_60XX_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_VIA_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_BCM7038_WDT=m
-CONFIG_MEN_A21_WDT=m
-# CONFIG_XEN_WDT is not set
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_HOST_SOC=y
-# CONFIG_SSB_SILENT is not set
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-# CONFIG_SSB_DRIVER_GPIO is not set
-CONFIG_BCMA_POSSIBLE=y
-
-#
-# Broadcom specific AMBA
-#
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_HOST_SOC is not set
-CONFIG_BCMA_DRIVER_PCI=y
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-# CONFIG_BCMA_DRIVER_GPIO is not set
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_CROS_EC=m
-CONFIG_MFD_CROS_EC_I2C=m
-CONFIG_MFD_DLN2=m
-CONFIG_MFD_MC13XXX=m
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_HTC_PASIC3=m
-CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
-CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
-CONFIG_MFD_JANZ_CMODIO=m
-# CONFIG_MFD_KEMPLD is not set
-CONFIG_MFD_MT6397=m
-CONFIG_MFD_MENF21BMC=m
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_RETU=m
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_RDC321X=m
-CONFIG_MFD_RTSX_PCI=m
-CONFIG_MFD_RTSX_USB=m
-CONFIG_MFD_RN5T618=m
-CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SM501=m
-# CONFIG_MFD_SM501_GPIO is not set
-CONFIG_MFD_SKY81452=m
-# CONFIG_ABX500_CORE is not set
-CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_MFD_LP3943=m
-CONFIG_TPS6105X=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_MFD_TPS65217=m
-CONFIG_MFD_TPS65218=m
-# CONFIG_MFD_TPS65912 is not set
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MFD_LM3533=m
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_ARIZONA=y
-CONFIG_MFD_ARIZONA_I2C=m
-CONFIG_MFD_WM5102=y
-CONFIG_MFD_WM5110=y
-CONFIG_MFD_WM8997=y
-# CONFIG_MFD_WM8998 is not set
-CONFIG_MFD_WM8994=m
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-CONFIG_REGULATOR_ACT8865=m
-CONFIG_REGULATOR_AD5398=m
-CONFIG_REGULATOR_ANATOP=m
-CONFIG_REGULATOR_BCM590XX=m
-CONFIG_REGULATOR_DA9210=m
-CONFIG_REGULATOR_DA9211=m
-CONFIG_REGULATOR_FAN53555=m
-CONFIG_REGULATOR_GPIO=m
-CONFIG_REGULATOR_ISL9305=m
-CONFIG_REGULATOR_ISL6271A=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_LP872X=m
-CONFIG_REGULATOR_LP8755=m
-CONFIG_REGULATOR_LTC3589=m
-CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_MAX8649=m
-CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_MAX8973=m
-CONFIG_REGULATOR_MC13XXX_CORE=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_MC13892=m
-CONFIG_REGULATOR_MT6311=m
-CONFIG_REGULATOR_MT6397=m
-CONFIG_REGULATOR_PCF50633=m
-CONFIG_REGULATOR_PFUZE100=m
-CONFIG_REGULATOR_RN5T618=m
-CONFIG_REGULATOR_SKY81452=m
-CONFIG_REGULATOR_TPS51632=m
-CONFIG_REGULATOR_TPS6105X=m
-CONFIG_REGULATOR_TPS62360=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_REGULATOR_TPS65217=m
-CONFIG_REGULATOR_WM8994=m
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-# CONFIG_MEDIA_SDR_SUPPORT is not set
-CONFIG_MEDIA_RC_SUPPORT=y
-# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2=m
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_DVB_CORE=m
-CONFIG_DVB_NET=y
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-
-#
-# Media drivers
-#
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_RC_DECODERS=y
-CONFIG_LIRC=m
-CONFIG_IR_LIRC_CODEC=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_SHARP_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_XMP_DECODER=m
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_HIX5HD2=m
-CONFIG_IR_IMON=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_IR_IGORPLUGUSB=m
-CONFIG_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SPCA1528=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-CONFIG_USB_GSPCA_XIRLINK_CIT=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_VIDEO_USBTV=m
-
-#
-# Analog TV USB devices
-#
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160_AC97=y
-CONFIG_VIDEO_STK1160=m
-# CONFIG_VIDEO_GO7007 is not set
-
-#
-# Analog/digital TV USB devices
-#
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_AU0828_V4L2=y
-CONFIG_VIDEO_AU0828_RC=y
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_DVBSKY=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG=y
-CONFIG_DVB_AS102=m
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-#
-# Media capture support
-#
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_TW68=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-
-#
-# Media capture/analog TV support
-#
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_IVTV_ALSA=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_DT3155=m
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_ENABLE_VP3054=y
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_BT848=m
-CONFIG_DVB_BT8XX=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7164=m
-
-#
-# Media digital TV PCI Adapters
-#
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-CONFIG_DVB_PT3=m
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_DDBRIDGE=m
-CONFIG_DVB_SMIPCIE=m
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_VIA_CAMERA=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
-CONFIG_VIDEO_SH_VEU=m
-CONFIG_V4L_TEST_DRIVERS=y
-CONFIG_VIDEO_VIVID=m
-CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_VIDEO_VIM2M=m
-# CONFIG_DVB_PLATFORM_DRIVERS is not set
-
-#
-# Supported MMC/SDIO adapters
-#
-CONFIG_SMS_SDIO_DRV=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_TEA575X=m
-# CONFIG_RADIO_SI470X is not set
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_SI4713=m
-CONFIG_PLATFORM_SI4713=m
-CONFIG_I2C_SI4713=m
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_SHARK=m
-CONFIG_RADIO_SHARK2=m
-CONFIG_USB_KEENE=m
-CONFIG_USB_RAREMONO=m
-CONFIG_USB_MA901=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_WL1273=m
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-CONFIG_RADIO_WL128X=m
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-CONFIG_MEDIA_COMMON_OPTIONS=y
-
-#
-# common driver options
-#
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_DEBUG=y
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_SMS_SIANO_MDTV=m
-CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
-
-#
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
-#
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Audio decoders, processors and mixers
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-
-#
-# Flash devices
-#
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Audio/Video compression chips
-#
-CONFIG_VIDEO_SAA6752HS=m
-
-#
-# Miscellaneous helper chips
-#
-CONFIG_VIDEO_M52790=m
-
-#
-# Sensors used on soc_camera driver
-#
-
-#
-# soc_camera sensor drivers
-#
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV5642=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_M88RS6000T=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-CONFIG_MEDIA_TUNER_MXL301RF=m
-CONFIG_MEDIA_TUNER_QM1D1C0042=m
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_M88DS3103=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_SI2165=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24117=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_TS2020=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_SI2168=m
-CONFIG_DVB_AS102_FE=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT3306A=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_AU8522_DTV=m
-CONFIG_DVB_AU8522_V4L=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_TC90522=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_DRX39XYJ=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-CONFIG_DVB_SP2=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_INTEL_GTT=m
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM=m
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_TTM=m
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_ADV7511=m
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_USERPTR=y
-# CONFIG_DRM_RADEON_UMS is not set
-CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_CIK is not set
-CONFIG_DRM_AMDGPU_USERPTR=y
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_I810=m
-CONFIG_DRM_I915=m
-# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_DRM_VGEM=m
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_GMA3600=y
-CONFIG_DRM_UDL=m
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_QXL=m
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-CONFIG_DRM_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-CONFIG_HSA_AMD=m
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_DDC=m
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=y
-CONFIG_FB_SYS_COPYAREA=y
-CONFIG_FB_SYS_IMAGEBLIT=y
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=y
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_HECUBA=m
-CONFIG_FB_SVGALIB=m
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_PM2=m
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-CONFIG_FB_CYBER2000=m
-CONFIG_FB_CYBER2000_DDC=y
-CONFIG_FB_ARC=m
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-# CONFIG_FB_UVESA is not set
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
-CONFIG_FB_N411=m
-CONFIG_FB_HGA=m
-CONFIG_FB_OPENCORES=m
-CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_I740=m
-CONFIG_FB_LE80578=m
-CONFIG_FB_CARILLO_RANCH=m
-# CONFIG_FB_INTEL is not set
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_VIA=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-CONFIG_FB_VIA_X_COMPATIBILITY=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-# CONFIG_FB_3DFX_ACCEL is not set
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-CONFIG_FB_ARK=m
-CONFIG_FB_PM3=m
-CONFIG_FB_CARMINE=m
-CONFIG_FB_CARMINE_DRAM_EVAL=y
-# CONFIG_CARMINE_DRAM_CUSTOM is not set
-# CONFIG_FB_SM501 is not set
-CONFIG_FB_SMSCUFX=m
-CONFIG_FB_UDL=m
-CONFIG_FB_IBM_GXT4500=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_XEN_FBDEV_FRONTEND=y
-CONFIG_FB_METRONOME=m
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-CONFIG_FB_MB862XX_I2C=y
-CONFIG_FB_BROADSHEET=m
-CONFIG_FB_AUO_K190X=m
-CONFIG_FB_AUO_K1900=m
-CONFIG_FB_AUO_K1901=m
-# CONFIG_FB_HYPERV is not set
-# CONFIG_FB_SIMPLE is not set
-CONFIG_FB_SM712=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_APPLE=m
-CONFIG_BACKLIGHT_PM8941_WLED=m
-CONFIG_BACKLIGHT_SAHARA=m
-CONFIG_BACKLIGHT_ADP8860=m
-CONFIG_BACKLIGHT_ADP8870=m
-CONFIG_BACKLIGHT_PCF50633=m
-CONFIG_BACKLIGHT_LM3639=m
-CONFIG_BACKLIGHT_SKY81452=m
-CONFIG_BACKLIGHT_TPS65217=m
-CONFIG_BACKLIGHT_GPIO=m
-CONFIG_BACKLIGHT_LV5207LP=m
-CONFIG_BACKLIGHT_BD6107=m
-CONFIG_VGASTATE=m
-CONFIG_HDMI=y
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_PCM_TIMER=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=32
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_PROC_FS=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCSP is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968_RADIO=y
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-
-#
-# HD-Audio
-#
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-# CONFIG_SND_HDA_INPUT_BEEP is not set
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_I915=y
-CONFIG_SND_HDA_PREALLOC_SIZE=2048
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_BCD2000=m
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_DICE=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_SCS1X=m
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_BEBOB=m
-CONFIG_SND_FIREWIRE_DIGI00X=m
-CONFIG_SND_FIREWIRE_TASCAM=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-# CONFIG_SND_SOC is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=m
-CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=m
-CONFIG_HID_APPLEIR=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_BETOP_FF=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CORSAIR=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CP2112=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_GEMBIRD=m
-CONFIG_HID_GFRM=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HOLTEK_FF=y
-CONFIG_HID_GT683R=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PLANTRONICS=m
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_SONY_FF=y
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_HYPERV_MOUSE=m
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TIVO=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-
-#
-# I2C HID support
-#
-CONFIG_I2C_HID=m
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG_FSM is not set
-CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_MON=y
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=m
-CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_FOTG210_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_SSB=y
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-# CONFIG_USB_SL811_HCD_ISO is not set
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-# CONFIG_USB_HCD_BCMA is not set
-CONFIG_USB_HCD_SSB=m
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_MUSB_HOST=y
-
-#
-# Platform Glue Layer
-#
-
-#
-# MUSB DMA mode
-#
-CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_DWC3=m
-# CONFIG_USB_DWC3_ULPI is not set
-CONFIG_USB_DWC3_HOST=y
-
-#
-# Platform Glue Driver Support
-#
-CONFIG_USB_DWC3_PCI=m
-# CONFIG_USB_DWC2 is not set
-CONFIG_USB_CHIPIDEA=m
-# CONFIG_USB_CHIPIDEA_HOST is not set
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
-CONFIG_USB_ISP1760=m
-CONFIG_USB_ISP1760_HCD=y
-CONFIG_USB_ISP1760_HOST_ROLE=y
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_F81232=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_METRO=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MXUPORT=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_SSU100=m
-CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_DEBUG=m
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_YUREX=m
-CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_LINK_LAYER_TEST=m
-CONFIG_USB_CHAOSKEY=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_USB_PHY is not set
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_TAHVO_USB is not set
-# CONFIG_USB_ISP1301 is not set
-# CONFIG_USB_GADGET is not set
-CONFIG_USB_LED_TRIG=y
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-CONFIG_MMC_USDHI6ROL0=m
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_TOSHIBA_PCI=m
-CONFIG_MMC_MTK=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-# CONFIG_MS_BLOCK is not set
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_CLASS_FLASH=m
-
-#
-# LED drivers
-#
-CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_LM3533=m
-CONFIG_LEDS_LM3642=m
-CONFIG_LEDS_PCA9532=m
-# CONFIG_LEDS_PCA9532_GPIO is not set
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-CONFIG_LEDS_LP8501=m
-CONFIG_LEDS_LP8860=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA963X=m
-CONFIG_LEDS_REGULATOR=m
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_INTEL_SS4200=m
-CONFIG_LEDS_LT3593=m
-CONFIG_LEDS_DELL_NETBOOKS=m
-CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_TCA6507=m
-CONFIG_LEDS_TLC591XX=m
-CONFIG_LEDS_LM355x=m
-CONFIG_LEDS_MENF21BMC=m
-
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-CONFIG_LEDS_BLINKM=m
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-# CONFIG_LEDS_TRIGGER_CPU is not set
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_QIB=m
-CONFIG_INFINIBAND_QIB_DCA=y
-# CONFIG_INFINIBAND_CXGB3 is not set
-CONFIG_INFINIBAND_CXGB4=m
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_MLX5_INFINIBAND=m
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
-CONFIG_INFINIBAND_OCRDMA=m
-CONFIG_INFINIBAND_USNIC=m
-CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SRPT=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_ISERT=m
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_EDAC=y
-CONFIG_EDAC_LEGACY_SYSFS=y
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=y
-# CONFIG_EDAC_MM_EDAC is not set
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_HCTOSYS is not set
-# CONFIG_RTC_SYSTOHC is not set
-# CONFIG_RTC_DEBUG is not set
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_ABB5ZES3=m
-CONFIG_RTC_DRV_ABX80X=m
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1374_WDT=y
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_ISL12057=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF85063=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
-CONFIG_RTC_DRV_RV3029C2=m
-CONFIG_RTC_DRV_RV8803=m
-
-#
-# SPI RTC drivers
-#
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1685_FAMILY=m
-CONFIG_RTC_DRV_DS1685=y
-# CONFIG_RTC_DRV_DS1689 is not set
-# CONFIG_RTC_DRV_DS17285 is not set
-# CONFIG_RTC_DRV_DS17485 is not set
-# CONFIG_RTC_DRV_DS17885 is not set
-# CONFIG_RTC_DS1685_PROC_REGS is not set
-# CONFIG_RTC_DS1685_SYSFS_REGS is not set
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_PCF50633=m
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_MC13XXX=m
-CONFIG_RTC_DRV_MT6397=m
-
-#
-# HID Sensor RTC drivers
-#
-CONFIG_RTC_DRV_HID_SENSOR_TIME=m
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_VIRTUAL_CHANNELS=m
-CONFIG_DMA_ACPI=y
-CONFIG_INTEL_IDMA64=m
-CONFIG_INTEL_IOATDMA=m
-CONFIG_INTEL_MIC_X100_DMA=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-CONFIG_HSU_DMA=m
-
-#
-# DMA Clients
-#
-# CONFIG_ASYNC_TX_DMA is not set
-CONFIG_DMATEST=m
-CONFIG_DMA_ENGINE_RAID=y
-CONFIG_DCA=m
-CONFIG_AUXDISPLAY=y
-# CONFIG_KS0108 is not set
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_DMEM_GENIRQ=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-CONFIG_UIO_PRUSS=m
-CONFIG_UIO_MF624=m
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO_VIRQFD=m
-CONFIG_VFIO=m
-CONFIG_VFIO_PCI=m
-# CONFIG_VFIO_PCI_VGA is not set
-CONFIG_VFIO_PCI_MMAP=y
-CONFIG_VFIO_PCI_INTX=y
-CONFIG_IRQ_BYPASS_MANAGER=m
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=m
-
-#
-# Virtio drivers
-#
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_HYPERV=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
-
-#
-# Xen driver support
-#
-CONFIG_XEN_BALLOON=y
-# CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DEV_EVTCHN=y
-CONFIG_XEN_BACKEND=y
-CONFIG_XENFS=y
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_XENBUS_FRONTEND=y
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_PCIDEV_BACKEND=m
-# CONFIG_XEN_SCSI_BACKEND is not set
-CONFIG_XEN_PRIVCMD=y
-CONFIG_XEN_ACPI_PROCESSOR=m
-# CONFIG_XEN_MCE_LOG is not set
-CONFIG_XEN_HAVE_PVMMU=y
-CONFIG_XEN_EFI=y
-CONFIG_XEN_AUTO_XLATE=y
-CONFIG_XEN_ACPI=y
-CONFIG_XEN_SYMS=y
-CONFIG_XEN_HAVE_VPMU=y
-CONFIG_STAGING=y
-# CONFIG_SLICOSS is not set
-# CONFIG_PRISM2_USB is not set
-# CONFIG_COMEDI is not set
-# CONFIG_PANEL is not set
-CONFIG_RTL8192U=m
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
-CONFIG_R8712U=m
-CONFIG_R8188EU=m
-CONFIG_88EU_AP_MODE=y
-CONFIG_R8723AU=m
-CONFIG_8723AU_AP_MODE=y
-CONFIG_8723AU_BT_COEXIST=y
-CONFIG_RTS5208=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-
-#
-# IIO staging drivers
-#
-
-#
-# Accelerometers
-#
-
-#
-# Analog to digital converters
-#
-CONFIG_AD7606=m
-CONFIG_AD7606_IFACE_PARALLEL=m
-
-#
-# Analog digital bi-direction converters
-#
-CONFIG_ADT7316=m
-CONFIG_ADT7316_I2C=m
-
-#
-# Capacitance to digital converters
-#
-CONFIG_AD7150=m
-CONFIG_AD7152=m
-CONFIG_AD7746=m
-
-#
-# Direct Digital Synthesis
-#
-
-#
-# Digital gyroscope sensors
-#
-
-#
-# Network Analyzer, Impedance Converters
-#
-CONFIG_AD5933=m
-
-#
-# Light sensors
-#
-CONFIG_SENSORS_ISL29018=m
-CONFIG_SENSORS_ISL29028=m
-CONFIG_TSL2583=m
-CONFIG_TSL2x7x=m
-
-#
-# Magnetometer sensors
-#
-CONFIG_SENSORS_HMC5843=m
-CONFIG_SENSORS_HMC5843_I2C=m
-
-#
-# Active energy metering IC
-#
-CONFIG_ADE7854=m
-CONFIG_ADE7854_I2C=m
-
-#
-# Resolver to digital converters
-#
-
-#
-# Triggers - standalone
-#
-CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
-# CONFIG_IIO_SIMPLE_DUMMY is not set
-CONFIG_FB_SM750=m
-CONFIG_FB_XGI=m
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-CONFIG_SPEAKUP_SYNTH_DUMMY=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_STAGING_MEDIA=y
-CONFIG_I2C_BCM2048=m
-CONFIG_DVB_CXD2099=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_BT829=m
-CONFIG_LIRC_IMON=m
-CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SERIAL=m
-CONFIG_LIRC_SERIAL_TRANSMITTER=y
-CONFIG_LIRC_SIR=m
-CONFIG_LIRC_ZILOG=m
-# CONFIG_STAGING_RDMA is not set
-
-#
-# Android
-#
-CONFIG_WIMAX_GDM72XX=m
-# CONFIG_WIMAX_GDM72XX_QOS is not set
-# CONFIG_WIMAX_GDM72XX_K_MODE is not set
-CONFIG_WIMAX_GDM72XX_WIMAX2=y
-CONFIG_WIMAX_GDM72XX_USB=y
-# CONFIG_WIMAX_GDM72XX_SDIO is not set
-# CONFIG_WIMAX_GDM72XX_USB_PM is not set
-CONFIG_LTE_GDM724X=m
-CONFIG_FIREWIRE_SERIAL=m
-CONFIG_FWTTY_MAX_TOTAL_PORTS=64
-CONFIG_FWTTY_MAX_CARD_PORTS=32
-# CONFIG_LUSTRE_FS is not set
-# CONFIG_DGNC is not set
-# CONFIG_DGAP is not set
-# CONFIG_GS_FPGABOOT is not set
-CONFIG_CRYPTO_SKEIN=y
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_WILC1000_DRIVER is not set
-# CONFIG_MOST is not set
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ALIENWARE_WMI=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
-CONFIG_DELL_WMI_AIO=m
-CONFIG_DELL_SMO8800=m
-CONFIG_DELL_RBTN=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_FUJITSU_TABLET=m
-CONFIG_AMILO_RFKILL=m
-CONFIG_HP_ACCEL=m
-CONFIG_HP_WIRELESS=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-CONFIG_SONYPI_COMPAT=y
-CONFIG_IDEAPAD_LAPTOP=m
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_SENSORS_HDAPS=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
-CONFIG_ACPI_WMI=m
-CONFIG_MSI_WMI=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_ACPI_TOSHIBA=m
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_TOSHIBA_HAPS=m
-CONFIG_TOSHIBA_WMI=m
-CONFIG_ACPI_CMPC=m
-CONFIG_INTEL_IPS=m
-CONFIG_IBM_RTL=m
-CONFIG_SAMSUNG_LAPTOP=m
-CONFIG_MXM_WMI=m
-CONFIG_INTEL_OAKTRAIL=m
-CONFIG_SAMSUNG_Q10=m
-CONFIG_APPLE_GMUX=m
-CONFIG_INTEL_RST=m
-CONFIG_INTEL_SMARTCONNECT=m
-CONFIG_PVPANIC=m
-CONFIG_INTEL_PMC_IPC=m
-CONFIG_SURFACE_PRO3_BUTTON=m
-CONFIG_CHROME_PLATFORMS=y
-CONFIG_CHROMEOS_LAPTOP=m
-CONFIG_CHROMEOS_PSTORE=m
-CONFIG_CROS_EC_CHARDEV=m
-CONFIG_CROS_EC_LPC=m
-CONFIG_CROS_EC_PROTO=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-
-#
-# Common Clock Framework
-#
-CONFIG_COMMON_CLK_SI5351=m
-# CONFIG_COMMON_CLK_PXA is not set
-CONFIG_COMMON_CLK_CDCE706=m
-
-#
-# Hardware Spinlock drivers
-#
-
-#
-# Clock Source drivers
-#
-CONFIG_CLKEVT_I8253=y
-CONFIG_I8253_LOCK=y
-CONFIG_CLKBLD_I8253=y
-# CONFIG_ATMEL_PIT is not set
-# CONFIG_SH_TIMER_CMT is not set
-# CONFIG_SH_TIMER_MTU2 is not set
-# CONFIG_SH_TIMER_TMU is not set
-# CONFIG_EM_TIMER_STI is not set
-# CONFIG_MAILBOX is not set
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-CONFIG_IOMMU_IOVA=y
-CONFIG_AMD_IOMMU=y
-# CONFIG_AMD_IOMMU_STATS is not set
-CONFIG_AMD_IOMMU_V2=m
-CONFIG_DMAR_TABLE=y
-CONFIG_INTEL_IOMMU=y
-CONFIG_INTEL_IOMMU_SVM=y
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-CONFIG_IRQ_REMAP=y
-
-#
-# Remoteproc drivers
-#
-CONFIG_REMOTEPROC=m
-CONFIG_STE_MODEM_RPROC=m
-
-#
-# Rpmsg drivers
-#
-
-#
-# SOC (System On Chip) specific Drivers
-#
-# CONFIG_SUNXI_SRAM is not set
-# CONFIG_SOC_TI is not set
-CONFIG_PM_DEVFREQ=y
-
-#
-# DEVFREQ Governors
-#
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
-CONFIG_DEVFREQ_GOV_PERFORMANCE=y
-CONFIG_DEVFREQ_GOV_POWERSAVE=y
-CONFIG_DEVFREQ_GOV_USERSPACE=y
-
-#
-# DEVFREQ Drivers
-#
-CONFIG_PM_DEVFREQ_EVENT=y
-CONFIG_EXTCON=m
-
-#
-# Extcon Device Drivers
-#
-CONFIG_EXTCON_ADC_JACK=m
-CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_RT8973A=m
-CONFIG_EXTCON_SM5502=m
-CONFIG_EXTCON_USB_GPIO=m
-CONFIG_MEMORY=y
-CONFIG_IIO=m
-CONFIG_IIO_BUFFER=y
-# CONFIG_IIO_BUFFER_CB is not set
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
-CONFIG_IIO_TRIGGER=y
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-
-#
-# Accelerometers
-#
-CONFIG_BMA180=m
-CONFIG_BMC150_ACCEL=m
-CONFIG_BMC150_ACCEL_I2C=m
-CONFIG_HID_SENSOR_ACCEL_3D=m
-CONFIG_IIO_ST_ACCEL_3AXIS=m
-CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
-CONFIG_KXCJK1013=m
-CONFIG_MMA8452=m
-CONFIG_MMA9551_CORE=m
-CONFIG_MMA9551=m
-CONFIG_MMA9553=m
-CONFIG_MXC4005=m
-CONFIG_STK8312=m
-CONFIG_STK8BA50=m
-
-#
-# Analog to digital converters
-#
-CONFIG_AD7291=m
-CONFIG_AD799X=m
-CONFIG_CC10001_ADC=m
-CONFIG_MAX1363=m
-CONFIG_MCP3422=m
-CONFIG_NAU7802=m
-CONFIG_TI_ADC081C=m
-CONFIG_TI_AM335X_ADC=m
-CONFIG_VIPERBOARD_ADC=m
-
-#
-# Amplifiers
-#
-
-#
-# Chemical Sensors
-#
-# CONFIG_VZ89X is not set
-
-#
-# Hid Sensor IIO Common
-#
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-CONFIG_IIO_MS_SENSORS_I2C=m
-
-#
-# SSP Sensor Common
-#
-CONFIG_IIO_ST_SENSORS_I2C=m
-CONFIG_IIO_ST_SENSORS_CORE=m
-
-#
-# Digital to analog converters
-#
-CONFIG_AD5064=m
-CONFIG_AD5380=m
-CONFIG_AD5446=m
-CONFIG_M62332=m
-CONFIG_MAX517=m
-CONFIG_MCP4725=m
-
-#
-# Frequency Synthesizers DDS/PLL
-#
-
-#
-# Clock Generator/Distribution
-#
-
-#
-# Phase-Locked Loop (PLL) frequency synthesizers
-#
-
-#
-# Digital gyroscope sensors
-#
-CONFIG_BMG160=m
-CONFIG_BMG160_I2C=m
-CONFIG_HID_SENSOR_GYRO_3D=m
-CONFIG_IIO_ST_GYRO_3AXIS=m
-CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
-CONFIG_ITG3200=m
-
-#
-# Humidity sensors
-#
-CONFIG_DHT11=m
-CONFIG_HDC100X=m
-CONFIG_HTU21=m
-CONFIG_SI7005=m
-CONFIG_SI7020=m
-
-#
-# Inertial measurement units
-#
-CONFIG_KMX61=m
-CONFIG_INV_MPU6050_IIO=m
-
-#
-# Light sensors
-#
-CONFIG_ACPI_ALS=m
-CONFIG_ADJD_S311=m
-CONFIG_AL3320A=m
-CONFIG_APDS9300=m
-CONFIG_APDS9960=m
-CONFIG_BH1750=m
-CONFIG_CM32181=m
-CONFIG_CM3232=m
-CONFIG_CM3323=m
-CONFIG_CM36651=m
-CONFIG_GP2AP020A00F=m
-CONFIG_ISL29125=m
-CONFIG_HID_SENSOR_ALS=m
-CONFIG_HID_SENSOR_PROX=m
-CONFIG_JSA1212=m
-CONFIG_RPR0521=m
-CONFIG_SENSORS_LM3533=m
-CONFIG_LTR501=m
-CONFIG_OPT3001=m
-CONFIG_PA12203001=m
-CONFIG_STK3310=m
-CONFIG_TCS3414=m
-CONFIG_TCS3472=m
-CONFIG_SENSORS_TSL2563=m
-CONFIG_TSL4531=m
-CONFIG_US5182D=m
-CONFIG_VCNL4000=m
-
-#
-# Magnetometer sensors
-#
-CONFIG_AK8975=m
-CONFIG_AK09911=m
-CONFIG_BMC150_MAGN=m
-CONFIG_MAG3110=m
-CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
-CONFIG_MMC35240=m
-CONFIG_IIO_ST_MAGN_3AXIS=m
-CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
-
-#
-# Inclinometer sensors
-#
-CONFIG_HID_SENSOR_INCLINOMETER_3D=m
-CONFIG_HID_SENSOR_DEVICE_ROTATION=m
-
-#
-# Triggers - standalone
-#
-CONFIG_IIO_INTERRUPT_TRIGGER=m
-CONFIG_IIO_SYSFS_TRIGGER=m
-
-#
-# Digital potentiometers
-#
-CONFIG_MCP4531=m
-
-#
-# Pressure sensors
-#
-CONFIG_BMP280=m
-CONFIG_HID_SENSOR_PRESS=m
-CONFIG_MPL115=m
-CONFIG_MPL3115=m
-CONFIG_MS5611=m
-CONFIG_MS5611_I2C=m
-CONFIG_MS5637=m
-CONFIG_IIO_ST_PRESS=m
-CONFIG_IIO_ST_PRESS_I2C=m
-CONFIG_T5403=m
-
-#
-# Lightning sensors
-#
-
-#
-# Proximity sensors
-#
-# CONFIG_LIDAR_LITE_V2 is not set
-CONFIG_SX9500=m
-
-#
-# Temperature sensors
-#
-CONFIG_MLX90614=m
-CONFIG_TMP006=m
-CONFIG_TSYS01=m
-CONFIG_TSYS02D=m
-CONFIG_NTB=m
-CONFIG_NTB_INTEL=m
-CONFIG_NTB_PINGPONG=m
-CONFIG_NTB_TOOL=m
-CONFIG_NTB_TRANSPORT=m
-# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
-# CONFIG_IPACK_BUS is not set
-CONFIG_RESET_CONTROLLER=y
-CONFIG_FMC=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
-CONFIG_FMC_CHARDEV=m
-
-#
-# PHY Subsystem
-#
-CONFIG_GENERIC_PHY=y
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_TUSB1210 is not set
-CONFIG_POWERCAP=y
-CONFIG_INTEL_RAPL=m
-# CONFIG_MCB is not set
-
-#
-# Performance monitor support
-#
-CONFIG_RAS=y
-# CONFIG_AMD_MCE_INJ is not set
-CONFIG_THUNDERBOLT=m
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-CONFIG_LIBNVDIMM=y
-CONFIG_BLK_DEV_PMEM=m
-CONFIG_ND_BLK=m
-CONFIG_ND_CLAIM=y
-CONFIG_ND_BTT=m
-CONFIG_BTT=y
-CONFIG_NVMEM=m
-CONFIG_STM=m
-CONFIG_STM_DUMMY=m
-CONFIG_STM_SOURCE_CONSOLE=m
-CONFIG_INTEL_TH=m
-CONFIG_INTEL_TH_PCI=m
-CONFIG_INTEL_TH_GTH=m
-CONFIG_INTEL_TH_STH=m
-CONFIG_INTEL_TH_MSU=m
-CONFIG_INTEL_TH_PTI=m
-# CONFIG_INTEL_TH_DEBUG is not set
-
-#
-# FPGA Configuration Support
-#
-# CONFIG_FPGA is not set
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-CONFIG_EDD_OFF=y
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=m
-CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
-CONFIG_ISCSI_IBFT_FIND=y
-CONFIG_ISCSI_IBFT=m
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-CONFIG_EFI_RUNTIME_MAP=y
-# CONFIG_EFI_FAKE_MEMMAP is not set
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_UEFI_CPER=y
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=m
-CONFIG_EXT4_FS_ENCRYPTION=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-# CONFIG_OCFS2_FS_STATS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-# CONFIG_F2FS_FS_SECURITY is not set
-# CONFIG_F2FS_CHECK_FS is not set
-CONFIG_F2FS_FS_ENCRYPTION=y
-# CONFIG_F2FS_IO_TRACE is not set
-CONFIG_FS_DAX=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_QUOTACTL_COMPAT=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_OVERLAY_FS=m
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-# CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_PROC_CHILDREN=y
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_CONFIGFS_FS=y
-CONFIG_EFIVAR_FS=m
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_ADFS_FS=m
-# CONFIG_ADFS_FS_RW is not set
-CONFIG_AFFS_FS=m
-CONFIG_ECRYPT_FS=m
-CONFIG_ECRYPT_FS_MESSAGING=y
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-# CONFIG_HFSPLUS_FS_POSIX_ACL is not set
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-CONFIG_BFS_FS=m
-CONFIG_EFS_FS=m
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_ATIME_SUPPORT=y
-CONFIG_LOGFS=m
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-CONFIG_SQUASHFS_DECOMP_MULTI=y
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-CONFIG_SQUASHFS_EMBEDDED=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_VXFS_FS=m
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-CONFIG_HPFS_FS=m
-CONFIG_QNX4FS_FS=m
-CONFIG_QNX6FS_FS=m
-# CONFIG_QNX6FS_DEBUG is not set
-CONFIG_ROMFS_FS=y
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
-CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_PSTORE=y
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-# CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EXOFS_FS=m
-# CONFIG_EXOFS_DEBUG is not set
-CONFIG_ORE=m
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V2=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
-CONFIG_NFS_SWAP=y
-# CONFIG_NFS_V4_1 is not set
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-# CONFIG_NFSD_V4_SECURITY_LABEL is not set
-# CONFIG_NFSD_FAULT_INJECTION is not set
-CONFIG_GRACE_PERIOD=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_SUNRPC_SWAP=y
-CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_SUNRPC_DEBUG is not set
-CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CEPH_FS_POSIX_ACL=y
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-# CONFIG_CIFS_UPCALL is not set
-# CONFIG_CIFS_XATTR is not set
-CONFIG_CIFS_DEBUG=y
-# CONFIG_CIFS_DEBUG2 is not set
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_SMB2=y
-# CONFIG_CIFS_SMB311 is not set
-CONFIG_CIFS_FSCACHE=y
-CONFIG_NCP_FS=m
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCPFS_STRONG=y
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-# CONFIG_AFS_FSCACHE is not set
-CONFIG_9P_FS=m
-# CONFIG_9P_FSCACHE is not set
-# CONFIG_9P_FS_POSIX_ACL is not set
-# CONFIG_9P_FS_SECURITY is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-CONFIG_ENABLE_WARN_DEPRECATED=y
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=0
-CONFIG_STRIP_ASM_SYMS=y
-# CONFIG_READABLE_ASM is not set
-CONFIG_UNUSED_SYMBOLS=y
-# CONFIG_PAGE_OWNER is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_DEBUG_KERNEL=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-CONFIG_HAVE_ARCH_KASAN=y
-# CONFIG_KASAN is not set
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Lockups and Hangs
-#
-# CONFIG_LOCKUP_DETECTOR is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-# CONFIG_TIMER_STATS is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_PI_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_PROVE_RCU is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_TORTURE_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_FENTRY=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
-CONFIG_BLK_DEV_IO_TRACE=y
-# CONFIG_UPROBE_EVENT is not set
-# CONFIG_PROBE_EVENTS is not set
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_MMIOTRACE is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-CONFIG_RING_BUFFER_BENCHMARK=m
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_TRACE_ENUM_MAP_FILE is not set
-# CONFIG_TRACING_EVENTS_GPIO is not set
-
-#
-# Runtime Testing
-#
-# CONFIG_LKDTM is not set
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_PERCPU_TEST is not set
-CONFIG_ATOMIC64_SELFTEST=y
-CONFIG_ASYNC_RAID6_TEST=m
-CONFIG_TEST_HEXDUMP=m
-# CONFIG_TEST_STRING_HELPERS is not set
-# CONFIG_TEST_KSTRTOX is not set
-# CONFIG_TEST_PRINTF is not set
-# CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_HASH is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_TEST_LKM=m
-CONFIG_TEST_USER_COPY=m
-CONFIG_TEST_BPF=m
-CONFIG_TEST_FIRMWARE=m
-CONFIG_TEST_UDELAY=m
-CONFIG_MEMTEST=y
-# CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-CONFIG_EARLY_PRINTK_EFI=y
-# CONFIG_X86_PTDUMP_CORE is not set
-# CONFIG_X86_PTDUMP is not set
-# CONFIG_EFI_PGT_DUMP is not set
-CONFIG_DEBUG_RODATA=y
-CONFIG_DEBUG_RODATA_TEST=y
-# CONFIG_DEBUG_WX is not set
-# CONFIG_DEBUG_SET_MODULE_RONX is not set
-# CONFIG_DEBUG_NX_TEST is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_IOMMU_DEBUG is not set
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-# CONFIG_X86_DECODER_SELFTEST is not set
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_ENTRY is not set
-# CONFIG_DEBUG_NMI_SELFTEST is not set
-CONFIG_X86_DEBUG_FPU=y
-# CONFIG_PUNIT_ATOM_DEBUG is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_COMPAT=y
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_SECURITY_DMESG_RESTRICT=y
-CONFIG_SECURITY=y
-CONFIG_PAGE_TABLE_ISOLATION=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
-# CONFIG_SECURITY_PATH is not set
-# CONFIG_INTEL_TXT is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-# CONFIG_SECURITY_APPARMOR is not set
-# CONFIG_SECURITY_YAMA is not set
-# CONFIG_INTEGRITY is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_XOR_BLOCKS=y
-CONFIG_ASYNC_CORE=y
-CONFIG_ASYNC_MEMCPY=y
-CONFIG_ASYNC_XOR=y
-CONFIG_ASYNC_PQ=y
-CONFIG_ASYNC_RAID6_RECOV=y
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_PCOMP=m
-CONFIG_CRYPTO_PCOMP2=y
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=m
-CONFIG_CRYPTO_RSA=m
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_MCRYPTD=m
-CONFIG_CRYPTO_AUTHENC=y
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER=y
-CONFIG_CRYPTO_GLUE_HELPER_X86=y
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=y
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_PCBC=y
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32C_INTEL=y
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
-CONFIG_CRYPTO_GHASH=y
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_POLY1305_X86_64=m
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=y
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_SSSE3=m
-CONFIG_CRYPTO_SHA256_SSSE3=m
-CONFIG_CRYPTO_SHA512_SSSE3=m
-CONFIG_CRYPTO_SHA1_MB=m
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_TGR192=y
-CONFIG_CRYPTO_WP512=y
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_X86_64=y
-CONFIG_CRYPTO_AES_NI_INTEL=y
-CONFIG_CRYPTO_ANUBIS=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_BLOWFISH_COMMON=y
-CONFIG_CRYPTO_BLOWFISH_X86_64=m
-CONFIG_CRYPTO_CAMELLIA=y
-CONFIG_CRYPTO_CAMELLIA_X86_64=y
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
-CONFIG_CRYPTO_CAST_COMMON=y
-CONFIG_CRYPTO_CAST5=y
-CONFIG_CRYPTO_CAST5_AVX_X86_64=m
-CONFIG_CRYPTO_CAST6=y
-CONFIG_CRYPTO_CAST6_AVX_X86_64=m
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_DES3_EDE_X86_64=m
-CONFIG_CRYPTO_FCRYPT=y
-CONFIG_CRYPTO_KHAZAD=y
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_X86_64=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_CHACHA20_X86_64=m
-CONFIG_CRYPTO_SEED=y
-CONFIG_CRYPTO_SERPENT=y
-CONFIG_CRYPTO_SERPENT_SSE2_X86_64=y
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
-CONFIG_CRYPTO_TEA=y
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRYPTO_TWOFISH_COMMON=y
-CONFIG_CRYPTO_TWOFISH_X86_64=y
-CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
-CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=y
-CONFIG_CRYPTO_DRBG_HMAC=y
-CONFIG_CRYPTO_DRBG_HASH=y
-CONFIG_CRYPTO_DRBG_CTR=y
-CONFIG_CRYPTO_DRBG=y
-CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-CONFIG_CRYPTO_HASH_INFO=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-CONFIG_CRYPTO_DEV_QAT=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-CONFIG_ASYMMETRIC_KEY_TYPE=m
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
-CONFIG_PUBLIC_KEY_ALGO_RSA=m
-CONFIG_X509_CERTIFICATE_PARSER=m
-CONFIG_PKCS7_MESSAGE_PARSER=m
-CONFIG_PKCS7_TEST_KEY=m
-
-#
-# Certificates for signature checking
-#
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_KVM_VFIO=y
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_KVM_COMPAT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_MMU_AUDIT=y
-CONFIG_KVM_DEVICE_ASSIGNMENT=y
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=y
-CONFIG_BITREVERSE=y
-# CONFIG_HAVE_ARCH_BITREVERSE is not set
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_IO=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=y
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=y
-CONFIG_CRC8=m
-# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_842_COMPRESS=m
-CONFIG_842_DECOMPRESS=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_BCH=m
-CONFIG_BCH_CONST_PARAMS=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_INTERVAL_TREE=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
-CONFIG_LRU_CACHE=m
-CONFIG_CLZ_TAB=y
-CONFIG_CORDIC=m
-# CONFIG_DDR is not set
-CONFIG_MPILIB=m
-CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_6x10 is not set
-CONFIG_FONT_SUN8x16=y
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-# CONFIG_SG_SPLIT is not set
-CONFIG_ARCH_HAS_SG_CHAIN=y
-CONFIG_ARCH_HAS_PMEM_API=y
-CONFIG_ARCH_HAS_MMIO_FLUSH=y
diff --git a/system/xen/dom0/config-5.15.139-xen.x86_64 b/system/xen/dom0/config-5.15.139-xen.x86_64
new file mode 100644
index 0000000000..b5c74fb8ff
--- /dev/null
+++ b/system/xen/dom0/config-5.15.139-xen.x86_64
@@ -0,0 +1,10307 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86 5.15.139 Kernel Configuration
+#
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=110200
+CONFIG_CLANG_VERSION=0
+CONFIG_AS_IS_GNU=y
+CONFIG_AS_VERSION=23700
+CONFIG_LD_IS_BFD=y
+CONFIG_LD_VERSION=23700
+CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
+CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
+CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
+CONFIG_PAHOLE_VERSION=0
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_TABLE_SORT=y
+CONFIG_THREAD_INFO_IN_TASK=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_COMPILE_TEST is not set
+# CONFIG_WERROR is not set
+CONFIG_LOCALVERSION="-xen"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+CONFIG_HAVE_KERNEL_ZSTD=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+# CONFIG_KERNEL_ZSTD is not set
+CONFIG_DEFAULT_INIT=""
+CONFIG_DEFAULT_HOSTNAME="darkstar"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_WATCH_QUEUE=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_USELIB is not set
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_GENERIC_IRQ_INJECTION=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_IRQ_MSI_IOMMU=y
+CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
+CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_ARCH_CLOCKSOURCE_INIT=y
+CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y
+CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
+CONFIG_BPF=y
+CONFIG_HAVE_EBPF_JIT=y
+CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
+
+#
+# BPF subsystem
+#
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_BPF_JIT_DEFAULT_ON=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
+CONFIG_USERMODE_DRIVER=y
+CONFIG_BPF_PRELOAD=y
+CONFIG_BPF_PRELOAD_UMD=m
+CONFIG_BPF_LSM=y
+# end of BPF subsystem
+
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
+CONFIG_PREEMPTION=y
+CONFIG_PREEMPT_DYNAMIC=y
+CONFIG_SCHED_CORE=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_HAVE_SCHED_AVG_IRQ=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+# CONFIG_PSI_DEFAULT_DISABLED is not set
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+CONFIG_PREEMPT_RCU=y
+CONFIG_RCU_EXPERT=y
+CONFIG_SRCU=y
+CONFIG_TREE_SRCU=y
+CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_TASKS_RCU=y
+CONFIG_TASKS_RUDE_RCU=y
+CONFIG_TASKS_TRACE_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT_LEAF=16
+CONFIG_RCU_FAST_NO_HZ=y
+# CONFIG_RCU_BOOST is not set
+CONFIG_RCU_NOCB_CPU=y
+# CONFIG_TASKS_TRACE_RCU_READ_MB is not set
+# end of RCU Subsystem
+
+CONFIG_BUILD_BIN2C=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_IKHEADERS=m
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
+# CONFIG_PRINTK_INDEX is not set
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
+CONFIG_CC_HAS_INT128=y
+CONFIG_ARCH_SUPPORTS_INT128=y
+# CONFIG_NUMA_BALANCING is not set
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
+CONFIG_CGROUP_FREEZER=y
+# CONFIG_CGROUP_HUGETLB is not set
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_CGROUP_MISC=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_TIME_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_RD_ZSTD=y
+CONFIG_BOOT_CONFIG=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_LD_ORPHAN_WARN=y
+CONFIG_SYSCTL=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+CONFIG_SGETMASK_SYSCALL=y
+CONFIG_SYSFS_SYSCALL=y
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_HAVE_ARCH_USERFAULTFD_WP=y
+CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_USERFAULTFD=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+# CONFIG_PC104 is not set
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+CONFIG_64BIT=y
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=28
+CONFIG_ARCH_MMAP_RND_BITS_MAX=32
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_FILTER_PGPROT=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_NR_GPIO=1024
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_64_SMP=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_DYNAMIC_PHYSICAL_MASK=y
+CONFIG_PGTABLE_LEVELS=4
+CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
+
+#
+# Processor type and features
+#
+CONFIG_SMP=y
+CONFIG_X86_FEATURE_NAMES=y
+CONFIG_X86_X2APIC=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_GOLDFISH is not set
+CONFIG_X86_CPU_RESCTRL=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_X86_INTEL_LPSS=y
+CONFIG_X86_AMD_PLATFORM_DEVICE=y
+CONFIG_IOSF_MBI=y
+# CONFIG_IOSF_MBI_DEBUG is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_XXL=y
+# CONFIG_PARAVIRT_DEBUG is not set
+CONFIG_PARAVIRT_SPINLOCKS=y
+CONFIG_X86_HV_CALLBACK_VECTOR=y
+CONFIG_XEN=y
+CONFIG_XEN_PV=y
+CONFIG_XEN_512GB=y
+CONFIG_XEN_PV_SMP=y
+CONFIG_XEN_PV_DOM0=y
+CONFIG_XEN_PVHVM=y
+CONFIG_XEN_PVHVM_SMP=y
+CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_SAVE_RESTORE=y
+# CONFIG_XEN_DEBUG_FS is not set
+CONFIG_XEN_PVH=y
+CONFIG_XEN_DOM0=y
+CONFIG_KVM_GUEST=y
+CONFIG_ARCH_CPUIDLE_HALTPOLL=y
+CONFIG_PVH=y
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_PARAVIRT_CLOCK=y
+# CONFIG_JAILHOUSE_GUEST is not set
+CONFIG_ACRN_GUEST=y
+# CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_IA32_FEAT_CTL=y
+CONFIG_X86_VMX_FEATURE_NAMES=y
+# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_HYGON=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_ZHAOXIN=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS_RANGE_BEGIN=2
+CONFIG_NR_CPUS_RANGE_END=512
+CONFIG_NR_CPUS_DEFAULT=64
+CONFIG_NR_CPUS=256
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_MC_PRIO=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCELOG_LEGACY=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE_INJECT=m
+
+#
+# Performance monitoring
+#
+CONFIG_PERF_EVENTS_INTEL_UNCORE=y
+CONFIG_PERF_EVENTS_INTEL_RAPL=m
+CONFIG_PERF_EVENTS_INTEL_CSTATE=m
+CONFIG_PERF_EVENTS_AMD_POWER=m
+CONFIG_PERF_EVENTS_AMD_UNCORE=y
+# end of Performance monitoring
+
+CONFIG_X86_16BIT=y
+CONFIG_X86_ESPFIX64=y
+CONFIG_X86_VSYSCALL_EMULATION=y
+CONFIG_X86_IOPL_IOPERM=y
+CONFIG_I8K=m
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+# CONFIG_MICROCODE_LATE_LOADING is not set
+CONFIG_X86_MSR=y
+CONFIG_X86_CPUID=y
+# CONFIG_X86_5LEVEL is not set
+CONFIG_X86_DIRECT_GBPAGES=y
+CONFIG_X86_CPA_STATISTICS=y
+CONFIG_AMD_MEM_ENCRYPT=y
+# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set
+CONFIG_NUMA=y
+CONFIG_AMD_NUMA=y
+CONFIG_X86_64_ACPI_NUMA=y
+# CONFIG_NUMA_EMU is not set
+CONFIG_NODES_SHIFT=6
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_X86_PMEM_LEGACY_DEVICE=y
+CONFIG_X86_PMEM_LEGACY=y
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
+CONFIG_X86_UMIP=y
+CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
+CONFIG_X86_SGX=y
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_EFI_MIXED=y
+CONFIG_HZ_100=y
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=100
+CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
+CONFIG_KEXEC_FILE=y
+CONFIG_ARCH_HAS_KEXEC_PURGATORY=y
+CONFIG_KEXEC_SIG=y
+# CONFIG_KEXEC_SIG_FORCE is not set
+CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
+CONFIG_CRASH_DUMP=y
+CONFIG_KEXEC_JUMP=y
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_X86_NEED_RELOCS=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_DYNAMIC_MEMORY_LAYOUT=y
+CONFIG_RANDOMIZE_MEMORY=y
+CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
+CONFIG_LEGACY_VSYSCALL_EMULATE=y
+# CONFIG_LEGACY_VSYSCALL_XONLY is not set
+# CONFIG_LEGACY_VSYSCALL_NONE is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_MODIFY_LDT_SYSCALL=y
+CONFIG_HAVE_LIVEPATCH=y
+CONFIG_LIVEPATCH=y
+# end of Processor type and features
+
+CONFIG_CC_HAS_RETURN_THUNK=y
+CONFIG_SPECULATION_MITIGATIONS=y
+CONFIG_PAGE_TABLE_ISOLATION=y
+CONFIG_RETPOLINE=y
+CONFIG_RETHUNK=y
+CONFIG_CPU_UNRET_ENTRY=y
+CONFIG_CPU_IBPB_ENTRY=y
+CONFIG_CPU_IBRS_ENTRY=y
+CONFIG_CPU_SRSO=y
+# CONFIG_GDS_FORCE_MITIGATION is not set
+CONFIG_ARCH_HAS_ADD_PAGES=y
+CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
+CONFIG_PM_STD_PARTITION="\"\""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+# CONFIG_ENERGY_MODEL is not set
+CONFIG_ARCH_SUPPORTS_ACPI=y
+CONFIG_ACPI=y
+CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
+CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
+CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
+# CONFIG_ACPI_DEBUGGER is not set
+CONFIG_ACPI_SPCR_TABLE=y
+CONFIG_ACPI_FPDT=y
+CONFIG_ACPI_LPIT=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+# CONFIG_ACPI_TINY_POWER_BUTTON is not set
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_TAD=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_CPU_FREQ_PSS=y
+CONFIG_ACPI_PROCESSOR_CSTATE=y
+CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_CPPC_LIB=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+CONFIG_ACPI_PLATFORM_PROFILE=m
+CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
+CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_HOTPLUG_IOAPIC=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=y
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+CONFIG_ACPI_BGRT=y
+# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+CONFIG_ACPI_NFIT=m
+# CONFIG_NFIT_SECURITY_DEBUG is not set
+CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_HMAT=y
+CONFIG_HAVE_ACPI_APEI=y
+CONFIG_HAVE_ACPI_APEI_NMI=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_ACPI_DPTF=y
+CONFIG_DPTF_POWER=m
+CONFIG_DPTF_PCH_FIVR=m
+CONFIG_ACPI_WATCHDOG=y
+CONFIG_ACPI_EXTLOG=m
+CONFIG_ACPI_ADXL=y
+CONFIG_ACPI_CONFIGFS=m
+CONFIG_PMIC_OPREGION=y
+CONFIG_BXT_WC_PMIC_OPREGION=y
+CONFIG_CHT_DC_TI_PMIC_OPREGION=y
+# CONFIG_TPS68470_PMIC_OPREGION is not set
+CONFIG_ACPI_VIOT=y
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_PRMT=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+# end of CPU Frequency scaling
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_CPU_IDLE_GOV_TEO is not set
+# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set
+CONFIG_HALTPOLL_CPUIDLE=y
+# end of CPU Idle
+
+CONFIG_INTEL_IDLE=y
+# end of Power management and ACPI options
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_XEN=y
+CONFIG_MMCONF_FAM10H=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_ISA_BUS is not set
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+# end of Bus options (PCI etc.)
+
+#
+# Binary Emulations
+#
+CONFIG_IA32_EMULATION=y
+CONFIG_X86_X32=y
+CONFIG_COMPAT_32=y
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+# end of Binary Emulations
+
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_KVM_COMPAT=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_NO_POLL=y
+CONFIG_KVM_XFER_TO_GUEST_WORK=y
+CONFIG_HAVE_KVM_PM_NOTIFIER=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+# CONFIG_KVM_WERROR is not set
+CONFIG_KVM_INTEL=m
+CONFIG_X86_SGX_KVM=y
+CONFIG_KVM_AMD=m
+CONFIG_KVM_AMD_SEV=y
+CONFIG_KVM_XEN=y
+CONFIG_KVM_MMU_AUDIT=y
+CONFIG_AS_AVX512=y
+CONFIG_AS_SHA1_NI=y
+CONFIG_AS_SHA256_NI=y
+CONFIG_AS_TPAUSE=y
+
+#
+# General architecture-dependent options
+#
+CONFIG_CRASH_CORE=y
+CONFIG_KEXEC_CORE=y
+CONFIG_HOTPLUG_SMT=y
+CONFIG_GENERIC_ENTRY=y
+# CONFIG_KPROBES is not set
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+# CONFIG_STATIC_CALL_SELFTEST is not set
+CONFIG_UPROBES=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
+CONFIG_HAVE_NMI=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
+CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
+CONFIG_ARCH_WANTS_NO_INSTR=y
+CONFIG_HAVE_ASM_MODVERSIONS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
+CONFIG_MMU_GATHER_TABLE_FREE=y
+CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_HAVE_ARCH_SECCOMP=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
+CONFIG_HAVE_ARCH_STACKLEAK=y
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
+CONFIG_LTO_NONE=y
+CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_CONTEXT_TRACKING_OFFSTACK=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PUD=y
+CONFIG_HAVE_MOVE_PMD=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_HAVE_EXIT_THREAD=y
+CONFIG_ARCH_MMAP_RND_BITS=28
+CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
+CONFIG_HAVE_STACK_VALIDATION=y
+CONFIG_HAVE_RELIABLE_STACKTRACE=y
+CONFIG_ISA_BUS_API=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
+CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
+# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+CONFIG_ARCH_HAS_CC_PLATFORM=y
+CONFIG_HAVE_STATIC_CALL=y
+CONFIG_HAVE_STATIC_CALL_INLINE=y
+CONFIG_HAVE_PREEMPT_DYNAMIC=y
+CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_ARCH_HAS_ELFCORE_COMPAT=y
+CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_HAVE_GCC_PLUGINS=y
+CONFIG_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+CONFIG_MODULE_COMPRESS_NONE=y
+# CONFIG_MODULE_COMPRESS_GZIP is not set
+# CONFIG_MODULE_COMPRESS_XZ is not set
+# CONFIG_MODULE_COMPRESS_ZSTD is not set
+CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y
+CONFIG_MODPROBE_PATH="/sbin/modprobe"
+# CONFIG_TRIM_UNUSED_KSYMS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_BLK_RQ_ALLOC_TIME=y
+CONFIG_BLK_CGROUP_RWSTAT=y
+CONFIG_BLK_DEV_BSG_COMMON=y
+CONFIG_BLK_DEV_BSGLIB=y
+CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_INTEGRITY_T10=y
+CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
+CONFIG_BLK_WBT=y
+CONFIG_BLK_WBT_MQ=y
+CONFIG_BLK_CGROUP_IOLATENCY=y
+# CONFIG_BLK_CGROUP_FC_APPID is not set
+CONFIG_BLK_CGROUP_IOCOST=y
+# CONFIG_BLK_CGROUP_IOPRIO is not set
+CONFIG_BLK_DEBUG_FS=y
+CONFIG_BLK_DEBUG_FS_ZONED=y
+CONFIG_BLK_SED_OPAL=y
+CONFIG_BLK_INLINE_ENCRYPTION=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+# CONFIG_LDM_PARTITION is not set
+CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
+# end of Partition Types
+
+CONFIG_BLOCK_COMPAT=y
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_MQ_RDMA=y
+CONFIG_BLK_PM=y
+CONFIG_BLOCK_HOLDER_DEPRECATED=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_IOSCHED_BFQ=m
+CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=y
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
+CONFIG_QUEUED_SPINLOCKS=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
+CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
+CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
+CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ELFCORE=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_NUMA_KEEP_MEMINFO=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_HAVE_BOOTMEM_INFO_NODE=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_MHP_MEMMAP_ON_MEMORY=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_PAGE_REPORTING=y
+CONFIG_MIGRATION=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=98304
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_ARCH_WANTS_THP_SWAP=y
+CONFIG_THP_SWAP=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_SYSFS=y
+CONFIG_CMA_AREAS=7
+# CONFIG_MEM_SOFT_DIRTY is not set
+CONFIG_ZSWAP=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set
+# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"
+CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set
+# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set
+CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud"
+# CONFIG_ZSWAP_DEFAULT_ON is not set
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=y
+CONFIG_Z3FOLD=y
+CONFIG_ZSMALLOC=y
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
+# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
+CONFIG_ARCH_HAS_ZONE_DMA_SET=y
+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA32=y
+CONFIG_ZONE_DEVICE=y
+CONFIG_DEV_PAGEMAP_OPS=y
+CONFIG_HMM_MIRROR=y
+CONFIG_DEVICE_PRIVATE=y
+CONFIG_VMAP_PFN=y
+CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
+CONFIG_ARCH_HAS_PKEYS=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_TEST is not set
+# CONFIG_READ_ONLY_THP_FOR_FS is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_MAPPING_DIRTY_HELPERS=y
+CONFIG_SECRETMEM=y
+
+#
+# Data Access Monitoring
+#
+# CONFIG_DAMON is not set
+# end of Data Access Monitoring
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_NET_REDIRECT=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
+CONFIG_AF_UNIX_OOB=y
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+# CONFIG_TLS_DEVICE is not set
+# CONFIG_TLS_TOE is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_OFFLOAD=y
+CONFIG_XFRM_ALGO=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_USER_COMPAT is not set
+# CONFIG_XFRM_INTERFACE is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_AH=m
+CONFIG_XFRM_ESP=m
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_XFRM_ESPINTCP=y
+# CONFIG_SMC is not set
+CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=m
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE_COMMON=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_FOU=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_ESP_OFFLOAD=m
+CONFIG_INET_ESPINTCP=y
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_TABLE_PERTURB_ORDER=16
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=m
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_ESP_OFFLOAD=m
+CONFIG_INET6_ESPINTCP=y
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+# CONFIG_IPV6_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_FOU_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+# CONFIG_IPV6_MROUTE is not set
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_RPL_LWTUNNEL=y
+# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
+# CONFIG_NETLABEL is not set
+CONFIG_MPTCP=y
+CONFIG_INET_MPTCP_DIAG=m
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NET_PTP_CLASSIFY=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_NETLINK_HOOK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_NETLINK_OSF=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_SYSLOG=m
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_OBJREF=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XTABLES_COMPAT=y
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_TWOS=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_BPFILTER is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+# CONFIG_IP_DCCP_CCID3 is not set
+# end of DCCP CCIDs Configuration
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TIPC_CRYPTO=y
+CONFIG_TIPC_DIAG=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_BRIDGE_MRP=y
+CONFIG_BRIDGE_CFM=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_AR9331=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_LEGACY=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_HELLCREEK=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA_COMMON=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_RTL4_A=m
+CONFIG_NET_DSA_TAG_OCELOT=m
+CONFIG_NET_DSA_TAG_OCELOT_8021Q=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
+CONFIG_NET_DSA_TAG_XRS700X=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_PHONET is not set
+CONFIG_6LOWPAN=m
+CONFIG_6LOWPAN_DEBUGFS=y
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
+CONFIG_6LOWPAN_GHC_UDP=m
+CONFIG_6LOWPAN_GHC_ICMPV6=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
+CONFIG_IEEE802154=m
+# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_SCH_ETS=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_SAMPLE=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_MPLS=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_ACT_CT=m
+CONFIG_NET_ACT_GATE=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+CONFIG_NET_TC_SKB_EXT=y
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BATMAN_V=y
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_TRACING=y
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VSOCKETS_LOOPBACK=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_HYPERV_VSOCKETS=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
+CONFIG_HSR=m
+CONFIG_NET_SWITCHDEV=y
+CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_QRTR=m
+CONFIG_QRTR_SMD=m
+CONFIG_QRTR_TUN=m
+CONFIG_QRTR_MHI=m
+# CONFIG_NET_NCSI is not set
+CONFIG_PCPU_DEV_REFCNT=y
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=y
+CONFIG_XPS=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+CONFIG_BPF_STREAM_PARSER=y
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+# end of Network testing
+# end of Networking options
+
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+# end of AX.25 network device drivers
+
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+CONFIG_CAN_J1939=m
+CONFIG_CAN_ISOTP=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_VXCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_CAN_KVASER_PCIEFD=m
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+CONFIG_CAN_C_CAN_PCI=m
+CONFIG_CAN_CC770=m
+CONFIG_CAN_CC770_ISA=m
+CONFIG_CAN_CC770_PLATFORM=m
+CONFIG_CAN_IFI_CANFD=m
+CONFIG_CAN_M_CAN=m
+CONFIG_CAN_M_CAN_PCI=m
+CONFIG_CAN_M_CAN_PLATFORM=m
+# CONFIG_CAN_M_CAN_TCAN4X5X is not set
+CONFIG_CAN_PEAK_PCIEFD=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_EMS_PCMCIA=m
+CONFIG_CAN_F81601=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_PEAK_PCMCIA=m
+CONFIG_CAN_PLX_PCI=m
+CONFIG_CAN_SJA1000_ISA=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
+
+#
+# CAN SPI interfaces
+#
+# CONFIG_CAN_HI311X is not set
+# CONFIG_CAN_MCP251X is not set
+# CONFIG_CAN_MCP251XFD is not set
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_ETAS_ES58X=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+CONFIG_CAN_MCBA_USB=m
+CONFIG_CAN_PEAK_USB=m
+# CONFIG_CAN_UCAN is not set
+# end of CAN USB interfaces
+
+# CONFIG_CAN_DEBUG_DEVICES is not set
+# end of CAN Device Drivers
+
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_6LOWPAN=m
+CONFIG_BT_LEDS=y
+CONFIG_BT_MSFTEXT=y
+# CONFIG_BT_AOSPEXT is not set
+# CONFIG_BT_DEBUGFS is not set
+# CONFIG_BT_SELFTEST is not set
+# CONFIG_BT_FEATURE_DEBUG is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_QCA=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
+CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_MTK=y
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_SERDEV=y
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_NOKIA=m
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_RTL=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIUART_MRVL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_MTKSDIO=m
+CONFIG_BT_MTKUART=m
+CONFIG_BT_HCIRSI=m
+CONFIG_BT_VIRTIO=m
+# end of Bluetooth device drivers
+
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_DEBUG is not set
+# CONFIG_RXKAD is not set
+# CONFIG_AF_KCM is not set
+CONFIG_STREAM_PARSER=y
+# CONFIG_MCTP is not set
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_XEN is not set
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+# CONFIG_NFC_NCI_SPI is not set
+# CONFIG_NFC_NCI_UART is not set
+CONFIG_NFC_HCI=m
+# CONFIG_NFC_SHDLC is not set
+
+#
+# Near Field Communication (NFC) devices
+#
+# CONFIG_NFC_TRF7970A is not set
+# CONFIG_NFC_MEI_PHY is not set
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_VIRTUAL_NCI=m
+# CONFIG_NFC_FDP is not set
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
+CONFIG_NFC_PN532_UART=m
+CONFIG_NFC_MRVL=m
+CONFIG_NFC_MRVL_USB=m
+# CONFIG_NFC_MRVL_I2C is not set
+CONFIG_NFC_ST_NCI=m
+CONFIG_NFC_ST_NCI_I2C=m
+# CONFIG_NFC_ST_NCI_SPI is not set
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
+# CONFIG_NFC_S3FWRN5_I2C is not set
+# CONFIG_NFC_S3FWRN82_UART is not set
+# CONFIG_NFC_ST95HF is not set
+# end of Near Field Communication (NFC) devices
+
+CONFIG_PSAMPLE=m
+CONFIG_NET_IFE=m
+CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
+CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
+CONFIG_NET_SELFTESTS=m
+CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=m
+CONFIG_ETHTOOL_NETLINK=y
+
+#
+# Device Drivers
+#
+CONFIG_HAVE_EISA=y
+# CONFIG_EISA is not set
+CONFIG_HAVE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEAER_INJECT=m
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEASPM=y
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+CONFIG_PCIE_DPC=y
+CONFIG_PCIE_PTM=y
+CONFIG_PCIE_EDR=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+CONFIG_PCI_STUB=m
+CONFIG_PCI_PF_STUB=m
+CONFIG_XEN_PCIDEV_FRONTEND=y
+CONFIG_PCI_ATS=y
+CONFIG_PCI_LOCKLESS_CONFIG=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+CONFIG_PCI_P2PDMA=y
+CONFIG_PCI_LABEL=y
+CONFIG_PCI_HYPERV=m
+# CONFIG_PCIE_BUS_TUNE_OFF is not set
+CONFIG_PCIE_BUS_DEFAULT=y
+# CONFIG_PCIE_BUS_SAFE is not set
+# CONFIG_PCIE_BUS_PERFORMANCE is not set
+# CONFIG_PCIE_BUS_PEER2PEER is not set
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+# CONFIG_HOTPLUG_PCI_SHPC is not set
+
+#
+# PCI controller drivers
+#
+CONFIG_VMD=y
+CONFIG_PCI_HYPERV_INTERFACE=m
+
+#
+# DesignWare PCI Core Support
+#
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+# CONFIG_PCI_MESON is not set
+# end of DesignWare PCI Core Support
+
+#
+# Mobiveil PCIe Core Support
+#
+# end of Mobiveil PCIe Core Support
+
+#
+# Cadence PCIe controllers support
+#
+# end of Cadence PCIe controllers support
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
+CONFIG_CXL_BUS=y
+CONFIG_CXL_MEM=m
+# CONFIG_CXL_MEM_RAW_COMMANDS is not set
+CONFIG_CXL_ACPI=y
+CONFIG_CXL_PMEM=m
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+# CONFIG_RAPIDIO is not set
+
+#
+# Generic Driver Options
+#
+CONFIG_AUXILIARY_BUS=y
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
+CONFIG_FW_CACHE=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+CONFIG_HMEM_REPORTING=y
+CONFIG_TEST_ASYNC_DRIVER_PROBE=m
+CONFIG_SYS_HYPERVISOR=y
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_SPI=m
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SOUNDWIRE=m
+CONFIG_REGMAP_SOUNDWIRE_MBQ=m
+CONFIG_REGMAP_SCCB=m
+CONFIG_REGMAP_SPI_AVMM=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+CONFIG_MHI_BUS=m
+# CONFIG_MHI_BUS_DEBUG is not set
+CONFIG_MHI_BUS_PCI_GENERIC=m
+# end of Bus devices
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+
+#
+# Firmware Drivers
+#
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# end of ARM System Control and Management Interface Protocol
+
+CONFIG_EDD=m
+CONFIG_EDD_OFF=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+CONFIG_FW_CFG_SYSFS=m
+CONFIG_FW_CFG_SYSFS_CMDLINE=y
+CONFIG_SYSFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_VARS=y
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=y
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_EFI_RUNTIME_MAP=y
+# CONFIG_EFI_FAKE_MEMMAP is not set
+CONFIG_EFI_SOFT_RESERVE=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
+CONFIG_EFI_BOOTLOADER_CONTROL=m
+CONFIG_EFI_CAPSULE_LOADER=m
+# CONFIG_EFI_TEST is not set
+CONFIG_APPLE_PROPERTIES=y
+CONFIG_RESET_ATTACK_MITIGATION=y
+# CONFIG_EFI_RCI2_TABLE is not set
+# CONFIG_EFI_DISABLE_PCI_DMA is not set
+# end of EFI (Extensible Firmware Interface) Support
+
+CONFIG_UEFI_CPER=y
+CONFIG_UEFI_CPER_X86=y
+CONFIG_EFI_DEV_PATH_PARSER=y
+CONFIG_EFI_EARLYCON=y
+CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+# CONFIG_GNSS is not set
+CONFIG_MTD=m
+CONFIG_MTD_TESTS=m
+
+#
+# Partition parsers
+#
+CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+
+#
+# Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK.
+#
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_MAP_BANK_WIDTH_8=y
+CONFIG_MTD_MAP_BANK_WIDTH_16=y
+CONFIG_MTD_MAP_BANK_WIDTH_32=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_I4=y
+CONFIG_MTD_CFI_I8=y
+CONFIG_MTD_OTP=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+# end of RAM/ROM/Flash chip drivers
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PHYSMAP_GPIO_ADDR is not set
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+# end of Mapping drivers for chip access
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+# CONFIG_MTD_PMC551_DEBUG is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_MCHP23K256 is not set
+CONFIG_MTD_MCHP48L640=m
+# CONFIG_MTD_SST25L is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
+# end of Self-contained MTD device drivers
+
+#
+# NAND
+#
+CONFIG_MTD_NAND_CORE=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_RAW_NAND=m
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_CAFE=m
+# CONFIG_MTD_NAND_MXIC is not set
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_NAND_ARASAN=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y
+CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y
+# CONFIG_MTD_SPI_NAND is not set
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+# CONFIG_MTD_NAND_ECC_SW_BCH is not set
+# end of ECC engine support
+# end of NAND
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+# end of LPDDR & LPDDR2 PCM memory drivers
+
+# CONFIG_MTD_SPI_NOR is not set
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+CONFIG_MTD_UBI_GLUEBI=m
+# CONFIG_MTD_UBI_BLOCK is not set
+# CONFIG_MTD_HYPERBUS is not set
+# CONFIG_OF is not set
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_BLK_DEV_FD=y
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
+CONFIG_CDROM=y
+CONFIG_PARIDE=m
+
+#
+# Parallel IDE high-level drivers
+#
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+# CONFIG_ZRAM_DEF_COMP_842 is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
+# CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_FRONTEND=y
+CONFIG_XEN_BLKDEV_BACKEND=y
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
+CONFIG_BLK_DEV_RNBD=y
+CONFIG_BLK_DEV_RNBD_CLIENT=m
+CONFIG_BLK_DEV_RNBD_SERVER=m
+
+#
+# NVME Support
+#
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_FC=m
+CONFIG_NVME_TCP=m
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_PASSTHRU=y
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
+CONFIG_NVME_TARGET_FCLOOP=m
+CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+# CONFIG_AD525X_DPOT_SPI is not set
+CONFIG_DUMMY_IRQ=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_SRAM is not set
+CONFIG_DW_XDATA_PCIE=m
+# CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
+CONFIG_MISC_RTSX=m
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT25 is not set
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
+CONFIG_EEPROM_IDT_89HPESX=m
+CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
+CONFIG_SENSORS_LIS3_I2C=m
+
+#
+# Altera FPGA firmware download module (requires I2C)
+#
+CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=m
+CONFIG_INTEL_MEI_TXE=m
+CONFIG_INTEL_MEI_HDCP=m
+CONFIG_VMWARE_VMCI=m
+CONFIG_GENWQE=m
+CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
+# CONFIG_ECHO is not set
+CONFIG_BCM_VK=m
+CONFIG_BCM_VK_TTY=y
+CONFIG_MISC_ALCOR_PCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+# CONFIG_HABANA_AI is not set
+CONFIG_UACCE=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+# end of Misc devices
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=y
+CONFIG_SCSI_COMMON=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_BLK_DEV_BSG=y
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=y
+CONFIG_SCSI_SAS_LIBSAS=y
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=y
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=4
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_CDNS_PLATFORM=m
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
+# CONFIG_SCSI_UFS_BSG is not set
+CONFIG_SCSI_UFS_CRYPTO=y
+# CONFIG_SCSI_UFS_HPB is not set
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
+CONFIG_SCSI_MYRB=m
+CONFIG_SCSI_MYRS=m
+CONFIG_VMWARE_PVSCSI=m
+# CONFIG_XEN_SCSI_FRONTEND is not set
+CONFIG_HYPERV_STORAGE=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_FDOMAIN=m
+CONFIG_SCSI_FDOMAIN_PCI=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+# CONFIG_TCM_QLA2XXX_DEBUG is not set
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_QEDI=m
+CONFIG_QEDF=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_EFCT=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_WD719X=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+# CONFIG_PCMCIA_FDOMAIN is not set
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
+CONFIG_ATA=y
+CONFIG_SATA_HOST=y
+CONFIG_PATA_TIMINGS=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_FORCE=y
+CONFIG_ATA_ACPI=y
+# CONFIG_SATA_ZPODD is not set
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_MOBILE_LPM_POLICY=3
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_SATA_INIC162X=y
+CONFIG_SATA_ACARD_AHCI=y
+CONFIG_SATA_SIL24=y
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=y
+CONFIG_SATA_QSTOR=y
+CONFIG_SATA_SX4=y
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=y
+# CONFIG_SATA_DWC is not set
+CONFIG_SATA_MV=y
+CONFIG_SATA_NV=y
+CONFIG_SATA_PROMISE=y
+CONFIG_SATA_SIL=y
+CONFIG_SATA_SIS=y
+CONFIG_SATA_SVW=y
+CONFIG_SATA_ULI=y
+CONFIG_SATA_VIA=y
+CONFIG_SATA_VITESSE=y
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=y
+CONFIG_PATA_AMD=y
+CONFIG_PATA_ARTOP=y
+CONFIG_PATA_ATIIXP=y
+CONFIG_PATA_ATP867X=y
+CONFIG_PATA_CMD64X=y
+CONFIG_PATA_CYPRESS=y
+CONFIG_PATA_EFAR=y
+CONFIG_PATA_HPT366=y
+CONFIG_PATA_HPT37X=y
+CONFIG_PATA_HPT3X2N=y
+CONFIG_PATA_HPT3X3=y
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=y
+CONFIG_PATA_IT821X=y
+CONFIG_PATA_JMICRON=y
+CONFIG_PATA_MARVELL=y
+CONFIG_PATA_NETCELL=y
+CONFIG_PATA_NINJA32=y
+CONFIG_PATA_NS87415=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_OPTIDMA=y
+CONFIG_PATA_PDC2027X=y
+CONFIG_PATA_PDC_OLD=y
+CONFIG_PATA_RADISYS=y
+CONFIG_PATA_RDC=y
+CONFIG_PATA_SCH=y
+CONFIG_PATA_SERVERWORKS=y
+CONFIG_PATA_SIL680=y
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=y
+CONFIG_PATA_VIA=y
+CONFIG_PATA_WINBOND=y
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_NS87410=y
+CONFIG_PATA_OPTI=y
+CONFIG_PATA_PCMCIA=m
+# CONFIG_PATA_PLATFORM is not set
+CONFIG_PATA_RZ1000=y
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=y
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID10=y
+CONFIG_MD_RAID456=y
+CONFIG_MD_MULTIPATH=y
+CONFIG_MD_FAULTY=m
+CONFIG_MD_CLUSTER=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+# CONFIG_BCACHE_ASYNC_REGISTRATION is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING=y
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=y
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+# CONFIG_DM_WRITECACHE is not set
+# CONFIG_DM_EBS is not set
+CONFIG_DM_ERA=m
+# CONFIG_DM_CLONE is not set
+CONFIG_DM_MIRROR=y
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_HST=m
+CONFIG_DM_MULTIPATH_IOA=m
+# CONFIG_DM_DELAY is not set
+CONFIG_DM_DUST=m
+CONFIG_DM_INIT=y
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
+CONFIG_DM_VERITY_FEC=y
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_DM_ZONED=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+# CONFIG_WIREGUARD_DEBUG is not set
+CONFIG_EQUALIZER=m
+CONFIG_NET_FC=y
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_GTP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_NTB_NETDEV=m
+CONFIG_TUN=m
+CONFIG_TAP=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+CONFIG_VSOCKMON=m
+CONFIG_MHI_NET=m
+CONFIG_SUNGEM_PHY=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_B53=m
+# CONFIG_B53_SPI_DRIVER is not set
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
+CONFIG_B53_SERDES=m
+CONFIG_NET_DSA_BCM_SF2=m
+CONFIG_NET_DSA_LOOP=m
+CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK=m
+# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
+CONFIG_NET_DSA_MT7530=m
+# CONFIG_NET_DSA_MV88E6060 is not set
+CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m
+# CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI is not set
+# CONFIG_NET_DSA_MICROCHIP_KSZ8795 is not set
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_PTP=y
+CONFIG_NET_DSA_AR9331=m
+# CONFIG_NET_DSA_SJA1105 is not set
+CONFIG_NET_DSA_XRS700X=m
+CONFIG_NET_DSA_XRS700X_I2C=m
+CONFIG_NET_DSA_XRS700X_MDIO=m
+CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK_SMI=m
+CONFIG_NET_DSA_SMSC_LAN9303=m
+CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
+CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
+CONFIG_NET_DSA_VITESSE_VSC73XX=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_SPI=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m
+# end of Distributed Switch Architecture drivers
+
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+# CONFIG_ET131X is not set
+CONFIG_NET_VENDOR_ALACRITECH=y
+# CONFIG_SLICOSS is not set
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_ALTERA_TSE=m
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_AMD_XGBE=m
+CONFIG_AMD_XGBE_HAVE_ECC=y
+CONFIG_NET_VENDOR_AQUANTIA=y
+CONFIG_AQTION=m
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_CX_ECAT=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BCMGENET=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+# CONFIG_SYSTEMPORT is not set
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_CADENCE=y
+CONFIG_MACB=m
+CONFIG_MACB_USE_HWSTAMP=y
+CONFIG_MACB_PCI=m
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
+CONFIG_CAVIUM_PTP=m
+CONFIG_LIQUIDIO=m
+CONFIG_LIQUIDIO_VF=m
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_CHELSIO_INLINE_CRYPTO=y
+CONFIG_CHELSIO_IPSEC_INLINE=m
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+# CONFIG_NET_VENDOR_CORTINA is not set
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MMIO=y
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_GOOGLE=y
+CONFIG_GVE=m
+# CONFIG_NET_VENDOR_HUAWEI is not set
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_E1000E_HWTS=y
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBE_IPSEC=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGBEVF_IPSEC=y
+CONFIG_I40E=m
+CONFIG_IAVF=m
+CONFIG_I40EVF=m
+CONFIG_ICE=m
+CONFIG_FM10K=m
+CONFIG_IGC=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_LITEX=y
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_PRESTERA=m
+CONFIG_PRESTERA_PCI=m
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_ACCEL=y
+# CONFIG_MLX5_FPGA is not set
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+CONFIG_MLX5_BRIDGE=y
+CONFIG_MLX5_CLS_ACT=y
+CONFIG_MLX5_TC_CT=y
+CONFIG_MLX5_TC_SAMPLE=y
+CONFIG_MLX5_CORE_IPOIB=y
+CONFIG_MLX5_IPSEC=y
+CONFIG_MLX5_EN_IPSEC=y
+CONFIG_MLX5_SW_STEERING=y
+CONFIG_MLX5_SF=y
+CONFIG_MLX5_SF_MANAGER=y
+CONFIG_MLXSW_CORE=m
+CONFIG_MLXSW_CORE_HWMON=y
+CONFIG_MLXSW_CORE_THERMAL=y
+CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_I2C=m
+CONFIG_MLXSW_SPECTRUM=m
+CONFIG_MLXSW_MINIMAL=m
+CONFIG_MLXFW=m
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+# CONFIG_KS8851 is not set
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_MICROSEMI is not set
+CONFIG_NET_VENDOR_MICROSOFT=y
+CONFIG_MICROSOFT_MANA=m
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_FEALNX=m
+# CONFIG_NET_VENDOR_NI is not set
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP=m
+CONFIG_NFP_APP_FLOWER=y
+CONFIG_NFP_APP_ABM_NIC=y
+# CONFIG_NFP_DEBUG is not set
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_ETHOC=m
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_PENSANDO=y
+# CONFIG_IONIC is not set
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
+CONFIG_QEDE=m
+CONFIG_QED_RDMA=y
+CONFIG_QED_ISCSI=y
+CONFIG_QED_FCOE=y
+CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_QUALCOMM=y
+# CONFIG_QCOM_EMAC is not set
+# CONFIG_RMNET is not set
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_ROCKER=m
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_SXGBE_ETH=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+# CONFIG_SFC_MCDI_LOGGING is not set
+CONFIG_SFC_FALCON=m
+CONFIG_SFC_FALCON_MTD=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_DWMAC_GENERIC=m
+CONFIG_DWMAC_INTEL=m
+# CONFIG_DWMAC_LOONGSON is not set
+# CONFIG_STMMAC_PCI is not set
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+CONFIG_DWC_XLGMAC=m
+CONFIG_DWC_XLGMAC_PCI=m
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+# CONFIG_WIZNET_W5100_SPI is not set
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_EMACLITE=m
+# CONFIG_XILINX_AXI_EMAC is not set
+CONFIG_XILINX_LL_TEMAC=m
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+CONFIG_NET_SB1000=m
+CONFIG_PHYLINK=m
+CONFIG_PHYLIB=m
+CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y
+CONFIG_FIXED_PHY=m
+CONFIG_SFP=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+CONFIG_ADIN_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM54140_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM84881_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
+CONFIG_MARVELL_88X2222_PHY=m
+CONFIG_MAXLINEAR_GPHY=m
+CONFIG_MEDIATEK_GE_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_PHY=m
+# CONFIG_MICROCHIP_T1_PHY is not set
+CONFIG_MICROSEMI_PHY=m
+CONFIG_MOTORCOMM_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_C45_TJA11XX_PHY=m
+# CONFIG_NXP_TJA11XX_PHY is not set
+CONFIG_AT803X_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_ROCKCHIP_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_DP83822_PHY=m
+# CONFIG_DP83TC811_PHY is not set
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_DP83869_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+# CONFIG_MICREL_KS8995MA is not set
+CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_BUS=m
+CONFIG_FWNODE_MDIO=m
+CONFIG_ACPI_MDIO=m
+CONFIG_MDIO_DEVRES=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_I2C=m
+CONFIG_MDIO_MVUSB=m
+# CONFIG_MDIO_MSCC_MIIM is not set
+CONFIG_MDIO_THUNDER=m
+
+#
+# MDIO Multiplexers
+#
+
+#
+# PCS device drivers
+#
+CONFIG_PCS_XPCS=m
+# end of PCS device drivers
+
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+# CONFIG_SLIP_MODE_SLIP6 is not set
+CONFIG_USB_NET_DRIVERS=y
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_USB_RTL8153_ECM=m
+CONFIG_WLAN=y
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+# CONFIG_ATH9K_AHB is not set
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DYNACK is not set
+CONFIG_ATH9K_WOW=y
+CONFIG_ATH9K_RFKILL=y
+CONFIG_ATH9K_CHANNEL_CONTEXT=y
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_PCI_NO_EEPROM=m
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+# CONFIG_ATH9K_HWRNG is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_WIL6210_DEBUGFS=y
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
+CONFIG_ATH10K_SDIO=m
+CONFIG_ATH10K_USB=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_SPECTRAL is not set
+# CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+CONFIG_WCN36XX_DEBUGFS=y
+CONFIG_ATH11K=m
+CONFIG_ATH11K_AHB=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_TRACING is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+CONFIG_BRCM_TRACING=y
+# CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO=m
+CONFIG_AIRO_CS=m
+CONFIG_WLAN_VENDOR_INTEL=y
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+# CONFIG_IWLWIFI_BCAST_FILTERING is not set
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+CONFIG_WLAN_VENDOR_MARVELL=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_MWL8K=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+CONFIG_MT76_CORE=m
+CONFIG_MT76_LEDS=y
+CONFIG_MT76_USB=m
+CONFIG_MT76_SDIO=m
+CONFIG_MT76x02_LIB=m
+CONFIG_MT76x02_USB=m
+CONFIG_MT76_CONNAC_LIB=m
+CONFIG_MT76x0_COMMON=m
+CONFIG_MT76x0U=m
+CONFIG_MT76x0E=m
+CONFIG_MT76x2_COMMON=m
+CONFIG_MT76x2E=m
+CONFIG_MT76x2U=m
+CONFIG_MT7603E=m
+CONFIG_MT7615_COMMON=m
+CONFIG_MT7615E=m
+CONFIG_MT7663_USB_SDIO_COMMON=m
+CONFIG_MT7663U=m
+CONFIG_MT7663S=m
+CONFIG_MT7915E=m
+CONFIG_MT7921E=m
+CONFIG_WLAN_VENDOR_MICROCHIP=y
+# CONFIG_WILC1000_SDIO is not set
+# CONFIG_WILC1000_SPI is not set
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+CONFIG_RTL8XXXU_UNTESTED=y
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822B=m
+CONFIG_RTW88_8822C=m
+CONFIG_RTW88_8723D=m
+CONFIG_RTW88_8821C=m
+CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8821CE=m
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+CONFIG_RSI_SDIO=m
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_ST=y
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+# CONFIG_CW1200_WLAN_SPI is not set
+CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WL1251=m
+# CONFIG_WL1251_SPI is not set
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_WLAN_VENDOR_ZYDAS=y
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PCIE=m
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+
+#
+# X.25/LAPB support is disabled
+#
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+# CONFIG_PC300TOO is not set
+CONFIG_FARSYNC=m
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+# CONFIG_IEEE802154_AT86RF230 is not set
+# CONFIG_IEEE802154_MRF24J40 is not set
+# CONFIG_IEEE802154_CC2520 is not set
+CONFIG_IEEE802154_ATUSB=m
+# CONFIG_IEEE802154_ADF7242 is not set
+# CONFIG_IEEE802154_CA8210 is not set
+# CONFIG_IEEE802154_MCR20A is not set
+# CONFIG_IEEE802154_HWSIM is not set
+
+#
+# Wireless WAN
+#
+CONFIG_WWAN=y
+# CONFIG_WWAN_HWSIM is not set
+CONFIG_MHI_WWAN_CTRL=m
+# CONFIG_MHI_WWAN_MBIM is not set
+# CONFIG_RPMSG_WWAN_CTRL is not set
+CONFIG_IOSM=m
+# end of Wireless WAN
+
+CONFIG_XEN_NETDEV_FRONTEND=y
+CONFIG_XEN_NETDEV_BACKEND=y
+CONFIG_VMXNET3=m
+CONFIG_FUJITSU_ES=m
+CONFIG_USB4_NET=m
+CONFIG_HYPERV_NET=m
+# CONFIG_NETDEVSIM is not set
+CONFIG_NET_FAILOVER=m
+CONFIG_ISDN=y
+CONFIG_ISDN_CAPI=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_HDLC=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=y
+CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADC is not set
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+# CONFIG_KEYBOARD_APPLESPI is not set
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+CONFIG_KEYBOARD_DLINK_DIR685=m
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_SAMSUNG=m
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+CONFIG_KEYBOARD_TM2_TOUCHKEY=m
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYBOARD_CROS_EC=m
+CONFIG_KEYBOARD_MTK_PMIC=m
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_VMMOUSE=y
+CONFIG_MOUSE_PS2_SMBUS=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADC=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+# CONFIG_JOYSTICK_PSXPAD_SPI is not set
+CONFIG_JOYSTICK_PXRC=m
+CONFIG_JOYSTICK_QWIIC=m
+CONFIG_JOYSTICK_FSIA6B=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
+CONFIG_TABLET_SERIAL_WACOM4=m
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+CONFIG_TOUCHSCREEN_ADC=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_BU21029=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
+CONFIG_TOUCHSCREEN_CY8CTMA140=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP4_SPI is not set
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
+CONFIG_TOUCHSCREEN_EXC3000=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_HIDEEP=m
+CONFIG_TOUCHSCREEN_HYCON_HY46XX=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_ILITEK=m
+CONFIG_TOUCHSCREEN_S6SY761=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_EKTF2127=m
+CONFIG_TOUCHSCREEN_ELAN=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
+CONFIG_TOUCHSCREEN_MAX11801=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
+CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
+CONFIG_TOUCHSCREEN_MSG2638=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
+CONFIG_TOUCHSCREEN_ST1232=m
+# CONFIG_TOUCHSCREEN_STMFTS is not set
+CONFIG_TOUCHSCREEN_SUR40=m
+# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
+CONFIG_TOUCHSCREEN_SX8654=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZET6223=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_TOUCHSCREEN_ZINITIX=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+# CONFIG_INPUT_ARIZONA_HAPTICS is not set
+# CONFIG_INPUT_ATC260X_ONKEY is not set
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_GPIO_BEEPER=m
+CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_PWM_BEEPER=m
+# CONFIG_INPUT_PWM_VIBRA is not set
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_DA7280_HAPTICS=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_IMS_PCU=m
+CONFIG_INPUT_IQS269A=m
+CONFIG_INPUT_IQS626A=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
+CONFIG_INPUT_DRV260X_HAPTICS=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_INPUT_DRV2667_HAPTICS=m
+CONFIG_RMI4_CORE=m
+CONFIG_RMI4_I2C=m
+# CONFIG_RMI4_SPI is not set
+CONFIG_RMI4_SMB=m
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
+CONFIG_RMI4_F34=y
+CONFIG_RMI4_F3A=y
+# CONFIG_RMI4_F54 is not set
+CONFIG_RMI4_F55=y
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_HYPERV_KEYBOARD=m
+# CONFIG_SERIO_GPIO_PS2 is not set
+CONFIG_USERIO=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=32
+CONFIG_LDISC_AUTOLOAD=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_PNP=y
+# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
+# CONFIG_SERIAL_8250_FINTEK is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_EXAR=m
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_8250_DWLIB=y
+CONFIG_SERIAL_8250_DW=m
+CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_8250_LPSS=m
+CONFIG_SERIAL_8250_MID=m
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_UARTLITE_NR_UARTS=1
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_LANTIQ=m
+CONFIG_SERIAL_SCCNXP=m
+CONFIG_SERIAL_SC16IS7XX=m
+# CONFIG_SERIAL_SC16IS7XX_I2C is not set
+# CONFIG_SERIAL_SC16IS7XX_SPI is not set
+CONFIG_SERIAL_BCM63XX=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+# CONFIG_SERIAL_FSL_LINFLEXUART is not set
+# CONFIG_SERIAL_SPRD is not set
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_NOZOMI=m
+CONFIG_NULL_TTY=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+CONFIG_SERIAL_DEV_BUS=y
+CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
+# CONFIG_TTY_PRINTK is not set
+CONFIG_PRINTER=m
+CONFIG_LP_CONSOLE=y
+CONFIG_PPDEV=m
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DMI_DECODE=y
+CONFIG_IPMI_PLAT_DATA=y
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_BA431=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_SCR24X=m
+CONFIG_IPWIRELESS=m
+# end of PCMCIA character devices
+
+CONFIG_MWAVE=m
+CONFIG_DEVMEM=y
+CONFIG_NVRAM=m
+CONFIG_DEVPORT=y
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=y
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TIS_CORE=m
+CONFIG_TCG_TIS=m
+# CONFIG_TCG_TIS_SPI is not set
+CONFIG_TCG_TIS_I2C_CR50=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+# CONFIG_TCG_XEN is not set
+CONFIG_TCG_CRB=m
+# CONFIG_TCG_VTPM_PROXY is not set
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
+# CONFIG_TCG_TIS_ST33ZP24_SPI is not set
+CONFIG_TELCLOCK=m
+CONFIG_XILLYBUS_CLASS=m
+# CONFIG_XILLYBUS is not set
+CONFIG_XILLYUSB=m
+CONFIG_RANDOM_TRUST_CPU=y
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+# end of Character devices
+
+#
+# I2C support
+#
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_AMD_MP2=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_NVIDIA_GPU=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_CBUS_GPIO is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_SLAVE=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_EMEV2=m
+CONFIG_I2C_GPIO=m
+# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
+CONFIG_I2C_CP2615=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_MLXCPLD is not set
+CONFIG_I2C_CROS_EC_TUNNEL=m
+CONFIG_I2C_VIRTIO=m
+# end of I2C Hardware Bus support
+
+CONFIG_I2C_STUB=m
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+# CONFIG_I2C_SLAVE_TESTUNIT is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+# CONFIG_I3C is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+# CONFIG_SPI_MEM is not set
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_AXI_SPI_ENGINE is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_CADENCE is not set
+# CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_DLN2 is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_LANTIQ_SSC is not set
+# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=m
+# CONFIG_SPI_ROCKCHIP is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
+# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
+# CONFIG_SPI_AMD is not set
+
+#
+# SPI Multiplexer support
+#
+CONFIG_SPI_MUX=m
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_LOOPBACK_TEST is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_DYNAMIC=y
+# CONFIG_SPMI is not set
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+
+#
+# HSI controllers
+#
+
+#
+# HSI clients
+#
+CONFIG_HSI_CHAR=m
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=y
+CONFIG_PTP_1588_CLOCK_OPTIONAL=y
+CONFIG_DP83640_PHY=m
+# CONFIG_PTP_1588_CLOCK_INES is not set
+CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_IDT82P33=m
+CONFIG_PTP_1588_CLOCK_IDTCM=m
+CONFIG_PTP_1588_CLOCK_VMW=m
+CONFIG_PTP_1588_CLOCK_OCP=m
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AMD=y
+# CONFIG_PINCTRL_MCP23S08 is not set
+CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_PINCTRL_CHERRYVIEW=m
+CONFIG_PINCTRL_LYNXPOINT=m
+CONFIG_PINCTRL_INTEL=y
+CONFIG_PINCTRL_ALDERLAKE=m
+CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_CANNONLAKE=m
+CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_DENVERTON=m
+CONFIG_PINCTRL_ELKHARTLAKE=m
+CONFIG_PINCTRL_EMMITSBURG=m
+CONFIG_PINCTRL_GEMINILAKE=m
+CONFIG_PINCTRL_ICELAKE=m
+CONFIG_PINCTRL_JASPERLAKE=m
+CONFIG_PINCTRL_LAKEFIELD=m
+CONFIG_PINCTRL_LEWISBURG=m
+CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_PINCTRL_TIGERLAKE=m
+
+#
+# Renesas pinctrl drivers
+#
+# end of Renesas pinctrl drivers
+
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_GPIO_ACPI=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO drivers
+#
+CONFIG_GPIO_AMDPT=m
+CONFIG_GPIO_DWAPB=m
+CONFIG_GPIO_EXAR=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIO_ICH=m
+# CONFIG_GPIO_MB86S7X is not set
+CONFIG_GPIO_VX855=m
+CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
+
+#
+# Port-mapped I/O GPIO drivers
+#
+CONFIG_GPIO_F7188X=m
+# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_SCH311X=m
+# CONFIG_GPIO_WINBOND is not set
+# CONFIG_GPIO_WS16C48 is not set
+# end of Port-mapped I/O GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+CONFIG_GPIO_ADP5588=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+# CONFIG_GPIO_PCA953X_IRQ is not set
+CONFIG_GPIO_PCA9570=m
+CONFIG_GPIO_PCF857X=m
+# CONFIG_GPIO_TPIC2810 is not set
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_ARIZONA=m
+CONFIG_GPIO_BD9571MWV=m
+CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_GPIO_LP3943=m
+# CONFIG_GPIO_TPS68470 is not set
+# CONFIG_GPIO_UCB1400 is not set
+CONFIG_GPIO_WHISKEY_COVE=m
+CONFIG_GPIO_WM8994=m
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+CONFIG_GPIO_AMD8111=m
+CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_PCI_IDIO_16=m
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
+CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+# CONFIG_GPIO_MAX3191X is not set
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_PISOSR is not set
+# CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+#
+# Virtual GPIO drivers
+#
+CONFIG_GPIO_AGGREGATOR=m
+# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_VIRTIO=m
+# end of Virtual GPIO drivers
+
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
+CONFIG_W1_MASTER_GPIO=m
+# CONFIG_W1_MASTER_SGI is not set
+# end of 1-wire Bus Masters
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2405=m
+CONFIG_W1_SLAVE_DS2408=m
+# CONFIG_W1_SLAVE_DS2408_READBACK is not set
+CONFIG_W1_SLAVE_DS2413=m
+CONFIG_W1_SLAVE_DS2406=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2805=m
+CONFIG_W1_SLAVE_DS2430=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2438=m
+# CONFIG_W1_SLAVE_DS250X is not set
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+# CONFIG_W1_SLAVE_DS28E17 is not set
+# end of 1-wire Slaves
+
+CONFIG_POWER_RESET=y
+# CONFIG_POWER_RESET_ATC260X is not set
+# CONFIG_POWER_RESET_MT6323 is not set
+# CONFIG_POWER_RESET_RESTART is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+CONFIG_PDA_POWER=m
+CONFIG_GENERIC_ADC_BATTERY=m
+CONFIG_TEST_POWER=m
+# CONFIG_CHARGER_ADP5061 is not set
+CONFIG_BATTERY_CW2015=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
+CONFIG_BATTERY_DS2781=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_SBS=m
+CONFIG_CHARGER_SBS=m
+# CONFIG_MANAGER_SBS is not set
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+# CONFIG_BATTERY_MAX1721X is not set
+CONFIG_CHARGER_PCF50633=m
+# CONFIG_CHARGER_ISP1704 is not set
+CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_LP8727=m
+CONFIG_CHARGER_GPIO=m
+# CONFIG_CHARGER_MANAGER is not set
+CONFIG_CHARGER_LT3651=m
+CONFIG_CHARGER_LTC4162L=m
+CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24257=m
+CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_BQ2515X=m
+CONFIG_CHARGER_BQ25890=m
+CONFIG_CHARGER_BQ25980=m
+CONFIG_CHARGER_BQ256XX=m
+CONFIG_CHARGER_SMB347=m
+CONFIG_BATTERY_GAUGE_LTC2941=m
+CONFIG_BATTERY_GOLDFISH=m
+# CONFIG_BATTERY_RT5033 is not set
+CONFIG_CHARGER_RT9455=m
+CONFIG_CHARGER_CROS_USBPD=m
+CONFIG_CHARGER_CROS_PCHG=m
+CONFIG_CHARGER_BD99954=m
+CONFIG_CHARGER_WILCO=m
+CONFIG_BATTERY_SURFACE=m
+CONFIG_CHARGER_SURFACE=m
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+# CONFIG_SENSORS_AD7314 is not set
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM1177=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+# CONFIG_SENSORS_ADT7310 is not set
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_AHT10=m
+CONFIG_SENSORS_AQUACOMPUTER_D5NEXT=m
+# CONFIG_SENSORS_AS370 is not set
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_AXI_FAN_CONTROL=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ASPEED=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_CORSAIR_CPRO=m
+CONFIG_SENSORS_CORSAIR_PSU=m
+CONFIG_SENSORS_DRIVETEMP=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_DELL_SMM=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_FTSTEUTATES=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IIO_HWMON=m
+CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2947=m
+CONFIG_SENSORS_LTC2947_I2C=m
+CONFIG_SENSORS_LTC2947_SPI=m
+CONFIG_SENSORS_LTC2990=m
+CONFIG_SENSORS_LTC2992=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+# CONFIG_SENSORS_MAX1111 is not set
+CONFIG_SENSORS_MAX127=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+# CONFIG_SENSORS_MAX31722 is not set
+# CONFIG_SENSORS_MAX31730 is not set
+CONFIG_SENSORS_MAX6621=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_MLXREG_FAN=m
+CONFIG_SENSORS_TC654=m
+CONFIG_SENSORS_TPS23861=m
+CONFIG_SENSORS_MENF21BMC_HWMON=m
+CONFIG_SENSORS_MR75203=m
+# CONFIG_SENSORS_ADCXX is not set
+CONFIG_SENSORS_LM63=m
+# CONFIG_SENSORS_LM70 is not set
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_NZXT_KRAKEN2=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1266=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_BEL_PFE=m
+CONFIG_SENSORS_BPA_RS600=m
+CONFIG_SENSORS_FSP_3Y=m
+CONFIG_SENSORS_IBM_CFFPS=m
+CONFIG_SENSORS_DPS920AB=m
+# CONFIG_SENSORS_INSPUR_IPSPS is not set
+CONFIG_SENSORS_IR35221=m
+CONFIG_SENSORS_IR36021=m
+CONFIG_SENSORS_IR38064=m
+# CONFIG_SENSORS_IRPS5401 is not set
+# CONFIG_SENSORS_ISL68137 is not set
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_LTC2978_REGULATOR=y
+CONFIG_SENSORS_LTC3815=m
+CONFIG_SENSORS_MAX15301=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX16601=m
+CONFIG_SENSORS_MAX20730=m
+CONFIG_SENSORS_MAX20751=m
+CONFIG_SENSORS_MAX31785=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_MP2888=m
+CONFIG_SENSORS_MP2975=m
+CONFIG_SENSORS_PIM4328=m
+CONFIG_SENSORS_PM6764TR=m
+# CONFIG_SENSORS_PXE1610 is not set
+CONFIG_SENSORS_Q54SJ108A2=m
+CONFIG_SENSORS_STPDDC60=m
+CONFIG_SENSORS_TPS40422=m
+CONFIG_SENSORS_TPS53679=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_XDPE122=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SBTSI=m
+CONFIG_SENSORS_SBRMI=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
+CONFIG_SENSORS_SHT4x=m
+CONFIG_SENSORS_SHTC1=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_STTS751=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_ADC128D818=m
+CONFIG_SENSORS_ADS7828=m
+# CONFIG_SENSORS_ADS7871 is not set
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_INA3221=m
+CONFIG_SENSORS_TC74=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP108=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_TMP513=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83773G=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_XGENE=m
+CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=y
+CONFIG_THERMAL_NETLINK=y
+CONFIG_THERMAL_STATISTICS=y
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+# CONFIG_DEVFREQ_THERMAL is not set
+CONFIG_THERMAL_EMULATION=y
+
+#
+# Intel thermal drivers
+#
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_X86_PKG_TEMP_THERMAL=m
+CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
+CONFIG_INTEL_SOC_DTS_THERMAL=m
+
+#
+# ACPI INT340X thermal drivers
+#
+CONFIG_INT340X_THERMAL=m
+CONFIG_ACPI_THERMAL_REL=m
+CONFIG_INT3406_THERMAL=m
+CONFIG_PROC_THERMAL_MMIO_RAPL=m
+# end of ACPI INT340X thermal drivers
+
+CONFIG_INTEL_BXT_PMIC_THERMAL=m
+CONFIG_INTEL_PCH_THERMAL=m
+CONFIG_INTEL_TCC_COOLING=m
+CONFIG_INTEL_MENLOW=m
+# end of Intel thermal drivers
+
+CONFIG_GENERIC_ADC_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+CONFIG_WATCHDOG_SYSFS=y
+# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_MENF21BMC_WATCHDOG=m
+CONFIG_WDAT_WDT=m
+# CONFIG_XILINX_WATCHDOG is not set
+CONFIG_ZIIRAVE_WATCHDOG=m
+CONFIG_MLX_WDT=m
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
+CONFIG_MAX63XX_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_EBC_C384_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_TQMX86_WDT=m
+CONFIG_VIA_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_INTEL_MEI_WDT=m
+CONFIG_NI903X_WDT=m
+CONFIG_NIC7018_WDT=m
+CONFIG_MEN_A21_WDT=m
+# CONFIG_XEN_WDT is not set
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+# CONFIG_SSB_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
+CONFIG_BCMA_DRIVER_PCI=y
+# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
+# CONFIG_BCMA_DRIVER_GPIO is not set
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=m
+CONFIG_MFD_BCM590XX=m
+CONFIG_MFD_BD9571MWV=m
+# CONFIG_MFD_AXP20X_I2C is not set
+CONFIG_MFD_CROS_EC_DEV=m
+# CONFIG_MFD_MADERA is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9062 is not set
+# CONFIG_MFD_DA9063 is not set
+# CONFIG_MFD_DA9150 is not set
+CONFIG_MFD_DLN2=m
+CONFIG_MFD_MC13XXX=m
+# CONFIG_MFD_MC13XXX_SPI is not set
+CONFIG_MFD_MC13XXX_I2C=m
+# CONFIG_MFD_MP2629 is not set
+CONFIG_HTC_PASIC3=m
+CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+CONFIG_INTEL_SOC_PMIC_BXTWC=m
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_INTEL_SOC_PMIC_MRFLD=m
+CONFIG_MFD_INTEL_LPSS=m
+CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_PMC_BXT=m
+CONFIG_MFD_INTEL_PMT=m
+# CONFIG_MFD_IQS62X is not set
+CONFIG_MFD_JANZ_CMODIO=m
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MT6360 is not set
+CONFIG_MFD_MT6397=m
+CONFIG_MFD_MENF21BMC=m
+# CONFIG_EZX_PCAP is not set
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_UCB1400_CORE=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RT4831=m
+# CONFIG_MFD_RT5033 is not set
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+# CONFIG_MFD_SM501_GPIO is not set
+CONFIG_MFD_SKY81452=m
+CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_MFD_LP3943=m
+CONFIG_MFD_TI_LMU=m
+CONFIG_TPS6105X=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+# CONFIG_MFD_TPS65086 is not set
+# CONFIG_MFD_TI_LP873X is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+# CONFIG_MFD_TQMX86 is not set
+CONFIG_MFD_VX855=m
+CONFIG_MFD_ARIZONA=m
+CONFIG_MFD_ARIZONA_I2C=m
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_CS47L24 is not set
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+CONFIG_MFD_WM8997=y
+# CONFIG_MFD_WM8998 is not set
+# CONFIG_MFD_WM831X_SPI is not set
+CONFIG_MFD_WM8994=m
+CONFIG_MFD_ATC260X=m
+CONFIG_MFD_ATC260X_I2C=m
+# CONFIG_RAVE_SP_CORE is not set
+CONFIG_MFD_INTEL_M10_BMC=m
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+# CONFIG_REGULATOR_88PG86X is not set
+CONFIG_REGULATOR_ACT8865=m
+CONFIG_REGULATOR_AD5398=m
+# CONFIG_REGULATOR_ARIZONA_LDO1 is not set
+# CONFIG_REGULATOR_ARIZONA_MICSUPP is not set
+# CONFIG_REGULATOR_ATC260X is not set
+CONFIG_REGULATOR_BCM590XX=m
+CONFIG_REGULATOR_BD9571MWV=m
+CONFIG_REGULATOR_DA9210=m
+CONFIG_REGULATOR_DA9211=m
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LM363X=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=m
+CONFIG_REGULATOR_LP8755=m
+CONFIG_REGULATOR_LTC3589=m
+CONFIG_REGULATOR_LTC3676=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8893=m
+CONFIG_REGULATOR_MAX8952=m
+# CONFIG_REGULATOR_MAX77826 is not set
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+# CONFIG_REGULATOR_MP8859 is not set
+CONFIG_REGULATOR_MT6311=m
+CONFIG_REGULATOR_MT6323=m
+# CONFIG_REGULATOR_MT6358 is not set
+CONFIG_REGULATOR_MT6359=m
+CONFIG_REGULATOR_MT6397=m
+# CONFIG_REGULATOR_PCA9450 is not set
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_PV88060=m
+CONFIG_REGULATOR_PV88080=m
+CONFIG_REGULATOR_PV88090=m
+# CONFIG_REGULATOR_PWM is not set
+# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
+CONFIG_REGULATOR_RT4801=m
+CONFIG_REGULATOR_RT4831=m
+CONFIG_REGULATOR_RT6160=m
+CONFIG_REGULATOR_RT6245=m
+CONFIG_REGULATOR_RTQ2134=m
+CONFIG_REGULATOR_RTMV20=m
+CONFIG_REGULATOR_RTQ6752=m
+CONFIG_REGULATOR_SKY81452=m
+CONFIG_REGULATOR_SLG51000=m
+CONFIG_REGULATOR_TPS51632=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS62360=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65132=m
+# CONFIG_REGULATOR_TPS6524X is not set
+CONFIG_REGULATOR_WM8994=m
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_LIRC=y
+CONFIG_RC_DECODERS=y
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_RCMM_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_SERIAL=m
+CONFIG_IR_SERIAL_TRANSMITTER=y
+CONFIG_IR_SIR=m
+CONFIG_RC_XBOX_DVD=m
+CONFIG_IR_TOY=m
+CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
+CONFIG_CEC_PIN=y
+CONFIG_MEDIA_CEC_RC=y
+# CONFIG_CEC_PIN_ERROR_INJ is not set
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_CEC_CH7322=m
+CONFIG_CEC_CROS_EC=m
+CONFIG_CEC_GPIO=m
+CONFIG_CEC_SECO=m
+CONFIG_CEC_SECO_RC=y
+CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_RAINSHADOW_CEC=m
+CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_SUPPORT_FILTER=y
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+
+#
+# Media device types
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+# CONFIG_MEDIA_SDR_SUPPORT is not set
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
+# CONFIG_MEDIA_TEST_SUPPORT is not set
+# end of Media device types
+
+CONFIG_VIDEO_DEV=m
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_DVB_CORE=m
+
+#
+# Video4Linux options
+#
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2_I2C=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_FLASH_LED_CLASS=m
+CONFIG_V4L2_FWNODE=m
+CONFIG_V4L2_ASYNC=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+# end of Video4Linux options
+
+#
+# Media controller options
+#
+CONFIG_MEDIA_CONTROLLER_DVB=y
+# end of Media controller options
+
+#
+# Digital TV options
+#
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+# end of Digital TV options
+
+#
+# Media drivers
+#
+
+#
+# Drivers filtered as selected at 'Filter media drivers'
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+# CONFIG_VIDEO_GO7007 is not set
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_CXUSB_ANALOG=y
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_ZD1301=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG=y
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_SOLO6X10=m
+# CONFIG_VIDEO_TW5864 is not set
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_TW686X=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+# CONFIG_VIDEO_FB_IVTV_FORCE_PAT is not set
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DT3155=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7164=m
+# CONFIG_VIDEO_COBALT is not set
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_SMIPCIE=m
+# CONFIG_DVB_NETUP_UNIDVB is not set
+CONFIG_VIDEO_IPU3_CIO2=m
+CONFIG_CIO2_BRIDGE=y
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
+# CONFIG_RADIO_SI470X is not set
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_SI4713=m
+CONFIG_PLATFORM_SI4713=m
+CONFIG_I2C_SI4713=m
+# CONFIG_RADIO_SI476X is not set
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_RAREMONO=m
+CONFIG_USB_MA901=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+CONFIG_RADIO_WL128X=m
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_TTPCI_EEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_DEBUG=y
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_VIA_CAMERA=m
+# CONFIG_VIDEO_CADENCE is not set
+# CONFIG_VIDEO_ASPEED is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+# CONFIG_DVB_PLATFORM_DRIVERS is not set
+
+#
+# MMC/SDIO DVB adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+
+#
+# FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+# end of Media drivers
+
+#
+# Media ancillary drivers
+#
+CONFIG_MEDIA_ATTACH=y
+
+#
+# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
+#
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+# CONFIG_VIDEO_TDA1997X is not set
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+# end of Audio decoders, processors and mixers
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+# end of RDS decoders
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_ADV7183=m
+CONFIG_VIDEO_ADV7604=m
+CONFIG_VIDEO_ADV7604_CEC=y
+CONFIG_VIDEO_ADV7842=m
+CONFIG_VIDEO_ADV7842_CEC=y
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_ML86V7667=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TC358743=m
+CONFIG_VIDEO_TC358743_CEC=y
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_TW9910=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+# end of Video decoders
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_ADV7511_CEC=y
+CONFIG_VIDEO_AD9389B=m
+CONFIG_VIDEO_AK881X=m
+CONFIG_VIDEO_THS8200=m
+# end of Video encoders
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+# end of Video improvement chips
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+# end of Audio/Video compression chips
+
+#
+# SDR tuner chips
+#
+# end of SDR tuner chips
+
+#
+# Miscellaneous helper chips
+#
+# CONFIG_VIDEO_THS7303 is not set
+CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# CONFIG_VIDEO_ST_MIPID02 is not set
+# end of Miscellaneous helper chips
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_APTINA_PLL=m
+CONFIG_VIDEO_CCS_PLL=m
+CONFIG_VIDEO_HI556=m
+CONFIG_VIDEO_IMX208=m
+CONFIG_VIDEO_IMX214=m
+CONFIG_VIDEO_IMX219=m
+CONFIG_VIDEO_IMX258=m
+CONFIG_VIDEO_IMX274=m
+CONFIG_VIDEO_IMX290=m
+CONFIG_VIDEO_IMX319=m
+CONFIG_VIDEO_IMX355=m
+CONFIG_VIDEO_OV02A10=m
+CONFIG_VIDEO_OV2640=m
+CONFIG_VIDEO_OV2659=m
+CONFIG_VIDEO_OV2680=m
+CONFIG_VIDEO_OV2685=m
+CONFIG_VIDEO_OV2740=m
+CONFIG_VIDEO_OV5647=m
+CONFIG_VIDEO_OV5648=m
+CONFIG_VIDEO_OV6650=m
+CONFIG_VIDEO_OV5670=m
+CONFIG_VIDEO_OV5675=m
+CONFIG_VIDEO_OV5695=m
+CONFIG_VIDEO_OV7251=m
+CONFIG_VIDEO_OV772X=m
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_OV7740=m
+CONFIG_VIDEO_OV8856=m
+CONFIG_VIDEO_OV8865=m
+CONFIG_VIDEO_OV9640=m
+CONFIG_VIDEO_OV9650=m
+CONFIG_VIDEO_OV9734=m
+CONFIG_VIDEO_OV13858=m
+CONFIG_VIDEO_VS6624=m
+CONFIG_VIDEO_MT9M001=m
+CONFIG_VIDEO_MT9M032=m
+CONFIG_VIDEO_MT9M111=m
+CONFIG_VIDEO_MT9P031=m
+CONFIG_VIDEO_MT9T001=m
+CONFIG_VIDEO_MT9T112=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MT9V032=m
+CONFIG_VIDEO_MT9V111=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_NOON010PC30=m
+CONFIG_VIDEO_M5MOLS=m
+CONFIG_VIDEO_MAX9271_LIB=m
+CONFIG_VIDEO_RDACM20=m
+CONFIG_VIDEO_RDACM21=m
+CONFIG_VIDEO_RJ54N1=m
+CONFIG_VIDEO_S5K6AA=m
+CONFIG_VIDEO_S5K6A3=m
+CONFIG_VIDEO_S5K4ECGX=m
+CONFIG_VIDEO_S5K5BAF=m
+CONFIG_VIDEO_CCS=m
+CONFIG_VIDEO_ET8EK8=m
+# CONFIG_VIDEO_S5C73M3 is not set
+# end of Camera sensor devices
+
+#
+# Lens drivers
+#
+CONFIG_VIDEO_AD5820=m
+CONFIG_VIDEO_AK7375=m
+CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9768=m
+CONFIG_VIDEO_DW9807_VCM=m
+# end of Lens drivers
+
+#
+# Flash devices
+#
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
+# end of Flash devices
+
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+# end of SPI helper chips
+
+#
+# Media SPI Adapters
+#
+# CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+# CONFIG_MEDIA_TUNER_MSI001 is not set
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_DIB9000=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_AS102_FE=m
+CONFIG_DVB_ZD1301_DEMOD=m
+CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+CONFIG_DVB_MXL692=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_TC90522=m
+CONFIG_DVB_MN88443X=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBH25=m
+CONFIG_DVB_LNBH29=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_HELENE=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+# end of Customise DVB Frontends
+# end of Media ancillary drivers
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+CONFIG_INTEL_GTT=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DBI=m
+CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_DP_AUX_CHARDEV=y
+# CONFIG_DRM_DEBUG_SELFTEST is not set
+CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_DP_CEC is not set
+CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
+CONFIG_DRM_TTM_HELPER=m
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+# CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+# end of ARM devices
+
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_USERPTR=y
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+CONFIG_DRM_AMDGPU_USERPTR=y
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+CONFIG_DRM_AMD_ACP=y
+# end of ACP (Audio CoProcessor) Configuration
+
+#
+# Display Engine Configuration
+#
+CONFIG_DRM_AMD_DC=y
+CONFIG_DRM_AMD_DC_DCN=y
+CONFIG_DRM_AMD_DC_HDCP=y
+CONFIG_DRM_AMD_DC_SI=y
+CONFIG_DRM_AMD_SECURE_DISPLAY=y
+# end of Display Engine Configuration
+
+CONFIG_HSA_AMD=y
+CONFIG_HSA_AMD_SVM=y
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+# CONFIG_NOUVEAU_DEBUG_MMU is not set
+# CONFIG_NOUVEAU_DEBUG_PUSH is not set
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+# CONFIG_DRM_NOUVEAU_SVM is not set
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_FORCE_PROBE=""
+CONFIG_DRM_I915_CAPTURE_ERROR=y
+CONFIG_DRM_I915_COMPRESS_ERROR=y
+CONFIG_DRM_I915_USERPTR=y
+CONFIG_DRM_I915_GVT=y
+CONFIG_DRM_I915_GVT_KVMGT=m
+
+#
+# drm/i915 Debugging
+#
+# CONFIG_DRM_I915_WERROR is not set
+# CONFIG_DRM_I915_DEBUG is not set
+# CONFIG_DRM_I915_DEBUG_MMIO is not set
+# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
+# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
+# CONFIG_DRM_I915_DEBUG_GUC is not set
+# CONFIG_DRM_I915_SELFTEST is not set
+# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
+# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
+# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
+# end of drm/i915 Debugging
+
+#
+# drm/i915 Profile Guided Optimisation
+#
+CONFIG_DRM_I915_REQUEST_TIMEOUT=20000
+CONFIG_DRM_I915_FENCE_TIMEOUT=10000
+CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
+CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
+CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
+CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
+CONFIG_DRM_I915_STOP_TIMEOUT=100
+CONFIG_DRM_I915_TIMESLICE_DURATION=1
+# end of drm/i915 Profile Guided Optimisation
+
+CONFIG_DRM_VGEM=m
+# CONFIG_DRM_VKMS is not set
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+# CONFIG_DRM_VMWGFX_MKSSTATS is not set
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+# CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+CONFIG_DRM_ANALOGIX_DP=m
+# end of Display Interface Bridges
+
+# CONFIG_DRM_ETNAVIV is not set
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_GM12U320=m
+# CONFIG_DRM_SIMPLEDRM is not set
+CONFIG_TINYDRM_HX8357D=m
+CONFIG_TINYDRM_ILI9225=m
+CONFIG_TINYDRM_ILI9341=m
+CONFIG_TINYDRM_ILI9486=m
+CONFIG_TINYDRM_MI0283QT=m
+CONFIG_TINYDRM_REPAPER=m
+CONFIG_TINYDRM_ST7586=m
+CONFIG_TINYDRM_ST7735R=m
+# CONFIG_DRM_XEN_FRONTEND is not set
+CONFIG_DRM_VBOXVIDEO=m
+CONFIG_DRM_GUD=m
+CONFIG_DRM_HYPERV=m
+CONFIG_DRM_LEGACY=y
+# CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_R128 is not set
+# CONFIG_DRM_MGA is not set
+# CONFIG_DRM_SIS is not set
+# CONFIG_DRM_VIA is not set
+# CONFIG_DRM_SAVAGE is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+CONFIG_FB_BACKLIGHT=m
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
+CONFIG_FB_ARC=m
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+CONFIG_FB_OPENCORES=m
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_I740=m
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_VIA_X_COMPATIBILITY=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+# CONFIG_FB_SM501 is not set
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
+CONFIG_FB_IBM_GXT4500=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=y
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_HYPERV=m
+# CONFIG_FB_SIMPLE is not set
+CONFIG_FB_SSD1307=m
+CONFIG_FB_SM712=m
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+CONFIG_LCD_PLATFORM=m
+# CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
+# CONFIG_LCD_OTM3225A is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_KTD253=m
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_QCOM_WLED=m
+CONFIG_BACKLIGHT_RT4831=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+CONFIG_BACKLIGHT_PCF50633=m
+CONFIG_BACKLIGHT_LM3630A=m
+CONFIG_BACKLIGHT_LM3639=m
+CONFIG_BACKLIGHT_LP855X=m
+CONFIG_BACKLIGHT_SKY81452=m
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
+CONFIG_BACKLIGHT_ARCXCNN=m
+# end of Backlight & LCD device support
+
+CONFIG_VGASTATE=m
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+# end of Console display driver support
+
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_LOGO_LINUX_CLUT224=y
+# end of Graphics support
+
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_CTL_LED=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_SEQUENCER_OSS=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_VIRMIDI=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+CONFIG_SND_PCSP=m
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_GENERIC_LEDS=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=0
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CS8409=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y
+# end of HD-Audio
+
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
+CONFIG_SND_HDA_I915=y
+CONFIG_SND_HDA_EXT_CORE=m
+CONFIG_SND_HDA_PREALLOC_SIZE=0
+CONFIG_SND_INTEL_NHLT=y
+CONFIG_SND_INTEL_DSP_CONFIG=m
+CONFIG_SND_INTEL_SOUNDWIRE_ACPI=m
+# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+CONFIG_SND_FIREWIRE_MOTU=m
+CONFIG_SND_FIREFACE=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_COMPRESS=y
+CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ACPI=m
+CONFIG_SND_SOC_ADI=m
+CONFIG_SND_SOC_ADI_AXI_I2S=m
+CONFIG_SND_SOC_ADI_AXI_SPDIF=m
+CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
+CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_SOC_AMD_ACP3x=m
+CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
+CONFIG_SND_SOC_AMD_RENOIR=m
+CONFIG_SND_SOC_AMD_RENOIR_MACH=m
+CONFIG_SND_SOC_AMD_ACP5x=m
+# CONFIG_SND_ATMEL_SOC is not set
+# CONFIG_SND_BCM63XX_I2S_WHISTLER is not set
+CONFIG_SND_DESIGNWARE_I2S=m
+CONFIG_SND_DESIGNWARE_PCM=y
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+# CONFIG_SND_SOC_FSL_ASRC is not set
+# CONFIG_SND_SOC_FSL_SAI is not set
+# CONFIG_SND_SOC_FSL_AUDMIX is not set
+# CONFIG_SND_SOC_FSL_SSI is not set
+# CONFIG_SND_SOC_FSL_SPDIF is not set
+# CONFIG_SND_SOC_FSL_ESAI is not set
+# CONFIG_SND_SOC_FSL_MICFIL is not set
+# CONFIG_SND_SOC_FSL_XCVR is not set
+# CONFIG_SND_SOC_FSL_RPMSG is not set
+# CONFIG_SND_SOC_IMX_AUDMUX is not set
+# end of SoC Audio for Freescale CPUs
+
+CONFIG_SND_I2S_HI6210_I2S=m
+# CONFIG_SND_SOC_IMG is not set
+CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
+CONFIG_SND_SOC_INTEL_SST=m
+CONFIG_SND_SOC_INTEL_CATPT=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
+CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_INTEL_SKL=m
+CONFIG_SND_SOC_INTEL_APL=m
+CONFIG_SND_SOC_INTEL_KBL=m
+CONFIG_SND_SOC_INTEL_GLK=m
+CONFIG_SND_SOC_INTEL_CNL=m
+CONFIG_SND_SOC_INTEL_CFL=m
+CONFIG_SND_SOC_INTEL_CML_H=m
+CONFIG_SND_SOC_INTEL_CML_LP=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
+CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
+CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
+CONFIG_SND_SOC_INTEL_MACH=y
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
+CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
+CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
+CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
+CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_WM5102_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
+CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
+CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
+# CONFIG_SND_SOC_MTK_BTCVSD is not set
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI_DEV=m
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_ACPI_DEV=m
+# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set
+# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set
+CONFIG_SND_SOC_SOF=m
+CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
+CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
+CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
+CONFIG_SND_SOC_SOF_INTEL_COMMON=m
+CONFIG_SND_SOC_SOF_BAYTRAIL=m
+CONFIG_SND_SOC_SOF_BROADWELL=m
+CONFIG_SND_SOC_SOF_MERRIFIELD=m
+CONFIG_SND_SOC_SOF_INTEL_APL=m
+CONFIG_SND_SOC_SOF_APOLLOLAKE=m
+CONFIG_SND_SOC_SOF_GEMINILAKE=m
+CONFIG_SND_SOC_SOF_INTEL_CNL=m
+CONFIG_SND_SOC_SOF_CANNONLAKE=m
+CONFIG_SND_SOC_SOF_COFFEELAKE=m
+CONFIG_SND_SOC_SOF_COMETLAKE=m
+CONFIG_SND_SOC_SOF_INTEL_ICL=m
+CONFIG_SND_SOC_SOF_ICELAKE=m
+CONFIG_SND_SOC_SOF_JASPERLAKE=m
+CONFIG_SND_SOC_SOF_INTEL_TGL=m
+CONFIG_SND_SOC_SOF_TIGERLAKE=m
+CONFIG_SND_SOC_SOF_ELKHARTLAKE=m
+CONFIG_SND_SOC_SOF_ALDERLAKE=m
+CONFIG_SND_SOC_SOF_HDA_COMMON=m
+CONFIG_SND_SOC_SOF_HDA_LINK=y
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_HDA=m
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
+CONFIG_SND_SOC_SOF_XTENSA=m
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+# CONFIG_SND_SOC_XILINX_I2S is not set
+# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
+# CONFIG_SND_SOC_XILINX_SPDIF is not set
+# CONFIG_SND_SOC_XTFPGA_I2S is not set
+CONFIG_SND_SOC_I2C_AND_SPI=m
+
+#
+# CODEC drivers
+#
+CONFIG_SND_SOC_ARIZONA=m
+CONFIG_SND_SOC_WM_ADSP=m
+CONFIG_SND_SOC_AC97_CODEC=m
+CONFIG_SND_SOC_ADAU_UTILS=m
+CONFIG_SND_SOC_ADAU1372=m
+CONFIG_SND_SOC_ADAU1372_I2C=m
+CONFIG_SND_SOC_ADAU1372_SPI=m
+# CONFIG_SND_SOC_ADAU1701 is not set
+CONFIG_SND_SOC_ADAU17X1=m
+CONFIG_SND_SOC_ADAU1761=m
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
+CONFIG_SND_SOC_ADAU7002=m
+CONFIG_SND_SOC_ADAU7118=m
+CONFIG_SND_SOC_ADAU7118_HW=m
+CONFIG_SND_SOC_ADAU7118_I2C=m
+# CONFIG_SND_SOC_AK4104 is not set
+# CONFIG_SND_SOC_AK4118 is not set
+# CONFIG_SND_SOC_AK4458 is not set
+# CONFIG_SND_SOC_AK4554 is not set
+# CONFIG_SND_SOC_AK4613 is not set
+# CONFIG_SND_SOC_AK4642 is not set
+# CONFIG_SND_SOC_AK5386 is not set
+CONFIG_SND_SOC_AK5558=m
+# CONFIG_SND_SOC_ALC5623 is not set
+CONFIG_SND_SOC_BD28623=m
+# CONFIG_SND_SOC_BT_SCO is not set
+CONFIG_SND_SOC_CROS_EC_CODEC=m
+# CONFIG_SND_SOC_CS35L32 is not set
+# CONFIG_SND_SOC_CS35L33 is not set
+CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
+CONFIG_SND_SOC_CS35L36=m
+CONFIG_SND_SOC_CS42L42=m
+# CONFIG_SND_SOC_CS42L51_I2C is not set
+# CONFIG_SND_SOC_CS42L52 is not set
+# CONFIG_SND_SOC_CS42L56 is not set
+# CONFIG_SND_SOC_CS42L73 is not set
+CONFIG_SND_SOC_CS4234=m
+# CONFIG_SND_SOC_CS4265 is not set
+# CONFIG_SND_SOC_CS4270 is not set
+# CONFIG_SND_SOC_CS4271_I2C is not set
+# CONFIG_SND_SOC_CS4271_SPI is not set
+# CONFIG_SND_SOC_CS42XX8_I2C is not set
+CONFIG_SND_SOC_CS43130=m
+# CONFIG_SND_SOC_CS4341 is not set
+# CONFIG_SND_SOC_CS4349 is not set
+# CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_CX2072X=m
+CONFIG_SND_SOC_DA7213=m
+CONFIG_SND_SOC_DA7219=m
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_ES7134=m
+CONFIG_SND_SOC_ES7241=m
+CONFIG_SND_SOC_ES8316=m
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
+# CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDAC_HDMI=m
+CONFIG_SND_SOC_HDAC_HDA=m
+# CONFIG_SND_SOC_ICS43432 is not set
+# CONFIG_SND_SOC_INNO_RK3036 is not set
+CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98357A=m
+# CONFIG_SND_SOC_MAX98504 is not set
+CONFIG_SND_SOC_MAX9867=m
+CONFIG_SND_SOC_MAX98927=m
+CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX98373_I2C=m
+CONFIG_SND_SOC_MAX98373_SDW=m
+CONFIG_SND_SOC_MAX98390=m
+# CONFIG_SND_SOC_MAX9860 is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+# CONFIG_SND_SOC_PCM1681 is not set
+CONFIG_SND_SOC_PCM1789=m
+CONFIG_SND_SOC_PCM1789_I2C=m
+# CONFIG_SND_SOC_PCM179X_I2C is not set
+# CONFIG_SND_SOC_PCM179X_SPI is not set
+CONFIG_SND_SOC_PCM186X=m
+CONFIG_SND_SOC_PCM186X_I2C=m
+CONFIG_SND_SOC_PCM186X_SPI=m
+CONFIG_SND_SOC_PCM3060=m
+CONFIG_SND_SOC_PCM3060_I2C=m
+CONFIG_SND_SOC_PCM3060_SPI=m
+# CONFIG_SND_SOC_PCM3168A_I2C is not set
+# CONFIG_SND_SOC_PCM3168A_SPI is not set
+# CONFIG_SND_SOC_PCM5102A is not set
+CONFIG_SND_SOC_PCM512x=m
+CONFIG_SND_SOC_PCM512x_I2C=m
+# CONFIG_SND_SOC_PCM512x_SPI is not set
+# CONFIG_SND_SOC_RK3328 is not set
+CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RL6347A=m
+CONFIG_SND_SOC_RT286=m
+CONFIG_SND_SOC_RT298=m
+CONFIG_SND_SOC_RT1011=m
+CONFIG_SND_SOC_RT1015=m
+CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308=m
+CONFIG_SND_SOC_RT1308_SDW=m
+CONFIG_SND_SOC_RT1316_SDW=m
+CONFIG_SND_SOC_RT5514=m
+CONFIG_SND_SOC_RT5514_SPI=m
+# CONFIG_SND_SOC_RT5616 is not set
+# CONFIG_SND_SOC_RT5631 is not set
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_RT5645=m
+CONFIG_SND_SOC_RT5651=m
+CONFIG_SND_SOC_RT5659=m
+CONFIG_SND_SOC_RT5660=m
+CONFIG_SND_SOC_RT5663=m
+CONFIG_SND_SOC_RT5670=m
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
+CONFIG_SND_SOC_RT5682=m
+CONFIG_SND_SOC_RT5682_I2C=m
+CONFIG_SND_SOC_RT5682_SDW=m
+CONFIG_SND_SOC_RT700=m
+CONFIG_SND_SOC_RT700_SDW=m
+CONFIG_SND_SOC_RT711=m
+CONFIG_SND_SOC_RT711_SDW=m
+CONFIG_SND_SOC_RT711_SDCA_SDW=m
+CONFIG_SND_SOC_RT715=m
+CONFIG_SND_SOC_RT715_SDW=m
+CONFIG_SND_SOC_RT715_SDCA_SDW=m
+CONFIG_SND_SOC_SDW_MOCKUP=m
+# CONFIG_SND_SOC_SGTL5000 is not set
+CONFIG_SND_SOC_SIGMADSP=m
+CONFIG_SND_SOC_SIGMADSP_REGMAP=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+CONFIG_SND_SOC_SIMPLE_MUX=m
+CONFIG_SND_SOC_SPDIF=m
+# CONFIG_SND_SOC_SSM2305 is not set
+CONFIG_SND_SOC_SSM2518=m
+# CONFIG_SND_SOC_SSM2602_SPI is not set
+# CONFIG_SND_SOC_SSM2602_I2C is not set
+CONFIG_SND_SOC_SSM4567=m
+# CONFIG_SND_SOC_STA32X is not set
+# CONFIG_SND_SOC_STA350 is not set
+# CONFIG_SND_SOC_STI_SAS is not set
+# CONFIG_SND_SOC_TAS2552 is not set
+CONFIG_SND_SOC_TAS2562=m
+CONFIG_SND_SOC_TAS2764=m
+CONFIG_SND_SOC_TAS2770=m
+# CONFIG_SND_SOC_TAS5086 is not set
+# CONFIG_SND_SOC_TAS571X is not set
+# CONFIG_SND_SOC_TAS5720 is not set
+CONFIG_SND_SOC_TAS6424=m
+CONFIG_SND_SOC_TDA7419=m
+# CONFIG_SND_SOC_TFA9879 is not set
+CONFIG_SND_SOC_TFA989X=m
+# CONFIG_SND_SOC_TLV320AIC23_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
+# CONFIG_SND_SOC_TLV320AIC31XX is not set
+CONFIG_SND_SOC_TLV320AIC32X4=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320AIC3X_I2C=m
+CONFIG_SND_SOC_TLV320AIC3X_SPI=m
+CONFIG_SND_SOC_TLV320ADCX140=m
+CONFIG_SND_SOC_TS3A227E=m
+CONFIG_SND_SOC_TSCS42XX=m
+# CONFIG_SND_SOC_TSCS454 is not set
+# CONFIG_SND_SOC_UDA1334 is not set
+# CONFIG_SND_SOC_WCD938X_SDW is not set
+CONFIG_SND_SOC_WM5102=m
+# CONFIG_SND_SOC_WM8510 is not set
+# CONFIG_SND_SOC_WM8523 is not set
+CONFIG_SND_SOC_WM8524=m
+# CONFIG_SND_SOC_WM8580 is not set
+# CONFIG_SND_SOC_WM8711 is not set
+# CONFIG_SND_SOC_WM8728 is not set
+# CONFIG_SND_SOC_WM8731 is not set
+# CONFIG_SND_SOC_WM8737 is not set
+# CONFIG_SND_SOC_WM8741 is not set
+# CONFIG_SND_SOC_WM8750 is not set
+# CONFIG_SND_SOC_WM8753 is not set
+# CONFIG_SND_SOC_WM8770 is not set
+# CONFIG_SND_SOC_WM8776 is not set
+# CONFIG_SND_SOC_WM8782 is not set
+CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8804_I2C=m
+# CONFIG_SND_SOC_WM8804_SPI is not set
+# CONFIG_SND_SOC_WM8903 is not set
+# CONFIG_SND_SOC_WM8904 is not set
+# CONFIG_SND_SOC_WM8960 is not set
+# CONFIG_SND_SOC_WM8962 is not set
+# CONFIG_SND_SOC_WM8974 is not set
+# CONFIG_SND_SOC_WM8978 is not set
+# CONFIG_SND_SOC_WM8985 is not set
+# CONFIG_SND_SOC_WSA881X is not set
+CONFIG_SND_SOC_ZL38060=m
+CONFIG_SND_SOC_MAX9759=m
+# CONFIG_SND_SOC_MT6351 is not set
+# CONFIG_SND_SOC_MT6358 is not set
+# CONFIG_SND_SOC_MT6660 is not set
+# CONFIG_SND_SOC_NAU8315 is not set
+CONFIG_SND_SOC_NAU8540=m
+# CONFIG_SND_SOC_NAU8810 is not set
+# CONFIG_SND_SOC_NAU8822 is not set
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_NAU8825=m
+# CONFIG_SND_SOC_TPA6130A2 is not set
+# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
+# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
+CONFIG_SND_SOC_LPASS_RX_MACRO=m
+CONFIG_SND_SOC_LPASS_TX_MACRO=m
+# end of CODEC drivers
+
+CONFIG_SND_SIMPLE_CARD_UTILS=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_X86=y
+CONFIG_HDMI_LPE_AUDIO=m
+CONFIG_SND_SYNTH_EMUX=m
+# CONFIG_SND_XEN_FRONTEND is not set
+CONFIG_SND_VIRTIO=m
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACCUTOUCH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_ASUS=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_BIGBEN_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CREATIVE_SB0540=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_FT260=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_GLORIOUS=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_GOOGLE_HAMMER=m
+CONFIG_HID_VIVALDI=m
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_VIEWSONIC=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MALTRON=m
+CONFIG_HID_MAYFLASH=m
+CONFIG_HID_REDRAGON=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTI=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PLAYSTATION=m
+CONFIG_PLAYSTATION_FF=y
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_RETRODE=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
+CONFIG_HID_MCP2221=m
+# end of Special HID drivers
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID_ACPI=m
+# end of I2C HID support
+
+CONFIG_I2C_HID_CORE=m
+
+#
+# Intel ISH HID support
+#
+CONFIG_INTEL_ISH_HID=m
+CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
+# end of Intel ISH HID support
+
+#
+# AMD SFH HID Support
+#
+CONFIG_AMD_SFH_HID=m
+# end of AMD SFH HID Support
+
+#
+# Surface System Aggregator Module HID support
+#
+CONFIG_SURFACE_HID=m
+CONFIG_SURFACE_KBD=m
+# end of Surface System Aggregator Module HID support
+
+CONFIG_SURFACE_HID_CORE=m
+# end of HID support
+
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=m
+# CONFIG_USB_CONN_GPIO is not set
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=y
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_FEW_INIT_RETRIES is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_OTG=y
+# CONFIG_USB_OTG_PRODUCTLIST is not set
+# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
+# CONFIG_USB_OTG_FSM is not set
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=y
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_DBGCAP=y
+CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+# CONFIG_USB_EHCI_FSL is not set
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_FOTG210_HCD=m
+# CONFIG_USB_MAX3421_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
+CONFIG_USB_OHCI_HCD_SSB=y
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD_ISO is not set
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+# CONFIG_USB_HCD_BCMA is not set
+CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
+CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_USB_CDNS_SUPPORT=m
+# CONFIG_USB_CDNS3 is not set
+CONFIG_USB_CDNSP_PCI=m
+# CONFIG_USB_CDNSP_HOST is not set
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_HOST=y
+
+#
+# Platform Glue Layer
+#
+
+#
+# MUSB DMA mode
+#
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_ULPI is not set
+CONFIG_USB_DWC3_HOST=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_PCI=m
+# CONFIG_USB_DWC3_HAPS is not set
+# CONFIG_USB_DWC2 is not set
+CONFIG_USB_CHIPIDEA=m
+# CONFIG_USB_CHIPIDEA_HOST is not set
+CONFIG_USB_CHIPIDEA_MSM=m
+CONFIG_USB_CHIPIDEA_GENERIC=m
+CONFIG_USB_ISP1760=m
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1760_HOST_ROLE=y
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_F8153X=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_UPD78F0730=m
+CONFIG_USB_SERIAL_XR=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_APPLE_MFI_FASTCHARGE=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HUB_USB251XB=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
+CONFIG_USB_LINK_LAYER_TEST=m
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_TAHVO_USB is not set
+# CONFIG_USB_ISP1301 is not set
+# end of USB Physical Layer drivers
+
+# CONFIG_USB_GADGET is not set
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_TCPCI=m
+CONFIG_TYPEC_RT1711H=m
+CONFIG_TYPEC_TCPCI_MAXIM=m
+CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_WCOVE=m
+CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_CCG=m
+CONFIG_UCSI_ACPI=m
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_HD3SS3220=m
+CONFIG_TYPEC_STUSB160X=m
+
+#
+# USB Type-C Multiplexer/DeMultiplexer Switch support
+#
+CONFIG_TYPEC_MUX_PI3USB30532=m
+CONFIG_TYPEC_MUX_INTEL_PMC=m
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
+
+#
+# USB Type-C Alternate Mode drivers
+#
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_MMC=m
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+CONFIG_MMC_CRYPTO=y
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+# CONFIG_MMC_SDHCI_F_SDH30 is not set
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_ALCOR=m
+CONFIG_MMC_TIFM_SD=m
+# CONFIG_MMC_SPI is not set
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+CONFIG_MMC_USDHI6ROL0=m
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_CQHCI=m
+CONFIG_MMC_HSQ=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_MTK=m
+CONFIG_MMC_SDHCI_XENON=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS_FLASH=m
+CONFIG_LEDS_CLASS_MULTICOLOR=m
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_APU=m
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_MT6323=m
+CONFIG_LEDS_PCA9532=m
+# CONFIG_LEDS_PCA9532_GPIO is not set
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_LP50XX=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA955X_GPIO is not set
+CONFIG_LEDS_PCA963X=m
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_PWM is not set
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_MENF21BMC=m
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_MLXCPLD=m
+CONFIG_LEDS_MLXREG=m
+CONFIG_LEDS_USER=m
+CONFIG_LEDS_NIC78BX=m
+CONFIG_LEDS_TI_LMU_COMMON=m
+CONFIG_LEDS_LM36274=m
+CONFIG_LEDS_TPS6105X=m
+
+#
+# Flash and Torch LED drivers
+#
+CONFIG_LEDS_AS3645A=m
+CONFIG_LEDS_LM3601X=m
+# CONFIG_LEDS_RT8515 is not set
+CONFIG_LEDS_SGM3140=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+# CONFIG_LEDS_TRIGGER_CPU is not set
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
+CONFIG_LEDS_TRIGGER_PATTERN=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
+CONFIG_LEDS_TRIGGER_TTY=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_VIRT_DMA=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_QIB=m
+CONFIG_INFINIBAND_QIB_DCA=y
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
+CONFIG_INFINIBAND_IRDMA=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+CONFIG_INFINIBAND_USNIC=m
+CONFIG_INFINIBAND_HFI1=m
+# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
+# CONFIG_SDMA_VERBOSITY is not set
+CONFIG_INFINIBAND_QEDR=m
+CONFIG_INFINIBAND_RDMAVT=m
+CONFIG_RDMA_RXE=m
+CONFIG_RDMA_SIW=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_INFINIBAND_RTRS=m
+CONFIG_INFINIBAND_RTRS_CLIENT=m
+CONFIG_INFINIBAND_RTRS_SERVER=m
+CONFIG_INFINIBAND_OPA_VNIC=m
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC=y
+CONFIG_EDAC_LEGACY_SYSFS=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=m
+CONFIG_EDAC_GHES=y
+CONFIG_EDAC_AMD64=m
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_I82975X=m
+CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I3200=m
+CONFIG_EDAC_IE31200=m
+CONFIG_EDAC_X38=m
+CONFIG_EDAC_I5400=m
+CONFIG_EDAC_I7CORE=m
+CONFIG_EDAC_I5000=m
+CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I7300=m
+CONFIG_EDAC_SBRIDGE=m
+CONFIG_EDAC_SKX=m
+CONFIG_EDAC_I10NM=m
+CONFIG_EDAC_PND2=m
+CONFIG_EDAC_IGEN6=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_MC146818_LIB=y
+CONFIG_RTC_CLASS=y
+# CONFIG_RTC_HCTOSYS is not set
+# CONFIG_RTC_SYSTOHC is not set
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_ABB5ZES3=m
+CONFIG_RTC_DRV_ABEOZ9=m
+CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_DS1307=m
+# CONFIG_RTC_DRV_DS1307_CENTURY is not set
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1374_WDT=y
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF85363=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3028=m
+CONFIG_RTC_DRV_RV3032=m
+CONFIG_RTC_DRV_RV8803=m
+CONFIG_RTC_DRV_SD3078=m
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1302 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1343 is not set
+# CONFIG_RTC_DRV_DS1347 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6916 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_MCP795 is not set
+CONFIG_RTC_I2C_AND_SPI=m
+
+#
+# SPI and I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_DS3232_HWMON=y
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV3029_HWMON=y
+# CONFIG_RTC_DRV_RX6110 is not set
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_CROS_EC=m
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_FTRTC010 is not set
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_MT6397=m
+
+#
+# HID Sensor RTC drivers
+#
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+# CONFIG_RTC_DRV_GOLDFISH is not set
+CONFIG_RTC_DRV_WILCO_EC=m
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_DMA_ACPI=y
+CONFIG_ALTERA_MSGDMA=m
+CONFIG_INTEL_IDMA64=m
+# CONFIG_INTEL_IDXD is not set
+# CONFIG_INTEL_IDXD_COMPAT is not set
+CONFIG_INTEL_IOATDMA=m
+CONFIG_PLX_DMA=m
+# CONFIG_AMD_PTDMA is not set
+# CONFIG_QCOM_HIDMA_MGMT is not set
+# CONFIG_QCOM_HIDMA is not set
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
+CONFIG_HSU_DMA=m
+# CONFIG_SF_PDMA is not set
+CONFIG_INTEL_LDMA=y
+
+#
+# DMA Clients
+#
+# CONFIG_ASYNC_TX_DMA is not set
+CONFIG_DMATEST=m
+CONFIG_DMA_ENGINE_RAID=y
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+CONFIG_UDMABUF=y
+# CONFIG_DMABUF_MOVE_NOTIFY is not set
+# CONFIG_DMABUF_DEBUG is not set
+# CONFIG_DMABUF_SELFTESTS is not set
+CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_SYSFS_STATS is not set
+CONFIG_DMABUF_HEAPS_SYSTEM=y
+CONFIG_DMABUF_HEAPS_CMA=y
+# end of DMABUF options
+
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+CONFIG_CHARLCD=m
+CONFIG_HD44780_COMMON=m
+CONFIG_HD44780=m
+# CONFIG_KS0108 is not set
+# CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_LCD2S is not set
+# CONFIG_PARPORT_PANEL is not set
+# CONFIG_PANEL_CHANGE_MESSAGE is not set
+# CONFIG_CHARLCD_BL_OFF is not set
+# CONFIG_CHARLCD_BL_ON is not set
+CONFIG_CHARLCD_BL_FLASH=y
+# CONFIG_PANEL is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_UIO_PRUSS=m
+CONFIG_UIO_MF624=m
+CONFIG_UIO_HV_GENERIC=m
+CONFIG_VFIO=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO_VIRQFD=m
+# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_PCI_CORE=m
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VFIO_PCI_IGD=y
+CONFIG_VFIO_MDEV=m
+CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VBOXGUEST=m
+CONFIG_NITRO_ENCLAVES=m
+CONFIG_ACRN_HSM=m
+CONFIG_VIRTIO=y
+CONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS=y
+CONFIG_VIRTIO_PCI_LIB=m
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_VDPA=m
+CONFIG_VIRTIO_PMEM=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MEM=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
+CONFIG_VDPA=m
+CONFIG_VDPA_SIM=m
+# CONFIG_VDPA_SIM_NET is not set
+# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_USER=m
+CONFIG_IFCVF=m
+CONFIG_MLX5_VDPA=y
+CONFIG_MLX5_VDPA_NET=m
+CONFIG_VP_VDPA=m
+CONFIG_VHOST_IOTLB=m
+CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
+CONFIG_VHOST_MENU=y
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_VDPA=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_TIMER=y
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+# end of Microsoft Hyper-V guest support
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
+CONFIG_XEN_DEV_EVTCHN=y
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=y
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+# CONFIG_XEN_GRANT_DMA_ALLOC is not set
+CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PVCALLS_FRONTEND=m
+CONFIG_XEN_PVCALLS_BACKEND=y
+CONFIG_XEN_SCSI_BACKEND=m
+CONFIG_XEN_PRIVCMD=y
+CONFIG_XEN_ACPI_PROCESSOR=m
+CONFIG_XEN_MCE_LOG=y
+CONFIG_XEN_HAVE_PVMMU=y
+CONFIG_XEN_EFI=y
+CONFIG_XEN_AUTO_XLATE=y
+CONFIG_XEN_ACPI=y
+CONFIG_XEN_SYMS=y
+CONFIG_XEN_HAVE_VPMU=y
+CONFIG_XEN_UNPOPULATED_ALLOC=y
+# end of Xen driver support
+
+# CONFIG_GREYBUS is not set
+# CONFIG_COMEDI is not set
+CONFIG_STAGING=y
+CONFIG_PRISM2_USB=m
+CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_RTL8192E=m
+CONFIG_RTL8723BS=m
+CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_RTS5208=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16240 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7816 is not set
+# CONFIG_AD7280 is not set
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+CONFIG_ADT7316=m
+CONFIG_ADT7316_SPI=m
+CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
+
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7746=m
+# end of Capacitance to digital converters
+
+#
+# Direct Digital Synthesis
+#
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
+
+#
+# Active energy metering IC
+#
+CONFIG_ADE7854=m
+CONFIG_ADE7854_I2C=m
+CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S1210 is not set
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+CONFIG_FB_SM750=m
+CONFIG_STAGING_MEDIA=y
+CONFIG_INTEL_ATOMISP=y
+CONFIG_VIDEO_ATOMISP=m
+# CONFIG_VIDEO_ATOMISP_ISP2401 is not set
+# CONFIG_VIDEO_ATOMISP_OV2722 is not set
+# CONFIG_VIDEO_ATOMISP_GC2235 is not set
+# CONFIG_VIDEO_ATOMISP_MSRLIST_HELPER is not set
+# CONFIG_VIDEO_ATOMISP_MT9M114 is not set
+# CONFIG_VIDEO_ATOMISP_GC0310 is not set
+# CONFIG_VIDEO_ATOMISP_OV2680 is not set
+# CONFIG_VIDEO_ATOMISP_OV5693 is not set
+# CONFIG_VIDEO_ATOMISP_LM3554 is not set
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+# CONFIG_VIDEO_IPU3_IMGU is not set
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_SP8870=m
+
+#
+# Android
+#
+# end of Android
+
+CONFIG_LTE_GDM724X=m
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_FWTTY_MAX_TOTAL_PORTS=64
+CONFIG_FWTTY_MAX_CARD_PORTS=32
+# CONFIG_GS_FPGABOOT is not set
+# CONFIG_UNISYSSPAR is not set
+# CONFIG_FB_TFT is not set
+# CONFIG_KS7010 is not set
+# CONFIG_PI433 is not set
+# CONFIG_FIELDBUS_DEV is not set
+CONFIG_QLGE=m
+# CONFIG_WFX is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACPI_WMI=m
+CONFIG_WMI_BMOF=m
+CONFIG_HUAWEI_WMI=m
+CONFIG_MXM_WMI=m
+CONFIG_PEAQ_WMI=m
+CONFIG_XIAOMI_WMI=m
+CONFIG_GIGABYTE_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ACER_WIRELESS=m
+CONFIG_ACER_WMI=m
+CONFIG_AMD_PMC=m
+CONFIG_ADV_SWBUTTON=m
+CONFIG_APPLE_GMUX=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_ASUS_WIRELESS=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+# CONFIG_MERAKI_MX100 is not set
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_EEEPC_WMI=m
+CONFIG_X86_PLATFORM_DRIVERS_DELL=y
+CONFIG_ALIENWARE_WMI=m
+CONFIG_DCDBAS=m
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_RBU=m
+CONFIG_DELL_RBTN=m
+CONFIG_DELL_SMBIOS=m
+CONFIG_DELL_SMBIOS_WMI=y
+CONFIG_DELL_SMBIOS_SMM=y
+CONFIG_DELL_SMO8800=m
+CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_PRIVACY=y
+CONFIG_DELL_WMI_AIO=m
+CONFIG_DELL_WMI_DESCRIPTOR=m
+CONFIG_DELL_WMI_LED=m
+CONFIG_DELL_WMI_SYSMAN=m
+CONFIG_AMILO_RFKILL=m
+CONFIG_FUJITSU_LAPTOP=m
+CONFIG_FUJITSU_TABLET=m
+CONFIG_GPD_POCKET_FAN=m
+CONFIG_X86_PLATFORM_DRIVERS_HP=y
+CONFIG_HP_ACCEL=m
+CONFIG_HP_WMI=m
+CONFIG_WIRELESS_HOTKEY=m
+CONFIG_IBM_RTL=m
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_SENSORS_HDAPS=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_THINKPAD_LMI=m
+CONFIG_INTEL_ATOMISP2_PDX86=y
+CONFIG_INTEL_ATOMISP2_LED=m
+# CONFIG_INTEL_SAR_INT1092 is not set
+CONFIG_INTEL_CHT_INT33FE=m
+CONFIG_INTEL_SKL_INT3472=m
+CONFIG_INTEL_PMC_CORE=y
+CONFIG_INTEL_PMT_CLASS=m
+CONFIG_INTEL_PMT_TELEMETRY=m
+CONFIG_INTEL_PMT_CRASHLOG=m
+
+#
+# Intel Speed Select Technology interface support
+#
+CONFIG_INTEL_SPEED_SELECT_INTERFACE=m
+# end of Intel Speed Select Technology interface support
+
+# CONFIG_INTEL_TELEMETRY is not set
+CONFIG_INTEL_WMI=y
+CONFIG_INTEL_WMI_SBL_FW_UPDATE=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
+CONFIG_INTEL_HID_EVENT=m
+CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_INT0002_VGPIO=m
+CONFIG_INTEL_OAKTRAIL=m
+CONFIG_INTEL_BXTWC_PMIC_TMU=m
+CONFIG_INTEL_CHTDC_TI_PWRBTN=m
+CONFIG_INTEL_MRFLD_PWRBTN=m
+CONFIG_INTEL_PUNIT_IPC=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=m
+CONFIG_INTEL_TURBO_MAX_3=y
+CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_MSI_WMI=m
+CONFIG_PCENGINES_APU2=m
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_SAMSUNG_Q10=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_TOSHIBA_HAPS=m
+CONFIG_TOSHIBA_WMI=m
+CONFIG_ACPI_CMPC=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_LG_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_SYSTEM76_ACPI=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_I2C_MULTI_INSTANTIATE=m
+CONFIG_MLX_PLATFORM=m
+CONFIG_FW_ATTR_CLASS=m
+CONFIG_INTEL_IPS=m
+CONFIG_INTEL_SCU_IPC=y
+CONFIG_INTEL_SCU=y
+CONFIG_INTEL_SCU_PCI=y
+CONFIG_INTEL_SCU_PLATFORM=m
+CONFIG_INTEL_SCU_IPC_UTIL=m
+CONFIG_PMC_ATOM=y
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_CHROMEOS_PSTORE=m
+CONFIG_CHROMEOS_TBMC=m
+CONFIG_CROS_EC=m
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_ISHTP=m
+# CONFIG_CROS_EC_SPI is not set
+CONFIG_CROS_EC_LPC=m
+CONFIG_CROS_EC_PROTO=y
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LIGHTBAR=m
+# CONFIG_CROS_EC_DEBUGFS is not set
+CONFIG_CROS_EC_SENSORHUB=m
+CONFIG_CROS_EC_SYSFS=m
+CONFIG_CROS_EC_TYPEC=m
+CONFIG_CROS_USBPD_LOGGER=m
+CONFIG_CROS_USBPD_NOTIFY=m
+CONFIG_WILCO_EC=m
+# CONFIG_WILCO_EC_DEBUGFS is not set
+# CONFIG_WILCO_EC_EVENTS is not set
+# CONFIG_WILCO_EC_TELEMETRY is not set
+CONFIG_MELLANOX_PLATFORM=y
+CONFIG_MLXREG_HOTPLUG=m
+CONFIG_MLXREG_IO=m
+CONFIG_SURFACE_PLATFORMS=y
+# CONFIG_SURFACE3_WMI is not set
+CONFIG_SURFACE_3_BUTTON=m
+CONFIG_SURFACE_3_POWER_OPREGION=m
+CONFIG_SURFACE_ACPI_NOTIFY=m
+CONFIG_SURFACE_AGGREGATOR_CDEV=m
+CONFIG_SURFACE_AGGREGATOR_REGISTRY=m
+CONFIG_SURFACE_DTX=m
+CONFIG_SURFACE_GPE=m
+CONFIG_SURFACE_HOTPLUG=m
+CONFIG_SURFACE_PLATFORM_PROFILE=m
+CONFIG_SURFACE_PRO3_BUTTON=m
+CONFIG_SURFACE_AGGREGATOR=m
+CONFIG_SURFACE_AGGREGATOR_BUS=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+
+#
+# Clock driver for ARM Reference designs
+#
+# CONFIG_ICST is not set
+# CONFIG_CLK_SP810 is not set
+# end of Clock driver for ARM Reference designs
+
+# CONFIG_LMK04832 is not set
+# CONFIG_COMMON_CLK_MAX9485 is not set
+# CONFIG_COMMON_CLK_SI5341 is not set
+CONFIG_COMMON_CLK_SI5351=m
+CONFIG_COMMON_CLK_SI544=m
+CONFIG_COMMON_CLK_CDCE706=m
+CONFIG_COMMON_CLK_CS2000_CP=m
+# CONFIG_COMMON_CLK_PWM is not set
+CONFIG_XILINX_VCU=m
+CONFIG_HWSPINLOCK=y
+
+#
+# Clock Source drivers
+#
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+CONFIG_PCC=y
+# CONFIG_ALTERA_MBOX is not set
+CONFIG_IOMMU_IOVA=y
+CONFIG_IOASID=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+CONFIG_IOMMU_IO_PGTABLE=y
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_IOMMU_DMA=y
+CONFIG_IOMMU_SVA_LIB=y
+CONFIG_AMD_IOMMU=y
+CONFIG_AMD_IOMMU_V2=m
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+CONFIG_INTEL_IOMMU_SVM=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON=y
+CONFIG_IRQ_REMAP=y
+CONFIG_HYPERV_IOMMU=y
+CONFIG_VIRTIO_IOMMU=m
+
+#
+# Remoteproc drivers
+#
+CONFIG_REMOTEPROC=y
+# CONFIG_REMOTEPROC_CDEV is not set
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+CONFIG_RPMSG=m
+# CONFIG_RPMSG_CHAR is not set
+CONFIG_RPMSG_NS=m
+# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
+CONFIG_SOUNDWIRE=y
+
+#
+# SoundWire Devices
+#
+CONFIG_SOUNDWIRE_CADENCE=m
+CONFIG_SOUNDWIRE_INTEL=m
+# CONFIG_SOUNDWIRE_QCOM is not set
+CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# i.MX SoC drivers
+#
+# end of i.MX SoC drivers
+
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# end of Enable LiteX SoC Builder specific drivers
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_QCOM_QMI_HELPERS=m
+# end of Qualcomm SoC drivers
+
+# CONFIG_SOC_TI is not set
+
+#
+# Xilinx SoC drivers
+#
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_GOV_PASSIVE=y
+
+#
+# DEVFREQ Drivers
+#
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_ADC_JACK=m
+CONFIG_EXTCON_FSA9480=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_INTEL_INT3496=m
+CONFIG_EXTCON_INTEL_MRFLD=m
+CONFIG_EXTCON_MAX3355=m
+CONFIG_EXTCON_PTN5150=m
+CONFIG_EXTCON_RT8973A=m
+CONFIG_EXTCON_SM5502=m
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_EXTCON_USBC_CROS_EC=m
+CONFIG_EXTCON_USBC_TUSB320=m
+CONFIG_MEMORY=y
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_DMA=m
+CONFIG_IIO_BUFFER_DMAENGINE=m
+CONFIG_IIO_BUFFER_HW_CONSUMER=m
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+CONFIG_IIO_CONFIGFS=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+CONFIG_IIO_SW_DEVICE=m
+CONFIG_IIO_SW_TRIGGER=m
+CONFIG_IIO_TRIGGERED_EVENT=m
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16209 is not set
+CONFIG_ADXL372=m
+# CONFIG_ADXL372_SPI is not set
+CONFIG_ADXL372_I2C=m
+# CONFIG_BMA220 is not set
+# CONFIG_BMA400 is not set
+CONFIG_BMC150_ACCEL=m
+CONFIG_BMC150_ACCEL_I2C=m
+CONFIG_BMC150_ACCEL_SPI=m
+# CONFIG_BMI088_ACCEL is not set
+CONFIG_DA280=m
+CONFIG_DA311=m
+CONFIG_DMARD09=m
+CONFIG_DMARD10=m
+# CONFIG_FXLS8962AF_I2C is not set
+# CONFIG_FXLS8962AF_SPI is not set
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
+CONFIG_KXSD9_I2C=m
+CONFIG_KXCJK1013=m
+CONFIG_MC3230=m
+CONFIG_MMA7455=m
+CONFIG_MMA7455_I2C=m
+# CONFIG_MMA7455_SPI is not set
+CONFIG_MMA7660=m
+CONFIG_MMA8452=m
+CONFIG_MMA9551_CORE=m
+CONFIG_MMA9551=m
+CONFIG_MMA9553=m
+CONFIG_MXC4005=m
+CONFIG_MXC6255=m
+# CONFIG_SCA3000 is not set
+CONFIG_SCA3300=m
+CONFIG_STK8312=m
+CONFIG_STK8BA50=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7091R5 is not set
+# CONFIG_AD7124 is not set
+# CONFIG_AD7192 is not set
+# CONFIG_AD7266 is not set
+CONFIG_AD7291=m
+CONFIG_AD7292=m
+# CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
+CONFIG_AD7606=m
+CONFIG_AD7606_IFACE_PARALLEL=m
+# CONFIG_AD7606_IFACE_SPI is not set
+# CONFIG_AD7766 is not set
+# CONFIG_AD7768_1 is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+# CONFIG_AD7949 is not set
+CONFIG_AD799X=m
+CONFIG_CC10001_ADC=m
+CONFIG_DLN2_ADC=m
+# CONFIG_HI8435 is not set
+CONFIG_HX711=m
+CONFIG_INA2XX_ADC=m
+CONFIG_INTEL_MRFLD_ADC=m
+CONFIG_LTC2471=m
+CONFIG_LTC2485=m
+CONFIG_LTC2496=m
+CONFIG_LTC2497=m
+# CONFIG_MAX1027 is not set
+# CONFIG_MAX11100 is not set
+# CONFIG_MAX1118 is not set
+CONFIG_MAX1241=m
+CONFIG_MAX1363=m
+CONFIG_MAX9611=m
+# CONFIG_MCP320X is not set
+CONFIG_MCP3422=m
+# CONFIG_MCP3911 is not set
+CONFIG_NAU7802=m
+CONFIG_TI_ADC081C=m
+# CONFIG_TI_ADC0832 is not set
+# CONFIG_TI_ADC084S021 is not set
+# CONFIG_TI_ADC12138 is not set
+# CONFIG_TI_ADC108S102 is not set
+# CONFIG_TI_ADC128S052 is not set
+# CONFIG_TI_ADC161S626 is not set
+CONFIG_TI_ADS1015=m
+# CONFIG_TI_ADS7950 is not set
+# CONFIG_TI_ADS131E08 is not set
+CONFIG_TI_AM335X_ADC=m
+# CONFIG_TI_TLC4541 is not set
+CONFIG_TI_TSC2046=m
+CONFIG_VIPERBOARD_ADC=m
+CONFIG_XILINX_XADC=m
+# end of Analog to digital converters
+
+#
+# Analog to digital and digital to analog converters
+#
+# end of Analog to digital and digital to analog converters
+
+#
+# Analog Front Ends
+#
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+# CONFIG_AD8366 is not set
+CONFIG_HMC425=m
+# end of Amplifiers
+
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7150=m
+# end of Capacitance to digital converters
+
+#
+# Chemical Sensors
+#
+# CONFIG_ATLAS_PH_SENSOR is not set
+# CONFIG_ATLAS_EZO_SENSOR is not set
+# CONFIG_BME680 is not set
+# CONFIG_CCS811 is not set
+# CONFIG_IAQCORE is not set
+# CONFIG_PMS7003 is not set
+CONFIG_SCD30_CORE=m
+CONFIG_SCD30_I2C=m
+CONFIG_SCD30_SERIAL=m
+# CONFIG_SENSIRION_SGP30 is not set
+# CONFIG_SENSIRION_SGP40 is not set
+# CONFIG_SPS30_I2C is not set
+# CONFIG_SPS30_SERIAL is not set
+# CONFIG_VZ89X is not set
+# end of Chemical Sensors
+
+# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
+CONFIG_IIO_MS_SENSORS_I2C=m
+
+#
+# IIO SCMI Sensors
+#
+# end of IIO SCMI Sensors
+
+#
+# SSP Sensor Common
+#
+# CONFIG_IIO_SSP_SENSORHUB is not set
+# end of SSP Sensor Common
+
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_SPI=m
+CONFIG_IIO_ST_SENSORS_CORE=m
+
+#
+# Digital to analog converters
+#
+CONFIG_AD5064=m
+# CONFIG_AD5360 is not set
+CONFIG_AD5380=m
+# CONFIG_AD5421 is not set
+CONFIG_AD5446=m
+# CONFIG_AD5449 is not set
+CONFIG_AD5592R_BASE=m
+# CONFIG_AD5592R is not set
+CONFIG_AD5593R=m
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+CONFIG_AD5686=m
+# CONFIG_AD5686_SPI is not set
+CONFIG_AD5696_I2C=m
+# CONFIG_AD5755 is not set
+# CONFIG_AD5758 is not set
+# CONFIG_AD5761 is not set
+# CONFIG_AD5764 is not set
+# CONFIG_AD5766 is not set
+CONFIG_AD5770R=m
+# CONFIG_AD5791 is not set
+# CONFIG_AD7303 is not set
+# CONFIG_AD8801 is not set
+CONFIG_DS4424=m
+# CONFIG_LTC1660 is not set
+# CONFIG_LTC2632 is not set
+CONFIG_M62332=m
+CONFIG_MAX517=m
+CONFIG_MCP4725=m
+# CONFIG_MCP4922 is not set
+# CONFIG_TI_DAC082S085 is not set
+CONFIG_TI_DAC5571=m
+# CONFIG_TI_DAC7311 is not set
+# CONFIG_TI_DAC7612 is not set
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+# CONFIG_IIO_SIMPLE_DUMMY is not set
+# end of IIO dummy driver
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+# CONFIG_AD9523 is not set
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16260 is not set
+CONFIG_ADXRS290=m
+# CONFIG_ADXRS450 is not set
+CONFIG_BMG160=m
+CONFIG_BMG160_I2C=m
+CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
+CONFIG_HID_SENSOR_GYRO_3D=m
+CONFIG_MPU3050=m
+CONFIG_MPU3050_I2C=m
+CONFIG_IIO_ST_GYRO_3AXIS=m
+CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
+CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
+CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+# CONFIG_AFE4403 is not set
+# CONFIG_AFE4404 is not set
+# CONFIG_MAX30100 is not set
+# CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+# CONFIG_AM2315 is not set
+CONFIG_DHT11=m
+CONFIG_HDC100X=m
+CONFIG_HDC2010=m
+CONFIG_HID_SENSOR_HUMIDITY=m
+CONFIG_HTS221=m
+CONFIG_HTS221_I2C=m
+CONFIG_HTS221_SPI=m
+CONFIG_HTU21=m
+CONFIG_SI7005=m
+CONFIG_SI7020=m
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+# CONFIG_ADIS16400 is not set
+# CONFIG_ADIS16460 is not set
+CONFIG_ADIS16475=m
+# CONFIG_ADIS16480 is not set
+# CONFIG_BMI160_I2C is not set
+# CONFIG_BMI160_SPI is not set
+CONFIG_FXOS8700=m
+CONFIG_FXOS8700_I2C=m
+CONFIG_FXOS8700_SPI=m
+CONFIG_KMX61=m
+CONFIG_INV_ICM42600=m
+CONFIG_INV_ICM42600_I2C=m
+CONFIG_INV_ICM42600_SPI=m
+# CONFIG_INV_MPU6050_I2C is not set
+# CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_IIO_ST_LSM6DSX is not set
+# CONFIG_IIO_ST_LSM9DS0 is not set
+# end of Inertial measurement units
+
+CONFIG_IIO_ADIS_LIB=m
+CONFIG_IIO_ADIS_LIB_BUFFER=y
+
+#
+# Light sensors
+#
+CONFIG_ACPI_ALS=m
+CONFIG_ADJD_S311=m
+CONFIG_ADUX1020=m
+CONFIG_AL3010=m
+CONFIG_AL3320A=m
+CONFIG_APDS9300=m
+CONFIG_APDS9960=m
+# CONFIG_AS73211 is not set
+CONFIG_BH1750=m
+# CONFIG_BH1780 is not set
+CONFIG_CM32181=m
+CONFIG_CM3232=m
+CONFIG_CM3323=m
+CONFIG_CM36651=m
+CONFIG_GP2AP002=m
+CONFIG_GP2AP020A00F=m
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
+CONFIG_ISL29125=m
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+CONFIG_JSA1212=m
+CONFIG_RPR0521=m
+CONFIG_SENSORS_LM3533=m
+CONFIG_LTR501=m
+CONFIG_LV0104CS=m
+# CONFIG_MAX44000 is not set
+CONFIG_MAX44009=m
+CONFIG_NOA1305=m
+CONFIG_OPT3001=m
+CONFIG_PA12203001=m
+CONFIG_SI1133=m
+# CONFIG_SI1145 is not set
+CONFIG_STK3310=m
+CONFIG_ST_UVIS25=m
+CONFIG_ST_UVIS25_I2C=m
+CONFIG_ST_UVIS25_SPI=m
+CONFIG_TCS3414=m
+CONFIG_TCS3472=m
+CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL2583=m
+# CONFIG_TSL2591 is not set
+CONFIG_TSL2772=m
+CONFIG_TSL4531=m
+CONFIG_US5182D=m
+CONFIG_VCNL4000=m
+CONFIG_VCNL4035=m
+CONFIG_VEML6030=m
+# CONFIG_VEML6070 is not set
+CONFIG_VL6180=m
+CONFIG_ZOPT2201=m
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+CONFIG_AK8975=m
+CONFIG_AK09911=m
+# CONFIG_BMC150_MAGN_I2C is not set
+# CONFIG_BMC150_MAGN_SPI is not set
+CONFIG_MAG3110=m
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+CONFIG_MMC35240=m
+CONFIG_IIO_ST_MAGN_3AXIS=m
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+CONFIG_SENSORS_HMC5843=m
+CONFIG_SENSORS_HMC5843_I2C=m
+# CONFIG_SENSORS_HMC5843_SPI is not set
+CONFIG_SENSORS_RM3100=m
+CONFIG_SENSORS_RM3100_I2C=m
+# CONFIG_SENSORS_RM3100_SPI is not set
+# CONFIG_YAMAHA_YAS530 is not set
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+# CONFIG_IIO_HRTIMER_TRIGGER is not set
+CONFIG_IIO_INTERRUPT_TRIGGER=m
+CONFIG_IIO_TIGHTLOOP_TRIGGER=m
+CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
+
+#
+# Linear and angular position sensors
+#
+CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
+# end of Linear and angular position sensors
+
+#
+# Digital potentiometers
+#
+# CONFIG_AD5110 is not set
+CONFIG_AD5272=m
+# CONFIG_DS1803 is not set
+# CONFIG_MAX5432 is not set
+# CONFIG_MAX5481 is not set
+# CONFIG_MAX5487 is not set
+CONFIG_MCP4018=m
+# CONFIG_MCP4131 is not set
+CONFIG_MCP4531=m
+# CONFIG_MCP41010 is not set
+# CONFIG_TPL0102 is not set
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+CONFIG_LMP91000=m
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+CONFIG_ABP060MG=m
+CONFIG_BMP280=m
+CONFIG_BMP280_I2C=m
+CONFIG_BMP280_SPI=m
+# CONFIG_DLHL60D is not set
+# CONFIG_DPS310 is not set
+CONFIG_HID_SENSOR_PRESS=m
+# CONFIG_HP03 is not set
+CONFIG_ICP10100=m
+# CONFIG_MPL115_I2C is not set
+# CONFIG_MPL115_SPI is not set
+CONFIG_MPL3115=m
+CONFIG_MS5611=m
+CONFIG_MS5611_I2C=m
+# CONFIG_MS5611_SPI is not set
+CONFIG_MS5637=m
+CONFIG_IIO_ST_PRESS=m
+CONFIG_IIO_ST_PRESS_I2C=m
+CONFIG_IIO_ST_PRESS_SPI=m
+CONFIG_T5403=m
+# CONFIG_HP206C is not set
+# CONFIG_ZPA2326 is not set
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+# CONFIG_AS3935 is not set
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+CONFIG_CROS_EC_MKBP_PROXIMITY=m
+# CONFIG_ISL29501 is not set
+# CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_MB1232 is not set
+# CONFIG_PING is not set
+# CONFIG_RFD77402 is not set
+# CONFIG_SRF04 is not set
+CONFIG_SX9310=m
+CONFIG_SX9500=m
+# CONFIG_SRF08 is not set
+CONFIG_VCNL3020=m
+CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S90 is not set
+# CONFIG_AD2S1200 is not set
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+CONFIG_LTC2983=m
+# CONFIG_MAXIM_THERMOCOUPLE is not set
+CONFIG_HID_SENSOR_TEMP=m
+CONFIG_MLX90614=m
+CONFIG_MLX90632=m
+CONFIG_TMP006=m
+CONFIG_TMP007=m
+CONFIG_TMP117=m
+CONFIG_TSYS01=m
+CONFIG_TSYS02D=m
+# CONFIG_MAX31856 is not set
+# end of Temperature sensors
+
+CONFIG_NTB=m
+# CONFIG_NTB_MSI is not set
+CONFIG_NTB_AMD=m
+CONFIG_NTB_IDT=m
+CONFIG_NTB_INTEL=m
+CONFIG_NTB_EPF=m
+CONFIG_NTB_SWITCHTEC=m
+CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_TOOL=m
+CONFIG_NTB_PERF=m
+CONFIG_NTB_TRANSPORT=m
+# CONFIG_VME_BUS is not set
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_DEBUG is not set
+CONFIG_PWM_CROS_EC=m
+CONFIG_PWM_DWC=m
+# CONFIG_PWM_LP3943 is not set
+CONFIG_PWM_LPSS=m
+CONFIG_PWM_LPSS_PCI=m
+CONFIG_PWM_LPSS_PLATFORM=m
+# CONFIG_PWM_PCA9685 is not set
+
+#
+# IRQ chip support
+#
+# end of IRQ chip support
+
+# CONFIG_IPACK_BUS is not set
+CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_TI_SYSCON is not set
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_USB_LGM_PHY=m
+# CONFIG_PHY_CAN_TRANSCEIVER is not set
+# CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_PHY_PXA_28NM_HSIC is not set
+# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_CPCAP_USB is not set
+# CONFIG_PHY_QCOM_USB_HS is not set
+# CONFIG_PHY_QCOM_USB_HSIC is not set
+# CONFIG_PHY_TUSB1210 is not set
+CONFIG_PHY_INTEL_LGM_EMMC=m
+# end of PHY Subsystem
+
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL_CORE=m
+CONFIG_INTEL_RAPL=m
+# CONFIG_IDLE_INJECT is not set
+# CONFIG_DTPM is not set
+# CONFIG_MCB is not set
+
+#
+# Performance monitor support
+#
+# end of Performance monitor support
+
+CONFIG_RAS=y
+CONFIG_RAS_CEC=y
+# CONFIG_RAS_CEC_DEBUG is not set
+CONFIG_USB4=m
+# CONFIG_USB4_DEBUGFS_WRITE is not set
+# CONFIG_USB4_DMA_TEST is not set
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# end of Android
+
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_ND_BLK=m
+CONFIG_ND_CLAIM=y
+CONFIG_ND_BTT=m
+CONFIG_BTT=y
+CONFIG_ND_PFN=m
+CONFIG_NVDIMM_PFN=y
+CONFIG_NVDIMM_DAX=y
+CONFIG_NVDIMM_KEYS=y
+CONFIG_DAX_DRIVER=y
+CONFIG_DAX=y
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
+CONFIG_DEV_DAX_HMEM=m
+CONFIG_DEV_DAX_HMEM_DEVICES=y
+CONFIG_DEV_DAX_KMEM=m
+# CONFIG_DEV_DAX_PMEM_COMPAT is not set
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+CONFIG_NVMEM_RMEM=m
+
+#
+# HW tracing support
+#
+CONFIG_STM=m
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_SYS_T=m
+CONFIG_STM_DUMMY=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_HEARTBEAT=m
+# CONFIG_STM_SOURCE_FTRACE is not set
+CONFIG_INTEL_TH=m
+CONFIG_INTEL_TH_PCI=m
+CONFIG_INTEL_TH_ACPI=m
+CONFIG_INTEL_TH_GTH=m
+CONFIG_INTEL_TH_STH=m
+CONFIG_INTEL_TH_MSU=m
+CONFIG_INTEL_TH_PTI=m
+# CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
+# CONFIG_FPGA is not set
+# CONFIG_TEE is not set
+CONFIG_MULTIPLEXER=m
+
+#
+# Multiplexer drivers
+#
+CONFIG_MUX_ADG792A=m
+CONFIG_MUX_ADGS1408=m
+CONFIG_MUX_GPIO=m
+# end of Multiplexer drivers
+
+CONFIG_PM_OPP=y
+# CONFIG_UNISYS_VISORBUS is not set
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+# CONFIG_INTERCONNECT is not set
+# CONFIG_COUNTER is not set
+# CONFIG_MOST is not set
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+# CONFIG_VALIDATE_FS_PARSER is not set
+CONFIG_FS_IOMAP=y
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_SUPPORT_V4=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+CONFIG_XFS_ONLINE_SCRUB=y
+# CONFIG_XFS_ONLINE_REPAIR is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+# CONFIG_OCFS2_FS_STATS is not set
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_FAULT_INJECTION is not set
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_FS_LZO=y
+CONFIG_F2FS_FS_LZORLE=y
+CONFIG_F2FS_FS_LZ4=y
+CONFIG_F2FS_FS_LZ4HC=y
+CONFIG_F2FS_FS_ZSTD=y
+CONFIG_F2FS_IOSTAT=y
+# CONFIG_ZONEFS_FS is not set
+CONFIG_FS_DAX=y
+CONFIG_FS_DAX_PMD=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_EXPORTFS_BLOCK_OPS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_ENCRYPTION_ALGS=m
+CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
+# CONFIG_FS_VERITY is not set
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_FUSE_DAX=y
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_INDEX is not set
+# CONFIG_OVERLAY_FS_XINO_AUTO is not set
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_NETFS_SUPPORT=m
+CONFIG_NETFS_STATS=y
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_DEBUG is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/EXFAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_FAT_DEFAULT_UTF8=y
+CONFIG_EXFAT_FS=m
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+CONFIG_NTFS3_FS=m
+# CONFIG_NTFS3_64BIT_CLUSTER is not set
+CONFIG_NTFS3_LZX_XPRESS=y
+CONFIG_NTFS3_FS_POSIX_ACL=y
+# end of DOS/FAT/EXFAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_PROC_PID_ARCH_STATUS=y
+CONFIG_PROC_CPU_RESCTRL=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_TMPFS_INODE64=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_HUGETLB_PAGE_FREE_VMEMMAP=y
+# CONFIG_HUGETLB_PAGE_FREE_VMEMMAP_DEFAULT_ON is not set
+CONFIG_MEMFD_CREATE=y
+CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_EFIVAR_FS=m
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ORANGEFS_FS=m
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
+CONFIG_ECRYPT_FS_MESSAGING=y
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
+CONFIG_UBIFS_ATIME_SUPPORT=y
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_SECURITY=y
+CONFIG_UBIFS_FS_AUTHENTICATION=y
+CONFIG_CRAMFS=m
+CONFIG_CRAMFS_BLOCKDEV=y
+CONFIG_CRAMFS_MTD=y
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_MULTI=y
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+CONFIG_ROMFS_FS=y
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_PSTORE=y
+CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
+CONFIG_PSTORE_DEFLATE_COMPRESS=y
+# CONFIG_PSTORE_LZO_COMPRESS is not set
+# CONFIG_PSTORE_LZ4_COMPRESS is not set
+CONFIG_PSTORE_LZ4HC_COMPRESS=m
+CONFIG_PSTORE_842_COMPRESS=y
+# CONFIG_PSTORE_ZSTD_COMPRESS is not set
+CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+# CONFIG_PSTORE_LZ4HC_COMPRESS_DEFAULT is not set
+# CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
+CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+# CONFIG_PSTORE_BLK is not set
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+# CONFIG_EROFS_FS is not set
+CONFIG_VBOXSF_FS=m
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V2=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=y
+CONFIG_PNFS_BLOCK=y
+CONFIG_PNFS_FLEXFILE_LAYOUT=y
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+# CONFIG_NFS_V4_2_READ_PLUS is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_NFSD_V4_2_INTER_SSC=y
+# CONFIG_NFSD_V4_SECURITY_LABEL is not set
+CONFIG_GRACE_PERIOD=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_COMMON=y
+CONFIG_NFS_V4_2_SSC_HELPER=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_SMB_SERVER is not set
+CONFIG_SMBFS_COMMON=m
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+# CONFIG_AFS_FSCACHE is not set
+# CONFIG_AFS_DEBUG_CURSOR is not set
+CONFIG_9P_FS=m
+# CONFIG_9P_FSCACHE is not set
+CONFIG_9P_FS_POSIX_ACL=y
+# CONFIG_9P_FS_SECURITY is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+CONFIG_IO_WQ=y
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_REQUEST_CACHE=y
+# CONFIG_PERSISTENT_KEYRINGS is not set
+CONFIG_TRUSTED_KEYS=y
+CONFIG_ENCRYPTED_KEYS=y
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_KEY_NOTIFICATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_INFINIBAND=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_INTEL_TXT is not set
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_FALLBACK=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_FORTIFY_SOURCE=y
+# CONFIG_STATIC_USERMODEHELPER is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_SECURITY_LOADPIN is not set
+# CONFIG_SECURITY_YAMA is not set
+# CONFIG_SECURITY_SAFESETID is not set
+# CONFIG_SECURITY_LOCKDOWN_LSM is not set
+# CONFIG_SECURITY_LANDLOCK is not set
+# CONFIG_INTEGRITY is not set
+# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
+# CONFIG_GCC_PLUGIN_STACKLEAK is not set
+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
+# CONFIG_ZERO_CALL_USED_REGS is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=y
+CONFIG_ASYNC_CORE=y
+CONFIG_ASYNC_MEMCPY=y
+CONFIG_ASYNC_XOR=y
+CONFIG_ASYNC_PQ=y
+CONFIG_ASYNC_RAID6_RECOV=y
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SKCIPHER=y
+CONFIG_CRYPTO_SKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=y
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_SIMD=y
+CONFIG_CRYPTO_ENGINE=m
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECRDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+CONFIG_CRYPTO_CURVE25519_X86=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=y
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_ECHAINIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_NHPOLY1305_SSE2=m
+CONFIG_CRYPTO_NHPOLY1305_AVX2=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_ESSIV=y
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32C_INTEL=y
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_BLAKE2B=y
+CONFIG_CRYPTO_BLAKE2S_X86=y
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
+CONFIG_CRYPTO_GHASH=y
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_POLY1305_X86_64=m
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_RMD160=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_STREEBOG=m
+CONFIG_CRYPTO_WP512=y
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_TI=m
+CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_ANUBIS=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_BLOWFISH_COMMON=y
+CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_CAMELLIA=y
+CONFIG_CRYPTO_CAMELLIA_X86_64=y
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_CAST_COMMON=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_DES3_EDE_X86_64=m
+CONFIG_CRYPTO_FCRYPT=y
+CONFIG_CRYPTO_KHAZAD=y
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_CHACHA20_X86_64=m
+CONFIG_CRYPTO_SEED=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=y
+CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
+CONFIG_CRYPTO_SM4=m
+CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_TEA=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_TWOFISH_X86_64=y
+CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_842=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+CONFIG_CRYPTO_DRBG_HASH=y
+CONFIG_CRYPTO_DRBG_CTR=y
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+# CONFIG_CRYPTO_USER_API_RNG_CAVP is not set
+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
+CONFIG_CRYPTO_STATS=y
+CONFIG_CRYPTO_HASH_INFO=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_ATMEL_I2C=m
+CONFIG_CRYPTO_DEV_ATMEL_ECC=m
+CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_CCP_DD=m
+CONFIG_CRYPTO_DEV_SP_CCP=y
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+CONFIG_CRYPTO_DEV_SP_PSP=y
+# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
+CONFIG_CRYPTO_DEV_QAT=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+CONFIG_CRYPTO_DEV_QAT_C3XXX=m
+CONFIG_CRYPTO_DEV_QAT_C62X=m
+CONFIG_CRYPTO_DEV_QAT_4XXX=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
+CONFIG_CRYPTO_DEV_QAT_C62XVF=m
+CONFIG_CRYPTO_DEV_NITROX=m
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
+# CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_TPM_KEY_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+CONFIG_SIGNED_PE_FILE_VERIFICATION=y
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+CONFIG_SECONDARY_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_BLACKLIST_KEYRING=y
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
+# CONFIG_SYSTEM_REVOCATION_LIST is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=y
+# CONFIG_RAID6_PQ_BENCHMARK is not set
+CONFIG_LINEAR_RANGES=y
+CONFIG_PACKING=y
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_CORDIC=m
+# CONFIG_PRIME_NUMBERS is not set
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=y
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SM4=m
+# end of Crypto library routines
+
+CONFIG_LIB_MEMNEQ=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=m
+CONFIG_CRC4=m
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=y
+CONFIG_CRC8=m
+CONFIG_XXHASH=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_842_COMPRESS=y
+CONFIG_842_DECOMPRESS=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=m
+CONFIG_ZSTD_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_DECOMPRESS_ZSTD=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_DMA_OPS=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
+CONFIG_SWIOTLB=y
+CONFIG_DMA_COHERENT_POOL=y
+CONFIG_DMA_CMA=y
+# CONFIG_DMA_PERNUMA_CMA is not set
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=0
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_MAP_BENCHMARK is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_IOMMU_HELPER=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_6x10 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_SUN8x16=y
+# CONFIG_FONT_SUN12x22 is not set
+CONFIG_FONT_TER16x32=y
+# CONFIG_FONT_6x8 is not set
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_MEMREGION=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_HAS_COPY_MC=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_SBITMAP=y
+CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
+# end of Library routines
+
+CONFIG_PLDMFW=y
+CONFIG_ASN1_ENCODER=y
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+# CONFIG_STACKTRACE_BUILD_ID is not set
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DYNAMIC_DEBUG_CORE is not set
+CONFIG_SYMBOLIC_ERRNAME=y
+CONFIG_DEBUG_BUGVERBOSE=y
+# end of printk and dmesg options
+
+CONFIG_AS_HAS_NON_CONST_LEB128=y
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
+CONFIG_FRAME_WARN=0
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+# CONFIG_HEADERS_INSTALL is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
+CONFIG_STACK_VALIDATION=y
+# CONFIG_VMLINUX_MAP is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+#
+# Generic Kernel Debugging Instruments
+#
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
+CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
+# CONFIG_DEBUG_FS_ALLOW_NONE is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+CONFIG_HAVE_ARCH_KCSAN=y
+CONFIG_HAVE_KCSAN_COMPILER=y
+# CONFIG_KCSAN is not set
+# end of Generic Kernel Debugging Instruments
+
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_MISC is not set
+
+#
+# Memory Debugging
+#
+# CONFIG_PAGE_EXTENSION is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PAGE_OWNER is not set
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_DEBUG_PAGE_REF is not set
+CONFIG_DEBUG_RODATA_TEST=y
+CONFIG_ARCH_HAS_DEBUG_WX=y
+# CONFIG_DEBUG_WX is not set
+CONFIG_GENERIC_PTDUMP=y
+# CONFIG_PTDUMP_DEBUGFS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_SCHED_STACK_END_CHECK is not set
+CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VM_PGTABLE is not set
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
+# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set
+CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
+CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
+# CONFIG_KASAN is not set
+CONFIG_HAVE_ARCH_KFENCE=y
+# CONFIG_KFENCE is not set
+# end of Memory Debugging
+
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Oops, Lockups and Hangs
+#
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+# CONFIG_SOFTLOCKUP_DETECTOR is not set
+CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_WQ_WATCHDOG is not set
+# CONFIG_TEST_LOCKUP is not set
+# end of Debug Oops, Lockups and Hangs
+
+#
+# Scheduler Debugging
+#
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+# CONFIG_SCHEDSTATS is not set
+# end of Scheduler Debugging
+
+# CONFIG_DEBUG_TIMEKEEPING is not set
+CONFIG_DEBUG_PREEMPT=y
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_WW_MUTEX_SELFTEST is not set
+# CONFIG_SCF_TORTURE_TEST is not set
+# CONFIG_CSD_LOCK_WAIT_DEBUG is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+# CONFIG_DEBUG_IRQFLAGS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+
+#
+# Debug kernel data structures
+#
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
+# end of Debug kernel data structures
+
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_RCU_SCALE_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_REF_SCALE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_FENTRY=y
+CONFIG_HAVE_OBJTOOL_MCOUNT=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_BOOTTIME_TRACING=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
+CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
+# CONFIG_FUNCTION_PROFILER is not set
+# CONFIG_STACK_TRACER is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_PREEMPT_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_HWLAT_TRACER is not set
+# CONFIG_OSNOISE_TRACER is not set
+# CONFIG_TIMERLAT_TRACER is not set
+# CONFIG_MMIOTRACE is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+# CONFIG_TRACER_SNAPSHOT is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
+CONFIG_FTRACE_MCOUNT_USE_CC=y
+CONFIG_SYNTH_EVENTS=y
+# CONFIG_HIST_TRIGGERS is not set
+# CONFIG_TRACE_EVENT_INJECT is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+CONFIG_TRACE_EVAL_MAP_FILE=y
+# CONFIG_FTRACE_RECORD_RECURSION is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_SYNTH_EVENT_GEN_TEST is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_SAMPLES is not set
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_STRICT_DEVMEM=y
+# CONFIG_IO_STRICT_DEVMEM is not set
+
+#
+# x86 Debugging
+#
+CONFIG_EARLY_PRINTK_USB=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK_USB_XDBC=y
+# CONFIG_EFI_PGT_DUMP is not set
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_IOMMU_DEBUG is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_DEBUG_ENTRY is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+CONFIG_X86_DEBUG_FPU=y
+# CONFIG_PUNIT_ATOM_DEBUG is not set
+CONFIG_UNWINDER_ORC=y
+# CONFIG_UNWINDER_FRAME_POINTER is not set
+# CONFIG_UNWINDER_GUESS is not set
+# end of x86 Debugging
+
+#
+# Kernel Testing and Coverage
+#
+# CONFIG_KUNIT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
+CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_MIN_HEAP is not set
+# CONFIG_TEST_DIV64 is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+CONFIG_ATOMIC64_SELFTEST=y
+CONFIG_ASYNC_RAID6_TEST=m
+CONFIG_TEST_HEXDUMP=m
+# CONFIG_STRING_SELFTEST is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_PRINTF is not set
+# CONFIG_TEST_SCANF is not set
+# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_UUID is not set
+# CONFIG_TEST_XARRAY is not set
+# CONFIG_TEST_OVERFLOW is not set
+# CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
+# CONFIG_TEST_IDA is not set
+# CONFIG_TEST_PARMAN is not set
+CONFIG_TEST_LKM=m
+# CONFIG_TEST_BITOPS is not set
+# CONFIG_TEST_VMALLOC is not set
+CONFIG_TEST_USER_COPY=m
+CONFIG_TEST_BPF=m
+# CONFIG_TEST_BLACKHOLE_DEV is not set
+# CONFIG_FIND_BIT_BENCHMARK is not set
+CONFIG_TEST_FIRMWARE=m
+# CONFIG_TEST_SYSCTL is not set
+CONFIG_TEST_UDELAY=m
+# CONFIG_TEST_STATIC_KEYS is not set
+# CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_OBJAGG is not set
+# CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
+# CONFIG_TEST_HMM is not set
+# CONFIG_TEST_FREE_PAGES is not set
+# CONFIG_TEST_FPU is not set
+# CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set
+CONFIG_ARCH_USE_MEMTEST=y
+CONFIG_MEMTEST=y
+# CONFIG_HYPERV_TESTING is not set
+# end of Kernel Testing and Coverage
+# end of Kernel hacking
diff --git a/system/xen/dom0/kernel-xen.sh b/system/xen/dom0/kernel-xen.sh
index ce4c95e783..0741ee7ce9 100644
--- a/system/xen/dom0/kernel-xen.sh
+++ b/system/xen/dom0/kernel-xen.sh
@@ -5,9 +5,8 @@
 # Written by Chris Abela <chris.abela@maltats.com>, 20100515
 # Modified by Mario Preksavec <mario@slackware.hr>
 
-KERNEL=${KERNEL:-4.4.240}
-XEN=${XEN:-4.13.1}
-BOOTLOADER=${BOOTLOADER:-lilo}
+KERNEL=${KERNEL:-5.15.139}
+XEN=${XEN:-4.18.0}
 
 ROOTMOD=${ROOTMOD:-ext4}
 ROOTFS=${ROOTFS:-ext4}
@@ -15,18 +14,11 @@ ROOTDEV=${ROOTDEV:-/dev/sda2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-      i?86) ARCH=i686 ;;
     x86_64) ARCH=x86_64 ;;
          *) echo "Unsupported architecture detected ($ARCH)"; exit ;;
   esac
 fi
 
-if [ "$BOOTLOADER" = lilo ] && [ ! -x /usr/bin/mbootpack ]; then
-  echo "LILO bootloader requires mbootpack."
-  echo "Get it from slackbuilds.org and rerun this script."
-  exit
-fi
-
 if [ ! -d /usr/src/linux-$KERNEL ]; then
   echo "Missing kernel source in /usr/src/linux-$KERNEL"
   echo "Get it from kernel.org and rerun this script."
@@ -78,15 +70,7 @@ cp -a $TMP/lib/modules/$KERNEL-xen /lib/modules
 mkinitrd -c -k $KERNEL-xen -m $ROOTMOD -f $ROOTFS -r $ROOTDEV \
   -o /boot/initrd-$KERNEL-xen.gz
 
-# For lilo we use mbootpack
-if [ "$BOOTLOADER" = lilo ]; then
-  gzip -d -c /boot/xen-$XEN.gz > xen-$XEN
-  mbootpack -m arch/x86/boot/bzImage -m /boot/initrd-$KERNEL-xen.gz xen-$XEN \
-    -o /boot/vmlinuz-$KERNEL-xen
-else
-  cp arch/x86/boot/bzImage /boot/vmlinuz-$KERNEL-xen
-fi
-
+cp arch/x86/boot/bzImage /boot/vmlinuz-$KERNEL-xen
 cp System.map /boot/System.map-$KERNEL-xen
 cp .config /boot/config-$KERNEL-xen
 
diff --git a/system/xen/domU/domU.sh b/system/xen/domU/domU.sh
index e49e3d58b9..4b167fc63a 100644
--- a/system/xen/domU/domU.sh
+++ b/system/xen/domU/domU.sh
@@ -7,7 +7,7 @@
 
 set -e
 
-KERNEL=${KERNEL:-4.4.240}
+KERNEL=${KERNEL:-5.15.139}
 
 # Build an image for the root file system and another for the swap
 # Default values : 8GB and 500MB resepectively.
diff --git a/system/xen/domU/mydom b/system/xen/domU/mydom
index 72f7f511ef..c43c00ff29 100644
--- a/system/xen/domU/mydom
+++ b/system/xen/domU/mydom
@@ -2,9 +2,9 @@ kernel = "/boot/vmlinuz-xen"
 ramdisk = "/boot/initrd-xen.gz"
 memory = 128
 name = "Slackware"
-vif = [ 'mac=00:16:3e:00:00:01']
-disk = [ 'file:/full_path_to/slackware.img,xvda1,w',
-	 'file:/full_path_to/swap_file,xvda2,w' ]
+vif = [ "mac=00:16:3e:00:00:01" ]
+disk = [ "file:/full_path_to/slackware.img,xvda1,w",
+	 "file:/full_path_to/swap_file,xvda2,w" ]
 root = "/dev/xvda1 ro"
 extra = "3"
 extra = "console=hvc0 elevator=noop"
diff --git a/system/xen/patches/edk2-ovmf-werror.diff b/system/xen/patches/edk2-ovmf-werror.diff
new file mode 100644
index 0000000000..49915c25c9
--- /dev/null
+++ b/system/xen/patches/edk2-ovmf-werror.diff
@@ -0,0 +1,34 @@
+--- xen-4.18.0/tools/firmware/ovmf-dir-remote/BaseTools/Conf/tools_def.template.ORIG	2023-05-24 14:59:54.000000000 +0200
++++ xen-4.18.0/tools/firmware/ovmf-dir-remote/BaseTools/Conf/tools_def.template	2023-12-05 03:34:17.395390728 +0100
+@@ -739,7 +739,7 @@
+ *_*_*_DTCPP_PATH                   = DEF(DTCPP_BIN)

+ *_*_*_DTC_PATH                     = DEF(DTC_BIN)

+ 

+-DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common

++DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Wno-array-bounds -include AutoGen.h -fno-common

+ DEFINE GCC_ARM_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -fno-pic -fno-pie

+ DEFINE GCC_LOONGARCH64_CC_FLAGS    = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d -fno-asynchronous-unwind-tables -fno-plt -Wno-address -fno-short-enums -fsigned-char -ffunction-sections -fdata-sections

+ DEFINE GCC_ARM_CC_XIPFLAGS         = -mno-unaligned-access

+--- xen-4.18.0/tools/firmware/ovmf-dir-remote/BaseTools/Source/C/Makefiles/header.makefile.ORIG	2023-05-24 14:59:54.000000000 +0200
++++ xen-4.18.0/tools/firmware/ovmf-dir-remote/BaseTools/Source/C/Makefiles/header.makefile	2023-12-05 03:36:03.531794147 +0100
+@@ -89,17 +89,17 @@
+ 

+ ifeq ($(DARWIN),Darwin)

+ # assume clang or clang compatible flags on OS X

+-CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \

++CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall \

+ -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g

+ else

+ ifneq ($(CLANG),)

+ CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \

+--fno-delete-null-pointer-checks -Wall -Werror \

++-fno-delete-null-pointer-checks -Wall \

+ -Wno-deprecated-declarations -Wno-self-assign \

+ -Wno-unused-result -nostdlib -g

+ else

+ CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \

+--fno-delete-null-pointer-checks -Wall -Werror \

++-fno-delete-null-pointer-checks -Wall \

+ -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \

+ -Wno-unused-result -nostdlib -g

+ endif

diff --git a/system/xen/patches/qemu-remove-password-option-for-spice.patch b/system/xen/patches/qemu-remove-password-option-for-spice.patch
new file mode 100644
index 0000000000..210d9d99f3
--- /dev/null
+++ b/system/xen/patches/qemu-remove-password-option-for-spice.patch
@@ -0,0 +1,123 @@
+From 36debafddd788066be10b33c5f11b984a08e5c85 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Thu, 1 Dec 2022 04:22:11 -0500
+Subject: [PATCH] ui: remove deprecated 'password' option for SPICE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This has been replaced by the 'password-secret' option,
+which references a 'secret' object instance.
+
+Reviewed-by: Fabiano Rosas <farosas@suse.de>
+Reviewed-by: Markus Armbruster <armbru@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ docs/about/deprecated.rst       |  8 --------
+ docs/about/removed-features.rst |  7 +++++++
+ qemu-options.hx                 |  9 +--------
+ ui/spice-core.c                 | 15 ---------------
+ 4 files changed, 8 insertions(+), 31 deletions(-)
+
+diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
+index d31ffa86d40..2827b0c0beb 100644
+--- a/docs/about/deprecated.rst
++++ b/docs/about/deprecated.rst
+@@ -66,14 +66,6 @@ and will cause a warning.
+ The replacement for the ``nodelay`` short-form boolean option is ``nodelay=on``
+ rather than ``delay=off``.
+ 
+-``-spice password=string`` (since 6.0)
+-''''''''''''''''''''''''''''''''''''''
+-
+-This option is insecure because the SPICE password remains visible in
+-the process listing. This is replaced by the new ``password-secret``
+-option which lets the password be securely provided on the command
+-line using a ``secret`` object instance.
+-
+ ``-smp`` ("parameter=0" SMP configurations) (since 6.2)
+ '''''''''''''''''''''''''''''''''''''''''''''''''''''''
+ 
+diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
+index 4a84e6174fe..e901637ce5f 100644
+--- a/docs/about/removed-features.rst
++++ b/docs/about/removed-features.rst
+@@ -428,6 +428,13 @@ respectively. The actual backend names should be used instead.
+ Use ``-drive if=pflash`` to configure the OTP device of the sifive_u
+ RISC-V machine instead.
+ 
++``-spice password=string`` (removed in 8.0)
++'''''''''''''''''''''''''''''''''''''''''''
++
++This option was insecure because the SPICE password remained visible in
++the process listing. This was replaced by the new ``password-secret``
++option which lets the password be securely provided on the command
++line using a ``secret`` object instance.
+ 
+ QEMU Machine Protocol (QMP) commands
+ ------------------------------------
+diff --git a/qemu-options.hx b/qemu-options.hx
+index e79ff4d8fb9..cafd8be8eda 100644
+--- a/qemu-options.hx
++++ b/qemu-options.hx
+@@ -2135,7 +2135,7 @@ DEF("spice", HAS_ARG, QEMU_OPTION_spice,
+     "       [,tls-channel=[main|display|cursor|inputs|record|playback]]\n"
+     "       [,plaintext-channel=[main|display|cursor|inputs|record|playback]]\n"
+     "       [,sasl=on|off][,disable-ticketing=on|off]\n"
+-    "       [,password=<string>][,password-secret=<secret-id>]\n"
++    "       [,password-secret=<secret-id>]\n"
+     "       [,image-compression=[auto_glz|auto_lz|quic|glz|lz|off]]\n"
+     "       [,jpeg-wan-compression=[auto|never|always]]\n"
+     "       [,zlib-glz-wan-compression=[auto|never|always]]\n"
+@@ -2161,13 +2161,6 @@ SRST
+     ``ipv4=on|off``; \ ``ipv6=on|off``; \ ``unix=on|off``
+         Force using the specified IP version.
+ 
+-    ``password=<string>``
+-        Set the password you need to authenticate.
+-
+-        This option is deprecated and insecure because it leaves the
+-        password visible in the process listing. Use ``password-secret``
+-        instead.
+-
+     ``password-secret=<secret-id>``
+         Set the ID of the ``secret`` object containing the password
+         you need to authenticate.
+diff --git a/ui/spice-core.c b/ui/spice-core.c
+index 72f8f1681c6..76f7c2bc3d1 100644
+--- a/ui/spice-core.c
++++ b/ui/spice-core.c
+@@ -412,9 +412,6 @@ static QemuOptsList qemu_spice_opts = {
+             .name = "unix",
+             .type = QEMU_OPT_BOOL,
+ #endif
+-        },{
+-            .name = "password",
+-            .type = QEMU_OPT_STRING,
+         },{
+             .name = "password-secret",
+             .type = QEMU_OPT_STRING,
+@@ -666,20 +663,8 @@ static void qemu_spice_init(void)
+     }
+     passwordSecret = qemu_opt_get(opts, "password-secret");
+     if (passwordSecret) {
+-        if (qemu_opt_get(opts, "password")) {
+-            error_report("'password' option is mutually exclusive with "
+-                         "'password-secret'");
+-            exit(1);
+-        }
+         password = qcrypto_secret_lookup_as_utf8(passwordSecret,
+                                                  &error_fatal);
+-    } else {
+-        str = qemu_opt_get(opts, "password");
+-        if (str) {
+-            warn_report("'password' option is deprecated and insecure, "
+-                        "use 'password-secret' instead");
+-            password = g_strdup(str);
+-        }
+     }
+ 
+     if (tls_port) {
+-- 
+GitLab
+
diff --git a/system/xen/patches/qemu-xen-no-pie.diff b/system/xen/patches/qemu-xen-no-pie.diff
new file mode 100644
index 0000000000..20db095f75
--- /dev/null
+++ b/system/xen/patches/qemu-xen-no-pie.diff
@@ -0,0 +1,26 @@
+--- xen-4.15.0/tools/qemu-xen/configure.orig	2020-11-06 16:30:18.000000000 +0100
++++ xen-4.15.0/tools/qemu-xen/configure	2021-04-10 01:32:39.533566877 +0200
+@@ -2184,7 +2184,6 @@
+ # Check we support --no-pie first; we will need this for building ROMs.
+ if compile_prog "-Werror -fno-pie" "-no-pie"; then
+   CFLAGS_NOPIE="-fno-pie"
+-  LDFLAGS_NOPIE="-no-pie"
+ fi
+ 
+ if test "$static" = "yes"; then
+@@ -2200,7 +2199,6 @@
+   fi
+ elif test "$pie" = "no"; then
+   QEMU_CFLAGS="$CFLAGS_NOPIE $QEMU_CFLAGS"
+-  QEMU_LDFLAGS="$LDFLAGS_NOPIE $QEMU_LDFLAGS"
+ elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then
+   QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
+   QEMU_LDFLAGS="-pie $QEMU_LDFLAGS"
+@@ -7996,7 +7994,6 @@
+   echo "QEMU_CFLAGS  += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak
+ fi
+ echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak
+-echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak
+ echo "LD_REL_FLAGS=$LD_REL_FLAGS" >> $config_host_mak
+ echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak
+ echo "LIBS+=$LIBS" >> $config_host_mak
diff --git a/system/xen/patches/symlinks_instead_of_hardlinks.diff b/system/xen/patches/symlinks_instead_of_hardlinks.diff
index 92c98bd980..c4a38e3bc0 100644
--- a/system/xen/patches/symlinks_instead_of_hardlinks.diff
+++ b/system/xen/patches/symlinks_instead_of_hardlinks.diff
@@ -1,29 +1,20 @@
---- xen-4.6.1/tools/xenstore/Makefile.orig	2016-02-09 15:44:19.000000000 +0100
-+++ xen-4.6.1/tools/xenstore/Makefile	2016-02-20 22:54:11.877906517 +0100
-@@ -84,7 +84,7 @@
- 	$(AR) cr $@ $^
+--- xen-4.18.0/tools/xs-clients/Makefile.ORIG	2023-11-16 22:44:21.000000000 +0100
++++ xen-4.18.0/tools/xs-clients/Makefile	2023-12-05 03:01:05.801759446 +0100
+@@ -29,7 +29,7 @@
+ clients: xenstore $(CLIENTS) xenstore-control
  
  $(CLIENTS): xenstore
 -	ln -f xenstore $@
 +	ln -sf xenstore $@
  
- xenstore: xenstore_client.o $(LIBXENSTORE)
- 	$(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS)
-@@ -140,7 +140,7 @@
+ xenstore: xenstore_client.o
+ 	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ $(APPEND_LDFLAGS)
+@@ -54,7 +54,7 @@
  	$(INSTALL_PROG) xenstore-control $(DESTDIR)$(bindir)
  	$(INSTALL_PROG) xenstore $(DESTDIR)$(bindir)
  	set -e ; for c in $(CLIENTS) ; do \
 -		ln -f $(DESTDIR)$(bindir)/xenstore $(DESTDIR)$(bindir)/$${c} ; \
 +		ln -sf xenstore $(DESTDIR)$(bindir)/$${c} ; \
  	done
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)
- 	$(INSTALL_SHLIB) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
-@@ -159,7 +159,7 @@
- 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
- 	$(INSTALL_PROG) xenstore $(DESTDIR)$(bindir)
- 	set -e ; for c in $(CLIENTS) ; do \
--		ln -f $(DESTDIR)$(bindir)/xenstore $(DESTDIR)$(bindir)/$${c} ; \
-+		ln -sf xenstore $(DESTDIR)$(bindir)/$${c} ; \
- 	done
  
- -include $(DEPS)
+ .PHONY: uninstall
diff --git a/system/xen/xen.SlackBuild b/system/xen/xen.SlackBuild
index 5c90056af9..5f3f380186 100644
--- a/system/xen/xen.SlackBuild
+++ b/system/xen/xen.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xen
 
-# Copyright 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020  Mario Preksavec, Zagreb, Croatia
+# Copyright 2010, 2023  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xen
-VERSION=${VERSION:-4.13.1}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-4.18.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-SEABIOS=${SEABIOS:-1.12.1}
-OVMF=${OVMF:-20190606_20d2e5a125}
-IPXE=${IPXE:-1dd56dbd11082fb622c2ed21cfaced4f47d798a6}
+SEABIOS=${SEABIOS:-1.16.2}
+OVMF=${OVMF:-20230524_ba91d0292e}
+IPXE=${IPXE:-1d1cf74a5e58811822bee4b3da3cff7282fcdfca}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -39,17 +42,22 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
+    cat << EOF
+
+  *** Xen x86/32 target no longer supported!
+
+EOF
+    exit 1
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
@@ -62,7 +70,7 @@ elif [ "$ARCH" = "x86_64" ]; then
   # ln -s /usr/include/gnu/stubs-64.h /usr/include/gnu/stubs-32.h
 
 EOF
-    exit
+    exit 1
   fi
 else
   SLKCFLAGS="-O2"
@@ -95,11 +103,6 @@ case "${USE_LIBSSH:-no}" in
     *) CONF_QEMUU+=" --disable-libssh" ;;
 esac
 
-case "${USE_BLUEZ:-no}" in
-  yes) CONF_QEMUU+=" --enable-bluez" ;;
-    *) CONF_QEMUU+=" --disable-bluez" ;;
-esac
-
 case "${USE_GTK:-no}" in
   yes) CONF_QEMUU+=" --enable-gtk" ;;
     *) CONF_QEMUU+=" --disable-gtk" ;;
@@ -166,9 +169,20 @@ patch -p1 <$CWD/patches/stubdom_zlib_disable_man_install.diff
 
 # Fix glibc-2.27 build
 if [ "$(ldd --version | awk '{print $NF; exit}')" = "2.27" ]; then
-  ( cd tools/qemu-xen && patch -p1 <$CWD/patches/glibc-memfd_fix_configure_test.patch )
+  tools/qemu-xen && patch -d tools/qemu-xen -p1 <$CWD/patches/glibc-memfd_fix_configure_test.patch
+fi
+
+# Fix ovmf firmware build
+patch -p1 <$CWD/patches/edk2-ovmf-werror.diff
+
+# Fix binutils-2.36 build
+if [ "$(objcopy --version | awk '{print $NF; exit}' | cut -d- -f1)" = "2.36" ]; then
+  patch -p1 <$CWD/patches/qemu-xen-no-pie.diff
 fi
 
+# Revert QEMU password removal for spice
+patch -d tools/qemu-xen -p1 -R <$CWD/patches/qemu-remove-password-option-for-spice.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -190,6 +204,9 @@ make install-xen \
   MANDIR=/usr/man \
   DESTDIR=$PKG
 
+echo CONFIG_GOLANG=n >> xen/.config
+echo CONFIG_GOLANG=n > tools/.config
+
 make install-tools \
   docdir=/usr/doc/$PRGNAM-$VERSION \
   DOCDIR=/usr/doc/$PRGNAM-$VERSION \
@@ -223,7 +240,7 @@ find $PKG/boot/ -type l -a -name "xen-*" -exec rm -f {} \; 2>/dev/null || true
 rmdir $PKG/etc/rc.d/init.d/
 
 # Append .new to config files
-for i in $PKG/etc/{default/*,xen/*.conf} ; do mv $i $i.new ; done
+for i in $PKG/etc/{default/*,xen/*.conf,sysconfig/*} ; do [ -f $i ] && mv $i $i.new ; done
 
 # Remove some executable flags
 chmod -x $PKG/usr/libexec/xen/boot/*.gz 2>/dev/null || true
@@ -254,4 +271,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xen/xen.info b/system/xen/xen.info
index c74e7f07d1..83847ec031 100644
--- a/system/xen/xen.info
+++ b/system/xen/xen.info
@@ -1,32 +1,32 @@
 PRGNAM="xen"
-VERSION="4.13.1"
+VERSION="4.18.0"
 HOMEPAGE="http://www.xenproject.org/"
-DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.13.1.tar.gz \
-          http://mirror.slackware.hr/sources/xen-extfiles/ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz \
-          http://mirror.slackware.hr/sources/xen-extfiles/lwip-1.3.0.tar.gz \
-          http://mirror.slackware.hr/sources/xen-extfiles/zlib-1.2.3.tar.gz \
-          http://mirror.slackware.hr/sources/xen-extfiles/newlib-1.16.0.tar.gz \
-          http://mirror.slackware.hr/sources/xen-extfiles/pciutils-2.2.9.tar.bz2 \
-          http://mirror.slackware.hr/sources/xen-extfiles/grub-0.97.tar.gz \
-          http://mirror.slackware.hr/sources/xen-extfiles/polarssl-1.1.4-gpl.tgz \
-          http://mirror.slackware.hr/sources/xen-extfiles/gmp-4.3.2.tar.bz2 \
-          http://mirror.slackware.hr/sources/xen-extfiles/tpm_emulator-0.7.4.tar.gz \
-          http://mirror.slackware.hr/sources/xen-seabios/seabios-1.12.1.tar.gz \
-          http://mirror.slackware.hr/sources/xen-ovmf/xen-ovmf-20190606_20d2e5a125.tar.bz2"
-MD5SUM="e26fe8f9ce39463734e6ede45c6e11b8 \
-        b3ab0488a989a089207302111d12e1a0 \
-        36cc57650cffda9a0269493be2a169bb \
-        debc62758716a169df9f62e6ab2bc634 \
-        bf8f1f9e3ca83d732c00a79a6ef29bc4 \
-        cec05e7785497c5e19da2f114b934ffd \
-        cd3f3eb54446be6003156158d51f4884 \
-        7b72caf22b01464ee7d6165f2fd85f44 \
-        dd60683d7057917e34630b4a787932e8 \
-        e26becb8a6a2b6695f6b3e8097593db8 \
-        6cb6cba431fd725126ddb5ec529ab85c \
-        a6063a0d3d45e6f77deea8c80569653e"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="http://mirror.slackware.hr/sources/xen/xen-4.18.0.tar.gz \
+                 http://mirror.slackware.hr/sources/xen-extfiles/ipxe-git-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz \
+                 http://mirror.slackware.hr/sources/xen-extfiles/lwip-1.3.0.tar.gz \
+                 http://mirror.slackware.hr/sources/xen-extfiles/zlib-1.2.3.tar.gz \
+                 http://mirror.slackware.hr/sources/xen-extfiles/newlib-1.16.0.tar.gz \
+                 http://mirror.slackware.hr/sources/xen-extfiles/pciutils-2.2.9.tar.bz2 \
+                 http://mirror.slackware.hr/sources/xen-extfiles/grub-0.97.tar.gz \
+                 http://mirror.slackware.hr/sources/xen-extfiles/polarssl-1.1.4-gpl.tgz \
+                 http://mirror.slackware.hr/sources/xen-extfiles/gmp-4.3.2.tar.bz2 \
+                 http://mirror.slackware.hr/sources/xen-extfiles/tpm_emulator-0.7.4.tar.gz \
+                 http://mirror.slackware.hr/sources/xen-seabios/seabios-1.16.2.tar.gz \
+                 http://mirror.slackware.hr/sources/xen-ovmf/xen-ovmf-20230524_ba91d0292e.tar.bz2"
+MD5SUM_x86_64="c564d641a8638cfd43a0a810ebce2179 \
+               0d0dc7451b47f2c7a2992bbec20bf4d0 \
+               36cc57650cffda9a0269493be2a169bb \
+               debc62758716a169df9f62e6ab2bc634 \
+               bf8f1f9e3ca83d732c00a79a6ef29bc4 \
+               cec05e7785497c5e19da2f114b934ffd \
+               cd3f3eb54446be6003156158d51f4884 \
+               7b72caf22b01464ee7d6165f2fd85f44 \
+               dd60683d7057917e34630b4a787932e8 \
+               e26becb8a6a2b6695f6b3e8097593db8 \
+               ef52bf37a78e78a082688a244300ab86 \
+               00968782d77aa244952c8236c299c45b"
 REQUIRES="acpica yajl"
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/system/xen/xsa/xsa317.patch b/system/xen/xsa/xsa317.patch
deleted file mode 100644
index 20e2c643d0..0000000000
--- a/system/xen/xsa/xsa317.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From aeb46e92f915f19a61d5a8a1f4b696793f64e6fb Mon Sep 17 00:00:00 2001
-From: Julien Grall <jgrall@amazon.com>
-Date: Thu, 19 Mar 2020 13:17:31 +0000
-Subject: [PATCH] xen/common: event_channel: Don't ignore error in
- get_free_port()
-
-Currently, get_free_port() is assuming that the port has been allocated
-when evtchn_allocate_port() is not return -EBUSY.
-
-However, the function may return an error when:
-    - We exhausted all the event channels. This can happen if the limit
-    configured by the administrator for the guest ('max_event_channels'
-    in xl cfg) is higher than the ABI used by the guest. For instance,
-    if the guest is using 2L, the limit should not be higher than 4095.
-    - We cannot allocate memory (e.g Xen has not more memory).
-
-Users of get_free_port() (such as EVTCHNOP_alloc_unbound) will validly
-assuming the port was valid and will next call evtchn_from_port(). This
-will result to a crash as the memory backing the event channel structure
-is not present.
-
-Fixes: 368ae9a05fe ("xen/pvshim: forward evtchn ops between L0 Xen and L2 DomU")
-Signed-off-by: Julien Grall <jgrall@amazon.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
----
- xen/common/event_channel.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c
-index e86e2bfab0..a8d182b584 100644
---- a/xen/common/event_channel.c
-+++ b/xen/common/event_channel.c
-@@ -195,10 +195,10 @@ static int get_free_port(struct domain *d)
-     {
-         int rc = evtchn_allocate_port(d, port);
- 
--        if ( rc == -EBUSY )
--            continue;
--
--        return port;
-+        if ( rc == 0 )
-+            return port;
-+        else if ( rc != -EBUSY )
-+            return rc;
-     }
- 
-     return -ENOSPC;
--- 
-2.17.1
-
diff --git a/system/xen/xsa/xsa319.patch b/system/xen/xsa/xsa319.patch
deleted file mode 100644
index 769443c900..0000000000
--- a/system/xen/xsa/xsa319.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: x86/shadow: correct an inverted conditional in dirty VRAM tracking
-
-This originally was "mfn_x(mfn) == INVALID_MFN". Make it like this
-again, taking the opportunity to also drop the unnecessary nearby
-braces.
-
-This is XSA-319.
-
-Fixes: 246a5a3377c2 ("xen: Use a typesafe to define INVALID_MFN")
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
-
---- a/xen/arch/x86/mm/shadow/common.c
-+++ b/xen/arch/x86/mm/shadow/common.c
-@@ -3252,10 +3252,8 @@ int shadow_track_dirty_vram(struct domai
-             int dirty = 0;
-             paddr_t sl1ma = dirty_vram->sl1ma[i];
- 
--            if ( !mfn_eq(mfn, INVALID_MFN) )
--            {
-+            if ( mfn_eq(mfn, INVALID_MFN) )
-                 dirty = 1;
--            }
-             else
-             {
-                 page = mfn_to_page(mfn);
diff --git a/system/xen/xsa/xsa320-4.13-1.patch b/system/xen/xsa/xsa320-4.13-1.patch
deleted file mode 100644
index 09eb8ea98e..0000000000
--- a/system/xen/xsa/xsa320-4.13-1.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From: Andrew Cooper <andrew.cooper3@citrix.com>
-Subject: x86/spec-ctrl: CPUID/MSR definitions for Special Register Buffer Data Sampling
-
-This is part of XSA-320 / CVE-2020-0543
-
-Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-Acked-by: Wei Liu <wl@xen.org>
-
-diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc
-index 1d9d816622..9268454297 100644
---- a/docs/misc/xen-command-line.pandoc
-+++ b/docs/misc/xen-command-line.pandoc
-@@ -483,10 +483,10 @@ accounting for hardware capabilities as enumerated via CPUID.
- 
- Currently accepted:
- 
--The Speculation Control hardware features `md-clear`, `ibrsb`, `stibp`, `ibpb`,
--`l1d-flush` and `ssbd` are used by default if available and applicable.  They can
--be ignored, e.g. `no-ibrsb`, at which point Xen won't use them itself, and
--won't offer them to guests.
-+The Speculation Control hardware features `srbds-ctrl`, `md-clear`, `ibrsb`,
-+`stibp`, `ibpb`, `l1d-flush` and `ssbd` are used by default if available and
-+applicable.  They can be ignored, e.g. `no-ibrsb`, at which point Xen won't
-+use them itself, and won't offer them to guests.
- 
- ### cpuid_mask_cpu
- > `= fam_0f_rev_[cdefg] | fam_10_rev_[bc] | fam_11_rev_b`
-diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c
-index 6cea4227ba..a78f08b927 100644
---- a/tools/libxl/libxl_cpuid.c
-+++ b/tools/libxl/libxl_cpuid.c
-@@ -213,6 +213,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str)
- 
-         {"avx512-4vnniw",0x00000007,  0, CPUID_REG_EDX,  2,  1},
-         {"avx512-4fmaps",0x00000007,  0, CPUID_REG_EDX,  3,  1},
-+        {"srbds-ctrl",   0x00000007,  0, CPUID_REG_EDX,  9,  1},
-         {"md-clear",     0x00000007,  0, CPUID_REG_EDX, 10,  1},
-         {"cet-ibt",      0x00000007,  0, CPUID_REG_EDX, 20,  1},
-         {"ibrsb",        0x00000007,  0, CPUID_REG_EDX, 26,  1},
-diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c
-index 603e1d65fd..a09440813b 100644
---- a/tools/misc/xen-cpuid.c
-+++ b/tools/misc/xen-cpuid.c
-@@ -157,6 +157,7 @@ static const char *const str_7d0[32] =
-     [ 2] = "avx512_4vnniw", [ 3] = "avx512_4fmaps",
-     [ 4] = "fsrm",
- 
-+    /*  8 */                [ 9] = "srbds-ctrl",
-     [10] = "md-clear",
-     /* 12 */                [13] = "tsx-force-abort",
- 
-diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c
-index 4b12103482..0cded3c0ad 100644
---- a/xen/arch/x86/msr.c
-+++ b/xen/arch/x86/msr.c
-@@ -134,6 +134,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val)
-         /* Write-only */
-     case MSR_TSX_FORCE_ABORT:
-     case MSR_TSX_CTRL:
-+    case MSR_MCU_OPT_CTRL:
-     case MSR_U_CET:
-     case MSR_S_CET:
-     case MSR_PL0_SSP ... MSR_INTERRUPT_SSP_TABLE:
-@@ -288,6 +289,7 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val)
-         /* Read-only */
-     case MSR_TSX_FORCE_ABORT:
-     case MSR_TSX_CTRL:
-+    case MSR_MCU_OPT_CTRL:
-     case MSR_U_CET:
-     case MSR_S_CET:
-     case MSR_PL0_SSP ... MSR_INTERRUPT_SSP_TABLE:
-diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c
-index 6656c44aec..5fc1c6827e 100644
---- a/xen/arch/x86/spec_ctrl.c
-+++ b/xen/arch/x86/spec_ctrl.c
-@@ -312,12 +312,13 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps)
-     printk("Speculative mitigation facilities:\n");
- 
-     /* Hardware features which pertain to speculative mitigations. */
--    printk("  Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
-+    printk("  Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
-            (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS/IBPB" : "",
-            (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP"     : "",
-            (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "",
-            (_7d0 & cpufeat_mask(X86_FEATURE_SSBD))  ? " SSBD"      : "",
-            (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "",
-+           (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "",
-            (e8b  & cpufeat_mask(X86_FEATURE_IBPB))  ? " IBPB"      : "",
-            (caps & ARCH_CAPS_IBRS_ALL)              ? " IBRS_ALL"  : "",
-            (caps & ARCH_CAPS_RDCL_NO)               ? " RDCL_NO"   : "",
-diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h
-index 7693c4a71a..91994669e1 100644
---- a/xen/include/asm-x86/msr-index.h
-+++ b/xen/include/asm-x86/msr-index.h
-@@ -179,6 +179,9 @@
- #define MSR_IA32_VMX_TRUE_ENTRY_CTLS            0x490
- #define MSR_IA32_VMX_VMFUNC                     0x491
- 
-+#define MSR_MCU_OPT_CTRL                    0x00000123
-+#define  MCU_OPT_CTRL_RNGDS_MITG_DIS        (_AC(1, ULL) <<  0)
-+
- #define MSR_U_CET                           0x000006a0
- #define MSR_S_CET                           0x000006a2
- #define MSR_PL0_SSP                         0x000006a4
-diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h
-index 2835688f1c..a2482c3627 100644
---- a/xen/include/public/arch-x86/cpufeatureset.h
-+++ b/xen/include/public/arch-x86/cpufeatureset.h
-@@ -252,6 +252,7 @@ XEN_CPUFEATURE(IBPB,          8*32+12) /*A  IBPB support only (no IBRS, used by
- /* Intel-defined CPU features, CPUID level 0x00000007:0.edx, word 9 */
- XEN_CPUFEATURE(AVX512_4VNNIW, 9*32+ 2) /*A  AVX512 Neural Network Instructions */
- XEN_CPUFEATURE(AVX512_4FMAPS, 9*32+ 3) /*A  AVX512 Multiply Accumulation Single Precision */
-+XEN_CPUFEATURE(SRBDS_CTRL,    9*32+ 9) /*   MSR_MCU_OPT_CTRL and RNGDS_MITG_DIS. */
- XEN_CPUFEATURE(MD_CLEAR,      9*32+10) /*A  VERW clears microarchitectural buffers */
- XEN_CPUFEATURE(TSX_FORCE_ABORT, 9*32+13) /* MSR_TSX_FORCE_ABORT.RTM_ABORT */
- XEN_CPUFEATURE(CET_IBT,       9*32+20) /*   CET - Indirect Branch Tracking */
diff --git a/system/xen/xsa/xsa320-4.13-2.patch b/system/xen/xsa/xsa320-4.13-2.patch
deleted file mode 100644
index 8a8080a312..0000000000
--- a/system/xen/xsa/xsa320-4.13-2.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From: Andrew Cooper <andrew.cooper3@citrix.com>
-Subject: x86/spec-ctrl: Mitigate the Special Register Buffer Data Sampling sidechannel
-
-See patch documentation and comments.
-
-This is part of XSA-320 / CVE-2020-0543
-
-Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-
-diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc
-index 9268454297..c780312531 100644
---- a/docs/misc/xen-command-line.pandoc
-+++ b/docs/misc/xen-command-line.pandoc
-@@ -1991,7 +1991,7 @@ By default SSBD will be mitigated at runtime (i.e `ssbd=runtime`).
- ### spec-ctrl (x86)
- > `= List of [ <bool>, xen=<bool>, {pv,hvm,msr-sc,rsb,md-clear}=<bool>,
- >              bti-thunk=retpoline|lfence|jmp, {ibrs,ibpb,ssbd,eager-fpu,
-->              l1d-flush,branch-harden}=<bool> ]`
-+>              l1d-flush,branch-harden,srb-lock}=<bool> ]`
- 
- Controls for speculative execution sidechannel mitigations.  By default, Xen
- will pick the most appropriate mitigations based on compiled in support,
-@@ -2068,6 +2068,12 @@ If Xen is compiled with `CONFIG_SPECULATIVE_HARDEN_BRANCH`, the
- speculation barriers to protect selected conditional branches.  By default,
- Xen will enable this mitigation.
- 
-+On hardware supporting SRBDS_CTRL, the `srb-lock=` option can be used to force
-+or prevent Xen from protect the Special Register Buffer from leaking stale
-+data. By default, Xen will enable this mitigation, except on parts where MDS
-+is fixed and TAA is fixed/mitigated (in which case, there is believed to be no
-+way for an attacker to obtain the stale data).
-+
- ### sync_console
- > `= <boolean>`
- 
-diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c
-index feb0f6ce20..75c6e34164 100644
---- a/xen/arch/x86/acpi/power.c
-+++ b/xen/arch/x86/acpi/power.c
-@@ -295,6 +295,9 @@ static int enter_state(u32 state)
-     ci->spec_ctrl_flags |= (default_spec_ctrl_flags & SCF_ist_wrmsr);
-     spec_ctrl_exit_idle(ci);
- 
-+    if ( boot_cpu_has(X86_FEATURE_SRBDS_CTRL) )
-+        wrmsrl(MSR_MCU_OPT_CTRL, default_xen_mcu_opt_ctrl);
-+
-  done:
-     spin_debug_enable();
-     local_irq_restore(flags);
-diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
-index dc8fdac1a1..b1e51b3aff 100644
---- a/xen/arch/x86/smpboot.c
-+++ b/xen/arch/x86/smpboot.c
-@@ -361,12 +361,14 @@ void start_secondary(void *unused)
-     microcode_update_one(false);
- 
-     /*
--     * If MSR_SPEC_CTRL is available, apply Xen's default setting and discard
--     * any firmware settings.  Note: MSR_SPEC_CTRL may only become available
--     * after loading microcode.
-+     * If any speculative control MSRs are available, apply Xen's default
-+     * settings.  Note: These MSRs may only become available after loading
-+     * microcode.
-      */
-     if ( boot_cpu_has(X86_FEATURE_IBRSB) )
-         wrmsrl(MSR_SPEC_CTRL, default_xen_spec_ctrl);
-+    if ( boot_cpu_has(X86_FEATURE_SRBDS_CTRL) )
-+        wrmsrl(MSR_MCU_OPT_CTRL, default_xen_mcu_opt_ctrl);
- 
-     tsx_init(); /* Needs microcode.  May change HLE/RTM feature bits. */
- 
-diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c
-index 5fc1c6827e..33343062a7 100644
---- a/xen/arch/x86/spec_ctrl.c
-+++ b/xen/arch/x86/spec_ctrl.c
-@@ -65,6 +65,9 @@ static unsigned int __initdata l1d_maxphysaddr;
- static bool __initdata cpu_has_bug_msbds_only; /* => minimal HT impact. */
- static bool __initdata cpu_has_bug_mds; /* Any other M{LP,SB,FB}DS combination. */
- 
-+static int8_t __initdata opt_srb_lock = -1;
-+uint64_t __read_mostly default_xen_mcu_opt_ctrl;
-+
- static int __init parse_spec_ctrl(const char *s)
- {
-     const char *ss;
-@@ -112,6 +115,7 @@ static int __init parse_spec_ctrl(const char *s)
-             opt_ssbd = false;
-             opt_l1d_flush = 0;
-             opt_branch_harden = false;
-+            opt_srb_lock = 0;
-         }
-         else if ( val > 0 )
-             rc = -EINVAL;
-@@ -178,6 +182,8 @@ static int __init parse_spec_ctrl(const char *s)
-             opt_l1d_flush = val;
-         else if ( (val = parse_boolean("branch-harden", s, ss)) >= 0 )
-             opt_branch_harden = val;
-+        else if ( (val = parse_boolean("srb-lock", s, ss)) >= 0 )
-+            opt_srb_lock = val;
-         else
-             rc = -EINVAL;
- 
-@@ -341,7 +347,7 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps)
-                "\n");
- 
-     /* Settings for Xen's protection, irrespective of guests. */
--    printk("  Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s%s, Other:%s%s%s%s\n",
-+    printk("  Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s%s, Other:%s%s%s%s%s\n",
-            thunk == THUNK_NONE      ? "N/A" :
-            thunk == THUNK_RETPOLINE ? "RETPOLINE" :
-            thunk == THUNK_LFENCE    ? "LFENCE" :
-@@ -352,6 +358,8 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps)
-            (default_xen_spec_ctrl & SPEC_CTRL_SSBD)  ? " SSBD+" : " SSBD-",
-            !(caps & ARCH_CAPS_TSX_CTRL)              ? "" :
-            (opt_tsx & 1)                             ? " TSX+" : " TSX-",
-+           !boot_cpu_has(X86_FEATURE_SRBDS_CTRL)     ? "" :
-+           opt_srb_lock                              ? " SRB_LOCK+" : " SRB_LOCK-",
-            opt_ibpb                                  ? " IBPB"  : "",
-            opt_l1d_flush                             ? " L1D_FLUSH" : "",
-            opt_md_clear_pv || opt_md_clear_hvm       ? " VERW"  : "",
-@@ -1149,6 +1157,34 @@ void __init init_speculation_mitigations(void)
-         tsx_init();
-     }
- 
-+    /* Calculate suitable defaults for MSR_MCU_OPT_CTRL */
-+    if ( boot_cpu_has(X86_FEATURE_SRBDS_CTRL) )
-+    {
-+        uint64_t val;
-+
-+        rdmsrl(MSR_MCU_OPT_CTRL, val);
-+
-+        /*
-+         * On some SRBDS-affected hardware, it may be safe to relax srb-lock
-+         * by default.
-+         *
-+         * On parts which enumerate MDS_NO and not TAA_NO, TSX is the only way
-+         * to access the Fill Buffer.  If TSX isn't available (inc. SKU
-+         * reasons on some models), or TSX is explicitly disabled, then there
-+         * is no need for the extra overhead to protect RDRAND/RDSEED.
-+         */
-+        if ( opt_srb_lock == -1 &&
-+             (caps & (ARCH_CAPS_MDS_NO|ARCH_CAPS_TAA_NO)) == ARCH_CAPS_MDS_NO &&
-+             (!cpu_has_hle || ((caps & ARCH_CAPS_TSX_CTRL) && opt_tsx == 0)) )
-+            opt_srb_lock = 0;
-+
-+        val &= ~MCU_OPT_CTRL_RNGDS_MITG_DIS;
-+        if ( !opt_srb_lock )
-+            val |= MCU_OPT_CTRL_RNGDS_MITG_DIS;
-+
-+        default_xen_mcu_opt_ctrl = val;
-+    }
-+
-     print_details(thunk, caps);
- 
-     /*
-@@ -1180,6 +1216,9 @@ void __init init_speculation_mitigations(void)
- 
-         wrmsrl(MSR_SPEC_CTRL, bsp_delay_spec_ctrl ? 0 : default_xen_spec_ctrl);
-     }
-+
-+    if ( boot_cpu_has(X86_FEATURE_SRBDS_CTRL) )
-+        wrmsrl(MSR_MCU_OPT_CTRL, default_xen_mcu_opt_ctrl);
- }
- 
- static void __init __maybe_unused build_assertions(void)
-diff --git a/xen/include/asm-x86/spec_ctrl.h b/xen/include/asm-x86/spec_ctrl.h
-index 9caecddfec..b252bb8631 100644
---- a/xen/include/asm-x86/spec_ctrl.h
-+++ b/xen/include/asm-x86/spec_ctrl.h
-@@ -54,6 +54,8 @@ extern int8_t opt_pv_l1tf_hwdom, opt_pv_l1tf_domu;
-  */
- extern paddr_t l1tf_addr_mask, l1tf_safe_maddr;
- 
-+extern uint64_t default_xen_mcu_opt_ctrl;
-+
- static inline void init_shadow_spec_ctrl_state(void)
- {
-     struct cpu_info *info = get_cpu_info();
diff --git a/system/xen/xsa/xsa320-4.13-3.patch b/system/xen/xsa/xsa320-4.13-3.patch
deleted file mode 100644
index b52eeb338a..0000000000
--- a/system/xen/xsa/xsa320-4.13-3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Andrew Cooper <andrew.cooper3@citrix.com>
-Subject: x86/spec-ctrl: Update docs with SRBDS workaround
-
-RDRAND/RDSEED can be hidden using cpuid= to mitigate SRBDS if microcode
-isn't available.
-
-This is part of XSA-320 / CVE-2020-0543.
-
-Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Acked-by: Julien Grall <jgrall@amazon.com>
-
-diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc
-index c780312531..81e12d053c 100644
---- a/docs/misc/xen-command-line.pandoc
-+++ b/docs/misc/xen-command-line.pandoc
-@@ -481,12 +481,18 @@ choice of `dom0-kernel` is deprecated and not supported by all Dom0 kernels.
- This option allows for fine tuning of the facilities Xen will use, after
- accounting for hardware capabilities as enumerated via CPUID.
- 
-+Unless otherwise noted, options only have any effect in their negative form,
-+to hide the named feature(s).  Ignoring a feature using this mechanism will
-+cause Xen not to use the feature, nor offer them as usable to guests.
-+
- Currently accepted:
- 
- The Speculation Control hardware features `srbds-ctrl`, `md-clear`, `ibrsb`,
- `stibp`, `ibpb`, `l1d-flush` and `ssbd` are used by default if available and
--applicable.  They can be ignored, e.g. `no-ibrsb`, at which point Xen won't
--use them itself, and won't offer them to guests.
-+applicable.  They can all be ignored.
-+
-+`rdrand` and `rdseed` can be ignored, as a mitigation to XSA-320 /
-+CVE-2020-0543.
- 
- ### cpuid_mask_cpu
- > `= fam_0f_rev_[cdefg] | fam_10_rev_[bc] | fam_11_rev_b`
diff --git a/system/xen/xsa/xsa327.patch b/system/xen/xsa/xsa327.patch
deleted file mode 100644
index 0541cfa0df..0000000000
--- a/system/xen/xsa/xsa327.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 030300ebbb86c40c12db038714479d746167c767 Mon Sep 17 00:00:00 2001
-From: Julien Grall <jgrall@amazon.com>
-Date: Tue, 26 May 2020 18:31:33 +0100
-Subject: [PATCH] xen: Check the alignment of the offset pased via
- VCPUOP_register_vcpu_info
-
-Currently a guest is able to register any guest physical address to use
-for the vcpu_info structure as long as the structure can fits in the
-rest of the frame.
-
-This means a guest can provide an address that is not aligned to the
-natural alignment of the structure.
-
-On Arm 32-bit, unaligned access are completely forbidden by the
-hypervisor. This will result to a data abort which is fatal.
-
-On Arm 64-bit, unaligned access are only forbidden when used for atomic
-access. As the structure contains fields (such as evtchn_pending_self)
-that are updated using atomic operations, any unaligned access will be
-fatal as well.
-
-While the misalignment is only fatal on Arm, a generic check is added
-as an x86 guest shouldn't sensibly pass an unaligned address (this
-would result to a split lock).
-
-This is XSA-327.
-
-Reported-by: Julien Grall <jgrall@amazon.com>
-Signed-off-by: Julien Grall <jgrall@amazon.com>
-Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
----
- xen/common/domain.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/xen/common/domain.c b/xen/common/domain.c
-index 7cc9526139a6..e9be05f1d05f 100644
---- a/xen/common/domain.c
-+++ b/xen/common/domain.c
-@@ -1227,10 +1227,20 @@ int map_vcpu_info(struct vcpu *v, unsigned long gfn, unsigned offset)
-     void *mapping;
-     vcpu_info_t *new_info;
-     struct page_info *page;
-+    unsigned int align;
- 
-     if ( offset > (PAGE_SIZE - sizeof(vcpu_info_t)) )
-         return -EINVAL;
- 
-+#ifdef CONFIG_COMPAT
-+    if ( has_32bit_shinfo(d) )
-+        align = alignof(new_info->compat);
-+    else
-+#endif
-+        align = alignof(*new_info);
-+    if ( offset & (align - 1) )
-+        return -EINVAL;
-+
-     if ( !mfn_eq(v->vcpu_info_mfn, INVALID_MFN) )
-         return -EINVAL;
- 
--- 
-2.17.1
-
diff --git a/system/xen/xsa/xsa328-4.13-1.patch b/system/xen/xsa/xsa328-4.13-1.patch
deleted file mode 100644
index 56e48de3e9..0000000000
--- a/system/xen/xsa/xsa328-4.13-1.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: x86/EPT: ept_set_middle_entry() related adjustments
-
-ept_split_super_page() wants to further modify the newly allocated
-table, so have ept_set_middle_entry() return the mapped pointer rather
-than tearing it down and then getting re-established right again.
-
-Similarly ept_next_level() wants to hand back a mapped pointer of
-the next level page, so re-use the one established by
-ept_set_middle_entry() in case that path was taken.
-
-Pull the setting of suppress_ve ahead of insertion into the higher level
-table, and don't have ept_split_super_page() set the field a 2nd time.
-
-This is part of XSA-328.
-
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-
---- a/xen/arch/x86/mm/p2m-ept.c
-+++ b/xen/arch/x86/mm/p2m-ept.c
-@@ -187,8 +187,9 @@ static void ept_p2m_type_to_flags(struct
- #define GUEST_TABLE_SUPER_PAGE  2
- #define GUEST_TABLE_POD_PAGE    3
- 
--/* Fill in middle levels of ept table */
--static int ept_set_middle_entry(struct p2m_domain *p2m, ept_entry_t *ept_entry)
-+/* Fill in middle level of ept table; return pointer to mapped new table. */
-+static ept_entry_t *ept_set_middle_entry(struct p2m_domain *p2m,
-+                                         ept_entry_t *ept_entry)
- {
-     mfn_t mfn;
-     ept_entry_t *table;
-@@ -196,7 +197,12 @@ static int ept_set_middle_entry(struct p
- 
-     mfn = p2m_alloc_ptp(p2m, 0);
-     if ( mfn_eq(mfn, INVALID_MFN) )
--        return 0;
-+        return NULL;
-+
-+    table = map_domain_page(mfn);
-+
-+    for ( i = 0; i < EPT_PAGETABLE_ENTRIES; i++ )
-+        table[i].suppress_ve = 1;
- 
-     ept_entry->epte = 0;
-     ept_entry->mfn = mfn_x(mfn);
-@@ -208,14 +214,7 @@ static int ept_set_middle_entry(struct p
- 
-     ept_entry->suppress_ve = 1;
- 
--    table = map_domain_page(mfn);
--
--    for ( i = 0; i < EPT_PAGETABLE_ENTRIES; i++ )
--        table[i].suppress_ve = 1;
--
--    unmap_domain_page(table);
--
--    return 1;
-+    return table;
- }
- 
- /* free ept sub tree behind an entry */
-@@ -253,10 +252,10 @@ static bool_t ept_split_super_page(struc
- 
-     ASSERT(is_epte_superpage(ept_entry));
- 
--    if ( !ept_set_middle_entry(p2m, &new_ept) )
-+    table = ept_set_middle_entry(p2m, &new_ept);
-+    if ( !table )
-         return 0;
- 
--    table = map_domain_page(_mfn(new_ept.mfn));
-     trunk = 1UL << ((level - 1) * EPT_TABLE_ORDER);
- 
-     for ( i = 0; i < EPT_PAGETABLE_ENTRIES; i++ )
-@@ -267,7 +266,6 @@ static bool_t ept_split_super_page(struc
-         epte->sp = (level > 1);
-         epte->mfn += i * trunk;
-         epte->snp = is_iommu_enabled(p2m->domain) && iommu_snoop;
--        epte->suppress_ve = 1;
- 
-         ept_p2m_type_to_flags(p2m, epte, epte->sa_p2mt, epte->access);
- 
-@@ -306,8 +304,7 @@ static int ept_next_level(struct p2m_dom
-                           ept_entry_t **table, unsigned long *gfn_remainder,
-                           int next_level)
- {
--    unsigned long mfn;
--    ept_entry_t *ept_entry, e;
-+    ept_entry_t *ept_entry, *next = NULL, e;
-     u32 shift, index;
- 
-     shift = next_level * EPT_TABLE_ORDER;
-@@ -332,19 +329,17 @@ static int ept_next_level(struct p2m_dom
-         if ( read_only )
-             return GUEST_TABLE_MAP_FAILED;
- 
--        if ( !ept_set_middle_entry(p2m, ept_entry) )
-+        next = ept_set_middle_entry(p2m, ept_entry);
-+        if ( !next )
-             return GUEST_TABLE_MAP_FAILED;
--        else
--            e = atomic_read_ept_entry(ept_entry); /* Refresh */
-+        /* e is now stale and hence may not be used anymore below. */
-     }
--
-     /* The only time sp would be set here is if we had hit a superpage */
--    if ( is_epte_superpage(&e) )
-+    else if ( is_epte_superpage(&e) )
-         return GUEST_TABLE_SUPER_PAGE;
- 
--    mfn = e.mfn;
-     unmap_domain_page(*table);
--    *table = map_domain_page(_mfn(mfn));
-+    *table = next ?: map_domain_page(_mfn(e.mfn));
-     *gfn_remainder &= (1UL << shift) - 1;
-     return GUEST_TABLE_NORMAL_PAGE;
- }
diff --git a/system/xen/xsa/xsa328-4.13-2.patch b/system/xen/xsa/xsa328-4.13-2.patch
deleted file mode 100644
index c4f437f625..0000000000
--- a/system/xen/xsa/xsa328-4.13-2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: <security@xenproject.org>
-Subject: x86/ept: atomically modify entries in ept_next_level
-
-ept_next_level was passing a live PTE pointer to ept_set_middle_entry,
-which was then modified without taking into account that the PTE could
-be part of a live EPT table. This wasn't a security issue because the
-pages returned by p2m_alloc_ptp are zeroed, so adding such an entry
-before actually initializing it didn't allow a guest to access
-physical memory addresses it wasn't supposed to access.
-
-This is part of XSA-328.
-
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-
---- a/xen/arch/x86/mm/p2m-ept.c
-+++ b/xen/arch/x86/mm/p2m-ept.c
-@@ -307,6 +307,8 @@ static int ept_next_level(struct p2m_dom
-     ept_entry_t *ept_entry, *next = NULL, e;
-     u32 shift, index;
- 
-+    ASSERT(next_level);
-+
-     shift = next_level * EPT_TABLE_ORDER;
- 
-     index = *gfn_remainder >> shift;
-@@ -323,16 +325,20 @@ static int ept_next_level(struct p2m_dom
- 
-     if ( !is_epte_present(&e) )
-     {
-+        int rc;
-+
-         if ( e.sa_p2mt == p2m_populate_on_demand )
-             return GUEST_TABLE_POD_PAGE;
- 
-         if ( read_only )
-             return GUEST_TABLE_MAP_FAILED;
- 
--        next = ept_set_middle_entry(p2m, ept_entry);
-+        next = ept_set_middle_entry(p2m, &e);
-         if ( !next )
-             return GUEST_TABLE_MAP_FAILED;
--        /* e is now stale and hence may not be used anymore below. */
-+
-+        rc = atomic_write_ept_entry(p2m, ept_entry, e, next_level);
-+        ASSERT(rc == 0);
-     }
-     /* The only time sp would be set here is if we had hit a superpage */
-     else if ( is_epte_superpage(&e) )
diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-1.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-1.patch
deleted file mode 100644
index 9a08ab240e..0000000000
--- a/system/xen/xsa/xsa328-post-xsa321-4.13-1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: vtd: improve IOMMU TLB flush
-
-Do not limit PSI flushes to order 0 pages, in order to avoid doing a
-full TLB flush if the passed in page has an order greater than 0 and
-is aligned. Should increase the performance of IOMMU TLB flushes when
-dealing with page orders greater than 0.
-
-This is part of XSA-321.
-
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-
---- a/xen/drivers/passthrough/vtd/iommu.c
-+++ b/xen/drivers/passthrough/vtd/iommu.c
-@@ -570,13 +570,14 @@ static int __must_check iommu_flush_iotl
-         if ( iommu_domid == -1 )
-             continue;
- 
--        if ( page_count != 1 || dfn_eq(dfn, INVALID_DFN) )
-+        if ( !page_count || (page_count & (page_count - 1)) ||
-+             dfn_eq(dfn, INVALID_DFN) || !IS_ALIGNED(dfn_x(dfn), page_count) )
-             rc = iommu_flush_iotlb_dsi(iommu, iommu_domid,
-                                        0, flush_dev_iotlb);
-         else
-             rc = iommu_flush_iotlb_psi(iommu, iommu_domid,
-                                        dfn_to_daddr(dfn),
--                                       PAGE_ORDER_4K,
-+                                       get_order_from_pages(page_count),
-                                        !dma_old_pte_present,
-                                        flush_dev_iotlb);
- 
diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-2.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-2.patch
deleted file mode 100644
index 1e48615f2b..0000000000
--- a/system/xen/xsa/xsa328-post-xsa321-4.13-2.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From: <security@xenproject.org>
-Subject: vtd: prune (and rename) cache flush functions
-
-Rename __iommu_flush_cache to iommu_sync_cache and remove
-iommu_flush_cache_page. Also remove the iommu_flush_cache_entry
-wrapper and just use iommu_sync_cache instead. Note the _entry suffix
-was meaningless as the wrapper was already taking a size parameter in
-bytes. While there also constify the addr parameter.
-
-No functional change intended.
-
-This is part of XSA-321.
-
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-
---- a/xen/drivers/passthrough/vtd/extern.h
-+++ b/xen/drivers/passthrough/vtd/extern.h
-@@ -43,8 +43,7 @@ void disable_qinval(struct vtd_iommu *io
- int enable_intremap(struct vtd_iommu *iommu, int eim);
- void disable_intremap(struct vtd_iommu *iommu);
- 
--void iommu_flush_cache_entry(void *addr, unsigned int size);
--void iommu_flush_cache_page(void *addr, unsigned long npages);
-+void iommu_sync_cache(const void *addr, unsigned int size);
- int iommu_alloc(struct acpi_drhd_unit *drhd);
- void iommu_free(struct acpi_drhd_unit *drhd);
- 
---- a/xen/drivers/passthrough/vtd/intremap.c
-+++ b/xen/drivers/passthrough/vtd/intremap.c
-@@ -230,7 +230,7 @@ static void free_remap_entry(struct vtd_
-                      iremap_entries, iremap_entry);
- 
-     update_irte(iommu, iremap_entry, &new_ire, false);
--    iommu_flush_cache_entry(iremap_entry, sizeof(*iremap_entry));
-+    iommu_sync_cache(iremap_entry, sizeof(*iremap_entry));
-     iommu_flush_iec_index(iommu, 0, index);
- 
-     unmap_vtd_domain_page(iremap_entries);
-@@ -406,7 +406,7 @@ static int ioapic_rte_to_remap_entry(str
-     }
- 
-     update_irte(iommu, iremap_entry, &new_ire, !init);
--    iommu_flush_cache_entry(iremap_entry, sizeof(*iremap_entry));
-+    iommu_sync_cache(iremap_entry, sizeof(*iremap_entry));
-     iommu_flush_iec_index(iommu, 0, index);
- 
-     unmap_vtd_domain_page(iremap_entries);
-@@ -695,7 +695,7 @@ static int msi_msg_to_remap_entry(
-     update_irte(iommu, iremap_entry, &new_ire, msi_desc->irte_initialized);
-     msi_desc->irte_initialized = true;
- 
--    iommu_flush_cache_entry(iremap_entry, sizeof(*iremap_entry));
-+    iommu_sync_cache(iremap_entry, sizeof(*iremap_entry));
-     iommu_flush_iec_index(iommu, 0, index);
- 
-     unmap_vtd_domain_page(iremap_entries);
---- a/xen/drivers/passthrough/vtd/iommu.c
-+++ b/xen/drivers/passthrough/vtd/iommu.c
-@@ -140,7 +140,8 @@ static int context_get_domain_id(struct
- }
- 
- static int iommus_incoherent;
--static void __iommu_flush_cache(void *addr, unsigned int size)
-+
-+void iommu_sync_cache(const void *addr, unsigned int size)
- {
-     int i;
-     static unsigned int clflush_size = 0;
-@@ -155,16 +156,6 @@ static void __iommu_flush_cache(void *ad
-         cacheline_flush((char *)addr + i);
- }
- 
--void iommu_flush_cache_entry(void *addr, unsigned int size)
--{
--    __iommu_flush_cache(addr, size);
--}
--
--void iommu_flush_cache_page(void *addr, unsigned long npages)
--{
--    __iommu_flush_cache(addr, PAGE_SIZE * npages);
--}
--
- /* Allocate page table, return its machine address */
- uint64_t alloc_pgtable_maddr(unsigned long npages, nodeid_t node)
- {
-@@ -183,7 +174,7 @@ uint64_t alloc_pgtable_maddr(unsigned lo
-         vaddr = __map_domain_page(cur_pg);
-         memset(vaddr, 0, PAGE_SIZE);
- 
--        iommu_flush_cache_page(vaddr, 1);
-+        iommu_sync_cache(vaddr, PAGE_SIZE);
-         unmap_domain_page(vaddr);
-         cur_pg++;
-     }
-@@ -216,7 +207,7 @@ static u64 bus_to_context_maddr(struct v
-         }
-         set_root_value(*root, maddr);
-         set_root_present(*root);
--        iommu_flush_cache_entry(root, sizeof(struct root_entry));
-+        iommu_sync_cache(root, sizeof(struct root_entry));
-     }
-     maddr = (u64) get_context_addr(*root);
-     unmap_vtd_domain_page(root_entries);
-@@ -263,7 +254,7 @@ static u64 addr_to_dma_page_maddr(struct
-              */
-             dma_set_pte_readable(*pte);
-             dma_set_pte_writable(*pte);
--            iommu_flush_cache_entry(pte, sizeof(struct dma_pte));
-+            iommu_sync_cache(pte, sizeof(struct dma_pte));
-         }
- 
-         if ( level == 2 )
-@@ -640,7 +631,7 @@ static int __must_check dma_pte_clear_on
-     *flush_flags |= IOMMU_FLUSHF_modified;
- 
-     spin_unlock(&hd->arch.mapping_lock);
--    iommu_flush_cache_entry(pte, sizeof(struct dma_pte));
-+    iommu_sync_cache(pte, sizeof(struct dma_pte));
- 
-     unmap_vtd_domain_page(page);
- 
-@@ -679,7 +670,7 @@ static void iommu_free_page_table(struct
-             iommu_free_pagetable(dma_pte_addr(*pte), next_level);
- 
-         dma_clear_pte(*pte);
--        iommu_flush_cache_entry(pte, sizeof(struct dma_pte));
-+        iommu_sync_cache(pte, sizeof(struct dma_pte));
-     }
- 
-     unmap_vtd_domain_page(pt_vaddr);
-@@ -1400,7 +1391,7 @@ int domain_context_mapping_one(
-     context_set_address_width(*context, agaw);
-     context_set_fault_enable(*context);
-     context_set_present(*context);
--    iommu_flush_cache_entry(context, sizeof(struct context_entry));
-+    iommu_sync_cache(context, sizeof(struct context_entry));
-     spin_unlock(&iommu->lock);
- 
-     /* Context entry was previously non-present (with domid 0). */
-@@ -1564,7 +1555,7 @@ int domain_context_unmap_one(
- 
-     context_clear_present(*context);
-     context_clear_entry(*context);
--    iommu_flush_cache_entry(context, sizeof(struct context_entry));
-+    iommu_sync_cache(context, sizeof(struct context_entry));
- 
-     iommu_domid= domain_iommu_domid(domain, iommu);
-     if ( iommu_domid == -1 )
-@@ -1791,7 +1782,7 @@ static int __must_check intel_iommu_map_
- 
-     *pte = new;
- 
--    iommu_flush_cache_entry(pte, sizeof(struct dma_pte));
-+    iommu_sync_cache(pte, sizeof(struct dma_pte));
-     spin_unlock(&hd->arch.mapping_lock);
-     unmap_vtd_domain_page(page);
- 
-@@ -1866,7 +1857,7 @@ int iommu_pte_flush(struct domain *d, ui
-     int iommu_domid;
-     int rc = 0;
- 
--    iommu_flush_cache_entry(pte, sizeof(struct dma_pte));
-+    iommu_sync_cache(pte, sizeof(struct dma_pte));
- 
-     for_each_drhd_unit ( drhd )
-     {
-@@ -2724,7 +2715,7 @@ static int __init intel_iommu_quarantine
-             dma_set_pte_addr(*pte, maddr);
-             dma_set_pte_readable(*pte);
-         }
--        iommu_flush_cache_page(parent, 1);
-+        iommu_sync_cache(parent, PAGE_SIZE);
- 
-         unmap_vtd_domain_page(parent);
-         parent = map_vtd_domain_page(maddr);
diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-3.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-3.patch
deleted file mode 100644
index c141c4b785..0000000000
--- a/system/xen/xsa/xsa328-post-xsa321-4.13-3.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From: <security@xenproject.org>
-Subject: x86/iommu: introduce a cache sync hook
-
-The hook is only implemented for VT-d and it uses the already existing
-iommu_sync_cache function present in VT-d code. The new hook is
-added so that the cache can be flushed by code outside of VT-d when
-using shared page tables.
-
-Note that alloc_pgtable_maddr must use the now locally defined
-sync_cache function, because IOMMU ops are not yet setup the first
-time the function gets called during IOMMU initialization.
-
-No functional change intended.
-
-This is part of XSA-321.
-
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-
---- a/xen/drivers/passthrough/vtd/extern.h
-+++ b/xen/drivers/passthrough/vtd/extern.h
-@@ -43,7 +43,6 @@ void disable_qinval(struct vtd_iommu *io
- int enable_intremap(struct vtd_iommu *iommu, int eim);
- void disable_intremap(struct vtd_iommu *iommu);
- 
--void iommu_sync_cache(const void *addr, unsigned int size);
- int iommu_alloc(struct acpi_drhd_unit *drhd);
- void iommu_free(struct acpi_drhd_unit *drhd);
- 
---- a/xen/drivers/passthrough/vtd/iommu.c
-+++ b/xen/drivers/passthrough/vtd/iommu.c
-@@ -141,7 +141,7 @@ static int context_get_domain_id(struct
- 
- static int iommus_incoherent;
- 
--void iommu_sync_cache(const void *addr, unsigned int size)
-+static void sync_cache(const void *addr, unsigned int size)
- {
-     int i;
-     static unsigned int clflush_size = 0;
-@@ -174,7 +174,7 @@ uint64_t alloc_pgtable_maddr(unsigned lo
-         vaddr = __map_domain_page(cur_pg);
-         memset(vaddr, 0, PAGE_SIZE);
- 
--        iommu_sync_cache(vaddr, PAGE_SIZE);
-+        sync_cache(vaddr, PAGE_SIZE);
-         unmap_domain_page(vaddr);
-         cur_pg++;
-     }
-@@ -2763,6 +2763,7 @@ const struct iommu_ops __initconstrel in
-     .iotlb_flush_all = iommu_flush_iotlb_all,
-     .get_reserved_device_memory = intel_iommu_get_reserved_device_memory,
-     .dump_p2m_table = vtd_dump_p2m_table,
-+    .sync_cache = sync_cache,
- };
- 
- const struct iommu_init_ops __initconstrel intel_iommu_init_ops = {
---- a/xen/include/asm-x86/iommu.h
-+++ b/xen/include/asm-x86/iommu.h
-@@ -121,6 +121,13 @@ extern bool untrusted_msi;
- int pi_update_irte(const struct pi_desc *pi_desc, const struct pirq *pirq,
-                    const uint8_t gvec);
- 
-+#define iommu_sync_cache(addr, size) ({                 \
-+    const struct iommu_ops *ops = iommu_get_ops();      \
-+                                                        \
-+    if ( ops->sync_cache )                              \
-+        iommu_vcall(ops, sync_cache, addr, size);       \
-+})
-+
- #endif /* !__ARCH_X86_IOMMU_H__ */
- /*
-  * Local variables:
---- a/xen/include/xen/iommu.h
-+++ b/xen/include/xen/iommu.h
-@@ -250,6 +250,7 @@ struct iommu_ops {
-     int (*setup_hpet_msi)(struct msi_desc *);
- 
-     int (*adjust_irq_affinities)(void);
-+    void (*sync_cache)(const void *addr, unsigned int size);
- #endif /* CONFIG_X86 */
- 
-     int __must_check (*suspend)(void);
diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-4.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-4.patch
deleted file mode 100644
index 62bbcc7271..0000000000
--- a/system/xen/xsa/xsa328-post-xsa321-4.13-4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: <security@xenproject.org>
-Subject: vtd: don't assume addresses are aligned in sync_cache
-
-Current code in sync_cache assume that the address passed in is
-aligned to a cache line size. Fix the code to support passing in
-arbitrary addresses not necessarily aligned to a cache line size.
-
-This is part of XSA-321.
-
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-
---- a/xen/drivers/passthrough/vtd/iommu.c
-+++ b/xen/drivers/passthrough/vtd/iommu.c
-@@ -143,8 +143,8 @@ static int iommus_incoherent;
- 
- static void sync_cache(const void *addr, unsigned int size)
- {
--    int i;
--    static unsigned int clflush_size = 0;
-+    static unsigned long clflush_size = 0;
-+    const void *end = addr + size;
- 
-     if ( !iommus_incoherent )
-         return;
-@@ -152,8 +152,9 @@ static void sync_cache(const void *addr,
-     if ( clflush_size == 0 )
-         clflush_size = get_cache_line_size();
- 
--    for ( i = 0; i < size; i += clflush_size )
--        cacheline_flush((char *)addr + i);
-+    addr -= (unsigned long)addr & (clflush_size - 1);
-+    for ( ; addr < end; addr += clflush_size )
-+        cacheline_flush((char *)addr);
- }
- 
- /* Allocate page table, return its machine address */
diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-5.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-5.patch
deleted file mode 100644
index 60cfe6ccdf..0000000000
--- a/system/xen/xsa/xsa328-post-xsa321-4.13-5.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: <security@xenproject.org>
-Subject: x86/alternative: introduce alternative_2
-
-It's based on alternative_io_2 without inputs or outputs but with an
-added memory clobber.
-
-This is part of XSA-321.
-
-Acked-by: Jan Beulich <jbeulich@suse.com>
-
---- a/xen/include/asm-x86/alternative.h
-+++ b/xen/include/asm-x86/alternative.h
-@@ -114,6 +114,11 @@ extern void alternative_branches(void);
- #define alternative(oldinstr, newinstr, feature)                        \
-         asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) : : : "memory")
- 
-+#define alternative_2(oldinstr, newinstr1, feature1, newinstr2, feature2) \
-+	asm volatile (ALTERNATIVE_2(oldinstr, newinstr1, feature1,	\
-+				    newinstr2, feature2)		\
-+		      : : : "memory")
-+
- /*
-  * Alternative inline assembly with input.
-  *
diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-6.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-6.patch
deleted file mode 100644
index 4c5c5ab0ba..0000000000
--- a/system/xen/xsa/xsa328-post-xsa321-4.13-6.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From: <security@xenproject.org>
-Subject: vtd: optimize CPU cache sync
-
-Some VT-d IOMMUs are non-coherent, which requires a cache write back
-in order for the changes made by the CPU to be visible to the IOMMU.
-This cache write back was unconditionally done using clflush, but there are
-other more efficient instructions to do so, hence implement support
-for them using the alternative framework.
-
-This is part of XSA-321.
-
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-
---- a/xen/drivers/passthrough/vtd/extern.h
-+++ b/xen/drivers/passthrough/vtd/extern.h
-@@ -68,7 +68,6 @@ int __must_check qinval_device_iotlb_syn
-                                           u16 did, u16 size, u64 addr);
- 
- unsigned int get_cache_line_size(void);
--void cacheline_flush(char *);
- void flush_all_cache(void);
- 
- uint64_t alloc_pgtable_maddr(unsigned long npages, nodeid_t node);
---- a/xen/drivers/passthrough/vtd/iommu.c
-+++ b/xen/drivers/passthrough/vtd/iommu.c
-@@ -31,6 +31,7 @@
- #include <xen/pci_regs.h>
- #include <xen/keyhandler.h>
- #include <asm/msi.h>
-+#include <asm/nops.h>
- #include <asm/irq.h>
- #include <asm/hvm/vmx/vmx.h>
- #include <asm/p2m.h>
-@@ -154,7 +155,42 @@ static void sync_cache(const void *addr,
- 
-     addr -= (unsigned long)addr & (clflush_size - 1);
-     for ( ; addr < end; addr += clflush_size )
--        cacheline_flush((char *)addr);
-+/*
-+ * The arguments to a macro must not include preprocessor directives. Doing so
-+ * results in undefined behavior, so we have to create some defines here in
-+ * order to avoid it.
-+ */
-+#if defined(HAVE_AS_CLWB)
-+# define CLWB_ENCODING "clwb %[p]"
-+#elif defined(HAVE_AS_XSAVEOPT)
-+# define CLWB_ENCODING "data16 xsaveopt %[p]" /* clwb */
-+#else
-+# define CLWB_ENCODING ".byte 0x66, 0x0f, 0xae, 0x30" /* clwb (%%rax) */
-+#endif
-+
-+#define BASE_INPUT(addr) [p] "m" (*(const char *)(addr))
-+#if defined(HAVE_AS_CLWB) || defined(HAVE_AS_XSAVEOPT)
-+# define INPUT BASE_INPUT
-+#else
-+# define INPUT(addr) "a" (addr), BASE_INPUT(addr)
-+#endif
-+        /*
-+         * Note regarding the use of NOP_DS_PREFIX: it's faster to do a clflush
-+         * + prefix than a clflush + nop, and hence the prefix is added instead
-+         * of letting the alternative framework fill the gap by appending nops.
-+         */
-+        alternative_io_2(".byte " __stringify(NOP_DS_PREFIX) "; clflush %[p]",
-+                         "data16 clflush %[p]", /* clflushopt */
-+                         X86_FEATURE_CLFLUSHOPT,
-+                         CLWB_ENCODING,
-+                         X86_FEATURE_CLWB, /* no outputs */,
-+                         INPUT(addr));
-+#undef INPUT
-+#undef BASE_INPUT
-+#undef CLWB_ENCODING
-+
-+    alternative_2("", "sfence", X86_FEATURE_CLFLUSHOPT,
-+                      "sfence", X86_FEATURE_CLWB);
- }
- 
- /* Allocate page table, return its machine address */
---- a/xen/drivers/passthrough/vtd/x86/vtd.c
-+++ b/xen/drivers/passthrough/vtd/x86/vtd.c
-@@ -51,11 +51,6 @@ unsigned int get_cache_line_size(void)
-     return ((cpuid_ebx(1) >> 8) & 0xff) * 8;
- }
- 
--void cacheline_flush(char * addr)
--{
--    clflush(addr);
--}
--
- void flush_all_cache()
- {
-     wbinvd();
diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-7.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-7.patch
deleted file mode 100644
index 0bd018f972..0000000000
--- a/system/xen/xsa/xsa328-post-xsa321-4.13-7.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From: <security@xenproject.org>
-Subject: x86/ept: flush cache when modifying PTEs and sharing page tables
-
-Modifications made to the page tables by EPT code need to be written
-to memory when the page tables are shared with the IOMMU, as Intel
-IOMMUs can be non-coherent and thus require changes to be written to
-memory in order to be visible to the IOMMU.
-
-In order to achieve this make sure data is written back to memory
-after writing an EPT entry when the recalc bit is not set in
-atomic_write_ept_entry. If such bit is set, the entry will be
-adjusted and atomic_write_ept_entry will be called a second time
-without the recalc bit set. Note that when splitting a super page the
-new tables resulting of the split should also be written back.
-
-Failure to do so can allow devices behind the IOMMU access to the
-stale super page, or cause coherency issues as changes made by the
-processor to the page tables are not visible to the IOMMU.
-
-This allows to remove the VT-d specific iommu_pte_flush helper, since
-the cache write back is now performed by atomic_write_ept_entry, and
-hence iommu_iotlb_flush can be used to flush the IOMMU TLB. The newly
-used method (iommu_iotlb_flush) can result in less flushes, since it
-might sometimes be called rightly with 0 flags, in which case it
-becomes a no-op.
-
-This is part of XSA-321.
-
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-
---- a/xen/arch/x86/mm/p2m-ept.c
-+++ b/xen/arch/x86/mm/p2m-ept.c
-@@ -58,6 +58,19 @@ static int atomic_write_ept_entry(struct
- 
-     write_atomic(&entryptr->epte, new.epte);
- 
-+    /*
-+     * The recalc field on the EPT is used to signal either that a
-+     * recalculation of the EMT field is required (which doesn't effect the
-+     * IOMMU), or a type change. Type changes can only be between ram_rw,
-+     * logdirty and ioreq_server: changes to/from logdirty won't work well with
-+     * an IOMMU anyway, as IOMMU #PFs are not synchronous and will lead to
-+     * aborts, and changes to/from ioreq_server are already fully flushed
-+     * before returning to guest context (see
-+     * XEN_DMOP_map_mem_type_to_ioreq_server).
-+     */
-+    if ( !new.recalc && iommu_use_hap_pt(p2m->domain) )
-+        iommu_sync_cache(entryptr, sizeof(*entryptr));
-+
-     return 0;
- }
- 
-@@ -278,6 +291,9 @@ static bool_t ept_split_super_page(struc
-             break;
-     }
- 
-+    if ( iommu_use_hap_pt(p2m->domain) )
-+        iommu_sync_cache(table, EPT_PAGETABLE_ENTRIES * sizeof(ept_entry_t));
-+
-     unmap_domain_page(table);
- 
-     /* Even failed we should install the newly allocated ept page. */
-@@ -337,6 +353,9 @@ static int ept_next_level(struct p2m_dom
-         if ( !next )
-             return GUEST_TABLE_MAP_FAILED;
- 
-+        if ( iommu_use_hap_pt(p2m->domain) )
-+            iommu_sync_cache(next, EPT_PAGETABLE_ENTRIES * sizeof(ept_entry_t));
-+
-         rc = atomic_write_ept_entry(p2m, ept_entry, e, next_level);
-         ASSERT(rc == 0);
-     }
-@@ -821,7 +840,10 @@ out:
-          need_modify_vtd_table )
-     {
-         if ( iommu_use_hap_pt(d) )
--            rc = iommu_pte_flush(d, gfn, &ept_entry->epte, order, vtd_pte_present);
-+            rc = iommu_iotlb_flush(d, _dfn(gfn), (1u << order),
-+                                   (iommu_flags ? IOMMU_FLUSHF_added : 0) |
-+                                   (vtd_pte_present ? IOMMU_FLUSHF_modified
-+                                                    : 0));
-         else if ( need_iommu_pt_sync(d) )
-             rc = iommu_flags ?
-                 iommu_legacy_map(d, _dfn(gfn), mfn, order, iommu_flags) :
---- a/xen/drivers/passthrough/vtd/iommu.c
-+++ b/xen/drivers/passthrough/vtd/iommu.c
-@@ -1884,53 +1884,6 @@ static int intel_iommu_lookup_page(struc
-     return 0;
- }
- 
--int iommu_pte_flush(struct domain *d, uint64_t dfn, uint64_t *pte,
--                    int order, int present)
--{
--    struct acpi_drhd_unit *drhd;
--    struct vtd_iommu *iommu = NULL;
--    struct domain_iommu *hd = dom_iommu(d);
--    bool_t flush_dev_iotlb;
--    int iommu_domid;
--    int rc = 0;
--
--    iommu_sync_cache(pte, sizeof(struct dma_pte));
--
--    for_each_drhd_unit ( drhd )
--    {
--        iommu = drhd->iommu;
--        if ( !test_bit(iommu->index, &hd->arch.iommu_bitmap) )
--            continue;
--
--        flush_dev_iotlb = !!find_ats_dev_drhd(iommu);
--        iommu_domid= domain_iommu_domid(d, iommu);
--        if ( iommu_domid == -1 )
--            continue;
--
--        rc = iommu_flush_iotlb_psi(iommu, iommu_domid,
--                                   __dfn_to_daddr(dfn),
--                                   order, !present, flush_dev_iotlb);
--        if ( rc > 0 )
--        {
--            iommu_flush_write_buffer(iommu);
--            rc = 0;
--        }
--    }
--
--    if ( unlikely(rc) )
--    {
--        if ( !d->is_shutting_down && printk_ratelimit() )
--            printk(XENLOG_ERR VTDPREFIX
--                   " d%d: IOMMU pages flush failed: %d\n",
--                   d->domain_id, rc);
--
--        if ( !is_hardware_domain(d) )
--            domain_crash(d);
--    }
--
--    return rc;
--}
--
- static int __init vtd_ept_page_compatible(struct vtd_iommu *iommu)
- {
-     u64 ept_cap, vtd_cap = iommu->cap;
---- a/xen/include/asm-x86/iommu.h
-+++ b/xen/include/asm-x86/iommu.h
-@@ -97,10 +97,6 @@ static inline int iommu_adjust_irq_affin
-            : 0;
- }
- 
--/* While VT-d specific, this must get declared in a generic header. */
--int __must_check iommu_pte_flush(struct domain *d, u64 gfn, u64 *pte,
--                                 int order, int present);
--
- static inline bool iommu_supports_x2apic(void)
- {
-     return iommu_init_ops && iommu_init_ops->supports_x2apic
diff --git a/system/xen/xsa/xsa333.patch b/system/xen/xsa/xsa333.patch
deleted file mode 100644
index 6b86c942fa..0000000000
--- a/system/xen/xsa/xsa333.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Andrew Cooper <andrew.cooper3@citrix.com>
-Subject: x86/pv: Handle the Intel-specific MSR_MISC_ENABLE correctly
-
-This MSR doesn't exist on AMD hardware, and switching away from the safe
-functions in the common MSR path was an erroneous change.
-
-Partially revert the change.
-
-This is XSA-333.
-
-Fixes: 4fdc932b3cc ("x86/Intel: drop another 32-bit leftover")
-Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Wei Liu <wl@xen.org>
-
-diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c
-index efeb2a727e..6332c74b80 100644
---- a/xen/arch/x86/pv/emul-priv-op.c
-+++ b/xen/arch/x86/pv/emul-priv-op.c
-@@ -924,7 +924,8 @@ static int read_msr(unsigned int reg, uint64_t *val,
-         return X86EMUL_OKAY;
- 
-     case MSR_IA32_MISC_ENABLE:
--        rdmsrl(reg, *val);
-+        if ( rdmsr_safe(reg, *val) )
-+            break;
-         *val = guest_misc_enable(*val);
-         return X86EMUL_OKAY;
- 
-@@ -1059,7 +1060,8 @@ static int write_msr(unsigned int reg, uint64_t val,
-         break;
- 
-     case MSR_IA32_MISC_ENABLE:
--        rdmsrl(reg, temp);
-+        if ( rdmsr_safe(reg, temp) )
-+            break;
-         if ( val != guest_misc_enable(temp) )
-             goto invalid;
-         return X86EMUL_OKAY;
diff --git a/system/xen/xsa/xsa334.patch b/system/xen/xsa/xsa334.patch
deleted file mode 100644
index 4260cdb2b2..0000000000
--- a/system/xen/xsa/xsa334.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Andrew Cooper <andrew.cooper3@citrix.com>
-Subject: xen/memory: Don't skip the RCU unlock path in acquire_resource()
-
-In the case that an HVM Stubdomain makes an XENMEM_acquire_resource hypercall,
-the FIXME path will bypass rcu_unlock_domain() on the way out of the function.
-
-Move the check to the start of the function.  This does change the behaviour
-of the get-size path for HVM Stubdomains, but that functionality is currently
-broken and unused anyway, as well as being quite useless to entities which
-can't actually map the resource anyway.
-
-This is XSA-334.
-
-Fixes: 83fa6552ce ("common: add a new mappable resource type: XENMEM_resource_grant_table")
-Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-
-diff --git a/xen/common/memory.c b/xen/common/memory.c
-index 1a3c9ffb30..29741d8904 100644
---- a/xen/common/memory.c
-+++ b/xen/common/memory.c
-@@ -1058,6 +1058,14 @@ static int acquire_resource(
-     xen_pfn_t mfn_list[32];
-     int rc;
- 
-+    /*
-+     * FIXME: Until foreign pages inserted into the P2M are properly
-+     *        reference counted, it is unsafe to allow mapping of
-+     *        resource pages unless the caller is the hardware domain.
-+     */
-+    if ( paging_mode_translate(currd) && !is_hardware_domain(currd) )
-+        return -EACCES;
-+
-     if ( copy_from_guest(&xmar, arg, 1) )
-         return -EFAULT;
- 
-@@ -1114,14 +1122,6 @@ static int acquire_resource(
-         xen_pfn_t gfn_list[ARRAY_SIZE(mfn_list)];
-         unsigned int i;
- 
--        /*
--         * FIXME: Until foreign pages inserted into the P2M are properly
--         *        reference counted, it is unsafe to allow mapping of
--         *        resource pages unless the caller is the hardware domain.
--         */
--        if ( !is_hardware_domain(currd) )
--            return -EACCES;
--
-         if ( copy_from_guest(gfn_list, xmar.frame_list, xmar.nr_frames) )
-             rc = -EFAULT;
- 
diff --git a/system/xen/xsa/xsa335-qemu.patch b/system/xen/xsa/xsa335-qemu.patch
deleted file mode 100644
index 5617502359..0000000000
--- a/system/xen/xsa/xsa335-qemu.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From c5bd2924c6d6a5bcbffb8b5e7798a88970131c07 Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Mon, 17 Aug 2020 08:34:22 +0200
-Subject: [PATCH] usb: fix setup_len init (CVE-2020-14364)
-
-Store calculated setup_len in a local variable, verify it, and only
-write it to the struct (USBDevice->setup_len) in case it passed the
-sanity checks.
-
-This prevents other code (do_token_{in,out} functions specifically)
-from working with invalid USBDevice->setup_len values and overrunning
-the USBDevice->setup_buf[] buffer.
-
-Fixes: CVE-2020-14364
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
----
- hw/usb/core.c | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/hw/usb/core.c b/hw/usb/core.c
-index 5abd128b6bc5..5234dcc73fea 100644
---- a/hw/usb/core.c
-+++ b/hw/usb/core.c
-@@ -129,6 +129,7 @@ void usb_wakeup(USBEndpoint *ep, unsigned int stream)
- static void do_token_setup(USBDevice *s, USBPacket *p)
- {
-     int request, value, index;
-+    unsigned int setup_len;
- 
-     if (p->iov.size != 8) {
-         p->status = USB_RET_STALL;
-@@ -138,14 +139,15 @@ static void do_token_setup(USBDevice *s, USBPacket *p)
-     usb_packet_copy(p, s->setup_buf, p->iov.size);
-     s->setup_index = 0;
-     p->actual_length = 0;
--    s->setup_len   = (s->setup_buf[7] << 8) | s->setup_buf[6];
--    if (s->setup_len > sizeof(s->data_buf)) {
-+    setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6];
-+    if (setup_len > sizeof(s->data_buf)) {
-         fprintf(stderr,
-                 "usb_generic_handle_packet: ctrl buffer too small (%d > %zu)\n",
--                s->setup_len, sizeof(s->data_buf));
-+                setup_len, sizeof(s->data_buf));
-         p->status = USB_RET_STALL;
-         return;
-     }
-+    s->setup_len = setup_len;
- 
-     request = (s->setup_buf[0] << 8) | s->setup_buf[1];
-     value   = (s->setup_buf[3] << 8) | s->setup_buf[2];
-@@ -259,26 +261,28 @@ static void do_token_out(USBDevice *s, USBPacket *p)
- static void do_parameter(USBDevice *s, USBPacket *p)
- {
-     int i, request, value, index;
-+    unsigned int setup_len;
- 
-     for (i = 0; i < 8; i++) {
-         s->setup_buf[i] = p->parameter >> (i*8);
-     }
- 
-     s->setup_state = SETUP_STATE_PARAM;
--    s->setup_len   = (s->setup_buf[7] << 8) | s->setup_buf[6];
-     s->setup_index = 0;
- 
-     request = (s->setup_buf[0] << 8) | s->setup_buf[1];
-     value   = (s->setup_buf[3] << 8) | s->setup_buf[2];
-     index   = (s->setup_buf[5] << 8) | s->setup_buf[4];
- 
--    if (s->setup_len > sizeof(s->data_buf)) {
-+    setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6];
-+    if (setup_len > sizeof(s->data_buf)) {
-         fprintf(stderr,
-                 "usb_generic_handle_packet: ctrl buffer too small (%d > %zu)\n",
--                s->setup_len, sizeof(s->data_buf));
-+                setup_len, sizeof(s->data_buf));
-         p->status = USB_RET_STALL;
-         return;
-     }
-+    s->setup_len = setup_len;
- 
-     if (p->pid == USB_TOKEN_OUT) {
-         usb_packet_copy(p, s->data_buf, s->setup_len);
--- 
-2.18.4
diff --git a/system/xen/xsa/xsa336.patch b/system/xen/xsa/xsa336.patch
deleted file mode 100644
index b44c298b70..0000000000
--- a/system/xen/xsa/xsa336.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-From: Roger Pau Monné <roger.pau@citrix.com>
-Subject: x86/vpt: fix race when migrating timers between vCPUs
-
-The current vPT code will migrate the emulated timers between vCPUs
-(change the pt->vcpu field) while just holding the destination lock,
-either from create_periodic_time or pt_adjust_global_vcpu_target if
-the global target is adjusted. Changing the periodic_timer vCPU field
-in this way creates a race where a third party could grab the lock in
-the unlocked region of pt_adjust_global_vcpu_target (or before
-create_periodic_time performs the vcpu change) and then release the
-lock from a different vCPU, creating a locking imbalance.
-
-Introduce a per-domain rwlock in order to protect periodic_time
-migration between vCPU lists. Taking the lock in read mode prevents
-any timer from being migrated to a different vCPU, while taking it in
-write mode allows performing migration of timers across vCPUs. The
-per-vcpu locks are still used to protect all the other fields from the
-periodic_timer struct.
-
-Note that such migration shouldn't happen frequently, and hence
-there's no performance drop as a result of such locking.
-
-This is XSA-336.
-
-Reported-by: Igor Druzhinin <igor.druzhinin@citrix.com>
-Tested-by: Igor Druzhinin <igor.druzhinin@citrix.com>
-Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
----
-Changes since v2:
- - Re-order pt_adjust_vcpu to remove one if.
- - Fix pt_lock to not call pt_vcpu_lock, as we might end up using a
-   stale value of pt->vcpu when taking the per-vcpu lock.
-
-Changes since v1:
- - Use a per-domain rwlock to protect timer vCPU migration.
-
---- a/xen/arch/x86/hvm/hvm.c
-+++ b/xen/arch/x86/hvm/hvm.c
-@@ -658,6 +658,8 @@ int hvm_domain_initialise(struct domain
-     /* need link to containing domain */
-     d->arch.hvm.pl_time->domain = d;
- 
-+    rwlock_init(&d->arch.hvm.pl_time->pt_migrate);
-+
-     /* Set the default IO Bitmap. */
-     if ( is_hardware_domain(d) )
-     {
---- a/xen/arch/x86/hvm/vpt.c
-+++ b/xen/arch/x86/hvm/vpt.c
-@@ -153,23 +153,32 @@ static int pt_irq_masked(struct periodic
-     return 1;
- }
- 
--static void pt_lock(struct periodic_time *pt)
-+static void pt_vcpu_lock(struct vcpu *v)
- {
--    struct vcpu *v;
-+    read_lock(&v->domain->arch.hvm.pl_time->pt_migrate);
-+    spin_lock(&v->arch.hvm.tm_lock);
-+}
- 
--    for ( ; ; )
--    {
--        v = pt->vcpu;
--        spin_lock(&v->arch.hvm.tm_lock);
--        if ( likely(pt->vcpu == v) )
--            break;
--        spin_unlock(&v->arch.hvm.tm_lock);
--    }
-+static void pt_vcpu_unlock(struct vcpu *v)
-+{
-+    spin_unlock(&v->arch.hvm.tm_lock);
-+    read_unlock(&v->domain->arch.hvm.pl_time->pt_migrate);
-+}
-+
-+static void pt_lock(struct periodic_time *pt)
-+{
-+    /*
-+     * We cannot use pt_vcpu_lock here, because we need to acquire the
-+     * per-domain lock first and then (re-)fetch the value of pt->vcpu, or
-+     * else we might be using a stale value of pt->vcpu.
-+     */
-+    read_lock(&pt->vcpu->domain->arch.hvm.pl_time->pt_migrate);
-+    spin_lock(&pt->vcpu->arch.hvm.tm_lock);
- }
- 
- static void pt_unlock(struct periodic_time *pt)
- {
--    spin_unlock(&pt->vcpu->arch.hvm.tm_lock);
-+    pt_vcpu_unlock(pt->vcpu);
- }
- 
- static void pt_process_missed_ticks(struct periodic_time *pt)
-@@ -219,7 +228,7 @@ void pt_save_timer(struct vcpu *v)
-     if ( v->pause_flags & VPF_blocked )
-         return;
- 
--    spin_lock(&v->arch.hvm.tm_lock);
-+    pt_vcpu_lock(v);
- 
-     list_for_each_entry ( pt, head, list )
-         if ( !pt->do_not_freeze )
-@@ -227,7 +236,7 @@ void pt_save_timer(struct vcpu *v)
- 
-     pt_freeze_time(v);
- 
--    spin_unlock(&v->arch.hvm.tm_lock);
-+    pt_vcpu_unlock(v);
- }
- 
- void pt_restore_timer(struct vcpu *v)
-@@ -235,7 +244,7 @@ void pt_restore_timer(struct vcpu *v)
-     struct list_head *head = &v->arch.hvm.tm_list;
-     struct periodic_time *pt;
- 
--    spin_lock(&v->arch.hvm.tm_lock);
-+    pt_vcpu_lock(v);
- 
-     list_for_each_entry ( pt, head, list )
-     {
-@@ -248,7 +257,7 @@ void pt_restore_timer(struct vcpu *v)
- 
-     pt_thaw_time(v);
- 
--    spin_unlock(&v->arch.hvm.tm_lock);
-+    pt_vcpu_unlock(v);
- }
- 
- static void pt_timer_fn(void *data)
-@@ -309,7 +318,7 @@ int pt_update_irq(struct vcpu *v)
-     int irq, pt_vector = -1;
-     bool level;
- 
--    spin_lock(&v->arch.hvm.tm_lock);
-+    pt_vcpu_lock(v);
- 
-     earliest_pt = NULL;
-     max_lag = -1ULL;
-@@ -339,7 +348,7 @@ int pt_update_irq(struct vcpu *v)
- 
-     if ( earliest_pt == NULL )
-     {
--        spin_unlock(&v->arch.hvm.tm_lock);
-+        pt_vcpu_unlock(v);
-         return -1;
-     }
- 
-@@ -347,7 +356,7 @@ int pt_update_irq(struct vcpu *v)
-     irq = earliest_pt->irq;
-     level = earliest_pt->level;
- 
--    spin_unlock(&v->arch.hvm.tm_lock);
-+    pt_vcpu_unlock(v);
- 
-     switch ( earliest_pt->source )
-     {
-@@ -394,7 +403,7 @@ int pt_update_irq(struct vcpu *v)
-                 time_cb *cb = NULL;
-                 void *cb_priv;
- 
--                spin_lock(&v->arch.hvm.tm_lock);
-+                pt_vcpu_lock(v);
-                 /* Make sure the timer is still on the list. */
-                 list_for_each_entry ( pt, &v->arch.hvm.tm_list, list )
-                     if ( pt == earliest_pt )
-@@ -404,7 +413,7 @@ int pt_update_irq(struct vcpu *v)
-                         cb_priv = pt->priv;
-                         break;
-                     }
--                spin_unlock(&v->arch.hvm.tm_lock);
-+                pt_vcpu_unlock(v);
- 
-                 if ( cb != NULL )
-                     cb(v, cb_priv);
-@@ -441,12 +450,12 @@ void pt_intr_post(struct vcpu *v, struct
-     if ( intack.source == hvm_intsrc_vector )
-         return;
- 
--    spin_lock(&v->arch.hvm.tm_lock);
-+    pt_vcpu_lock(v);
- 
-     pt = is_pt_irq(v, intack);
-     if ( pt == NULL )
-     {
--        spin_unlock(&v->arch.hvm.tm_lock);
-+        pt_vcpu_unlock(v);
-         return;
-     }
- 
-@@ -455,7 +464,7 @@ void pt_intr_post(struct vcpu *v, struct
-     cb = pt->cb;
-     cb_priv = pt->priv;
- 
--    spin_unlock(&v->arch.hvm.tm_lock);
-+    pt_vcpu_unlock(v);
- 
-     if ( cb != NULL )
-         cb(v, cb_priv);
-@@ -466,12 +475,12 @@ void pt_migrate(struct vcpu *v)
-     struct list_head *head = &v->arch.hvm.tm_list;
-     struct periodic_time *pt;
- 
--    spin_lock(&v->arch.hvm.tm_lock);
-+    pt_vcpu_lock(v);
- 
-     list_for_each_entry ( pt, head, list )
-         migrate_timer(&pt->timer, v->processor);
- 
--    spin_unlock(&v->arch.hvm.tm_lock);
-+    pt_vcpu_unlock(v);
- }
- 
- void create_periodic_time(
-@@ -490,7 +499,7 @@ void create_periodic_time(
- 
-     destroy_periodic_time(pt);
- 
--    spin_lock(&v->arch.hvm.tm_lock);
-+    write_lock(&v->domain->arch.hvm.pl_time->pt_migrate);
- 
-     pt->pending_intr_nr = 0;
-     pt->do_not_freeze = 0;
-@@ -540,7 +549,7 @@ void create_periodic_time(
-     init_timer(&pt->timer, pt_timer_fn, pt, v->processor);
-     set_timer(&pt->timer, pt->scheduled);
- 
--    spin_unlock(&v->arch.hvm.tm_lock);
-+    write_unlock(&v->domain->arch.hvm.pl_time->pt_migrate);
- }
- 
- void destroy_periodic_time(struct periodic_time *pt)
-@@ -565,30 +574,20 @@ void destroy_periodic_time(struct period
- 
- static void pt_adjust_vcpu(struct periodic_time *pt, struct vcpu *v)
- {
--    int on_list;
--
-     ASSERT(pt->source == PTSRC_isa || pt->source == PTSRC_ioapic);
- 
-     if ( pt->vcpu == NULL )
-         return;
- 
--    pt_lock(pt);
--    on_list = pt->on_list;
--    if ( pt->on_list )
--        list_del(&pt->list);
--    pt->on_list = 0;
--    pt_unlock(pt);
--
--    spin_lock(&v->arch.hvm.tm_lock);
-+    write_lock(&pt->vcpu->domain->arch.hvm.pl_time->pt_migrate);
-     pt->vcpu = v;
--    if ( on_list )
-+    if ( pt->on_list )
-     {
--        pt->on_list = 1;
-+        list_del(&pt->list);
-         list_add(&pt->list, &v->arch.hvm.tm_list);
--
-         migrate_timer(&pt->timer, v->processor);
-     }
--    spin_unlock(&v->arch.hvm.tm_lock);
-+    write_unlock(&pt->vcpu->domain->arch.hvm.pl_time->pt_migrate);
- }
- 
- void pt_adjust_global_vcpu_target(struct vcpu *v)
---- a/xen/include/asm-x86/hvm/vpt.h
-+++ b/xen/include/asm-x86/hvm/vpt.h
-@@ -128,6 +128,13 @@ struct pl_time {    /* platform time */
-     struct RTCState  vrtc;
-     struct HPETState vhpet;
-     struct PMTState  vpmt;
-+    /*
-+     * rwlock to prevent periodic_time vCPU migration. Take the lock in read
-+     * mode in order to prevent the vcpu field of periodic_time from changing.
-+     * Lock must be taken in write mode when changes to the vcpu field are
-+     * performed, as it allows exclusive access to all the timers of a domain.
-+     */
-+    rwlock_t pt_migrate;
-     /* guest_time = Xen sys time + stime_offset */
-     int64_t stime_offset;
-     /* Ensures monotonicity in appropriate timer modes. */
diff --git a/system/xen/xsa/xsa337-4.13-1.patch b/system/xen/xsa/xsa337-4.13-1.patch
deleted file mode 100644
index 2091626f4f..0000000000
--- a/system/xen/xsa/xsa337-4.13-1.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From: Roger Pau Monné <roger.pau@citrix.com>
-Subject: x86/msi: get rid of read_msi_msg
-
-It's safer and faster to just use the cached last written
-(untranslated) MSI message stored in msi_desc for the single user that
-calls read_msi_msg.
-
-This also prevents relying on the data read from the device MSI
-registers in order to figure out the index into the IOMMU interrupt
-remapping table, which is not safe.
-
-This is part of XSA-337.
-
-Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Requested-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-
---- a/xen/arch/x86/msi.c
-+++ b/xen/arch/x86/msi.c
-@@ -183,54 +183,6 @@ void msi_compose_msg(unsigned vector, co
-                 MSI_DATA_VECTOR(vector);
- }
-
--static bool read_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
--{
--    switch ( entry->msi_attrib.type )
--    {
--    case PCI_CAP_ID_MSI:
--    {
--        struct pci_dev *dev = entry->dev;
--        int pos = entry->msi_attrib.pos;
--        uint16_t data;
--
--        msg->address_lo = pci_conf_read32(dev->sbdf,
--                                          msi_lower_address_reg(pos));
--        if ( entry->msi_attrib.is_64 )
--        {
--            msg->address_hi = pci_conf_read32(dev->sbdf,
--                                              msi_upper_address_reg(pos));
--            data = pci_conf_read16(dev->sbdf, msi_data_reg(pos, 1));
--        }
--        else
--        {
--            msg->address_hi = 0;
--            data = pci_conf_read16(dev->sbdf, msi_data_reg(pos, 0));
--        }
--        msg->data = data;
--        break;
--    }
--    case PCI_CAP_ID_MSIX:
--    {
--        void __iomem *base = entry->mask_base;
--
--        if ( unlikely(!msix_memory_decoded(entry->dev,
--                                           entry->msi_attrib.pos)) )
--            return false;
--        msg->address_lo = readl(base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);
--        msg->address_hi = readl(base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);
--        msg->data = readl(base + PCI_MSIX_ENTRY_DATA_OFFSET);
--        break;
--    }
--    default:
--        BUG();
--    }
--
--    if ( iommu_intremap )
--        iommu_read_msi_from_ire(entry, msg);
--
--    return true;
--}
--
- static int write_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
- {
-     entry->msg = *msg;
-@@ -302,10 +254,7 @@ void set_msi_affinity(struct irq_desc *d
-
-     ASSERT(spin_is_locked(&desc->lock));
-
--    memset(&msg, 0, sizeof(msg));
--    if ( !read_msi_msg(msi_desc, &msg) )
--        return;
--
-+    msg = msi_desc->msg;
-     msg.data &= ~MSI_DATA_VECTOR_MASK;
-     msg.data |= MSI_DATA_VECTOR(desc->arch.vector);
-     msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK;
diff --git a/system/xen/xsa/xsa337-4.13-2.patch b/system/xen/xsa/xsa337-4.13-2.patch
deleted file mode 100644
index bdefd37cdc..0000000000
--- a/system/xen/xsa/xsa337-4.13-2.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: x86/MSI-X: restrict reading of table/PBA bases from BARs
-
-When assigned to less trusted or un-trusted guests, devices may change
-state behind our backs (they may e.g. get reset by means we may not know
-about). Therefore we should avoid reading BARs from hardware once a
-device is no longer owned by Dom0. Furthermore when we can't read a BAR,
-or when we read zero, we shouldn't instead use the caller provided
-address unless that caller can be trusted.
-
-Re-arrange the logic in msix_capability_init() such that only Dom0 (and
-only if the device isn't DomU-owned yet) or calls through
-PHYSDEVOP_prepare_msix will actually result in the reading of the
-respective BAR register(s). Additionally do so only as long as in-use
-table entries are known (note that invocation of PHYSDEVOP_prepare_msix
-counts as a "pseudo" entry). In all other uses the value already
-recorded will get used instead.
-
-Clear the recorded values in _pci_cleanup_msix() as well as on the one
-affected error path. (Adjust this error path to also avoid blindly
-disabling MSI-X when it was enabled on entry to the function.)
-
-While moving around variable declarations (in many cases to reduce their
-scopes), also adjust some of their types.
-
-This is part of XSA-337.
-
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
-
---- a/xen/arch/x86/msi.c
-+++ b/xen/arch/x86/msi.c
-@@ -769,16 +769,14 @@ static int msix_capability_init(struct p
- {
-     struct arch_msix *msix = dev->msix;
-     struct msi_desc *entry = NULL;
--    int vf;
-     u16 control;
-     u64 table_paddr;
-     u32 table_offset;
--    u8 bir, pbus, pslot, pfunc;
-     u16 seg = dev->seg;
-     u8 bus = dev->bus;
-     u8 slot = PCI_SLOT(dev->devfn);
-     u8 func = PCI_FUNC(dev->devfn);
--    bool maskall = msix->host_maskall;
-+    bool maskall = msix->host_maskall, zap_on_error = false;
-     unsigned int pos = pci_find_cap_offset(seg, bus, slot, func,
-                                            PCI_CAP_ID_MSIX);
- 
-@@ -820,43 +818,45 @@ static int msix_capability_init(struct p
- 
-     /* Locate MSI-X table region */
-     table_offset = pci_conf_read32(dev->sbdf, msix_table_offset_reg(pos));
--    bir = (u8)(table_offset & PCI_MSIX_BIRMASK);
--    table_offset &= ~PCI_MSIX_BIRMASK;
-+    if ( !msix->used_entries &&
-+         (!msi ||
-+          (is_hardware_domain(current->domain) &&
-+           (dev->domain == current->domain || dev->domain == dom_io))) )
-+    {
-+        unsigned int bir = table_offset & PCI_MSIX_BIRMASK, pbus, pslot, pfunc;
-+        int vf;
-+        paddr_t pba_paddr;
-+        unsigned int pba_offset;
- 
--    if ( !dev->info.is_virtfn )
--    {
--        pbus = bus;
--        pslot = slot;
--        pfunc = func;
--        vf = -1;
--    }
--    else
--    {
--        pbus = dev->info.physfn.bus;
--        pslot = PCI_SLOT(dev->info.physfn.devfn);
--        pfunc = PCI_FUNC(dev->info.physfn.devfn);
--        vf = PCI_BDF2(dev->bus, dev->devfn);
--    }
--
--    table_paddr = read_pci_mem_bar(seg, pbus, pslot, pfunc, bir, vf);
--    WARN_ON(msi && msi->table_base != table_paddr);
--    if ( !table_paddr )
--    {
--        if ( !msi || !msi->table_base )
-+        if ( !dev->info.is_virtfn )
-         {
--            pci_conf_write16(dev->sbdf, msix_control_reg(pos),
--                             control & ~PCI_MSIX_FLAGS_ENABLE);
--            xfree(entry);
--            return -ENXIO;
-+            pbus = bus;
-+            pslot = slot;
-+            pfunc = func;
-+            vf = -1;
-+        }
-+        else
-+        {
-+            pbus = dev->info.physfn.bus;
-+            pslot = PCI_SLOT(dev->info.physfn.devfn);
-+            pfunc = PCI_FUNC(dev->info.physfn.devfn);
-+            vf = PCI_BDF2(dev->bus, dev->devfn);
-         }
--        table_paddr = msi->table_base;
--    }
--    table_paddr += table_offset;
- 
--    if ( !msix->used_entries )
--    {
--        u64 pba_paddr;
--        u32 pba_offset;
-+        table_paddr = read_pci_mem_bar(seg, pbus, pslot, pfunc, bir, vf);
-+        WARN_ON(msi && msi->table_base != table_paddr);
-+        if ( !table_paddr )
-+        {
-+            if ( !msi || !msi->table_base )
-+            {
-+                pci_conf_write16(dev->sbdf, msix_control_reg(pos),
-+                                 control & ~PCI_MSIX_FLAGS_ENABLE);
-+                xfree(entry);
-+                return -ENXIO;
-+            }
-+            table_paddr = msi->table_base;
-+        }
-+        table_paddr += table_offset & ~PCI_MSIX_BIRMASK;
- 
-         msix->table.first = PFN_DOWN(table_paddr);
-         msix->table.last = PFN_DOWN(table_paddr +
-@@ -875,7 +875,18 @@ static int msix_capability_init(struct p
-                                   BITS_TO_LONGS(msix->nr_entries) - 1);
-         WARN_ON(rangeset_overlaps_range(mmio_ro_ranges, msix->pba.first,
-                                         msix->pba.last));
-+
-+        zap_on_error = true;
-+    }
-+    else if ( !msix->table.first )
-+    {
-+        pci_conf_write16(dev->sbdf, msix_control_reg(pos), control);
-+        xfree(entry);
-+        return -ENODATA;
-     }
-+    else
-+        table_paddr = (msix->table.first << PAGE_SHIFT) +
-+                      (table_offset & ~PCI_MSIX_BIRMASK & ~PAGE_MASK);
- 
-     if ( entry )
-     {
-@@ -886,8 +897,15 @@ static int msix_capability_init(struct p
- 
-         if ( idx < 0 )
-         {
--            pci_conf_write16(dev->sbdf, msix_control_reg(pos),
--                             control & ~PCI_MSIX_FLAGS_ENABLE);
-+            if ( zap_on_error )
-+            {
-+                msix->table.first = 0;
-+                msix->pba.first = 0;
-+
-+                control &= ~PCI_MSIX_FLAGS_ENABLE;
-+            }
-+
-+            pci_conf_write16(dev->sbdf, msix_control_reg(pos), control);
-             xfree(entry);
-             return idx;
-         }
-@@ -1076,9 +1094,14 @@ static void _pci_cleanup_msix(struct arc
-         if ( rangeset_remove_range(mmio_ro_ranges, msix->table.first,
-                                    msix->table.last) )
-             WARN();
-+        msix->table.first = 0;
-+        msix->table.last = 0;
-+
-         if ( rangeset_remove_range(mmio_ro_ranges, msix->pba.first,
-                                    msix->pba.last) )
-             WARN();
-+        msix->pba.first = 0;
-+        msix->pba.last = 0;
-     }
- }
- 
diff --git a/system/xen/xsa/xsa338.patch b/system/xen/xsa/xsa338.patch
deleted file mode 100644
index 776521990e..0000000000
--- a/system/xen/xsa/xsa338.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: evtchn: relax port_is_valid()
-
-To avoid ports potentially becoming invalid behind the back of certain
-other functions (due to ->max_evtchn shrinking) because of
-- a guest invoking evtchn_reset() and from a 2nd vCPU opening new
-  channels in parallel (see also XSA-343),
-- alloc_unbound_xen_event_channel() produced channels living above the
-  2-level range (see also XSA-342),
-drop the max_evtchns check from port_is_valid(). For a port for which
-the function once returned "true", the returned value may not turn into
-"false" later on. The function's result may only depend on bounds which
-can only ever grow (which is the case for d->valid_evtchns).
-
-This also eliminates a false sense of safety, utilized by some of the
-users (see again XSA-343): Without a suitable lock held, d->max_evtchns
-may change at any time, and hence deducing that certain other operations
-are safe when port_is_valid() returned true is not legitimate. The
-opportunities to abuse this may get widened by the change here
-(depending on guest and host configuration), but will be taken care of
-by the other XSA.
-
-This is XSA-338.
-
-Fixes: 48974e6ce52e ("evtchn: use a per-domain variable for the max number of event channels")
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
-Reviewed-by: Julien Grall <jgrall@amazon.com>
----
-v5: New, split from larger patch.
-
---- a/xen/include/xen/event.h
-+++ b/xen/include/xen/event.h
-@@ -107,8 +107,6 @@ void notify_via_xen_event_channel(struct
- 
- static inline bool_t port_is_valid(struct domain *d, unsigned int p)
- {
--    if ( p >= d->max_evtchns )
--        return 0;
-     return p < read_atomic(&d->valid_evtchns);
- }
- 
diff --git a/system/xen/xsa/xsa339.patch b/system/xen/xsa/xsa339.patch
deleted file mode 100644
index 3311ae093f..0000000000
--- a/system/xen/xsa/xsa339.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From: Andrew Cooper <andrew.cooper3@citrix.com>
-Subject: x86/pv: Avoid double exception injection
-
-There is at least one path (SYSENTER with NT set, Xen converts to #GP) which
-ends up injecting the #GP fault twice, first in compat_sysenter(), and then a
-second time in compat_test_all_events(), due to the stale TBF_EXCEPTION left
-in TRAPBOUNCE_flags.
-
-The guest kernel sees the second fault first, which is a kernel level #GP
-pointing at the head of the #GP handler, and is therefore a userspace
-trigger-able DoS.
-
-This particular bug has bitten us several times before, so rearrange
-{compat_,}create_bounce_frame() to clobber TRAPBOUNCE on success, rather than
-leaving this task to one area of code which isn't used uniformly.
-
-Other scenarios which might result in a double injection (e.g. two calls
-directly to compat_create_bounce_frame) will now crash the guest, which is far
-more obvious than letting the kernel run with corrupt state.
-
-This is XSA-339
-
-Fixes: fdac9515607b ("x86: clear EFLAGS.NT in SYSENTER entry path")
-Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
-
-diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S
-index c3e62f8734..73619f57ca 100644
---- a/xen/arch/x86/x86_64/compat/entry.S
-+++ b/xen/arch/x86/x86_64/compat/entry.S
-@@ -78,7 +78,6 @@ compat_process_softirqs:
-         sti
- .Lcompat_bounce_exception:
-         call  compat_create_bounce_frame
--        movb  $0, TRAPBOUNCE_flags(%rdx)
-         jmp   compat_test_all_events
- 
- 	ALIGN
-@@ -352,7 +351,13 @@ __UNLIKELY_END(compat_bounce_null_selector)
-         movl  %eax,UREGS_cs+8(%rsp)
-         movl  TRAPBOUNCE_eip(%rdx),%eax
-         movl  %eax,UREGS_rip+8(%rsp)
-+
-+        /* Trapbounce complete.  Clobber state to avoid an erroneous second injection. */
-+        xor   %eax, %eax
-+        mov   %ax,  TRAPBOUNCE_cs(%rdx)
-+        mov   %al,  TRAPBOUNCE_flags(%rdx)
-         ret
-+
- .section .fixup,"ax"
- .Lfx13:
-         xorl  %edi,%edi
-diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
-index 1e880eb9f6..71a00e846b 100644
---- a/xen/arch/x86/x86_64/entry.S
-+++ b/xen/arch/x86/x86_64/entry.S
-@@ -90,7 +90,6 @@ process_softirqs:
-         sti
- .Lbounce_exception:
-         call  create_bounce_frame
--        movb  $0, TRAPBOUNCE_flags(%rdx)
-         jmp   test_all_events
- 
-         ALIGN
-@@ -512,6 +511,11 @@ UNLIKELY_START(z, create_bounce_frame_bad_bounce_ip)
-         jmp   asm_domain_crash_synchronous  /* Does not return */
- __UNLIKELY_END(create_bounce_frame_bad_bounce_ip)
-         movq  %rax,UREGS_rip+8(%rsp)
-+
-+        /* Trapbounce complete.  Clobber state to avoid an erroneous second injection. */
-+        xor   %eax, %eax
-+        mov   %rax, TRAPBOUNCE_eip(%rdx)
-+        mov   %al,  TRAPBOUNCE_flags(%rdx)
-         ret
- 
-         .pushsection .fixup, "ax", @progbits
diff --git a/system/xen/xsa/xsa340.patch b/system/xen/xsa/xsa340.patch
deleted file mode 100644
index 38d04da465..0000000000
--- a/system/xen/xsa/xsa340.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: Julien Grall <jgrall@amazon.com>
-Subject: xen/evtchn: Add missing barriers when accessing/allocating an event channel
-
-While the allocation of a bucket is always performed with the per-domain
-lock, the bucket may be accessed without the lock taken (for instance, see
-evtchn_send()).
-
-Instead such sites relies on port_is_valid() to return a non-zero value
-when the port has a struct evtchn associated to it. The function will
-mostly check whether the port is less than d->valid_evtchns as all the
-buckets/event channels should be allocated up to that point.
-
-Unfortunately a compiler is free to re-order the assignment in
-evtchn_allocate_port() so it would be possible to have d->valid_evtchns
-updated before the new bucket has finish to allocate.
-
-Additionally on Arm, even if this was compiled "correctly", the
-processor can still re-order the memory access.
-
-Add a write memory barrier in the allocation side and a read memory
-barrier when the port is valid to prevent any re-ordering issue.
-
-This is XSA-340.
-
-Reported-by: Julien Grall <jgrall@amazon.com>
-Signed-off-by: Julien Grall <jgrall@amazon.com>
-Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
-
---- a/xen/common/event_channel.c
-+++ b/xen/common/event_channel.c
-@@ -178,6 +178,13 @@ int evtchn_allocate_port(struct domain *
-             return -ENOMEM;
-         bucket_from_port(d, port) = chn;
-
-+        /*
-+         * d->valid_evtchns is used to check whether the bucket can be
-+         * accessed without the per-domain lock. Therefore,
-+         * d->valid_evtchns should be seen *after* the new bucket has
-+         * been setup.
-+         */
-+        smp_wmb();
-         write_atomic(&d->valid_evtchns, d->valid_evtchns + EVTCHNS_PER_BUCKET);
-     }
-
---- a/xen/include/xen/event.h
-+++ b/xen/include/xen/event.h
-@@ -107,7 +107,17 @@ void notify_via_xen_event_channel(struct
-
- static inline bool_t port_is_valid(struct domain *d, unsigned int p)
- {
--    return p < read_atomic(&d->valid_evtchns);
-+    if ( p >= read_atomic(&d->valid_evtchns) )
-+        return false;
-+
-+    /*
-+     * The caller will usually access the event channel afterwards and
-+     * may be done without taking the per-domain lock. The barrier is
-+     * going in pair the smp_wmb() barrier in evtchn_allocate_port().
-+     */
-+    smp_rmb();
-+
-+    return true;
- }
-
- static inline struct evtchn *evtchn_from_port(struct domain *d, unsigned int p)
diff --git a/system/xen/xsa/xsa342-4.13.patch b/system/xen/xsa/xsa342-4.13.patch
deleted file mode 100644
index 334baf1b69..0000000000
--- a/system/xen/xsa/xsa342-4.13.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: evtchn/x86: enforce correct upper limit for 32-bit guests
-
-The recording of d->max_evtchns in evtchn_2l_init(), in particular with
-the limited set of callers of the function, is insufficient. Neither for
-PV nor for HVM guests the bitness is known at domain_create() time, yet
-the upper bound in 2-level mode depends upon guest bitness. Recording
-too high a limit "allows" x86 32-bit domains to open not properly usable
-event channels, management of which (inside Xen) would then result in
-corruption of the shared info and vCPU info structures.
-
-Keep the upper limit dynamic for the 2-level case, introducing a helper
-function to retrieve the effective limit. This helper is now supposed to
-be private to the event channel code. The used in do_poll() and
-domain_dump_evtchn_info() weren't consistent with port uses elsewhere
-and hence get switched to port_is_valid().
-
-Furthermore FIFO mode's setup_ports() gets adjusted to loop only up to
-the prior ABI limit, rather than all the way up to the new one.
-
-Finally a word on the change to do_poll(): Accessing ->max_evtchns
-without holding a suitable lock was never safe, as it as well as
-->evtchn_port_ops may change behind do_poll()'s back. Using
-port_is_valid() instead widens some the window for potential abuse,
-until we've dealt with the race altogether (see XSA-343).
-
-This is XSA-342.
-
-Reported-by: Julien Grall <jgrall@amazon.com>
-Fixes: 48974e6ce52e ("evtchn: use a per-domain variable for the max number of event channels")
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
-Reviewed-by: Julien Grall <jgrall@amazon.com>
-
---- a/xen/common/event_2l.c
-+++ b/xen/common/event_2l.c
-@@ -103,7 +103,6 @@ static const struct evtchn_port_ops evtc
- void evtchn_2l_init(struct domain *d)
- {
-     d->evtchn_port_ops = &evtchn_port_ops_2l;
--    d->max_evtchns = BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d);
- }
- 
- /*
---- a/xen/common/event_channel.c
-+++ b/xen/common/event_channel.c
-@@ -151,7 +151,7 @@ static void free_evtchn_bucket(struct do
- 
- int evtchn_allocate_port(struct domain *d, evtchn_port_t port)
- {
--    if ( port > d->max_evtchn_port || port >= d->max_evtchns )
-+    if ( port > d->max_evtchn_port || port >= max_evtchns(d) )
-         return -ENOSPC;
- 
-     if ( port_is_valid(d, port) )
-@@ -1396,13 +1396,11 @@ static void domain_dump_evtchn_info(stru
- 
-     spin_lock(&d->event_lock);
- 
--    for ( port = 1; port < d->max_evtchns; ++port )
-+    for ( port = 1; port_is_valid(d, port); ++port )
-     {
-         const struct evtchn *chn;
-         char *ssid;
- 
--        if ( !port_is_valid(d, port) )
--            continue;
-         chn = evtchn_from_port(d, port);
-         if ( chn->state == ECS_FREE )
-             continue;
---- a/xen/common/event_fifo.c
-+++ b/xen/common/event_fifo.c
-@@ -478,7 +478,7 @@ static void cleanup_event_array(struct d
-     d->evtchn_fifo = NULL;
- }
- 
--static void setup_ports(struct domain *d)
-+static void setup_ports(struct domain *d, unsigned int prev_evtchns)
- {
-     unsigned int port;
- 
-@@ -488,7 +488,7 @@ static void setup_ports(struct domain *d
-      * - save its pending state.
-      * - set default priority.
-      */
--    for ( port = 1; port < d->max_evtchns; port++ )
-+    for ( port = 1; port < prev_evtchns; port++ )
-     {
-         struct evtchn *evtchn;
- 
-@@ -546,6 +546,8 @@ int evtchn_fifo_init_control(struct evtc
-     if ( !d->evtchn_fifo )
-     {
-         struct vcpu *vcb;
-+        /* Latch the value before it changes during setup_event_array(). */
-+        unsigned int prev_evtchns = max_evtchns(d);
- 
-         for_each_vcpu ( d, vcb ) {
-             rc = setup_control_block(vcb);
-@@ -562,8 +564,7 @@ int evtchn_fifo_init_control(struct evtc
-             goto error;
- 
-         d->evtchn_port_ops = &evtchn_port_ops_fifo;
--        d->max_evtchns = EVTCHN_FIFO_NR_CHANNELS;
--        setup_ports(d);
-+        setup_ports(d, prev_evtchns);
-     }
-     else
-         rc = map_control_block(v, gfn, offset);
---- a/xen/common/schedule.c
-+++ b/xen/common/schedule.c
-@@ -1434,7 +1434,7 @@ static long do_poll(struct sched_poll *s
-             goto out;
- 
-         rc = -EINVAL;
--        if ( port >= d->max_evtchns )
-+        if ( !port_is_valid(d, port) )
-             goto out;
- 
-         rc = 0;
---- a/xen/include/xen/event.h
-+++ b/xen/include/xen/event.h
-@@ -105,6 +105,12 @@ void notify_via_xen_event_channel(struct
- #define bucket_from_port(d, p) \
-     ((group_from_port(d, p))[((p) % EVTCHNS_PER_GROUP) / EVTCHNS_PER_BUCKET])
- 
-+static inline unsigned int max_evtchns(const struct domain *d)
-+{
-+    return d->evtchn_fifo ? EVTCHN_FIFO_NR_CHANNELS
-+                          : BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d);
-+}
-+
- static inline bool_t port_is_valid(struct domain *d, unsigned int p)
- {
-     if ( p >= read_atomic(&d->valid_evtchns) )
---- a/xen/include/xen/sched.h
-+++ b/xen/include/xen/sched.h
-@@ -382,7 +382,6 @@ struct domain
-     /* Event channel information. */
-     struct evtchn   *evtchn;                         /* first bucket only */
-     struct evtchn  **evtchn_group[NR_EVTCHN_GROUPS]; /* all other buckets */
--    unsigned int     max_evtchns;     /* number supported by ABI */
-     unsigned int     max_evtchn_port; /* max permitted port number */
-     unsigned int     valid_evtchns;   /* number of allocated event channels */
-     spinlock_t       event_lock;
diff --git a/system/xen/xsa/xsa343-1.patch b/system/xen/xsa/xsa343-1.patch
deleted file mode 100644
index 0abbc03e8d..0000000000
--- a/system/xen/xsa/xsa343-1.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: evtchn: evtchn_reset() shouldn't succeed with still-open ports
-
-While the function closes all ports, it does so without holding any
-lock, and hence racing requests may be issued causing new ports to get
-opened. This would have been problematic in particular if such a newly
-opened port had a port number above the new implementation limit (i.e.
-when switching from FIFO to 2-level) after the reset, as prior to
-"evtchn: relax port_is_valid()" this could have led to e.g.
-evtchn_close()'s "BUG_ON(!port_is_valid(d2, port2))" to trigger.
-
-Introduce a counter of active ports and check that it's (still) no
-larger then the number of Xen internally used ones after obtaining the
-necessary lock in evtchn_reset().
-
-As to the access model of the new {active,xen}_evtchns fields - while
-all writes get done using write_atomic(), reads ought to use
-read_atomic() only when outside of a suitably locked region.
-
-Note that as of now evtchn_bind_virq() and evtchn_bind_ipi() don't have
-a need to call check_free_port().
-
-This is part of XSA-343.
-
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
-Reviewed-by: Julien Grall <jgrall@amazon.com>
----
-v7: Drop optimization from evtchn_reset().
-v6: Fix loop exit condition in evtchn_reset(). Use {read,write}_atomic()
-    also for xen_evtchns.
-v5: Move increment in alloc_unbound_xen_event_channel() out of the inner
-    locked region.
-v4: Account for Xen internal ports.
-v3: Document intended access next to new struct field.
-v2: Add comment to check_free_port(). Drop commented out calls.
-
---- a/xen/common/event_channel.c
-+++ b/xen/common/event_channel.c
-@@ -188,6 +188,8 @@ int evtchn_allocate_port(struct domain *
-         write_atomic(&d->valid_evtchns, d->valid_evtchns + EVTCHNS_PER_BUCKET);
-     }
- 
-+    write_atomic(&d->active_evtchns, d->active_evtchns + 1);
-+
-     return 0;
- }
- 
-@@ -211,11 +213,26 @@ static int get_free_port(struct domain *
-     return -ENOSPC;
- }
- 
-+/*
-+ * Check whether a port is still marked free, and if so update the domain
-+ * counter accordingly.  To be used on function exit paths.
-+ */
-+static void check_free_port(struct domain *d, evtchn_port_t port)
-+{
-+    if ( port_is_valid(d, port) &&
-+         evtchn_from_port(d, port)->state == ECS_FREE )
-+        write_atomic(&d->active_evtchns, d->active_evtchns - 1);
-+}
-+
- void evtchn_free(struct domain *d, struct evtchn *chn)
- {
-     /* Clear pending event to avoid unexpected behavior on re-bind. */
-     evtchn_port_clear_pending(d, chn);
- 
-+    if ( consumer_is_xen(chn) )
-+        write_atomic(&d->xen_evtchns, d->xen_evtchns - 1);
-+    write_atomic(&d->active_evtchns, d->active_evtchns - 1);
-+
-     /* Reset binding to vcpu0 when the channel is freed. */
-     chn->state          = ECS_FREE;
-     chn->notify_vcpu_id = 0;
-@@ -258,6 +275,7 @@ static long evtchn_alloc_unbound(evtchn_
-     alloc->port = port;
- 
-  out:
-+    check_free_port(d, port);
-     spin_unlock(&d->event_lock);
-     rcu_unlock_domain(d);
- 
-@@ -351,6 +369,7 @@ static long evtchn_bind_interdomain(evtc
-     bind->local_port = lport;
- 
-  out:
-+    check_free_port(ld, lport);
-     spin_unlock(&ld->event_lock);
-     if ( ld != rd )
-         spin_unlock(&rd->event_lock);
-@@ -488,7 +507,7 @@ static long evtchn_bind_pirq(evtchn_bind
-     struct domain *d = current->domain;
-     struct vcpu   *v = d->vcpu[0];
-     struct pirq   *info;
--    int            port, pirq = bind->pirq;
-+    int            port = 0, pirq = bind->pirq;
-     long           rc;
- 
-     if ( (pirq < 0) || (pirq >= d->nr_pirqs) )
-@@ -536,6 +555,7 @@ static long evtchn_bind_pirq(evtchn_bind
-     arch_evtchn_bind_pirq(d, pirq);
- 
-  out:
-+    check_free_port(d, port);
-     spin_unlock(&d->event_lock);
- 
-     return rc;
-@@ -1011,10 +1031,10 @@ int evtchn_unmask(unsigned int port)
-     return 0;
- }
- 
--
- int evtchn_reset(struct domain *d)
- {
-     unsigned int i;
-+    int rc = 0;
- 
-     if ( d != current->domain && !d->controller_pause_count )
-         return -EINVAL;
-@@ -1024,7 +1044,9 @@ int evtchn_reset(struct domain *d)
- 
-     spin_lock(&d->event_lock);
- 
--    if ( d->evtchn_fifo )
-+    if ( d->active_evtchns > d->xen_evtchns )
-+        rc = -EAGAIN;
-+    else if ( d->evtchn_fifo )
-     {
-         /* Switching back to 2-level ABI. */
-         evtchn_fifo_destroy(d);
-@@ -1033,7 +1055,7 @@ int evtchn_reset(struct domain *d)
- 
-     spin_unlock(&d->event_lock);
- 
--    return 0;
-+    return rc;
- }
- 
- static long evtchn_set_priority(const struct evtchn_set_priority *set_priority)
-@@ -1219,10 +1241,9 @@ int alloc_unbound_xen_event_channel(
- 
-     spin_lock(&ld->event_lock);
- 
--    rc = get_free_port(ld);
-+    port = rc = get_free_port(ld);
-     if ( rc < 0 )
-         goto out;
--    port = rc;
-     chn = evtchn_from_port(ld, port);
- 
-     rc = xsm_evtchn_unbound(XSM_TARGET, ld, chn, remote_domid);
-@@ -1238,7 +1259,10 @@ int alloc_unbound_xen_event_channel(
- 
-     spin_unlock(&chn->lock);
- 
-+    write_atomic(&ld->xen_evtchns, ld->xen_evtchns + 1);
-+
-  out:
-+    check_free_port(ld, port);
-     spin_unlock(&ld->event_lock);
- 
-     return rc < 0 ? rc : port;
-@@ -1314,6 +1338,7 @@ int evtchn_init(struct domain *d, unsign
-         return -EINVAL;
-     }
-     evtchn_from_port(d, 0)->state = ECS_RESERVED;
-+    write_atomic(&d->active_evtchns, 0);
- 
- #if MAX_VIRT_CPUS > BITS_PER_LONG
-     d->poll_mask = xzalloc_array(unsigned long, BITS_TO_LONGS(d->max_vcpus));
-@@ -1340,6 +1365,8 @@ void evtchn_destroy(struct domain *d)
-     for ( i = 0; port_is_valid(d, i); i++ )
-         evtchn_close(d, i, 0);
- 
-+    ASSERT(!d->active_evtchns);
-+
-     clear_global_virq_handlers(d);
- 
-     evtchn_fifo_destroy(d);
---- a/xen/include/xen/sched.h
-+++ b/xen/include/xen/sched.h
-@@ -361,6 +361,16 @@ struct domain
-     struct evtchn  **evtchn_group[NR_EVTCHN_GROUPS]; /* all other buckets */
-     unsigned int     max_evtchn_port; /* max permitted port number */
-     unsigned int     valid_evtchns;   /* number of allocated event channels */
-+    /*
-+     * Number of in-use event channels.  Writers should use write_atomic().
-+     * Readers need to use read_atomic() only when not holding event_lock.
-+     */
-+    unsigned int     active_evtchns;
-+    /*
-+     * Number of event channels used internally by Xen (not subject to
-+     * EVTCHNOP_reset).  Read/write access like for active_evtchns.
-+     */
-+    unsigned int     xen_evtchns;
-     spinlock_t       event_lock;
-     const struct evtchn_port_ops *evtchn_port_ops;
-     struct evtchn_fifo_domain *evtchn_fifo;
diff --git a/system/xen/xsa/xsa343-2.patch b/system/xen/xsa/xsa343-2.patch
deleted file mode 100644
index b8eb4998f1..0000000000
--- a/system/xen/xsa/xsa343-2.patch
+++ /dev/null
@@ -1,295 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: evtchn: convert per-channel lock to be IRQ-safe
-
-... in order for send_guest_{global,vcpu}_virq() to be able to make use
-of it.
-
-This is part of XSA-343.
-
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Acked-by: Julien Grall <jgrall@amazon.com>
----
-v6: New.
----
-TBD: This is the "dumb" conversion variant. In a couple of cases the
-     slightly simpler spin_{,un}lock_irq() could apparently be used.
-
---- a/xen/common/event_channel.c
-+++ b/xen/common/event_channel.c
-@@ -248,6 +248,7 @@ static long evtchn_alloc_unbound(evtchn_
-     int            port;
-     domid_t        dom = alloc->dom;
-     long           rc;
-+    unsigned long  flags;
- 
-     d = rcu_lock_domain_by_any_id(dom);
-     if ( d == NULL )
-@@ -263,14 +264,14 @@ static long evtchn_alloc_unbound(evtchn_
-     if ( rc )
-         goto out;
- 
--    spin_lock(&chn->lock);
-+    spin_lock_irqsave(&chn->lock, flags);
- 
-     chn->state = ECS_UNBOUND;
-     if ( (chn->u.unbound.remote_domid = alloc->remote_dom) == DOMID_SELF )
-         chn->u.unbound.remote_domid = current->domain->domain_id;
-     evtchn_port_init(d, chn);
- 
--    spin_unlock(&chn->lock);
-+    spin_unlock_irqrestore(&chn->lock, flags);
- 
-     alloc->port = port;
- 
-@@ -283,26 +284,32 @@ static long evtchn_alloc_unbound(evtchn_
- }
- 
- 
--static void double_evtchn_lock(struct evtchn *lchn, struct evtchn *rchn)
-+static unsigned long double_evtchn_lock(struct evtchn *lchn,
-+                                        struct evtchn *rchn)
- {
--    if ( lchn < rchn )
-+    unsigned long flags;
-+
-+    if ( lchn <= rchn )
-     {
--        spin_lock(&lchn->lock);
--        spin_lock(&rchn->lock);
-+        spin_lock_irqsave(&lchn->lock, flags);
-+        if ( lchn != rchn )
-+            spin_lock(&rchn->lock);
-     }
-     else
-     {
--        if ( lchn != rchn )
--            spin_lock(&rchn->lock);
-+        spin_lock_irqsave(&rchn->lock, flags);
-         spin_lock(&lchn->lock);
-     }
-+
-+    return flags;
- }
- 
--static void double_evtchn_unlock(struct evtchn *lchn, struct evtchn *rchn)
-+static void double_evtchn_unlock(struct evtchn *lchn, struct evtchn *rchn,
-+                                 unsigned long flags)
- {
--    spin_unlock(&lchn->lock);
-     if ( lchn != rchn )
--        spin_unlock(&rchn->lock);
-+        spin_unlock(&lchn->lock);
-+    spin_unlock_irqrestore(&rchn->lock, flags);
- }
- 
- static long evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind)
-@@ -312,6 +319,7 @@ static long evtchn_bind_interdomain(evtc
-     int            lport, rport = bind->remote_port;
-     domid_t        rdom = bind->remote_dom;
-     long           rc;
-+    unsigned long  flags;
- 
-     if ( rdom == DOMID_SELF )
-         rdom = current->domain->domain_id;
-@@ -347,7 +355,7 @@ static long evtchn_bind_interdomain(evtc
-     if ( rc )
-         goto out;
- 
--    double_evtchn_lock(lchn, rchn);
-+    flags = double_evtchn_lock(lchn, rchn);
- 
-     lchn->u.interdomain.remote_dom  = rd;
-     lchn->u.interdomain.remote_port = rport;
-@@ -364,7 +372,7 @@ static long evtchn_bind_interdomain(evtc
-      */
-     evtchn_port_set_pending(ld, lchn->notify_vcpu_id, lchn);
- 
--    double_evtchn_unlock(lchn, rchn);
-+    double_evtchn_unlock(lchn, rchn, flags);
- 
-     bind->local_port = lport;
- 
-@@ -387,6 +395,7 @@ int evtchn_bind_virq(evtchn_bind_virq_t
-     struct domain *d = current->domain;
-     int            virq = bind->virq, vcpu = bind->vcpu;
-     int            rc = 0;
-+    unsigned long  flags;
- 
-     if ( (virq < 0) || (virq >= ARRAY_SIZE(v->virq_to_evtchn)) )
-         return -EINVAL;
-@@ -424,14 +433,14 @@ int evtchn_bind_virq(evtchn_bind_virq_t
- 
-     chn = evtchn_from_port(d, port);
- 
--    spin_lock(&chn->lock);
-+    spin_lock_irqsave(&chn->lock, flags);
- 
-     chn->state          = ECS_VIRQ;
-     chn->notify_vcpu_id = vcpu;
-     chn->u.virq         = virq;
-     evtchn_port_init(d, chn);
- 
--    spin_unlock(&chn->lock);
-+    spin_unlock_irqrestore(&chn->lock, flags);
- 
-     v->virq_to_evtchn[virq] = bind->port = port;
- 
-@@ -448,6 +457,7 @@ static long evtchn_bind_ipi(evtchn_bind_
-     struct domain *d = current->domain;
-     int            port, vcpu = bind->vcpu;
-     long           rc = 0;
-+    unsigned long  flags;
- 
-     if ( domain_vcpu(d, vcpu) == NULL )
-         return -ENOENT;
-@@ -459,13 +469,13 @@ static long evtchn_bind_ipi(evtchn_bind_
- 
-     chn = evtchn_from_port(d, port);
- 
--    spin_lock(&chn->lock);
-+    spin_lock_irqsave(&chn->lock, flags);
- 
-     chn->state          = ECS_IPI;
-     chn->notify_vcpu_id = vcpu;
-     evtchn_port_init(d, chn);
- 
--    spin_unlock(&chn->lock);
-+    spin_unlock_irqrestore(&chn->lock, flags);
- 
-     bind->port = port;
- 
-@@ -509,6 +519,7 @@ static long evtchn_bind_pirq(evtchn_bind
-     struct pirq   *info;
-     int            port = 0, pirq = bind->pirq;
-     long           rc;
-+    unsigned long  flags;
- 
-     if ( (pirq < 0) || (pirq >= d->nr_pirqs) )
-         return -EINVAL;
-@@ -541,14 +552,14 @@ static long evtchn_bind_pirq(evtchn_bind
-         goto out;
-     }
- 
--    spin_lock(&chn->lock);
-+    spin_lock_irqsave(&chn->lock, flags);
- 
-     chn->state  = ECS_PIRQ;
-     chn->u.pirq.irq = pirq;
-     link_pirq_port(port, chn, v);
-     evtchn_port_init(d, chn);
- 
--    spin_unlock(&chn->lock);
-+    spin_unlock_irqrestore(&chn->lock, flags);
- 
-     bind->port = port;
- 
-@@ -569,6 +580,7 @@ int evtchn_close(struct domain *d1, int
-     struct evtchn *chn1, *chn2;
-     int            port2;
-     long           rc = 0;
-+    unsigned long  flags;
- 
-  again:
-     spin_lock(&d1->event_lock);
-@@ -668,14 +680,14 @@ int evtchn_close(struct domain *d1, int
-         BUG_ON(chn2->state != ECS_INTERDOMAIN);
-         BUG_ON(chn2->u.interdomain.remote_dom != d1);
- 
--        double_evtchn_lock(chn1, chn2);
-+        flags = double_evtchn_lock(chn1, chn2);
- 
-         evtchn_free(d1, chn1);
- 
-         chn2->state = ECS_UNBOUND;
-         chn2->u.unbound.remote_domid = d1->domain_id;
- 
--        double_evtchn_unlock(chn1, chn2);
-+        double_evtchn_unlock(chn1, chn2, flags);
- 
-         goto out;
- 
-@@ -683,9 +695,9 @@ int evtchn_close(struct domain *d1, int
-         BUG();
-     }
- 
--    spin_lock(&chn1->lock);
-+    spin_lock_irqsave(&chn1->lock, flags);
-     evtchn_free(d1, chn1);
--    spin_unlock(&chn1->lock);
-+    spin_unlock_irqrestore(&chn1->lock, flags);
- 
-  out:
-     if ( d2 != NULL )
-@@ -705,13 +717,14 @@ int evtchn_send(struct domain *ld, unsig
-     struct evtchn *lchn, *rchn;
-     struct domain *rd;
-     int            rport, ret = 0;
-+    unsigned long  flags;
- 
-     if ( !port_is_valid(ld, lport) )
-         return -EINVAL;
- 
-     lchn = evtchn_from_port(ld, lport);
- 
--    spin_lock(&lchn->lock);
-+    spin_lock_irqsave(&lchn->lock, flags);
- 
-     /* Guest cannot send via a Xen-attached event channel. */
-     if ( unlikely(consumer_is_xen(lchn)) )
-@@ -746,7 +759,7 @@ int evtchn_send(struct domain *ld, unsig
-     }
- 
- out:
--    spin_unlock(&lchn->lock);
-+    spin_unlock_irqrestore(&lchn->lock, flags);
- 
-     return ret;
- }
-@@ -1238,6 +1251,7 @@ int alloc_unbound_xen_event_channel(
- {
-     struct evtchn *chn;
-     int            port, rc;
-+    unsigned long  flags;
- 
-     spin_lock(&ld->event_lock);
- 
-@@ -1250,14 +1264,14 @@ int alloc_unbound_xen_event_channel(
-     if ( rc )
-         goto out;
- 
--    spin_lock(&chn->lock);
-+    spin_lock_irqsave(&chn->lock, flags);
- 
-     chn->state = ECS_UNBOUND;
-     chn->xen_consumer = get_xen_consumer(notification_fn);
-     chn->notify_vcpu_id = lvcpu;
-     chn->u.unbound.remote_domid = remote_domid;
- 
--    spin_unlock(&chn->lock);
-+    spin_unlock_irqrestore(&chn->lock, flags);
- 
-     write_atomic(&ld->xen_evtchns, ld->xen_evtchns + 1);
- 
-@@ -1280,11 +1294,12 @@ void notify_via_xen_event_channel(struct
- {
-     struct evtchn *lchn, *rchn;
-     struct domain *rd;
-+    unsigned long flags;
- 
-     ASSERT(port_is_valid(ld, lport));
-     lchn = evtchn_from_port(ld, lport);
- 
--    spin_lock(&lchn->lock);
-+    spin_lock_irqsave(&lchn->lock, flags);
- 
-     if ( likely(lchn->state == ECS_INTERDOMAIN) )
-     {
-@@ -1294,7 +1309,7 @@ void notify_via_xen_event_channel(struct
-         evtchn_port_set_pending(rd, rchn->notify_vcpu_id, rchn);
-     }
- 
--    spin_unlock(&lchn->lock);
-+    spin_unlock_irqrestore(&lchn->lock, flags);
- }
- 
- void evtchn_check_pollers(struct domain *d, unsigned int port)
diff --git a/system/xen/xsa/xsa343-3.patch b/system/xen/xsa/xsa343-3.patch
deleted file mode 100644
index e513e308eb..0000000000
--- a/system/xen/xsa/xsa343-3.patch
+++ /dev/null
@@ -1,392 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: evtchn: address races with evtchn_reset()
-
-Neither d->evtchn_port_ops nor max_evtchns(d) may be used in an entirely
-lock-less manner, as both may change by a racing evtchn_reset(). In the
-common case, at least one of the domain's event lock or the per-channel
-lock needs to be held. In the specific case of the inter-domain sending
-by evtchn_send() and notify_via_xen_event_channel() holding the other
-side's per-channel lock is sufficient, as the channel can't change state
-without both per-channel locks held. Without such a channel changing
-state, evtchn_reset() can't complete successfully.
-
-Lock-free accesses continue to be permitted for the shim (calling some
-otherwise internal event channel functions), as this happens while the
-domain is in effectively single-threaded mode. Special care also needs
-taking for the shim's marking of in-use ports as ECS_RESERVED (allowing
-use of such ports in the shim case is okay because switching into and
-hence also out of FIFO mode is impossihble there).
-
-As a side effect, certain operations on Xen bound event channels which
-were mistakenly permitted so far (e.g. unmask or poll) will be refused
-now.
-
-This is part of XSA-343.
-
-Reported-by: Julien Grall <jgrall@amazon.com>
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Acked-by: Julien Grall <jgrall@amazon.com>
----
-v9: Add arch_evtchn_is_special() to fix PV shim.
-v8: Add BUILD_BUG_ON() in evtchn_usable().
-v7: Add locking related comment ahead of struct evtchn_port_ops.
-v6: New.
----
-TBD: I've been considering to move some of the wrappers from xen/event.h
-     into event_channel.c (or even drop them altogether), when they
-     require external locking (e.g. evtchn_port_init() or
-     evtchn_port_set_priority()). Does anyone have a strong opinion
-     either way?
-
---- a/xen/arch/x86/irq.c
-+++ b/xen/arch/x86/irq.c
-@@ -2488,14 +2488,24 @@ static void dump_irqs(unsigned char key)
- 
-             for ( i = 0; i < action->nr_guests; )
-             {
-+                struct evtchn *evtchn;
-+                unsigned int pending = 2, masked = 2;
-+
-                 d = action->guest[i++];
-                 pirq = domain_irq_to_pirq(d, irq);
-                 info = pirq_info(d, pirq);
-+                evtchn = evtchn_from_port(d, info->evtchn);
-+                local_irq_disable();
-+                if ( spin_trylock(&evtchn->lock) )
-+                {
-+                    pending = evtchn_is_pending(d, evtchn);
-+                    masked = evtchn_is_masked(d, evtchn);
-+                    spin_unlock(&evtchn->lock);
-+                }
-+                local_irq_enable();
-                 printk("d%d:%3d(%c%c%c)%c",
--                       d->domain_id, pirq,
--                       evtchn_port_is_pending(d, info->evtchn) ? 'P' : '-',
--                       evtchn_port_is_masked(d, info->evtchn) ? 'M' : '-',
--                       info->masked ? 'M' : '-',
-+                       d->domain_id, pirq, "-P?"[pending],
-+                       "-M?"[masked], info->masked ? 'M' : '-',
-                        i < action->nr_guests ? ',' : '\n');
-             }
-         }
---- a/xen/arch/x86/pv/shim.c
-+++ b/xen/arch/x86/pv/shim.c
-@@ -660,8 +660,11 @@ void pv_shim_inject_evtchn(unsigned int
-     if ( port_is_valid(guest, port) )
-     {
-         struct evtchn *chn = evtchn_from_port(guest, port);
-+        unsigned long flags;
- 
-+        spin_lock_irqsave(&chn->lock, flags);
-         evtchn_port_set_pending(guest, chn->notify_vcpu_id, chn);
-+        spin_unlock_irqrestore(&chn->lock, flags);
-     }
- }
- 
---- a/xen/common/event_2l.c
-+++ b/xen/common/event_2l.c
-@@ -63,8 +63,10 @@ static void evtchn_2l_unmask(struct doma
-     }
- }
- 
--static bool evtchn_2l_is_pending(const struct domain *d, evtchn_port_t port)
-+static bool evtchn_2l_is_pending(const struct domain *d,
-+                                 const struct evtchn *evtchn)
- {
-+    evtchn_port_t port = evtchn->port;
-     unsigned int max_ports = BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d);
- 
-     ASSERT(port < max_ports);
-@@ -72,8 +74,10 @@ static bool evtchn_2l_is_pending(const s
-             guest_test_bit(d, port, &shared_info(d, evtchn_pending)));
- }
- 
--static bool evtchn_2l_is_masked(const struct domain *d, evtchn_port_t port)
-+static bool evtchn_2l_is_masked(const struct domain *d,
-+                                const struct evtchn *evtchn)
- {
-+    evtchn_port_t port = evtchn->port;
-     unsigned int max_ports = BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d);
- 
-     ASSERT(port < max_ports);
---- a/xen/common/event_channel.c
-+++ b/xen/common/event_channel.c
-@@ -156,8 +156,9 @@ int evtchn_allocate_port(struct domain *
- 
-     if ( port_is_valid(d, port) )
-     {
--        if ( evtchn_from_port(d, port)->state != ECS_FREE ||
--             evtchn_port_is_busy(d, port) )
-+        const struct evtchn *chn = evtchn_from_port(d, port);
-+
-+        if ( chn->state != ECS_FREE || evtchn_is_busy(d, chn) )
-             return -EBUSY;
-     }
-     else
-@@ -774,6 +775,7 @@ void send_guest_vcpu_virq(struct vcpu *v
-     unsigned long flags;
-     int port;
-     struct domain *d;
-+    struct evtchn *chn;
- 
-     ASSERT(!virq_is_global(virq));
- 
-@@ -784,7 +786,10 @@ void send_guest_vcpu_virq(struct vcpu *v
-         goto out;
- 
-     d = v->domain;
--    evtchn_port_set_pending(d, v->vcpu_id, evtchn_from_port(d, port));
-+    chn = evtchn_from_port(d, port);
-+    spin_lock(&chn->lock);
-+    evtchn_port_set_pending(d, v->vcpu_id, chn);
-+    spin_unlock(&chn->lock);
- 
-  out:
-     spin_unlock_irqrestore(&v->virq_lock, flags);
-@@ -813,7 +818,9 @@ void send_guest_global_virq(struct domai
-         goto out;
- 
-     chn = evtchn_from_port(d, port);
-+    spin_lock(&chn->lock);
-     evtchn_port_set_pending(d, chn->notify_vcpu_id, chn);
-+    spin_unlock(&chn->lock);
- 
-  out:
-     spin_unlock_irqrestore(&v->virq_lock, flags);
-@@ -823,6 +830,7 @@ void send_guest_pirq(struct domain *d, c
- {
-     int port;
-     struct evtchn *chn;
-+    unsigned long flags;
- 
-     /*
-      * PV guests: It should not be possible to race with __evtchn_close(). The
-@@ -837,7 +845,9 @@ void send_guest_pirq(struct domain *d, c
-     }
- 
-     chn = evtchn_from_port(d, port);
-+    spin_lock_irqsave(&chn->lock, flags);
-     evtchn_port_set_pending(d, chn->notify_vcpu_id, chn);
-+    spin_unlock_irqrestore(&chn->lock, flags);
- }
- 
- static struct domain *global_virq_handlers[NR_VIRQS] __read_mostly;
-@@ -1034,12 +1044,15 @@ int evtchn_unmask(unsigned int port)
- {
-     struct domain *d = current->domain;
-     struct evtchn *evtchn;
-+    unsigned long flags;
- 
-     if ( unlikely(!port_is_valid(d, port)) )
-         return -EINVAL;
- 
-     evtchn = evtchn_from_port(d, port);
-+    spin_lock_irqsave(&evtchn->lock, flags);
-     evtchn_port_unmask(d, evtchn);
-+    spin_unlock_irqrestore(&evtchn->lock, flags);
- 
-     return 0;
- }
-@@ -1449,8 +1462,8 @@ static void domain_dump_evtchn_info(stru
- 
-         printk("    %4u [%d/%d/",
-                port,
--               evtchn_port_is_pending(d, port),
--               evtchn_port_is_masked(d, port));
-+               evtchn_is_pending(d, chn),
-+               evtchn_is_masked(d, chn));
-         evtchn_port_print_state(d, chn);
-         printk("]: s=%d n=%d x=%d",
-                chn->state, chn->notify_vcpu_id, chn->xen_consumer);
---- a/xen/common/event_fifo.c
-+++ b/xen/common/event_fifo.c
-@@ -296,23 +296,26 @@ static void evtchn_fifo_unmask(struct do
-         evtchn_fifo_set_pending(v, evtchn);
- }
- 
--static bool evtchn_fifo_is_pending(const struct domain *d, evtchn_port_t port)
-+static bool evtchn_fifo_is_pending(const struct domain *d,
-+                                   const struct evtchn *evtchn)
- {
--    const event_word_t *word = evtchn_fifo_word_from_port(d, port);
-+    const event_word_t *word = evtchn_fifo_word_from_port(d, evtchn->port);
- 
-     return word && guest_test_bit(d, EVTCHN_FIFO_PENDING, word);
- }
- 
--static bool_t evtchn_fifo_is_masked(const struct domain *d, evtchn_port_t port)
-+static bool_t evtchn_fifo_is_masked(const struct domain *d,
-+                                    const struct evtchn *evtchn)
- {
--    const event_word_t *word = evtchn_fifo_word_from_port(d, port);
-+    const event_word_t *word = evtchn_fifo_word_from_port(d, evtchn->port);
- 
-     return !word || guest_test_bit(d, EVTCHN_FIFO_MASKED, word);
- }
- 
--static bool_t evtchn_fifo_is_busy(const struct domain *d, evtchn_port_t port)
-+static bool_t evtchn_fifo_is_busy(const struct domain *d,
-+                                  const struct evtchn *evtchn)
- {
--    const event_word_t *word = evtchn_fifo_word_from_port(d, port);
-+    const event_word_t *word = evtchn_fifo_word_from_port(d, evtchn->port);
- 
-     return word && guest_test_bit(d, EVTCHN_FIFO_LINKED, word);
- }
---- a/xen/include/asm-x86/event.h
-+++ b/xen/include/asm-x86/event.h
-@@ -47,4 +47,10 @@ static inline bool arch_virq_is_global(u
-     return true;
- }
- 
-+#ifdef CONFIG_PV_SHIM
-+# include <asm/pv/shim.h>
-+# define arch_evtchn_is_special(chn) \
-+             (pv_shim && (chn)->port && (chn)->state == ECS_RESERVED)
-+#endif
-+
- #endif
---- a/xen/include/xen/event.h
-+++ b/xen/include/xen/event.h
-@@ -133,6 +133,24 @@ static inline struct evtchn *evtchn_from
-     return bucket_from_port(d, p) + (p % EVTCHNS_PER_BUCKET);
- }
- 
-+/*
-+ * "usable" as in "by a guest", i.e. Xen consumed channels are assumed to be
-+ * taken care of separately where used for Xen's internal purposes.
-+ */
-+static bool evtchn_usable(const struct evtchn *evtchn)
-+{
-+    if ( evtchn->xen_consumer )
-+        return false;
-+
-+#ifdef arch_evtchn_is_special
-+    if ( arch_evtchn_is_special(evtchn) )
-+        return true;
-+#endif
-+
-+    BUILD_BUG_ON(ECS_FREE > ECS_RESERVED);
-+    return evtchn->state > ECS_RESERVED;
-+}
-+
- /* Wait on a Xen-attached event channel. */
- #define wait_on_xen_event_channel(port, condition)                      \
-     do {                                                                \
-@@ -165,19 +183,24 @@ int evtchn_reset(struct domain *d);
- 
- /*
-  * Low-level event channel port ops.
-+ *
-+ * All hooks have to be called with a lock held which prevents the channel
-+ * from changing state. This may be the domain event lock, the per-channel
-+ * lock, or in the case of sending interdomain events also the other side's
-+ * per-channel lock. Exceptions apply in certain cases for the PV shim.
-  */
- struct evtchn_port_ops {
-     void (*init)(struct domain *d, struct evtchn *evtchn);
-     void (*set_pending)(struct vcpu *v, struct evtchn *evtchn);
-     void (*clear_pending)(struct domain *d, struct evtchn *evtchn);
-     void (*unmask)(struct domain *d, struct evtchn *evtchn);
--    bool (*is_pending)(const struct domain *d, evtchn_port_t port);
--    bool (*is_masked)(const struct domain *d, evtchn_port_t port);
-+    bool (*is_pending)(const struct domain *d, const struct evtchn *evtchn);
-+    bool (*is_masked)(const struct domain *d, const struct evtchn *evtchn);
-     /*
-      * Is the port unavailable because it's still being cleaned up
-      * after being closed?
-      */
--    bool (*is_busy)(const struct domain *d, evtchn_port_t port);
-+    bool (*is_busy)(const struct domain *d, const struct evtchn *evtchn);
-     int (*set_priority)(struct domain *d, struct evtchn *evtchn,
-                         unsigned int priority);
-     void (*print_state)(struct domain *d, const struct evtchn *evtchn);
-@@ -193,38 +216,67 @@ static inline void evtchn_port_set_pendi
-                                            unsigned int vcpu_id,
-                                            struct evtchn *evtchn)
- {
--    d->evtchn_port_ops->set_pending(d->vcpu[vcpu_id], evtchn);
-+    if ( evtchn_usable(evtchn) )
-+        d->evtchn_port_ops->set_pending(d->vcpu[vcpu_id], evtchn);
- }
- 
- static inline void evtchn_port_clear_pending(struct domain *d,
-                                              struct evtchn *evtchn)
- {
--    d->evtchn_port_ops->clear_pending(d, evtchn);
-+    if ( evtchn_usable(evtchn) )
-+        d->evtchn_port_ops->clear_pending(d, evtchn);
- }
- 
- static inline void evtchn_port_unmask(struct domain *d,
-                                       struct evtchn *evtchn)
- {
--    d->evtchn_port_ops->unmask(d, evtchn);
-+    if ( evtchn_usable(evtchn) )
-+        d->evtchn_port_ops->unmask(d, evtchn);
- }
- 
--static inline bool evtchn_port_is_pending(const struct domain *d,
--                                          evtchn_port_t port)
-+static inline bool evtchn_is_pending(const struct domain *d,
-+                                     const struct evtchn *evtchn)
- {
--    return d->evtchn_port_ops->is_pending(d, port);
-+    return evtchn_usable(evtchn) && d->evtchn_port_ops->is_pending(d, evtchn);
- }
- 
--static inline bool evtchn_port_is_masked(const struct domain *d,
--                                         evtchn_port_t port)
-+static inline bool evtchn_port_is_pending(struct domain *d, evtchn_port_t port)
- {
--    return d->evtchn_port_ops->is_masked(d, port);
-+    struct evtchn *evtchn = evtchn_from_port(d, port);
-+    bool rc;
-+    unsigned long flags;
-+
-+    spin_lock_irqsave(&evtchn->lock, flags);
-+    rc = evtchn_is_pending(d, evtchn);
-+    spin_unlock_irqrestore(&evtchn->lock, flags);
-+
-+    return rc;
-+}
-+
-+static inline bool evtchn_is_masked(const struct domain *d,
-+                                    const struct evtchn *evtchn)
-+{
-+    return !evtchn_usable(evtchn) || d->evtchn_port_ops->is_masked(d, evtchn);
-+}
-+
-+static inline bool evtchn_port_is_masked(struct domain *d, evtchn_port_t port)
-+{
-+    struct evtchn *evtchn = evtchn_from_port(d, port);
-+    bool rc;
-+    unsigned long flags;
-+
-+    spin_lock_irqsave(&evtchn->lock, flags);
-+    rc = evtchn_is_masked(d, evtchn);
-+    spin_unlock_irqrestore(&evtchn->lock, flags);
-+
-+    return rc;
- }
- 
--static inline bool evtchn_port_is_busy(const struct domain *d,
--                                       evtchn_port_t port)
-+static inline bool evtchn_is_busy(const struct domain *d,
-+                                  const struct evtchn *evtchn)
- {
-     return d->evtchn_port_ops->is_busy &&
--           d->evtchn_port_ops->is_busy(d, port);
-+           d->evtchn_port_ops->is_busy(d, evtchn);
- }
- 
- static inline int evtchn_port_set_priority(struct domain *d,
-@@ -233,6 +285,8 @@ static inline int evtchn_port_set_priori
- {
-     if ( !d->evtchn_port_ops->set_priority )
-         return -ENOSYS;
-+    if ( !evtchn_usable(evtchn) )
-+        return -EACCES;
-     return d->evtchn_port_ops->set_priority(d, evtchn, priority);
- }
- 
diff --git a/system/xen/xsa/xsa344-4.13-1.patch b/system/xen/xsa/xsa344-4.13-1.patch
deleted file mode 100644
index d8e9b3f43f..0000000000
--- a/system/xen/xsa/xsa344-4.13-1.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: evtchn: arrange for preemption in evtchn_destroy()
-
-Especially closing of fully established interdomain channels can take
-quite some time, due to the locking involved. Therefore we shouldn't
-assume we can clean up still active ports all in one go. Besides adding
-the necessary preemption check, also avoid pointlessly starting from
-(or now really ending at) 0; 1 is the lowest numbered port which may
-need closing.
-
-Since we're now reducing ->valid_evtchns, free_xen_event_channel(),
-and (at least to be on the safe side) notify_via_xen_event_channel()
-need to cope with attempts to close / unbind from / send through already
-closed (and no longer valid, as per port_is_valid()) ports.
-
-This is part of XSA-344.
-
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Acked-by: Julien Grall <jgrall@amazon.com>
-Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
-
---- a/xen/common/domain.c
-+++ b/xen/common/domain.c
-@@ -770,12 +770,14 @@ int domain_kill(struct domain *d)
-             return domain_kill(d);
-         d->is_dying = DOMDYING_dying;
-         argo_destroy(d);
--        evtchn_destroy(d);
-         gnttab_release_mappings(d);
-         vnuma_destroy(d->vnuma);
-         domain_set_outstanding_pages(d, 0);
-         /* fallthrough */
-     case DOMDYING_dying:
-+        rc = evtchn_destroy(d);
-+        if ( rc )
-+            break;
-         rc = domain_relinquish_resources(d);
-         if ( rc != 0 )
-             break;
---- a/xen/common/event_channel.c
-+++ b/xen/common/event_channel.c
-@@ -1297,7 +1297,16 @@ int alloc_unbound_xen_event_channel(
- 
- void free_xen_event_channel(struct domain *d, int port)
- {
--    BUG_ON(!port_is_valid(d, port));
-+    if ( !port_is_valid(d, port) )
-+    {
-+        /*
-+         * Make sure ->is_dying is read /after/ ->valid_evtchns, pairing
-+         * with the spin_barrier() and BUG_ON() in evtchn_destroy().
-+         */
-+        smp_rmb();
-+        BUG_ON(!d->is_dying);
-+        return;
-+    }
- 
-     evtchn_close(d, port, 0);
- }
-@@ -1309,7 +1318,17 @@ void notify_via_xen_event_channel(struct
-     struct domain *rd;
-     unsigned long flags;
- 
--    ASSERT(port_is_valid(ld, lport));
-+    if ( !port_is_valid(ld, lport) )
-+    {
-+        /*
-+         * Make sure ->is_dying is read /after/ ->valid_evtchns, pairing
-+         * with the spin_barrier() and BUG_ON() in evtchn_destroy().
-+         */
-+        smp_rmb();
-+        ASSERT(ld->is_dying);
-+        return;
-+    }
-+
-     lchn = evtchn_from_port(ld, lport);
- 
-     spin_lock_irqsave(&lchn->lock, flags);
-@@ -1380,8 +1399,7 @@ int evtchn_init(struct domain *d, unsign
-     return 0;
- }
- 
--
--void evtchn_destroy(struct domain *d)
-+int evtchn_destroy(struct domain *d)
- {
-     unsigned int i;
- 
-@@ -1390,14 +1408,29 @@ void evtchn_destroy(struct domain *d)
-     spin_barrier(&d->event_lock);
- 
-     /* Close all existing event channels. */
--    for ( i = 0; port_is_valid(d, i); i++ )
-+    for ( i = d->valid_evtchns; --i; )
-+    {
-         evtchn_close(d, i, 0);
- 
-+        /*
-+         * Avoid preempting when called from domain_create()'s error path,
-+         * and don't check too often (choice of frequency is arbitrary).
-+         */
-+        if ( i && !(i & 0x3f) && d->is_dying != DOMDYING_dead &&
-+             hypercall_preempt_check() )
-+        {
-+            write_atomic(&d->valid_evtchns, i);
-+            return -ERESTART;
-+        }
-+    }
-+
-     ASSERT(!d->active_evtchns);
- 
-     clear_global_virq_handlers(d);
- 
-     evtchn_fifo_destroy(d);
-+
-+    return 0;
- }
- 
- 
---- a/xen/include/xen/sched.h
-+++ b/xen/include/xen/sched.h
-@@ -136,7 +136,7 @@ struct evtchn
- } __attribute__((aligned(64)));
- 
- int  evtchn_init(struct domain *d, unsigned int max_port);
--void evtchn_destroy(struct domain *d); /* from domain_kill */
-+int  evtchn_destroy(struct domain *d); /* from domain_kill */
- void evtchn_destroy_final(struct domain *d); /* from complete_domain_destroy */
- 
- struct waitqueue_vcpu;
diff --git a/system/xen/xsa/xsa344-4.13-2.patch b/system/xen/xsa/xsa344-4.13-2.patch
deleted file mode 100644
index 3f0339498f..0000000000
--- a/system/xen/xsa/xsa344-4.13-2.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: evtchn: arrange for preemption in evtchn_reset()
-
-Like for evtchn_destroy() looping over all possible event channels to
-close them can take a significant amount of time. Unlike done there, we
-can't alter domain properties (i.e. d->valid_evtchns) here. Borrow, in a
-lightweight form, the paging domctl continuation concept, redirecting
-the continuations to different sub-ops. Just like there this is to be
-able to allow for predictable overall results of the involved sub-ops:
-Racing requests should either complete or be refused.
-
-Note that a domain can't interfere with an already started (by a remote
-domain) reset, due to being paused. It can prevent a remote reset from
-happening by leaving a reset unfinished, but that's only going to affect
-itself.
-
-This is part of XSA-344.
-
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Acked-by: Julien Grall <jgrall@amazon.com>
-Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
-
---- a/xen/common/domain.c
-+++ b/xen/common/domain.c
-@@ -1214,7 +1214,7 @@ void domain_unpause_except_self(struct d
-         domain_unpause(d);
- }
- 
--int domain_soft_reset(struct domain *d)
-+int domain_soft_reset(struct domain *d, bool resuming)
- {
-     struct vcpu *v;
-     int rc;
-@@ -1228,7 +1228,7 @@ int domain_soft_reset(struct domain *d)
-         }
-     spin_unlock(&d->shutdown_lock);
- 
--    rc = evtchn_reset(d);
-+    rc = evtchn_reset(d, resuming);
-     if ( rc )
-         return rc;
- 
---- a/xen/common/domctl.c
-+++ b/xen/common/domctl.c
-@@ -572,12 +572,22 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xe
-     }
- 
-     case XEN_DOMCTL_soft_reset:
-+    case XEN_DOMCTL_soft_reset_cont:
-         if ( d == current->domain ) /* no domain_pause() */
-         {
-             ret = -EINVAL;
-             break;
-         }
--        ret = domain_soft_reset(d);
-+        ret = domain_soft_reset(d, op->cmd == XEN_DOMCTL_soft_reset_cont);
-+        if ( ret == -ERESTART )
-+        {
-+            op->cmd = XEN_DOMCTL_soft_reset_cont;
-+            if ( !__copy_field_to_guest(u_domctl, op, cmd) )
-+                ret = hypercall_create_continuation(__HYPERVISOR_domctl,
-+                                                    "h", u_domctl);
-+            else
-+                ret = -EFAULT;
-+        }
-         break;
- 
-     case XEN_DOMCTL_destroydomain:
---- a/xen/common/event_channel.c
-+++ b/xen/common/event_channel.c
-@@ -1057,7 +1057,7 @@ int evtchn_unmask(unsigned int port)
-     return 0;
- }
- 
--int evtchn_reset(struct domain *d)
-+int evtchn_reset(struct domain *d, bool resuming)
- {
-     unsigned int i;
-     int rc = 0;
-@@ -1065,11 +1065,40 @@ int evtchn_reset(struct domain *d)
-     if ( d != current->domain && !d->controller_pause_count )
-         return -EINVAL;
- 
--    for ( i = 0; port_is_valid(d, i); i++ )
-+    spin_lock(&d->event_lock);
-+
-+    /*
-+     * If we are resuming, then start where we stopped. Otherwise, check
-+     * that a reset operation is not already in progress, and if none is,
-+     * record that this is now the case.
-+     */
-+    i = resuming ? d->next_evtchn : !d->next_evtchn;
-+    if ( i > d->next_evtchn )
-+        d->next_evtchn = i;
-+
-+    spin_unlock(&d->event_lock);
-+
-+    if ( !i )
-+        return -EBUSY;
-+
-+    for ( ; port_is_valid(d, i); i++ )
-+    {
-         evtchn_close(d, i, 1);
- 
-+        /* NB: Choice of frequency is arbitrary. */
-+        if ( !(i & 0x3f) && hypercall_preempt_check() )
-+        {
-+            spin_lock(&d->event_lock);
-+            d->next_evtchn = i;
-+            spin_unlock(&d->event_lock);
-+            return -ERESTART;
-+        }
-+    }
-+
-     spin_lock(&d->event_lock);
- 
-+    d->next_evtchn = 0;
-+
-     if ( d->active_evtchns > d->xen_evtchns )
-         rc = -EAGAIN;
-     else if ( d->evtchn_fifo )
-@@ -1204,7 +1233,8 @@ long do_event_channel_op(int cmd, XEN_GU
-         break;
-     }
- 
--    case EVTCHNOP_reset: {
-+    case EVTCHNOP_reset:
-+    case EVTCHNOP_reset_cont: {
-         struct evtchn_reset reset;
-         struct domain *d;
- 
-@@ -1217,9 +1247,13 @@ long do_event_channel_op(int cmd, XEN_GU
- 
-         rc = xsm_evtchn_reset(XSM_TARGET, current->domain, d);
-         if ( !rc )
--            rc = evtchn_reset(d);
-+            rc = evtchn_reset(d, cmd == EVTCHNOP_reset_cont);
- 
-         rcu_unlock_domain(d);
-+
-+        if ( rc == -ERESTART )
-+            rc = hypercall_create_continuation(__HYPERVISOR_event_channel_op,
-+                                               "ih", EVTCHNOP_reset_cont, arg);
-         break;
-     }
- 
---- a/xen/include/public/domctl.h
-+++ b/xen/include/public/domctl.h
-@@ -1152,7 +1152,10 @@ struct xen_domctl {
- #define XEN_DOMCTL_iomem_permission              20
- #define XEN_DOMCTL_ioport_permission             21
- #define XEN_DOMCTL_hypercall_init                22
--#define XEN_DOMCTL_arch_setup                    23 /* Obsolete IA64 only */
-+#ifdef __XEN__
-+/* #define XEN_DOMCTL_arch_setup                 23 Obsolete IA64 only */
-+#define XEN_DOMCTL_soft_reset_cont               23
-+#endif
- #define XEN_DOMCTL_settimeoffset                 24
- #define XEN_DOMCTL_getvcpuaffinity               25
- #define XEN_DOMCTL_real_mode_area                26 /* Obsolete PPC only */
---- a/xen/include/public/event_channel.h
-+++ b/xen/include/public/event_channel.h
-@@ -74,6 +74,9 @@
- #define EVTCHNOP_init_control    11
- #define EVTCHNOP_expand_array    12
- #define EVTCHNOP_set_priority    13
-+#ifdef __XEN__
-+#define EVTCHNOP_reset_cont      14
-+#endif
- /* ` } */
- 
- typedef uint32_t evtchn_port_t;
---- a/xen/include/xen/event.h
-+++ b/xen/include/xen/event.h
-@@ -171,7 +171,7 @@ void evtchn_check_pollers(struct domain
- void evtchn_2l_init(struct domain *d);
- 
- /* Close all event channels and reset to 2-level ABI. */
--int evtchn_reset(struct domain *d);
-+int evtchn_reset(struct domain *d, bool resuming);
- 
- /*
-  * Low-level event channel port ops.
---- a/xen/include/xen/sched.h
-+++ b/xen/include/xen/sched.h
-@@ -394,6 +394,8 @@ struct domain
-      * EVTCHNOP_reset).  Read/write access like for active_evtchns.
-      */
-     unsigned int     xen_evtchns;
-+    /* Port to resume from in evtchn_reset(), when in a continuation. */
-+    unsigned int     next_evtchn;
-     spinlock_t       event_lock;
-     const struct evtchn_port_ops *evtchn_port_ops;
-     struct evtchn_fifo_domain *evtchn_fifo;
-@@ -663,7 +665,7 @@ int domain_shutdown(struct domain *d, u8
- void domain_resume(struct domain *d);
- void domain_pause_for_debugger(void);
- 
--int domain_soft_reset(struct domain *d);
-+int domain_soft_reset(struct domain *d, bool resuming);
- 
- int vcpu_start_shutdown_deferral(struct vcpu *v);
- void vcpu_end_shutdown_deferral(struct vcpu *v);
diff --git a/system/xen/xsa/xsa345-0001-x86-mm-Refactor-map_pages_to_xen-to-have-only-a-sing.patch b/system/xen/xsa/xsa345-0001-x86-mm-Refactor-map_pages_to_xen-to-have-only-a-sing.patch
deleted file mode 100644
index d325385a56..0000000000
--- a/system/xen/xsa/xsa345-0001-x86-mm-Refactor-map_pages_to_xen-to-have-only-a-sing.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From b3e0d4e37b7902533a463812374947d4d6d2e463 Mon Sep 17 00:00:00 2001
-From: Wei Liu <wei.liu2@citrix.com>
-Date: Sat, 11 Jan 2020 21:57:41 +0000
-Subject: [PATCH 1/3] x86/mm: Refactor map_pages_to_xen to have only a single
- exit path
-
-We will soon need to perform clean-ups before returning.
-
-No functional change.
-
-This is part of XSA-345.
-
-Reported-by: Hongyan Xia <hongyxia@amazon.com>
-Signed-off-by: Wei Liu <wei.liu2@citrix.com>
-Signed-off-by: Hongyan Xia <hongyxia@amazon.com>
-Signed-off-by: George Dunlap <george.dunlap@citrix.com>
-Acked-by: Jan Beulich <jbeulich@suse.com>
----
- xen/arch/x86/mm.c | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
-index 30dffb68e8..133a393875 100644
---- a/xen/arch/x86/mm.c
-+++ b/xen/arch/x86/mm.c
-@@ -5187,6 +5187,7 @@ int map_pages_to_xen(
-     l2_pgentry_t *pl2e, ol2e;
-     l1_pgentry_t *pl1e, ol1e;
-     unsigned int  i;
-+    int rc = -ENOMEM;
- 
- #define flush_flags(oldf) do {                 \
-     unsigned int o_ = (oldf);                  \
-@@ -5207,7 +5208,8 @@ int map_pages_to_xen(
-         l3_pgentry_t ol3e, *pl3e = virt_to_xen_l3e(virt);
- 
-         if ( !pl3e )
--            return -ENOMEM;
-+            goto out;
-+
-         ol3e = *pl3e;
- 
-         if ( cpu_has_page1gb &&
-@@ -5295,7 +5297,7 @@ int map_pages_to_xen(
- 
-             pl2e = alloc_xen_pagetable();
-             if ( pl2e == NULL )
--                return -ENOMEM;
-+                goto out;
- 
-             for ( i = 0; i < L2_PAGETABLE_ENTRIES; i++ )
-                 l2e_write(pl2e + i,
-@@ -5324,7 +5326,7 @@ int map_pages_to_xen(
- 
-         pl2e = virt_to_xen_l2e(virt);
-         if ( !pl2e )
--            return -ENOMEM;
-+            goto out;
- 
-         if ( ((((virt >> PAGE_SHIFT) | mfn_x(mfn)) &
-                ((1u << PAGETABLE_ORDER) - 1)) == 0) &&
-@@ -5367,7 +5369,7 @@ int map_pages_to_xen(
-             {
-                 pl1e = virt_to_xen_l1e(virt);
-                 if ( pl1e == NULL )
--                    return -ENOMEM;
-+                    goto out;
-             }
-             else if ( l2e_get_flags(*pl2e) & _PAGE_PSE )
-             {
-@@ -5394,7 +5396,7 @@ int map_pages_to_xen(
- 
-                 pl1e = alloc_xen_pagetable();
-                 if ( pl1e == NULL )
--                    return -ENOMEM;
-+                    goto out;
- 
-                 for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++ )
-                     l1e_write(&pl1e[i],
-@@ -5538,7 +5540,10 @@ int map_pages_to_xen(
- 
- #undef flush_flags
- 
--    return 0;
-+    rc = 0;
-+
-+ out:
-+    return rc;
- }
- 
- int populate_pt_range(unsigned long virt, unsigned long nr_mfns)
--- 
-2.25.1
-
diff --git a/system/xen/xsa/xsa345-0002-x86-mm-Refactor-modify_xen_mappings-to-have-one-exit.patch b/system/xen/xsa/xsa345-0002-x86-mm-Refactor-modify_xen_mappings-to-have-one-exit.patch
deleted file mode 100644
index 836bed681a..0000000000
--- a/system/xen/xsa/xsa345-0002-x86-mm-Refactor-modify_xen_mappings-to-have-one-exit.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 9f6f35b833d295acaaa2d8ff8cf309bf688cfd50 Mon Sep 17 00:00:00 2001
-From: Wei Liu <wei.liu2@citrix.com>
-Date: Sat, 11 Jan 2020 21:57:42 +0000
-Subject: [PATCH 2/3] x86/mm: Refactor modify_xen_mappings to have one exit
- path
-
-We will soon need to perform clean-ups before returning.
-
-No functional change.
-
-This is part of XSA-345.
-
-Reported-by: Hongyan Xia <hongyxia@amazon.com>
-Signed-off-by: Wei Liu <wei.liu2@citrix.com>
-Signed-off-by: Hongyan Xia <hongyxia@amazon.com>
-Signed-off-by: George Dunlap <george.dunlap@citrix.com>
-Acked-by: Jan Beulich <jbeulich@suse.com>
----
- xen/arch/x86/mm.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
-index 133a393875..af726d3274 100644
---- a/xen/arch/x86/mm.c
-+++ b/xen/arch/x86/mm.c
-@@ -5570,6 +5570,7 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf)
-     l1_pgentry_t *pl1e;
-     unsigned int  i;
-     unsigned long v = s;
-+    int rc = -ENOMEM;
- 
-     /* Set of valid PTE bits which may be altered. */
- #define FLAGS_MASK (_PAGE_NX|_PAGE_RW|_PAGE_PRESENT)
-@@ -5611,7 +5612,8 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf)
-             /* PAGE1GB: shatter the superpage and fall through. */
-             pl2e = alloc_xen_pagetable();
-             if ( !pl2e )
--                return -ENOMEM;
-+                goto out;
-+
-             for ( i = 0; i < L2_PAGETABLE_ENTRIES; i++ )
-                 l2e_write(pl2e + i,
-                           l2e_from_pfn(l3e_get_pfn(*pl3e) +
-@@ -5666,7 +5668,8 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf)
-                 /* PSE: shatter the superpage and try again. */
-                 pl1e = alloc_xen_pagetable();
-                 if ( !pl1e )
--                    return -ENOMEM;
-+                    goto out;
-+
-                 for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++ )
-                     l1e_write(&pl1e[i],
-                               l1e_from_pfn(l2e_get_pfn(*pl2e) + i,
-@@ -5795,7 +5798,10 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf)
-     flush_area(NULL, FLUSH_TLB_GLOBAL);
- 
- #undef FLAGS_MASK
--    return 0;
-+    rc = 0;
-+
-+ out:
-+    return rc;
- }
- 
- #undef flush_area
--- 
-2.25.1
-
diff --git a/system/xen/xsa/xsa345-0003-x86-mm-Prevent-some-races-in-hypervisor-mapping-upda.patch b/system/xen/xsa/xsa345-0003-x86-mm-Prevent-some-races-in-hypervisor-mapping-upda.patch
deleted file mode 100644
index db407416b9..0000000000
--- a/system/xen/xsa/xsa345-0003-x86-mm-Prevent-some-races-in-hypervisor-mapping-upda.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-From 0ff9a8453dc47cd47eee9659d5916afb5094e871 Mon Sep 17 00:00:00 2001
-From: Hongyan Xia <hongyxia@amazon.com>
-Date: Sat, 11 Jan 2020 21:57:43 +0000
-Subject: [PATCH 3/3] x86/mm: Prevent some races in hypervisor mapping updates
-
-map_pages_to_xen will attempt to coalesce mappings into 2MiB and 1GiB
-superpages if possible, to maximize TLB efficiency.  This means both
-replacing superpage entries with smaller entries, and replacing
-smaller entries with superpages.
-
-Unfortunately, while some potential races are handled correctly,
-others are not.  These include:
-
-1. When one processor modifies a sub-superpage mapping while another
-processor replaces the entire range with a superpage.
-
-Take the following example:
-
-Suppose L3[N] points to L2.  And suppose we have two processors, A and
-B.
-
-* A walks the pagetables, get a pointer to L2.
-* B replaces L3[N] with a 1GiB mapping.
-* B Frees L2
-* A writes L2[M] #
-
-This is race exacerbated by the fact that virt_to_xen_l[21]e doesn't
-handle higher-level superpages properly: If you call virt_xen_to_l2e
-on a virtual address within an L3 superpage, you'll either hit a BUG()
-(most likely), or get a pointer into the middle of a data page; same
-with virt_xen_to_l1 on a virtual address within either an L3 or L2
-superpage.
-
-So take the following example:
-
-* A reads pl3e and discovers it to point to an L2.
-* B replaces L3[N] with a 1GiB mapping
-* A calls virt_to_xen_l2e() and hits the BUG_ON() #
-
-2. When two processors simultaneously try to replace a sub-superpage
-mapping with a superpage mapping.
-
-Take the following example:
-
-Suppose L3[N] points to L2.  And suppose we have two processors, A and B,
-both trying to replace L3[N] with a superpage.
-
-* A walks the pagetables, get a pointer to pl3e, and takes a copy ol3e pointing to L2.
-* B walks the pagetables, gets a pointre to pl3e, and takes a copy ol3e pointing to L2.
-* A writes the new value into L3[N]
-* B writes the new value into L3[N]
-* A recursively frees all the L1's under L2, then frees L2
-* B recursively double-frees all the L1's under L2, then double-frees L2 #
-
-Fix this by grabbing a lock for the entirety of the mapping update
-operation.
-
-Rather than grabbing map_pgdir_lock for the entire operation, however,
-repurpose the PGT_locked bit from L3's page->type_info as a lock.
-This means that rather than locking the entire address space, we
-"only" lock a single 512GiB chunk of hypervisor address space at a
-time.
-
-There was a proposal for a lock-and-reverify approach, where we walk
-the pagetables to the point where we decide what to do; then grab the
-map_pgdir_lock, re-verify the information we collected without the
-lock, and finally make the change (starting over again if anything had
-changed).  Without being able to guarantee that the L2 table wasn't
-freed, however, that means every read would need to be considered
-potentially unsafe.  Thinking carefully about that is probably
-something that wants to be done on public, not under time pressure.
-
-This is part of XSA-345.
-
-Reported-by: Hongyan Xia <hongyxia@amazon.com>
-Signed-off-by: Hongyan Xia <hongyxia@amazon.com>
-Signed-off-by: George Dunlap <george.dunlap@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
----
- xen/arch/x86/mm.c | 92 +++++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 89 insertions(+), 3 deletions(-)
-
-diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
-index af726d3274..d6a0761f43 100644
---- a/xen/arch/x86/mm.c
-+++ b/xen/arch/x86/mm.c
-@@ -2167,6 +2167,50 @@ void page_unlock(struct page_info *page)
-     current_locked_page_set(NULL);
- }
- 
-+/*
-+ * L3 table locks:
-+ *
-+ * Used for serialization in map_pages_to_xen() and modify_xen_mappings().
-+ *
-+ * For Xen PT pages, the page->u.inuse.type_info is unused and it is safe to
-+ * reuse the PGT_locked flag. This lock is taken only when we move down to L3
-+ * tables and below, since L4 (and above, for 5-level paging) is still globally
-+ * protected by map_pgdir_lock.
-+ *
-+ * PV MMU update hypercalls call map_pages_to_xen while holding a page's page_lock().
-+ * This has two implications:
-+ * - We cannot reuse reuse current_locked_page_* for debugging
-+ * - To avoid the chance of deadlock, even for different pages, we
-+ *   must never grab page_lock() after grabbing l3t_lock().  This
-+ *   includes any page_lock()-based locks, such as
-+ *   mem_sharing_page_lock().
-+ *
-+ * Also note that we grab the map_pgdir_lock while holding the
-+ * l3t_lock(), so to avoid deadlock we must avoid grabbing them in
-+ * reverse order.
-+ */
-+static void l3t_lock(struct page_info *page)
-+{
-+    unsigned long x, nx;
-+
-+    do {
-+        while ( (x = page->u.inuse.type_info) & PGT_locked )
-+            cpu_relax();
-+        nx = x | PGT_locked;
-+    } while ( cmpxchg(&page->u.inuse.type_info, x, nx) != x );
-+}
-+
-+static void l3t_unlock(struct page_info *page)
-+{
-+    unsigned long x, nx, y = page->u.inuse.type_info;
-+
-+    do {
-+        x = y;
-+        BUG_ON(!(x & PGT_locked));
-+        nx = x & ~PGT_locked;
-+    } while ( (y = cmpxchg(&page->u.inuse.type_info, x, nx)) != x );
-+}
-+
- #ifdef CONFIG_PV
- /*
-  * PTE flags that a guest may change without re-validating the PTE.
-@@ -5177,6 +5221,23 @@ l1_pgentry_t *virt_to_xen_l1e(unsigned long v)
-                          flush_area_local((const void *)v, f) : \
-                          flush_area_all((const void *)v, f))
- 
-+#define L3T_INIT(page) (page) = ZERO_BLOCK_PTR
-+
-+#define L3T_LOCK(page)        \
-+    do {                      \
-+        if ( locking )        \
-+            l3t_lock(page);   \
-+    } while ( false )
-+
-+#define L3T_UNLOCK(page)                           \
-+    do {                                           \
-+        if ( locking && (page) != ZERO_BLOCK_PTR ) \
-+        {                                          \
-+            l3t_unlock(page);                      \
-+            (page) = ZERO_BLOCK_PTR;               \
-+        }                                          \
-+    } while ( false )
-+
- int map_pages_to_xen(
-     unsigned long virt,
-     mfn_t mfn,
-@@ -5188,6 +5249,7 @@ int map_pages_to_xen(
-     l1_pgentry_t *pl1e, ol1e;
-     unsigned int  i;
-     int rc = -ENOMEM;
-+    struct page_info *current_l3page;
- 
- #define flush_flags(oldf) do {                 \
-     unsigned int o_ = (oldf);                  \
-@@ -5203,13 +5265,20 @@ int map_pages_to_xen(
-     }                                          \
- } while (0)
- 
-+    L3T_INIT(current_l3page);
-+
-     while ( nr_mfns != 0 )
-     {
--        l3_pgentry_t ol3e, *pl3e = virt_to_xen_l3e(virt);
-+        l3_pgentry_t *pl3e, ol3e;
- 
-+        L3T_UNLOCK(current_l3page);
-+
-+        pl3e = virt_to_xen_l3e(virt);
-         if ( !pl3e )
-             goto out;
- 
-+        current_l3page = virt_to_page(pl3e);
-+        L3T_LOCK(current_l3page);
-         ol3e = *pl3e;
- 
-         if ( cpu_has_page1gb &&
-@@ -5543,6 +5612,7 @@ int map_pages_to_xen(
-     rc = 0;
- 
-  out:
-+    L3T_UNLOCK(current_l3page);
-     return rc;
- }
- 
-@@ -5571,6 +5641,7 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf)
-     unsigned int  i;
-     unsigned long v = s;
-     int rc = -ENOMEM;
-+    struct page_info *current_l3page;
- 
-     /* Set of valid PTE bits which may be altered. */
- #define FLAGS_MASK (_PAGE_NX|_PAGE_RW|_PAGE_PRESENT)
-@@ -5579,11 +5650,22 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf)
-     ASSERT(IS_ALIGNED(s, PAGE_SIZE));
-     ASSERT(IS_ALIGNED(e, PAGE_SIZE));
- 
-+    L3T_INIT(current_l3page);
-+
-     while ( v < e )
-     {
--        l3_pgentry_t *pl3e = virt_to_xen_l3e(v);
-+        l3_pgentry_t *pl3e;
-+
-+        L3T_UNLOCK(current_l3page);
- 
--        if ( !pl3e || !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) )
-+        pl3e = virt_to_xen_l3e(v);
-+        if ( !pl3e )
-+            goto out;
-+
-+        current_l3page = virt_to_page(pl3e);
-+        L3T_LOCK(current_l3page);
-+
-+        if ( !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) )
-         {
-             /* Confirm the caller isn't trying to create new mappings. */
-             ASSERT(!(nf & _PAGE_PRESENT));
-@@ -5801,9 +5883,13 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf)
-     rc = 0;
- 
-  out:
-+    L3T_UNLOCK(current_l3page);
-     return rc;
- }
- 
-+#undef L3T_LOCK
-+#undef L3T_UNLOCK
-+
- #undef flush_area
- 
- int destroy_xen_mappings(unsigned long s, unsigned long e)
--- 
-2.25.1
-
diff --git a/system/xen/xsa/xsa346-4.13-1.patch b/system/xen/xsa/xsa346-4.13-1.patch
deleted file mode 100644
index a32e658e80..0000000000
--- a/system/xen/xsa/xsa346-4.13-1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: IOMMU: suppress "iommu_dont_flush_iotlb" when about to free a page
-
-Deferring flushes to a single, wide range one - as is done when
-handling XENMAPSPACE_gmfn_range - is okay only as long as
-pages don't get freed ahead of the eventual flush. While the only
-function setting the flag (xenmem_add_to_physmap()) suggests by its name
-that it's only mapping new entries, in reality the way
-xenmem_add_to_physmap_one() works means an unmap would happen not only
-for the page being moved (but not freed) but, if the destination GFN is
-populated, also for the page being displaced from that GFN. Collapsing
-the two flushes for this GFN into just one (end even more so deferring
-it to a batched invocation) is not correct.
-
-This is part of XSA-346.
-
-Fixes: cf95b2a9fd5a ("iommu: Introduce per cpu flag (iommu_dont_flush_iotlb) to avoid unnecessary iotlb... ")
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Paul Durrant <paul@xen.org>
-Acked-by: Julien Grall <jgrall@amazon.com>
-
---- a/xen/common/memory.c
-+++ b/xen/common/memory.c
-@@ -292,6 +292,7 @@ int guest_remove_page(struct domain *d,
-     p2m_type_t p2mt;
- #endif
-     mfn_t mfn;
-+    bool *dont_flush_p, dont_flush;
-     int rc;
- 
- #ifdef CONFIG_X86
-@@ -378,8 +379,18 @@ int guest_remove_page(struct domain *d,
-         return -ENXIO;
-     }
- 
-+    /*
-+     * Since we're likely to free the page below, we need to suspend
-+     * xenmem_add_to_physmap()'s suppressing of IOMMU TLB flushes.
-+     */
-+    dont_flush_p = &this_cpu(iommu_dont_flush_iotlb);
-+    dont_flush = *dont_flush_p;
-+    *dont_flush_p = false;
-+
-     rc = guest_physmap_remove_page(d, _gfn(gmfn), mfn, 0);
- 
-+    *dont_flush_p = dont_flush;
-+
-     /*
-      * With the lack of an IOMMU on some platforms, domains with DMA-capable
-      * device must retrieve the same pfn when the hypercall populate_physmap
diff --git a/system/xen/xsa/xsa346-4.13-2.patch b/system/xen/xsa/xsa346-4.13-2.patch
deleted file mode 100644
index 6371b5c3db..0000000000
--- a/system/xen/xsa/xsa346-4.13-2.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: IOMMU: hold page ref until after deferred TLB flush
-
-When moving around a page via XENMAPSPACE_gmfn_range, deferring the TLB
-flush for the "from" GFN range requires that the page remains allocated
-to the guest until the TLB flush has actually occurred. Otherwise a
-parallel hypercall to remove the page would only flush the TLB for the
-GFN it has been moved to, but not the one is was mapped at originally.
-
-This is part of XSA-346.
-
-Fixes: cf95b2a9fd5a ("iommu: Introduce per cpu flag (iommu_dont_flush_iotlb) to avoid unnecessary iotlb... ")
-Reported-by: Julien Grall <jgrall@amazon.com>
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Acked-by: Julien Grall <jgrall@amazon.com>
-
---- a/xen/arch/arm/mm.c
-+++ b/xen/arch/arm/mm.c
-@@ -1407,7 +1407,7 @@ void share_xen_page_with_guest(struct pa
- int xenmem_add_to_physmap_one(
-     struct domain *d,
-     unsigned int space,
--    union xen_add_to_physmap_batch_extra extra,
-+    union add_to_physmap_extra extra,
-     unsigned long idx,
-     gfn_t gfn)
- {
-@@ -1480,10 +1480,6 @@ int xenmem_add_to_physmap_one(
-         break;
-     }
-     case XENMAPSPACE_dev_mmio:
--        /* extra should be 0. Reserved for future use. */
--        if ( extra.res0 )
--            return -EOPNOTSUPP;
--
-         rc = map_dev_mmio_region(d, gfn, 1, _mfn(idx));
-         return rc;
- 
---- a/xen/arch/x86/mm.c
-+++ b/xen/arch/x86/mm.c
-@@ -4617,7 +4617,7 @@ static int handle_iomem_range(unsigned l
- int xenmem_add_to_physmap_one(
-     struct domain *d,
-     unsigned int space,
--    union xen_add_to_physmap_batch_extra extra,
-+    union add_to_physmap_extra extra,
-     unsigned long idx,
-     gfn_t gpfn)
- {
-@@ -4701,9 +4701,20 @@ int xenmem_add_to_physmap_one(
-         rc = guest_physmap_add_page(d, gpfn, mfn, PAGE_ORDER_4K);
- 
-  put_both:
--    /* In the XENMAPSPACE_gmfn case, we took a ref of the gfn at the top. */
-+    /*
-+     * In the XENMAPSPACE_gmfn case, we took a ref of the gfn at the top.
-+     * We also may need to transfer ownership of the page reference to our
-+     * caller.
-+     */
-     if ( space == XENMAPSPACE_gmfn )
-+    {
-         put_gfn(d, gfn);
-+        if ( !rc && extra.ppage )
-+        {
-+            *extra.ppage = page;
-+            page = NULL;
-+        }
-+    }
- 
-     if ( page )
-         put_page(page);
---- a/xen/common/memory.c
-+++ b/xen/common/memory.c
-@@ -814,13 +814,12 @@ int xenmem_add_to_physmap(struct domain
- {
-     unsigned int done = 0;
-     long rc = 0;
--    union xen_add_to_physmap_batch_extra extra;
-+    union add_to_physmap_extra extra = {};
-+    struct page_info *pages[16];
- 
-     ASSERT(paging_mode_translate(d));
- 
--    if ( xatp->space != XENMAPSPACE_gmfn_foreign )
--        extra.res0 = 0;
--    else
-+    if ( xatp->space == XENMAPSPACE_gmfn_foreign )
-         extra.foreign_domid = DOMID_INVALID;
- 
-     if ( xatp->space != XENMAPSPACE_gmfn_range )
-@@ -835,7 +834,10 @@ int xenmem_add_to_physmap(struct domain
-     xatp->size -= start;
- 
-     if ( is_iommu_enabled(d) )
-+    {
-        this_cpu(iommu_dont_flush_iotlb) = 1;
-+       extra.ppage = &pages[0];
-+    }
- 
-     while ( xatp->size > done )
-     {
-@@ -847,8 +849,12 @@ int xenmem_add_to_physmap(struct domain
-         xatp->idx++;
-         xatp->gpfn++;
- 
-+        if ( extra.ppage )
-+            ++extra.ppage;
-+
-         /* Check for continuation if it's not the last iteration. */
--        if ( xatp->size > ++done && hypercall_preempt_check() )
-+        if ( (++done > ARRAY_SIZE(pages) && extra.ppage) ||
-+             (xatp->size > done && hypercall_preempt_check()) )
-         {
-             rc = start + done;
-             break;
-@@ -858,6 +864,7 @@ int xenmem_add_to_physmap(struct domain
-     if ( is_iommu_enabled(d) )
-     {
-         int ret;
-+        unsigned int i;
- 
-         this_cpu(iommu_dont_flush_iotlb) = 0;
- 
-@@ -866,6 +873,15 @@ int xenmem_add_to_physmap(struct domain
-         if ( unlikely(ret) && rc >= 0 )
-             rc = ret;
- 
-+        /*
-+         * Now that the IOMMU TLB flush was done for the original GFN, drop
-+         * the page references. The 2nd flush below is fine to make later, as
-+         * whoever removes the page again from its new GFN will have to do
-+         * another flush anyway.
-+         */
-+        for ( i = 0; i < done; ++i )
-+            put_page(pages[i]);
-+
-         ret = iommu_iotlb_flush(d, _dfn(xatp->gpfn - done), done,
-                                 IOMMU_FLUSHF_added | IOMMU_FLUSHF_modified);
-         if ( unlikely(ret) && rc >= 0 )
-@@ -879,6 +895,8 @@ static int xenmem_add_to_physmap_batch(s
-                                        struct xen_add_to_physmap_batch *xatpb,
-                                        unsigned int extent)
- {
-+    union add_to_physmap_extra extra = {};
-+
-     if ( unlikely(xatpb->size < extent) )
-         return -EILSEQ;
- 
-@@ -890,6 +908,19 @@ static int xenmem_add_to_physmap_batch(s
-          !guest_handle_subrange_okay(xatpb->errs, extent, xatpb->size - 1) )
-         return -EFAULT;
- 
-+    switch ( xatpb->space )
-+    {
-+    case XENMAPSPACE_dev_mmio:
-+        /* res0 is reserved for future use. */
-+        if ( xatpb->u.res0 )
-+            return -EOPNOTSUPP;
-+        break;
-+
-+    case XENMAPSPACE_gmfn_foreign:
-+        extra.foreign_domid = xatpb->u.foreign_domid;
-+        break;
-+    }
-+
-     while ( xatpb->size > extent )
-     {
-         xen_ulong_t idx;
-@@ -902,8 +933,7 @@ static int xenmem_add_to_physmap_batch(s
-                                                extent, 1)) )
-             return -EFAULT;
- 
--        rc = xenmem_add_to_physmap_one(d, xatpb->space,
--                                       xatpb->u,
-+        rc = xenmem_add_to_physmap_one(d, xatpb->space, extra,
-                                        idx, _gfn(gpfn));
- 
-         if ( unlikely(__copy_to_guest_offset(xatpb->errs, extent, &rc, 1)) )
---- a/xen/include/xen/mm.h
-+++ b/xen/include/xen/mm.h
-@@ -588,8 +588,22 @@ void scrub_one_page(struct page_info *);
-                       &(d)->xenpage_list : &(d)->page_list)
- #endif
- 
-+union add_to_physmap_extra {
-+    /*
-+     * XENMAPSPACE_gmfn: When deferring TLB flushes, a page reference needs
-+     * to be kept until after the flush, so the page can't get removed from
-+     * the domain (and re-used for another purpose) beforehand. By passing
-+     * non-NULL, the caller of xenmem_add_to_physmap_one() indicates it wants
-+     * to have ownership of such a reference transferred in the success case.
-+     */
-+    struct page_info **ppage;
-+
-+    /* XENMAPSPACE_gmfn_foreign */
-+    domid_t foreign_domid;
-+};
-+
- int xenmem_add_to_physmap_one(struct domain *d, unsigned int space,
--                              union xen_add_to_physmap_batch_extra extra,
-+                              union add_to_physmap_extra extra,
-                               unsigned long idx, gfn_t gfn);
- 
- int xenmem_add_to_physmap(struct domain *d, struct xen_add_to_physmap *xatp,
diff --git a/system/xen/xsa/xsa347-4.13-1.patch b/system/xen/xsa/xsa347-4.13-1.patch
deleted file mode 100644
index e9f31a151f..0000000000
--- a/system/xen/xsa/xsa347-4.13-1.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: AMD/IOMMU: convert amd_iommu_pte from struct to union
-
-This is to add a "raw" counterpart to the bitfield equivalent. Take the
-opportunity and
- - convert fields to bool / unsigned int,
- - drop the naming of the reserved field,
- - shorten the names of the ignored ones.
-
-This is part of XSA-347.
-
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Reviewed-by: Paul Durrant <paul@xen.org>
-
---- a/xen/drivers/passthrough/amd/iommu_map.c
-+++ b/xen/drivers/passthrough/amd/iommu_map.c
-@@ -38,7 +38,7 @@ static unsigned int pfn_to_pde_idx(unsig
- static unsigned int clear_iommu_pte_present(unsigned long l1_mfn,
-                                             unsigned long dfn)
- {
--    struct amd_iommu_pte *table, *pte;
-+    union amd_iommu_pte *table, *pte;
-     unsigned int flush_flags;
- 
-     table = map_domain_page(_mfn(l1_mfn));
-@@ -52,7 +52,7 @@ static unsigned int clear_iommu_pte_pres
-     return flush_flags;
- }
- 
--static unsigned int set_iommu_pde_present(struct amd_iommu_pte *pte,
-+static unsigned int set_iommu_pde_present(union amd_iommu_pte *pte,
-                                           unsigned long next_mfn,
-                                           unsigned int next_level, bool iw,
-                                           bool ir)
-@@ -87,7 +87,7 @@ static unsigned int set_iommu_pte_presen
-                                           int pde_level,
-                                           bool iw, bool ir)
- {
--    struct amd_iommu_pte *table, *pde;
-+    union amd_iommu_pte *table, *pde;
-     unsigned int flush_flags;
- 
-     table = map_domain_page(_mfn(pt_mfn));
-@@ -178,7 +178,7 @@ void iommu_dte_set_guest_cr3(struct amd_
- static int iommu_pde_from_dfn(struct domain *d, unsigned long dfn,
-                               unsigned long pt_mfn[], bool map)
- {
--    struct amd_iommu_pte *pde, *next_table_vaddr;
-+    union amd_iommu_pte *pde, *next_table_vaddr;
-     unsigned long  next_table_mfn;
-     unsigned int level;
-     struct page_info *table;
-@@ -458,7 +458,7 @@ int __init amd_iommu_quarantine_init(str
-     unsigned long end_gfn =
-         1ul << (DEFAULT_DOMAIN_ADDRESS_WIDTH - PAGE_SHIFT);
-     unsigned int level = amd_iommu_get_paging_mode(end_gfn);
--    struct amd_iommu_pte *table;
-+    union amd_iommu_pte *table;
- 
-     if ( hd->arch.root_table )
-     {
-@@ -489,7 +489,7 @@ int __init amd_iommu_quarantine_init(str
- 
-         for ( i = 0; i < PTE_PER_TABLE_SIZE; i++ )
-         {
--            struct amd_iommu_pte *pde = &table[i];
-+            union amd_iommu_pte *pde = &table[i];
- 
-             /*
-              * PDEs are essentially a subset of PTEs, so this function
---- a/xen/drivers/passthrough/amd/pci_amd_iommu.c
-+++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c
-@@ -390,7 +390,7 @@ static void deallocate_next_page_table(s
- 
- static void deallocate_page_table(struct page_info *pg)
- {
--    struct amd_iommu_pte *table_vaddr;
-+    union amd_iommu_pte *table_vaddr;
-     unsigned int index, level = PFN_ORDER(pg);
- 
-     PFN_ORDER(pg) = 0;
-@@ -405,7 +405,7 @@ static void deallocate_page_table(struct
- 
-     for ( index = 0; index < PTE_PER_TABLE_SIZE; index++ )
-     {
--        struct amd_iommu_pte *pde = &table_vaddr[index];
-+        union amd_iommu_pte *pde = &table_vaddr[index];
- 
-         if ( pde->mfn && pde->next_level && pde->pr )
-         {
-@@ -557,7 +557,7 @@ static void amd_dump_p2m_table_level(str
-                                      paddr_t gpa, int indent)
- {
-     paddr_t address;
--    struct amd_iommu_pte *table_vaddr;
-+    const union amd_iommu_pte *table_vaddr;
-     int index;
- 
-     if ( level < 1 )
-@@ -573,7 +573,7 @@ static void amd_dump_p2m_table_level(str
- 
-     for ( index = 0; index < PTE_PER_TABLE_SIZE; index++ )
-     {
--        struct amd_iommu_pte *pde = &table_vaddr[index];
-+        const union amd_iommu_pte *pde = &table_vaddr[index];
- 
-         if ( !(index % 2) )
-             process_pending_softirqs();
---- a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h
-+++ b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h
-@@ -465,20 +465,23 @@ union amd_iommu_x2apic_control {
- #define IOMMU_PAGE_TABLE_U32_PER_ENTRY	(IOMMU_PAGE_TABLE_ENTRY_SIZE / 4)
- #define IOMMU_PAGE_TABLE_ALIGNMENT	4096
- 
--struct amd_iommu_pte {
--    uint64_t pr:1;
--    uint64_t ignored0:4;
--    uint64_t a:1;
--    uint64_t d:1;
--    uint64_t ignored1:2;
--    uint64_t next_level:3;
--    uint64_t mfn:40;
--    uint64_t reserved:7;
--    uint64_t u:1;
--    uint64_t fc:1;
--    uint64_t ir:1;
--    uint64_t iw:1;
--    uint64_t ignored2:1;
-+union amd_iommu_pte {
-+    uint64_t raw;
-+    struct {
-+        bool pr:1;
-+        unsigned int ign0:4;
-+        bool a:1;
-+        bool d:1;
-+        unsigned int ign1:2;
-+        unsigned int next_level:3;
-+        uint64_t mfn:40;
-+        unsigned int :7;
-+        bool u:1;
-+        bool fc:1;
-+        bool ir:1;
-+        bool iw:1;
-+        unsigned int ign2:1;
-+    };
- };
- 
- /* Paging modes */
diff --git a/system/xen/xsa/xsa347-4.13-2.patch b/system/xen/xsa/xsa347-4.13-2.patch
deleted file mode 100644
index fbe7461636..0000000000
--- a/system/xen/xsa/xsa347-4.13-2.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: AMD/IOMMU: update live PTEs atomically
-
-Updating a live PTE bitfield by bitfield risks the compiler re-ordering
-the individual updates as well as splitting individual updates into
-multiple memory writes. Construct the new entry fully in a local
-variable, do the check to determine the flushing needs on the thus
-established new entry, and then write the new entry by a single insn.
-
-Similarly using memset() to clear a PTE is unsafe, as the order of
-writes the function does is, at least in principle, undefined.
-
-This is part of XSA-347.
-
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Paul Durrant <paul@xen.org>
-
---- a/xen/drivers/passthrough/amd/iommu_map.c
-+++ b/xen/drivers/passthrough/amd/iommu_map.c
-@@ -45,7 +45,7 @@ static unsigned int clear_iommu_pte_pres
-     pte = &table[pfn_to_pde_idx(dfn, 1)];
- 
-     flush_flags = pte->pr ? IOMMU_FLUSHF_modified : 0;
--    memset(pte, 0, sizeof(*pte));
-+    write_atomic(&pte->raw, 0);
- 
-     unmap_domain_page(table);
- 
-@@ -57,26 +57,30 @@ static unsigned int set_iommu_pde_presen
-                                           unsigned int next_level, bool iw,
-                                           bool ir)
- {
-+    union amd_iommu_pte new = {}, old;
-     unsigned int flush_flags = IOMMU_FLUSHF_added;
- 
--    if ( pte->pr &&
--         (pte->mfn != next_mfn ||
--          pte->iw != iw ||
--          pte->ir != ir ||
--          pte->next_level != next_level) )
--            flush_flags |= IOMMU_FLUSHF_modified;
--
-     /*
-      * FC bit should be enabled in PTE, this helps to solve potential
-      * issues with ATS devices
-      */
--    pte->fc = !next_level;
-+    new.fc = !next_level;
-+
-+    new.mfn = next_mfn;
-+    new.iw = iw;
-+    new.ir = ir;
-+    new.next_level = next_level;
-+    new.pr = true;
-+
-+    old.raw = read_atomic(&pte->raw);
-+    old.ign0 = 0;
-+    old.ign1 = 0;
-+    old.ign2 = 0;
-+
-+    if ( old.pr && old.raw != new.raw )
-+        flush_flags |= IOMMU_FLUSHF_modified;
- 
--    pte->mfn = next_mfn;
--    pte->iw = iw;
--    pte->ir = ir;
--    pte->next_level = next_level;
--    pte->pr = 1;
-+    write_atomic(&pte->raw, new.raw);
- 
-     return flush_flags;
- }
diff --git a/system/xen/xsa/xsa347-4.13-3.patch b/system/xen/xsa/xsa347-4.13-3.patch
deleted file mode 100644
index 90c8e66020..0000000000
--- a/system/xen/xsa/xsa347-4.13-3.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: AMD/IOMMU: ensure suitable ordering of DTE modifications
-
-DMA and interrupt translation should be enabled only after other
-applicable DTE fields have been written. Similarly when disabling
-translation or when moving a device between domains, translation should
-first be disabled, before other entry fields get modified. Note however
-that the "moving" aspect doesn't apply to the interrupt remapping side,
-as domain specifics are maintained in the IRTEs here, not the DTE. We
-also never disable interrupt remapping once it got enabled for a device
-(the respective argument passed is always the immutable iommu_intremap).
-
-This is part of XSA-347.
-
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Paul Durrant <paul@xen.org>
-
---- a/xen/drivers/passthrough/amd/iommu_map.c
-+++ b/xen/drivers/passthrough/amd/iommu_map.c
-@@ -107,11 +107,18 @@ void amd_iommu_set_root_page_table(struc
-                                    uint64_t root_ptr, uint16_t domain_id,
-                                    uint8_t paging_mode, bool valid)
- {
-+    if ( valid || dte->v )
-+    {
-+        dte->tv = false;
-+        dte->v = true;
-+        smp_wmb();
-+    }
-     dte->domain_id = domain_id;
-     dte->pt_root = paddr_to_pfn(root_ptr);
-     dte->iw = true;
-     dte->ir = true;
-     dte->paging_mode = paging_mode;
-+    smp_wmb();
-     dte->tv = true;
-     dte->v = valid;
- }
-@@ -134,6 +141,7 @@ void amd_iommu_set_intremap_table(
-     }
- 
-     dte->ig = false; /* unmapped interrupts result in i/o page faults */
-+    smp_wmb();
-     dte->iv = valid;
- }
- 
---- a/xen/drivers/passthrough/amd/pci_amd_iommu.c
-+++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c
-@@ -120,7 +120,10 @@ static void amd_iommu_setup_domain_devic
-         /* Undo what amd_iommu_disable_domain_device() may have done. */
-         ivrs_dev = &get_ivrs_mappings(iommu->seg)[req_id];
-         if ( dte->it_root )
-+        {
-             dte->int_ctl = IOMMU_DEV_TABLE_INT_CONTROL_TRANSLATED;
-+            smp_wmb();
-+        }
-         dte->iv = iommu_intremap;
-         dte->ex = ivrs_dev->dte_allow_exclusion;
-         dte->sys_mgt = MASK_EXTR(ivrs_dev->device_flags, ACPI_IVHD_SYSTEM_MGMT);
diff --git a/system/xf86-video-qxl/libdrm.patch b/system/xf86-video-qxl/libdrm.patch
new file mode 100644
index 0000000000..8e95dd77ac
--- /dev/null
+++ b/system/xf86-video-qxl/libdrm.patch
@@ -0,0 +1,25 @@
+From: Matteo Bernardini <ponce@slackbuilds.org>
+Subject: Change header inclusion order to avoid xorg headers catching stdbool.h
+
+libdrm commit e641e2a632d779f638ac2ba983b9fceb20b3fac4 added
+stdbool.h to the library headers which conflicts with xorg headers.
+
+diff -Naur xf86-video-qxl-0.1.5.orig/src/qxl_drmmode.c xf86-video-qxl-0.1.5/src/qxl_drmmode.c
+--- xf86-video-qxl-0.1.5.orig/src/qxl_drmmode.c	2015-03-30 16:58:56.000000000 +0200
++++ xf86-video-qxl-0.1.5/src/qxl_drmmode.c	2022-02-10 08:59:13.221017000 +0100
+@@ -33,7 +33,6 @@
+ #ifdef XF86DRM_MODE
+ 
+ #include <sys/ioctl.h>
+-#include "qxl_drmmode.h"
+ #include "X11/Xatom.h"
+ #include "xf86DDC.h"
+ /* DPMS */
+@@ -47,6 +46,7 @@
+ 
+ #include "qxl.h"
+ #include "qxl_surface.h"
++#include "qxl_drmmode.h"
+ 
+ static void drmmode_show_cursor (xf86CrtcPtr crtc);
+ 
diff --git a/system/xf86-video-qxl/xf86-video-qxl.SlackBuild b/system/xf86-video-qxl/xf86-video-qxl.SlackBuild
index ab6853360f..c7d3cbc47f 100644
--- a/system/xf86-video-qxl/xf86-video-qxl.SlackBuild
+++ b/system/xf86-video-qxl/xf86-video-qxl.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xf86-video-qxl
-# Copyright 2012-2017 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2012-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,26 +21,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xf86-video-qxl
-VERSION=${VERSION:-0.1.5}
+VERSION=${VERSION:-0.1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,10 +79,12 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+patch -p1 < $CWD/libdrm.patch
 
 # autogen.sh can be used in place of configure
 CFLAGS="$SLKCFLAGS" \
@@ -114,4 +126,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xf86-video-qxl/xf86-video-qxl.info b/system/xf86-video-qxl/xf86-video-qxl.info
index 31dbe6b3cc..d88bb1142f 100644
--- a/system/xf86-video-qxl/xf86-video-qxl.info
+++ b/system/xf86-video-qxl/xf86-video-qxl.info
@@ -1,8 +1,8 @@
 PRGNAM="xf86-video-qxl"
-VERSION="0.1.5"
+VERSION="0.1.6"
 HOMEPAGE="https://www.spice-space.org"
-DOWNLOAD="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-qxl-0.1.5.tar.bz2"
-MD5SUM="addb686fce597a452eecd8d8f9fddf15"
+DOWNLOAD="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-qxl-0.1.6.tar.xz"
+MD5SUM="5d3a4ac0f6b21d62ff4e308717ff239f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="spice-protocol"
diff --git a/system/xfburn/doinst.sh b/system/xfburn/doinst.sh
index 4a25de5e6f..65c7e2eeb9 100644
--- a/system/xfburn/doinst.sh
+++ b/system/xfburn/doinst.sh
@@ -7,4 +7,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
-
diff --git a/system/xfburn/slack-desc b/system/xfburn/slack-desc
index bfaaba2f50..a609926e81 100644
--- a/system/xfburn/slack-desc
+++ b/system/xfburn/slack-desc
@@ -13,7 +13,7 @@ xfburn: libraries. It can blank CD-RWs, burn and create iso images,
 xfburn: as well as burn personal compositions of data to either
 xfburn: CD or DVD.
 xfburn:
-xfburn: Homepage: http://www.xfce.org/projects/xfburn/
+xfburn: Homepage: https://docs.xfce.org/apps/xfburn/start
 xfburn:
 xfburn:
 xfburn:
diff --git a/system/xfburn/xfburn.SlackBuild b/system/xfburn/xfburn.SlackBuild
index d90ff00729..65fddd16be 100644
--- a/system/xfburn/xfburn.SlackBuild
+++ b/system/xfburn/xfburn.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xfburn
 
 # Copyright 2008-2012 Robby Workman, Northport, Alabama, USA
-# Copyright 2014-2017 Aaditya Bagga <aaditya_gnulinux@zoho.com>
+# Copyright 2014-2023 Aaditya <aaditya_gnulinux@zoho.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xfburn
-VERSION=${VERSION:-0.5.5}
+VERSION=${VERSION:-0.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -94,7 +104,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+  AUTHORS COPYING NEWS README.md \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -103,4 +113,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xfburn/xfburn.info b/system/xfburn/xfburn.info
index dc50a7af53..6e130b8e2c 100644
--- a/system/xfburn/xfburn.info
+++ b/system/xfburn/xfburn.info
@@ -1,10 +1,10 @@
 PRGNAM="xfburn"
-VERSION="0.5.5"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfburn"
-DOWNLOAD="https://archive.xfce.org/src/apps/xfburn/0.5/xfburn-0.5.5.tar.bz2"
-MD5SUM="818181480321b382b9943e886bcdfda5"
+VERSION="0.7.0"
+HOMEPAGE="https://docs.xfce.org/apps/xfburn/start"
+DOWNLOAD="https://archive.xfce.org/src/apps/xfburn/0.7/xfburn-0.7.0.tar.bz2"
+MD5SUM="38d1e73e53c0fc4bb1bd286df1d91839"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libburn libisofs"
-MAINTAINER="Aaditya Bagga"
+REQUIRES="libisofs"
+MAINTAINER="Aaditya"
 EMAIL="aaditya_gnulinux@zoho.com"
diff --git a/system/xfe/xfe.SlackBuild b/system/xfe/xfe.SlackBuild
index 5fcd5c5259..7a96af96e1 100644
--- a/system/xfe/xfe.SlackBuild
+++ b/system/xfe/xfe.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xfe
 
-# Copyright 2006-2017  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2006-2021  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xfe
-VERSION=${VERSION:-1.42}
+VERSION=${VERSION:-1.44}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,7 +70,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -102,4 +112,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xfe/xfe.info b/system/xfe/xfe.info
index b717e451ae..bcce245804 100644
--- a/system/xfe/xfe.info
+++ b/system/xfe/xfe.info
@@ -1,8 +1,8 @@
 PRGNAM="xfe"
-VERSION="1.42"
+VERSION="1.44"
 HOMEPAGE="http://roland65.free.fr/xfe/"
-DOWNLOAD="http://downloads.sourceforge.net/xfe/xfe-1.42.tar.gz"
-MD5SUM="34326f185070db02e7419f85f7967cdf"
+DOWNLOAD="https://downloads.sourceforge.net/xfe/xfe-1.44.tar.xz"
+MD5SUM="10849fdb126deafbd0932ea8b1b0a50d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fox-toolkit"
diff --git a/system/xfile/README b/system/xfile/README
new file mode 100644
index 0000000000..1801170c19
--- /dev/null
+++ b/system/xfile/README
@@ -0,0 +1,8 @@
+XFile is a compact file manager for UNIX and alike systems running
+X11. It presents the file system as-is, without imaginary locations,
+trashcans etc.
+
+By default, Xft fonts will be used by copying a bundled resource
+file to enable that into app-defaults. If you wish to use Helvetica
+invoked by XLFD strings, pass DEFAULT_XFT=no variable to the script
+or override the settings in your X11 resource files.
diff --git a/system/xfile/slack-desc b/system/xfile/slack-desc
new file mode 100644
index 0000000000..96845f62ae
--- /dev/null
+++ b/system/xfile/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+xfile: xfile (file manager for UNIX/X11)
+xfile:
+xfile: XFile is a compact file manager for UNIX and alike systems running
+xfile: X11. It presents the file system as-is, without imaginary locations,
+xfile: trashcans etc.
+xfile:
+xfile: Homepage: https://fastestcode.org/xfile.html
+xfile:
+xfile:
+xfile:
+xfile:
diff --git a/system/xfile/xfile.SlackBuild b/system/xfile/xfile.SlackBuild
new file mode 100644
index 0000000000..3014001d66
--- /dev/null
+++ b/system/xfile/xfile.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/bash
+
+# @(#) xfile.SlackBuild 1.2@(#)
+
+# Slackware build script for xfile
+
+# Copyright 2023 pomfland
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=xfile
+VERSION=${VERSION:-1.0beta}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-beta
+tar xvf $CWD/$PRGNAM-src-${VERSION/beta/-beta}.tar.xz
+cd $PRGNAM-beta
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+make CFLAGS="$SLKCFLAGS"
+
+install -Dm755 src/xfile $PKG/usr/bin/xfile
+ln -s /usr/bin/xfile $PKG/usr/bin/xfile-open
+
+install -Dm644 src/default.db $PKG/usr/share/xfile/types/default.db
+
+install -Dm644 src/xfile.1 $PKG/usr/man/man1/xfile.1
+
+for icon in src/icons/*.xpm; do
+  install -Dm644 "$icon" $PKG/usr/share/xfile/icons/$(basename "$icon")
+done
+
+install -Dm644 src/icons/README $PKG/usr/share/xfile/README.icons
+
+install -Dm644 src/xbm/cabinet.xpm $PKG/usr/share/pixmaps/xfile_48x48.xpm
+
+# construe app-defaults file
+mkdir -p $PKG/etc/X11/app-defaults
+if [ ${DEFAULT_XFT:-yes} == "yes" ]; then
+  cat src/res/{prefs,fonts-xft,accels,misc}.ad > $PKG/etc/X11/app-defaults/XFile
+else
+  cat src/res/{prefs,fonts,accels,misc}.ad > $PKG/etc/X11/app-defaults/XFile
+fi
+sed -i $PKG/etc/X11/app-defaults/XFile -e 's/^\*/XFile\*/'
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+if [ $(command -v pigz) ]; then
+  find $PKG/usr/man -type f -exec pigz -11 {} \;
+else
+  find $PKG/usr/man -type f -exec gzip -9 {} \;
+fi
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README COPYING \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xfile/xfile.info b/system/xfile/xfile.info
new file mode 100644
index 0000000000..70c32839c8
--- /dev/null
+++ b/system/xfile/xfile.info
@@ -0,0 +1,10 @@
+PRGNAM="xfile"
+VERSION="1.0beta"
+HOMEPAGE="https://fastestcode.org/xfile.html"
+DOWNLOAD="https://prdownloads.sourceforge.net/xfilemanager/xfile-src-1.0-beta.tar.xz"
+MD5SUM="fe7aeea0d2471e578252df9c9981b4cf"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="%README%"
+MAINTAINER="pomfland"
+EMAIL="pomfland@tfwno.gf"
diff --git a/system/xfsudo/xfsudo.SlackBuild b/system/xfsudo/xfsudo.SlackBuild
index de6335c9d3..2edd73639e 100644
--- a/system/xfsudo/xfsudo.SlackBuild
+++ b/system/xfsudo/xfsudo.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xfsudo
 
-# Copyright 2013-2015 Aaditya Bagga <aaditya_gnulinux@zoho.com>
+# Copyright 2013-2015 Aaditya <aaditya_gnulinux@zoho.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xfsudo
 VERSION=${VERSION:-0.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,4 +75,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xfsudo/xfsudo.info b/system/xfsudo/xfsudo.info
index fbb62ba576..deead1b2f2 100644
--- a/system/xfsudo/xfsudo.info
+++ b/system/xfsudo/xfsudo.info
@@ -1,10 +1,10 @@
 PRGNAM="xfsudo"
 VERSION="0.7.1"
-HOMEPAGE="https://github.com/aadityabagga/xfsudo"
-DOWNLOAD="https://github.com/aadityabagga/xfsudo/archive/0.7.1.tar.gz"
+HOMEPAGE="https://github.com/abchk1234/xfsudo"
+DOWNLOAD="https://github.com/abchk1234/xfsudo/archive/0.7.1.tar.gz"
 MD5SUM="8dc33b7c397593505ebfa16ab9fa8382"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="zenity"
-MAINTAINER="Aaditya Bagga"
+MAINTAINER="Aaditya"
 EMAIL="aaditya_gnulinux@zoho.com"
diff --git a/system/xiccd/README b/system/xiccd/README
new file mode 100644
index 0000000000..d9456eca04
--- /dev/null
+++ b/system/xiccd/README
@@ -0,0 +1,21 @@
+xiccd
+
+xiccd is a simple bridge between colord and X. It does the following
+tasks:
+
+ * Enumerates displays and register them in colord;
+ * Creates default ICC profiles based on EDID data;
+ * Applies ICC profiles provided by colord;
+ * Maintains user's private ICC storage directory.
+
+It does basically the same as gnome-settings-daemon color plugin or
+colord-kde but does not depend on any particular desktop. It even
+doesn't depend on GTK so it doesn't create useless GTK3 dependency if
+the desktop environment is GTK2-based or vice versa. The primary goal of
+xiccd is providing color profile support for desktop environments other
+than Gnome and KDE (Xfce, LXDE and probably others) that do not support
+native color management yet. It is however not meant to be excuse of not
+adding native color management to the session daemons of them.
+
+xiccd is distributed under the terms of GNU General Public License
+version 3 or later.
diff --git a/system/xiccd/slack-desc b/system/xiccd/slack-desc
new file mode 100644
index 0000000000..718724ec7c
--- /dev/null
+++ b/system/xiccd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+xiccd: xiccd (xiccdxiccd is a simple bridge between colord and X.)
+xiccd:
+xiccd: xiccd is a simple bridge between colord and X.
+xiccd: It does the following tasks:
+xiccd: * Enumerates displays and register them in colord;
+xiccd: * Creates default ICC profiles based on EDID data;
+xiccd: * Applies ICC profiles provided by colord;
+xiccd: * Maintains user's private ICC storage directory.
+xiccd: It does basically the same as colord-kde
+xiccd:
+xiccd:
diff --git a/system/xiccd/xiccd.SlackBuild b/system/xiccd/xiccd.SlackBuild
new file mode 100644
index 0000000000..1bea39bd94
--- /dev/null
+++ b/system/xiccd/xiccd.SlackBuild
@@ -0,0 +1,98 @@
+#!/bin/bash
+# Slackware build script for xiccd
+# Copyright 2023 Lockywolf
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+PRGNAM=xiccd
+VERSION=${VERSION:-0.3.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+TMP=${TMP:-/tmp/SBo}	
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}	
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+set -e 
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf "$PRGNAM"-"$VERSION"
+tar xvf $CWD/"$PRGNAM"-"$VERSION".*
+cd "$PRGNAM"-"$VERSION"
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+autoreconf -i
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+   README AUTHORS COPYING ChangeLog NEWS \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xiccd/xiccd.info b/system/xiccd/xiccd.info
new file mode 100644
index 0000000000..cca21ae165
--- /dev/null
+++ b/system/xiccd/xiccd.info
@@ -0,0 +1,10 @@
+PRGNAM="xiccd"
+VERSION="0.3.0"
+HOMEPAGE="https://github.com/agalakhov/xiccd"
+DOWNLOAD="https://github.com/agalakhov/xiccd/archive/v0.3.0/xiccd-0.3.0.tar.gz"
+MD5SUM="87a22a231c807566a250c3065073e737"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="colord"
+MAINTAINER="Lockywolf"
+EMAIL="for_sbo-xiccd_2023-05-08@lockywolf.net"
diff --git a/system/xidel/xidel.SlackBuild b/system/xidel/xidel.SlackBuild
index a13c4c6979..3a52b9cee5 100644
--- a/system/xidel/xidel.SlackBuild
+++ b/system/xidel/xidel.SlackBuild
@@ -1,15 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xidel
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20221229 bkw: BUILD=2, sbopkglint
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xidel
 VERSION=${VERSION:-0.9.8}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +24,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -51,6 +60,9 @@ cp -a $PRGNAM $PKG/usr/bin
 mkdir -p $PKG/usr/man/man1
 gzip -9c < meta/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
+# Uhhh. Empty file, useless... though I like the name :)
+rm -f examples/site-generator/buildtemp/tardis
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README* COPYING changelog examples $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -59,4 +71,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xidel/xidel.info b/system/xidel/xidel.info
index b07650eb41..35cad80bd3 100644
--- a/system/xidel/xidel.info
+++ b/system/xidel/xidel.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fpc"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/xinput_calibrator/xinput_calibrator.SlackBuild b/system/xinput_calibrator/xinput_calibrator.SlackBuild
index 776db0b275..d0cf0e5950 100644
--- a/system/xinput_calibrator/xinput_calibrator.SlackBuild
+++ b/system/xinput_calibrator/xinput_calibrator.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xinput_calibrator
 # Copyright 2010  V'yacheslav Stetskevych <slava18@gmail.com>
@@ -21,26 +21,35 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220209 bkw: Modified by SlackBuilds.org
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xinput_calibrator
 VERSION=${VERSION:-0.7.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -55,11 +64,18 @@ fi
 
 set -e
 
+# 20220209 bkw: wget saves the file with gobbledegook in the name (CGI params).
+TARBALL=$CWD/$PRGNAM-$VERSION.tar.gz
+if [ ! -e "$TARBALL" ]; then
+  T="$( /bin/ls $CWD/$PRGNAM-$VERSION.tar.gz\?* 2>/dev/null | head -1 )"
+  [ -n "$T" ] && TARBALL="$T"
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $TARBALL
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -98,4 +114,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xjobs/README b/system/xjobs/README
index cc7ceb6124..f6fb6be14a 100644
--- a/system/xjobs/README
+++ b/system/xjobs/README
@@ -1,14 +1,15 @@
-xjobs reads job descriptions line by line and executes them in parallel. It
-limits the number of parallel executing jobs and starts new jobs when jobs
-finish. Therefore, it combines the arguments from every input line with the
-utility and arguments given on the command line. If no utility is given as
-an argument to xjobs, then the first argument on every job line will be used
-as utility. To execute utility xjobs searches the directories given in the
-PATH environment variable and uses the first file found in these directories.
+xjobs reads job descriptions line by line and executes them in
+parallel. It limits the number of parallel executing jobs and starts
+new jobs when jobs finish. Therefore, it combines the arguments from
+every input line with the utility and arguments given on the command
+line. If no utility is given as an argument to xjobs, then the first
+argument on every job line will be used as utility. To execute utility
+xjobs searches the directories given in the PATH environment variable
+and uses the first file found in these directories.
 
-xjobs is most useful on multiprocessor machines when one needs to execute
-several time consuming commands that could possibly be run in parallel. With
-xjobs this can be achieved easily, and it is possible to limit the load of
-the machine to a useful value. It works similar to xargs, but starts several
-processes simultaneously and gives only one line of arguments to each utility
-call.
+xjobs is most useful on multiprocessor machines when one needs to
+execute several time consuming commands that could possibly be run in
+parallel. With xjobs this can be achieved easily, and it is possible
+to limit the load of the machine to a useful value. It works similar
+to xargs, but starts several processes simultaneously and gives only
+one line of arguments to each utility call.
diff --git a/system/xjobs/xjobs.SlackBuild b/system/xjobs/xjobs.SlackBuild
index 9979c6fe70..6f9a025964 100644
--- a/system/xjobs/xjobs.SlackBuild
+++ b/system/xjobs/xjobs.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xjobs
 
-# Copyright 2009-2017  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009-2022  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,26 +22,36 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xjobs
-VERSION=${VERSION:-20170630}
+VERSION=${VERSION:-20200726}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -80,4 +90,4 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xjobs/xjobs.info b/system/xjobs/xjobs.info
index b2d857ada1..7c6f819691 100644
--- a/system/xjobs/xjobs.info
+++ b/system/xjobs/xjobs.info
@@ -1,8 +1,8 @@
 PRGNAM="xjobs"
-VERSION="20170630"
+VERSION="20200726"
 HOMEPAGE="http://www.maier-komor.de/xjobs.html"
-DOWNLOAD="http://www.maier-komor.de/xjobs/xjobs-20170630.tgz"
-MD5SUM="aaca070b3fe965e1fc3a893dd64df73a"
+DOWNLOAD="http://www.maier-komor.de/xjobs/xjobs-20200726.tgz"
+MD5SUM="459b5991cf7dce1e6178fc0376bd0d28"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/xldconfig/README b/system/xldconfig/README
index d15fd43542..afa85f5ac2 100644
--- a/system/xldconfig/README
+++ b/system/xldconfig/README
@@ -1,4 +1,7 @@
-Xldconfig is a tool suplying ldconfig on non native architectures.
-It makes symlinks by the same way as the ldconfig do. It does not
-create or recreate the cache /etc/ld.so.cache.
+xldconfig (cross arch ldconfig)
+
+Xldconfig is a tool suplying ldconfig on non-native architectures.
+It makes symlinks in the same way as ldconfig does. It does not create
+or recreate the cache /etc/ld.so.cache.
+
 It is useful for cross arch system installations.
diff --git a/system/xldconfig/slack-desc b/system/xldconfig/slack-desc
index 43b0e5f8d2..6e0999cc73 100644
--- a/system/xldconfig/slack-desc
+++ b/system/xldconfig/slack-desc
@@ -8,11 +8,11 @@
          |-----handy-ruler------------------------------------------------------|
 xldconfig: xldconfig (cross arch ldconfig)
 xldconfig:
-xldconfig: Xldconfig is a tool suplying ldconfig on non native architectures.
-xldconfig: It makes symlinks by the same way as the ldconfig do. It does not
-xldconfig: create or recreate the cache /etc/ld.so.cache.
-xldconfig: It is usefuf for cross arch system installations.
+xldconfig: Xldconfig is a tool suplying ldconfig on non-native architectures.
+xldconfig: It makes symlinks in the same way as ldconfig does. It does not create
+xldconfig: or recreate the cache /etc/ld.so.cache.
 xldconfig:
+xldconfig: It is useful for cross arch system installations.
 xldconfig:
 xldconfig:
 xldconfig:
diff --git a/system/xldconfig/xldconfig.SlackBuild b/system/xldconfig/xldconfig.SlackBuild
index 519b8c7747..b04694fc94 100644
--- a/system/xldconfig/xldconfig.SlackBuild
+++ b/system/xldconfig/xldconfig.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xldconfig
 
@@ -22,11 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220208 bkw: Modified by SlackBuilds.org, to fix the download URL
+# and some grammar issues in README and slack-desc.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xldconfig
 VERSION=${VERSION:-0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -103,4 +115,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xldconfig/xldconfig.info b/system/xldconfig/xldconfig.info
index 3524de9603..7f1e61cc42 100644
--- a/system/xldconfig/xldconfig.info
+++ b/system/xldconfig/xldconfig.info
@@ -1,7 +1,7 @@
 PRGNAM="xldconfig"
 VERSION="0.7"
 HOMEPAGE="https://www.jagda.eu/linux/xldxonfig"
-DOWNLOAD="https://www.jagda.eu/linux/xldxonfig/xldconfig-0.7.tgz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/xldconfig-0.7.tgz"
 MD5SUM="49693d184e56714c4fb474a99bb2e3ba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/xnp2/gcc6.patch b/system/xnp2/gcc6.patch
new file mode 100644
index 0000000000..6265959666
--- /dev/null
+++ b/system/xnp2/gcc6.patch
@@ -0,0 +1,17 @@
+--- xnp2-0.86/x11/compiler.h.old        2016-03-08 18:25:50.000000000 +0100
++++ xnp2-0.86/x11/compiler.h    2016-07-05 23:48:04.507937827 +0200
+@@ -117,12 +117,14 @@
+ #define	MAX_PATH	MAXPATHLEN
+ #endif
+
++#ifndef __cplusplus
+ #ifndef	max
+ #define	max(a,b)	(((a) > (b)) ? (a) : (b))
+ #endif
+ #ifndef	min
+ #define	min(a,b)	(((a) < (b)) ? (a) : (b))
+ #endif
++#endif /* __cplusplus */
+
+ #ifndef        ZeroMemory
+ #define        ZeroMemory(d,n)         memset((d), 0, (n))
diff --git a/system/xnp2/xnp2.SlackBuild b/system/xnp2/xnp2.SlackBuild
index bbd8e9d826..7f8cd3607b 100644
--- a/system/xnp2/xnp2.SlackBuild
+++ b/system/xnp2/xnp2.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xnp2
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xnp2
 VERSION=${VERSION:-0.86}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,6 +79,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Thanks to the archlinux folks!
+patch -p2 < $CWD/gcc6.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -98,4 +111,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xonsh/README b/system/xonsh/README
index 8c0180ed05..ed54686f94 100644
--- a/system/xonsh/README
+++ b/system/xonsh/README
@@ -3,7 +3,4 @@ and command prompt. The language is a superset of Python 3.4
 with additional shell primitives. xonsh (pronounced conch) 
 is meant for the daily use of experts and novices alike.
 
-Optional dependencies: setproctitle, Pygments, prompt_toolkiti, python-distro
-
-NOTE:
-Please install python3 first before installing all other requirements.
+Optional dependencies: setproctitle, prompt_toolkiti
diff --git a/system/xonsh/v310.patch b/system/xonsh/v310.patch
new file mode 100644
index 0000000000..836124714e
--- /dev/null
+++ b/system/xonsh/v310.patch
@@ -0,0 +1,432 @@
+--- xonsh-0.14.4/xonsh/parsers/v310.orig.py	2024-01-18 17:58:44.463700213 +0200
++++ xonsh-0.14.4/xonsh/parsers/v310.py	2024-01-18 19:03:33.985074856 +0200
+@@ -76,26 +76,24 @@
+         """
+ 
+         loc = self.get_line_cols(p, 1)
+-        match list(p):
+-            case [_, _, pattern, _, suite]:
+-                p[0] = ast.match_case(pattern=pattern, body=suite, **loc)
+-            case [_, _, pattern, _, guard, _, suite]:
+-                p[0] = ast.match_case(pattern=pattern, body=suite, guard=guard, **loc)
+-            case _:
+-                raise AssertionError()
++        if list(p) == [_, _, pattern, _, suite]:
++            p[0] = ast.match_case(pattern=pattern, body=suite, **loc)
++        elif list(p) == [_, _, pattern, _, guard, _, suite]:
++            p[0] = ast.match_case(pattern=pattern, body=suite, guard=guard, **loc)
++        else:
++            raise AssertionError()
+ 
+     def p_case_block_list_nonempty(self, p):
+         """
+         case_block_list_nonempty : case_block
+                                  | case_block case_block_list_nonempty
+         """
+-        match list(p):
+-            case [_, case_block]:
+-                p[0] = [case_block]
+-            case [_, case_block, case_block_list_nonempty]:
+-                p[0] = [case_block] + case_block_list_nonempty
+-            case _:
+-                raise AssertionError()
++        if list(p) == [_, case_block]:
++            p[0] = [case_block]
++        elif list(p) == [_, case_block, case_block_list_nonempty]:
++            p[0] = [case_block] + case_block_list_nonempty
++        else:
++            raise AssertionError()
+ 
+     # subject expression
+     def p_subject_expr_single_value(self, p):
+@@ -103,33 +101,31 @@
+         subject_expr : test_or_star_expr comma_opt
+         """
+ 
+-        match list(p):
+-            case [_, test_or_star_expr, None]:
+-                # single value
+-                p[0] = test_or_star_expr
+-            case [_, test_or_star_expr, ","]:
+-                # tuple with one element
+-                p[0] = ast.Tuple(
+-                    elts=[test_or_star_expr], ctx=ast.Load(), **self.get_line_cols(p, 1)
+-                )
+-            case _:
+-                raise AssertionError()
++        if list(p) == [_, test_or_star_expr, None]:
++            # single value
++            p[0] = test_or_star_expr
++        elif list(p) == [_, test_or_star_expr, ","]:
++            # tuple with one element
++            p[0] = ast.Tuple(
++                elts=[test_or_star_expr], ctx=ast.Load(), **self.get_line_cols(p, 1)
++            )
++        else:
++            raise AssertionError()
+ 
+     def p_subject_expr_multiple_values(self, p):
+         """
+         subject_expr : test_or_star_expr comma_test_or_star_expr_list comma_opt
+         """
+ 
+-        match list(p):
+-            case [_, test_or_star_expr, comma_test_or_star_expr_list, "," | None]:
+-                # tuple with more than one element
+-                p[0] = ast.Tuple(
+-                    elts=[test_or_star_expr] + comma_test_or_star_expr_list,
+-                    ctx=ast.Load(),
+-                    **self.get_line_cols(p, 1),
+-                )
+-            case _:
+-                raise AssertionError()
++        if list(p) == [_, test_or_star_expr, comma_test_or_star_expr_list, "," | None]:
++            # tuple with more than one element
++            p[0] = ast.Tuple(
++                elts=[test_or_star_expr] + comma_test_or_star_expr_list,
++                ctx=ast.Load(),
++                **self.get_line_cols(p, 1),
++            )
++        else:
++            raise AssertionError()
+ 
+     # patterns
+     def p_closed_pattern(self, p):
+@@ -167,22 +163,20 @@
+ 
+         _, or_pattern_list = p
+ 
+-        match or_pattern_list:
+-            case [single_value]:
+-                p[0] = single_value
+-            case multiple_values:
+-                p[0] = ast.MatchOr(patterns=multiple_values, **self.get_line_cols(p, 1))
++        if or_pattern_list == [single_value]:
++            p[0] = single_value
++        elif or_pattern_list == multiple_values:
++            p[0] = ast.MatchOr(patterns=multiple_values, **self.get_line_cols(p, 1))
+ 
+     def p_or_pattern_list(self, p):
+         """
+         or_pattern_list : closed_pattern
+                         | closed_pattern PIPE or_pattern_list
+         """
+-        match list(p):
+-            case [_, closed_pattern]:
+-                p[0] = [closed_pattern]
+-            case [_, closed_pattern, "|", or_pattern_list]:
+-                p[0] = [closed_pattern] + or_pattern_list
++        if list(p) == [_, closed_pattern]:
++            p[0] = [closed_pattern]
++        elif list(p) == [_, closed_pattern, "|", or_pattern_list]:
++            p[0] = [closed_pattern] + or_pattern_list
+ 
+     # group pattern
+     def p_group_pattern(self, p):
+@@ -198,11 +192,10 @@
+         literal_pattern : literal_expr
+         """
+ 
+-        match p[1]:
+-            case None | True | False:
+-                p[0] = ast.MatchSingleton(value=p[1], **self.get_line_cols(p, 1))
+-            case _:
+-                p[0] = ast.MatchValue(value=p[1], **self.get_line_cols(p, 1))
++        if p[1] == None | True | False:
++            p[0] = ast.MatchSingleton(value=p[1], **self.get_line_cols(p, 1))
++        else:
++            p[0] = ast.MatchValue(value=p[1], **self.get_line_cols(p, 1))
+ 
+     def p_literal_expr_number_or_string_literal_list(self, p):
+         """
+@@ -212,11 +205,10 @@
+ 
+         p[0] = p[1]
+ 
+-        match p[1]:
+-            case ast.JoinedStr():
+-                raise AssertionError("patterns may not match formatted string literals")
+-                # TODO: raise SyntaxError instead
+-                # (doing so currently somehow causes an IndexError in tools.py:get_logical_line)
++        if p[1] == ast.JoinedStr():
++            raise AssertionError("patterns may not match formatted string literals")
++            # TODO: raise SyntaxError instead
++            # (doing so currently somehow causes an IndexError in tools.py:get_logical_line)
+ 
+         # TODO: f"hi" "hi" does not parse in xonsh
+ 
+@@ -227,15 +219,14 @@
+                      | false_tok
+         """
+ 
+-        match p[1].value:
+-            case "None":
+-                value = None
+-            case "True":
+-                value = True
+-            case "False":
+-                value = False
+-            case _:
+-                raise AssertionError()
++        if p[1].value == "None":
++            value = None
++        elif "True":
++            value = True
++        elif "False":
++            value = False
++        else:
++            raise AssertionError()
+ 
+         p[0] = value
+ 
+@@ -253,19 +244,18 @@
+         build_complex = False
+         loc = self.get_line_cols(p, 1)
+ 
+-        match list(p):
+-            case [_, x]:
+-                p[0] = x
+-            case [_, "-", x]:
+-                p[0] = ast.UnaryOp(op=ast.USub(), operand=x, **loc)
+-            case [_, left, ("+" | "-") as op_char, right]:
+-                build_complex = True
+-                negate_left_side = False
+-            case [_, "-", left, ("+" | "-") as op_char, right]:
+-                build_complex = True
+-                negate_left_side = True
+-            case _:
+-                raise AssertionError()
++        if list(p) == [_, x]:
++            p[0] = x
++        elif list(p) == [_, "-", x]:
++            p[0] = ast.UnaryOp(op=ast.USub(), operand=x, **loc)
++        elif list(p) == [_, left, ("+",  op_char) | ("-", op_char), right]:
++            build_complex = True
++            negate_left_side = False
++        elif list(p) == [_, "-", left, ("+",  op_char) | ("-", op_char), right]:
++            build_complex = True
++            negate_left_side = True
++        else:
++            raise AssertionError()
+ 
+         if build_complex:
+             # TODO raise syntax error instead (see reason in p_literal_expr_number_or_string_literal_list)
+@@ -322,17 +312,16 @@
+                          | LPAREN RPAREN
+         """
+ 
+-        match list(p):
+-            case [_, _, ast.MatchSequence() as seq, _]:
+-                p[0] = seq
+-            case [_, _, single_item, _]:
+-                p[0] = ast.MatchSequence(
+-                    patterns=[single_item], **self.get_line_cols(p, 1)
+-                )
+-            case [_, _, _]:
+-                p[0] = ast.MatchSequence(patterns=[], **self.get_line_cols(p, 1))
+-            case _:
+-                raise AssertionError()
++        if list(p) == [_, _, (ast.MatchSequence(), seq), _]:
++            p[0] = seq
++        elif list(p) == [_, _, single_item, _]:
++            p[0] = ast.MatchSequence(
++                patterns=[single_item], **self.get_line_cols(p, 1)
++            )
++        elif list(p) == [_, _, _]:
++            p[0] = ast.MatchSequence(patterns=[], **self.get_line_cols(p, 1))
++        else:
++            raise AssertionError()
+ 
+     def p_maybe_sequence_pattern(self, p):
+         """
+@@ -340,30 +329,24 @@
+                                | maybe_star_pattern COMMA maybe_sequence_pattern
+         """
+ 
+-        match list(p):
+-            case [_, maybe_star_pattern, ","]:
+-                p[0] = ast.MatchSequence(
+-                    patterns=[maybe_star_pattern], **self.get_line_cols(p, 1)
+-                )
+-            case [_, maybe_star_pattern, None]:
+-                p[0] = maybe_star_pattern
+-            case [
+-                _,
+-                maybe_star_pattern,
+-                ",",
+-                ast.MatchSequence(patterns=list(maybe_sequence_pattern)),
+-            ]:
+-                p[0] = ast.MatchSequence(
+-                    patterns=[maybe_star_pattern] + maybe_sequence_pattern,
+-                    **self.get_line_cols(p, 1),
+-                )
+-            case [_, maybe_star_pattern, ",", maybe_sequence_pattern]:
+-                p[0] = ast.MatchSequence(
+-                    patterns=[maybe_star_pattern, maybe_sequence_pattern],
+-                    **self.get_line_cols(p, 1),
+-                )
+-            case _:
+-                raise AssertionError()
++        if list(p) == [_, maybe_star_pattern, ","]:
++            p[0] = ast.MatchSequence(
++                patterns=[maybe_star_pattern], **self.get_line_cols(p, 1)
++            )
++        elif list(p) == [_, maybe_star_pattern, None]:
++            p[0] = maybe_star_pattern
++        elif list(p) == [_, maybe_star_pattern, ",", ast.MatchSequence(patterns=list(maybe_sequence_pattern)),]:
++            p[0] = ast.MatchSequence(
++                patterns=[maybe_star_pattern] + maybe_sequence_pattern,
++                **self.get_line_cols(p, 1),
++            )
++        elif list(p) == [_, maybe_star_pattern, ",", maybe_sequence_pattern]:
++            p[0] = ast.MatchSequence(
++                patterns=[maybe_star_pattern, maybe_sequence_pattern],
++                **self.get_line_cols(p, 1),
++            )
++        else:
++            raise AssertionError()
+ 
+     def p_open_sequence_pattern(self, p):
+         """
+@@ -429,19 +412,18 @@
+                                             | name_str EQUALS pattern COMMA class_pattern_keyword_part
+         """
+ 
+-        match list(p):
+-            case [_]:
+-                p[0] = ([], [])
+-            case [_, pattern]:
+-                p[0] = ([pattern], [])
+-            case [_, pattern, ",", (names, patterns)]:
+-                p[0] = ([pattern] + names, patterns)
+-            case [_, name, "=", pattern]:
+-                p[0] = ([], [(name, pattern)])
+-            case [_, name, "=", pattern, ",", class_pattern_keyword_part]:
+-                p[0] = ([], [(name, pattern)] + class_pattern_keyword_part)
+-            case _:
+-                raise AssertionError()
++        if list(p) == [_]:
++            p[0] = ([], [])
++        elif list(p) == [_, pattern]:
++            p[0] = ([pattern], [])
++        elif list(p) == [_, pattern, ",", (names, patterns)]:
++            p[0] = ([pattern] + names, patterns)
++        elif list(p) == [_, name, "=", pattern]:
++            p[0] = ([], [(name, pattern)])
++        elif list(p) == [_, name, "=", pattern, ",", class_pattern_keyword_part]:
++            p[0] = ([], [(name, pattern)] + class_pattern_keyword_part)
++        else:
++            raise AssertionError()
+ 
+     # returns ( [pattern], [ (name, pattern) ]  )
+     def p_class_pattern_positional_part_skip(self, p):
+@@ -457,13 +439,12 @@
+                                       | pattern COMMA class_pattern_positional_part
+         """
+ 
+-        match list(p):
+-            case [_, pattern]:
+-                p[0] = ([pattern], [])
+-            case [_, pattern, ",", (names, patterns)]:
+-                p[0] = ([pattern] + names, patterns)
+-            case _:
+-                raise AssertionError()
++        if list(p) == [_, pattern]:
++            p[0] = ([pattern], [])
++        elif list(p) == [_, pattern, ",", (names, patterns)]:
++            p[0] = ([pattern] + names, patterns)
++        else:
++            raise AssertionError()
+ 
+     # returns [ (name, pattern) ]
+     def p_class_pattern_keyword_part(self, p):
+@@ -474,15 +455,14 @@
+                                    | name_str EQUALS pattern COMMA class_pattern_keyword_part
+         """
+ 
+-        match list(p):
+-            case [_] | [_, ","]:
+-                p[0] = []
+-            case [_, name, "=", pattern]:
+-                p[0] = [(name, pattern)]
+-            case [_, name, "=", pattern, ",", class_pattern_keyword_part]:
+-                p[0] = [(name, pattern)] + class_pattern_keyword_part
+-            case _:
+-                raise AssertionError()
++        if list(p) == [_] | [_, ","]:
++            p[0] = []
++        elif list(p) == [_, name, "=", pattern]:
++            p[0] = [(name, pattern)]
++        elif list(p) == [_, name, "=", pattern, ",", class_pattern_keyword_part]:
++            p[0] = [(name, pattern)] + class_pattern_keyword_part
++        else:
++            raise AssertionError()
+ 
+     # Mapping pattern
+ 
+@@ -505,43 +485,40 @@
+                                    | key_value_pattern COMMA mapping_pattern_args_item_part
+                                    | double_star_pattern
+         """
+-        match list(p):
+-            case [_]:
+-                p[0] = [], [], None
+-            case [_, (key, value)]:
+-                p[0] = [key], [value], None
+-            case [_, (key, value), ",", (keys, values, rest)]:
+-                p[0] = [key] + keys, [value] + values, rest
+-            case [_, str(double_star_pattern)]:
+-                p[0] = [], [], double_star_pattern
+-            case _:
+-                raise AssertionError()
++        if list(p) == [_]:
++            p[0] = [], [], None
++        elif list(p) == [_, (key, value)]:
++            p[0] = [key], [value], None
++        elif list(p) == [_, (key, value), ",", (keys, values, rest)]:
++            p[0] = [key] + keys, [value] + values, rest
++        elif list(p) == [_, str(double_star_pattern)]:
++            p[0] = [], [], double_star_pattern
++        else:
++            raise AssertionError()
+ 
+     def p_mapping_pattern_args_item_part_skip(self, p):
+         """
+         mapping_pattern_args_item_part :
+                                        | double_star_pattern
+         """
+-        match list(p):
+-            case [_]:
+-                p[0] = [], [], None
+-            case [_, rest]:
+-                p[0] = [], [], rest
+-            case _:
+-                raise AssertionError()
++        if list(p) == [_]:
++            p[0] = [], [], None
++        elif list(p) == [_, rest]:
++            p[0] = [], [], rest
++        else:
++            raise AssertionError()
+ 
+     def p_mapping_pattern_args_item_part(self, p):
+         """
+         mapping_pattern_args_item_part : key_value_pattern
+                                        | key_value_pattern COMMA mapping_pattern_args_item_part
+         """
+-        match list(p):
+-            case [_, (key, value)]:
+-                p[0] = [key], [value], None
+-            case [_, (key, value), ",", (keys, values, rest)]:
+-                p[0] = [key] + keys, [value] + values, rest
+-            case _:
+-                raise AssertionError()
++        if list(p) == [_, (key, value)]:
++            p[0] = [key], [value], None
++        elif list(p) == [_, (key, value), ",", (keys, values, rest)]:
++            p[0] = [key] + keys, [value] + values, rest
++        else:
++            raise AssertionError()
+ 
+     def p_double_star_pattern(self, p):
+         """
diff --git a/system/xonsh/xonsh.SlackBuild b/system/xonsh/xonsh.SlackBuild
index eb1ac14701..ac0907d994 100644
--- a/system/xonsh/xonsh.SlackBuild
+++ b/system/xonsh/xonsh.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xonsh
 
-# Copyright 2016-2019  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2016-2024  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220208 bkw: modified by SlackBuilds.org: updated for version 0.11.0,
+# to fix the build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xonsh
-VERSION=${VERSION:-0.9.12}
+VERSION=${VERSION:-0.14.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,7 +79,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python3 setup.py install --root=$PKG
+# Fixed compatibility with python3.9
+patch -p1 < $CWD/v310.patch
+
+PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
+export PYTHONPATH=/opt/python$PYVER/site-packages/
+
+python3 -m build --wheel --no-isolation
+python3 -m installer --destdir "$PKG" dist/*.whl
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -82,4 +99,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xonsh/xonsh.info b/system/xonsh/xonsh.info
index b600316ccb..88b0267a50 100644
--- a/system/xonsh/xonsh.info
+++ b/system/xonsh/xonsh.info
@@ -1,10 +1,10 @@
 PRGNAM="xonsh"
-VERSION="0.9.12"
+VERSION="0.14.4"
 HOMEPAGE="https://xon.sh/"
-DOWNLOAD="https://files.pythonhosted.org/packages/7c/be/a6269ae0440f3b860e727e4faf066f179937611bad3331616ba7dd863996/xonsh-0.9.12.tar.gz"
-MD5SUM="6cfa0915bb4b7f775049378d9b65f6b4"
+DOWNLOAD="https://github.com/xonsh/xonsh/archive/0.14.4/xonsh-0.14.4.tar.gz"
+MD5SUM="75a00385bca4e113c21eaabcf68bee18"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
+REQUIRES="python3-setuptools-opt"
 MAINTAINER="Dimitris Zlatanidis"
-EMAIL="d.zlatanidis@gmail.com"
+EMAIL="dslackw@gmail.com"
diff --git a/system/xorgxrdp/README b/system/xorgxrdp/README
index ebd375e8cc..74d5348ed2 100644
--- a/system/xorgxrdp/README
+++ b/system/xorgxrdp/README
@@ -1,7 +1,8 @@
-** xorgxrdp ** is a collection of modules to be used with a pre-existing X.Org
-install to make the X server act like X11rdp. Unlike X11rdp, you don't have to
-recompile the whole X Window System. Instead, additional modules are installed to
-a location where the existing Xorg installation would pick them.
+** xorgxrdp ** is a collection of modules to be used with
+a pre-existing X.Org install to make the X server act like
+X11rdp. Unlike X11rdp, you don't have to recompile the whole X Window
+System. Instead, additional modules are installed to a location where
+the existing Xorg installation would pick them.
 
 xorgxrdp is to be used together with xrdp and X.Org Server.
 It is pretty useless using xorgxrdp alone.
diff --git a/system/xorgxrdp/xorgxrdp.SlackBuild b/system/xorgxrdp/xorgxrdp.SlackBuild
index 273efbc7d8..de59d724ad 100644
--- a/system/xorgxrdp/xorgxrdp.SlackBuild
+++ b/system/xorgxrdp/xorgxrdp.SlackBuild
@@ -1,13 +1,19 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xorgxrdp
 # Inspired by Phillip Warner <pc_warner@yahoo.com>
 # Written by David Allen <david.a58@optusnet.com.au>
 
+# 20220414 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - add SlackBuild to doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xorgxrdp
 VERSION=${VERSION:-0.2.12}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -17,7 +23,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,9 +57,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # uses autoreconf now
 autoreconf -vfi
@@ -67,13 +77,11 @@ CPPFLAGS="$SLKCFLAGS" \
   --disable-static
 
 make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
@@ -83,4 +91,4 @@ cd $PKG
 # Let's not clobber existing config
 mv etc/X11/xrdp/xorg.conf etc/X11/xrdp/xorg.conf.new
 
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xosd/README b/system/xosd/README
index 786606df82..d22d3e78b3 100644
--- a/system/xosd/README
+++ b/system/xosd/README
@@ -1,8 +1,9 @@
-XOSD displays text on your screen; sounds simple, right? The difference is 
-that it is unmanaged and shaped, so it appears transparent.  This gives the 
-effect of an On Screen Display, like your TV/VCR etc.  The package also 
-includes an xmms plugin, which automatically displays various interesting 
-things as they change (song name, volume etc...)
+XOSD displays text on your screen; sounds simple, right? The
+difference is that it is unmanaged and shaped, so it appears
+transparent. This gives the effect of an On Screen Display, like
+your TV/VCR etc. The package also includes an xmms plugin, which
+automatically displays various interesting things as they change (song
+name, volume etc...)
 
 gdk-pixbuf is an optional dependency, but don't bother - it causes the
 build to fail.
diff --git a/system/xosd/xosd.SlackBuild b/system/xosd/xosd.SlackBuild
index b1a600d4b7..4f4a641a90 100644
--- a/system/xosd/xosd.SlackBuild
+++ b/system/xosd/xosd.SlackBuild
@@ -1,14 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xosd
 # Written by Jick Nan (jick.nan 在 gmail.com)
 
 # Currently maintained by Robby Workman <rworkman@slackbuilds.org>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xosd
 VERSION=${VERSION:-2.2.14}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -18,7 +21,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -75,8 +85,10 @@ cp -a \
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xpipe/README b/system/xpipe/README
new file mode 100644
index 0000000000..c1c16006ca
--- /dev/null
+++ b/system/xpipe/README
@@ -0,0 +1,7 @@
+xpipe (split input and feed it into the given utility)
+
+The xpipe command reads input from stdin and splits it by the given
+number of bytes, lines, or if matching the given pattern. It then
+invokes the given utility repeatedly, feeding it the generated data
+chunks as input. You can think of it as a Unix love-child of the
+split(1), tee(1), and xargs(1) commands.
diff --git a/system/xpipe/git2tarxz.sh b/system/xpipe/git2tarxz.sh
new file mode 100644
index 0000000000..ec693117f8
--- /dev/null
+++ b/system/xpipe/git2tarxz.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create
+# a tarball of. With no arg, HEAD is used.
+
+PRGNAM=xpipe
+CLONE_URL=https://github.com/jschauma/xpipe
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/system/xpipe/slack-desc b/system/xpipe/slack-desc
new file mode 100644
index 0000000000..036e32761c
--- /dev/null
+++ b/system/xpipe/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+xpipe: xpipe (split input and feed it into the given utility)
+xpipe:
+xpipe: The xpipe command reads input from stdin and splits it by the given
+xpipe: number of bytes, lines, or if matching the given pattern. It then
+xpipe: invokes the given utility repeatedly, feeding it the generated data
+xpipe: chunks as input. You can think of it as a Unix love-child of the
+xpipe: split(1), tee(1), and xargs(1) commands.
+xpipe:
+xpipe:
+xpipe:
+xpipe:
diff --git a/system/xpipe/xpipe.SlackBuild b/system/xpipe/xpipe.SlackBuild
new file mode 100644
index 0000000000..42195a279d
--- /dev/null
+++ b/system/xpipe/xpipe.SlackBuild
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+# Slackware build script for xpipe
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20221225 bkw: update for v20220918_2c4882c (new dep libbsd),
+# add TEST=yes option to run xpipe's self tests.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=xpipe
+VERSION=${VERSION:-20220918_2c4882c}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+make CFLAGS="$SLKCFLAGS -Wall -Wl,-s"
+
+[ "${TEST:-no}" = "yes" ] && make test
+
+# make install is pretty BSD-specific, don't use.
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1 $PKGDOC
+install -s $PRGNAM $PKG/usr/bin
+gzip -9c < doc/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+cp -a README* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xpipe/xpipe.info b/system/xpipe/xpipe.info
new file mode 100644
index 0000000000..faac176e55
--- /dev/null
+++ b/system/xpipe/xpipe.info
@@ -0,0 +1,10 @@
+PRGNAM="xpipe"
+VERSION="20220918_2c4882c"
+HOMEPAGE="https://github.com/jschauma/xpipe"
+DOWNLOAD="https://slackware.uk/~urchlay/src/xpipe-20220918_2c4882c.tar.xz"
+MD5SUM="c1d479218e3ee07605a52862602bc338"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="libbsd"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/xprintidle/README b/system/xprintidle/README
new file mode 100644
index 0000000000..81e556cabe
--- /dev/null
+++ b/system/xprintidle/README
@@ -0,0 +1,5 @@
+xprintidle (utility printing user's idle time in X)
+
+xprintidle is a simple utility to query the X server for the
+user's idle time in milliseconds and print it to the standard
+output.
diff --git a/system/xprintidle/slack-desc b/system/xprintidle/slack-desc
new file mode 100644
index 0000000000..bf3ab26cfc
--- /dev/null
+++ b/system/xprintidle/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+xprintidle: xprintidle (utility printing user's idle time in X)
+xprintidle:
+xprintidle: xprintidle is a simple utility to query the X server for the
+xprintidle: user's idle time in milliseconds and print it to the standard
+xprintidle: output.
+xprintidle:
+xprintidle: Homepage: https://github.com/g0hl1n/xprintidle
+xprintidle:
+xprintidle:
+xprintidle:
+xprintidle:
diff --git a/system/xprintidle/xprintidle.SlackBuild b/system/xprintidle/xprintidle.SlackBuild
new file mode 100644
index 0000000000..cf6c166122
--- /dev/null
+++ b/system/xprintidle/xprintidle.SlackBuild
@@ -0,0 +1,94 @@
+#!/bin/bash
+
+# Slackware build script for xprintidle
+
+# Originally written 2022 by Juan M. Lasca <email removed>
+# Modified and now maintained by B. Watson <urchlay@slackware.uk>
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20240221 bkw: BUILD=2
+# - Take over maintenance
+# - Relicense as WTFPL
+# - Tweak README and slack-desc
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=xprintidle
+VERSION=${VERSION:-0.2.5}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+gzip -9 $PKG/usr/man/man*/*
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING README.md $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xprintidle/xprintidle.info b/system/xprintidle/xprintidle.info
new file mode 100644
index 0000000000..b0f03a24d6
--- /dev/null
+++ b/system/xprintidle/xprintidle.info
@@ -0,0 +1,10 @@
+PRGNAM="xprintidle"
+VERSION="0.2.5"
+HOMEPAGE="https://github.com/g0hl1n/xprintidle"
+DOWNLOAD="https://github.com/g0hl1n/xprintidle/archive/0.2.5/xprintidle-0.2.5.tar.gz"
+MD5SUM="a87dc804a6e84a58fb8057c2522da3f6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/xrdp/README b/system/xrdp/README
index e127d9d09a..f04525fa85 100644
--- a/system/xrdp/README
+++ b/system/xrdp/README
@@ -1,34 +1,36 @@
-Xrdp provides a fully functional Linux terminal server, capable of accepting
-connections from rdesktop and Microsoft's own terminal server/remote desktop
-clients. Xrdp uses Xvnc or xorgxrdp (which are installed separately) to manage
-the X session.  This means a RDP client can connect to a VNC server on the
-xrdp server machine in addition to the RDP server. Xrdp can also act as a
-bridging server, allowing RDP clients to connect to other RDP or VNC servers
-through the xrdp server.
+Xrdp provides a fully functional Linux terminal server, capable of
+accepting connections from rdesktop and Microsoft's own terminal
+server/remote desktop clients. Xrdp uses Xvnc or xorgxrdp (which
+are installed separately) to manage the X session.  This means a
+RDP client can connect to a VNC server on the xrdp server machine in
+addition to the RDP server. Xrdp can also act as a bridging server,
+allowing RDP clients to connect to other RDP or VNC servers through
+the xrdp server.
 
 Xvnc is included with tigervnc (in Slackware /extra).
 xorgxrdp can be compiled and installed after installing xrdp.
 
-By default, this script will make xrdp without PAM support since PAM is not
-installed in Slackware by default.  The script supports building with PAM,
-but it is completely untested by us.  If you want to enable PAM, run the
-script as follows:
+By default, this script will make xrdp without PAM support since
+PAM is not installed in Slackware by default.  The script supports
+building with PAM, but it is completely untested by us.  If you want
+to enable PAM, run the script as follows:
   USE_PAM=YES ./xrdp.SlackBuild
 
-By default, this script will make xrdp without GVFS support, as it can cause
-a problem if a session is unexpectedly terminated leaving an orphan GVFS
-mount. (This can be corrected by logging into the server hosting xrdp and
-running 'fusermount -uz ~/thinclient_drives').
-If you want to use drive redirection and shared clipboard support,
-run the script as follows:
+By default, this script will make xrdp without GVFS support, as it
+can cause a problem if a session is unexpectedly terminated leaving
+an orphan GVFS mount. (This can be corrected by logging into the
+server hosting xrdp and running 'fusermount -uz ~/thinclient_drives').
+If you want to use drive redirection and shared clipboard support, run
+the script as follows:
   USE_GVFS=YES ./xrdp.SlackBuild
 
-After installing xrdp there are some configuration files in /etc/xrdp that
-can be modified:
+After installing xrdp there are some configuration files in /etc/xrdp
+that can be modified:
 
 ** sesman.ini **
-sesman.ini has some useful options to take note of such as the ability to
-allow xrdp use by only a certain group and to specify the log location.
+sesman.ini has some useful options to take note of such as the ability
+to allow xrdp use by only a certain group and to specify the log
+location.
 *NOTE:* The default log location is now /var/log/xrdp-sesman.log, and
 the logs are rotated according to /etc/logrotate.d/xrdp-sesman added
 by the script.
@@ -48,17 +50,17 @@ the logs are rotated according to /etc/logrotate.d/xrdp added
 by the script.
 
 ** xrdp-xinitrc **
-xrdp-xinitrc by default tries to load one of several DE/WMs in order to
-start a X11rdp session.  Change this as desired to load a specific DE/WM.
-A similar script can be executed on a per-user basis by creating an
-executable script at ~/.xrdp-xinitrc.  A utility program, xrdp-xwmconfig,
-is included to allow you to use your xinit scripts during sessions.
-It works just like xwmconfig, so run it as root to set the global default,
-or run it as a normal user to set only the default for that user.  See the
-sesman.ini man page for details about defining different names or locations
-for the startup scripts.
+xrdp-xinitrc by default tries to load one of several DE/WMs in order
+to start a X11rdp session.  Change this as desired to load a specific
+DE/WM.  A similar script can be executed on a per-user basis by
+creating an executable script at ~/.xrdp-xinitrc.  A utility program,
+xrdp-xwmconfig, is included to allow you to use your xinit scripts
+during sessions. It works just like xwmconfig, so run it as root to
+set the global default, or run it as a normal user to set only the
+default for that user. See the sesman.ini man page for details about
+defining different names or locations for the startup scripts.
 
-If using xorgxrdp, you will likely need a /etc/X11/Xwrapper.config wrapper
-script containing a line:
+If using xorgxrdp, you will likely need a /etc/X11/Xwrapper.config
+wrapper script containing a line:
   allowed_users = anybody
 (See 'man Xwrapper.config' for details)
diff --git a/system/xrdp/doinst.sh b/system/xrdp/doinst.sh
index 5e27a33eb6..51dec44e87 100644
--- a/system/xrdp/doinst.sh
+++ b/system/xrdp/doinst.sh
@@ -47,3 +47,5 @@ config etc/xrdp/km-00000813.ini.new
 config etc/xrdp/km-00000816.ini.new
 config etc/xrdp/km-0000100c.ini.new
 config etc/xrdp/km-00010409.ini.new
+config etc/logrotate.d/xrdp-sesman.new
+config etc/logrotate.d/xrdp.new
diff --git a/system/xrdp/xrdp.SlackBuild b/system/xrdp/xrdp.SlackBuild
index 520cda33c9..13ec540299 100644
--- a/system/xrdp/xrdp.SlackBuild
+++ b/system/xrdp/xrdp.SlackBuild
@@ -1,13 +1,19 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xrdp
 # Written by Phillip Warner <pc_warner@yahoo.com>
 # Amended by David Allen <david.a58@optusnet.com.au>
 
+# 20220414 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - add a couple missing .new config files to doinst.sh.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xrdp
 VERSION=${VERSION:-0.9.12}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -17,7 +23,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,9 +65,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # uses autoreconf now
 autoreconf -vfi
@@ -154,4 +164,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xrestop/xrestop.SlackBuild b/system/xrestop/xrestop.SlackBuild
index e6bd617724..30d84989e2 100644
--- a/system/xrestop/xrestop.SlackBuild
+++ b/system/xrestop/xrestop.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for xrestop
 #
-# Copyright 2009  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009-2022  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,28 +22,38 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xrestop
-VERSION=${VERSION:-0.4}
+VERSION=${VERSION:-0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 set -eu
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,7 +70,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -75,6 +85,7 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
 make
@@ -83,9 +94,9 @@ make install-strip DESTDIR=$PKG
 gzip -9 $PKG/usr/man/man?/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install
-cp -a AUTHORS COPYING ChangeLog INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xrestop/xrestop.info b/system/xrestop/xrestop.info
index 0c3b23c5b9..060d181a18 100644
--- a/system/xrestop/xrestop.info
+++ b/system/xrestop/xrestop.info
@@ -1,8 +1,8 @@
 PRGNAM="xrestop"
-VERSION="0.4"
+VERSION="0.5"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/xrestop"
-DOWNLOAD="http://downloads.yoctoproject.org/releases/xrestop/xrestop-0.4.tar.gz"
-MD5SUM="d8a54596cbaf037e62b80c4585a3ca9b"
+DOWNLOAD="https://xorg.freedesktop.org/archive/individual/app/xrestop-0.5.tar.bz2"
+MD5SUM="5fb15fce4b643046df43e8179054773c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/xsettingsd/README b/system/xsettingsd/README
new file mode 100644
index 0000000000..b8eaf7107f
--- /dev/null
+++ b/system/xsettingsd/README
@@ -0,0 +1,2 @@
+xsettingsd is a lightweight XSETTINGS implementation for when
+you don't want to or can't run something heavier.
diff --git a/system/xsettingsd/slack-desc b/system/xsettingsd/slack-desc
new file mode 100644
index 0000000000..2bb5792278
--- /dev/null
+++ b/system/xsettingsd/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+xsettingsd: xsettingsd (lightweight XSETTINGS implementation)
+xsettingsd:
+xsettingsd:
+xsettingsd: xsettingsd is a small, fast XSETTINGS implementation that can be used
+xsettingsd: with lightweight window managers that don't provide their own
+xsettingsd:
+xsettingsd:
+xsettingsd: https://github.com/derat/xsettingsd
+xsettingsd:
+xsettingsd:
+xsettingsd:
diff --git a/system/xsettingsd/xsettingsd.SlackBuild b/system/xsettingsd/xsettingsd.SlackBuild
new file mode 100644
index 0000000000..d93bbc957a
--- /dev/null
+++ b/system/xsettingsd/xsettingsd.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+# Slackware build script for xsettingsd
+
+# Copyright 2022 Majors <majors@majors.email>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=xsettingsd
+VERSION=${VERSION:-1.0.2}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_MANDIR=man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+# Remove systemd specific file
+rm -rf $PKG/usr/lib/
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README.md COPYING \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xsettingsd/xsettingsd.info b/system/xsettingsd/xsettingsd.info
new file mode 100644
index 0000000000..d8736474b6
--- /dev/null
+++ b/system/xsettingsd/xsettingsd.info
@@ -0,0 +1,10 @@
+PRGNAM="xsettingsd"
+VERSION="1.0.2"
+HOMEPAGE="https://github.com/derat/xsettingsd"
+DOWNLOAD="https://github.com/derat/xsettingsd/archive/refs/tags/v1.0.2/xsettingsd-1.0.2.tar.gz"
+MD5SUM="a550949ee88e68a0b3fe6e43c4ccd343"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Majors"
+EMAIL="majors@majors.email"
diff --git a/system/xstow/README b/system/xstow/README
index 5cdf8bedcd..1478eed335 100644
--- a/system/xstow/README
+++ b/system/xstow/README
@@ -1,9 +1,10 @@
-XStow is a replacement for GNU Stow written in C++. It supports all features of
-GNU Stow with some extensions. Even the command line options are compatible. 
+XStow is a replacement for GNU Stow written in C++. It supports all
+features of GNU Stow with some extensions. Even the command line
+options are compatible.
 
-XStow and GNU Stow are programs for managing the installation of software
-packages, keeping them separate (/usr/local/stow/emacs vs.
-/usr/local/stow/perl, for example) while making them appear to be installed in
-the same place (/usr/local).
+XStow and GNU Stow are programs for managing the installation of
+software packages, keeping them separate (/usr/local/stow/emacs vs.
+/usr/local/stow/perl, for example) while making them appear to be
+installed in the same place (/usr/local).
 
 XStow installs packages in the exact same way as GNU Stow.
diff --git a/system/xstow/xstow.SlackBuild b/system/xstow/xstow.SlackBuild
index dad3996a42..8eb44de2b7 100644
--- a/system/xstow/xstow.SlackBuild
+++ b/system/xstow/xstow.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xstow
 
-# Copyright 2014 Erik Falor, West Valley City, Utah, USA
+# Copyright 2024 Erik Falor, Logan, Utah, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,36 +22,42 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xstow
-VERSION=${VERSION:-1.0.2}
+VERSION=${VERSION:-1.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -88,7 +94,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/doc/xstow/* $PKG/usr/doc/$PRGNAM-$VERSION
 rm -rf $PKG/usr/share
 
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+cp -a AUTHORS COPYING ChangeLog NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -96,4 +102,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xstow/xstow.info b/system/xstow/xstow.info
index 36efb1738b..4965394893 100644
--- a/system/xstow/xstow.info
+++ b/system/xstow/xstow.info
@@ -1,8 +1,8 @@
 PRGNAM="xstow"
-VERSION="1.0.2"
+VERSION="1.1.0"
 HOMEPAGE="http://xstow.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/xstow/xstow-1.0.2.tar.bz2"
-MD5SUM="685fe4f3db3c363191e836082dc0d512"
+DOWNLOAD="https://github.com/majorkingleo/xstow/releases/download/1.1.0/xstow-1.1.0.tar.bz2"
+MD5SUM="c9d5a3203ee7648f0ac10f2de417b58f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/xtrs/README b/system/xtrs/README
index ac57d3b32b..25afdd811b 100644
--- a/system/xtrs/README
+++ b/system/xtrs/README
@@ -1,15 +1,11 @@
-xtrs is a Radio Shack TRS-80 Model I/III/4/4P emulator for Unix and the X 
-Window system. It includes lower case, the real time clock, hi-res graphics, 
-serial port, parallel printer, mouse, cassette, sound and music output 
-(requires OSS), 5" and 8" floppy disk drives in single and double density, 
-and even hard disk drives.
+xtrs (TRS-80 Model I/III/4/4P Emulator for Unix)
 
-To run xtrs, you will need a 'romfile' with the contents of the original ROM 
-of the model you want to emulate.  Since these are copyrighted, they are not 
-included in this package.  However, do not dispair!  The xtrs page explains
-how to obtain a legal copy of the MODELA/III file that can be used.  These 
-or other ROM images should be copied to the /usr/share/xtrs directory.
+xtrs is a Radio Shack TRS-80 Model I/III/4/4P emulator for Unix and
+the X Window system. It includes lower case, the real time clock,
+hi-res graphics, serial port, parallel printer, mouse, cassette, sound
+and music output, 5" and 8" floppy disk drives in single and double
+density, and even hard disk drives.
 
-A simple xtrs.desktop file is included that will start xtrs with
-the default options.  Read the included 'xtrs' man-page after installation 
+A simple xtrs.desktop file is included that will start xtrs with the
+default options. Read the included 'xtrs' man page after installation
 for more information and command-line options.
diff --git a/system/xtrs/default_rom_dir.patch b/system/xtrs/default_rom_dir.patch
deleted file mode 100644
index 4fa57f673e..0000000000
--- a/system/xtrs/default_rom_dir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur xtrs-4.9d.orig/Makefile.local xtrs-4.9d/Makefile.local
---- xtrs-4.9d.orig/Makefile.local	2009-06-15 18:32:57.000000000 -0500
-+++ xtrs-4.9d/Makefile.local	2009-09-26 16:29:19.371490363 -0500
-@@ -36,9 +36,9 @@
- # time, use these lines (with the appropriate file names).  The default file
- # name is ignored and can be omitted if the ROM for that model is built in.
- 
--DEFAULT_ROM = -DDEFAULT_ROM='"/usr/local/lib/xtrs/level2rom.hex"' \
--              -DDEFAULT_ROM3='"/usr/local/lib/xtrs/romimage.m3"' \
--              -DDEFAULT_ROM4P='"/usr/local/lib/xtrs/romimage.m4p"'
-+DEFAULT_ROM = -DDEFAULT_ROM='"/usr/share/xtrs/level2rom.hex"' \
-+              -DDEFAULT_ROM3='"/usr/share/xtrs/romimage.m3"' \
-+              -DDEFAULT_ROM4P='"/usr/share/xtrs/romimage.m4p"'
- 
- # If you would like to change where xtrs looks for disk?-? files, edit
- # this line.  "." of course means the current working directory.
diff --git a/system/xtrs/doinst.sh b/system/xtrs/doinst.sh
index 4e8ba7071d..3e5691a052 100644
--- a/system/xtrs/doinst.sh
+++ b/system/xtrs/doinst.sh
@@ -2,3 +2,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/xtrs/icons/128.png b/system/xtrs/icons/128.png
new file mode 100644
index 0000000000..8b4230a6fa
--- /dev/null
+++ b/system/xtrs/icons/128.png
diff --git a/system/xtrs/icons/16.png b/system/xtrs/icons/16.png
new file mode 100644
index 0000000000..e59155b147
--- /dev/null
+++ b/system/xtrs/icons/16.png
diff --git a/system/xtrs/icons/22.png b/system/xtrs/icons/22.png
new file mode 100644
index 0000000000..b8c13c8526
--- /dev/null
+++ b/system/xtrs/icons/22.png
diff --git a/system/xtrs/icons/32.png b/system/xtrs/icons/32.png
new file mode 100644
index 0000000000..ed8dccec88
--- /dev/null
+++ b/system/xtrs/icons/32.png
diff --git a/system/xtrs/icons/48.png b/system/xtrs/icons/48.png
new file mode 100644
index 0000000000..a810d34f01
--- /dev/null
+++ b/system/xtrs/icons/48.png
diff --git a/system/xtrs/icons/64.png b/system/xtrs/icons/64.png
new file mode 100644
index 0000000000..80947c645e
--- /dev/null
+++ b/system/xtrs/icons/64.png
diff --git a/system/xtrs/sbo.diff b/system/xtrs/sbo.diff
new file mode 100644
index 0000000000..be2ad80e0d
--- /dev/null
+++ b/system/xtrs/sbo.diff
@@ -0,0 +1,108 @@
+diff -Naur xtrs-4.9d/Makefile xtrs-4.9d.patched/Makefile
+--- xtrs-4.9d/Makefile	2009-06-15 19:35:20.000000000 -0400
++++ xtrs-4.9d.patched/Makefile	2023-04-18 04:57:54.855888189 -0400
+@@ -205,14 +205,15 @@
+ install: install-progs install-man
+ 
+ install-progs: $(PROGS)
+-	$(INSTALL) -c -m 755 $(PROGS) $(BINDIR)
++	$(INSTALL) -s -c -m 755 $(PROGS) $(BINDIR)
++	$(INSTALL) -c -m 755 cassette.sh $(BINDIR)/cassette
+ 
+ install-man: $(MANPAGES)
+-	$(INSTALL) -c -m 644 xtrs.man $(MANDIR)/man1/xtrs.1
+-	$(INSTALL) -c -m 644 cassette.man $(MANDIR)/man1/cassette.1
+-	$(INSTALL) -c -m 644 mkdisk.man $(MANDIR)/man1/mkdisk.1
+-	$(INSTALL) -c -m 644 cmddump.man $(MANDIR)/man1/cmddump.1
+-	$(INSTALL) -c -m 644 hex2cmd.man $(MANDIR)/man1/hex2cmd.1
++	$(INSTALL) -c -m 644 xtrs.man $(MANDIR)/man6/xtrs.6
++	$(INSTALL) -c -m 644 cassette.man $(MANDIR)/man6/cassette.6
++	$(INSTALL) -c -m 644 mkdisk.man $(MANDIR)/man6/mkdisk.6
++	$(INSTALL) -c -m 644 cmddump.man $(MANDIR)/man6/cmddump.6
++	$(INSTALL) -c -m 644 hex2cmd.man $(MANDIR)/man6/hex2cmd.6
+ 
+ depend:
+ 	makedepend -- $(CFLAGS) -- $(SOURCES)
+diff -Naur xtrs-4.9d/Makefile.local xtrs-4.9d.patched/Makefile.local
+--- xtrs-4.9d/Makefile.local	2009-06-15 19:32:57.000000000 -0400
++++ xtrs-4.9d.patched/Makefile.local	2023-04-18 04:54:34.470907048 -0400
+@@ -36,9 +36,9 @@
+ # time, use these lines (with the appropriate file names).  The default file
+ # name is ignored and can be omitted if the ROM for that model is built in.
+ 
+-DEFAULT_ROM = -DDEFAULT_ROM='"/usr/local/lib/xtrs/level2rom.hex"' \
+-              -DDEFAULT_ROM3='"/usr/local/lib/xtrs/romimage.m3"' \
+-              -DDEFAULT_ROM4P='"/usr/local/lib/xtrs/romimage.m4p"'
++DEFAULT_ROM = -DDEFAULT_ROM='"/usr/share/trs80-roms/level2.rom"' \
++              -DDEFAULT_ROM3='"/usr/share/trs80-roms/model3.rom"' \
++              -DDEFAULT_ROM4P='"/usr/share/trs80-roms/model4p.rom"'
+ 
+ # If you would like to change where xtrs looks for disk?-? files, edit
+ # this line.  "." of course means the current working directory.
+@@ -85,17 +85,17 @@
+ # If you want xtrs to look for a global app-defaults file
+ # at runtime in $APPDEFAULTS/Xtrs:
+ 
+-APPDEFAULTS = -DAPPDEFAULTS='"/usr/X11/lib/X11/app-defaults"'
++APPDEFAULTS = -DAPPDEFAULTS='"/etc/X11/app-defaults"'
+ 
+ # prefix directory
+ 
+-PREFIX=/usr/local
++PREFIX=/usr
+ #If included in distribution: PREFIX=/usr
+ 
+ # Set these to where you want installed stuff to go, if you install them.
+ 
+-BINDIR = $(PREFIX)/bin
+-MANDIR = $(PREFIX)/share/man
++BINDIR = $(PREFIX)/games
++MANDIR = $(PREFIX)/man
+ 
+ # Change this if you have a BSD-compatible install program that is
+ # not the first program named "install" on your $PATH
+diff -Naur xtrs-4.9d/cassette.man xtrs-4.9d.patched/cassette.man
+--- xtrs-4.9d/cassette.man	2008-06-26 00:40:04.000000000 -0400
++++ xtrs-4.9d.patched/cassette.man	2023-04-18 04:59:28.921879337 -0400
+@@ -1,4 +1,4 @@
+-.TH cassette 1
++.TH cassette 6
+ .SH Name
+ cassette \- data cassette image manipulator for xtrs TRS-80 emulator
+ .SH Syntax
+diff -Naur xtrs-4.9d/cmddump.man xtrs-4.9d.patched/cmddump.man
+--- xtrs-4.9d/cmddump.man	2008-06-26 00:40:07.000000000 -0400
++++ xtrs-4.9d.patched/cmddump.man	2023-04-18 04:59:35.808878689 -0400
+@@ -1,4 +1,4 @@
+-.TH cmddump 1 2001-02-22
++.TH cmddump 6 2001-02-22
+ .SH Name
+ cmddump \- simulated TRS-80 CMD file loader
+ .SH Syntax
+diff -Naur xtrs-4.9d/hex2cmd.man xtrs-4.9d.patched/hex2cmd.man
+--- xtrs-4.9d/hex2cmd.man	2008-06-26 00:40:09.000000000 -0400
++++ xtrs-4.9d.patched/hex2cmd.man	2023-04-18 04:59:42.338878074 -0400
+@@ -1,4 +1,4 @@
+-.TH hex2cmd 1
++.TH hex2cmd 6
+ .SH Name
+ hex2cmd \- convert Intel hex format to TRS-80 CMD format
+ .SH Syntax
+diff -Naur xtrs-4.9d/mkdisk.man xtrs-4.9d.patched/mkdisk.man
+--- xtrs-4.9d/mkdisk.man	2008-06-26 00:40:12.000000000 -0400
++++ xtrs-4.9d.patched/mkdisk.man	2023-04-18 04:59:52.715877098 -0400
+@@ -1,4 +1,4 @@
+-.TH mkdisk 1
++.TH mkdisk 6
+ .SH Name
+ mkdisk \- Make a blank emulated floppy or hard disk for xtrs,
+ or add/remove an emulated write protect tab
+diff -Naur xtrs-4.9d/xtrs.man xtrs-4.9d.patched/xtrs.man
+--- xtrs-4.9d/xtrs.man	2009-06-15 19:44:45.000000000 -0400
++++ xtrs-4.9d.patched/xtrs.man	2023-04-18 04:59:58.745876530 -0400
+@@ -1,4 +1,4 @@
+-.TH xtrs 1
++.TH xtrs 6
+ .SH Name
+ xtrs \- TRS-80 Model I/III/4/4P emulator for the X Window System
+ .SH Syntax
diff --git a/system/xtrs/slack-desc b/system/xtrs/slack-desc
index 327ceffb32..19d41a5d07 100644
--- a/system/xtrs/slack-desc
+++ b/system/xtrs/slack-desc
@@ -11,8 +11,8 @@ xtrs:
 xtrs: xtrs is a Radio Shack TRS-80 Model I/III/4/4P emulator for Unix and
 xtrs: the X Window system. It includes lower case, the real time clock, hi-
 xtrs: res graphics, serial port, parallel printer, mouse, cassette, sound
-xtrs: and music output (requires OSS), 5" and 8" floppy disk drives in
-xtrs: single and double density, and even hard disk drives.
+xtrs: and music output, 5" and 8" floppy disk drives in single and double
+xtrs: density, and even hard disk drives.
 xtrs:
 xtrs: http://www.tim-mann.org/xtrs.html
 xtrs:
diff --git a/system/xtrs/window_close.diff b/system/xtrs/window_close.diff
new file mode 100644
index 0000000000..96bef4e05e
--- /dev/null
+++ b/system/xtrs/window_close.diff
@@ -0,0 +1,35 @@
+diff -Naur xtrs-4.9d/trs_xinterface.c xtrs-4.9d.patched/trs_xinterface.c
+--- xtrs-4.9d/trs_xinterface.c	2009-06-15 23:23:09.000000000 -0400
++++ xtrs-4.9d.patched/trs_xinterface.c	2023-05-17 15:31:29.237827697 -0400
+@@ -730,6 +730,7 @@
+   Colormap color_map;
+   XColor cdef;
+   XGCValues gcvals;
++  Atom wm_delete_window;
+   char *fontname = NULL;
+   char *widefontname = NULL;
+   int len;
+@@ -737,6 +738,7 @@
+ 
+   screen = DefaultScreen(display);
+   color_map = DefaultColormap(display,screen);
++  wm_delete_window = XInternAtom(display, "WM_DELETE_WINDOW", False);
+ 
+   (void) sprintf(option, "%s%s", program_name, ".foreground");
+   if (XrmGetResource(x_db, option, "Xtrs.Foreground", &type, &value)) {
+@@ -937,6 +939,7 @@
+   trs_fix_size(window, OrigWidth, OrigHeight);
+   XStoreName(display,window,title);
+   XSelectInput(display, window, EVENT_MASK);
++  XSetWMProtocols(display, window, &wm_delete_window, 1);
+ 
+   (void) sprintf(option, "%s%s", program_name, ".iconic"); 
+   if (XrmGetResource(x_db, option, "Xtrs.Iconic", &type, &value)) { 
+@@ -1002,6 +1005,7 @@
+     if (wait) {
+       XNextEvent(display, &event);
+     } else {
++      if (XCheckTypedEvent(display, ClientMessage, &event)) trs_exit();
+       if (!XCheckMaskEvent(display, ~0, &event)) return;
+     }
+ 
diff --git a/system/xtrs/xtrs-ico.png b/system/xtrs/xtrs-ico.png
deleted file mode 100644
index 6f28450c52..0000000000
--- a/system/xtrs/xtrs-ico.png
+++ /dev/null
diff --git a/system/xtrs/xtrs.SlackBuild b/system/xtrs/xtrs.SlackBuild
index 6d0f41246d..c0d9fb78d0 100644
--- a/system/xtrs/xtrs.SlackBuild
+++ b/system/xtrs/xtrs.SlackBuild
@@ -1,14 +1,33 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xtrs - the X Windows TRS-80 emulator
 
-# Written by Niels Horn <niels.horn@gmail.com>
-# revision date 2010/07/17
+# Originally written by Niels Horn <email removed>.
+# Highly modified and now maintained by B. Watson <urchlay@slackware.uk>.
+# There was no license on the original version. Modified version is
+# licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20230517 bkw: BUILD=4
+# - include patch from Jens Guenther (sdltrs upstream maintainer) to
+#   make the window close button work.
+
+# 20230418 bkw: BUILD=3
+# - new maintainer.
+# - use ROMs from trs80-roms package by default.
+# - binaries in /usr/games; man pages in section 6.
+# - replace old 32x21 icon.
+# - remove ROMs from package (they live in trs80-roms now).
+# - include all the trs-80 native stuff in the doc dir, like
+#   sdltrs does. basically it's the same stuff, too.
+# - link with libaoss, to get audio working.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xtrs
 VERSION=${VERSION:-4.9d}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -18,23 +37,23 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -46,48 +65,57 @@ cd $TMP
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Make /usr/share/xtrs the default rom directory
-patch -p1 < $CWD/default_rom_dir.patch
-
-# xtrs does not have a ./configure
-make \
-  DEBUG="$SLKCFLAGS" \
-  PREFIX=/usr \
-  MANDIR=/usr/man \
-  APPDEFAULTS='-DAPPDEFAULTS=\"/etc/X11/app-defaults\"'
-
-mkdir -p $PKG/usr/bin $PKG/usr/man/man1
-make BINDIR=$PKG/usr/bin MANDIR=$PKG/usr/man install
-
-# Make a directory for the ROMs (not included), include fakerom.hex & xtrsrom4p.hex
-mkdir -p $PKG/usr/share/xtrs
-cp -a fakerom.hex xtrsrom4p.hex $PKG/usr/share/xtrs
-
-# Copy icon & desktop file to package
-mkdir -p $PKG/usr/share/{applications,pixmaps}
+# upstream permissions are wonky, do not revert to template.
+find . -type f -a -exec chmod 644 {} + -o \
+       -type d -a -exec chmod 755 {} +
+
+# 20230418 bkw: patch does all this:
+# - use system-wide ROMs from trs80-roms package.
+# - install binaries to /usr/games and man pages to section 6.
+# - strip binaries.
+# - use correct app-defaults dir.
+patch -p1 < $CWD/sbo.diff
+
+# 20230517 bkw: Jens Guenther's "quick and dirty" patch to make the
+# windowmanager's close button work. Many thanks!
+patch -p1 < $CWD/window_close.diff
+
+# 20230418 bkw: the -laoss here allows xtrs to make sound via ALSA
+# or PulseAudio (via /etc/asound.conf).
+make DEBUG="$SLKCFLAGS" EXTRALIBS="-laoss"
+mkdir -p $PKG/usr/games $PKG/usr/man/man6
+make BINDIR=$PKG/usr/games MANDIR=$PKG/usr/man install
+
+gzip -9 $PKG/usr/man/man*/*
+
+# 20230418 bkw: made this icon by combining the sdltrs icon
+# and the X logo (tinted red). not beautiful, but distinctive.
+for i in $CWD/icons/*.png; do
+  px="$( basename $i .png )"
+  size="${px}x${px}"
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  cat $i > $dir/$PRGNAM.png
+done
+
+mkdir -p $PKG/usr/share/pixmaps
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+mkdir -p $PKG/usr/share/applications
 cat $CWD/xtrs.desktop > $PKG/usr/share/applications/xtrs.desktop
-cp $CWD/xtrs-ico.png $PKG/usr/share/pixmaps
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog README xtrsrom4p.README $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# 20230418 bkw: the .txt files are just rendered versions of the man
+# pages (with ddoouubblleedd characters), do not package.
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC/utilities
+cp -a ChangeLog README *.html $PKGDOC
+cp -a *.ccc *.cmd *.tgz *.jcl *.bas *.z80 *.lst xtrsemt.h *.hex *.README \
+      $PKGDOC/utilities
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xtrs/xtrs.desktop b/system/xtrs/xtrs.desktop
index b2ebc5df6b..39f0b111cf 100644
--- a/system/xtrs/xtrs.desktop
+++ b/system/xtrs/xtrs.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=xtrs
-Comment=Emulator for TRS-80
-Categories=System;
+Name=XTRS
+Comment=TRS-80 Model I/III/4/4P Emulator
+Categories=System;Emulator;
 Exec=xtrs
-Icon=xtrs-ico
+Icon=xtrs
 Terminal=false
 StartupNotify=false
diff --git a/system/xtrs/xtrs.info b/system/xtrs/xtrs.info
index afa2d5d971..6311ce70e1 100644
--- a/system/xtrs/xtrs.info
+++ b/system/xtrs/xtrs.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://www.tim-mann.org/trs80/xtrs-4.9d.tar.gz"
 MD5SUM="8bb7cf88a3bc1da890f1f29398120bf3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Niels Horn"
-EMAIL="niels.horn@gmail.com"
+REQUIRES="trs80-roms"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/xvfb-run/xvfb-run.SlackBuild b/system/xvfb-run/xvfb-run.SlackBuild
index 9f1c3a092d..cff238081a 100644
--- a/system/xvfb-run/xvfb-run.SlackBuild
+++ b/system/xvfb-run/xvfb-run.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xvfb-run
 
@@ -21,15 +21,26 @@
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# 20-05-2023: Updated to version 21.1.7 and cleaned up to adhere to 
+# sbopkglint standards. - Bob Funk
+# 20-12-2023: Updated to version 21.1.10
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xvfb-run
-VERSION=${VERSION:-1.19.2}
+VERSION=${VERSION:-21.1.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -50,11 +61,12 @@ rm -f usr/bin/Xvfb
 mv usr/share/* usr
 rmdir usr/share
 rm -f usr/doc/xvfb/changelog*
-mv usr/doc/xvfb usr/doc/xvfb-bin-$VERSION
+mv usr/doc/xvfb usr/doc/$PRGNAM-$VERSION
 rm -f usr/man/man1/Xvfb.1.gz
 mkdir install
 
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/slack-desc > install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/xvfb-run/xvfb-run.info b/system/xvfb-run/xvfb-run.info
index 7ad63a27c7..b80dc2b315 100644
--- a/system/xvfb-run/xvfb-run.info
+++ b/system/xvfb-run/xvfb-run.info
@@ -1,10 +1,10 @@
 PRGNAM="xvfb-run"
-VERSION="1.19.2"
+VERSION="21.1.11"
 HOMEPAGE="https://packages.gentoo.org/packages/x11-misc/xvfb-run"
-DOWNLOAD="http://ftp.us.debian.org/debian/pool/main/x/xorg-server/xvfb_1.19.2-1+deb9u5_i386.deb"
-MD5SUM="4b467ff96d94ad07b5550d052466449c"
+DOWNLOAD="http://ftp.us.debian.org/debian/pool/main/x/xorg-server/xvfb_21.1.11-2_i386.deb"
+MD5SUM="f37981494621f43f29a4d97ee4b0177e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Jan F. Chadima"
-EMAIL="jfch@jagda.eu"
+MAINTAINER="Bob Funk"
+EMAIL="bobfunk11@gmail.com"
diff --git a/system/xwiimote/xwiimote.SlackBuild b/system/xwiimote/xwiimote.SlackBuild
index 3c14cb0a43..ff6556ad15 100644
--- a/system/xwiimote/xwiimote.SlackBuild
+++ b/system/xwiimote/xwiimote.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for xwiimote
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=xwiimote
 VERSION=${VERSION:-2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
 case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
     *) ARCH=$( uname -m ) ;;
 esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
 SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -95,8 +105,10 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/yabsm/README b/system/yabsm/README
new file mode 100644
index 0000000000..54aeaa4432
--- /dev/null
+++ b/system/yabsm/README
@@ -0,0 +1,21 @@
+Yabsm (yet another btrfs snapshot manageer) is a btrfs snapshot
+manager and backup system.
+
+To have the yabsm daemon start and stop with your host, add the
+following to /etc/rc.d/rc.local:
+
+  if [ -x /etc/rc.d/rc.yabsm ]; then
+    /etc/rc.d/rc.yabsm start
+  fi
+
+and add the following to /etc/rc.d/rc.local_shutdown (creating it if
+needed):
+
+  if [ -x /etc/rc.d/rc.yabsm ]; then
+    /etc/rc.d/rc.yabsm stop
+  fi
+
+Yabsm is configured via the /etc/yabsm.conf file. On installation, an
+example configuration will be installed to /etc/yabsm.conf.example.
+This example configuration is well documented and can be used (along
+with the manual) to help you create your own configuration.
diff --git a/system/yabsm/doinst.sh b/system/yabsm/doinst.sh
new file mode 100644
index 0000000000..0bbefd4a54
--- /dev/null
+++ b/system/yabsm/doinst.sh
@@ -0,0 +1,25 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
+
+preserve_perms etc/rc.d/rc.yabsm.new
diff --git a/system/yabsm/rc.yabsm b/system/yabsm/rc.yabsm
new file mode 100644
index 0000000000..1d00263a65
--- /dev/null
+++ b/system/yabsm/rc.yabsm
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# start/stop/restart the yabsm daemon.
+
+usage="usage: $0 start|stop|restart"
+
+if [ $# != 1 ]; then
+   echo "$usage"
+   exit 1
+fi
+
+case "$1" in
+'start')
+  echo "Starting yabsm daemon:  /usr/bin/yabsm"
+  /usr/bin/yabsm daemon start
+  ;;
+'stop')
+  echo "Stopping yabsm daemon:  /usr/bin/yabsm"
+  /usr/bin/yabsm daemon stop
+  ;;
+'restart')
+  echo "Restarting yabsm daemon:  /usr/bin/yabsm"
+  /usr/bin/yabsm daemon restart
+  ;;
+*)
+  echo "$usage"
+  exit 1
+esac
diff --git a/system/yabsm/slack-desc b/system/yabsm/slack-desc
new file mode 100644
index 0000000000..8564ae074f
--- /dev/null
+++ b/system/yabsm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+yabsm: yabsm (yet another btrfs snapshot manager)
+yabsm:
+yabsm: A btrfs snapshot manager and backup system.
+yabsm:
+yabsm:
+yabsm:
+yabsm:
+yabsm:
+yabsm:
+yabsm:
+yabsm:
diff --git a/system/yabsm/yabsm.SlackBuild b/system/yabsm/yabsm.SlackBuild
new file mode 100644
index 0000000000..de3251c172
--- /dev/null
+++ b/system/yabsm/yabsm.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# Slackware build script for yabsm
+
+# Copyright 2023 Nicholas Hubbard <nicholashubbard@posteo.net>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=yabsm
+VERSION=${VERSION:-3.15.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# yabsm's CPAN distribution name
+SRCNAM=App-Yabsm
+
+ARCH=noarch
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+perl Makefile.PL \
+  PREFIX=/usr \
+  INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 \
+  INSTALLVENDORMAN3DIR=/usr/man/man3
+make
+make install DESTDIR=$PKG
+
+# add an rc.yabsm to start/stop/restart the daemon
+install -D -m 0755 $CWD/rc.yabsm $PKG/etc/rc.d/rc.yabsm.new
+
+# add the example configuration to /etc/yabsmd.conf.example
+install -D -m 0644 examples/yabsm.conf.example $PKG/etc/yabsm.conf.example
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+find $PKG -depth -type d -empty -delete || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a examples/yabsm.conf.example $PKG/etc/yabsm.conf.example
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/yabsm/yabsm.info b/system/yabsm/yabsm.info
new file mode 100644
index 0000000000..984af3f5e6
--- /dev/null
+++ b/system/yabsm/yabsm.info
@@ -0,0 +1,10 @@
+PRGNAM="yabsm"
+VERSION="3.15.3"
+HOMEPAGE="https://metacpan.org/dist/App-Yabsm/view/bin/yabsm"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/N/NH/NHUBBARD/App-Yabsm-3.15.3.tar.gz"
+MD5SUM="47f83018534b8be80ba873889853c8b4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Nicholas Hubbard"
+EMAIL="nicholashubbard@posteo.net"
diff --git a/system/yaft/README b/system/yaft/README
index 751cd4f635..681f7857e4 100644
--- a/system/yaft/README
+++ b/system/yaft/README
@@ -1,6 +1,6 @@
-Yet another framebuffer terminal (aka "yaft") is simple terminal emulator for minimalist,
-living without X.
-This software is being developed to replace Linux console for personal use.
+Yet another framebuffer terminal (aka "yaft") is simple terminal
+emulator for minimalist, living without X. This software is being
+developed to replace Linux console for personal use.
 
 Features:
 
@@ -14,10 +14,7 @@ Features:
 
 OPTIONS
 
-If you need active Background Draw (always draw even if vt is not active):
+If you need active Background Draw (always draw even if vt is not
+active):
 
   BACKGROUND_DRAW=yes sh yaft.SlackBuild
-
-
-!!! NOTE !!!
-sbo-patches/background-draw.patch : For activate the BACKGROUND DRAW option
diff --git a/system/yaft/yaft.SlackBuild b/system/yaft/yaft.SlackBuild
index bc1dd40caa..49aa6acd10 100644
--- a/system/yaft/yaft.SlackBuild
+++ b/system/yaft/yaft.SlackBuild
@@ -1,6 +1,7 @@
-#!/bin/sh
-# Slackware build script for abella
+#!/bin/bash
+# Slackware build script for yaft
 # Copyright 2020 Jefferson Rocha <jeffersoncarneiro@slackjeff.com.br>
+# Copyright 2023 slackjeff <slackjeff@riseup.net>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,20 +21,51 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20231215 bkw: modified by SlackBuilds.org:
+# - use correct ARCH (this isn't noarch) and SLKCFLAGS.
+# - include README.md in doc dir.
+# - add man page symlink for yaft_wall.
+# - minor tweaks.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=yaft
 VERSION=${VERSION:-0.2.9}
-UNPACK=${UNPACK:-v}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
-ARCH=noarch
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -43,32 +75,29 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
 # Enable Backgroun Draw!
 BACKGROUND_DRAW=${BACKGROUND_DRAW:-no}
 [ "$BACKGROUND_DRAW" = 'yes' ] && patch -p1 <${CWD}/sbo-patches/background-drawm.patch
 
-# Var MANDIR not work.
-sed -i 's|$(DESTDIR)/usr/share/man|$(DESTDIR)/usr/man|' makefile
-
 # Generate bin and install
-make PREFIX=/usr
-
-make install DESTDIR=$PKG
+make CFLAGS="$SLKCFLAGS -s"
+make install DESTDIR=$PKG MANPREFIX=$PKG/usr/man
+gzip -9 $PKG/usr/man/man*/*
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# 20231215 bkw: this kinda-sorta documents yaft_wall.
+ln -s yaft.1.gz $PKG/usr/man/man1/yaft_wall.1.gz
 
 # Send original Docs and archives
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md ChangeLog LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/yaft/yaft.info b/system/yaft/yaft.info
index 7e02516027..78cdf144fb 100644
--- a/system/yaft/yaft.info
+++ b/system/yaft/yaft.info
@@ -6,5 +6,5 @@ MD5SUM="ddcbe929c51c453b01e3d18579b0860a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Jefferson Rocha"
-EMAIL="jeffersoncarneiro@slackjeff.com.br"
+MAINTAINER="slackjeff"
+EMAIL="slackjeff@riseup.net"
diff --git a/system/yakuake/README b/system/yakuake/README
deleted file mode 100644
index be602331b3..0000000000
--- a/system/yakuake/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Yakuake (Yet Another Kuake) is a KDE terminal emulator.  Its design was
-inspired from consoles in computer games such as Quake which slide down from
-the top of the screen when a key is pressed, and slide back up when the key
-is pressed again.
-
-Running Yakuake is faster than launching a new terminal with a keyboard
-shortcut because the program is already loaded into memory, and so can be
-useful to people who frequently find themselves opening and closing
-terminals for odd tasks.
diff --git a/system/yakuake/doinst.sh b/system/yakuake/doinst.sh
deleted file mode 100644
index 7c2b4d5242..0000000000
--- a/system/yakuake/doinst.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
-
-
diff --git a/system/yakuake/slack-desc b/system/yakuake/slack-desc
deleted file mode 100644
index 59f88d8cf7..0000000000
--- a/system/yakuake/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-yakuake: yakuake (Yet Another Kuake, KDE terminal emulator)
-yakuake:
-yakuake: Yakuake is a KDE terminal emulator. Its design was inspired from
-yakuake: consoles in computer games such as Quake which slide down from the top
-yakuake: of the screen when a key is pressed, and slide back up when the key is
-yakuake: pressed again. Its features include:
-yakuake: - Smoothly rolls down from the top of your screen
-yakuake: - Tabbed interface, Skinnable
-yakuake: - Configurable dimensions and animation speed
-yakuake: - Sophisticated DCOP interface
-yakuake:
diff --git a/system/yakuake/yakuake.SlackBuild b/system/yakuake/yakuake.SlackBuild
deleted file mode 100644
index 39a8686e79..0000000000
--- a/system/yakuake/yakuake.SlackBuild
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-
-# SlackBuild script for yakuake
-
-# Copyright 2012-2017  Matthew "mfillpot" Fillpot
-# Copyright 2018 Greg Tourte <artourter@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR
-# IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-# TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Slackware build script for yakuake
-# Originally Written by Steffen Schwebel (steffen.schwebel at web.de)
-
-# Modified by SlackBuilds.org
-
-PRGNAM=yakuake
-VERSION=${VERSION:-2.9.9}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ $ARCH = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ $ARCH = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ $ARCH = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir build
-( cd build
-cmake \
-  -DCMAKE_C_FLAGS="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DLIB_SUFFIX="$LIBDIRSUFFIX" \
-  -DCMAKE_BUILD_TYPE="Release" \
-  -Wno-dev \
-  ..
-
-make
-make install DESTDIR=$PKG
-)
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* KDE4FAQ NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc -type f -exec chmod 0644 {} \;
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/yakuake/yakuake.info b/system/yakuake/yakuake.info
deleted file mode 100644
index b39cbafe06..0000000000
--- a/system/yakuake/yakuake.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="yakuake"
-VERSION="2.9.9"
-HOMEPAGE="https://yakuake.kde.org"
-DOWNLOAD="https://download.kde.org/stable/yakuake/2.9.9/src/yakuake-2.9.9.tar.xz"
-MD5SUM="ef97612710b28d62e43a58bed49cbead"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="ArTourter"
-EMAIL="artourter@gmail.com"
diff --git a/system/yank/README b/system/yank/README
new file mode 100644
index 0000000000..28f951094a
--- /dev/null
+++ b/system/yank/README
@@ -0,0 +1,17 @@
+yank (yank terminal output to clipboard)
+
+The yank(1) utility reads input from stdin and display a selection
+interface that allows a field to be selected and copied to the
+clipboard. Fields are either recognized by a regular expression using
+the -g option or by splitting the input on a delimiter sequence using
+the -d option.
+
+Using the arrow keys will move the selected field. The interface
+supports several Emacs and Vi like key bindings, consult the man page
+for further reference. Pressing the return key will invoke the yank
+command and write the selected field to its stdin. The yank command
+defaults to xsel(1) but could be anything that accepts input on stdin.
+
+Note: xsel is not a required dependency for this, but it's highly
+recommended, at least if you're using X. For Wayland users, there's
+probably an equivalent tool.
diff --git a/system/yank/slack-desc b/system/yank/slack-desc
new file mode 100644
index 0000000000..322091f951
--- /dev/null
+++ b/system/yank/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+yank: yank (yank terminal output to clipboard)
+yank:
+yank: The yank(1) utility reads input from stdin and display a selection
+yank: interface that allows a field to be selected and copied to the
+yank: clipboard. Fields are either recognized by a regular expression using
+yank: the -g option or by splitting the input on a delimiter sequence using
+yank: the -d option.
+yank:
+yank: Using the arrow keys will move the selected field. The interface
+yank: supports several Emacs and Vi like key bindings, consult the man page
+yank: for further reference.
diff --git a/system/yank/yank.SlackBuild b/system/yank/yank.SlackBuild
new file mode 100644
index 0000000000..f6009a916b
--- /dev/null
+++ b/system/yank/yank.SlackBuild
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+# Slackware build script for yank
+
+# Written by B. Watson (urchlay@slackware.uk)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=yank
+VERSION=${VERSION:-1.3.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+# use our flags:
+sed -i "/-Wextra/s,\$, $SLKCFLAGS," Makefile
+
+# manpage doubleplusungood refs unmanpage:
+sed -i 's,re_format,regex,g' $PRGNAM.1
+
+make
+make install DESTDIR=$PKG PREFIX=/usr MANPREFIX=/usr/man
+gzip -9 $PKG/usr/man/man1/*.1
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a CHANGELOG* LICENSE* README* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/yank/yank.info b/system/yank/yank.info
new file mode 100644
index 0000000000..2757f0a14e
--- /dev/null
+++ b/system/yank/yank.info
@@ -0,0 +1,10 @@
+PRGNAM="yank"
+VERSION="1.3.0"
+HOMEPAGE="https://github.com/mptre/yank/"
+DOWNLOAD="https://github.com/mptre/yank/archive/v1.3.0/yank-1.3.0.tar.gz"
+MD5SUM="2789f1cae0604fb5b84cfd5689cb752f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/yash/README b/system/yash/README
index ca964a8139..16bcf05cc5 100644
--- a/system/yash/README
+++ b/system/yash/README
@@ -1,5 +1,5 @@
-Yash, yet another shell, is a POSIX-compliant command line shell written
-by Watanabe Yuki (aka magicant) in C99 (ISO/IEC 9899:1999). It was
-originally written as a work on a university course assignment, but the
-code has been re-written from scratch to meet the requirement of POSIX.
-Yash is intended to be the most POSIX-compliant shell in the world.
+Yash (yet another shell) is a POSIX-compliant command line shell written
+by Yuki Watanabe (aka magicant) in C99 (ISO/IEC 9899:1999). It was
+originally written as a university assignment, but the code has since
+been re-written from scratch to meet POSIX requirements. Yash is
+intended to be the most POSIX-compliant shell in the world.
diff --git a/system/yash/slack-desc b/system/yash/slack-desc
index 3739299edd..39f5b036aa 100644
--- a/system/yash/slack-desc
+++ b/system/yash/slack-desc
@@ -8,12 +8,12 @@
     |-----handy-ruler------------------------------------------------------|
 yash: yash (POSIX-compliant command line shell)
 yash:
-yash: Yash, yet another shell, is a POSIX-compliant command line shell
-yash: written by Watanabe Yuki (aka magicant) in C99 (ISO/IEC 9899:1999).
+yash: Yash (yet another shell) is a POSIX-compliant command line shell
+yash: written by Yuki Watanabe (aka magicant) in C99 (ISO/IEC 9899:1999).
 yash: Yash is intended to be the most POSIX-compliant shell in the world.
 yash:
-yash: Homepage: https://yash.osdn.jp/index.html.en
-yash:
+yash: Author: Yuki Watanabe
+yash: Homepage: https://magicant.github.io/yash/
 yash:
 yash:
 yash:
diff --git a/system/yash/yash.SlackBuild b/system/yash/yash.SlackBuild
index 5a93ecb8d4..82f67447e2 100644
--- a/system/yash/yash.SlackBuild
+++ b/system/yash/yash.SlackBuild
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for yash
 
 # Copyright 2015-2018 Leonard Schmidt <lems@gmx.net>
 # Copyright 2018-2020 Hunter Sezen <orbea@riseup.net>
+# Copyright 2023-2024 K. Eugene Carlson <kvngncrlsn@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +24,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=yash
-VERSION=${VERSION:-2.51}
+VERSION=${VERSION:-2.56.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,23 +40,26 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -eu
@@ -77,8 +84,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man
 
 make
-# make test is problematic on 14.2
-#make test
+make test
 make install DESTDIR=$PKG
 
 mkdir -p $PKG/usr/bin
@@ -91,7 +97,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING NEWS NEWS.ja README README.ja THANKS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING NEWS NEWS.ja README.md README.ja.md THANKS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -99,4 +105,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/yash/yash.info b/system/yash/yash.info
index 1267972a88..809beab497 100644
--- a/system/yash/yash.info
+++ b/system/yash/yash.info
@@ -1,10 +1,10 @@
 PRGNAM="yash"
-VERSION="2.51"
-HOMEPAGE="https://yash.osdn.jp/index.html.en"
-DOWNLOAD="https://osdn.net/dl/yash/yash-2.51.tar.xz"
-MD5SUM="91d0c0fa548c9c9a081893f515b4f049"
+VERSION="2.56.1"
+HOMEPAGE="https://magicant.github.io/yash/"
+DOWNLOAD="https://github.com/magicant/yash/releases/download/2.56.1/yash-2.56.1.tar.xz"
+MD5SUM="c871fe6cf3eef8c753690bd617b92fd4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="K. Eugene Carlson"
+EMAIL="kvngncrlsn@gmail.com"
diff --git a/system/yaze-ag/Makefile.patch b/system/yaze-ag/Makefile.patch
new file mode 100644
index 0000000000..4fea92dbd1
--- /dev/null
+++ b/system/yaze-ag/Makefile.patch
@@ -0,0 +1,21 @@
+--- Makefile	2021-12-20 20:33:32.000000000 +0000
++++ Makefile.new	2022-05-28 19:10:55.440386452 +0100
+@@ -6,12 +6,12 @@
+ CC            =	gcc
+ 
+ #where you want the binaries and manual page
+-BINDIR	      = /usr/local/bin
+-MANDIR	      = /usr/local/man/man1
+-LIBDIR	      = /usr/local/lib/yaze
+-DSKDIR        = $(LIBDIR)/disks
+-DOCDIR        = $(LIBDIR)/doc
+-DOCHTMLDIR    = $(LIBDIR)/doc_html
++BINDIR	      = /usr/bin
++MANDIR	      = /usr/man/man1
++LIBDIR	      = /usr/lib/yaze-ag
++DSKDIR        = /usr/share/yaze-ag/disks
++DOCDIR        = /usr/doc/yaze-ag-2.51.3/doc
++DOCHTMLDIR    = /usr/doc/yaze-ag-2.51.3/doc_html
+ 
+ #OPTIMIZE	= -g -m486
+ #OPTIMIZE	= -g -save-temps -m486
diff --git a/system/yaze-ag/README b/system/yaze-ag/README
new file mode 100644
index 0000000000..8604bb2302
--- /dev/null
+++ b/system/yaze-ag/README
@@ -0,0 +1,26 @@
+yaze-ag is designed to provide an exact simulation of the Z80
+microprocessor. It is fast, emulates undocumented opcodes, and
+passes instruction regression tests against real Z80 hardware.
+NEW in yaze-ag version 2.xx is the support of an emulated Memory
+Management Unit (MMU) and the BIOS which supports CP/M 3.1.
+
+YAZE-AG is a Z80-CPU-Emulator and NOT a CP/M-Emulator!
+
+Inside the Emulator runs an original CP/M or a replacement of CP/M.
+
+YAZE-AG uses the free CP/M 3.1 replacement "ZPM3N10" of Simeon Cran
+(bootfile "yaze-cpm3.boot") or the CP/M 2.2 replacement "Superdos"
+(bootfile "yaze.boot").
+
+(Optionally) when building on x84_64 you can specify an alternative
+Makefile like this:
+
+./yaze-ag.SlackBuild  Makefile_linux_64_intel_corei7
+./yaze-ag.SlackBuild  Makefile_linux_64_intel_nocona
+./yaze-ag.SlackBuild  Makefile_linux_64_intel_skylake
+./yaze-ag.SlackBuild  Makefile_linux_64_intel_tigerlake
+./yaze-ag.SlackBuild  Makefile_linux_64_amd_athlon64
+
+Please visit the homepage for further reading on this excelent
+emulator.
+
diff --git a/system/yaze-ag/doinst.sh b/system/yaze-ag/doinst.sh
new file mode 100644
index 0000000000..aea0f894eb
--- /dev/null
+++ b/system/yaze-ag/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/yaze-ag/slack-desc b/system/yaze-ag/slack-desc
new file mode 100644
index 0000000000..25406666e2
--- /dev/null
+++ b/system/yaze-ag/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+yaze-ag: yaze-ag (yet another z80 emulator )
+yaze-ag:
+yaze-ag: is designed to provide an exact simulation of the Z80 microprocessor.
+yaze-ag: It is fast, emulates undocumented opcodes, and passes instruction
+yaze-ag: regression tests against real Z80 hardware.
+yaze-ag: NEW in yaze-ag version 2.xx is the support of an emulated Memory
+yaze-ag: Management Unit (MMU) and the BIOS which supports CP/M 3.1.
+yaze-ag:
+yaze-ag: YAZE-AG is a Z80-CPU-Emulator and NOT a CP/M-Emulator!
+yaze-ag: Inside the Emulator runs an original CP/M or a replacement of CP/M.
+yaze-ag: Please visit homepage for further reading on this excelent emulator.
diff --git a/system/yaze-ag/yaze-ag.SlackBuild b/system/yaze-ag/yaze-ag.SlackBuild
new file mode 100644
index 0000000000..9c5f27fe4c
--- /dev/null
+++ b/system/yaze-ag/yaze-ag.SlackBuild
@@ -0,0 +1,162 @@
+#!/bin/bash
+
+# Slackware build script for yaze-ag
+
+# Copyright 2022 Antonio Leal, Lisbon, Portugal
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=yaze-ag
+VERSION=${VERSION:-2.51.3}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+BUILDDIR=$TMP/$PRGNAM-$VERSION
+
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+rm -rf $PKG $BUILDDIR
+mkdir -p $TMP $PKG $OUTPUT $BUILDDIR
+cd $TMP
+tar xvfz $CWD/$PRGNAM-$VERSION.tar.gz
+cd $BUILDDIR
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+if [ "$1" != "" ]; then
+    if [ -f "$1" ]; then
+        echo
+        echo "Building with $1"
+        echo
+        cp $1 Makefile
+    else
+        echo
+        echo "$1 does not exist."
+        echo
+        exit 1
+    fi
+else
+    case "$( uname -m )" in
+    i?86)
+            cp Makefile_linux_32_i586 Makefile
+            ;;
+    x86_64)
+            cp Makefile_linux_64_intel_corei7 Makefile
+            ;;
+    *) echo "Package for $(uname -m) architecture is not available." ; exit 1 ;;
+    esac
+fi
+patch Makefile $CWD/Makefile.patch
+patch yaze.sh $CWD/yaze.sh.patch
+make
+BINDIR=${BINDIR:-$PKG/usr/bin}
+MANDIR=${MANDIR:-$PKG/usr/man/man1}
+LIBDIR=${LIBDIR:-$PKG/usr/lib/yaze-ag}
+DSKDIR=${DSKDIR:-$PKG/usr/share/yaze-ag/disks}
+DOCDIR=${DOCDIR:-$PKG/usr/doc/yaze-ag-$VERSION/doc}
+DOCHTMLDIR=${DOCHTMLDIR:-$PKG/usr/doc/yaze-ag-$VERSION/doc_html}
+mkdir -p $BINDIR $MANDIR $LIBDIR $DSKDIR $DOCDIR $DOCHTMLDIR
+install -s -c -m 755 yaze_bin $BINDIR
+install -s -c -m 755 cdm $BINDIR
+install -c -m 755 yaze $BINDIR
+install -c -m 644 yaze-cpm3.boot $LIBDIR
+install -c -m 644 yaze.boot $LIBDIR
+install -c -m 644 m2.ktt $LIBDIR
+install -c -m 644 sample.ktt $LIBDIR
+install -c -m 644 yaze.ktt $LIBDIR
+install -c -m 644 yaze.1 $MANDIR
+install -c -m 644 cdm.1 $MANDIR
+install -c -m 644 cpm.1 $MANDIR
+install -c -m 644 z80.1 $MANDIR
+/bin/sh $BUILDDIR/install_disks.sh $DSKDIR
+/bin/sh $BUILDDIR/install_doc.sh $DOCDIR
+/bin/sh $BUILDDIR/install_doc_html.sh $DOCHTMLDIR
+cd $LIBDIR
+rm -f md5 $BUILDDIR/md5.yaze-ag
+find . -type f -exec /bin/md5sum -b {} >>$BUILDDIR/md5.yaze-ag \; 
+mv $BUILDDIR/md5.yaze-ag md5
+
+mkdir -p $PKG/usr/share/pixmaps
+cp $CWD/yaze-ag.png $PKG/usr/share/pixmaps
+mkdir -p $PKG/usr/share/applications
+cp $CWD/yaze-ag.desktop $PKG/usr/share/applications
+
+( cd $BINDIR ; rm -rf cpm )
+( cd $BINDIR ; ln -sf yaze cpm )
+( cd $BINDIR ; rm -rf z80 )
+( cd $BINDIR ; ln -sf yaze z80 )
+
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr//man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/yaze-ag-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/yaze-ag/yaze-ag.desktop b/system/yaze-ag/yaze-ag.desktop
new file mode 100644
index 0000000000..c24fa52da9
--- /dev/null
+++ b/system/yaze-ag/yaze-ag.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Yaze-AG
+Comment=Z80 Emulator with CPM
+Exec=/usr/bin/yaze
+Icon=/usr/share/pixmaps/yaze-ag.png
+Terminal=true
+Type=Application
+Categories=System;Emulator;
+
diff --git a/system/yaze-ag/yaze-ag.info b/system/yaze-ag/yaze-ag.info
new file mode 100644
index 0000000000..8e83e3e7e2
--- /dev/null
+++ b/system/yaze-ag/yaze-ag.info
@@ -0,0 +1,10 @@
+PRGNAM="yaze-ag"
+VERSION="2.51.3"
+HOMEPAGE="https://www.mathematik.uni-ulm.de/users/ag/yaze-ag"
+DOWNLOAD="https://www.mathematik.uni-ulm.de/users/ag/yaze-ag/devel/yaze-ag-2.51.3.tar.gz"
+MD5SUM="2c005d44d190665b5d9066307a2b4a9b"
+DOWNLOAD_x86_64="https://www.mathematik.uni-ulm.de/users/ag/yaze-ag/devel/yaze-ag-2.51.3.tar.gz"
+MD5SUM_x86_64="2c005d44d190665b5d9066307a2b4a9b"
+REQUIRES=""
+MAINTAINER="Antonio Leal"
+EMAIL="antonioleal@yahoo.com"
diff --git a/system/yaze-ag/yaze-ag.png b/system/yaze-ag/yaze-ag.png
new file mode 100644
index 0000000000..4f174edf3a
--- /dev/null
+++ b/system/yaze-ag/yaze-ag.png
diff --git a/system/yaze-ag/yaze.sh.patch b/system/yaze-ag/yaze.sh.patch
new file mode 100644
index 0000000000..9b5a05d26e
--- /dev/null
+++ b/system/yaze-ag/yaze.sh.patch
@@ -0,0 +1,16 @@
+--- yaze.sh	2015-04-26 15:15:29.000000000 +0100
++++ yaze.sh.new	2022-05-28 20:33:43.386759212 +0100
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+ 
+-S_YAZEFILES=/usr/local/lib/yaze
+-S_CPMDSKS=/usr/local/lib/yaze/disks
+-S_DOCFILES=/usr/local/lib/yaze/doc
+-S_DOCFILES_html=/usr/local/lib/yaze/doc_html
++S_YAZEFILES=/usr/lib/yaze-ag
++S_CPMDSKS=/usr/share/yaze-ag/disks
++S_DOCFILES=/usr/doc/yaze-ag-2.51.3/doc
++S_DOCFILES_html=/usr/doc/yaze-ag-2.51.3/doc_html
+ 
+ if [ ! -f .yazerc ]
+ then
diff --git a/system/yeahconsole/52-yeahkeys.patch b/system/yeahconsole/52-yeahkeys.patch
new file mode 100644
index 0000000000..78b2d816ce
--- /dev/null
+++ b/system/yeahconsole/52-yeahkeys.patch
@@ -0,0 +1,21 @@
+Description: Recognize Shift key, Meta, and Super key names
+Author: Decklin Foster <decklin@red-bean.com>
+Forwarded: mailto:knorke@phrat.de
+Bug-Debian: https://bugs.debian.org/506062
+
+--- a/yeahconsole.c
++++ b/yeahconsole.c
+@@ -294,9 +294,11 @@
+ 	
+     if (strstr(opt, "Control"))
+ 	modmask = modmask | ControlMask;
+-    if (strstr(opt, "Alt"))
++    if (strstr(opt, "Shift"))
++	modmask = modmask | ShiftMask;
++    if (strstr(opt, "Meta") || strstr(opt, "Alt"))
+ 	modmask = modmask | Mod1Mask;
+-    if (strstr(opt, "Win"))
++    if (strstr(opt, "Super") || strstr(opt, "Win"))
+ 	modmask = modmask | Mod4Mask;
+     if (strstr(opt, "None"))
+ 	modmask = 0;
diff --git a/system/yeahconsole/yeahconsole.1 b/system/yeahconsole/yeahconsole.1
index a3693e366a..ec7bbe7f05 100644
--- a/system/yeahconsole/yeahconsole.1
+++ b/system/yeahconsole/yeahconsole.1
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: YEAHCONSOLE
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: April  15, 2006
+.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
+.\"      Date: August 9, 2021
 .\"    Manual: SlackBuilds.org
-.\"    Source: yeahconsole
+.\"    Source: yeahconsole 0.3.4
 .\"  Language: English
 .\"
-.TH "YEAHCONSOLE" "1" "April 15, 2006" "yeahconsole" "SlackBuilds.org"
+.TH "YEAHCONSOLE" "1" "August 9, 2021" "yeahconsole 0.3.4" "SlackBuilds.org"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -43,14 +43,14 @@ Debian(TM)
 distribution because the original program does not have a manual page\&.
 .PP
 \fByeahconsole\fR
-is a wrapper for X terminal emulators that provide a drop\-down terminal embedding other terminal emulators
+is a wrapper for X terminal emulators that provides a drop\-down terminal embedding other terminal emulators
 .SH "OPTIONS"
 .PP
 A summary of options is included below\&. Any other argument is passed to the X terminal emulator\&.
 .PP
 \fB\-h\fR
 .RS 4
-Show summary of options and supported xresources\&.
+Show summary of options and supported X resources\&.
 .RE
 .PP
 \fB\-e\fR \fIcommand\fR
@@ -85,7 +85,7 @@ number of lines of the console\&. Default is 10\&.
 .PP
 \fBxOffset\fR
 .RS 4
-x position\&. Default is set to 0\&.
+x position\&. Default is 0\&.
 .RE
 .PP
 \fBaniDelay\fR
@@ -95,7 +95,7 @@ delay for the slide animation\&. Default is 40\&.
 .PP
 \fBstepSize\fR
 .RS 4
-step size in pixels for the animation 0 will disable the animation\&. Default is set 1\&.
+step size in pixels for the animation\&. 0 will disable the animation\&. Default is 1\&.
 .RE
 .PP
 \fBhandleWidth\fR
@@ -133,14 +133,18 @@ xterm (1), rxvt (1)\&.
 .SH "AUTHOR"
 .PP
 This manual page was written by
-DamiánViano<debian@damianv\&.com\&.ar>
+Damián
+Viano
+<debian@damianv\&.com\&.ar>
 for the
 Debian(TM)
 system (but may be used by others)\&. Permission is granted to copy, distribute and/or modify this document under the terms of the
 GNU
 General Public License, Version 2 any later version published by the Free Software Foundation\&.
 .PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL\&.
+This man page has been modified slightly by B\&. Watson for the SlackBuilds\&.org project\&.
+.PP
+The complete text of the GNU General Public License can be found at https://www\&.gnu\&.org/licenses/old\-licenses/gpl\-2\&.0\&.txt\&.
 .SH "COPYRIGHT"
 .br
 Copyright \(co 2006 Damián Viano
diff --git a/system/yeahconsole/yeahconsole.SlackBuild b/system/yeahconsole/yeahconsole.SlackBuild
index 40028c8d53..4ab69131c9 100644
--- a/system/yeahconsole/yeahconsole.SlackBuild
+++ b/system/yeahconsole/yeahconsole.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for yeahconsole
 
@@ -22,7 +22,12 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Now maintained by B. Watson <yalhcru@gmail.com>
+# Now maintained by B. Watson <urchlay@slackware.uk>
+
+# 20210809 bkw:
+# - BUILD=3
+# - add patch for Shift/Meta/Super/Win key names
+# - clean up man page
 
 # 20170210 bkw:
 # - Take over maintenance
@@ -33,10 +38,13 @@
 #   for multilib users.
 # - minor cosmetic fixes
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=yeahconsole
 VERSION=${VERSION:-0.3.4}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -46,7 +54,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -74,15 +86,15 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # apply patch from debian, fixes a segfault when DISPLAY isn't set.
 patch -p1 < $CWD/50-display.patch
 
+# another patch from debian, recognize shift/meta/super key names.
+patch -p1 < $CWD/52-yeahkeys.patch
+
 make FLAGS="$SLKCFLAGS" LIB_DIRS="-L/usr/lib$LIBDIRSUFFIX"
 strip $PRGNAM
 mkdir -p $PKG/usr/bin
@@ -103,4 +115,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/yeahconsole/yeahconsole.info b/system/yeahconsole/yeahconsole.info
index c8ec72a50f..054361958a 100644
--- a/system/yeahconsole/yeahconsole.info
+++ b/system/yeahconsole/yeahconsole.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/yeahconsole/yeahconsole.xml b/system/yeahconsole/yeahconsole.xml
index 446c7fc018..f99e68109b 100644
--- a/system/yeahconsole/yeahconsole.xml
+++ b/system/yeahconsole/yeahconsole.xml
@@ -5,7 +5,7 @@
 
   <!ENTITY dhfirstname "<firstname>Damián</firstname>">
   <!ENTITY dhsurname   "<surname>Viano</surname>">
-  <!ENTITY dhdate      "<date>April  15, 2006</date>">
+  <!ENTITY dhdate      "<date>August 9, 2021</date>">
   <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
   <!ENTITY dhemail     "<email>debian@damianv.com.ar</email>">
   <!ENTITY dhusername  "&dhfirstname; &dhsurname;">
@@ -20,7 +20,7 @@
 <refentry>
   <refentryinfo>
     <title>SlackBuilds.org</title>
-	 <productname>&dhpackage;</productname>
+	 <productname>&dhpackage; 0.3.4</productname>
     <address>
       &dhemail;
     </address>
@@ -58,7 +58,7 @@
     <para>This manual page was written for the &debian; distribution
       because the original program does not have a manual page.</para>
 
-    <para><command>&dhpackage;</command> is a wrapper for X terminal emulators that provide a drop-down terminal embedding other terminal emulators</para>
+    <para><command>&dhpackage;</command> is a wrapper for X terminal emulators that provides a drop-down terminal embedding other terminal emulators</para>
 
   </refsect1>
   <refsect1>
@@ -71,7 +71,7 @@
         <term><option>-h</option>
         </term>
         <listitem>
-          <para>Show summary of options and supported xresources.</para>
+          <para>Show summary of options and supported X resources.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -121,7 +121,7 @@
         <term><option>xOffset</option>
         </term>
         <listitem>
-          <para>x position. Default is set to 0.</para>
+          <para>x position. Default is 0.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -135,7 +135,7 @@
         <term><option>stepSize</option>
         </term>
         <listitem>
-          <para>step size in pixels for the animation 0 will disable the animation. Default is set 1.</para>
+          <para>step size in pixels for the animation. 0 will disable the animation. Default is 1.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -197,9 +197,12 @@
       the terms of the &gnu; General Public License, Version 2 any 
 	  later version published by the Free Software Foundation.
     </para>
+   <para>This man page has been modified slightly by B. Watson for
+         the SlackBuilds.org project.
+   </para>
 	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
+	  The complete text of the GNU General Public
+	  License can be found at https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 	</para>
 
   </refsect1>
diff --git a/system/yelp-tools/README b/system/yelp-tools/README
index 92f7d0f688..b7754e9943 100644
--- a/system/yelp-tools/README
+++ b/system/yelp-tools/README
@@ -1 +1,2 @@
-yelp-tools is a set of command-line tools to build and check documentation.
+yelp-tools is a set of command-line tools to build and check
+documentation.
diff --git a/system/yelp-tools/yelp-tools.SlackBuild b/system/yelp-tools/yelp-tools.SlackBuild
index 8acb722736..d7ae9d4d16 100644
--- a/system/yelp-tools/yelp-tools.SlackBuild
+++ b/system/yelp-tools/yelp-tools.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for yelp-tools
 
-# Copyright 2014-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2022 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=yelp-tools
-VERSION=${VERSION:-3.18.0}
+VERSION=${VERSION:-42.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -69,29 +79,31 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* NEWS README* MAINTAINERS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/yelp-tools/yelp-tools.info b/system/yelp-tools/yelp-tools.info
index 25caf333d3..57fc61c9bc 100644
--- a/system/yelp-tools/yelp-tools.info
+++ b/system/yelp-tools/yelp-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="yelp-tools"
-VERSION="3.18.0"
-HOMEPAGE="http://projects.gnome.org/yelp/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/yelp-tools/3.18/yelp-tools-3.18.0.tar.xz"
-MD5SUM="ceca436ff2ab3900dde718c0f0286f3f"
+VERSION="42.1"
+HOMEPAGE="https://projects.gnome.org/yelp/"
+DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/yelp-tools/42/yelp-tools-42.1.tar.xz"
+MD5SUM="d106655b3a8f8fc5fa71fbd3c2409cb8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="yelp-xsl"
diff --git a/system/yelp-xsl/yelp-xsl.SlackBuild b/system/yelp-xsl/yelp-xsl.SlackBuild
index 0cc61ca040..069a3eeb91 100644
--- a/system/yelp-xsl/yelp-xsl.SlackBuild
+++ b/system/yelp-xsl/yelp-xsl.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for yelp-xsl
 
-# Copyright 2014-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2022 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=yelp-xsl
-VERSION=${VERSION:-3.20.1}
+VERSION=${VERSION:-42.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -80,18 +87,18 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-make $NUMJOBS || make
+make
 make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* ChangeLog INSTALL NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/yelp-xsl/yelp-xsl.info b/system/yelp-xsl/yelp-xsl.info
index 378d681bc1..8c52fa75cb 100644
--- a/system/yelp-xsl/yelp-xsl.info
+++ b/system/yelp-xsl/yelp-xsl.info
@@ -1,10 +1,10 @@
 PRGNAM="yelp-xsl"
-VERSION="3.20.1"
-HOMEPAGE="http://projects.gnome.org/yelp/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz"
-MD5SUM="2332716e6e39125a942bc761a6f94211"
+VERSION="42.1"
+HOMEPAGE="https://projects.gnome.org/yelp/"
+DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/yelp-xsl/42/yelp-xsl-42.1.tar.xz"
+MD5SUM="c41858c78e34bb8b68a535657a3e15d9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3-lxml"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/system/yelp/README b/system/yelp/README
index 353e2f8f76..6daeb04e7b 100644
--- a/system/yelp/README
+++ b/system/yelp/README
@@ -1,2 +1,7 @@
 yelp allows you to view documentation regarding GNOME and other
 components through a variety of formats
+
+Conflict warning: webkit2gtk and webkit2gtk4.1 conflict with each
+other. Since this depends on webkit2gtk (with 4.0 API), yelp cannot
+be used with (or even installed on the same system as) software that
+requires webkit2gtk4.1.
diff --git a/system/yelp/yelp.SlackBuild b/system/yelp/yelp.SlackBuild
index ca7e39e815..f12b8946e5 100644
--- a/system/yelp/yelp.SlackBuild
+++ b/system/yelp/yelp.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for yelp
 
-# Copyright 2014-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2024 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=yelp
-VERSION=${VERSION:-3.22.0}
+VERSION=${VERSION:-42.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -80,6 +87,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-static=no \
   --disable-schemas-compile \
+  --with-webkit2gtk-4-0 \
   --build=$ARCH-slackware-linux
 
 make
@@ -89,12 +97,14 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* ChangeLog NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/yelp/yelp.info b/system/yelp/yelp.info
index f274e5ba76..872a5ae246 100644
--- a/system/yelp/yelp.info
+++ b/system/yelp/yelp.info
@@ -1,10 +1,10 @@
 PRGNAM="yelp"
-VERSION="3.22.0"
+VERSION="42.2"
 HOMEPAGE="http://projects.gnome.org/yelp/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/yelp/3.22/yelp-3.22.0.tar.xz"
-MD5SUM="2195842c812b4bf3d9903e4e41cb5dd1"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/yelp/42/yelp-42.2.tar.xz"
+MD5SUM="3792122c4ab90725716cd88e9274f0f6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="yelp-tools webkit2gtk"
+REQUIRES="yelp-tools webkit2gtk libhandy"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/system/yq/README b/system/yq/README
new file mode 100644
index 0000000000..796b0188e3
--- /dev/null
+++ b/system/yq/README
@@ -0,0 +1,11 @@
+a lightweight and portable command-line YAML, JSON and XML processor.
+yq uses jq like syntax but works with yaml files as well as json, xml,
+properties, csv and tsv. It doesn't yet support everything jq does -
+but it does support the most common operations and functions, and more
+is being added continuously.
+
+pandoc is required to build the docs
+
+Warning: This SlackBuild requires network access when it runs, meaning
+it downloads files from the Internet with root access. You should
+decide for yourself whether or not you think this is a good idea.
diff --git a/system/yq/slack-desc b/system/yq/slack-desc
new file mode 100644
index 0000000000..3117089a7f
--- /dev/null
+++ b/system/yq/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+  |-----handy-ruler------------------------------------------------------|
+yq: yq (portable command-line YAML, JSON, XML, CSV, TOML processor)
+yq:
+yq: a lightweight and portable command-line YAML, JSON and XML processor.
+yq: yq uses jq like syntax but works with yaml files as well as json,
+yq: xml, properties, csv and tsv. It doesn't yet support everything jq
+yq: does - but it does support the most common operations and functions,
+yq: and more is being added continuously.
+yq:
+yq: Homepage: https://github.com/mikefarah/yq
+yq:
+yq:
diff --git a/system/yq/yq.SlackBuild b/system/yq/yq.SlackBuild
new file mode 100644
index 0000000000..5c2413d2dc
--- /dev/null
+++ b/system/yq/yq.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# Slackware build script for terraform
+
+# Copyright 2022 Julian Grinblat <julian@dotcore.co.il>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=yq
+VERSION=${VERSION:-4.43.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+GOOS=linux
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+case "$ARCH" in
+  x86_64) GOARCH=amd64 ;;
+    i586) GOARCH=386 ;;
+       *) GOARCH=$ARCH ;;
+esac
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+GOPATH=$TMP/go
+mkdir -p $GOPATH
+
+GOPATH=$GOPATH \
+GOOS=$GOOS \
+GOARCH=$GOARCH \
+CGO_ENABLED=0 \
+go build \
+  -mod=readonly \
+  -ldflags='-w -s' # In release mode we don't want debug information in the binary
+
+install -D -m 0755 yq $PKG/usr/bin/yq
+
+if command -v pandoc &> /dev/null
+then
+  ./scripts/generate-man-page-md.sh
+  ./scripts/generate-man-page.sh
+  mkdir -p $PKG/usr/man/man1
+  install -D -m 644 yq.1 $PKG/usr/man/man1
+  find $PKG/usr/man -type f -exec gzip -9 {} \;
+  for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE README.md CODE_OF_CONDUCT.md CONTRIBUTING.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/yq/yq.info b/system/yq/yq.info
new file mode 100644
index 0000000000..86a56bda63
--- /dev/null
+++ b/system/yq/yq.info
@@ -0,0 +1,10 @@
+PRGNAM="yq"
+VERSION="4.43.1"
+HOMEPAGE="https://github.com/mikefarah/yq"
+DOWNLOAD="https://github.com/mikefarah/yq/archive/refs/tags/v4.43.1/yq-4.43.1.tar.gz"
+MD5SUM="ec908b9211767299b597991c0a284a5a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="google-go-lang"
+MAINTAINER="Julian Grinblat"
+EMAIL="julian@dotcore.co.il"
diff --git a/system/yubico-piv-tool/README b/system/yubico-piv-tool/README
new file mode 100644
index 0000000000..43f8d29967
--- /dev/null
+++ b/system/yubico-piv-tool/README
@@ -0,0 +1,6 @@
+The Yubico PIV tool is used for interacting with the Personal Identity
+Verification (PIV) application on a YubiKey.
+
+With it you may generate keys on the device, importing keys and
+certificates, and create certificate requests, and other operations. A
+shared library and a command-line tool is included.
diff --git a/system/yubico-piv-tool/slack-desc b/system/yubico-piv-tool/slack-desc
new file mode 100644
index 0000000000..1c26b58c7b
--- /dev/null
+++ b/system/yubico-piv-tool/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+yubico-piv-tool: yubico-piv-tool (tool for interacting with YubiKey PIV)
+yubico-piv-tool:
+yubico-piv-tool: The Yubico PIV tool is used for interacting with the Personal
+yubico-piv-tool: Identity Verification (PIV) application on a YubiKey.
+yubico-piv-tool:
+yubico-piv-tool: With it you may generate keys on the device, importing keys
+yubico-piv-tool: and certificates, and create certificate requests, and other
+yubico-piv-tool: operations.
+yubico-piv-tool:
+yubico-piv-tool: A shared library and a command-line tool is included.
+yubico-piv-tool:
diff --git a/system/yubico-piv-tool/yubico-piv-tool.SlackBuild b/system/yubico-piv-tool/yubico-piv-tool.SlackBuild
new file mode 100644
index 0000000000..6edd4e7d78
--- /dev/null
+++ b/system/yubico-piv-tool/yubico-piv-tool.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/bash
+
+# Slackware build script for yubico-piv-tool
+
+# Copyright 2024 pyllyukko
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=yubico-piv-tool
+VERSION=${VERSION:-2.5.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DYKPIV_INSTALL_MAN_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING NEWS README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/yubico-piv-tool/yubico-piv-tool.info b/system/yubico-piv-tool/yubico-piv-tool.info
new file mode 100644
index 0000000000..40f274a826
--- /dev/null
+++ b/system/yubico-piv-tool/yubico-piv-tool.info
@@ -0,0 +1,10 @@
+PRGNAM="yubico-piv-tool"
+VERSION="2.5.1"
+HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/"
+DOWNLOAD="https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-2.5.1.tar.gz"
+MD5SUM="f354366991e45c5206eabdd9fee8f81c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="gengetopt pcsc-lite"
+MAINTAINER="pyllyukko"
+EMAIL="pyllyukko@maimed.org"
diff --git a/system/z/z.SlackBuild b/system/z/z.SlackBuild
index e531f29576..b236a7ceca 100644
--- a/system/z/z.SlackBuild
+++ b/system/z/z.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for z
 
@@ -22,14 +22,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=z
 VERSION=${VERSION:-1.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -63,4 +73,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/z/z.info b/system/z/z.info
index 8efd7b0dd3..644bf1285f 100644
--- a/system/z/z.info
+++ b/system/z/z.info
@@ -1,7 +1,7 @@
 PRGNAM="z"
 VERSION="1.9"
 HOMEPAGE="https://github.com/rupa/z/wiki"
-DOWNLOAD="https://github.com/rupa/z/archive/v1.9.tar.gz"
+DOWNLOAD="https://github.com/rupa/z/archive/v1.9/z-1.9.tar.gz"
 MD5SUM="a111ecf453a8437a1ac0b005627d6b84"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/zarfy/zarfy.SlackBuild b/system/zarfy/zarfy.SlackBuild
index 07210e1e60..a1d8272124 100644
--- a/system/zarfy/zarfy.SlackBuild
+++ b/system/zarfy/zarfy.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for zarfy
 
@@ -23,27 +23,35 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Maintained by Marc Dix
+# Modified by SlackBuilds.org project, 20220208 bkw, BUILD=4
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=zarfy
 VERSION=${VERSION:-0.1.0}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -74,6 +82,8 @@ find -L . \
 patch -p0 < $CWD/patch-makefile-in
 patch -p0 < $CWD/patch-src-makefile-in
 
+SLKCFLAGS+=" -fcommon"
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="-lm -lX11" \
@@ -88,20 +98,17 @@ LDFLAGS="-lm -lX11" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
-  grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
+# 20220208 bkw: do not install INSTALL (useless), NEWS, or AUTHORS
+# (zero-byte placeholders).
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/zerofree/README b/system/zerofree/README
deleted file mode 100644
index 14a43ae30e..0000000000
--- a/system/zerofree/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Zerofree is a utility which scans the free blocks in an ext2/3/4
-filesystem and fills any non-zero blocks with zeroes.
-
-This is useful if you have an ext2/3/4 virtual disk image
-(e.g. VirtualBox' .vdi) that you wish to compact.
-
-See project homepage for information and usage.
diff --git a/system/zerofree/slack-desc b/system/zerofree/slack-desc
deleted file mode 100644
index 864bdb3182..0000000000
--- a/system/zerofree/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-        |-----handy-ruler------------------------------------------------------|
-zerofree: zerofree (fills free blocks in an ext2/3/4 filesystem with zeroes)
-zerofree:
-zerofree: Zerofree is a utility which scans the free blocks in an ext2/3/4
-zerofree: filesystem and fills any non-zero blocks with zeroes.
-zerofree: This is useful if you have an ext2/3/4 virtual disk image
-zerofree: (e.g. VirtualBox' .vdi) that you wish to compact.
-zerofree: See project homepage for information and usage.
-zerofree:
-zerofree:
-zerofree: Homepage: http://intgat.tigress.co.uk/rmy/uml/index.html
-zerofree:
diff --git a/system/zerofree/zerofree.8 b/system/zerofree/zerofree.8
deleted file mode 100644
index fb6f277e7b..0000000000
--- a/system/zerofree/zerofree.8
+++ /dev/null
@@ -1,92 +0,0 @@
-.TH "ZEROFREE" "8" 
-.SH "NAME" 
-zerofree \(em zero free blocks from ext2, ext3 and ext4 file-systems 
-.SH "SYNOPSIS" 
-.PP 
-\fBzerofree\fR [\fB-n\fP]  [\fB-v\fP]  [\fB-f fillval\fP]  \fIfilesystem\fR 
-.SH "DESCRIPTION" 
-.PP 
-\fBzerofree\fR finds the unallocated, 
-blocks with non-zero value content in an ext2, ext3 or ext4 
-\fIfilesystem\fR (e.g. /dev/hda1) and 
-fills them with zeroes (or another octet of your choice). 
- 
- 
-.PP 
-Filling unused areas with zeroes is useful if the device on 
-which this file-system resides is a disk image. In this case, 
-depending on the type of disk image, a secondary utility may be 
-able to reduce the size of the disk image after zerofree has 
-been run.  
- 
-.PP 
-Filling unused areas may also be useful with solid-state 
-drives (SSDs). On some SSDs, filling blocks with ones (0xFF) 
-is reported to trigger Flash block erasure by the firmware, 
-possibly giving a write performance increase.  
- 
-.PP 
-The usual way to achieve the same result (zeroing the 
-unallocated blocks) is to run \fBdd\fR (1) to 
-create a file full of zeroes that takes up the entire free 
-space on the drive, and then delete this file. This has many 
-disadvantages, which zerofree alleviates:      
-.IP "   \(bu" 6 
-it is slow; 
-.IP "   \(bu" 6 
-it makes the disk image (temporarily) grow to its maximal 
-extent; 
-.IP "   \(bu" 6 
-it (temporarily) uses all free space on the disk, so other 
-concurrent write actions may fail.  
- 
-.PP 
-\fIfilesystem\fR has to be unmounted or 
-mounted read-only for \fBzerofree\fR to work. It 
-will exit with an error message if the 
-\fIfilesystem\fR is mounted writable. To 
-remount the root file-system readonly, you can first switch to 
-single user runlevel (\fBtelinit 1\fR) then use 
-\fBmount \-o remount,ro 
-\fIfilesystem\fR\fR.  
- 
-.PP 
-\fBzerofree\fR has been written to be run 
-from GNU/Linux systems installed as guest OSes inside a virtual 
-machine. In this case, it is typically run from within the guest 
-system, and a utility is then run from the host system to shrink 
-disk image (\fBVBoxManage modifyhd \-\-compact\fR, 
-provided with virtualbox, is able to do that for some disk image 
-formats).  
- 
-.PP 
-It may however be useful in other situations: for instance 
-it can be used to make it more difficult to retrieve deleted 
-data. Beware that securely deleting sensitive data is not in 
-general an easy task and usually requires writing several times 
-on the deleted blocks.  
- 
-.SH "OPTIONS" 
-.IP "\fB-n\fP         " 10 
-Perform a dry run  (do not modify the file-system); 
-.IP "\fB-v\fP         " 10 
-Be verbose; 
-.IP "\fB-f value\fP         " 10 
-Specify the octet value to fill empty blocks with (defaults to 
-0). Argument must be within the range 0 to 255. 
-.SH "SEE ALSO" 
-.PP 
-dd (1). 
-.SH "AUTHOR" 
-.PP 
-This manual page was written by Thibaut Paumard <paumard@users.sourceforge.net> for 
-the \fBDebian\fP system (but may be used by others).  Permission is 
-granted to copy, distribute and/or modify this document under 
-the terms of the GNU General Public License, Version 2 or any  
-later version published by the Free Software Foundation. 
- 
-.PP 
-On Debian systems, the complete text of the GNU General Public 
-License can be found in /usr/share/common-licenses/GPL-2. 
- 
-.\" created by instant / docbook-to-man, Mon 31 Mar 2014, 15:41 
diff --git a/system/zerofree/zerofree.SlackBuild b/system/zerofree/zerofree.SlackBuild
deleted file mode 100644
index a40dcdade4..0000000000
--- a/system/zerofree/zerofree.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for zerofree
-
-# Copyright 2011-2013 Roberto Neri, Palermo, Italy
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# 20180612 bkw: update to 1.1.1.
-# 20170122 bkw: update to 1.1.0, fix homepage/download URLs.
-# 20160803 bkw: update to 1.0.4, BUILD=1
-# 20141021 bkw: add man page, add sparsify, bump BUILD to 2.
-
-PRGNAM=zerofree
-VERSION=${VERSION:-1.1.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# No ./configure or "make install" provided
-make CFLAGS="$SLKCFLAGS"
-
-strip --strip-unneeded $PRGNAM 2> /dev/null
-
-mkdir -p $PKG/usr/sbin
-cp -a $PRGNAM $PKG/usr/sbin
-
-# This looks useful, include it.
-gcc $SLKCFLAGS -Wl,-s -o $PKG/usr/sbin/sparsify $CWD/sparsify.c -lext2fs
-
-# man page comes from Debian.
-mkdir -p $PKG/usr/man/man8
-gzip -9c $CWD/$PRGNAM.8 > $PKG/usr/man/man8/$PRGNAM.8.gz
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/zerofree/zerofree.info b/system/zerofree/zerofree.info
deleted file mode 100644
index 51862897eb..0000000000
--- a/system/zerofree/zerofree.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="zerofree"
-VERSION="1.1.1"
-HOMEPAGE="http://frippery.org/uml/"
-DOWNLOAD="http://frippery.org/uml/zerofree-1.1.1.tgz \
-          http://frippery.org/uml/sparsify.c"
-MD5SUM="4f2d6bdba4212e54eb7dd22a8fbb6d29 \
-        919ad782c7120d1e4a9c0ccc9f45b8ef"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
diff --git a/system/zfs-auto-snapshot/README b/system/zfs-auto-snapshot/README
index 5db41321bf..0974b99c70 100644
--- a/system/zfs-auto-snapshot/README
+++ b/system/zfs-auto-snapshot/README
@@ -1,7 +1,7 @@
-An alternative implementation of the zfs-auto-snapshot service for Linux
-that is compatible with zfs-linux and zfs-fuse.
+An alternative implementation of the zfs-auto-snapshot service for
+Linux that is compatible with zfs-linux and zfs-fuse.
 
-Automatically create, rotate, and destroy periodic ZFS snapshots. This is
-the utility that creates the @zfs-auto-snap_frequent, @zfs-auto-snap_hourly,
-@zfs-auto-snap_daily, @zfs-auto-snap_weekly, and @zfs-auto-snap_monthly
-snapshots if it is installed.
+Automatically create, rotate, and destroy periodic ZFS snapshots. This
+is the utility that creates the @zfs-auto-snap_frequent,
+@zfs-auto-snap_hourly, @zfs-auto-snap_daily, @zfs-auto-snap_weekly,
+and @zfs-auto-snap_monthly snapshots if it is installed.
diff --git a/system/zfs-auto-snapshot/zfs-auto-snapshot.SlackBuild b/system/zfs-auto-snapshot/zfs-auto-snapshot.SlackBuild
index 3f2f796b58..107249d884 100644
--- a/system/zfs-auto-snapshot/zfs-auto-snapshot.SlackBuild
+++ b/system/zfs-auto-snapshot/zfs-auto-snapshot.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for zfs-auto-snapshot
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=zfs-auto-snapshot
 VERSION=${VERSION:-1.2.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 USRDIR=/usr
 
 if [ -z "$ARCH" ]; then
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -61,7 +71,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-upstream-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-upstream-$VERSION.tar.gz
 cd $PRGNAM-upstream-$VERSION
 chown -R root:root .
 find -L . \
@@ -88,4 +98,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/zfs-auto-snapshot/zfs-auto-snapshot.info b/system/zfs-auto-snapshot/zfs-auto-snapshot.info
index 8b3d54f4b3..9441eff98d 100644
--- a/system/zfs-auto-snapshot/zfs-auto-snapshot.info
+++ b/system/zfs-auto-snapshot/zfs-auto-snapshot.info
@@ -1,7 +1,7 @@
 PRGNAM="zfs-auto-snapshot"
 VERSION="1.2.4"
 HOMEPAGE="https://github.com/zfsonlinux/zfs-auto-snapshot"
-DOWNLOAD="https://github.com/zfsonlinux/zfs-auto-snapshot/archive/upstream/1.2.4/zfs-auto-snapshot-1.2.4.tar.gz"
+DOWNLOAD="https://github.com/zfsonlinux/zfs-auto-snapshot/archive/upstream/1.2.4/zfs-auto-snapshot-upstream-1.2.4.tar.gz"
 MD5SUM="6c71731b441e1e0f8da385df583460d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/zfs-on-linux/README b/system/zfs-on-linux/README
deleted file mode 100644
index fe11a0407f..0000000000
--- a/system/zfs-on-linux/README
+++ /dev/null
@@ -1,15 +0,0 @@
-ZFS is a modern filesystem originally developed for SOLARIS.
-It provides many functionalities such as snapshots, data compression,
-data recovery, filesystem (snapshot) sending/reveiving, and more.
-
-For more information about ZFS on Linux, please visit
-https://zfsonlinux.org.
-
-NOTE: You'll need the kernel source code to be able to compile this.
-This package is kernel dependent, so you'll need to recompile it for
-every new kernel you choose to run.
-
-Please use KERN environment variable if target kernel version differs
-from that's of the build machine, e.g. `export KERN=5.4.51`.
-
-NOTE: you should run ZFS on 64-bit systems.
diff --git a/system/zfs-on-linux/slack-desc b/system/zfs-on-linux/slack-desc
deleted file mode 100644
index cb6c12ed88..0000000000
--- a/system/zfs-on-linux/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-            |-----handy-ruler------------------------------------------------------|
-zfs-on-linux: zfs-on-linux (ZFS support for Linux)
-zfs-on-linux:
-zfs-on-linux: ZFS is a combined file system and logical volume manager designed by
-zfs-on-linux: Sun Microsystems for Solaris.  It features protection against data
-zfs-on-linux: corruption, support for high storage capacities, efficient data
-zfs-on-linux: compression, snapshots, copy-on-write clones, continuous integrity
-zfs-on-linux: checking and automatic repair, native encryption, block-level data
-zfs-on-linux: deduplication, ability to serialize filesystems (snapshots)
-zfs-on-linux: e.g. to send/receive them over SSH, and many, many more.
-zfs-on-linux:
-zfs-on-linux: Homepage: https://zfsonlinux.org
diff --git a/system/zfs-on-linux/zfs-on-linux.SlackBuild b/system/zfs-on-linux/zfs-on-linux.SlackBuild
deleted file mode 100644
index 48027407a7..0000000000
--- a/system/zfs-on-linux/zfs-on-linux.SlackBuild
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for zfs-on-linux
-
-# Copyright 2021 Markus Reichelt <slackbuilds@mareichelt.de>, Germany
-# Copyright 2017 Marcin Szychowski <szycha@gmail.com>, Poland
-# Copyright 2016 Kevin Paulus <goarilla@gmail.com>, Belgium
-# Copyright 2013-2014 Petr Hejl - Czech Republic
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by the SlackBuilds.org project
-
-PRGNAM=zfs-on-linux
-SRCNAM=zfs
-VERSION=${VERSION:-0.8.6}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-KERN=${KERN:-"$(uname -r)"}
-PKGVER="$(printf %s "${VERSION}_${KERN}" | tr - _)"
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -fr $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-env -u ARCH \
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --libdir=/lib$LIBDIRSUFFIX \
-  --bindir=/usr/bin \
-  --sbindir=/sbin \
-  --includedir=/usr/include \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-linux="/lib/modules/${KERN}/source" \
-  --with-linux-obj="/lib/modules/${KERN}/source" \
-  --with-udevdir=/lib/udev \
-  --enable-static=no \
-  --build=$ARCH-slackware-linux
-
-env -u ARCH make
-env -u ARCH make install DESTDIR=$PKG
-
-# no such thing here
-rm -fr $PKG/usr/lib/dracut
-# no use to keep header files; the Module.symvers file would need the correct path anyway.
-rm -r $PKG/usr/src
-
-mkdir -p $PKG/etc/rc.d/init.d
-rm -fr $PKG/etc/init.d
-install -m 0755 -D $CWD/rc.zfs $PKG/etc/rc.d/rc.zfs.new
-ln -s ../rc.zfs $PKG/etc/rc.d/init.d/zfs
-
-# create the lock directory
-mkdir -p $PKG/var/lock/zfs
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYRIGHT LICENSE META README.md NEWS NOTICE CODE_OF_CONDUCT.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/zfs-on-linux/zfs-on-linux.info b/system/zfs-on-linux/zfs-on-linux.info
deleted file mode 100644
index ac5850c145..0000000000
--- a/system/zfs-on-linux/zfs-on-linux.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="zfs-on-linux"
-VERSION="0.8.6"
-HOMEPAGE="https://zfsonlinux.org"
-DOWNLOAD="https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.6/zfs-0.8.6.tar.gz"
-MD5SUM="e3ca8d66af6e2d7a214e92bf6c733082"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Markus Reichelt"
-EMAIL="slackbuilds@mareichelt.de"
diff --git a/system/znapzend/znapzend.SlackBuild b/system/znapzend/znapzend.SlackBuild
index 7875648231..aa3c2592bc 100644
--- a/system/znapzend/znapzend.SlackBuild
+++ b/system/znapzend/znapzend.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 # Slackware build script for znapzend
 
@@ -24,10 +24,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=znapzend
 VERSION=${VERSION:-0.19.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -100,4 +110,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/zookeeper/README b/system/zookeeper/README
index ed9fb00d94..d1763b0ead 100644
--- a/system/zookeeper/README
+++ b/system/zookeeper/README
@@ -1,6 +1,6 @@
 ZooKeeper is a centralized service for maintaining configuration
-information, naming, providing distributed synchronization, and providing
-group services.
+information, naming, providing distributed synchronization, and
+providing group services.
 
 All of these kinds of services are used in some form or another by
 distributed applications. Each time they are implemented there is a
diff --git a/system/zookeeper/zookeeper.SlackBuild b/system/zookeeper/zookeeper.SlackBuild
index 97cd5e2af4..ee370b0736 100644
--- a/system/zookeeper/zookeeper.SlackBuild
+++ b/system/zookeeper/zookeeper.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Apache Zookeeper
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=zookeeper
 VERSION=${VERSION:-3.4.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ZOOKEEPER_USER=${ZOOKEEPER_USER:-zookeeper}
 ZOOKEEPER_UID=${ZOOKEEPER_UID:-322}
@@ -34,7 +37,7 @@ ZOOKEEPER_GID=${ZOOKEEPER_GID:-322}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -58,7 +61,14 @@ elif ! grep -q "^$ZOOKEEPER_GROUP:" /etc/group; then
   bailout
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -137,4 +147,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/zookeeper/zookeeper.info b/system/zookeeper/zookeeper.info
index c542fd647b..d7b9659009 100644
--- a/system/zookeeper/zookeeper.info
+++ b/system/zookeeper/zookeeper.info
@@ -1,10 +1,10 @@
 PRGNAM="zookeeper"
 VERSION="3.4.10"
 HOMEPAGE="https://zookeeper.apache.org/"
-DOWNLOAD="http://www.us.apache.org/dist/zookeeper/zookeeper-3.4.10/zookeeper-3.4.10.tar.gz"
+DOWNLOAD="https://archive.apache.org/dist/zookeeper/zookeeper-3.4.10/zookeeper-3.4.10.tar.gz"
 MD5SUM="e4cf1b1593ca870bf1c7a75188f09678"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES="zulu-openjdk8"
 MAINTAINER="Andre Barboza"
 EMAIL="bmg.andre@gmail.com"
diff --git a/system/zopfli/README b/system/zopfli/README
index 1bdf00f886..7550b48840 100644
--- a/system/zopfli/README
+++ b/system/zopfli/README
@@ -1,18 +1,18 @@
-Zopfli Compression Algorithm is a compression library programmed in C to perform
-very good, but slow, deflate or zlib compression.
+Zopfli Compression Algorithm is a compression library programmed in C
+to perform very good, but slow, deflate or zlib compression.
 
-The basic function to compress data is ZopfliCompress in zopfli.h. Use the
-ZopfliOptions object to set parameters that affect the speed and compression.
-Use the ZopfliInitOptions function to place the default values in the
-ZopfliOptions first.
+The basic function to compress data is ZopfliCompress in zopfli.h. Use
+the ZopfliOptions object to set parameters that affect the speed and
+compression. Use the ZopfliInitOptions function to place the default
+values in the ZopfliOptions first.
 
-ZopfliCompress supports deflate, gzip and zlib output format with a parameter.
-To support only one individual format, you can instead use ZopfliDeflate in
-deflate.h, ZopfliZlibCompress in zlib_container.h or ZopfliGzipCompress in
-gzip_container.h.
+ZopfliCompress supports deflate, gzip and zlib output format with a
+parameter. To support only one individual format, you can instead use
+ZopfliDeflate in deflate.h, ZopfliZlibCompress in zlib_container.h or
+ZopfliGzipCompress in gzip_container.h.
 
-This library can only compress, not decompress. Existing zlib or deflate
-libraries can decompress the data.
+This library can only compress, not decompress. Existing zlib or
+deflate libraries can decompress the data.
 
 Zopfli Compression Algorithm was created by Lode Vandevenne and Jyrki
 Alakuijala, based on an algorithm by Jyrki Alakuijala.
diff --git a/system/zopfli/zopfli.SlackBuild b/system/zopfli/zopfli.SlackBuild
index a4cc1a214e..300e621878 100644
--- a/system/zopfli/zopfli.SlackBuild
+++ b/system/zopfli/zopfli.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Zopfli
 
@@ -22,20 +22,30 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20240402 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - strip binary.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=zopfli
 VERSION=${VERSION:-1.0.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -51,14 +61,14 @@ cd $PRGNAM-$PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
 make
 
 mkdir -p $PKG/usr/bin $PKG/usr/doc/$PRGNAM-$VERSION
-cp ./zopfli $PKG/usr/bin
+install -s -m0755 ./zopfli $PKG/usr/bin
 
 cp CONTRIBUTORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -67,4 +77,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/zopfli/zopfli.info b/system/zopfli/zopfli.info
index 43a262d989..94669f5e6c 100644
--- a/system/zopfli/zopfli.info
+++ b/system/zopfli/zopfli.info
@@ -1,7 +1,7 @@
 PRGNAM="zopfli"
 VERSION="1.0.0"
 HOMEPAGE="https://github.com/google/zopfli"
-DOWNLOAD="https://github.com/google/zopfli/archive/zopfli-1.0.0.tar.gz"
+DOWNLOAD="https://github.com/google/zopfli/archive/zopfli-1.0.0/zopfli-zopfli-1.0.0.tar.gz"
 MD5SUM="22321d8350fafa2d3290544317b6be83"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/zoxide/README b/system/zoxide/README
new file mode 100644
index 0000000000..1ea662e201
--- /dev/null
+++ b/system/zoxide/README
@@ -0,0 +1,39 @@
+Zoxide is a smarter cd command, inspired by z and autojump.
+It remembers which directories you use most frequently, so you can 
+"jump" to them in just a few keystrokes.
+Zoxide works on all major shells.
+
+z foo             # cd into highest ranked directory matching foo
+z foo bar         # cd into highest ranked directory matching 
+                    foo and bar
+z foo /           # cd into a subdirectory starting with foo
+
+z ~/foo           # z also works like a regular cd command
+z foo/            # cd into relative path
+z ..              # cd one level up
+z -               # cd into previous directory
+
+zi foo            # cd with interactive selection (using fzf)
+
+z foo<SPACE><TAB> # show interactive completions 
+                  (zoxide v0.8.0+, bash 4.4+/fish/zsh only)
+
+Add zoxide to your shell:
+
+Bash: 
+Add this to your configuration (usually ~/.bashrc):
+eval "$(zoxide init bash)"
+
+Fish:
+Add this to your configuration (usually ~/.config/fish/config.fish):
+zoxide init fish | source
+
+Zsh:
+Add this to your configuration (usually ~/.zshrc):
+eval "$(zoxide init zsh)"
+
+For completions to work, the above line must be added after compinit is 
+called. You may have to rebuild your cache by running 
+rm ~/.zcompdump*; compinit.
+
+more data in the github page.
diff --git a/system/zoxide/slack-desc b/system/zoxide/slack-desc
new file mode 100644
index 0000000000..921ce6417d
--- /dev/null
+++ b/system/zoxide/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+zoxide: zoxide (smarter cd command written in Rust)
+zoxide:
+zoxide: Zoxide is a smarter cd command, inspired by z and autojump.
+zoxide:
+zoxide:
+zoxide:
+zoxide:
+zoxide:
+zoxide:
+zoxide: Home: https://github.com/ajeetdsouza/zoxide
+zoxide:
diff --git a/system/zoxide/zoxide.SlackBuild b/system/zoxide/zoxide.SlackBuild
new file mode 100644
index 0000000000..102d417204
--- /dev/null
+++ b/system/zoxide/zoxide.SlackBuild
@@ -0,0 +1,162 @@
+#!/bin/bash
+
+# Slackware build script for zoxide
+
+# Copyright 2022 Damian Perticone, Berisso, Argentina
+# All rights reserved.
+# Thanks to Andrew Clemons for the sources and md5sum getting script!
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=zoxide
+VERSION=${VERSION:-0.8.2}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+
+  if [ "$ARCH" = "i586" ]; then
+    if rustc -Vv | grep host | grep i686 > /dev/null ; then
+      ARCH=i686
+    fi
+  fi
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+  CARGOTARGET="--target i586-unknown-linux-gnu"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+  CARGOTARGET="--target i686-unknown-linux-gnu"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+  CARGOTARGET="--target x86_64-unknown-linux-gnu"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+  CARGOTARGET=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+# build offline
+# configuration tells cargo to use the configured directory
+# for dependencies intead of downloading from crates.io
+cat << EOF >> .cargo/config
+[source.crates-io]
+registry = 'https://github.com/rust-lang/crates.io-index'
+replace-with = 'vendored-sources'
+
+[source.vendored-sources]
+directory = '$(pwd)/vendor'
+EOF
+
+# deps and versions come from Cargo.lock
+mkdir vendor
+(
+  cd vendor
+
+  grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \
+    sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \
+    awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \
+    grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do
+
+    ver="$(printf "%s\n" "$dep" | cut -d= -f2)"
+    dep="$(printf "%s\n" "$dep" | cut -d= -f1)"
+
+    tar xvf $CWD/$dep-$ver.crate
+
+    touch $dep-$ver/.cargo-ok
+
+    # generate checksum
+    {
+      printf "{\n"
+      printf '    "files": {\n'
+
+      (
+        cd $dep-$ver
+        find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/'
+      ) | sed '$ s/,$//'
+
+      printf "    },\n"
+      printf '    "package": "'
+
+      sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
+
+      printf "}\n"
+    } > $dep-$ver/.cargo-checksum.json
+  done
+)
+
+sed -i '/strip =/d' Cargo.toml
+sed -i 's/rust-version = "1.59"/rust-version = "1.58"/' Cargo.toml
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CARGO_HOME=.cargo \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+cargo build --release $CARGOTARGET
+
+mkdir -p $PKG/usr/bin
+
+find target -name $PRGNAM -exec install -m 755 {} $PKG/usr/bin/$PRGNAM \;
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/zoxide/zoxide.info b/system/zoxide/zoxide.info
new file mode 100644
index 0000000000..86d4034ea3
--- /dev/null
+++ b/system/zoxide/zoxide.info
@@ -0,0 +1,288 @@
+PRGNAM="zoxide"
+VERSION="0.8.2"
+HOMEPAGE="https://github.com/ajeetdsouza/zoxide"
+DOWNLOAD="https://github.com/ajeetdsouza/zoxide/archive/v0.8.2/zoxide-0.8.2.tar.gz \
+          https://static.crates.io/crates/aho-corasick/aho-corasick-0.7.18.crate \
+          https://static.crates.io/crates/anyhow/anyhow-1.0.58.crate \
+          https://static.crates.io/crates/askama/askama-0.11.1.crate \
+          https://static.crates.io/crates/askama_derive/askama_derive-0.11.2.crate \
+          https://static.crates.io/crates/askama_escape/askama_escape-0.10.3.crate \
+          https://static.crates.io/crates/askama_shared/askama_shared-0.12.2.crate \
+          https://static.crates.io/crates/assert_cmd/assert_cmd-2.0.4.crate \
+          https://static.crates.io/crates/async-attributes/async-attributes-1.1.2.crate \
+          https://static.crates.io/crates/async-channel/async-channel-1.6.1.crate \
+          https://static.crates.io/crates/async-executor/async-executor-1.4.1.crate \
+          https://static.crates.io/crates/async-global-executor/async-global-executor-2.2.0.crate \
+          https://static.crates.io/crates/async-io/async-io-1.7.0.crate \
+          https://static.crates.io/crates/async-lock/async-lock-2.5.0.crate \
+          https://static.crates.io/crates/async-std/async-std-1.12.0.crate \
+          https://static.crates.io/crates/async-task/async-task-4.2.0.crate \
+          https://static.crates.io/crates/atomic-waker/atomic-waker-1.0.0.crate \
+          https://static.crates.io/crates/atty/atty-0.2.14.crate \
+          https://static.crates.io/crates/autocfg/autocfg-1.1.0.crate \
+          https://static.crates.io/crates/bincode/bincode-1.3.3.crate \
+          https://static.crates.io/crates/bitflags/bitflags-1.3.2.crate \
+          https://static.crates.io/crates/blocking/blocking-1.2.0.crate \
+          https://static.crates.io/crates/bstr/bstr-0.2.17.crate \
+          https://static.crates.io/crates/bumpalo/bumpalo-3.10.0.crate \
+          https://static.crates.io/crates/cache-padded/cache-padded-1.2.0.crate \
+          https://static.crates.io/crates/cc/cc-1.0.73.crate \
+          https://static.crates.io/crates/cfg-if/cfg-if-1.0.0.crate \
+          https://static.crates.io/crates/clap/clap-3.2.6.crate \
+          https://static.crates.io/crates/clap_complete/clap_complete-3.2.2.crate \
+          https://static.crates.io/crates/clap_complete_fig/clap_complete_fig-3.2.2.crate \
+          https://static.crates.io/crates/clap_derive/clap_derive-3.2.6.crate \
+          https://static.crates.io/crates/clap_lex/clap_lex-0.2.3.crate \
+          https://static.crates.io/crates/concurrent-queue/concurrent-queue-1.2.2.crate \
+          https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.10.crate \
+          https://static.crates.io/crates/ctor/ctor-0.1.22.crate \
+          https://static.crates.io/crates/difflib/difflib-0.4.0.crate \
+          https://static.crates.io/crates/dirs-sys/dirs-sys-0.3.7.crate \
+          https://static.crates.io/crates/dirs/dirs-4.0.0.crate \
+          https://static.crates.io/crates/doc-comment/doc-comment-0.3.3.crate \
+          https://static.crates.io/crates/dunce/dunce-1.0.2.crate \
+          https://static.crates.io/crates/either/either-1.6.1.crate \
+          https://static.crates.io/crates/event-listener/event-listener-2.5.2.crate \
+          https://static.crates.io/crates/fastrand/fastrand-1.7.0.crate \
+          https://static.crates.io/crates/fnv/fnv-1.0.7.crate \
+          https://static.crates.io/crates/futures-channel/futures-channel-0.3.21.crate \
+          https://static.crates.io/crates/futures-core/futures-core-0.3.21.crate \
+          https://static.crates.io/crates/futures-executor/futures-executor-0.3.21.crate \
+          https://static.crates.io/crates/futures-io/futures-io-0.3.21.crate \
+          https://static.crates.io/crates/futures-lite/futures-lite-1.12.0.crate \
+          https://static.crates.io/crates/futures-macro/futures-macro-0.3.21.crate \
+          https://static.crates.io/crates/futures-sink/futures-sink-0.3.21.crate \
+          https://static.crates.io/crates/futures-task/futures-task-0.3.21.crate \
+          https://static.crates.io/crates/futures-timer/futures-timer-3.0.2.crate \
+          https://static.crates.io/crates/futures-util/futures-util-0.3.21.crate \
+          https://static.crates.io/crates/futures/futures-0.3.21.crate \
+          https://static.crates.io/crates/getrandom/getrandom-0.2.7.crate \
+          https://static.crates.io/crates/glob/glob-0.3.0.crate \
+          https://static.crates.io/crates/globset/globset-0.4.9.crate \
+          https://static.crates.io/crates/gloo-timers/gloo-timers-0.2.4.crate \
+          https://static.crates.io/crates/hashbrown/hashbrown-0.12.1.crate \
+          https://static.crates.io/crates/heck/heck-0.4.0.crate \
+          https://static.crates.io/crates/hermit-abi/hermit-abi-0.1.19.crate \
+          https://static.crates.io/crates/ignore/ignore-0.4.18.crate \
+          https://static.crates.io/crates/indexmap/indexmap-1.9.1.crate \
+          https://static.crates.io/crates/instant/instant-0.1.12.crate \
+          https://static.crates.io/crates/itertools/itertools-0.10.3.crate \
+          https://static.crates.io/crates/js-sys/js-sys-0.3.58.crate \
+          https://static.crates.io/crates/kv-log-macro/kv-log-macro-1.0.7.crate \
+          https://static.crates.io/crates/lazy_static/lazy_static-1.4.0.crate \
+          https://static.crates.io/crates/libc/libc-0.2.126.crate \
+          https://static.crates.io/crates/log/log-0.4.17.crate \
+          https://static.crates.io/crates/memchr/memchr-2.5.0.crate \
+          https://static.crates.io/crates/mime/mime-0.3.16.crate \
+          https://static.crates.io/crates/mime_guess/mime_guess-2.0.4.crate \
+          https://static.crates.io/crates/minimal-lexical/minimal-lexical-0.2.1.crate \
+          https://static.crates.io/crates/nix/nix-0.24.1.crate \
+          https://static.crates.io/crates/nom/nom-7.1.1.crate \
+          https://static.crates.io/crates/num-traits/num-traits-0.2.15.crate \
+          https://static.crates.io/crates/num_cpus/num_cpus-1.13.1.crate \
+          https://static.crates.io/crates/once_cell/once_cell-1.12.0.crate \
+          https://static.crates.io/crates/ordered-float/ordered-float-3.0.0.crate \
+          https://static.crates.io/crates/os_str_bytes/os_str_bytes-6.1.0.crate \
+          https://static.crates.io/crates/parking/parking-2.0.0.crate \
+          https://static.crates.io/crates/pin-project-lite/pin-project-lite-0.2.9.crate \
+          https://static.crates.io/crates/pin-utils/pin-utils-0.1.0.crate \
+          https://static.crates.io/crates/polling/polling-2.2.0.crate \
+          https://static.crates.io/crates/predicates-core/predicates-core-1.0.3.crate \
+          https://static.crates.io/crates/predicates-tree/predicates-tree-1.0.5.crate \
+          https://static.crates.io/crates/predicates/predicates-2.1.1.crate \
+          https://static.crates.io/crates/proc-macro-error-attr/proc-macro-error-attr-1.0.4.crate \
+          https://static.crates.io/crates/proc-macro-error/proc-macro-error-1.0.4.crate \
+          https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.40.crate \
+          https://static.crates.io/crates/quote/quote-1.0.20.crate \
+          https://static.crates.io/crates/redox_syscall/redox_syscall-0.2.13.crate \
+          https://static.crates.io/crates/redox_users/redox_users-0.4.3.crate \
+          https://static.crates.io/crates/regex-automata/regex-automata-0.1.10.crate \
+          https://static.crates.io/crates/regex-syntax/regex-syntax-0.6.26.crate \
+          https://static.crates.io/crates/regex/regex-1.5.6.crate \
+          https://static.crates.io/crates/remove_dir_all/remove_dir_all-0.5.3.crate \
+          https://static.crates.io/crates/rstest/rstest-0.13.0.crate \
+          https://static.crates.io/crates/rstest_macros/rstest_macros-0.13.0.crate \
+          https://static.crates.io/crates/rstest_reuse/rstest_reuse-0.3.0.crate \
+          https://static.crates.io/crates/rustc_version/rustc_version-0.4.0.crate \
+          https://static.crates.io/crates/same-file/same-file-1.0.6.crate \
+          https://static.crates.io/crates/semver/semver-1.0.10.crate \
+          https://static.crates.io/crates/serde/serde-1.0.137.crate \
+          https://static.crates.io/crates/serde_derive/serde_derive-1.0.137.crate \
+          https://static.crates.io/crates/shell-words/shell-words-1.1.0.crate \
+          https://static.crates.io/crates/slab/slab-0.4.6.crate \
+          https://static.crates.io/crates/socket2/socket2-0.4.4.crate \
+          https://static.crates.io/crates/strsim/strsim-0.10.0.crate \
+          https://static.crates.io/crates/syn/syn-1.0.98.crate \
+          https://static.crates.io/crates/tempfile/tempfile-3.3.0.crate \
+          https://static.crates.io/crates/termcolor/termcolor-1.1.3.crate \
+          https://static.crates.io/crates/termtree/termtree-0.2.4.crate \
+          https://static.crates.io/crates/textwrap/textwrap-0.15.0.crate \
+          https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.31.crate \
+          https://static.crates.io/crates/thiserror/thiserror-1.0.31.crate \
+          https://static.crates.io/crates/thread_local/thread_local-1.1.4.crate \
+          https://static.crates.io/crates/unicase/unicase-2.6.0.crate \
+          https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.1.crate \
+          https://static.crates.io/crates/value-bag/value-bag-1.0.0-alpha.9.crate \
+          https://static.crates.io/crates/version_check/version_check-0.9.4.crate \
+          https://static.crates.io/crates/wait-timeout/wait-timeout-0.2.0.crate \
+          https://static.crates.io/crates/waker-fn/waker-fn-1.1.0.crate \
+          https://static.crates.io/crates/walkdir/walkdir-2.3.2.crate \
+          https://static.crates.io/crates/wasi/wasi-0.11.0+wasi-snapshot-preview1.crate \
+          https://static.crates.io/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.81.crate \
+          https://static.crates.io/crates/wasm-bindgen-futures/wasm-bindgen-futures-0.4.31.crate \
+          https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.81.crate \
+          https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.81.crate \
+          https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.81.crate \
+          https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.81.crate \
+          https://static.crates.io/crates/web-sys/web-sys-0.3.58.crate \
+          https://static.crates.io/crates/wepoll-ffi/wepoll-ffi-0.1.2.crate \
+          https://static.crates.io/crates/which/which-4.2.5.crate \
+          https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi-util/winapi-util-0.1.5.crate \
+          https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \
+          https://static.crates.io/crates/winapi/winapi-0.3.9.crate"
+MD5SUM="aeb85ffb7c75a9f5d0474b4ad22c5660 \
+        425b8fdf70df59998d9b7c89083e48d1 \
+        a1a14bb3ed8e85bfc1b289244472e7c7 \
+        92f5048a3c603c047643c10f515faaa6 \
+        c21efcb667a9be150e96237890eddd7f \
+        01bc9b13d591d5088589cf61f6c4e770 \
+        0962bfdc9f9e860375dc76eefb8a4b95 \
+        c1dbf06f827d7ca0350a9be45c6bc040 \
+        c175b102a9ce52c8ca8b0e3d2d0f0bb6 \
+        218d9b779b991e39e2e3fd2f299a9864 \
+        50806ccba0af9b3fdd3e37c6b651059c \
+        4f0bd30bea0f80a780a574b5b2deaf7c \
+        56fbde846ac8e78aaa29c4f14b6f47e5 \
+        f3b6de508f03f6d12010b154160b13ee \
+        1aea297795331d5e82ad16b0fca71748 \
+        f0fee7ed35cbf0f8bd5f78161bf80960 \
+        6a2f7b82f00aaf8f9124cbae817980ac \
+        142cb4b9a653e56e56311f0c883b8582 \
+        05d77ef52e90ad161fdd41b252420467 \
+        b9beac7e75b4986031a89562c26eb553 \
+        a295edb6953237ebbdfa8e731229f9a3 \
+        c23fa18e9e7f214f091b14fc65be7b8b \
+        f5b0c1878d1deab2cc401e09fa6c78af \
+        67b7cc02856cad7f081e9dc0d8a74427 \
+        ca7e295f50617a33e02283d3ef93ff99 \
+        8e3a4d0980acef2c4e74485a45de29a9 \
+        74634128440dbc3766bda76fdf0aaa05 \
+        a48ca91f58511dcb08faaa229ec10129 \
+        d47fa69e678099245c6e4b07afed7bdc \
+        8ca25c4d1c199c2ff09d9bd8330877a9 \
+        1b68473c872a795ee58ca12a0cd8e210 \
+        bf164aee946210dcbaba83a8bb513ce7 \
+        f637bf20fac185ee2687bb2a08325e59 \
+        eadef349030e87e603a5558983305827 \
+        7f41743a48a304cf5b932ea321dab0c9 \
+        bebc8338ae113a87a04564c97c1e3f0c \
+        4c21da37e71a52f26c8c5490f3ec4837 \
+        889fdcd1499ef5939caaafab5c09729e \
+        dd1e49c76e9d5853e673a3b41ba02917 \
+        92975b31808c970d08fb58909982eada \
+        b4e2b229c362ad0dd313ff631816d5db \
+        782fd3cac41045c0d89d69b90012d8b7 \
+        e08921c68133df2e254fe723b368bae3 \
+        8dab3b3ec00dc56cffde0b0c410d47b5 \
+        5d404b52af03b999e7fb74fbe16d3bd0 \
+        8aa040d9c661f68ebb67d5b71813473b \
+        1e0ad6e5cdab371cabd218748fee9b6d \
+        74d9ab54981e8f02e7eb683ac0a8a6b9 \
+        3763e6c936b1accbd2e9a7c8118793e0 \
+        750ca4b374c5cd501a612a841f7362a9 \
+        a46bd303e3155f7975b167af12435e5e \
+        1ab2952ce15d2f9cfe279821274133eb \
+        23e8b9cc40cb6247022c1265fb95505b \
+        8071e8e030bee77619611dbb4e508864 \
+        bece18dd831ac2ce1e26e92271e6d832 \
+        62864db03072aaae4f855126d502b8c7 \
+        e7c07242a95ee1df865efe9534e10a34 \
+        8d1e025b4de733a62d60cb72f875fefd \
+        52b7c854accccb07820ba28d816f2290 \
+        5170744b32143ae954a57f26c0fa3467 \
+        4fd75413081a400a1c230f0700732611 \
+        0b7994d1256215201bdfb810a357ffa2 \
+        9e124280062b1b929e62113dc501866e \
+        9473c008d472707d1aa3273d7cbabb96 \
+        5f153f7135dceb02f88266121c836b4e \
+        28953383a9cd5d5a80f9fab5a254f740 \
+        47d4e602ecc3c645749b420a13567ec4 \
+        e155c3d45440413eec6db44f68a21b69 \
+        fba3b040a55c01be7376d3dd5c4d4920 \
+        c58d450f13e76e4a034fde8f20710266 \
+        b31bf94ffe7e0f2ada93afae1076eaeb \
+        94b8bf179385ff071bdc33b58bf047c0 \
+        a362e890dd0dfe51ecd95a4a1be6e28c \
+        6b4eda909ad28591c70bd89045795e84 \
+        8b708bc4b33c5e1683467444c9ed41b0 \
+        4e32cad8256a6dee8902f5c23f87c66c \
+        b4f83cacd53b7dc0d12ba582d27cbc1a \
+        a0de6eabdeb1320350abcbd7c02df6ac \
+        c5e50e299295e662ad19c58428d6e085 \
+        d2898eb94e8ec220fa09df7fa0ebb692 \
+        8f0eaa9364873b1ac7ccea6b77050c32 \
+        ceb4ba55f783e6834b6914f56f451d0e \
+        205459def23510e8815562e73a65c898 \
+        ce6dde2ea2691fdd97632fb8c9b3e042 \
+        07c75fec267864bcbb800ca7709ceae2 \
+        1d827ececfe381f71248b88ec399f359 \
+        2ce811fbdcffe77c4f44e732a464b599 \
+        f0483617baf64c673526ff9e015b4d44 \
+        3b9ab1d39ea550e7d78982d2c6e41f91 \
+        7d76a523677de261dda1b65d29a93c4e \
+        6a32bab57772c3a1146d599b65ffb0cb \
+        76c12c914deb8149bffb7437aab133b0 \
+        37812acc7a616d54221d786d215ef8cf \
+        2e69b77050ab91b1d0bb941e843a05cb \
+        2793ed3e6807d79ff72271baec586531 \
+        95f4b6766a27d814b4e54d1ccb3b7fc9 \
+        c3789f11772f0c40ad7cc1f6e4b7bf2c \
+        8cfc5b8dac188c6b4b790175902df1bc \
+        0538d1da369f3e3f0412aa4d735c1b61 \
+        92501d945ed545dc78206792827643a2 \
+        00e0f96063af5adbe369ab20379b104a \
+        0cb8aa4d58dae33fa5cbbdc82bcd09fb \
+        fdf3aa5e1f6c33e4f68b0f7b08e1e94e \
+        2d8d8b377d144f5e32b4f65a69eb0b24 \
+        c1ce9a606f286b2a3b7d885046d47ecb \
+        31553e8c2d0d2f2e7474cc48a03337d8 \
+        3d3fef13feb53a62c0f434a092f526bf \
+        ce622fdb8d18cd1c13ed8fadc5400c10 \
+        be6b7845e52831416901caba0b97a360 \
+        f8839491f88f7a15ac8a5bdd787de442 \
+        82d98dc87dc8503400aa095f5aa70f13 \
+        56aba66d1843b03c542c3558631eecbd \
+        f29a1bb1b5f3f29cedb36f40f720d765 \
+        40ce77bc7803d0ff8734f6a11c4e8814 \
+        20bd2fec49a1daa82476faf42ef8f18b \
+        7bfb933cd096d342c9d6f77f5d3c4b94 \
+        ac76b35d8c76c7fa25c73b8863d5d055 \
+        a8ae09f39c6e68744ca70bf8db61df71 \
+        d03f75b223b8c2a58c73971ec0227fc0 \
+        36cbce768155bdac8934efa262d75fe3 \
+        07327370ffe0d5e4c5b49a7d7a1452aa \
+        6e71c4d256f4d02355b5b722e7d481be \
+        d18d362345c4fe512ef67b738b239fb8 \
+        6708629acf3d2ecb7404e43255d2df85 \
+        274f9bcda1e4afd4a290329eff9267ad \
+        580dd7d12690c726da7d5075f3442a74 \
+        e972ea58ec203bfa6c79c1207852298b \
+        6646fa0bddbee6e648dd1c3a13d7460d \
+        7ec178f3832231cf0c15c34919f4480e \
+        8006eb912ef48ea3c5131302492df440 \
+        15dc09c16fa157d689e9a2a10ce29654 \
+        d72895ac322e8cab7c70df7bd9b1dc57 \
+        4bf4e0643aaa8ccbb05a236c1aa12fc8 \
+        d089e0772e1d69f411919a082c7ad202 \
+        20cfa8aba7521c8767344b06c39479f7 \
+        c8fa57829efc7efdfe176f19715582e5 \
+        db96b50050277bf05a3c68534bbb9586 \
+        b9e37d5fc4ad28b612b78ad37816684d \
+        09de9d01e7331ff3da11f58be8bef0df \
+        0498c4a11448bfc35dc7bb2caa64c753"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="fzf"
+MAINTAINER="Damian Perticone"
+EMAIL="mjolnirdam@gmail.com"
diff --git a/system/zpaq/README b/system/zpaq/README
index d11265591c..72de972d2c 100644
--- a/system/zpaq/README
+++ b/system/zpaq/README
@@ -2,13 +2,14 @@ zpaq is a journaling, incremental, deduplicating archiver for Windows
 and Linux.
 
 "Journaling" means that when you update a file or directory, both the
-old and new versions are saved. You can extract from the archive as it
-existed at any time in the past. "Incremental", means that when you back
-up your entire hard drive, for example with:
+old and new versions are saved. You can extract from the archive as
+it existed at any time in the past. "Incremental", means that when you
+back up your entire hard drive, for example with:
 
   zpaq -add e:backup.zpaq c:\*
 
-only those files whose last-modified date has changed since the previous
-backup are added. For 100 GB of files, this typically takes 1-2 minutes,
-vs. a few hours to create the first version. "Deduplicating" means that
-identical files or fragments are stored only once to save time and space.
+only those files whose last-modified date has changed since
+the previous backup are added. For 100 GB of files, this
+typically takes 1-2 minutes, vs. a few hours to create the first
+version. "Deduplicating" means that identical files or fragments are
+stored only once to save time and space.
diff --git a/system/zpaq/zpaq.SlackBuild b/system/zpaq/zpaq.SlackBuild
index 2c8dfbd205..876bde87d6 100644
--- a/system/zpaq/zpaq.SlackBuild
+++ b/system/zpaq/zpaq.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for zpaq
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=zpaq
 VERSION=${VERSION:-7.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -93,4 +103,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/zpaq/zpaq.info b/system/zpaq/zpaq.info
index 83e946f5ea..3f760f2beb 100644
--- a/system/zpaq/zpaq.info
+++ b/system/zpaq/zpaq.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://mattmahoney.net/dc/zpaq715.zip"
 MD5SUM="1779c19decc885b44636c497b61d937a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="docutils"
+REQUIRES=""
 MAINTAINER="Christoph Willing"
 EMAIL="chris.willing@linux.com"
diff --git a/system/zramen/README b/system/zramen/README
new file mode 100644
index 0000000000..5fe20b1f72
--- /dev/null
+++ b/system/zramen/README
@@ -0,0 +1,9 @@
+Zramen is a simple bash script that makes managing zram much easier.
+This SlackBuild provides the zramen script but also a service script
+compatible with sysvinit.
+
+To enable zramen on startup, add the following to /etc/rc.d/rc.local:
+if [ -x /etc/rc.d/rc.zramen ]; then
+  # Start Zramen
+  /etc/rc.d/rc.zramen start
+fi
diff --git a/system/zramen/rc.zramen b/system/zramen/rc.zramen
new file mode 100644
index 0000000000..97cb5fa324
--- /dev/null
+++ b/system/zramen/rc.zramen
@@ -0,0 +1,39 @@
+#!/bin/sh
+# Start/stop/restart zramen (manages zram swap space)
+
+# Source options
+if [ -r /etc/default/zramen ]; then
+  . /etc/default/zramen
+fi
+
+zramen_start() {
+ if [ -x /usr/bin/zramen ]; then
+ /usr/bin/zramen make
+ fi
+}
+
+zramen_stop() {
+ if [ -x /usr/bin/zramen ]; then
+ /usr/bin/zramen toss
+ fi
+}
+
+zramen_restart() {
+ zramen_stop
+ sleep 1
+ zramen_start
+}
+
+case "$1" in
+'start')
+  zramen_start
+  ;;
+'stop')
+  zramen_stop
+  ;;
+'restart')
+  zramen_restart
+  ;;
+*)
+  echo "usage $0 start|stop|restart"
+esac
diff --git a/system/zramen/slack-desc b/system/zramen/slack-desc
new file mode 100644
index 0000000000..b5842d57ce
--- /dev/null
+++ b/system/zramen/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+zramen: zramen (Manage zram swap space)
+zramen:
+zramen: Zramen is a bash script and service (originally for runit) that makes
+zramen: managing and setting zram swap space much easier. The properties of
+zramen: the zram can be configured with environment variables that activate
+zramen: when running "zramen make" or in /etc/default/zramen for the
+zramen: provided sysvinit service.
+zramen:
+zramen:
+zramen: https://github.com/atweiden/zramen
+zramen:
diff --git a/system/zramen/zramen.SlackBuild b/system/zramen/zramen.SlackBuild
new file mode 100644
index 0000000000..d6285b65f8
--- /dev/null
+++ b/system/zramen/zramen.SlackBuild
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+# Slackware build script for zramen
+
+# Copyright 2023, 2024 Hunter Ellett <hunter2k1@disroot.org>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd "$(dirname "$0")" ; CWD=$(pwd)
+
+PRGNAM=zramen
+VERSION=${VERSION:-0.6.0}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP="${TMP:-/tmp/SBo}"
+PKG="$TMP/package-$PRGNAM"
+OUTPUT="${OUTPUT:-/tmp}"
+
+set -e
+
+rm -rf "$PKG"
+mkdir -p "$TMP" "$PKG" "$OUTPUT"
+mkdir -p "$PKG/install"
+mkdir -p "$PKG/usr/doc/$PRGNAM-$VERSION"
+mkdir -p "$PKG/usr/bin"
+mkdir -p "$PKG/etc/rc.d"
+mkdir -p "$PKG/etc/default"
+
+cd "$PKG"
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+install -m 755 "$PKG/$PRGNAM-$VERSION/$PRGNAM" "$PKG/usr/bin/$PRGNAM"
+install -m 666 "$PKG/$PRGNAM-$VERSION/sv/$PRGNAM/conf" "$PKG/etc/default/$PRGNAM"
+install -m 666 "$CWD/rc.$PRGNAM" "$PKG/etc/rc.d"
+
+cp "$CWD/$PRGNAM.SlackBuild" "$PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild"
+cp "$CWD/README" "$PKG/usr/doc/$PRGNAM-$VERSION/README"
+cp "$CWD/slack-desc" "$PKG/install/slack-desc"
+
+# Clean up
+rm -rf "$PKG/$PRGNAM-$VERSION"
+
+cd "$PKG"
+/sbin/makepkg -l n -c n "$OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
diff --git a/system/zramen/zramen.info b/system/zramen/zramen.info
new file mode 100644
index 0000000000..016b745d48
--- /dev/null
+++ b/system/zramen/zramen.info
@@ -0,0 +1,10 @@
+PRGNAM="zramen"
+VERSION="0.6.0"
+HOMEPAGE="https://github.com/atweiden/zramen"
+DOWNLOAD="https://github.com/atweiden/zramen/releases/download/0.6.0/zramen-0.6.0.tar.gz"
+MD5SUM="eb8057d3e4952ea78c18d5e7880d9841"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Hunter Ellett"
+EMAIL="hunter2k1@disroot.org"
diff --git a/system/zsh-completions/zsh-completions.SlackBuild b/system/zsh-completions/zsh-completions.SlackBuild
index 3f7d830057..2180c8b564 100644
--- a/system/zsh-completions/zsh-completions.SlackBuild
+++ b/system/zsh-completions/zsh-completions.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for the zsh-completions.
 #
-# Copyright 2018-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2018-2023  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,38 +22,28 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=zsh-completions
-VERSION=${VERSION:-0.32.0}
+VERSION=${VERSION:-0.35.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -83,4 +73,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/zsh-completions/zsh-completions.info b/system/zsh-completions/zsh-completions.info
index b33d141a83..932cab0206 100644
--- a/system/zsh-completions/zsh-completions.info
+++ b/system/zsh-completions/zsh-completions.info
@@ -1,8 +1,8 @@
 PRGNAM="zsh-completions"
-VERSION="0.32.0"
+VERSION="0.35.0"
 HOMEPAGE="https://github.com/zsh-users/zsh-completions"
-DOWNLOAD="https://github.com/zsh-users/zsh-completions/archive/0.32.0/zsh-completions-0.32.0.tar.gz"
-MD5SUM="6dd2963013700d6024cf3e292cc1110c"
+DOWNLOAD="https://github.com/zsh-users/zsh-completions/archive/0.35.0/zsh-completions-0.35.0.tar.gz"
+MD5SUM="1f00ff15928efbd4284b25d14a7f564c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/zsh-syntax-highlighting/README b/system/zsh-syntax-highlighting/README
index f5534846ff..cd02b79649 100644
--- a/system/zsh-syntax-highlighting/README
+++ b/system/zsh-syntax-highlighting/README
@@ -2,11 +2,12 @@ zsh-syntax-highlighting (Fish shell like syntax highlighting for Zsh)
 
 Provides syntax highlighing for the shell zsh. It enables highlighing
 of commands whilst they are typed at a zsh prompt into an interactive
- terminal. This helps in reviewing commands before running them,
+terminal. This helps in reviewing commands before running them,
 particularly in catching syntax errors.
 
-Enable syntax highlighting in the current interactive shell:
+To enable syntax highlighting in the current interactive shell:
 
- source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+source /usr/share/zsh/plugins/zsh-syntax-highlighting/*.zsh
 
-NOTE:  the 'source' command must be **at the end** of '~/.zshrc'.
+You can also add this command to your ~/.zshrc to always enable it.
+NOTE: the 'source' command must be **at the end** of '~/.zshrc'.
diff --git a/system/zsh-syntax-highlighting/zsh-syntax-highlighting.SlackBuild b/system/zsh-syntax-highlighting/zsh-syntax-highlighting.SlackBuild
index e7f8830af0..812c0a6ea4 100644
--- a/system/zsh-syntax-highlighting/zsh-syntax-highlighting.SlackBuild
+++ b/system/zsh-syntax-highlighting/zsh-syntax-highlighting.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for the zsh-syntax-highlighting.
 #
-# Copyright 2018-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2018-2024  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,20 +22,24 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=zsh-syntax-highlighting
-VERSION=${VERSION:-0.7.1}
+VERSION=${VERSION:-0.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -84,11 +88,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
 rm -rf $PKG/usr/share/doc
-cp HACKING.md INSTALL.md release.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp HACKING.md release.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/zsh-syntax-highlighting/zsh-syntax-highlighting.info b/system/zsh-syntax-highlighting/zsh-syntax-highlighting.info
index 74c7ba4fe5..01b1997be8 100644
--- a/system/zsh-syntax-highlighting/zsh-syntax-highlighting.info
+++ b/system/zsh-syntax-highlighting/zsh-syntax-highlighting.info
@@ -1,8 +1,8 @@
 PRGNAM="zsh-syntax-highlighting"
-VERSION="0.7.1"
+VERSION="0.8.0"
 HOMEPAGE="https://github.com/zsh-users/zsh-syntax-highlighting"
-DOWNLOAD="https://github.com/zsh-users/zsh-syntax-highlighting/archive/0.7.1/zsh-syntax-highlighting-0.7.1.tar.gz"
-MD5SUM="a271f8f290c4173eb056d7f2d6229eb1"
+DOWNLOAD="https://github.com/zsh-users/zsh-syntax-highlighting/archive/0.8.0/zsh-syntax-highlighting-0.8.0.tar.gz"
+MD5SUM="d767ca3eb85e5ad24c28999ed661af59"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/zstd/README b/system/zstd/README
deleted file mode 100644
index 70e275669d..0000000000
--- a/system/zstd/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Zstd, short for Zstandard, is a fast lossless compression algorithm,
-targeting real-time compression scenarios at zlib-level and better
-compression ratios.
-
-Since 1.3.1, it is dual licensed as BSD and GPLv2.
diff --git a/system/zstd/slack-desc b/system/zstd/slack-desc
deleted file mode 100644
index 215674d549..0000000000
--- a/system/zstd/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-    |-----handy-ruler------------------------------------------------------|
-zstd: zstd (real-time compression algorithm)
-zstd:
-zstd: Zstandard, or zstd for short, is a real-time compression algorithm
-zstd: providing high compression ratios. It offers a very wide range of
-zstd: compression/speed trade-off, while being backed by a very fast
-zstd: decoder. It also offers a special mode for small data, called
-zstd: dictionary compression, and can create dictionaries from any sample
-zstd: set.
-zstd:
-zstd: Homepage: http://zstd.net/
-zstd:
diff --git a/system/zstd/zstd.SlackBuild b/system/zstd/zstd.SlackBuild
deleted file mode 100644
index 297b0b92f5..0000000000
--- a/system/zstd/zstd.SlackBuild
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for zstd
-
-# Copyright 2016-2019, Zhu Qun-Ying
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=zstd
-VERSION=${VERSION:-1.4.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-zcat $CWD/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz | patch -p1 --verbose || exit 1
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Compile it:
-make CFLAGS="$SLKCFLAGS"
-make CFLAGS="$SLKCFLAGS" -C contrib/pzstd
-
-# Install it:
-make \
-  prefix=/usr \
-  libdir=/usr/lib${LIBDIRSUFFIX} \
-  mandir=/usr/man \
-  DESTDIR=$PKG \
-  install
-install -Dm755 contrib/pzstd/pzstd $PKG/usr/bin/pzstd
-
-# Don't ship static library:
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a
-
-# zstdmt as the same as zstd, so just make a symlink:
-( cd $PKG/usr/bin
-  ln -sf zstd zstdmt
-)
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/pzstd
-cp -a CONTRIBUTING* COPYING* LICENSE README* doc $PKG/usr/doc/$PRGNAM-$VERSION
-cp contrib/pzstd/README.md $PKG/usr/doc/$PRGNAM-$VERSION/pzstd-README.md
-
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz b/system/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz
deleted file mode 100644
index 3e5d5d7c32..0000000000
--- a/system/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz
+++ /dev/null
diff --git a/system/zstd/zstd.info b/system/zstd/zstd.info
deleted file mode 100644
index 5f404b9774..0000000000
--- a/system/zstd/zstd.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="zstd"
-VERSION="1.4.4"
-HOMEPAGE="http://facebook.github.io/zstd/"
-DOWNLOAD="https://github.com/facebook/zstd/releases/download/v1.4.4/zstd-1.4.4.tar.gz"
-MD5SUM="487f7ee1562dee7c1c8adf85e2a63df9"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Zhu Qun-Ying"
-EMAIL="zhu.qunying@gmail.com"
diff --git a/system/zuluCrypt/README b/system/zuluCrypt/README
deleted file mode 100644
index 3e32af4329..0000000000
--- a/system/zuluCrypt/README
+++ /dev/null
@@ -1,37 +0,0 @@
-zuluCrypt (CLI and GUI frontend to cryptsetup).
-
-zuluCrypt is a simple, feature rich and powerful solution for hard
-drives encryption.
-
-zuluCrypt is a front end to cryptsetup and tcplay and it allows easy
-management of encrypted block devices.
-
-zuluCrypt is made up of two components:
-The back end, CLI interface is called "zuluCrypt-cli".
-The front end is Qt GUI application called "zuluCrypt-gui.
-
-* zuluCrypt:
-
-zuluCrypt does hard drives encryption and it can manage plain dm-crypt
-volumes, LUKS encrypted volumes, TrueCrypt encrypted volumes and
-VeraCrypt encrypted volumes.
-
-zuluCrypt can manage encrypted volumes that are hosted in image files,
-in lvm volumes, in mdraid volumes as well as in hard drives and usb
-sticks.
-
-zuluCrypt can also encrypt stand alone files:
-  zuluCrypt menu->zC->encrypt a file.
-
-* zuluMount:
-
-zuluMount is bundled with zuluCrypt and its meant to be used as a
-general purpose tool that mount and unmount zuluCrypt supported
-encrypted volumes as well as unencrypted volumes and it can be
-used as a substitute to udisks,pmount and related tools.
-
-zuluMount-gui can also be used as a frontend to encfs.
-
-zuluMount-gui is ideal for use as a desktop environment/file manager
-independent tool for mounting/unmounting encrypted and unencrypted
-volumes.
diff --git a/system/zuluCrypt/slack-desc b/system/zuluCrypt/slack-desc
deleted file mode 100644
index dc485188f8..0000000000
--- a/system/zuluCrypt/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-         |-----handy-ruler------------------------------------------------------|
-zuluCrypt: zuluCrypt (CLI and GUI frontend to cryptsetup)
-zuluCrypt:
-zuluCrypt: zuluCrypt is a simple, feature rich and powerful solution for
-zuluCrypt: hard drives encryption.
-zuluCrypt:
-zuluCrypt: zuluCrypt is a front end to cryptsetup and tcplay and it allows easy
-zuluCrypt: management of encrypted block devices.
-zuluCrypt:
-zuluCrypt: Home page: http://mhogomchungu.github.io/zuluCrypt/
-zuluCrypt:
-zuluCrypt:
diff --git a/system/zuluCrypt/zuluCrypt.SlackBuild b/system/zuluCrypt/zuluCrypt.SlackBuild
deleted file mode 100644
index 7628512bfe..0000000000
--- a/system/zuluCrypt/zuluCrypt.SlackBuild
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/sh
-#
-# Slackware build script for zuluCrypt.
-#
-# Copyright 2015-2020  Edinaldo P. Silva, Rio de Janeiro, Brazil.
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PRGNAM=zuluCrypt
-VERSION=${VERSION:-5.7.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
-cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSHARE_MOUNT_PREFIX=default \
-    -DUDEVSUPPORT=true \
-    -DNOGUI=false \
-    -DQT5=true \
-    -DHOMEMOUNTPREFIX=false \
-    -DREUSEMOUNTPOINT=false \
-    -DNOGNOME=false \
-    -DINTERNAL_ZULUPLAY=false \
-    -DNOKDE=false \
-    -DINTERNAL_LXQT_WALLET=false \
-    -DUSE_POLKIT=false \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
-cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mv $PKG/usr/share/man $PKG/usr/
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -r docs BUILD_INSTRUCTIONS changelog COPYING copyright GPLv* LICENSE README* TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-rm -r $PKG/usr/share/doc
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/zuluCrypt/zuluCrypt.info b/system/zuluCrypt/zuluCrypt.info
deleted file mode 100644
index 013b62b239..0000000000
--- a/system/zuluCrypt/zuluCrypt.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="zuluCrypt"
-VERSION="5.7.0"
-HOMEPAGE="http://mhogomchungu.github.io/zuluCrypt/"
-DOWNLOAD="https://github.com/mhogomchungu/zuluCrypt/archive/5.7.0/zuluCrypt-5.7.0.tar.gz"
-MD5SUM="cc388dc0eefee86e40b19f8e42ce280e"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="qt5 libpwquality zuluplay"
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere"
diff --git a/system/zutty/README b/system/zutty/README
new file mode 100644
index 0000000000..a3efbbfcbc
--- /dev/null
+++ b/system/zutty/README
@@ -0,0 +1,17 @@
+zutty (X terminal emulator using OpenGL ES Compute Shaders)
+
+Zutty is a terminal emulator for the X Window System, functionally 
+similar to several other X terminal emulators such as xterm, rxvt and 
+countless others. It is also similar to other, much more modern, 
+GPU-accelerated terminal emulators such as Alacritty and Kitty. What 
+really sets Zutty apart is its radically simple, yet extremely 
+efficient rendering implementation, coupled with a sufficiently 
+complete feature set to make it useful for a wide range of users. Zutty 
+offers high throughput with low latency, and strives to conform to 
+relevant (published or de-facto) standards. 
+
+Zutty is written in straightforward C++ and only relies on OpenGL 
+ES 3.1 for rendering, making it trivially portable to windowing systems 
+other than X and operating systems other than Linux. Zutty provides a 
+clean implementation written from scratch, resulting in a minimal, 
+maintainable, modern codebase unencumbered by historical baggage. 
diff --git a/system/zutty/doinst.sh b/system/zutty/doinst.sh
new file mode 100644
index 0000000000..4a25de5e6f
--- /dev/null
+++ b/system/zutty/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/system/zutty/slack-desc b/system/zutty/slack-desc
new file mode 100644
index 0000000000..490a35d48e
--- /dev/null
+++ b/system/zutty/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+zutty: zutty (X terminal emulator using OpenGL ES Compute Shaders)
+zutty:
+zutty: Zutty is a terminal emulator for the X Window System, functionally
+zutty: similar to several other X terminal emulators such as xterm, rxvt and
+zutty: countless others. It is also similar to other, much more modern,
+zutty: GPU-accelerated terminal emulators such as Alacritty and Kitty. What
+zutty: really sets Zutty apart is its radically simple, yet extremely
+zutty: efficient rendering implementation.
+zutty:
+zutty: Homepage: https://tomscii.sig7.se/zutty/
+zutty:
diff --git a/system/zutty/zutty.SlackBuild b/system/zutty/zutty.SlackBuild
new file mode 100644
index 0000000000..d67cc5137f
--- /dev/null
+++ b/system/zutty/zutty.SlackBuild
@@ -0,0 +1,111 @@
+#!/bin/bash
+
+# Slackware build script for zutty
+
+# Copyright 2023-2024 Samuel Young, MO, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=zutty
+VERSION=${VERSION:-0.15}
+COMMIT=3fb1516
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+# This SlackBuild searches for tarball named $VERSION.tar.gz (wget) or
+# $PRGNAM-$VERSION-$COMMIT.tar.gz (browser). I couldn't find a link to a tarball
+# with a dedicated filename, so this will have to do.
+if [ -f $CWD/$VERSION.tar.gz ]; then
+  TARNAM=$VERSION
+else
+  TARNAM=$PRGNAM-$VERSION-$COMMIT
+fi
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION-$COMMIT
+tar xvf $CWD/$TARNAM.tar.gz
+cd $PRGNAM-$VERSION-$COMMIT
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+./waf configure \
+  --prefix=/usr \
+  --bindir=/usr/bin \
+  --libdir=/usr/lib${LIBDIRSUFFIX}
+./waf
+./waf install --destdir=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/share/applications
+cp $CWD/zutty.desktop $PKG/usr/share/applications
+mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps
+cp icons/zutty.svg $PKG/usr/share/icons/hicolor/scalable/apps
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -ra \
+  LICENSE README.org doc/* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/zutty/zutty.desktop b/system/zutty/zutty.desktop
new file mode 100644
index 0000000000..48bc06b753
--- /dev/null
+++ b/system/zutty/zutty.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Zutty
+Comment=Zero-cost Unicode Teletype
+Exec=zutty
+Terminal=false
+Icon=zutty
+Categories=System;TerminalEmulator;
+Keywords=shell;prompt;command;commandline;cmd;
diff --git a/system/zutty/zutty.info b/system/zutty/zutty.info
new file mode 100644
index 0000000000..026f69e474
--- /dev/null
+++ b/system/zutty/zutty.info
@@ -0,0 +1,10 @@
+PRGNAM="zutty"
+VERSION="0.15"
+HOMEPAGE="https://tomscii.sig7.se/zutty/"
+DOWNLOAD="https://git.hq.sig7.se/zutty.git/snapshot/0.15.tar.gz"
+MD5SUM="45301e40ce2e8ef18a18ef6eb808f559"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Samuel Young"
+EMAIL="samyoung12788@gmail.com"
diff --git a/system/zzzfm/README b/system/zzzfm/README
new file mode 100644
index 0000000000..746b1f1ec8
--- /dev/null
+++ b/system/zzzfm/README
@@ -0,0 +1,15 @@
+zzzfm is a multi-panel tabbed file manager for Linux
+with built-in VFS, udev-based device manager,
+customizable menu system, and bash integration forked
+from the unmaintained SpaceFM v1.06 codebase.
+
+To build zzzfm with gdb support, run:
+
+  DEBUG=yes sh zzzfm.SlackBuild
+
+To build zzzfm with video thumbnail support, run:
+
+  VIDEO_THUMBNAILS=yes sh zzzfm.SlackBuild
+
+udevil is an optional dependency to mount networks
+(nfs://, smb://, ftp://, ssh://) and other filesystems.
diff --git a/system/zzzfm/doinst.sh b/system/zzzfm/doinst.sh
new file mode 100644
index 0000000000..aea0f894eb
--- /dev/null
+++ b/system/zzzfm/doinst.sh
@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/zzzfm/slack-desc b/system/zzzfm/slack-desc
new file mode 100644
index 0000000000..e49c0e6197
--- /dev/null
+++ b/system/zzzfm/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+zzzfm: zzzfm (Multi-panel tabbed file manager)
+zzzfm:
+zzzfm: zzzFM is a multi-panel tabbed file manager for Linux
+zzzfm: with built-in VFS, udev-based device manager,
+zzzfm: customizable menu system, and bash integration.
+zzzfm:
+zzzfm: Homepage: https://gitlab.com/antix-contribs/zzzfm/
+zzzfm:
+zzzfm:
+zzzfm:
+zzzfm:
diff --git a/system/zzzfm/zzzfm.SlackBuild b/system/zzzfm/zzzfm.SlackBuild
new file mode 100644
index 0000000000..01d8b0b9a2
--- /dev/null
+++ b/system/zzzfm/zzzfm.SlackBuild
@@ -0,0 +1,137 @@
+#!/bin/bash
+# Slackware build script for zzzfm based on slackbuild for spacefm
+
+# Copyright 2012  Binh Nguyen <binhvng@gmail.com>
+# Copyright 2014-2017 Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
+# Copyright 2017 Andreas Guldstrand
+# Copyright 2022 Andrew Tkalia <anddt@ukr.net>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=zzzfm
+VERSION=${VERSION:-1.0.7}
+SUFFIX="-5"
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+## thanks to Hunter S for the idea,
+## and ponce for the elegant solution
+DEBUG=${DEBUG:-no}
+if [ "${DEBUG}" = "yes" ]; then
+  SLKCFLAGS=$(echo $SLKCFLAGS | sed "s|-O2|-Og -ggdb3|g")
+fi
+
+## detect video thumbnail support, requires ffmpegthumbnailer:
+## http://slackbuilds.org/apps/ffmpegthumbnailer/
+
+VIDEO_THUMBNAILS=${VIDEO_THUMBNAILS:-no}
+if [ "pkg-config --exists libffmpegthumbnailer" -a "x${VIDEO_THUMBNAILS}" != "xno" ]; then
+  VIDEO_THUMBNAIL_FLAG="yes"
+  else VIDEO_THUMBNAIL_FLAG="no"
+fi
+
+set -euo pipefail
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-${VERSION}${SUFFIX}
+tar xvf $CWD/$PRGNAM-${VERSION}${SUFFIX}.tar.gz
+cd $PRGNAM-${VERSION}${SUFFIX}
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+./autogen.sh \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --localedir=/usr/share/locale \
+  --disable-static \
+  --enable-largefile \
+  --enable-desktop-integration=yes \
+  --with-gtk2=yes \
+  --with-gtk3=no \
+  --enable-video-thumbnails=$VIDEO_THUMBNAIL_FLAG \
+  --enable-maintainer-mode=no \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+if [ "${DEBUG}" = "no" ]; then
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+fi
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* ChangeLog README* $PKG/usr/doc/$PRGNAM-$VERSION || true
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/zzzfm/zzzfm.info b/system/zzzfm/zzzfm.info
new file mode 100644
index 0000000000..1ef37fc6ab
--- /dev/null
+++ b/system/zzzfm/zzzfm.info
@@ -0,0 +1,10 @@
+PRGNAM="zzzfm"
+VERSION="1.0.7"
+HOMEPAGE="https://gitlab.com/antix-contribs/zzzfm/"
+DOWNLOAD="https://gitlab.com/antix-contribs/zzzfm/-/archive/1.0.7-5/zzzfm-1.0.7-5.tar.gz"
+MD5SUM="89c6fdf24d19985c119c0c22b94e49f8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Andrew Tkalia"
+EMAIL="anddt@ukr.net"